Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
14 changes: 7 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -527,13 +527,13 @@ endef
.PHONY: update-otel
update-otel:$(MULTIMOD)
# Make sure cmd/otelcontribcol/go.mod and cmd/oteltestbedcol/go.mod are present
$(MAKE) genotelcontribcol
$(MAKE) genoteltestbedcol
$(MULTIMOD) sync -s=true -o ../opentelemetry-collector -m stable --commit-hash "$(OTEL_STABLE_VERSION)"
git add . && git commit -s -m "[chore] multimod update stable modules" ; \
$(MULTIMOD) sync -s=true -o ../opentelemetry-collector -m beta --commit-hash "$(OTEL_VERSION)"
git add . && git commit -s -m "[chore] multimod update beta modules" ; \
$(MAKE) gotidy
# $(MAKE) genotelcontribcol
# $(MAKE) genoteltestbedcol
# $(MULTIMOD) sync -s=true -o ../opentelemetry-collector -m stable --commit-hash "$(OTEL_STABLE_VERSION)"
# git add . && git commit -s -m "[chore] multimod update stable modules" ; \
# $(MULTIMOD) sync -s=true -o ../opentelemetry-collector -m beta --commit-hash "$(OTEL_VERSION)"
# git add . && git commit -s -m "[chore] multimod update beta modules" ; \
# $(MAKE) gotidy
$(call updatehelper,$(CORE_VERSIONS),./cmd/otelcontribcol/go.mod,./cmd/otelcontribcol/builder-config.yaml)
$(call updatehelper,$(CORE_VERSIONS),./cmd/oteltestbedcol/go.mod,./cmd/oteltestbedcol/builder-config.yaml)
$(MAKE) -B install-tools
Expand Down
3 changes: 3 additions & 0 deletions cmd/codecovgen/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,6 @@ require (
github.com/rogpeppe/go-internal v1.10.0 // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
)

