Skip to content

Commit

Permalink
[exporter/datadog] Put back the otelcol prefix on internal metrics (o…
Browse files Browse the repository at this point in the history
…pen-telemetry#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.
  • Loading branch information
songy23 authored and f7o committed Sep 12, 2024
1 parent 08b72b2 commit 216d780
Show file tree
Hide file tree
Showing 13 changed files with 247 additions and 72 deletions.
27 changes: 27 additions & 0 deletions .chloggen/dd-connector-prefix.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: bug_fix

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: datadogconnector

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: "Put back the `otelcol_` prefix for Datadog internal metrics on trace and APM stats exporting"

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [34807]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
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."

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: []
27 changes: 27 additions & 0 deletions .chloggen/dd-exporter-prefix.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: bug_fix

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: datadogexporter

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: "Put back the `otelcol_` prefix for Datadog internal metrics on trace and APM stats exporting"

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [34807]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
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."

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: []
10 changes: 5 additions & 5 deletions cmd/otelcontribcol/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -352,11 +352,11 @@ require (
github.com/DataDog/go-sqllexer v0.0.12 // indirect
github.com/DataDog/go-tuf v1.1.0-0.5.2 // indirect
github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.18.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.18.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.18.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.18.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.18.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.19.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.19.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.19.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.19.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.19.0 // indirect
github.com/DataDog/sketches-go v1.4.6 // indirect
github.com/DataDog/viper v1.13.5 // indirect
github.com/DataDog/zstd v1.5.5 // indirect
Expand Down
24 changes: 12 additions & 12 deletions cmd/otelcontribcol/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions connector/datadogconnector/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ require (
github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.12
github.com/DataDog/datadog-agent/pkg/trace v0.57.0-devel.0.20240722160158-ad956a31a730
github.com/DataDog/datadog-go/v5 v5.5.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.18.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.18.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.19.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.19.0
github.com/google/go-cmp v0.6.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.107.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.107.0
Expand Down Expand Up @@ -96,9 +96,9 @@ require (
github.com/DataDog/go-sqllexer v0.0.12 // indirect
github.com/DataDog/go-tuf v1.1.0-0.5.2 // indirect
github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.18.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.18.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.18.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.19.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.19.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.19.0 // indirect
github.com/DataDog/sketches-go v1.4.6 // indirect
github.com/DataDog/viper v1.13.5 // indirect
github.com/DataDog/zstd v1.5.5 // indirect
Expand Down
24 changes: 12 additions & 12 deletions connector/datadogconnector/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions exporter/datadogexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ require (
github.com/DataDog/datadog-api-client-go/v2 v2.29.0
github.com/DataDog/datadog-go/v5 v5.5.0
github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.18.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.18.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.18.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.18.0
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.18.0
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.19.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.19.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.19.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.19.0
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.19.0
github.com/DataDog/sketches-go v1.4.6 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.1
github.com/aws/aws-sdk-go v1.55.5
Expand Down
24 changes: 12 additions & 12 deletions exporter/datadogexporter/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions exporter/datadogexporter/integrationtest/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,11 @@ require (
github.com/DataDog/go-sqllexer v0.0.12 // indirect
github.com/DataDog/go-tuf v1.1.0-0.5.2 // indirect
github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.18.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.18.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.18.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.18.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.18.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.19.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.19.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.19.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.19.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.19.0 // indirect
github.com/DataDog/sketches-go v1.4.6 // indirect
github.com/DataDog/viper v1.13.5 // indirect
github.com/DataDog/zstd v1.5.5 // indirect
Expand Down
Loading

0 comments on commit 216d780

Please sign in to comment.