Skip to content

Commit 0f56c38

Browse files
sincejunesincejune
authored
Merge branch 'main' into update-otel
2 parents 2dcfecd + 1b8070f commit 0f56c38

File tree

139 files changed

+2608
-3285
lines changed

Some content is hidden

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

139 files changed

+2608
-3285
lines changed

‎.chloggen/add-bmchelix-to-build.yaml

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: new_component
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: bmchelixexporter
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Mark the BMC Helix exporter as Alpha.
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: [36773]
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: [user]

‎.chloggen/add-initial-buffer.yaml

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: enhancement
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: pkg/stanza
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Allow users to configure initial buffer size
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: [37786]
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: [user]

‎.chloggen/migrating_converter_thrift_zipkin.yaml

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: enhancement
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: pkg/translator/zipkin/internal/zipkin
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Remove jaeger model/converter/thrift/zipkin dependency
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: [37795]
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: [user]

‎.github/CODEOWNERS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@
1111

1212
* @open-telemetry/collector-contrib-approvers
1313

14+
# Files owned by collector-releases-approvers
15+
.github/workflows/prepare-release.yml @open-telemetry/collector-contrib-approvers @open-telemetry/collector-releases-approvers
16+
.github/workflows/scripts/release-prepare-release.sh @open-telemetry/collector-contrib-approvers @open-telemetry/collector-releases-approvers
17+
.github/workflows/scripts/set_release_tag.sh @open-telemetry/collector-contrib-approvers @open-telemetry/collector-releases-approvers
18+
1419
# Start components list
1520

1621
cmd/githubgen/ @open-telemetry/collector-contrib-approvers @atoulme

‎cmd/otelcontribcol/builder-config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ exporters:
6565
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.119.0
6666
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuredataexplorerexporter v0.119.0
6767
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuremonitorexporter v0.119.0
68+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/bmchelixexporter v0.119.0
6869
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.119.0
6970
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/clickhouseexporter v0.119.0
7071
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/cassandraexporter v0.119.0

‎connector/datadogconnector/go.mod

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/connector/datad
33
go 1.22.0
44

