Skip to content

Commit

Permalink
Update OTEL collector to v0.64.0 and update deprecated calls (jaegert…
Browse files Browse the repository at this point in the history 
…racing#4042)

A few methods were deprecated in the latest release. This PR addresses
those changes and replaces
jaegertracing#4040,
jaegertracing#4038,
jaegertracing#4036

Signed-off-by: Alex Boten <[email protected]>
  • Loading branch information
@codeboten
codeboten authored Nov 10, 2022
1 parent 538fba4 commit 12e5375
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 26 deletions.
9 changes: 4 additions & 5 deletions cmd/collector/app/handler/otlp_receiver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (

otlp2jaeger "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/config"
"go.opentelemetry.io/collector/config/configgrpc"
"go.opentelemetry.io/collector/config/confighttp"
"go.opentelemetry.io/collector/config/configtls"
Expand Down Expand Up @@ -66,7 +65,7 @@ func startOTLPReceiver(
otlpFactory component.ReceiverFactory,
newTraces func(consume consumer.ConsumeTracesFunc, options ...consumer.Option) (consumer.Traces, error),
createTracesReceiver func(ctx context.Context, set component.ReceiverCreateSettings,
cfg config.Receiver, nextConsumer consumer.Traces) (component.TracesReceiver, error),
cfg component.ReceiverConfig, nextConsumer consumer.Traces) (component.TracesReceiver, error),
) (component.TracesReceiver, error) {
otlpReceiverConfig := otlpFactory.CreateDefaultConfig().(*otlpreceiver.Config)
applyGRPCSettings(otlpReceiverConfig.GRPC, &options.OTLP.GRPC)
Expand Down Expand Up @@ -181,14 +180,14 @@ func (h *otelHost) ReportFatalError(err error) {
h.logger.Fatal("OTLP receiver error", zap.Error(err))
}

func (*otelHost) GetFactory(_ component.Kind, _ config.Type) component.Factory {
func (*otelHost) GetFactory(_ component.Kind, _ component.Type) component.Factory {
return nil
}

func (*otelHost) GetExtensions() map[config.ComponentID]component.Extension {
func (*otelHost) GetExtensions() map[component.ID]component.Extension {
return nil
}

func (*otelHost) GetExporters() map[config.DataType]map[config.ComponentID]component.Exporter {
func (*otelHost) GetExporters() map[component.DataType]map[component.ID]component.Exporter {
return nil
}
5 changes: 2 additions & 3 deletions cmd/collector/app/handler/otlp_receiver_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/config"
"go.opentelemetry.io/collector/consumer"
"go.opentelemetry.io/collector/pdata/ptrace"
"go.opentelemetry.io/collector/receiver/otlpreceiver"
Expand Down Expand Up @@ -114,7 +113,7 @@ func TestStartOtlpReceiver_Error(t *testing.T) {
assert.Contains(t, err.Error(), "could not create the OTLP consumer")

createTracesReceiver := func(
context.Context, component.ReceiverCreateSettings, config.Receiver, consumer.Traces,
context.Context, component.ReceiverCreateSettings, component.ReceiverConfig, consumer.Traces,
) (component.TracesReceiver, error) {
return nil, errors.New("mock error")
}
Expand Down Expand Up @@ -148,7 +147,7 @@ func TestOtelHost_ReportFatalError(t *testing.T) {

func TestOtelHost(t *testing.T) {
host := &otelHost{}
assert.Nil(t, host.GetFactory(component.KindReceiver, config.TracesDataType))
assert.Nil(t, host.GetFactory(component.KindReceiver, component.DataTypeTraces))
assert.Nil(t, host.GetExtensions())
assert.Nil(t, host.GetExporters())
}
Expand Down
17 changes: 9 additions & 8 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ require (
github.com/hashicorp/go-plugin v1.4.6
github.com/kr/pretty v0.3.1
github.com/olivere/elastic v6.2.37+incompatible
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.63.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.64.0
github.com/opentracing-contrib/go-grpc v0.0.0-20191001143057-db30781987df
github.com/opentracing-contrib/go-stdlib v1.0.0
github.com/opentracing/opentracing-go v1.2.0
Expand All @@ -47,9 +47,10 @@ require (
github.com/uber/jaeger-client-go v2.30.0+incompatible
github.com/uber/jaeger-lib v2.4.1+incompatible
github.com/xdg-go/scram v1.1.1
go.opentelemetry.io/collector v0.63.0
go.opentelemetry.io/collector/pdata v0.63.0
go.opentelemetry.io/collector/semconv v0.63.0
go.opentelemetry.io/collector v0.64.0
go.opentelemetry.io/collector/pdata v0.64.0
go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.0
go.opentelemetry.io/collector/semconv v0.64.0
go.opentelemetry.io/otel v1.11.1
go.opentelemetry.io/otel/metric v0.33.0
go.uber.org/atomic v1.10.0
Expand Down Expand Up @@ -101,7 +102,7 @@ require (
github.com/jcmturner/rpc/v2 v2.0.3 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.15.11 // indirect
github.com/klauspost/compress v1.15.12 // indirect
github.com/knadh/koanf v1.4.4 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/magiconair/properties v1.8.6 // indirect
Expand All @@ -120,7 +121,7 @@ require (
github.com/oklog/ulid v1.3.1 // indirect
github.com/onsi/ginkgo v1.16.4 // indirect
github.com/onsi/gomega v1.13.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.63.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.64.0 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pelletier/go-toml/v2 v2.0.5 // indirect
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
Expand All @@ -138,15 +139,15 @@ require (
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
github.com/xdg-go/stringprep v1.0.3 // indirect
go.mongodb.org/mongo-driver v1.10.0 // indirect
go.opencensus.io v0.23.0 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect
go.opentelemetry.io/otel/sdk v1.11.1 // indirect
go.opentelemetry.io/otel/trace v1.11.1 // indirect
go.uber.org/multierr v1.8.0 // indirect
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect
golang.org/x/text v0.4.0 // indirect
google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e // indirect
google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
28 changes: 18 additions & 10 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,8 @@ github.com/klauspost/compress v1.15.0/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47e
github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU=
github.com/klauspost/compress v1.15.11 h1:Lcadnb3RKGin4FYM/orgq0qde+nc15E5Cbqg4B9Sx9c=
github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM=
github.com/klauspost/compress v1.15.12 h1:YClS/PImqYbn+UILDnqxQCZ3RehC9N318SU3kElDUEM=
github.com/klauspost/compress v1.15.12/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM=
github.com/knadh/koanf v1.4.4 h1:d2jY5nCCeoaiqvEKSBW9rEc93EfNy/XWgWsSB3j7JEA=
github.com/knadh/koanf v1.4.4/go.mod h1:Hgyjp4y8v44hpZtPzs7JZfRAW5AhN7KfZcwv1RYggDs=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
Expand Down Expand Up @@ -541,10 +543,10 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
github.com/onsi/gomega v1.13.0 h1:7lLHu94wT9Ij0o6EWWclhu0aOh32VxhkwEJvzuWPeak=
github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY=
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.63.0 h1:2jXMdfJ36Hs7QuzlhvC9wi9xFCJ9q0a40qjPaFEsDI8=
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.63.0/go.mod h1:Vo92E1v3sPewq/74L573iW9dCJl40na+Heum93YGbPQ=
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.63.0 h1:XzKVij0Zmwei9a3ktwWk11GMX0FX+WGDg3cw9/tytmw=
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.63.0/go.mod h1:w5rHiSvZJ110BJE/xLQxtlCGEELhfJ46dPR7XAHBXHE=
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.64.0 h1:q/eqvFPeeAxZ+By7v7kZCboH0Qd8SlGoZhSJm0+Ep7I=
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.64.0/go.mod h1:ObdNIb1QMMQpLDrqEGf2IP9WjTD0+Y3PNOiDmnoJnlI=
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.64.0 h1:0pwxG18G1vpOUHYqXLZaZGwJ9L1VcFjriZdIESxaeiY=
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.64.0/go.mod h1:jJsonfsWxJ9iHaYe6e2f/TtN+yVmjOl8qDzzOtRfL4E=
github.com/opentracing-contrib/go-grpc v0.0.0-20191001143057-db30781987df h1:vdYtBU6zvL7v+Tr+0xFM/qhahw/EvY8DMMunZHKH6eE=
github.com/opentracing-contrib/go-grpc v0.0.0-20191001143057-db30781987df/go.mod h1:DYR5Eij8rJl8h7gblRrOZ8g0kW1umSpKqYIBTgeDtLo=
github.com/opentracing-contrib/go-stdlib v1.0.0 h1:TBS7YuVotp8myLon4Pv7BtCBzOTo1DeZCld0Z63mW2w=
Expand Down Expand Up @@ -710,12 +712,16 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
go.opentelemetry.io/collector v0.63.0 h1:7GuWusUSd0Wfh3RRc0/g0ubVeRHeqw0QSuY02e1J3kg=
go.opentelemetry.io/collector v0.63.0/go.mod h1:/wnGBrLyrQ804Eh7jZAPh4xJVa9xwbDbGfKQXLil3yM=
go.opentelemetry.io/collector/pdata v0.63.0 h1:YPeMzF4OYFeMW6E+A/eQEv5s32wpc5wEa24H2PP5LeE=
go.opentelemetry.io/collector/pdata v0.63.0/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek=
go.opentelemetry.io/collector/semconv v0.63.0 h1:zvpL8Q6xJLOtg8jBK4jNH4Mbhu25HJ43IBeVZNIHH78=
go.opentelemetry.io/collector/semconv v0.63.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU=
go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
go.opentelemetry.io/collector v0.64.0 h1:ebYzuWsyysz95HQwOw/r+GVRJSt7xn8kYdJTyg0XgfQ=
go.opentelemetry.io/collector v0.64.0/go.mod h1:yZzWgFxIgd17G/mQO9UbFT5gj8dCyY/Oqw1bDEEGR5E=
go.opentelemetry.io/collector/pdata v0.64.0 h1:Mx0ZawbR5F0WyUPCGB1EYsCJYsEj0iJBqX+hm3CFH40=
go.opentelemetry.io/collector/pdata v0.64.0/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek=
go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.0 h1:z4kTdkSCzsbi9iH2jZ0twJrRkmfYqC8PfZ2vAIUclQk=
go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.0/go.mod h1:CoDUStGu6pmcRGwqsjm9/4HHXvDcSToWt5HMQuIvsrM=
go.opentelemetry.io/collector/semconv v0.64.0 h1:6RP8UHRyUDwlAxGmoWFMHbHDfCo4V1+L48hwEFDqd/E=
go.opentelemetry.io/collector/semconv v0.64.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU=
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU=
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c=
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio=
Expand Down Expand Up @@ -1105,6 +1111,8 @@ google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6D
google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e h1:S9GbmC1iCgvbLyAokVCwiO6tVIrU9Y7c5oMx1V/ki/Y=
google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s=
google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
Expand Down

0 comments on commit 12e5375

Please sign in to comment.