Skip to content

Commit b4ee7be

Browse files
dmitryaxdmitryax
authored
[chore] Update otelcol core dependency (#38214)
To fix contrib tests in core Had to add replaces to the new modules to use latest main commit: ``` make for-all CMD="go mod edit -replace go.opentelemetry.io/collector/extension/extensionauth=go.opentelemetry.io/collector/extension/[email protected]" make for-all CMD="go mod edit -replace go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest=go.opentelemetry.io/collector/extension/extensionauth/[email protected]" make for-all CMD="go mod edit -replace go.opentelemetry.io/collector/service/hostcapabilities=go.opentelemetry.io/collector/service/[email protected]" ``` Can be removed once they are released
1 parent 6c94334 commit b4ee7be

File tree

615 files changed

+19527
-17350
lines changed

Some content is hidden

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

615 files changed

+19527
-17350
lines changed

‎cmd/opampsupervisor/go.mod

Lines changed: 12 additions & 6 deletions
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.18.0
1414
github.com/stretchr/testify v1.10.0
15-
go.opentelemetry.io/collector/config/configopaque v1.26.1-0.20250224010654-18e18b21da7a
16-
go.opentelemetry.io/collector/config/configtls v1.26.1-0.20250224010654-18e18b21da7a
17-
go.opentelemetry.io/collector/confmap v1.26.1-0.20250224010654-18e18b21da7a
18-
go.opentelemetry.io/collector/confmap/provider/envprovider v1.26.1-0.20250224010654-18e18b21da7a
19-
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.26.1-0.20250224010654-18e18b21da7a
20-
go.opentelemetry.io/collector/semconv v0.120.1-0.20250224010654-18e18b21da7a
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
2121
go.uber.org/goleak v1.3.0
2222
go.uber.org/zap v1.27.0
2323
golang.org/x/sys v0.30.0
@@ -36,3 +36,9 @@ require (
3636
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
3737
go.uber.org/multierr v1.11.0 // indirect
3838
)
39+
40+
replace go.opentelemetry.io/collector/extension/extensionauth => go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250226024140-8099e51f9a77
41+
42+
replace go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest => go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250226024140-8099e51f9a77
43+
44+
replace go.opentelemetry.io/collector/service/hostcapabilities => go.opentelemetry.io/collector/service/hostcapabilities v0.0.0-20250226024140-8099e51f9a77

‎cmd/opampsupervisor/go.sum

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/otelcontribcol/builder-config.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,3 +257,7 @@ providers:
257257
# When using `make genotelcontribcol`, a `replaces` section is appended to this
258258
# file before passing it to OCB, to ensure that local versions are used for all
259259
# Contrib modules.
260+
replaces:
261+
- go.opentelemetry.io/collector/extension/extensionauth => go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250226024140-8099e51f9a77
262+
- go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest => go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250226024140-8099e51f9a77
263+
- go.opentelemetry.io/collector/service/hostcapabilities => go.opentelemetry.io/collector/service/hostcapabilities v0.0.0-20250226024140-8099e51f9a77

‎cmd/oteltestbedcol/builder-config.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,8 @@ providers:
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
6670

‎cmd/telemetrygen/go.mod

Lines changed: 8 additions & 2 deletions
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.20250224010654-18e18b21da7a
10-
go.opentelemetry.io/collector/semconv v0.120.1-0.20250224010654-18e18b21da7a
9+
go.opentelemetry.io/collector/pdata v1.26.1-0.20250226024140-8099e51f9a77
10+
go.opentelemetry.io/collector/semconv v0.120.1-0.20250226024140-8099e51f9a77
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
@@ -61,3 +61,9 @@ retract (
6161

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.
64+
65+
replace go.opentelemetry.io/collector/extension/extensionauth => go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250226024140-8099e51f9a77
66+
67+
replace go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest => go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250226024140-8099e51f9a77
68+
69+
replace go.opentelemetry.io/collector/service/hostcapabilities => go.opentelemetry.io/collector/service/hostcapabilities v0.0.0-20250226024140-8099e51f9a77

‎cmd/telemetrygen/go.sum

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/telemetrygen/internal/e2etest/go.mod

Lines changed: 37 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ require (
66
github.com/open-telemetry/opentelemetry-collector-contrib/cmd/telemetrygen v0.120.1
77
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.120.1
88
github.com/stretchr/testify v1.10.0
9-
go.opentelemetry.io/collector/component/componenttest v0.120.1-0.20250224010654-18e18b21da7a
10-
go.opentelemetry.io/collector/consumer/consumertest v0.120.1-0.20250224010654-18e18b21da7a
11-
go.opentelemetry.io/collector/receiver/otlpreceiver v0.120.1-0.20250224010654-18e18b21da7a
12-
go.opentelemetry.io/collector/receiver/receivertest v0.120.1-0.20250224010654-18e18b21da7a
9+
go.opentelemetry.io/collector/component/componenttest v0.120.1-0.20250226024140-8099e51f9a77
10+
go.opentelemetry.io/collector/consumer/consumertest v0.120.1-0.20250226024140-8099e51f9a77
11+
go.opentelemetry.io/collector/receiver/otlpreceiver v0.120.1-0.20250226024140-8099e51f9a77
12+
go.opentelemetry.io/collector/receiver/receivertest v0.120.1-0.20250226024140-8099e51f9a77
1313
)
1414

1515
require (
@@ -26,7 +26,7 @@ require (
2626
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
2727
github.com/hashicorp/go-version v1.7.0 // indirect
2828
github.com/json-iterator/go v1.1.12 // indirect
29-
github.com/klauspost/compress v1.17.11 // indirect
29+
github.com/klauspost/compress v1.18.0 // indirect
3030
github.com/knadh/koanf/maps v0.1.1 // indirect
3131
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
3232
github.com/knadh/koanf/v2 v2.1.2 // indirect
@@ -40,32 +40,32 @@ require (
4040
github.com/rs/cors v1.11.1 // indirect
4141
github.com/spf13/pflag v1.0.6 // indirect
4242
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
43-
go.opentelemetry.io/collector v0.120.1-0.20250224010654-18e18b21da7a // indirect
44-
go.opentelemetry.io/collector/client v1.26.1-0.20250224010654-18e18b21da7a // indirect
45-
go.opentelemetry.io/collector/component v0.120.1-0.20250224010654-18e18b21da7a // indirect
46-
go.opentelemetry.io/collector/component/componentstatus v0.120.1-0.20250224010654-18e18b21da7a // indirect
47-
go.opentelemetry.io/collector/config/configauth v0.120.1-0.20250224010654-18e18b21da7a // indirect
48-
go.opentelemetry.io/collector/config/configcompression v1.26.1-0.20250224010654-18e18b21da7a // indirect
49-
go.opentelemetry.io/collector/config/configgrpc v0.120.1-0.20250224010654-18e18b21da7a // indirect
50-
go.opentelemetry.io/collector/config/confighttp v0.120.1-0.20250224010654-18e18b21da7a // indirect
51-
go.opentelemetry.io/collector/config/confignet v1.26.1-0.20250224010654-18e18b21da7a // indirect
52-
go.opentelemetry.io/collector/config/configopaque v1.26.1-0.20250224010654-18e18b21da7a // indirect
53-
go.opentelemetry.io/collector/config/configtls v1.26.1-0.20250224010654-18e18b21da7a // indirect
54-
go.opentelemetry.io/collector/confmap v1.26.1-0.20250224010654-18e18b21da7a // indirect
55-
go.opentelemetry.io/collector/consumer v1.26.1-0.20250224010654-18e18b21da7a // indirect
56-
go.opentelemetry.io/collector/consumer/consumererror v0.120.1-0.20250224010654-18e18b21da7a // indirect
57-
go.opentelemetry.io/collector/consumer/xconsumer v0.120.1-0.20250224010654-18e18b21da7a // indirect
58-
go.opentelemetry.io/collector/extension v0.120.1-0.20250224010654-18e18b21da7a // indirect
59-
go.opentelemetry.io/collector/extension/auth v0.120.1-0.20250224010654-18e18b21da7a // indirect
60-
go.opentelemetry.io/collector/featuregate v1.26.1-0.20250224010654-18e18b21da7a // indirect
61-
go.opentelemetry.io/collector/internal/sharedcomponent v0.120.1-0.20250224010654-18e18b21da7a // indirect
62-
go.opentelemetry.io/collector/internal/telemetry v0.120.1-0.20250224010654-18e18b21da7a // indirect
63-
go.opentelemetry.io/collector/pdata v1.26.1-0.20250224010654-18e18b21da7a // indirect
64-
go.opentelemetry.io/collector/pdata/pprofile v0.120.1-0.20250224010654-18e18b21da7a // indirect
65-
go.opentelemetry.io/collector/pipeline v0.120.1-0.20250224010654-18e18b21da7a // indirect
66-
go.opentelemetry.io/collector/receiver v0.120.1-0.20250224010654-18e18b21da7a // indirect
67-
go.opentelemetry.io/collector/receiver/xreceiver v0.120.1-0.20250224010654-18e18b21da7a // indirect
68-
go.opentelemetry.io/collector/semconv v0.120.1-0.20250224010654-18e18b21da7a // indirect
43+
go.opentelemetry.io/collector v0.120.1-0.20250226024140-8099e51f9a77 // indirect
44+
go.opentelemetry.io/collector/client v1.26.1-0.20250226024140-8099e51f9a77 // indirect
45+
go.opentelemetry.io/collector/component v0.120.1-0.20250226024140-8099e51f9a77 // indirect
46+
go.opentelemetry.io/collector/component/componentstatus v0.120.1-0.20250226024140-8099e51f9a77 // indirect
47+
go.opentelemetry.io/collector/config/configauth v0.120.1-0.20250226024140-8099e51f9a77 // indirect
48+
go.opentelemetry.io/collector/config/configcompression v1.26.1-0.20250226024140-8099e51f9a77 // indirect
49+
go.opentelemetry.io/collector/config/configgrpc v0.120.1-0.20250226024140-8099e51f9a77 // indirect
50+
go.opentelemetry.io/collector/config/confighttp v0.120.1-0.20250226024140-8099e51f9a77 // indirect
51+
go.opentelemetry.io/collector/config/confignet v1.26.1-0.20250226024140-8099e51f9a77 // indirect
52+
go.opentelemetry.io/collector/config/configopaque v1.26.1-0.20250226024140-8099e51f9a77 // indirect
53+
go.opentelemetry.io/collector/config/configtls v1.26.1-0.20250226024140-8099e51f9a77 // indirect
54+
go.opentelemetry.io/collector/confmap v1.26.1-0.20250226024140-8099e51f9a77 // indirect
55+
go.opentelemetry.io/collector/consumer v1.26.1-0.20250226024140-8099e51f9a77 // indirect
56+
go.opentelemetry.io/collector/consumer/consumererror v0.120.1-0.20250226024140-8099e51f9a77 // indirect
57+
go.opentelemetry.io/collector/consumer/xconsumer v0.120.1-0.20250226024140-8099e51f9a77 // indirect
58+
go.opentelemetry.io/collector/extension v0.120.1-0.20250226024140-8099e51f9a77 // indirect
59+
go.opentelemetry.io/collector/extension/extensionauth v0.120.0 // indirect
60+
go.opentelemetry.io/collector/featuregate v1.26.1-0.20250226024140-8099e51f9a77 // indirect
61+
go.opentelemetry.io/collector/internal/sharedcomponent v0.120.1-0.20250226024140-8099e51f9a77 // indirect
62+
go.opentelemetry.io/collector/internal/telemetry v0.120.1-0.20250226024140-8099e51f9a77 // indirect
63+
go.opentelemetry.io/collector/pdata v1.26.1-0.20250226024140-8099e51f9a77 // indirect
64+
go.opentelemetry.io/collector/pdata/pprofile v0.120.1-0.20250226024140-8099e51f9a77 // indirect
65+
go.opentelemetry.io/collector/pipeline v0.120.1-0.20250226024140-8099e51f9a77 // indirect
66+
go.opentelemetry.io/collector/receiver v0.120.1-0.20250226024140-8099e51f9a77 // indirect
67+
go.opentelemetry.io/collector/receiver/xreceiver v0.120.1-0.20250226024140-8099e51f9a77 // indirect
68+
go.opentelemetry.io/collector/semconv v0.120.1-0.20250226024140-8099e51f9a77 // indirect
6969
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect
7070
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
7171
go.opentelemetry.io/otel v1.34.0 // indirect
@@ -105,3 +105,9 @@ retract (
105105
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => ../../../../internal/common
106106

107107
replace github.com/open-telemetry/opentelemetry-collector-contrib/cmd/telemetrygen => ../..
108+
109+
replace go.opentelemetry.io/collector/extension/extensionauth => go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250226024140-8099e51f9a77
110+
111+
replace go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest => go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250226024140-8099e51f9a77
112+
113+
replace go.opentelemetry.io/collector/service/hostcapabilities => go.opentelemetry.io/collector/service/hostcapabilities v0.0.0-20250226024140-8099e51f9a77

0 commit comments

Comments
 (0)