55
require (
6-
github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/metricsclient v0.61.0
6+
github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/metricsclient v0.62.2
77
github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor v0.64.0-devel.0.20250203170818-31c3d5c28ba0
88
github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-devel.0.20250129111638-01c8fb06949e
99
github.com/DataDog/datadog-agent/pkg/proto v0.64.0-devel
@@ -43,64 +43,64 @@ require (
4343

4444
require (
4545
cloud.google.com/go/compute/metadata v0.6.0 // indirect
46-
github.com/DataDog/agent-payload/v5 v5.0.142 // indirect
47-
github.com/DataDog/datadog-agent/comp/core/config v0.61.0 // indirect
48-
github.com/DataDog/datadog-agent/comp/core/flare/builder v0.61.0 // indirect
49-
github.com/DataDog/datadog-agent/comp/core/flare/types v0.61.0 // indirect
50-
github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.61.0 // indirect
51-
github.com/DataDog/datadog-agent/comp/core/log/def v0.61.0 // indirect
52-
github.com/DataDog/datadog-agent/comp/core/secrets v0.61.0 // indirect
46+
github.com/DataDog/agent-payload/v5 v5.0.144 // indirect
47+
github.com/DataDog/datadog-agent/comp/core/config v0.62.2 // indirect
48+
github.com/DataDog/datadog-agent/comp/core/flare/builder v0.62.2 // indirect
49+
github.com/DataDog/datadog-agent/comp/core/flare/types v0.62.2 // indirect
50+
github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.62.2 // indirect
51+
github.com/DataDog/datadog-agent/comp/core/log/def v0.62.2 // indirect
52+
github.com/DataDog/datadog-agent/comp/core/secrets v0.62.2 // indirect
5353
github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-devel // indirect
54-
github.com/DataDog/datadog-agent/comp/core/telemetry v0.61.0 // indirect
55-
github.com/DataDog/datadog-agent/comp/def v0.61.0 // indirect
56-
github.com/DataDog/datadog-agent/comp/logs/agent/config v0.61.0 // indirect
57-
github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.61.0 // indirect
58-
github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl v0.61.0 // indirect
54+
github.com/DataDog/datadog-agent/comp/core/telemetry v0.62.2 // indirect
55+
github.com/DataDog/datadog-agent/comp/def v0.62.2 // indirect
56+
github.com/DataDog/datadog-agent/comp/logs/agent/config v0.62.2 // indirect
57+
github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.62.2 // indirect
58+
github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl v0.62.2 // indirect
5959
github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter v0.62.0-devel.0.20241213165407-f95df913d2b7 // indirect
60-
github.com/DataDog/datadog-agent/comp/trace/compression/def v0.61.0 // indirect
61-
github.com/DataDog/datadog-agent/comp/trace/compression/impl-gzip v0.61.0 // indirect
62-
github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.61.0 // indirect
63-
github.com/DataDog/datadog-agent/pkg/config/env v0.61.0 // indirect
64-
github.com/DataDog/datadog-agent/pkg/config/mock v0.61.0 // indirect
65-
github.com/DataDog/datadog-agent/pkg/config/model v0.61.0 // indirect
66-
github.com/DataDog/datadog-agent/pkg/config/nodetreemodel v0.61.0 // indirect
67-
github.com/DataDog/datadog-agent/pkg/config/setup v0.61.0 // indirect
68-
github.com/DataDog/datadog-agent/pkg/config/structure v0.61.0 // indirect
69-
github.com/DataDog/datadog-agent/pkg/config/teeconfig v0.61.0 // indirect
70-
github.com/DataDog/datadog-agent/pkg/config/utils v0.61.0 // indirect
71-
github.com/DataDog/datadog-agent/pkg/logs/auditor v0.61.0 // indirect
72-
github.com/DataDog/datadog-agent/pkg/logs/client v0.61.0 // indirect
73-
github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.61.0 // indirect
74-
github.com/DataDog/datadog-agent/pkg/logs/message v0.61.0 // indirect
75-
github.com/DataDog/datadog-agent/pkg/logs/metrics v0.61.0 // indirect
76-
github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.61.0 // indirect
77-
github.com/DataDog/datadog-agent/pkg/logs/processor v0.61.0 // indirect
78-
github.com/DataDog/datadog-agent/pkg/logs/sds v0.61.0 // indirect
79-
github.com/DataDog/datadog-agent/pkg/logs/sender v0.61.0 // indirect
80-
github.com/DataDog/datadog-agent/pkg/logs/sources v0.61.0 // indirect
81-
github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.61.0 // indirect
82-
github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.61.0 // indirect
60+
github.com/DataDog/datadog-agent/comp/trace/compression/def v0.62.2 // indirect
61+
github.com/DataDog/datadog-agent/comp/trace/compression/impl-gzip v0.62.2 // indirect
62+
github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.62.2 // indirect
63+
github.com/DataDog/datadog-agent/pkg/config/env v0.62.2 // indirect
64+
github.com/DataDog/datadog-agent/pkg/config/mock v0.62.2 // indirect
65+
github.com/DataDog/datadog-agent/pkg/config/model v0.62.2 // indirect
66+
github.com/DataDog/datadog-agent/pkg/config/nodetreemodel v0.62.2 // indirect
67+
github.com/DataDog/datadog-agent/pkg/config/setup v0.62.2 // indirect
68+
github.com/DataDog/datadog-agent/pkg/config/structure v0.62.2 // indirect
69+
github.com/DataDog/datadog-agent/pkg/config/teeconfig v0.62.2 // indirect
70+
github.com/DataDog/datadog-agent/pkg/config/utils v0.62.2 // indirect
71+
github.com/DataDog/datadog-agent/pkg/logs/auditor v0.62.2 // indirect
72+
github.com/DataDog/datadog-agent/pkg/logs/client v0.62.2 // indirect
73+
github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.62.2 // indirect
74+
github.com/DataDog/datadog-agent/pkg/logs/message v0.62.2 // indirect
75+
github.com/DataDog/datadog-agent/pkg/logs/metrics v0.62.2 // indirect
76+
github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.62.2 // indirect
77+
github.com/DataDog/datadog-agent/pkg/logs/processor v0.62.2 // indirect
78+
github.com/DataDog/datadog-agent/pkg/logs/sds v0.62.2 // indirect
79+
github.com/DataDog/datadog-agent/pkg/logs/sender v0.62.2 // indirect
80+
github.com/DataDog/datadog-agent/pkg/logs/sources v0.62.2 // indirect
81+
github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.62.2 // indirect
82+
github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.62.2 // indirect
8383
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.61.0 // indirect
84-
github.com/DataDog/datadog-agent/pkg/status/health v0.61.0 // indirect
85-
github.com/DataDog/datadog-agent/pkg/telemetry v0.61.0 // indirect
86-
github.com/DataDog/datadog-agent/pkg/util/backoff v0.61.0 // indirect
84+
github.com/DataDog/datadog-agent/pkg/status/health v0.62.2 // indirect
85+
github.com/DataDog/datadog-agent/pkg/telemetry v0.62.2 // indirect
86+
github.com/DataDog/datadog-agent/pkg/util/backoff v0.62.2 // indirect
8787
github.com/DataDog/datadog-agent/pkg/util/cgroups v0.61.0 // indirect
88-
github.com/DataDog/datadog-agent/pkg/util/executable v0.61.0 // indirect
89-
github.com/DataDog/datadog-agent/pkg/util/filesystem v0.61.0 // indirect
90-
github.com/DataDog/datadog-agent/pkg/util/fxutil v0.61.0 // indirect
91-
github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.61.0 // indirect
92-
github.com/DataDog/datadog-agent/pkg/util/http v0.61.0 // indirect
88+
github.com/DataDog/datadog-agent/pkg/util/executable v0.62.2 // indirect
89+
github.com/DataDog/datadog-agent/pkg/util/filesystem v0.62.2 // indirect
90+
github.com/DataDog/datadog-agent/pkg/util/fxutil v0.62.2 // indirect
91+
github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.62.2 // indirect
92+
github.com/DataDog/datadog-agent/pkg/util/http v0.62.2 // indirect
9393
github.com/DataDog/datadog-agent/pkg/util/log v0.64.0-devel.0.20250129111638-01c8fb06949e // indirect
94-
github.com/DataDog/datadog-agent/pkg/util/optional v0.61.0 // indirect
95-
github.com/DataDog/datadog-agent/pkg/util/pointer v0.61.0 // indirect
96-
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.61.0 // indirect
97-
github.com/DataDog/datadog-agent/pkg/util/startstop v0.61.0 // indirect
98-
github.com/DataDog/datadog-agent/pkg/util/statstracker v0.61.0 // indirect
99-
github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect
100-
github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect
101-
github.com/DataDog/datadog-agent/pkg/util/winutil v0.61.0 // indirect
102-
github.com/DataDog/datadog-agent/pkg/version v0.61.0 // indirect
103-
github.com/DataDog/datadog-api-client-go/v2 v2.34.0 // indirect
94+
github.com/DataDog/datadog-agent/pkg/util/optional v0.62.2 // indirect
95+
github.com/DataDog/datadog-agent/pkg/util/pointer v0.62.2 // indirect
96+
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.62.2 // indirect
97+
github.com/DataDog/datadog-agent/pkg/util/startstop v0.62.2 // indirect
98+
github.com/DataDog/datadog-agent/pkg/util/statstracker v0.62.2 // indirect
99+
github.com/DataDog/datadog-agent/pkg/util/system v0.62.2 // indirect
100+
github.com/DataDog/datadog-agent/pkg/util/system/socket v0.62.2 // indirect
101+
github.com/DataDog/datadog-agent/pkg/util/winutil v0.62.2 // indirect
102+
github.com/DataDog/datadog-agent/pkg/version v0.62.2 // indirect
103+
github.com/DataDog/datadog-api-client-go/v2 v2.35.0 // indirect
104104
github.com/DataDog/dd-sensitive-data-scanner/sds-go/go v0.0.0-20240816154533-f7f9beb53a42 // indirect
105105
github.com/DataDog/go-sqllexer v0.0.20 // indirect
106106
github.com/DataDog/go-tuf v1.1.0-0.5.2 // indirect
@@ -175,7 +175,7 @@ require (
175175
github.com/hashicorp/golang-lru v1.0.2 // indirect
176176
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
177177
github.com/hashicorp/hcl v1.0.1-vault-5 // indirect
178-
github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95 // indirect
178+
github.com/hectane/go-acl v0.0.0-20230122075934-ca0b05cb1adb // indirect
179179
github.com/iancoleman/strcase v0.3.0 // indirect
180180
github.com/imdario/mergo v0.3.16 // indirect
181181
github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -309,7 +309,7 @@ require (
309309
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
310310
go.uber.org/atomic v1.11.0 // indirect
311311
go.uber.org/dig v1.18.0 // indirect
312-
go.uber.org/fx v1.22.2 // indirect
312+
go.uber.org/fx v1.23.0 // indirect
313313
go.uber.org/multierr v1.11.0 // indirect
314314
golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c // indirect
315315
golang.org/x/net v0.34.0 // indirect

0 commit comments

Comments
 (0)