Skip to content

Commit 47d1e8d

Browse files
mahadzaryab1mahadzaryab1
authored
[fix] Upgrade to otel-collector v0.111.0 and fix breaking changes (jaegertracing#6053)
## Which problem is this PR solving? - Resolves jaegertracing#6046 ## Description of the changes - The following breaking changes from otel-collector v0.111.0 were addressed in this PR - `exporterhelper.TimeoutSettings` was deprecated in favour of `exporterhelper.TimeoutConfig` - `ClientConfig.ToClientConnWithOptions` was deprecated in favour of `ClientConfig.ToClientConn` - `CreateTracesReceiver` was deprecated in favour of `CreateTraces` - `ServerConfig.ToServerWithOptions` was deprecated in favour `ServerConfig.ToServer` ## How was this change tested? - CI ## Checklist - [x] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [x] I have signed all commits - [x] I have added unit tests for the new functionality - [x] I have run lint and test steps successfully - for `jaeger`: `make lint test` - for `jaeger-ui`: `yarn lint` and `yarn test` --------- Signed-off-by: Mahad Zaryab <[email protected]>
1 parent fa31b89 commit 47d1e8d

File tree

13 files changed

+169
-170
lines changed

13 files changed

+169
-170
lines changed

‎cmd/collector/app/handler/otlp_receiver.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func StartOTLPReceiver(options *flags.CollectorOptions, logger *zap.Logger, span
4444
tm,
4545
otlpFactory,
4646
consumer.NewTraces,
47-
otlpFactory.CreateTracesReceiver,
47+
otlpFactory.CreateTraces,
4848
)
4949
}
5050

‎cmd/collector/app/handler/otlp_receiver_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ func TestStartOtlpReceiver_Error(t *testing.T) {
100100
return nil, errors.New("mock error")
101101
}
102102
f := otlpreceiver.NewFactory()
103-
_, err = startOTLPReceiver(opts, logger, spanProcessor, &tenancy.Manager{}, f, newTraces, f.CreateTracesReceiver)
103+
_, err = startOTLPReceiver(opts, logger, spanProcessor, &tenancy.Manager{}, f, newTraces, f.CreateTraces)
104104
require.Error(t, err)
105105
assert.Contains(t, err.Error(), "could not create the OTLP consumer")
106106

‎cmd/collector/app/handler/zipkin_receiver.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func StartZipkinReceiver(
3737
tm,
3838
zipkinFactory,
3939
consumer.NewTraces,
40-
zipkinFactory.CreateTracesReceiver,
40+
zipkinFactory.CreateTraces,
4141
)
4242
}
4343

‎cmd/collector/app/handler/zipkin_receiver_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ func TestStartZipkinReceiver_Error(t *testing.T) {
148148
return nil, errors.New("mock error")
149149
}
150150
f := zipkinreceiver.NewFactory()
151-
_, err = startZipkinReceiver(opts, logger, spanProcessor, tm, f, newTraces, f.CreateTracesReceiver)
151+
_, err = startZipkinReceiver(opts, logger, spanProcessor, tm, f, newTraces, f.CreateTraces)
152152
require.Error(t, err)
153153
assert.Contains(t, err.Error(), "could not create Zipkin consumer")
154154

