Skip to content

Commit 733c62d

Browse files
evan-bradleyevan-bradley
authored
Merge branch 'main' into pass-confmap-providers
2 parents 3c5146e + 8991654 commit 733c62d

File tree

67 files changed

+665
-659
lines changed

Some content is hidden

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

67 files changed

+665
-659
lines changed

‎cmd/mdatagen/go.mod

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ require (
1111
go.opentelemetry.io/collector/pdata v1.1.0
1212
go.opentelemetry.io/collector/receiver v0.94.1
1313
go.opentelemetry.io/collector/semconv v0.94.1
14-
go.opentelemetry.io/otel/metric v1.23.0
15-
go.opentelemetry.io/otel/trace v1.23.0
14+
go.opentelemetry.io/otel/metric v1.23.1
15+
go.opentelemetry.io/otel/trace v1.23.1
1616
go.uber.org/multierr v1.11.0
1717
go.uber.org/zap v1.26.0
1818
golang.org/x/text v0.14.0
@@ -43,10 +43,10 @@ require (
4343
github.com/prometheus/procfs v0.12.0 // indirect
4444
go.opentelemetry.io/collector/config/configtelemetry v0.94.1 // indirect
4545
go.opentelemetry.io/collector/consumer v0.94.1 // indirect
46-
go.opentelemetry.io/otel v1.23.0 // indirect
47-
go.opentelemetry.io/otel/exporters/prometheus v0.45.1 // indirect
48-
go.opentelemetry.io/otel/sdk v1.23.0 // indirect
49-
go.opentelemetry.io/otel/sdk/metric v1.23.0 // indirect
46+
go.opentelemetry.io/otel v1.23.1 // indirect
47+
go.opentelemetry.io/otel/exporters/prometheus v0.45.2 // indirect
48+
go.opentelemetry.io/otel/sdk v1.23.1 // indirect
49+
go.opentelemetry.io/otel/sdk/metric v1.23.1 // indirect
5050
golang.org/x/net v0.20.0 // indirect
5151
golang.org/x/sys v0.16.0 // indirect
5252
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -104,20 +104,20 @@ require (
104104
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect
105105
go.opentelemetry.io/contrib/propagators/b3 v1.23.0 // indirect
106106
go.opentelemetry.io/contrib/zpages v0.48.0 // indirect
107-
go.opentelemetry.io/otel v1.23.0 // indirect
108-
go.opentelemetry.io/otel/bridge/opencensus v1.23.0 // indirect
109-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.23.0 // indirect
110-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.23.0 // indirect
111-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.23.0 // indirect
112-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.23.0 // indirect
113-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.23.0 // indirect
114-
go.opentelemetry.io/otel/exporters/prometheus v0.45.1 // indirect
115-
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.23.0 // indirect
116-
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.23.0 // indirect
117-
go.opentelemetry.io/otel/metric v1.23.0 // indirect
118-
go.opentelemetry.io/otel/sdk v1.23.0 // indirect
119-
go.opentelemetry.io/otel/sdk/metric v1.23.0 // indirect
120-
go.opentelemetry.io/otel/trace v1.23.0 // indirect
107+
go.opentelemetry.io/otel v1.23.1 // indirect
108+
go.opentelemetry.io/otel/bridge/opencensus v1.23.1 // indirect
109+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.23.1 // indirect
110+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.23.1 // indirect
111+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.23.1 // indirect
112+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.23.1 // indirect
113+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.23.1 // indirect
114+
go.opentelemetry.io/otel/exporters/prometheus v0.45.2 // indirect
115+
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.23.1 // indirect
116+
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.23.1 // indirect
117+
go.opentelemetry.io/otel/metric v1.23.1 // indirect
118+
go.opentelemetry.io/otel/sdk v1.23.1 // indirect
119+
go.opentelemetry.io/otel/sdk/metric v1.23.1 // indirect
120+
go.opentelemetry.io/otel/trace v1.23.1 // indirect
121121
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
122122
go.uber.org/multierr v1.11.0 // indirect
123123
go.uber.org/zap v1.26.0 // indirect

‎cmd/otelcorecol/go.sum

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

‎component/go.mod

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ require (
1010
go.opentelemetry.io/collector/config/configtelemetry v0.94.1
1111
go.opentelemetry.io/collector/confmap v0.94.1
1212
go.opentelemetry.io/collector/pdata v1.1.0
13-
go.opentelemetry.io/otel v1.23.0
14-
go.opentelemetry.io/otel/exporters/prometheus v0.45.1
15-
go.opentelemetry.io/otel/metric v1.23.0
16-
go.opentelemetry.io/otel/sdk v1.23.0
17-
go.opentelemetry.io/otel/sdk/metric v1.23.0
18-
go.opentelemetry.io/otel/trace v1.23.0
13+
go.opentelemetry.io/otel v1.23.1
14+
go.opentelemetry.io/otel/exporters/prometheus v0.45.2
15+
go.opentelemetry.io/otel/metric v1.23.1
16+
go.opentelemetry.io/otel/sdk v1.23.1
17+
go.opentelemetry.io/otel/sdk/metric v1.23.1
18+
go.opentelemetry.io/otel/trace v1.23.1
1919
go.uber.org/goleak v1.3.0
2020
go.uber.org/multierr v1.11.0
2121
go.uber.org/zap v1.26.0

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

‎config/configauth/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ require (
2525
go.opentelemetry.io/collector/config/configtelemetry v0.94.1 // indirect
2626
go.opentelemetry.io/collector/confmap v0.94.1 // indirect
2727
go.opentelemetry.io/collector/pdata v1.1.0 // indirect
28-
go.opentelemetry.io/otel v1.23.0 // indirect
29-
go.opentelemetry.io/otel/metric v1.23.0 // indirect
30-
go.opentelemetry.io/otel/trace v1.23.0 // indirect
28+
go.opentelemetry.io/otel v1.23.1 // indirect
29+
go.opentelemetry.io/otel/metric v1.23.1 // indirect
30+
go.opentelemetry.io/otel/trace v1.23.1 // indirect
3131
go.uber.org/multierr v1.11.0 // indirect
3232
go.uber.org/zap v1.26.0 // indirect
3333
golang.org/x/net v0.20.0 // indirect

‎config/configauth/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.

0 commit comments

Comments
 (0)