Skip to content

Commit b23a7c9

Browse files
mx-psimx-psi
authored
Revert "Downgrade otel-go" (#13443)
Reverts #13429 so that we can bump to the to-be-released bugfix version that adds open-telemetry/opentelemetry-go/pull/7044
1 parent d82267d commit b23a7c9

100 files changed

Lines changed: 309 additions & 352 deletions

File tree

Some content is hidden

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

‎.chloggen/mx-psi_revert-otel-go-pr.yaml‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎.chloggen/prom_enable_scope_info.yaml‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎cmd/mdatagen/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ require (
2525
go.opentelemetry.io/collector/scraper/scrapertest v0.130.0
2626
go.opentelemetry.io/otel v1.37.0
2727
go.opentelemetry.io/otel/metric v1.37.0
28-
go.opentelemetry.io/otel/sdk/metric v1.36.0
28+
go.opentelemetry.io/otel/sdk/metric v1.37.0
2929
go.opentelemetry.io/otel/trace v1.37.0
3030
go.uber.org/goleak v1.3.0
3131
go.uber.org/zap v1.27.0
@@ -67,7 +67,7 @@ require (
6767
go.opentelemetry.io/collector/receiver/xreceiver v0.130.0 // indirect
6868
go.opentelemetry.io/contrib/bridges/otelzap v0.12.0 // indirect
6969
go.opentelemetry.io/otel/log v0.13.0 // indirect
70-
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
70+
go.opentelemetry.io/otel/sdk v1.37.0 // indirect
7171
go.uber.org/multierr v1.11.0 // indirect
7272
go.yaml.in/yaml/v3 v3.0.4 // indirect
7373
golang.org/x/net v0.39.0 // indirect

‎cmd/mdatagen/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/otelcorecol/go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ require (
137137
go.opentelemetry.io/contrib/bridges/otelzap v0.12.0 // indirect
138138
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.62.0 // indirect
139139
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 // indirect
140-
go.opentelemetry.io/contrib/otelconf v0.16.0 // indirect
141-
go.opentelemetry.io/contrib/propagators/b3 v1.36.0 // indirect
140+
go.opentelemetry.io/contrib/otelconf v0.17.0 // indirect
141+
go.opentelemetry.io/contrib/propagators/b3 v1.37.0 // indirect
142142
go.opentelemetry.io/contrib/zpages v0.62.0 // indirect
143143
go.opentelemetry.io/otel v1.37.0 // indirect
144144
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.13.0 // indirect
@@ -148,7 +148,7 @@ require (
148148
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0 // indirect
149149
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0 // indirect
150150
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.37.0 // indirect
151-
go.opentelemetry.io/otel/exporters/prometheus v0.58.0 // indirect
151+
go.opentelemetry.io/otel/exporters/prometheus v0.59.0 // indirect
152152
go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.13.0 // indirect
153153
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.37.0 // indirect
154154
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.37.0 // indirect

‎cmd/otelcorecol/go.sum‎

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

‎component/componentstatus/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ require (
2424
go.opentelemetry.io/otel v1.37.0 // indirect
2525
go.opentelemetry.io/otel/log v0.13.0 // indirect
2626
go.opentelemetry.io/otel/metric v1.37.0 // indirect
27-
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
27+
go.opentelemetry.io/otel/sdk v1.37.0 // indirect
2828
go.opentelemetry.io/otel/trace v1.37.0 // indirect
2929
go.uber.org/multierr v1.11.0 // indirect
3030
go.uber.org/zap v1.27.0 // indirect

‎component/componentstatus/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.

‎component/componenttest/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ require (
77
go.opentelemetry.io/collector/component v1.36.0
88
go.opentelemetry.io/collector/pdata v1.36.0
99
go.opentelemetry.io/otel/metric v1.37.0
10-
go.opentelemetry.io/otel/sdk v1.36.0
11-
go.opentelemetry.io/otel/sdk/metric v1.36.0
10+
go.opentelemetry.io/otel/sdk v1.37.0
11+
go.opentelemetry.io/otel/sdk/metric v1.37.0
1212
go.opentelemetry.io/otel/trace v1.37.0
1313
go.uber.org/goleak v1.3.0
1414
go.uber.org/multierr v1.11.0

‎component/componenttest/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.

0 commit comments

Comments
 (0)
⚡