Skip to content

Commit

Permalink
[receiver/datadog] update scope name (open-telemetry#34711)
Browse files Browse the repository at this point in the history
Update scope name to follow the standard of the other components.

Part of open-telemetry/opentelemetry-collector#9494

---------

Signed-off-by: Alex Boten <[email protected]>
  • Loading branch information
codeboten authored and f7o committed Sep 12, 2024
1 parent e99123b commit a065005
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 7 deletions.
27 changes: 27 additions & 0 deletions .chloggen/codeboten_scope-datadogreceiver.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: 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: []
2 changes: 1 addition & 1 deletion receiver/datadogreceiver/internal/translator/batcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 2 additions & 5 deletions receiver/datadogreceiver/internal/translator/testutil.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down Expand Up @@ -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())
}
Expand Down

0 comments on commit a065005

Please sign in to comment.