Skip to content

Commit f2eff38

Browse files
authored
[pkg/translator/azure] update scope name (#34712)
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]>
1 parent 0fb0480 commit f2eff38

File tree

4 files changed

+35
-9
lines changed

4 files changed

+35
-9
lines changed
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: azuretranslator
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: "The scope name has been updated from `otelcol/azureresourcelogs` and `otelcol/azureresourcetraces` to `github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure`"
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: [34712]
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: []

pkg/translator/azure/resourcelogs_to_logs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020

2121
const (
2222
// Constants for OpenTelemetry Specs
23-
scopeName = "otelcol/azureresourcelogs"
23+
scopeName = "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure"
2424

2525
// Constants for Azure Log Records
2626
azureCategory = "azure.category"

pkg/translator/azure/resourcelogs_to_logs_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ func TestUnmarshalLogs(t *testing.T) {
368368
expectedMinimum := plog.NewLogs()
369369
resourceLogs := expectedMinimum.ResourceLogs().AppendEmpty()
370370
scopeLogs := resourceLogs.ScopeLogs().AppendEmpty()
371-
scopeLogs.Scope().SetName("otelcol/azureresourcelogs")
371+
scopeLogs.Scope().SetName("github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure")
372372
scopeLogs.Scope().SetVersion(testBuildInfo.Version)
373373
lr := scopeLogs.LogRecords().AppendEmpty()
374374
resourceLogs.Resource().Attributes().PutStr(azureResourceID, "/RESOURCE_ID")
@@ -378,7 +378,7 @@ func TestUnmarshalLogs(t *testing.T) {
378378
resourceLogs = expectedMinimum2.ResourceLogs().AppendEmpty()
379379
resourceLogs.Resource().Attributes().PutStr(azureResourceID, "/RESOURCE_ID")
380380
scopeLogs = resourceLogs.ScopeLogs().AppendEmpty()
381-
scopeLogs.Scope().SetName("otelcol/azureresourcelogs")
381+
scopeLogs.Scope().SetName("github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure")
382382
scopeLogs.Scope().SetVersion(testBuildInfo.Version)
383383
logRecords := scopeLogs.LogRecords()
384384
lr = logRecords.AppendEmpty()
@@ -390,15 +390,15 @@ func TestUnmarshalLogs(t *testing.T) {
390390
resourceLogs = expectedMaximum.ResourceLogs().AppendEmpty()
391391
resourceLogs.Resource().Attributes().PutStr(azureResourceID, "/RESOURCE_ID-1")
392392
scopeLogs = resourceLogs.ScopeLogs().AppendEmpty()
393-
scopeLogs.Scope().SetName("otelcol/azureresourcelogs")
393+
scopeLogs.Scope().SetName("github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure")
394394
scopeLogs.Scope().SetVersion(testBuildInfo.Version)
395395
lr = scopeLogs.LogRecords().AppendEmpty()
396396
maximumLogRecord1.CopyTo(lr)
397397

398398
resourceLogs = expectedMaximum.ResourceLogs().AppendEmpty()
399399
resourceLogs.Resource().Attributes().PutStr(azureResourceID, "/RESOURCE_ID-2")
400400
scopeLogs = resourceLogs.ScopeLogs().AppendEmpty()
401-
scopeLogs.Scope().SetName("otelcol/azureresourcelogs")
401+
scopeLogs.Scope().SetName("github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure")
402402
scopeLogs.Scope().SetVersion(testBuildInfo.Version)
403403
lr = scopeLogs.LogRecords().AppendEmpty()
404404
lr2 := scopeLogs.LogRecords().AppendEmpty()
@@ -409,7 +409,7 @@ func TestUnmarshalLogs(t *testing.T) {
409409
resourceLogs = expectedBadLevel.ResourceLogs().AppendEmpty()
410410
resourceLogs.Resource().Attributes().PutStr(azureResourceID, "/RESOURCE_ID")
411411
scopeLogs = resourceLogs.ScopeLogs().AppendEmpty()
412-
scopeLogs.Scope().SetName("otelcol/azureresourcelogs")
412+
scopeLogs.Scope().SetName("github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure")
413413
scopeLogs.Scope().SetVersion(testBuildInfo.Version)
414414
lr = scopeLogs.LogRecords().AppendEmpty()
415415
badLevelLogRecord.CopyTo(lr)
@@ -418,7 +418,7 @@ func TestUnmarshalLogs(t *testing.T) {
418418
resourceLogs = expectedBadTime.ResourceLogs().AppendEmpty()
419419
resourceLogs.Resource().Attributes().PutStr(azureResourceID, "/RESOURCE_ID")
420420
scopeLogs = resourceLogs.ScopeLogs().AppendEmpty()
421-
scopeLogs.Scope().SetName("otelcol/azureresourcelogs")
421+
scopeLogs.Scope().SetName("github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure")
422422
scopeLogs.Scope().SetVersion(testBuildInfo.Version)
423423
lr = scopeLogs.LogRecords().AppendEmpty()
424424
badTimeLogRecord.CopyTo(lr)

pkg/translator/azure/resources_to_traces.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import (
1818
const (
1919
// Constants for OpenTelemetry Specs
2020
traceAzureResourceID = "azure.resource.id"
21-
traceScopeName = "otelcol/azureresourcetraces"
2221
)
2322

2423
type azureTracesRecords struct {
@@ -79,7 +78,7 @@ func (r TracesUnmarshaler) UnmarshalTraces(buf []byte) (ptrace.Traces, error) {
7978

8079
resourceTraces := t.ResourceSpans().AppendEmpty()
8180
resource := resourceTraces.Resource()
82-
resource.Attributes().PutStr(conventions.AttributeTelemetrySDKName, traceScopeName)
81+
resource.Attributes().PutStr(conventions.AttributeTelemetrySDKName, scopeName)
8382
resource.Attributes().PutStr(conventions.AttributeTelemetrySDKLanguage, conventions.AttributeTelemetrySDKLanguageGo)
8483
resource.Attributes().PutStr(conventions.AttributeTelemetrySDKVersion, r.Version)
8584
resource.Attributes().PutStr(conventions.AttributeCloudProvider, conventions.AttributeCloudProviderAzure)

0 commit comments

Comments
 (0)