‎cmd/jaeger/internal/extension/remotesampling/extension.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ func (ext *rsExtension) startHTTPServer(ctx context.Context, host component.Host
267267

268268
func (ext *rsExtension) startGRPCServer(ctx context.Context, host component.Host) error {
269269
var err error
270-
if ext.grpcServer, err = ext.cfg.GRPC.ToServerWithOptions(ctx, host, ext.telemetry); err != nil {
270+
if ext.grpcServer, err = ext.cfg.GRPC.ToServer(ctx, host, ext.telemetry); err != nil {
271271
return err
272272
}
273273

‎cmd/jaeger/internal/processors/adaptivesampling/factory.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func createTracesProcessor(
3636
) (processor.Traces, error) {
3737
oCfg := cfg.(*Config)
3838
sp := newTraceProcessor(*oCfg, set.TelemetrySettings)
39-
return processorhelper.NewTracesProcessor(
39+
return processorhelper.NewTraces(
4040
ctx,
4141
set,
4242
cfg,

‎go.mod

+52-51
Original file line numberDiff line numberDiff line change
@@ -43,37 +43,37 @@ require (
4343
github.com/stretchr/testify v1.9.0
4444
github.com/uber/jaeger-client-go v2.30.0+incompatible
4545
github.com/xdg-go/scram v1.1.2
46-
go.opentelemetry.io/collector/component v0.110.0
47-
go.opentelemetry.io/collector/component/componentstatus v0.110.0
48-
go.opentelemetry.io/collector/config/configauth v0.110.0
49-
go.opentelemetry.io/collector/config/configgrpc v0.110.0
50-
go.opentelemetry.io/collector/config/confighttp v0.110.0
51-
go.opentelemetry.io/collector/config/configretry v1.16.0
52-
go.opentelemetry.io/collector/config/configtls v1.16.0
46+
go.opentelemetry.io/collector/component v0.111.0
47+
go.opentelemetry.io/collector/component/componentstatus v0.111.0
48+
go.opentelemetry.io/collector/config/configauth v0.111.0
49+
go.opentelemetry.io/collector/config/configgrpc v0.111.0
50+
go.opentelemetry.io/collector/config/confighttp v0.111.0
51+
go.opentelemetry.io/collector/config/configretry v1.17.0
52+
go.opentelemetry.io/collector/config/configtls v1.17.0
5353
go.opentelemetry.io/collector/confmap v1.17.0
5454
go.opentelemetry.io/collector/confmap/provider/envprovider v1.16.0
5555
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.16.0
5656
go.opentelemetry.io/collector/confmap/provider/httpprovider v1.17.0
5757
go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.17.0
5858
go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.17.0
59-
go.opentelemetry.io/collector/connector v0.110.0
60-
go.opentelemetry.io/collector/connector/forwardconnector v0.110.0
61-
go.opentelemetry.io/collector/consumer v0.110.0
62-
go.opentelemetry.io/collector/consumer/consumertest v0.110.0
63-
go.opentelemetry.io/collector/exporter v0.110.0
64-
go.opentelemetry.io/collector/exporter/otlpexporter v0.110.0
65-
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.110.0
66-
go.opentelemetry.io/collector/extension v0.110.0
59+
go.opentelemetry.io/collector/connector v0.111.0
60+
go.opentelemetry.io/collector/connector/forwardconnector v0.111.0
61+
go.opentelemetry.io/collector/consumer v0.111.0
62+
go.opentelemetry.io/collector/consumer/consumertest v0.111.0
63+
go.opentelemetry.io/collector/exporter v0.111.0
64+
go.opentelemetry.io/collector/exporter/otlpexporter v0.111.0
65+
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.111.0
66+
go.opentelemetry.io/collector/extension v0.111.0
6767
go.opentelemetry.io/collector/extension/ballastextension v0.108.1
68-
go.opentelemetry.io/collector/extension/zpagesextension v0.110.0
69-
go.opentelemetry.io/collector/otelcol v0.110.0
70-
go.opentelemetry.io/collector/pdata v1.16.0
71-
go.opentelemetry.io/collector/pipeline v0.110.0
72-
go.opentelemetry.io/collector/processor v0.110.0
73-
go.opentelemetry.io/collector/processor/batchprocessor v0.110.0
74-
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.110.0
75-
go.opentelemetry.io/collector/receiver v0.110.0
76-
go.opentelemetry.io/collector/receiver/otlpreceiver v0.110.0
68+
go.opentelemetry.io/collector/extension/zpagesextension v0.111.0
69+
go.opentelemetry.io/collector/otelcol v0.111.0
70+
go.opentelemetry.io/collector/pdata v1.17.0
71+
go.opentelemetry.io/collector/pipeline v0.111.0
72+
go.opentelemetry.io/collector/processor v0.111.0
73+
go.opentelemetry.io/collector/processor/batchprocessor v0.111.0
74+
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.111.0
75+
go.opentelemetry.io/collector/receiver v0.111.0
76+
go.opentelemetry.io/collector/receiver/otlpreceiver v0.111.0
7777
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.55.0
7878
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0
7979
go.opentelemetry.io/contrib/samplers/jaegerremote v0.24.0
@@ -97,6 +97,8 @@ require (
9797
gopkg.in/yaml.v3 v3.0.1
9898
)
9999

100+
require github.com/ebitengine/purego v0.8.0 // indirect
101+
100102
require (
101103
github.com/IBM/sarama v1.43.3 // indirect
102104
github.com/alecthomas/participle/v2 v2.1.1 // indirect
@@ -146,7 +148,7 @@ require (
146148
github.com/jonboulle/clockwork v0.4.0 // indirect
147149
github.com/josharian/intern v1.0.0 // indirect
148150
github.com/json-iterator/go v1.1.12 // indirect
149-
github.com/klauspost/compress v1.17.9 // indirect
151+
github.com/klauspost/compress v1.17.10 // indirect
150152
github.com/knadh/koanf/maps v0.1.1 // indirect
151153
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
152154
github.com/knadh/koanf/v2 v2.1.1 // indirect
@@ -193,8 +195,7 @@ require (
193195
github.com/russross/blackfriday/v2 v2.1.0 // indirect
194196
github.com/sagikazarmark/locafero v0.4.0 // indirect
195197
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
196-
github.com/shirou/gopsutil/v4 v4.24.8 // indirect
197-
github.com/shoenig/go-m1cpu v0.1.6 // indirect
198+
github.com/shirou/gopsutil/v4 v4.24.9 // indirect
198199
github.com/sourcegraph/conc v0.3.0 // indirect
199200
github.com/spf13/afero v1.11.0 // indirect
200201
github.com/spf13/cast v1.6.0 // indirect
@@ -208,30 +209,30 @@ require (
208209
github.com/xdg-go/stringprep v1.0.4 // indirect
209210
github.com/yusufpapurcu/wmi v1.2.4 // indirect
210211
go.opencensus.io v0.24.0 // indirect
211-
go.opentelemetry.io/collector v0.110.0 // indirect
212-
go.opentelemetry.io/collector/client v1.16.0 // indirect
213-
go.opentelemetry.io/collector/component/componentprofiles v0.110.0 // indirect
214-
go.opentelemetry.io/collector/config/configcompression v1.16.0 // indirect
215-
go.opentelemetry.io/collector/config/confignet v1.16.0
216-
go.opentelemetry.io/collector/config/configopaque v1.16.0
217-
go.opentelemetry.io/collector/config/configtelemetry v0.110.0
218-
go.opentelemetry.io/collector/config/internal v0.110.0 // indirect
219-
go.opentelemetry.io/collector/connector/connectorprofiles v0.110.0 // indirect
220-
go.opentelemetry.io/collector/consumer/consumerprofiles v0.110.0 // indirect
221-
go.opentelemetry.io/collector/exporter/debugexporter v0.110.0
222-
go.opentelemetry.io/collector/exporter/exporterprofiles v0.110.0 // indirect
223-
go.opentelemetry.io/collector/extension/auth v0.110.0 // indirect
224-
go.opentelemetry.io/collector/extension/experimental/storage v0.110.0 // indirect
225-
go.opentelemetry.io/collector/extension/extensioncapabilities v0.110.0
226-
go.opentelemetry.io/collector/featuregate v1.16.0 // indirect
227-
go.opentelemetry.io/collector/internal/globalgates v0.110.0 // indirect
228-
go.opentelemetry.io/collector/internal/globalsignal v0.110.0 // indirect
229-
go.opentelemetry.io/collector/pdata/pprofile v0.110.0 // indirect
230-
go.opentelemetry.io/collector/pdata/testdata v0.110.0 // indirect
231-
go.opentelemetry.io/collector/processor/processorprofiles v0.110.0 // indirect
232-
go.opentelemetry.io/collector/receiver/receiverprofiles v0.110.0 // indirect
233-
go.opentelemetry.io/collector/semconv v0.110.0 // indirect
234-
go.opentelemetry.io/collector/service v0.110.0 // indirect
212+
go.opentelemetry.io/collector v0.111.0 // indirect
213+
go.opentelemetry.io/collector/client v1.17.0 // indirect
214+
go.opentelemetry.io/collector/component/componentprofiles v0.111.0 // indirect
215+
go.opentelemetry.io/collector/config/configcompression v1.17.0 // indirect
216+
go.opentelemetry.io/collector/config/confignet v1.17.0
217+
go.opentelemetry.io/collector/config/configopaque v1.17.0
218+
go.opentelemetry.io/collector/config/configtelemetry v0.111.0
219+
go.opentelemetry.io/collector/config/internal v0.111.0 // indirect
220+
go.opentelemetry.io/collector/connector/connectorprofiles v0.111.0 // indirect
221+
go.opentelemetry.io/collector/consumer/consumerprofiles v0.111.0 // indirect
222+
go.opentelemetry.io/collector/exporter/debugexporter v0.111.0
223+
go.opentelemetry.io/collector/exporter/exporterprofiles v0.111.0 // indirect
224+
go.opentelemetry.io/collector/extension/auth v0.111.0 // indirect
225+
go.opentelemetry.io/collector/extension/experimental/storage v0.111.0 // indirect
226+
go.opentelemetry.io/collector/extension/extensioncapabilities v0.111.0
227+
go.opentelemetry.io/collector/featuregate v1.17.0 // indirect
228+
go.opentelemetry.io/collector/internal/globalgates v0.111.0 // indirect
229+
go.opentelemetry.io/collector/internal/globalsignal v0.111.0 // indirect
230+
go.opentelemetry.io/collector/pdata/pprofile v0.111.0 // indirect
231+
go.opentelemetry.io/collector/pdata/testdata v0.111.0 // indirect
232+
go.opentelemetry.io/collector/processor/processorprofiles v0.111.0 // indirect
233+
go.opentelemetry.io/collector/receiver/receiverprofiles v0.111.0 // indirect
234+
go.opentelemetry.io/collector/semconv v0.111.0 // indirect
235+
go.opentelemetry.io/collector/service v0.111.0 // indirect
235236
go.opentelemetry.io/contrib/config v0.10.0 // indirect
236237
go.opentelemetry.io/contrib/propagators/b3 v1.30.0 // indirect
237238
go.opentelemetry.io/contrib/zpages v0.55.0 // indirect

0 commit comments

Comments
 (0)