Skip to content

Commit

Permalink
[exporter/datadog] Stop prefixing 3 HTTP metrics (#36265)
Browse files Browse the repository at this point in the history
#### Description

Stop prefixing `http_server_duration`, `http_server_request_size` and
`http_server_response_size` with `otelcol`.

Those metrics used to have the `otelcol` prefix if they are from
collector internal metrics before v0.106, then the prefix was removed.
We put back the prefix in v0.108 but the same metric can be from SDKs as
well. Stop prefixing them be consistent with
https://opentelemetry.io/docs/collector/internal-telemetry/#lists-of-internal-metrics
  • Loading branch information
songy23 authored Nov 8, 2024
1 parent 2a3fbd0 commit d0f4d09
Show file tree
Hide file tree
Showing 7 changed files with 78 additions and 51 deletions.
27 changes: 27 additions & 0 deletions .chloggen/datadog-metric-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: breaking

# 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: "Stop prefixing `http_server_duration`, `http_server_request_size` and `http_server_response_size` with `otelcol`"

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

# (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: "These metrics can be from SDKs rather than collector. Stop prefixing them to be consistent with https://opentelemetry.io/docs/collector/internal-telemetry/#lists-of-internal-metrics"

# 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 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.58.2
github.com/DataDog/datadog-agent/pkg/trace v0.59.0-devel.0.20240911192058-0c2181220f85
github.com/DataDog/datadog-go/v5 v5.5.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.20.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.20.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.21.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.21.0
github.com/google/go-cmp v0.6.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.113.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/datadog v0.113.0
Expand Down Expand Up @@ -101,9 +101,9 @@ require (
github.com/DataDog/go-sqllexer v0.0.14 // 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.20.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.20.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.20.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.21.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.21.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.21.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.31.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.20.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.20.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.20.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.20.0
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.20.0
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.21.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.21.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.21.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.21.0
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.21.0
github.com/DataDog/sketches-go v1.4.6 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.25.0
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 @@ -109,11 +109,11 @@ require (
github.com/DataDog/go-sqllexer v0.0.14 // 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.20.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.20.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.20.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.20.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.20.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.21.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.21.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.21.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.21.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.21.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 exporter/datadogexporter/integrationtest/go.sum

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

0 comments on commit d0f4d09

Please sign in to comment.