Skip to content

Commit 572f7a1

Browse files
Merge branch 'jaegertracing:main' into elasticsearch-opensearch-authenticator
2 parents b1f5e90 + a54003c commit 572f7a1

File tree

12 files changed

+447
-328
lines changed

12 files changed

+447
-328
lines changed

go.mod

Lines changed: 78 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -48,51 +48,51 @@ require (
4848
github.com/stretchr/testify v1.11.1
4949
github.com/uber/jaeger-client-go v2.30.0+incompatible
5050
github.com/xdg-go/scram v1.1.2
51-
go.opentelemetry.io/collector/client v1.43.0
52-
go.opentelemetry.io/collector/component v1.43.0
53-
go.opentelemetry.io/collector/component/componentstatus v0.137.0
54-
go.opentelemetry.io/collector/component/componenttest v0.137.0
55-
go.opentelemetry.io/collector/config/configauth v1.43.0
56-
go.opentelemetry.io/collector/config/configgrpc v0.137.0
57-
go.opentelemetry.io/collector/config/confighttp v0.137.0
58-
go.opentelemetry.io/collector/config/confighttp/xconfighttp v0.137.0
59-
go.opentelemetry.io/collector/config/confignet v1.43.0
60-
go.opentelemetry.io/collector/config/configopaque v1.43.0
61-
go.opentelemetry.io/collector/config/configoptional v1.43.0
62-
go.opentelemetry.io/collector/config/configretry v1.43.0
63-
go.opentelemetry.io/collector/config/configtls v1.43.0
64-
go.opentelemetry.io/collector/confmap v1.43.0
65-
go.opentelemetry.io/collector/confmap/provider/envprovider v1.43.0
66-
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.43.0
67-
go.opentelemetry.io/collector/confmap/provider/httpprovider v1.43.0
68-
go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.43.0
69-
go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.43.0
70-
go.opentelemetry.io/collector/confmap/xconfmap v0.137.0
71-
go.opentelemetry.io/collector/connector v0.137.0
72-
go.opentelemetry.io/collector/connector/forwardconnector v0.137.0
73-
go.opentelemetry.io/collector/consumer v1.43.0
74-
go.opentelemetry.io/collector/consumer/consumertest v0.137.0
75-
go.opentelemetry.io/collector/exporter v1.43.0
76-
go.opentelemetry.io/collector/exporter/debugexporter v0.137.0
77-
go.opentelemetry.io/collector/exporter/exporterhelper v0.137.0
78-
go.opentelemetry.io/collector/exporter/exportertest v0.137.0
79-
go.opentelemetry.io/collector/exporter/nopexporter v0.137.0
80-
go.opentelemetry.io/collector/exporter/otlpexporter v0.137.0
81-
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.137.0
82-
go.opentelemetry.io/collector/extension v1.43.0
83-
go.opentelemetry.io/collector/extension/zpagesextension v0.137.0
84-
go.opentelemetry.io/collector/featuregate v1.43.0
85-
go.opentelemetry.io/collector/otelcol v0.137.0
86-
go.opentelemetry.io/collector/pdata v1.43.0
87-
go.opentelemetry.io/collector/pipeline v1.43.0
88-
go.opentelemetry.io/collector/processor v1.43.0
89-
go.opentelemetry.io/collector/processor/batchprocessor v0.137.0
90-
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.137.0
91-
go.opentelemetry.io/collector/processor/processorhelper v0.137.0
92-
go.opentelemetry.io/collector/processor/processortest v0.137.0
93-
go.opentelemetry.io/collector/receiver v1.43.0
94-
go.opentelemetry.io/collector/receiver/nopreceiver v0.137.0
95-
go.opentelemetry.io/collector/receiver/otlpreceiver v0.137.0
51+
go.opentelemetry.io/collector/client v1.44.0
52+
go.opentelemetry.io/collector/component v1.44.0
53+
go.opentelemetry.io/collector/component/componentstatus v0.138.0
54+
go.opentelemetry.io/collector/component/componenttest v0.138.0
55+
go.opentelemetry.io/collector/config/configauth v1.44.0
56+
go.opentelemetry.io/collector/config/configgrpc v0.138.0
57+
go.opentelemetry.io/collector/config/confighttp v0.138.0
58+
go.opentelemetry.io/collector/config/confighttp/xconfighttp v0.138.0
59+
go.opentelemetry.io/collector/config/confignet v1.44.0
60+
go.opentelemetry.io/collector/config/configopaque v1.44.0
61+
go.opentelemetry.io/collector/config/configoptional v1.44.0
62+
go.opentelemetry.io/collector/config/configretry v1.44.0
63+
go.opentelemetry.io/collector/config/configtls v1.44.0
64+
go.opentelemetry.io/collector/confmap v1.44.0
65+
go.opentelemetry.io/collector/confmap/provider/envprovider v1.44.0
66+
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.44.0
67+
go.opentelemetry.io/collector/confmap/provider/httpprovider v1.44.0
68+
go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.44.0
69+
go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.44.0
70+
go.opentelemetry.io/collector/confmap/xconfmap v0.138.0
71+
go.opentelemetry.io/collector/connector v0.138.0
72+
go.opentelemetry.io/collector/connector/forwardconnector v0.138.0
73+
go.opentelemetry.io/collector/consumer v1.44.0
74+
go.opentelemetry.io/collector/consumer/consumertest v0.138.0
75+
go.opentelemetry.io/collector/exporter v1.44.0
76+
go.opentelemetry.io/collector/exporter/debugexporter v0.138.0
77+
go.opentelemetry.io/collector/exporter/exporterhelper v0.138.0
78+
go.opentelemetry.io/collector/exporter/exportertest v0.138.0
79+
go.opentelemetry.io/collector/exporter/nopexporter v0.138.0
80+
go.opentelemetry.io/collector/exporter/otlpexporter v0.138.0
81+
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.138.0
82+
go.opentelemetry.io/collector/extension v1.44.0
83+
go.opentelemetry.io/collector/extension/zpagesextension v0.138.0
84+
go.opentelemetry.io/collector/featuregate v1.44.0
85+
go.opentelemetry.io/collector/otelcol v0.138.0
86+
go.opentelemetry.io/collector/pdata v1.44.0
87+
go.opentelemetry.io/collector/pipeline v1.44.0
88+
go.opentelemetry.io/collector/processor v1.44.0
89+
go.opentelemetry.io/collector/processor/batchprocessor v0.138.0
90+
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.138.0
91+
go.opentelemetry.io/collector/processor/processorhelper v0.138.0
92+
go.opentelemetry.io/collector/processor/processortest v0.138.0
93+
go.opentelemetry.io/collector/receiver v1.44.0
94+
go.opentelemetry.io/collector/receiver/nopreceiver v0.138.0
95+
go.opentelemetry.io/collector/receiver/otlpreceiver v0.138.0
9696
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0
9797
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0
9898
go.opentelemetry.io/contrib/samplers/jaegerremote v0.32.0
@@ -184,7 +184,7 @@ require (
184184
github.com/eapache/go-resiliency v1.7.0 // indirect
185185
github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect
186186
github.com/eapache/queue v1.1.0 // indirect
187-
github.com/ebitengine/purego v0.8.4 // indirect
187+
github.com/ebitengine/purego v0.9.0 // indirect
188188
github.com/elastic/elastic-transport-go/v8 v8.7.0 // indirect
189189
github.com/elastic/go-grok v0.3.1 // indirect
190190
github.com/elastic/lunes v0.1.0 // indirect
@@ -272,7 +272,7 @@ require (
272272
github.com/russross/blackfriday/v2 v2.1.0 // indirect
273273
github.com/sagikazarmark/locafero v0.11.0 // indirect
274274
github.com/segmentio/asm v1.2.1 // indirect
275-
github.com/shirou/gopsutil/v4 v4.25.8 // indirect
275+
github.com/shirou/gopsutil/v4 v4.25.9 // indirect
276276
github.com/shopspring/decimal v1.4.0 // indirect
277277
github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect
278278
github.com/spf13/afero v1.15.0 // indirect
@@ -292,37 +292,37 @@ require (
292292
github.com/xdg-go/stringprep v1.0.4 // indirect
293293
github.com/yusufpapurcu/wmi v1.2.4 // indirect
294294
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
295-
go.opentelemetry.io/collector v0.137.0 // indirect
296-
go.opentelemetry.io/collector/config/configcompression v1.43.0 // indirect
297-
go.opentelemetry.io/collector/config/configmiddleware v1.43.0
298-
go.opentelemetry.io/collector/config/configtelemetry v0.137.0 // indirect
299-
go.opentelemetry.io/collector/connector/connectortest v0.137.0 // indirect
300-
go.opentelemetry.io/collector/connector/xconnector v0.137.0 // indirect
301-
go.opentelemetry.io/collector/consumer/consumererror v0.137.0 // indirect
302-
go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.137.0 // indirect
303-
go.opentelemetry.io/collector/consumer/xconsumer v0.137.0 // indirect
304-
go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.137.0 // indirect
305-
go.opentelemetry.io/collector/exporter/xexporter v0.137.0 // indirect
306-
go.opentelemetry.io/collector/extension/extensionauth v1.43.0
307-
go.opentelemetry.io/collector/extension/extensioncapabilities v0.137.0
308-
go.opentelemetry.io/collector/extension/extensionmiddleware v0.137.0 // indirect
309-
go.opentelemetry.io/collector/extension/extensiontest v0.137.0 // indirect
310-
go.opentelemetry.io/collector/extension/xextension v0.137.0 // indirect
311-
go.opentelemetry.io/collector/internal/fanoutconsumer v0.137.0 // indirect
312-
go.opentelemetry.io/collector/internal/memorylimiter v0.137.0 // indirect
313-
go.opentelemetry.io/collector/internal/sharedcomponent v0.137.0 // indirect
314-
go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect
315-
go.opentelemetry.io/collector/pdata/pprofile v0.137.0 // indirect
316-
go.opentelemetry.io/collector/pdata/testdata v0.137.0 // indirect
317-
go.opentelemetry.io/collector/pdata/xpdata v0.137.0 // indirect
318-
go.opentelemetry.io/collector/pipeline/xpipeline v0.137.0 // indirect
319-
go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.137.0 // indirect
320-
go.opentelemetry.io/collector/processor/xprocessor v0.137.0 // indirect
321-
go.opentelemetry.io/collector/receiver/receiverhelper v0.137.0 // indirect
322-
go.opentelemetry.io/collector/receiver/receivertest v0.137.0 // indirect
323-
go.opentelemetry.io/collector/receiver/xreceiver v0.137.0 // indirect
324-
go.opentelemetry.io/collector/service v0.137.0 // indirect
325-
go.opentelemetry.io/collector/service/hostcapabilities v0.137.0 // indirect
295+
go.opentelemetry.io/collector v0.138.0 // indirect
296+
go.opentelemetry.io/collector/config/configcompression v1.44.0 // indirect
297+
go.opentelemetry.io/collector/config/configmiddleware v1.44.0
298+
go.opentelemetry.io/collector/config/configtelemetry v0.138.0 // indirect
299+
go.opentelemetry.io/collector/connector/connectortest v0.138.0 // indirect
300+
go.opentelemetry.io/collector/connector/xconnector v0.138.0 // indirect
301+
go.opentelemetry.io/collector/consumer/consumererror v0.138.0 // indirect
302+
go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.138.0 // indirect
303+
go.opentelemetry.io/collector/consumer/xconsumer v0.138.0 // indirect
304+
go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.138.0 // indirect
305+
go.opentelemetry.io/collector/exporter/xexporter v0.138.0 // indirect
306+
go.opentelemetry.io/collector/extension/extensionauth v1.44.0
307+
go.opentelemetry.io/collector/extension/extensioncapabilities v0.138.0
308+
go.opentelemetry.io/collector/extension/extensionmiddleware v0.138.0 // indirect
309+
go.opentelemetry.io/collector/extension/extensiontest v0.138.0 // indirect
310+
go.opentelemetry.io/collector/extension/xextension v0.138.0 // indirect
311+
go.opentelemetry.io/collector/internal/fanoutconsumer v0.138.0 // indirect
312+
go.opentelemetry.io/collector/internal/memorylimiter v0.138.0 // indirect
313+
go.opentelemetry.io/collector/internal/sharedcomponent v0.138.0 // indirect
314+
go.opentelemetry.io/collector/internal/telemetry v0.138.0 // indirect
315+
go.opentelemetry.io/collector/pdata/pprofile v0.138.0 // indirect
316+
go.opentelemetry.io/collector/pdata/testdata v0.138.0 // indirect
317+
go.opentelemetry.io/collector/pdata/xpdata v0.138.0 // indirect
318+
go.opentelemetry.io/collector/pipeline/xpipeline v0.138.0 // indirect
319+
go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.138.0 // indirect
320+
go.opentelemetry.io/collector/processor/xprocessor v0.138.0 // indirect
321+
go.opentelemetry.io/collector/receiver/receiverhelper v0.138.0 // indirect
322+
go.opentelemetry.io/collector/receiver/receivertest v0.138.0 // indirect
323+
go.opentelemetry.io/collector/receiver/xreceiver v0.138.0 // indirect
324+
go.opentelemetry.io/collector/service v0.138.0 // indirect
325+
go.opentelemetry.io/collector/service/hostcapabilities v0.138.0 // indirect
326326
go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect
327327
go.opentelemetry.io/contrib/otelconf v0.18.0 // indirect
328328
go.opentelemetry.io/contrib/propagators/b3 v1.38.0 // indirect

0 commit comments

Comments
 (0)