Skip to content

Commit ad6e096

Browse files
authored
Merge branch 'main' into renovate/sigs.k8s.io-controller-runtime-0.x
2 parents 338affc + 43af18f commit ad6e096

File tree

20 files changed

+109
-79
lines changed

20 files changed

+109
-79
lines changed
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: bug_fix
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: kafkametricsreceiver
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Fix incorrect cluster admin initialization in consumer scraper
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [36818]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: []

cmd/telemetrygen/internal/e2etest/go.mod

Lines changed: 2 additions & 2 deletions
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

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

exporter/datadogexporter/go.mod

Lines changed: 1 addition & 1 deletion
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

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

exporter/datadogexporter/integrationtest/go.mod

Lines changed: 1 addition & 1 deletion
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

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

internal/datadog/go.mod

Lines changed: 1 addition & 1 deletion
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

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

internal/metadataproviders/go.mod

Lines changed: 4 additions & 4 deletions
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

0 commit comments

Comments
 (0)