Skip to content

Commit 8f0f6c5

Browse files
codebotenf7o
authored andcommitted
[receiver/azureeventhub] update scope name for consistency (open-telemetry#34611)
Update the scope name for telemetry produced by the azureeventhubreceiver from otelcol/azureeventhubreceiver to github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureeventhubreceiver Part of open-telemetry/opentelemetry-collector#9494 --------- Signed-off-by: Alex Boten <[email protected]>
1 parent 4629532 commit 8f0f6c5

File tree

3 files changed

+30
-7
lines changed

3 files changed

+30
-7
lines changed

.chloggen/codeboten_more-scope-5.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: breaking
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: azureeventhubreceiver
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: "Update the scope name for telemetry produced by the azureeventhubreceiver from `otelcol/azureeventhubreceiver` to `github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureeventhubreceiver`"
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: [34611]
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:
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: []

receiver/azureeventhubreceiver/azureresourcemetrics_unmarshaler.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@ import (
1717
"go.opentelemetry.io/collector/pdata/pmetric"
1818
conventions "go.opentelemetry.io/collector/semconv/v1.13.0"
1919
"go.uber.org/zap"
20+
21+
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureeventhubreceiver/internal/metadata"
2022
)
2123

2224
const (
2325
azureResourceID = "azure.resource.id"
24-
scopeName = "otelcol/azureresourcemetrics"
2526
)
2627

2728
type azureResourceMetricsUnmarshaler struct {
@@ -75,7 +76,7 @@ func (r azureResourceMetricsUnmarshaler) UnmarshalMetrics(event *eventhub.Event)
7576

7677
resourceMetrics := md.ResourceMetrics().AppendEmpty()
7778
resource := resourceMetrics.Resource()
78-
resource.Attributes().PutStr(conventions.AttributeTelemetrySDKName, receiverScopeName)
79+
resource.Attributes().PutStr(conventions.AttributeTelemetrySDKName, metadata.ScopeName)
7980
resource.Attributes().PutStr(conventions.AttributeTelemetrySDKLanguage, conventions.AttributeTelemetrySDKLanguageGo)
8081
resource.Attributes().PutStr(conventions.AttributeTelemetrySDKVersion, r.buildInfo.Version)
8182
resource.Attributes().PutStr(conventions.AttributeCloudProvider, conventions.AttributeCloudProviderAzure)

receiver/azureeventhubreceiver/factory.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ import (
1515
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureeventhubreceiver/internal/metadata"
1616
)
1717

18-
var (
19-
// The receiver scope name
20-
receiverScopeName = "otelcol/" + metadata.Type.String() + "receiver"
21-
)
22-
2318
var (
2419
errUnexpectedConfigurationType = errors.New("failed to cast configuration to azure event hub config")
2520
)

0 commit comments

Comments
 (0)