Skip to content

Commit 4838e05

Browse files
iblancasaiblancasa
authored
Merge branch 'main' into 23662
2 parents 7f1f6c8 + 43af18f commit 4838e05

File tree

18 files changed

+74
-74
lines changed

18 files changed

+74
-74
lines changed

‎cmd/telemetrygen/internal/e2etest/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/cmd/telemetryge
33
go 1.23.0
44

55
require (
6-
github.com/open-telemetry/opentelemetry-collector-contrib/cmd/telemetrygen v0.119.0
7-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.119.0
6+
github.com/open-telemetry/opentelemetry-collector-contrib/cmd/telemetrygen v0.120.0
7+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.120.0
88
github.com/stretchr/testify v1.10.0
99
go.opentelemetry.io/collector/component/componenttest v0.120.0
1010
go.opentelemetry.io/collector/consumer/consumertest v0.120.0

‎connector/datadogconnector/go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎exporter/datadogexporter/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ require (
232232
github.com/gorilla/websocket v1.5.0 // indirect
233233
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
234234
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
235-
github.com/hashicorp/consul/api v1.31.0 // indirect
235+
github.com/hashicorp/consul/api v1.31.1 // indirect
236236
github.com/hashicorp/cronexpr v1.1.2 // indirect
237237
github.com/hashicorp/errwrap v1.1.0 // indirect
238238
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect

‎exporter/datadogexporter/go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎exporter/datadogexporter/integrationtest/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ require (
205205
github.com/gorilla/websocket v1.5.0 // indirect
206206
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
207207
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
208-
github.com/hashicorp/consul/api v1.31.0 // indirect
208+
github.com/hashicorp/consul/api v1.31.1 // indirect
209209
github.com/hashicorp/cronexpr v1.1.2 // indirect
210210
github.com/hashicorp/errwrap v1.1.0 // indirect
211211
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect

‎exporter/datadogexporter/integrationtest/go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/datadog/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ require (
156156
go.opentelemetry.io/otel/trace v1.34.0 // indirect
157157
go.uber.org/atomic v1.11.0 // indirect
158158
go.uber.org/multierr v1.11.0 // indirect
159-
golang.org/x/exp v0.0.0-20241210194714-1829a127f884 // indirect
159+
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect
160160
golang.org/x/net v0.35.0 // indirect
161161
golang.org/x/oauth2 v0.24.0 // indirect
162162
golang.org/x/sys v0.30.0 // indirect

‎internal/datadog/go.sum

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/metadataproviders/go.mod

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/aws/aws-sdk-go-v2 v1.36.1
88
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.28
99
github.com/docker/docker v27.5.1+incompatible
10-
github.com/hashicorp/consul/api v1.31.0
10+
github.com/hashicorp/consul/api v1.31.1
1111
github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.120.0
1212
github.com/shirou/gopsutil/v4 v4.25.1
1313
github.com/stretchr/testify v1.10.0
@@ -87,11 +87,11 @@ require (
8787
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.24.0 // indirect
8888
go.opentelemetry.io/otel/metric v1.34.0 // indirect
8989
go.opentelemetry.io/otel/trace v1.34.0 // indirect
90-
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
91-
golang.org/x/net v0.33.0 // indirect
90+
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect
91+
golang.org/x/net v0.34.0 // indirect
9292
golang.org/x/oauth2 v0.21.0 // indirect
9393
golang.org/x/sys v0.29.0 // indirect
94-
golang.org/x/term v0.27.0 // indirect
94+
golang.org/x/term v0.28.0 // indirect
9595
golang.org/x/text v0.21.0 // indirect
9696
golang.org/x/time v0.4.0 // indirect
9797
google.golang.org/genproto/googleapis/api v0.0.0-20240515191416-fc5f0ca64291 // indirect

‎internal/metadataproviders/go.sum

+10-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/datadog/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ require (
131131
go.opentelemetry.io/otel/trace v1.34.0 // indirect
132132
go.uber.org/atomic v1.11.0 // indirect
133133
go.uber.org/multierr v1.11.0 // indirect
134-
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
134+
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect
135135
golang.org/x/net v0.35.0 // indirect
136136
golang.org/x/oauth2 v0.24.0 // indirect
137137
golang.org/x/sys v0.30.0 // indirect

‎pkg/datadog/go.sum

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎processor/resourcedetectionprocessor/go.mod

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.28
1212
github.com/aws/aws-sdk-go-v2/service/ec2 v1.203.0
1313
github.com/google/go-cmp v0.6.0
14-
github.com/hashicorp/consul/api v1.31.0
14+
github.com/hashicorp/consul/api v1.31.1
1515
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.120.0
1616
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.120.0
1717
github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.120.0
@@ -145,16 +145,16 @@ require (
145145
go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect
146146
go.opentelemetry.io/otel/trace v1.34.0 // indirect
147147
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
148-
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
149-
golang.org/x/mod v0.17.0 // indirect
148+
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect
149+
golang.org/x/mod v0.22.0 // indirect
150150
golang.org/x/net v0.35.0 // indirect
151151
golang.org/x/oauth2 v0.24.0 // indirect
152152
golang.org/x/sync v0.11.0 // indirect
153153
golang.org/x/sys v0.30.0 // indirect
154154
golang.org/x/term v0.29.0 // indirect
155155
golang.org/x/text v0.22.0 // indirect
156156
golang.org/x/time v0.4.0 // indirect
157-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
157+
golang.org/x/tools v0.29.0 // indirect
158158
google.golang.org/genproto/googleapis/api v0.0.0-20241202173237-19429a94021a // indirect
159159
google.golang.org/genproto/googleapis/rpc v0.0.0-20241202173237-19429a94021a // indirect
160160
google.golang.org/grpc v1.70.0 // indirect

0 commit comments

Comments
 (0)