Skip to content

Commit 664ecdc

Browse files
authored
[exporter/datadog] Put back the otelcol prefix on internal metrics (#34807)
**Description:** Put back the `otelcol_` prefix for Datadog internal metrics on trace and APM stats exporting **Link to tracking Issue:** Recovers these metrics from an upstream breaking change. See open-telemetry/opentelemetry-collector#9759 and open-telemetry/opentelemetry-collector#10940.
1 parent af9dcb3 commit 664ecdc

File tree

13 files changed

+247
-72
lines changed

13 files changed

+247
-72
lines changed

.chloggen/dd-connector-prefix.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: bug_fix
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: datadogconnector
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: "Put back the `otelcol_` prefix for Datadog internal metrics on trace and APM stats exporting"
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: [34807]
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: "Recovers these metrics from an upstream breaking change. See https://github.com/open-telemetry/opentelemetry-collector/pull/9759 and https://github.com/open-telemetry/opentelemetry-collector/pull/10940."
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: []

.chloggen/dd-exporter-prefix.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: bug_fix
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: datadogexporter
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: "Put back the `otelcol_` prefix for Datadog internal metrics on trace and APM stats exporting"
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: [34807]
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: "Recovers these metrics from an upstream breaking change. See https://github.com/open-telemetry/opentelemetry-collector/pull/9759 and https://github.com/open-telemetry/opentelemetry-collector/pull/10940."
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/otelcontribcol/go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -352,11 +352,11 @@ require (
352352
github.com/DataDog/go-sqllexer v0.0.12 // indirect
353353
github.com/DataDog/go-tuf v1.1.0-0.5.2 // indirect
354354
github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee // indirect
355-
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.18.0 // indirect
356-
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.18.0 // indirect
357-
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.18.0 // indirect
358-
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.18.0 // indirect
359-
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.18.0 // indirect
355+
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.19.0 // indirect
356+
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.19.0 // indirect
357+
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.19.0 // indirect
358+
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.19.0 // indirect
359+
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.19.0 // indirect
360360
github.com/DataDog/sketches-go v1.4.6 // indirect
361361
github.com/DataDog/viper v1.13.5 // indirect
362362
github.com/DataDog/zstd v1.5.5 // indirect

cmd/otelcontribcol/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.

connector/datadogconnector/go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ require (
88
github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.12
99
github.com/DataDog/datadog-agent/pkg/trace v0.57.0-devel.0.20240722160158-ad956a31a730
1010
github.com/DataDog/datadog-go/v5 v5.5.0
11-
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.18.0
12-
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.18.0
11+
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.19.0
12+
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.19.0
1313
github.com/google/go-cmp v0.6.0
1414
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.107.0
1515
github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.107.0
@@ -96,9 +96,9 @@ require (
9696
github.com/DataDog/go-sqllexer v0.0.12 // indirect
9797
github.com/DataDog/go-tuf v1.1.0-0.5.2 // indirect
9898
github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee // indirect
99-
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.18.0 // indirect
100-
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.18.0 // indirect
101-
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.18.0 // indirect
99+
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.19.0 // indirect
100+
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.19.0 // indirect
101+
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.19.0 // indirect
102102
github.com/DataDog/sketches-go v1.4.6 // indirect
103103
github.com/DataDog/viper v1.13.5 // indirect
104104
github.com/DataDog/zstd v1.5.5 // indirect

connector/datadogconnector/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.

exporter/datadogexporter/go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ require (
3131
github.com/DataDog/datadog-api-client-go/v2 v2.29.0
3232
github.com/DataDog/datadog-go/v5 v5.5.0
3333
github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee
34-
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.18.0
35-
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.18.0
36-
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.18.0
37-
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.18.0
38-
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.18.0
34+
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.19.0
35+
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.19.0
36+
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.19.0
37+
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.19.0
38+
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.19.0
3939
github.com/DataDog/sketches-go v1.4.6 // indirect
4040
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.1
4141
github.com/aws/aws-sdk-go v1.55.5

exporter/datadogexporter/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.

exporter/datadogexporter/integrationtest/go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,11 @@ require (
107107
github.com/DataDog/go-sqllexer v0.0.12 // indirect
108108
github.com/DataDog/go-tuf v1.1.0-0.5.2 // indirect
109109
github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee // indirect
110-
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.18.0 // indirect
111-
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.18.0 // indirect
112-
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.18.0 // indirect
113-
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.18.0 // indirect
114-
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.18.0 // indirect
110+
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.19.0 // indirect
111+
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.19.0 // indirect
112+
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.19.0 // indirect
113+
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.19.0 // indirect
114+
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.19.0 // indirect
115115
github.com/DataDog/sketches-go v1.4.6 // indirect
116116
github.com/DataDog/viper v1.13.5 // indirect
117117
github.com/DataDog/zstd v1.5.5 // indirect

0 commit comments

Comments
 (0)