Skip to content

Commit 3b2390a

Browse files
[chore] Update core dependencies (#38299)
This PR updates the opentelemetry-collector dependency to the latest release. It also partially reverts #37569 --------- Signed-off-by: opentelemetrybot <[email protected]> Co-authored-by: Pablo Baeyens <[email protected]>
1 parent 5e0f92e commit 3b2390a

File tree

628 files changed

+17839
-17898
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

628 files changed

+17839
-17898
lines changed

cmd/opampsupervisor/go.mod

+9-9
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ require (
1212
github.com/knadh/koanf/v2 v2.1.2
1313
github.com/open-telemetry/opamp-go v0.19.0
1414
github.com/stretchr/testify v1.10.0
15-
go.opentelemetry.io/collector/config/configopaque v1.26.1-0.20250226024140-8099e51f9a77
16-
go.opentelemetry.io/collector/config/configtls v1.26.1-0.20250226024140-8099e51f9a77
17-
go.opentelemetry.io/collector/confmap v1.26.1-0.20250226024140-8099e51f9a77
18-
go.opentelemetry.io/collector/confmap/provider/envprovider v1.26.1-0.20250226024140-8099e51f9a77
19-
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.26.1-0.20250226024140-8099e51f9a77
20-
go.opentelemetry.io/collector/semconv v0.120.1-0.20250226024140-8099e51f9a77
15+
go.opentelemetry.io/collector/config/configopaque v1.26.1-0.20250303102058-a9bca17f1a4c
16+
go.opentelemetry.io/collector/config/configtls v1.26.1-0.20250303102058-a9bca17f1a4c
17+
go.opentelemetry.io/collector/confmap v1.26.1-0.20250303102058-a9bca17f1a4c
18+
go.opentelemetry.io/collector/confmap/provider/envprovider v1.26.1-0.20250303102058-a9bca17f1a4c
19+
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.26.1-0.20250303102058-a9bca17f1a4c
20+
go.opentelemetry.io/collector/semconv v0.120.1-0.20250303102058-a9bca17f1a4c
2121
go.uber.org/goleak v1.3.0
2222
go.uber.org/zap v1.27.0
2323
golang.org/x/sys v0.30.0
@@ -37,8 +37,8 @@ require (
3737
go.uber.org/multierr v1.11.0 // indirect
3838
)
3939

40-
replace go.opentelemetry.io/collector/extension/extensionauth => go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250226024140-8099e51f9a77
40+
replace go.opentelemetry.io/collector/extension/extensionauth => go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c
4141

42-
replace go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest => go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250226024140-8099e51f9a77
42+
replace go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest => go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250303102058-a9bca17f1a4c
4343

44-
replace go.opentelemetry.io/collector/service/hostcapabilities => go.opentelemetry.io/collector/service/hostcapabilities v0.0.0-20250226024140-8099e51f9a77
44+
replace go.opentelemetry.io/collector/service/hostcapabilities => go.opentelemetry.io/collector/service/hostcapabilities v0.0.0-20250303102058-a9bca17f1a4c

cmd/opampsupervisor/go.sum

+12-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/otelcontribcol/builder-config.yaml

+16-19
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dist:
1414
output_path: ./cmd/otelcontribcol
1515

1616
extensions:
17-
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.120.1-0.20250224010654-18e18b21da7a
17+
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.120.1-0.20250303102058-a9bca17f1a4c
1818
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension v0.120.1
1919
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/asapauthextension v0.120.1
2020
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy v0.120.1
@@ -52,10 +52,10 @@ extensions:
5252
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/skywalkingencodingextension v0.120.1
5353

5454
exporters:
55-
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.120.1-0.20250224010654-18e18b21da7a
56-
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.120.1-0.20250224010654-18e18b21da7a
57-
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.120.1-0.20250224010654-18e18b21da7a
58-
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.120.1-0.20250224010654-18e18b21da7a
55+
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.120.1-0.20250303102058-a9bca17f1a4c
56+
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.120.1-0.20250303102058-a9bca17f1a4c
57+
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.120.1-0.20250303102058-a9bca17f1a4c
58+
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.120.1-0.20250303102058-a9bca17f1a4c
5959
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alertmanagerexporter v0.120.1
6060
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.120.1
6161
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.120.1
@@ -105,8 +105,8 @@ exporters:
105105
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.120.1
106106

107107
processors:
108-
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.120.1-0.20250224010654-18e18b21da7a
109-
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.120.1-0.20250224010654-18e18b21da7a
108+
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.120.1-0.20250303102058-a9bca17f1a4c
109+
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.120.1-0.20250303102058-a9bca17f1a4c
110110
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.120.1
111111
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.120.1
112112
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor v0.120.1
@@ -132,8 +132,8 @@ processors:
132132
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/remotetapprocessor v0.120.1
133133

134134
receivers:
135-
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.120.1-0.20250224010654-18e18b21da7a
136-
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.120.1-0.20250224010654-18e18b21da7a
135+
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.120.1-0.20250303102058-a9bca17f1a4c
136+
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.120.1-0.20250303102058-a9bca17f1a4c
137137
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver v0.120.1
138138
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver v0.120.1
139139
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.120.1
@@ -232,7 +232,7 @@ receivers:
232232
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.120.1
233233

234234
connectors:
235-
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.120.1-0.20250224010654-18e18b21da7a
235+
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.120.1-0.20250303102058-a9bca17f1a4c
236236
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.120.1
237237
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.120.1
238238
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.120.1
@@ -247,19 +247,16 @@ connectors:
247247
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/signaltometricsconnector v0.120.1
248248

249249
providers:
250-
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.26.1-0.20250224010654-18e18b21da7a
251-
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.26.1-0.20250224010654-18e18b21da7a
252-
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v1.26.1-0.20250224010654-18e18b21da7a
253-
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.26.1-0.20250224010654-18e18b21da7a
254-
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.26.1-0.20250224010654-18e18b21da7a
250+
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.26.1-0.20250303102058-a9bca17f1a4c
251+
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.26.1-0.20250303102058-a9bca17f1a4c
252+
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v1.26.1-0.20250303102058-a9bca17f1a4c
253+
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.26.1-0.20250303102058-a9bca17f1a4c
254+
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.26.1-0.20250303102058-a9bca17f1a4c
255255
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/aesprovider v0.120.1
256256
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.120.1
257257
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider v0.120.1
258258

259259
# When using `make genotelcontribcol`, a `replaces` section is appended to this
260260
# file before passing it to OCB, to ensure that local versions are used for all
261261
# Contrib modules.
262-
replaces:
263-
- go.opentelemetry.io/collector/extension/extensionauth => go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250226024140-8099e51f9a77
264-
- go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest => go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250226024140-8099e51f9a77
265-
- go.opentelemetry.io/collector/service/hostcapabilities => go.opentelemetry.io/collector/service/hostcapabilities v0.0.0-20250226024140-8099e51f9a77
262+

cmd/oteltestbedcol/builder-config.yaml

+12-16
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ dist:
1111
output_path: ./cmd/oteltestbedcol
1212

1313
extensions:
14-
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.120.1-0.20250224010654-18e18b21da7a
14+
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.120.1-0.20250303102058-a9bca17f1a4c
1515
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.120.1
1616
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.120.1
1717

1818
exporters:
19-
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.120.1-0.20250224010654-18e18b21da7a
20-
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.120.1-0.20250224010654-18e18b21da7a
21-
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.120.1-0.20250224010654-18e18b21da7a
19+
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.120.1-0.20250303102058-a9bca17f1a4c
20+
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.120.1-0.20250303102058-a9bca17f1a4c
21+
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.120.1-0.20250303102058-a9bca17f1a4c
2222
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.120.1
2323
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.120.1
2424
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opensearchexporter v0.120.1
@@ -30,15 +30,15 @@ exporters:
3030
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.120.1
3131

3232
processors:
33-
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.120.1-0.20250224010654-18e18b21da7a
34-
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.120.1-0.20250224010654-18e18b21da7a
33+
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.120.1-0.20250303102058-a9bca17f1a4c
34+
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.120.1-0.20250303102058-a9bca17f1a4c
3535
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.120.1
3636
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.120.1
3737
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.120.1
3838
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.120.1
3939

4040
receivers:
41-
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.120.1-0.20250224010654-18e18b21da7a
41+
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.120.1-0.20250303102058-a9bca17f1a4c
4242
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.120.1
4343
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.120.1
4444
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.120.1
@@ -54,17 +54,13 @@ receivers:
5454
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.120.1
5555

5656
providers:
57-
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.26.1-0.20250224010654-18e18b21da7a
58-
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.26.1-0.20250224010654-18e18b21da7a
59-
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v1.26.1-0.20250224010654-18e18b21da7a
60-
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.26.1-0.20250224010654-18e18b21da7a
61-
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.26.1-0.20250224010654-18e18b21da7a
57+
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.26.1-0.20250303102058-a9bca17f1a4c
58+
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.26.1-0.20250303102058-a9bca17f1a4c
59+
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v1.26.1-0.20250303102058-a9bca17f1a4c
60+
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.26.1-0.20250303102058-a9bca17f1a4c
61+
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.26.1-0.20250303102058-a9bca17f1a4c
6262

6363
# When using `make genoteltestbedcol`, a `replaces` section is appended to this
6464
# file before passing it to OCB, to ensure that local versions are used for all
6565
# Contrib modules.
66-
replaces:
67-
- go.opentelemetry.io/collector/extension/extensionauth => go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250226024140-8099e51f9a77
68-
- go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest => go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250226024140-8099e51f9a77
69-
- go.opentelemetry.io/collector/service/hostcapabilities => go.opentelemetry.io/collector/service/hostcapabilities v0.0.0-20250226024140-8099e51f9a77
7066

cmd/telemetrygen/go.mod

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ require (
66
github.com/spf13/cobra v1.9.1
77
github.com/spf13/pflag v1.0.6
88
github.com/stretchr/testify v1.10.0
9-
go.opentelemetry.io/collector/pdata v1.26.1-0.20250226024140-8099e51f9a77
10-
go.opentelemetry.io/collector/semconv v0.120.1-0.20250226024140-8099e51f9a77
9+
go.opentelemetry.io/collector/pdata v1.26.1-0.20250303102058-a9bca17f1a4c
10+
go.opentelemetry.io/collector/semconv v0.120.1-0.20250303102058-a9bca17f1a4c
1111
go.opentelemetry.io/otel v1.34.0
1212
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.10.0
1313
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.10.0
@@ -62,8 +62,8 @@ retract (
6262
// IMPORTANT NOTE: Do not add replace statements to this go.mod. This will break go install.
6363
// See https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/27855.
6464

65-
replace go.opentelemetry.io/collector/extension/extensionauth => go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250226024140-8099e51f9a77
65+
replace go.opentelemetry.io/collector/extension/extensionauth => go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c
6666

67-
replace go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest => go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250226024140-8099e51f9a77
67+
replace go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest => go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250303102058-a9bca17f1a4c
6868

69-
replace go.opentelemetry.io/collector/service/hostcapabilities => go.opentelemetry.io/collector/service/hostcapabilities v0.0.0-20250226024140-8099e51f9a77
69+
replace go.opentelemetry.io/collector/service/hostcapabilities => go.opentelemetry.io/collector/service/hostcapabilities v0.0.0-20250303102058-a9bca17f1a4c

0 commit comments

Comments
 (0)