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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions cmd/otelcorecol/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ require (
go.opentelemetry.io/contrib/bridges/otelzap v0.15.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.65.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0 // indirect
go.opentelemetry.io/contrib/otelconf v0.20.0 // indirect
go.opentelemetry.io/contrib/otelconf v0.18.0 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.40.0 // indirect
go.opentelemetry.io/contrib/zpages v0.65.0 // indirect
go.opentelemetry.io/otel v1.40.0 // indirect
Expand Down Expand Up @@ -336,6 +336,3 @@ replace go.opentelemetry.io/collector/service => ../../service
replace go.opentelemetry.io/collector/service/hostcapabilities => ../../service/hostcapabilities

replace go.opentelemetry.io/collector/service/telemetry/telemetrytest => ../../service/telemetry/telemetrytest

// Remove this once https://github.com/open-telemetry/opentelemetry-collector/issues/14615 is resolved
replace go.opentelemetry.io/otel/exporters/prometheus => go.opentelemetry.io/otel/exporters/prometheus v0.60.0
8 changes: 4 additions & 4 deletions cmd/otelcorecol/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions internal/e2e/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ require (
go.opentelemetry.io/contrib/bridges/otelzap v0.15.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.65.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0 // indirect
go.opentelemetry.io/contrib/otelconf v0.20.0 // indirect
go.opentelemetry.io/contrib/otelconf v0.18.0 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.40.0 // indirect
go.opentelemetry.io/otel v1.40.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.16.0 // indirect
Expand Down Expand Up @@ -305,6 +305,3 @@ replace go.opentelemetry.io/collector/exporter/exporterhelper => ../../exporter/
replace go.opentelemetry.io/collector/internal/testutil => ../../internal/testutil

replace go.opentelemetry.io/collector/internal/componentalias => ../componentalias

// Remove this once https://github.com/open-telemetry/opentelemetry-collector/issues/14615 is resolved
replace go.opentelemetry.io/otel/exporters/prometheus => go.opentelemetry.io/otel/exporters/prometheus v0.60.0
8 changes: 4 additions & 4 deletions internal/e2e/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion otelcol/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ require (
go.opentelemetry.io/collector/pdata/xpdata v0.146.1 // indirect
go.opentelemetry.io/collector/pipeline/xpipeline v0.146.1 // indirect
go.opentelemetry.io/collector/service/hostcapabilities v0.146.1 // indirect
go.opentelemetry.io/contrib/otelconf v0.20.0 // indirect
go.opentelemetry.io/contrib/otelconf v0.18.0 // indirect
go.opentelemetry.io/otel v1.40.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.16.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.16.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions otelcol/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions otelcol/otelcoltest/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ require (
go.opentelemetry.io/collector/receiver v1.52.0 // indirect
go.opentelemetry.io/collector/receiver/xreceiver v0.146.1 // indirect
go.opentelemetry.io/collector/service/hostcapabilities v0.146.1 // indirect
go.opentelemetry.io/contrib/otelconf v0.20.0 // indirect
go.opentelemetry.io/contrib/otelconf v0.18.0 // indirect
go.opentelemetry.io/otel v1.40.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.16.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.16.0 // indirect
Expand Down Expand Up @@ -245,6 +245,3 @@ replace go.opentelemetry.io/collector/internal/testutil => ../../internal/testut
replace go.opentelemetry.io/collector/internal/componentalias => ../../internal/componentalias

replace go.opentelemetry.io/collector/config/confignet => ../../config/confignet

// Remove this once https://github.com/open-telemetry/opentelemetry-collector/issues/14615 is resolved
replace go.opentelemetry.io/otel/exporters/prometheus => go.opentelemetry.io/otel/exporters/prometheus v0.60.0
8 changes: 4 additions & 4 deletions otelcol/otelcoltest/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions service/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ require (
go.opentelemetry.io/collector/service/hostcapabilities v0.146.1
go.opentelemetry.io/collector/service/telemetry/telemetrytest v0.146.1
go.opentelemetry.io/contrib/bridges/otelzap v0.15.0
go.opentelemetry.io/contrib/otelconf v0.20.0
go.opentelemetry.io/contrib/otelconf v0.18.0
go.opentelemetry.io/contrib/propagators/b3 v1.40.0
go.opentelemetry.io/otel v1.40.0
go.opentelemetry.io/otel/log v0.16.0
Expand Down Expand Up @@ -259,6 +259,3 @@ replace go.opentelemetry.io/collector/internal/testutil => ../internal/testutil
replace go.opentelemetry.io/collector/internal/componentalias => ../internal/componentalias

replace go.opentelemetry.io/collector/config/confignet => ../config/confignet

// Remove this once https://github.com/open-telemetry/opentelemetry-collector/issues/14615 is resolved
replace go.opentelemetry.io/otel/exporters/prometheus => go.opentelemetry.io/otel/exporters/prometheus v0.60.0
8 changes: 4 additions & 4 deletions service/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions service/telemetry/telemetrytest/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ require (
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.146.1 // indirect
go.opentelemetry.io/collector/featuregate v1.52.0 // indirect
go.opentelemetry.io/contrib/otelconf v0.20.0 // indirect
go.opentelemetry.io/contrib/otelconf v0.18.0 // indirect
go.opentelemetry.io/otel v1.40.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.16.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.16.0 // indirect
Expand Down Expand Up @@ -179,6 +179,3 @@ replace go.opentelemetry.io/collector/internal/testutil => ../../../internal/tes
replace go.opentelemetry.io/collector/internal/componentalias => ../../../internal/componentalias

replace go.opentelemetry.io/collector/config/confignet => ../../../config/confignet

// Remove this once https://github.com/open-telemetry/opentelemetry-collector/issues/14615 is resolved
replace go.opentelemetry.io/otel/exporters/prometheus => go.opentelemetry.io/otel/exporters/prometheus v0.60.0
8 changes: 4 additions & 4 deletions service/telemetry/telemetrytest/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading