From f2f7fc8d1dd99653a5c6031c2197abf69fcd8b28 Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Fri, 16 Aug 2024 01:10:16 -0700 Subject: [PATCH] [receiver/datadog] update scope name (#34711) Update scope name to follow the standard of the other components. Part of open-telemetry/opentelemetry-collector#9494 --------- Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- .../codeboten_scope-datadogreceiver.yaml | 27 +++++++++++++++++++ .../internal/translator/batcher.go | 2 +- .../internal/translator/series_test.go | 2 +- .../internal/translator/testutil.go | 7 ++--- 4 files changed, 31 insertions(+), 7 deletions(-) create mode 100644 .chloggen/codeboten_scope-datadogreceiver.yaml diff --git a/.chloggen/codeboten_scope-datadogreceiver.yaml b/.chloggen/codeboten_scope-datadogreceiver.yaml new file mode 100644 index 000000000000..828c9e040211 --- /dev/null +++ b/.chloggen/codeboten_scope-datadogreceiver.yaml @@ -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: datadogreceiver + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: "The scope name has been updated from `otelcol/datadogreceiver` to `github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datadogreceiver/internal/translator`" + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [34711] + +# (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: + +# 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: [] diff --git a/receiver/datadogreceiver/internal/translator/batcher.go b/receiver/datadogreceiver/internal/translator/batcher.go index 72ddb5dd4265..bec1644a7614 100644 --- a/receiver/datadogreceiver/internal/translator/batcher.go +++ b/receiver/datadogreceiver/internal/translator/batcher.go @@ -98,7 +98,7 @@ func (d dimensions) Resource() pcommon.Resource { func (d dimensions) Scope() pcommon.InstrumentationScope { scope := pcommon.NewInstrumentationScope() - scope.SetName("otelcol/datadogreceiver") + scope.SetName("github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datadogreceiver/internal/translator") scope.SetVersion(d.buildInfo) d.scopeAttrs.CopyTo(scope.Attributes()) return scope diff --git a/receiver/datadogreceiver/internal/translator/series_test.go b/receiver/datadogreceiver/internal/translator/series_test.go index 0f633a4729ec..23bcb0f041f9 100644 --- a/receiver/datadogreceiver/internal/translator/series_test.go +++ b/receiver/datadogreceiver/internal/translator/series_test.go @@ -414,7 +414,7 @@ func TestTranslateSeriesV2(t *testing.T) { require.Equal(t, 1, result.ResourceMetrics().At(0).ScopeMetrics().Len()) require.Equal(t, 1, result.ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics().Len()) - require.Equal(t, "otelcol/datadogreceiver", result.ResourceMetrics().At(0).ScopeMetrics().At(0).Scope().Name()) + require.Equal(t, "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datadogreceiver/internal/translator", result.ResourceMetrics().At(0).ScopeMetrics().At(0).Scope().Name()) require.Equal(t, component.NewDefaultBuildInfo().Version, result.ResourceMetrics().At(0).ScopeMetrics().At(0).Scope().Version()) metric := result.ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics().At(0) diff --git a/receiver/datadogreceiver/internal/translator/testutil.go b/receiver/datadogreceiver/internal/translator/testutil.go index 986725c53596..060e3030a07d 100644 --- a/receiver/datadogreceiver/internal/translator/testutil.go +++ b/receiver/datadogreceiver/internal/translator/testutil.go @@ -12,10 +12,7 @@ import ( "go.opentelemetry.io/collector/pdata/pmetric" ) -const ( - scopeName string = "otelcol/datadogreceiver" - aggregationTemporality = pmetric.AggregationTemporalityDelta -) +const aggregationTemporality = pmetric.AggregationTemporalityDelta func createMetricsTranslator() *MetricsTranslator { mt := NewMetricsTranslator(component.BuildInfo{ @@ -43,7 +40,7 @@ func requireScopeMetrics(t *testing.T, result pmetric.Metrics, expectedScopeMetr } func requireScope(t *testing.T, result pmetric.Metrics, expectedAttrs pcommon.Map, expectedVersion string) { - require.Equal(t, scopeName, result.ResourceMetrics().At(0).ScopeMetrics().At(0).Scope().Name()) + require.Equal(t, "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datadogreceiver/internal/translator", result.ResourceMetrics().At(0).ScopeMetrics().At(0).Scope().Name()) require.Equal(t, expectedVersion, result.ResourceMetrics().At(0).ScopeMetrics().At(0).Scope().Version()) require.Equal(t, expectedAttrs, result.ResourceMetrics().At(0).ScopeMetrics().At(0).Scope().Attributes()) }