// Can be removed after 0.144.0 release
replace go.opentelemetry.io/collector/internal/componentalias => go.opentelemetry.io/collector/internal/componentalias v0.0.0-20260109195331-fbd5d3f9faae
70 changes: 37 additions & 33 deletions cmd/golden/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.143.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.143.0
github.com/stretchr/testify v1.11.1
go.opentelemetry.io/collector/component v1.49.0
go.opentelemetry.io/collector/component/componenttest v0.143.0
go.opentelemetry.io/collector/config/configoptional v1.49.0
go.opentelemetry.io/collector/confmap v1.49.0
go.opentelemetry.io/collector/consumer v1.49.0
go.opentelemetry.io/collector/pdata v1.49.0
go.opentelemetry.io/collector/receiver v1.49.0
go.opentelemetry.io/collector/receiver/otlpreceiver v0.143.0
go.opentelemetry.io/collector/component v1.49.1-0.20260109195331-fbd5d3f9faae
go.opentelemetry.io/collector/component/componenttest v0.143.1-0.20260109195331-fbd5d3f9faae
go.opentelemetry.io/collector/config/configoptional v1.49.1-0.20260109195331-fbd5d3f9faae
go.opentelemetry.io/collector/confmap v1.49.1-0.20260109195331-fbd5d3f9faae
go.opentelemetry.io/collector/consumer v1.49.1-0.20260109195331-fbd5d3f9faae
go.opentelemetry.io/collector/pdata v1.49.1-0.20260109195331-fbd5d3f9faae
go.opentelemetry.io/collector/receiver v1.49.1-0.20260109195331-fbd5d3f9faae
go.opentelemetry.io/collector/receiver/otlpreceiver v0.143.1-0.20260109195331-fbd5d3f9faae
go.opentelemetry.io/otel/metric v1.39.0
go.opentelemetry.io/otel/trace v1.39.0
go.uber.org/goleak v1.3.0
Expand All @@ -24,7 +24,7 @@ require (
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/foxboron/go-tpm-keyfiles v0.0.0-20250903184740-5d135037bd4d // indirect
github.com/foxboron/go-tpm-keyfiles v0.0.0-20251226215517-609e4778396f // indirect
github.com/fsnotify/fsnotify v1.9.0 // indirect
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
Expand All @@ -49,29 +49,30 @@ require (
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rs/cors v1.11.1 // indirect
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/collector v0.143.0 // indirect
go.opentelemetry.io/collector/client v1.49.0 // indirect
go.opentelemetry.io/collector/component/componentstatus v0.143.0 // indirect
go.opentelemetry.io/collector/config/configauth v1.49.0 // indirect
go.opentelemetry.io/collector/config/configcompression v1.49.0 // indirect
go.opentelemetry.io/collector/config/configgrpc v0.143.0 // indirect
go.opentelemetry.io/collector/config/confighttp v0.143.0 // indirect
go.opentelemetry.io/collector/config/configmiddleware v1.49.0 // indirect
go.opentelemetry.io/collector/config/confignet v1.49.0 // indirect
go.opentelemetry.io/collector/config/configopaque v1.49.0 // indirect
go.opentelemetry.io/collector/config/configtls v1.49.0 // indirect
go.opentelemetry.io/collector/confmap/xconfmap v0.143.0 // indirect
go.opentelemetry.io/collector/consumer/consumererror v0.143.0 // indirect
go.opentelemetry.io/collector/consumer/xconsumer v0.143.0 // indirect
go.opentelemetry.io/collector/extension/extensionauth v1.49.0 // indirect
go.opentelemetry.io/collector/extension/extensionmiddleware v0.143.0 // indirect
go.opentelemetry.io/collector/featuregate v1.49.0 // indirect
go.opentelemetry.io/collector/internal/sharedcomponent v0.143.0 // indirect
go.opentelemetry.io/collector/internal/telemetry v0.143.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.143.0 // indirect
go.opentelemetry.io/collector/pipeline v1.49.0 // indirect
go.opentelemetry.io/collector/receiver/receiverhelper v0.143.0 // indirect
go.opentelemetry.io/collector/receiver/xreceiver v0.143.0 // indirect
go.opentelemetry.io/collector v0.143.1-0.20260109195331-fbd5d3f9faae // indirect
go.opentelemetry.io/collector/client v1.49.1-0.20260109195331-fbd5d3f9faae // indirect
go.opentelemetry.io/collector/component/componentstatus v0.143.1-0.20260109195331-fbd5d3f9faae // indirect
go.opentelemetry.io/collector/config/configauth v1.49.1-0.20260109195331-fbd5d3f9faae // indirect
go.opentelemetry.io/collector/config/configcompression v1.49.1-0.20260109195331-fbd5d3f9faae // indirect
go.opentelemetry.io/collector/config/configgrpc v0.143.1-0.20260109195331-fbd5d3f9faae // indirect
go.opentelemetry.io/collector/config/confighttp v0.143.1-0.20260109195331-fbd5d3f9faae // indirect
go.opentelemetry.io/collector/config/configmiddleware v1.49.1-0.20260109195331-fbd5d3f9faae // indirect
go.opentelemetry.io/collector/config/confignet v1.49.1-0.20260109195331-fbd5d3f9faae // indirect
go.opentelemetry.io/collector/config/configopaque v1.49.1-0.20260109195331-fbd5d3f9faae // indirect
go.opentelemetry.io/collector/config/configtls v1.49.1-0.20260109195331-fbd5d3f9faae // indirect
go.opentelemetry.io/collector/confmap/xconfmap v0.143.1-0.20260109195331-fbd5d3f9faae // indirect
go.opentelemetry.io/collector/consumer/consumererror v0.143.1-0.20260109195331-fbd5d3f9faae // indirect
go.opentelemetry.io/collector/consumer/xconsumer v0.143.1-0.20260109195331-fbd5d3f9faae // indirect
go.opentelemetry.io/collector/extension/extensionauth v1.49.1-0.20260109195331-fbd5d3f9faae // indirect
go.opentelemetry.io/collector/extension/extensionmiddleware v0.143.1-0.20260109195331-fbd5d3f9faae // indirect
go.opentelemetry.io/collector/featuregate v1.49.1-0.20260109195331-fbd5d3f9faae // indirect
go.opentelemetry.io/collector/internal/componentalias v0.0.0-00010101000000-000000000000 // indirect
go.opentelemetry.io/collector/internal/sharedcomponent v0.143.1-0.20260109195331-fbd5d3f9faae // indirect
go.opentelemetry.io/collector/internal/telemetry v0.143.1-0.20260109195331-fbd5d3f9faae // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.143.1-0.20260109195331-fbd5d3f9faae // indirect
go.opentelemetry.io/collector/pipeline v1.49.1-0.20260109195331-fbd5d3f9faae // indirect
go.opentelemetry.io/collector/receiver/receiverhelper v0.143.1-0.20260109195331-fbd5d3f9faae // indirect
go.opentelemetry.io/collector/receiver/xreceiver v0.143.1-0.20260109195331-fbd5d3f9faae // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
go.opentelemetry.io/otel v1.39.0 // indirect
Expand All @@ -83,7 +84,7 @@ require (
golang.org/x/net v0.48.0 // indirect
golang.org/x/sys v0.39.0 // indirect
golang.org/x/text v0.32.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b // indirect
google.golang.org/grpc v1.78.0 // indirect
google.golang.org/protobuf v1.36.11 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand All @@ -94,3 +95,6 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden => ../../pkg/golden

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil => ../../pkg/pdatautil

// Can be removed after 0.144.0 release
replace go.opentelemetry.io/collector/internal/componentalias => go.opentelemetry.io/collector/internal/componentalias v0.0.0-20260109195331-fbd5d3f9faae
Loading