Skip to content

Commit 0db286f

Browse files
authored
[chore] Update otel core collector dependencies (open-telemetry#45330)
Cannot be done in CI due to a new internal module in core. See https://github.com/open-telemetry/opentelemetry-collector-contrib/actions/runs/20846134948/job/59890092343 Extra changes: - Add temporary replace statements for go.opentelemetry.io/collector/internal/componentalias - Update Coralogix exporter tests after open-telemetry/opentelemetry-collector#13663
1 parent 39df1a7 commit 0db286f

File tree

826 files changed

+25329
-22509
lines changed

Some content is hidden

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

826 files changed

+25329
-22509
lines changed

Makefile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -527,13 +527,13 @@ endef
527527
.PHONY: update-otel
528528
update-otel:$(MULTIMOD)
529529
# Make sure cmd/otelcontribcol/go.mod and cmd/oteltestbedcol/go.mod are present
530-
$(MAKE) genotelcontribcol
531-
$(MAKE) genoteltestbedcol
532-
$(MULTIMOD) sync -s=true -o ../opentelemetry-collector -m stable --commit-hash "$(OTEL_STABLE_VERSION)"
533-
git add . && git commit -s -m "[chore] multimod update stable modules" ; \
534-
$(MULTIMOD) sync -s=true -o ../opentelemetry-collector -m beta --commit-hash "$(OTEL_VERSION)"
535-
git add . && git commit -s -m "[chore] multimod update beta modules" ; \
536-
$(MAKE) gotidy
530+
# $(MAKE) genotelcontribcol
531+
# $(MAKE) genoteltestbedcol
532+
# $(MULTIMOD) sync -s=true -o ../opentelemetry-collector -m stable --commit-hash "$(OTEL_STABLE_VERSION)"
533+
# git add . && git commit -s -m "[chore] multimod update stable modules" ; \
534+
# $(MULTIMOD) sync -s=true -o ../opentelemetry-collector -m beta --commit-hash "$(OTEL_VERSION)"
535+
# git add . && git commit -s -m "[chore] multimod update beta modules" ; \
536+
# $(MAKE) gotidy
537537
$(call updatehelper,$(CORE_VERSIONS),./cmd/otelcontribcol/go.mod,./cmd/otelcontribcol/builder-config.yaml)
538538
$(call updatehelper,$(CORE_VERSIONS),./cmd/oteltestbedcol/go.mod,./cmd/oteltestbedcol/builder-config.yaml)
539539
$(MAKE) -B install-tools

cmd/codecovgen/go.mod

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,6 @@ require (
1313
github.com/rogpeppe/go-internal v1.10.0 // indirect
1414
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
1515
)
16+
17+
// Can be removed after 0.144.0 release
18+
replace go.opentelemetry.io/collector/internal/componentalias => go.opentelemetry.io/collector/internal/componentalias v0.0.0-20260109195331-fbd5d3f9faae

cmd/golden/go.mod

Lines changed: 37 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ require (
66
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.143.0
77
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.143.0
88
github.com/stretchr/testify v1.11.1
9-
go.opentelemetry.io/collector/component v1.49.0
10-
go.opentelemetry.io/collector/component/componenttest v0.143.0
11-
go.opentelemetry.io/collector/config/configoptional v1.49.0
12-
go.opentelemetry.io/collector/confmap v1.49.0
13-
go.opentelemetry.io/collector/consumer v1.49.0
14-
go.opentelemetry.io/collector/pdata v1.49.0
15-
go.opentelemetry.io/collector/receiver v1.49.0
16-
go.opentelemetry.io/collector/receiver/otlpreceiver v0.143.0
9+
go.opentelemetry.io/collector/component v1.49.1-0.20260109195331-fbd5d3f9faae
10+
go.opentelemetry.io/collector/component/componenttest v0.143.1-0.20260109195331-fbd5d3f9faae
11+
go.opentelemetry.io/collector/config/configoptional v1.49.1-0.20260109195331-fbd5d3f9faae
12+
go.opentelemetry.io/collector/confmap v1.49.1-0.20260109195331-fbd5d3f9faae
13+
go.opentelemetry.io/collector/consumer v1.49.1-0.20260109195331-fbd5d3f9faae
14+
go.opentelemetry.io/collector/pdata v1.49.1-0.20260109195331-fbd5d3f9faae
15+
go.opentelemetry.io/collector/receiver v1.49.1-0.20260109195331-fbd5d3f9faae
16+
go.opentelemetry.io/collector/receiver/otlpreceiver v0.143.1-0.20260109195331-fbd5d3f9faae
1717
go.opentelemetry.io/otel/metric v1.39.0
1818
go.opentelemetry.io/otel/trace v1.39.0
1919
go.uber.org/goleak v1.3.0
@@ -24,7 +24,7 @@ require (
2424
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2525
github.com/davecgh/go-spew v1.1.1 // indirect
2626
github.com/felixge/httpsnoop v1.0.4 // indirect
27-
github.com/foxboron/go-tpm-keyfiles v0.0.0-20250903184740-5d135037bd4d // indirect
27+
github.com/foxboron/go-tpm-keyfiles v0.0.0-20251226215517-609e4778396f // indirect
2828
github.com/fsnotify/fsnotify v1.9.0 // indirect
2929
github.com/go-logr/logr v1.4.3 // indirect
3030
github.com/go-logr/stdr v1.2.2 // indirect
@@ -49,29 +49,30 @@ require (
4949
github.com/pmezard/go-difflib v1.0.0 // indirect
5050
github.com/rs/cors v1.11.1 // indirect
5151
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
52-
go.opentelemetry.io/collector v0.143.0 // indirect
53-
go.opentelemetry.io/collector/client v1.49.0 // indirect
54-
go.opentelemetry.io/collector/component/componentstatus v0.143.0 // indirect
55-
go.opentelemetry.io/collector/config/configauth v1.49.0 // indirect
56-
go.opentelemetry.io/collector/config/configcompression v1.49.0 // indirect
57-
go.opentelemetry.io/collector/config/configgrpc v0.143.0 // indirect
58-
go.opentelemetry.io/collector/config/confighttp v0.143.0 // indirect
59-
go.opentelemetry.io/collector/config/configmiddleware v1.49.0 // indirect
60-
go.opentelemetry.io/collector/config/confignet v1.49.0 // indirect
61-
go.opentelemetry.io/collector/config/configopaque v1.49.0 // indirect
62-
go.opentelemetry.io/collector/config/configtls v1.49.0 // indirect
63-
go.opentelemetry.io/collector/confmap/xconfmap v0.143.0 // indirect
64-
go.opentelemetry.io/collector/consumer/consumererror v0.143.0 // indirect
65-
go.opentelemetry.io/collector/consumer/xconsumer v0.143.0 // indirect
66-
go.opentelemetry.io/collector/extension/extensionauth v1.49.0 // indirect
67-
go.opentelemetry.io/collector/extension/extensionmiddleware v0.143.0 // indirect
68-
go.opentelemetry.io/collector/featuregate v1.49.0 // indirect
69-
go.opentelemetry.io/collector/internal/sharedcomponent v0.143.0 // indirect
70-
go.opentelemetry.io/collector/internal/telemetry v0.143.0 // indirect
71-
go.opentelemetry.io/collector/pdata/pprofile v0.143.0 // indirect
72-
go.opentelemetry.io/collector/pipeline v1.49.0 // indirect
73-
go.opentelemetry.io/collector/receiver/receiverhelper v0.143.0 // indirect
74-
go.opentelemetry.io/collector/receiver/xreceiver v0.143.0 // indirect
52+
go.opentelemetry.io/collector v0.143.1-0.20260109195331-fbd5d3f9faae // indirect
53+
go.opentelemetry.io/collector/client v1.49.1-0.20260109195331-fbd5d3f9faae // indirect
54+
go.opentelemetry.io/collector/component/componentstatus v0.143.1-0.20260109195331-fbd5d3f9faae // indirect
55+
go.opentelemetry.io/collector/config/configauth v1.49.1-0.20260109195331-fbd5d3f9faae // indirect
56+
go.opentelemetry.io/collector/config/configcompression v1.49.1-0.20260109195331-fbd5d3f9faae // indirect
57+
go.opentelemetry.io/collector/config/configgrpc v0.143.1-0.20260109195331-fbd5d3f9faae // indirect
58+
go.opentelemetry.io/collector/config/confighttp v0.143.1-0.20260109195331-fbd5d3f9faae // indirect
59+
go.opentelemetry.io/collector/config/configmiddleware v1.49.1-0.20260109195331-fbd5d3f9faae // indirect
60+
go.opentelemetry.io/collector/config/confignet v1.49.1-0.20260109195331-fbd5d3f9faae // indirect
61+
go.opentelemetry.io/collector/config/configopaque v1.49.1-0.20260109195331-fbd5d3f9faae // indirect
62+
go.opentelemetry.io/collector/config/configtls v1.49.1-0.20260109195331-fbd5d3f9faae // indirect
63+
go.opentelemetry.io/collector/confmap/xconfmap v0.143.1-0.20260109195331-fbd5d3f9faae // indirect
64+
go.opentelemetry.io/collector/consumer/consumererror v0.143.1-0.20260109195331-fbd5d3f9faae // indirect
65+
go.opentelemetry.io/collector/consumer/xconsumer v0.143.1-0.20260109195331-fbd5d3f9faae // indirect
66+
go.opentelemetry.io/collector/extension/extensionauth v1.49.1-0.20260109195331-fbd5d3f9faae // indirect
67+
go.opentelemetry.io/collector/extension/extensionmiddleware v0.143.1-0.20260109195331-fbd5d3f9faae // indirect
68+
go.opentelemetry.io/collector/featuregate v1.49.1-0.20260109195331-fbd5d3f9faae // indirect
69+
go.opentelemetry.io/collector/internal/componentalias v0.0.0-00010101000000-000000000000 // indirect
70+
go.opentelemetry.io/collector/internal/sharedcomponent v0.143.1-0.20260109195331-fbd5d3f9faae // indirect
71+
go.opentelemetry.io/collector/internal/telemetry v0.143.1-0.20260109195331-fbd5d3f9faae // indirect
72+
go.opentelemetry.io/collector/pdata/pprofile v0.143.1-0.20260109195331-fbd5d3f9faae // indirect
73+
go.opentelemetry.io/collector/pipeline v1.49.1-0.20260109195331-fbd5d3f9faae // indirect
74+
go.opentelemetry.io/collector/receiver/receiverhelper v0.143.1-0.20260109195331-fbd5d3f9faae // indirect
75+
go.opentelemetry.io/collector/receiver/xreceiver v0.143.1-0.20260109195331-fbd5d3f9faae // indirect
7576
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
7677
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
7778
go.opentelemetry.io/otel v1.39.0 // indirect
@@ -83,7 +84,7 @@ require (
8384
golang.org/x/net v0.48.0 // indirect
8485
golang.org/x/sys v0.39.0 // indirect
8586
golang.org/x/text v0.32.0 // indirect
86-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda // indirect
87+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b // indirect
8788
google.golang.org/grpc v1.78.0 // indirect
8889
google.golang.org/protobuf v1.36.11 // indirect
8990
gopkg.in/yaml.v3 v3.0.1 // indirect
@@ -94,3 +95,6 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest
9495
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden => ../../pkg/golden
9596

9697
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil => ../../pkg/pdatautil
98+
99+
// Can be removed after 0.144.0 release
100+
replace go.opentelemetry.io/collector/internal/componentalias => go.opentelemetry.io/collector/internal/componentalias v0.0.0-20260109195331-fbd5d3f9faae

0 commit comments

Comments
 (0)