From b887339a9e7beb7ebdb4c705a92c17a59e7e85c3 Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Tue, 6 Aug 2024 16:21:33 -0700 Subject: [PATCH 1/2] [receiver/solacereceiver] update scope name for consistency Update the scope name for telemetry produced by the solacereceiverreceiver from otelcol/solacereceiver to github.com/open-telemetry/opentelemetry-collector-contrib/receiver/solacereceiverreceiver Part of https://github.com/open-telemetry/opentelemetry-collector/issues/9494 Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- ...codeboten_update-scope-solacereceiver.yaml | 27 +++++++++++++++++++ .../internal/metadata/generated_telemetry.go | 4 +-- .../metadata/generated_telemetry_test.go | 4 +-- receiver/solacereceiver/metadata.yaml | 1 - 4 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 .chloggen/codeboten_update-scope-solacereceiver.yaml diff --git a/.chloggen/codeboten_update-scope-solacereceiver.yaml b/.chloggen/codeboten_update-scope-solacereceiver.yaml new file mode 100644 index 000000000000..dd927553cadc --- /dev/null +++ b/.chloggen/codeboten_update-scope-solacereceiver.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: solacereceiver + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Update the scope name for telemetry produced by the solacereceiver from otelcol/solacereceiver to github.com/open-telemetry/opentelemetry-collector-contrib/receiver/solacereceiver + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [34429] + +# (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/solacereceiver/internal/metadata/generated_telemetry.go b/receiver/solacereceiver/internal/metadata/generated_telemetry.go index 8aaaf9e11bcf..00c54f224f75 100644 --- a/receiver/solacereceiver/internal/metadata/generated_telemetry.go +++ b/receiver/solacereceiver/internal/metadata/generated_telemetry.go @@ -14,11 +14,11 @@ import ( ) func Meter(settings component.TelemetrySettings) metric.Meter { - return settings.MeterProvider.Meter("otelcol/solacereceiver") + return settings.MeterProvider.Meter("github.com/open-telemetry/opentelemetry-collector-contrib/receiver/solacereceiver") } func Tracer(settings component.TelemetrySettings) trace.Tracer { - return settings.TracerProvider.Tracer("otelcol/solacereceiver") + return settings.TracerProvider.Tracer("github.com/open-telemetry/opentelemetry-collector-contrib/receiver/solacereceiver") } // TelemetryBuilder provides an interface for components to report telemetry diff --git a/receiver/solacereceiver/internal/metadata/generated_telemetry_test.go b/receiver/solacereceiver/internal/metadata/generated_telemetry_test.go index bd6841d6ccfc..83ba4e23d2df 100644 --- a/receiver/solacereceiver/internal/metadata/generated_telemetry_test.go +++ b/receiver/solacereceiver/internal/metadata/generated_telemetry_test.go @@ -49,14 +49,14 @@ func TestProviders(t *testing.T) { meter := Meter(set) if m, ok := meter.(mockMeter); ok { - require.Equal(t, "otelcol/solacereceiver", m.name) + require.Equal(t, "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/solacereceiver", m.name) } else { require.Fail(t, "returned Meter not mockMeter") } tracer := Tracer(set) if m, ok := tracer.(mockTracer); ok { - require.Equal(t, "otelcol/solacereceiver", m.name) + require.Equal(t, "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/solacereceiver", m.name) } else { require.Fail(t, "returned Meter not mockTracer") } diff --git a/receiver/solacereceiver/metadata.yaml b/receiver/solacereceiver/metadata.yaml index c4df3ce89d8b..c7fa4a0b4f5d 100644 --- a/receiver/solacereceiver/metadata.yaml +++ b/receiver/solacereceiver/metadata.yaml @@ -1,5 +1,4 @@ type: solace -scope_name: otelcol/solacereceiver status: class: receiver From 87f4ea16b13b14c7eea2dfbeacac8728802da84c Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Wed, 7 Aug 2024 07:09:10 -0700 Subject: [PATCH 2/2] Update .chloggen/codeboten_update-scope-solacereceiver.yaml --- .chloggen/codeboten_update-scope-solacereceiver.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.chloggen/codeboten_update-scope-solacereceiver.yaml b/.chloggen/codeboten_update-scope-solacereceiver.yaml index dd927553cadc..bd25acb4a88a 100644 --- a/.chloggen/codeboten_update-scope-solacereceiver.yaml +++ b/.chloggen/codeboten_update-scope-solacereceiver.yaml @@ -10,7 +10,7 @@ component: solacereceiver note: Update the scope name for telemetry produced by the solacereceiver from otelcol/solacereceiver to github.com/open-telemetry/opentelemetry-collector-contrib/receiver/solacereceiver # Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. -issues: [34429] +issues: [34466] # (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.