From 37ce11d7831486594eccdda069db72a2b66c7360 Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Thu, 8 Aug 2024 13:46:37 -0700 Subject: [PATCH 1/2] [processors] updating remaining processor scope names Doing this in a single PR as there are no additional changes other than running the generation. Part of open-telemetry/opentelemetry-collector#9494 Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- ...date-scope-deltatocumulativeprocessor.yaml | 27 +++++++++++++++++++ ...odeboten_update-scope-filterprocessor.yaml | 27 +++++++++++++++++++ ...en_update-scope-groupbyattrsprocessor.yaml | 27 +++++++++++++++++++ ...en_update-scope-groupbytraceprocessor.yaml | 27 +++++++++++++++++++ ...n_update-scope-k8sattributesprocessor.yaml | 27 +++++++++++++++++++ ...e-scope-probabilisticsamplerprocessor.yaml | 27 +++++++++++++++++++ ...deboten_update-scope-routingprocessor.yaml | 27 +++++++++++++++++++ ...en_update-scope-tailsamplingprocessor.yaml | 27 +++++++++++++++++++ .../internal/metadata/generated_telemetry.go | 4 +-- .../metadata/generated_telemetry_test.go | 4 +-- .../deltatocumulativeprocessor/metadata.yaml | 1 - .../internal/metadata/generated_telemetry.go | 4 +-- .../metadata/generated_telemetry_test.go | 4 +-- processor/filterprocessor/metadata.yaml | 1 - .../internal/metadata/generated_telemetry.go | 4 +-- .../metadata/generated_telemetry_test.go | 4 +-- processor/groupbyattrsprocessor/metadata.yaml | 1 - .../internal/metadata/generated_telemetry.go | 4 +-- .../metadata/generated_telemetry_test.go | 4 +-- processor/groupbytraceprocessor/metadata.yaml | 1 - .../internal/metadata/generated_telemetry.go | 4 +-- .../metadata/generated_telemetry_test.go | 4 +-- .../k8sattributesprocessor/metadata.yaml | 1 - .../internal/metadata/generated_telemetry.go | 4 +-- .../metadata/generated_telemetry_test.go | 4 +-- .../metadata.yaml | 1 - .../internal/metadata/generated_telemetry.go | 4 +-- .../metadata/generated_telemetry_test.go | 4 +-- processor/routingprocessor/metadata.yaml | 1 - .../internal/metadata/generated_telemetry.go | 4 +-- .../metadata/generated_telemetry_test.go | 4 +-- processor/tailsamplingprocessor/metadata.yaml | 1 - 32 files changed, 248 insertions(+), 40 deletions(-) create mode 100644 .chloggen/codeboten_update-scope-deltatocumulativeprocessor.yaml create mode 100644 .chloggen/codeboten_update-scope-filterprocessor.yaml create mode 100644 .chloggen/codeboten_update-scope-groupbyattrsprocessor.yaml create mode 100644 .chloggen/codeboten_update-scope-groupbytraceprocessor.yaml create mode 100644 .chloggen/codeboten_update-scope-k8sattributesprocessor.yaml create mode 100644 .chloggen/codeboten_update-scope-probabilisticsamplerprocessor.yaml create mode 100644 .chloggen/codeboten_update-scope-routingprocessor.yaml create mode 100644 .chloggen/codeboten_update-scope-tailsamplingprocessor.yaml diff --git a/.chloggen/codeboten_update-scope-deltatocumulativeprocessor.yaml b/.chloggen/codeboten_update-scope-deltatocumulativeprocessor.yaml new file mode 100644 index 000000000000..5a0024eeaee2 --- /dev/null +++ b/.chloggen/codeboten_update-scope-deltatocumulativeprocessor.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: deltatocumulativeprocessor + +# 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 deltatocumulativeprocessor from `otelcol/deltatocumulative` to `github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor`" + +# 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/.chloggen/codeboten_update-scope-filterprocessor.yaml b/.chloggen/codeboten_update-scope-filterprocessor.yaml new file mode 100644 index 000000000000..5e933efbb546 --- /dev/null +++ b/.chloggen/codeboten_update-scope-filterprocessor.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: filterprocessor + +# 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 filterprocessor from `otelcol/filter` to `github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor`" + +# 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/.chloggen/codeboten_update-scope-groupbyattrsprocessor.yaml b/.chloggen/codeboten_update-scope-groupbyattrsprocessor.yaml new file mode 100644 index 000000000000..284f7df45cbc --- /dev/null +++ b/.chloggen/codeboten_update-scope-groupbyattrsprocessor.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: groupbyattrsprocessor + +# 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 groupbyattrsprocessor from `otelcol/groupbyattrs` to `github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor`" + +# 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/.chloggen/codeboten_update-scope-groupbytraceprocessor.yaml b/.chloggen/codeboten_update-scope-groupbytraceprocessor.yaml new file mode 100644 index 000000000000..b00517824cea --- /dev/null +++ b/.chloggen/codeboten_update-scope-groupbytraceprocessor.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: groupbytraceprocessor + +# 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 groupbytraceprocessor from `otelcol/groupbytrace` to `github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor`" + +# 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/.chloggen/codeboten_update-scope-k8sattributesprocessor.yaml b/.chloggen/codeboten_update-scope-k8sattributesprocessor.yaml new file mode 100644 index 000000000000..c0318d22137b --- /dev/null +++ b/.chloggen/codeboten_update-scope-k8sattributesprocessor.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: k8sattributesprocessor + +# 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 k8sattributesprocessor from `otelcol/k8sattributes` to `github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor`" + +# 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/.chloggen/codeboten_update-scope-probabilisticsamplerprocessor.yaml b/.chloggen/codeboten_update-scope-probabilisticsamplerprocessor.yaml new file mode 100644 index 000000000000..82bcd84a11e6 --- /dev/null +++ b/.chloggen/codeboten_update-scope-probabilisticsamplerprocessor.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: probabilisticsamplerprocessor + +# 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 probabilisticsamplerprocessor from `otelcol/probabilisticsampler` to `github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor`" + +# 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/.chloggen/codeboten_update-scope-routingprocessor.yaml b/.chloggen/codeboten_update-scope-routingprocessor.yaml new file mode 100644 index 000000000000..70fb8039f461 --- /dev/null +++ b/.chloggen/codeboten_update-scope-routingprocessor.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: routingprocessor + +# 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 routingprocessor from `otelcol/routing` to `github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor`" + +# 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/.chloggen/codeboten_update-scope-tailsamplingprocessor.yaml b/.chloggen/codeboten_update-scope-tailsamplingprocessor.yaml new file mode 100644 index 000000000000..e1c035adf6a2 --- /dev/null +++ b/.chloggen/codeboten_update-scope-tailsamplingprocessor.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: tailsamplingprocessor + +# 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 tailsamplingprocessor from `otelcol/tailsampling` to `github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor`" + +# 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/processor/deltatocumulativeprocessor/internal/metadata/generated_telemetry.go b/processor/deltatocumulativeprocessor/internal/metadata/generated_telemetry.go index 1ee7497b7bfa..75f63aa49698 100644 --- a/processor/deltatocumulativeprocessor/internal/metadata/generated_telemetry.go +++ b/processor/deltatocumulativeprocessor/internal/metadata/generated_telemetry.go @@ -14,11 +14,11 @@ import ( ) func Meter(settings component.TelemetrySettings) metric.Meter { - return settings.MeterProvider.Meter("otelcol/deltatocumulative") + return settings.MeterProvider.Meter("github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor") } func Tracer(settings component.TelemetrySettings) trace.Tracer { - return settings.TracerProvider.Tracer("otelcol/deltatocumulative") + return settings.TracerProvider.Tracer("github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor") } // TelemetryBuilder provides an interface for components to report telemetry diff --git a/processor/deltatocumulativeprocessor/internal/metadata/generated_telemetry_test.go b/processor/deltatocumulativeprocessor/internal/metadata/generated_telemetry_test.go index a4ff6092b731..50d7558d885a 100644 --- a/processor/deltatocumulativeprocessor/internal/metadata/generated_telemetry_test.go +++ b/processor/deltatocumulativeprocessor/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/deltatocumulative", m.name) + require.Equal(t, "github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor", m.name) } else { require.Fail(t, "returned Meter not mockMeter") } tracer := Tracer(set) if m, ok := tracer.(mockTracer); ok { - require.Equal(t, "otelcol/deltatocumulative", m.name) + require.Equal(t, "github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor", m.name) } else { require.Fail(t, "returned Meter not mockTracer") } diff --git a/processor/deltatocumulativeprocessor/metadata.yaml b/processor/deltatocumulativeprocessor/metadata.yaml index 1966284cb1eb..81fd086c3be1 100644 --- a/processor/deltatocumulativeprocessor/metadata.yaml +++ b/processor/deltatocumulativeprocessor/metadata.yaml @@ -1,5 +1,4 @@ type: deltatocumulative -scope_name: otelcol/deltatocumulative status: class: processor diff --git a/processor/filterprocessor/internal/metadata/generated_telemetry.go b/processor/filterprocessor/internal/metadata/generated_telemetry.go index a9c6bf0c2b60..2b102d825d80 100644 --- a/processor/filterprocessor/internal/metadata/generated_telemetry.go +++ b/processor/filterprocessor/internal/metadata/generated_telemetry.go @@ -14,11 +14,11 @@ import ( ) func Meter(settings component.TelemetrySettings) metric.Meter { - return settings.MeterProvider.Meter("otelcol/filter") + return settings.MeterProvider.Meter("github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor") } func Tracer(settings component.TelemetrySettings) trace.Tracer { - return settings.TracerProvider.Tracer("otelcol/filter") + return settings.TracerProvider.Tracer("github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor") } // TelemetryBuilder provides an interface for components to report telemetry diff --git a/processor/filterprocessor/internal/metadata/generated_telemetry_test.go b/processor/filterprocessor/internal/metadata/generated_telemetry_test.go index 65e6db21aa00..c43120883160 100644 --- a/processor/filterprocessor/internal/metadata/generated_telemetry_test.go +++ b/processor/filterprocessor/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/filter", m.name) + require.Equal(t, "github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor", m.name) } else { require.Fail(t, "returned Meter not mockMeter") } tracer := Tracer(set) if m, ok := tracer.(mockTracer); ok { - require.Equal(t, "otelcol/filter", m.name) + require.Equal(t, "github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor", m.name) } else { require.Fail(t, "returned Meter not mockTracer") } diff --git a/processor/filterprocessor/metadata.yaml b/processor/filterprocessor/metadata.yaml index 5474feaa46c5..94e85e87759a 100644 --- a/processor/filterprocessor/metadata.yaml +++ b/processor/filterprocessor/metadata.yaml @@ -1,5 +1,4 @@ type: filter -scope_name: otelcol/filter status: class: processor diff --git a/processor/groupbyattrsprocessor/internal/metadata/generated_telemetry.go b/processor/groupbyattrsprocessor/internal/metadata/generated_telemetry.go index 107307c4e1ee..e0dbfd806d6f 100644 --- a/processor/groupbyattrsprocessor/internal/metadata/generated_telemetry.go +++ b/processor/groupbyattrsprocessor/internal/metadata/generated_telemetry.go @@ -14,11 +14,11 @@ import ( ) func Meter(settings component.TelemetrySettings) metric.Meter { - return settings.MeterProvider.Meter("otelcol/groupbyattrs") + return settings.MeterProvider.Meter("github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor") } func Tracer(settings component.TelemetrySettings) trace.Tracer { - return settings.TracerProvider.Tracer("otelcol/groupbyattrs") + return settings.TracerProvider.Tracer("github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor") } // TelemetryBuilder provides an interface for components to report telemetry diff --git a/processor/groupbyattrsprocessor/internal/metadata/generated_telemetry_test.go b/processor/groupbyattrsprocessor/internal/metadata/generated_telemetry_test.go index 64ef0a52037c..d0d9cd12eeaa 100644 --- a/processor/groupbyattrsprocessor/internal/metadata/generated_telemetry_test.go +++ b/processor/groupbyattrsprocessor/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/groupbyattrs", m.name) + require.Equal(t, "github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor", m.name) } else { require.Fail(t, "returned Meter not mockMeter") } tracer := Tracer(set) if m, ok := tracer.(mockTracer); ok { - require.Equal(t, "otelcol/groupbyattrs", m.name) + require.Equal(t, "github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor", m.name) } else { require.Fail(t, "returned Meter not mockTracer") } diff --git a/processor/groupbyattrsprocessor/metadata.yaml b/processor/groupbyattrsprocessor/metadata.yaml index b1fb3b8a2cd6..23dda73faf7e 100644 --- a/processor/groupbyattrsprocessor/metadata.yaml +++ b/processor/groupbyattrsprocessor/metadata.yaml @@ -1,5 +1,4 @@ type: groupbyattrs -scope_name: otelcol/groupbyattrs status: class: processor diff --git a/processor/groupbytraceprocessor/internal/metadata/generated_telemetry.go b/processor/groupbytraceprocessor/internal/metadata/generated_telemetry.go index 8d6f177c1c50..00759ea53c40 100644 --- a/processor/groupbytraceprocessor/internal/metadata/generated_telemetry.go +++ b/processor/groupbytraceprocessor/internal/metadata/generated_telemetry.go @@ -14,11 +14,11 @@ import ( ) func Meter(settings component.TelemetrySettings) metric.Meter { - return settings.MeterProvider.Meter("otelcol/groupbytrace") + return settings.MeterProvider.Meter("github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor") } func Tracer(settings component.TelemetrySettings) trace.Tracer { - return settings.TracerProvider.Tracer("otelcol/groupbytrace") + return settings.TracerProvider.Tracer("github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor") } // TelemetryBuilder provides an interface for components to report telemetry diff --git a/processor/groupbytraceprocessor/internal/metadata/generated_telemetry_test.go b/processor/groupbytraceprocessor/internal/metadata/generated_telemetry_test.go index 241a710c201a..c358b15f3e28 100644 --- a/processor/groupbytraceprocessor/internal/metadata/generated_telemetry_test.go +++ b/processor/groupbytraceprocessor/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/groupbytrace", m.name) + require.Equal(t, "github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor", m.name) } else { require.Fail(t, "returned Meter not mockMeter") } tracer := Tracer(set) if m, ok := tracer.(mockTracer); ok { - require.Equal(t, "otelcol/groupbytrace", m.name) + require.Equal(t, "github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor", m.name) } else { require.Fail(t, "returned Meter not mockTracer") } diff --git a/processor/groupbytraceprocessor/metadata.yaml b/processor/groupbytraceprocessor/metadata.yaml index 1ff46fea2e8c..ef574c02edbf 100644 --- a/processor/groupbytraceprocessor/metadata.yaml +++ b/processor/groupbytraceprocessor/metadata.yaml @@ -1,5 +1,4 @@ type: groupbytrace -scope_name: otelcol/groupbytrace status: class: processor diff --git a/processor/k8sattributesprocessor/internal/metadata/generated_telemetry.go b/processor/k8sattributesprocessor/internal/metadata/generated_telemetry.go index 22a6a6a1615b..738eb6b76756 100644 --- a/processor/k8sattributesprocessor/internal/metadata/generated_telemetry.go +++ b/processor/k8sattributesprocessor/internal/metadata/generated_telemetry.go @@ -14,11 +14,11 @@ import ( ) func Meter(settings component.TelemetrySettings) metric.Meter { - return settings.MeterProvider.Meter("otelcol/k8sattributes") + return settings.MeterProvider.Meter("github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor") } func Tracer(settings component.TelemetrySettings) trace.Tracer { - return settings.TracerProvider.Tracer("otelcol/k8sattributes") + return settings.TracerProvider.Tracer("github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor") } // TelemetryBuilder provides an interface for components to report telemetry diff --git a/processor/k8sattributesprocessor/internal/metadata/generated_telemetry_test.go b/processor/k8sattributesprocessor/internal/metadata/generated_telemetry_test.go index 85f43c5c3bba..6bce34e0097e 100644 --- a/processor/k8sattributesprocessor/internal/metadata/generated_telemetry_test.go +++ b/processor/k8sattributesprocessor/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/k8sattributes", m.name) + require.Equal(t, "github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor", m.name) } else { require.Fail(t, "returned Meter not mockMeter") } tracer := Tracer(set) if m, ok := tracer.(mockTracer); ok { - require.Equal(t, "otelcol/k8sattributes", m.name) + require.Equal(t, "github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor", m.name) } else { require.Fail(t, "returned Meter not mockTracer") } diff --git a/processor/k8sattributesprocessor/metadata.yaml b/processor/k8sattributesprocessor/metadata.yaml index f9f02fcd9814..d9b0494ab6c1 100644 --- a/processor/k8sattributesprocessor/metadata.yaml +++ b/processor/k8sattributesprocessor/metadata.yaml @@ -1,5 +1,4 @@ type: k8sattributes -scope_name: otelcol/k8sattributes status: class: processor diff --git a/processor/probabilisticsamplerprocessor/internal/metadata/generated_telemetry.go b/processor/probabilisticsamplerprocessor/internal/metadata/generated_telemetry.go index 91e28d5dd7c5..9fbd3f2c0c1d 100644 --- a/processor/probabilisticsamplerprocessor/internal/metadata/generated_telemetry.go +++ b/processor/probabilisticsamplerprocessor/internal/metadata/generated_telemetry.go @@ -14,11 +14,11 @@ import ( ) func Meter(settings component.TelemetrySettings) metric.Meter { - return settings.MeterProvider.Meter("otelcol/probabilisticsampler") + return settings.MeterProvider.Meter("github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor") } func Tracer(settings component.TelemetrySettings) trace.Tracer { - return settings.TracerProvider.Tracer("otelcol/probabilisticsampler") + return settings.TracerProvider.Tracer("github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor") } // TelemetryBuilder provides an interface for components to report telemetry diff --git a/processor/probabilisticsamplerprocessor/internal/metadata/generated_telemetry_test.go b/processor/probabilisticsamplerprocessor/internal/metadata/generated_telemetry_test.go index 1c4418ed57bb..37cc6e09a970 100644 --- a/processor/probabilisticsamplerprocessor/internal/metadata/generated_telemetry_test.go +++ b/processor/probabilisticsamplerprocessor/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/probabilisticsampler", m.name) + require.Equal(t, "github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor", m.name) } else { require.Fail(t, "returned Meter not mockMeter") } tracer := Tracer(set) if m, ok := tracer.(mockTracer); ok { - require.Equal(t, "otelcol/probabilisticsampler", m.name) + require.Equal(t, "github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor", m.name) } else { require.Fail(t, "returned Meter not mockTracer") } diff --git a/processor/probabilisticsamplerprocessor/metadata.yaml b/processor/probabilisticsamplerprocessor/metadata.yaml index 3abbfa94a080..6dcf37ff8e33 100644 --- a/processor/probabilisticsamplerprocessor/metadata.yaml +++ b/processor/probabilisticsamplerprocessor/metadata.yaml @@ -1,5 +1,4 @@ type: probabilistic_sampler -scope_name: otelcol/probabilisticsampler status: class: processor diff --git a/processor/routingprocessor/internal/metadata/generated_telemetry.go b/processor/routingprocessor/internal/metadata/generated_telemetry.go index 4e1a4a7752ea..e6cf1465188f 100644 --- a/processor/routingprocessor/internal/metadata/generated_telemetry.go +++ b/processor/routingprocessor/internal/metadata/generated_telemetry.go @@ -14,11 +14,11 @@ import ( ) func Meter(settings component.TelemetrySettings) metric.Meter { - return settings.MeterProvider.Meter("otelcol/routing") + return settings.MeterProvider.Meter("github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor") } func Tracer(settings component.TelemetrySettings) trace.Tracer { - return settings.TracerProvider.Tracer("otelcol/routing") + return settings.TracerProvider.Tracer("github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor") } // TelemetryBuilder provides an interface for components to report telemetry diff --git a/processor/routingprocessor/internal/metadata/generated_telemetry_test.go b/processor/routingprocessor/internal/metadata/generated_telemetry_test.go index 5dd084e790c7..475ea84d56ba 100644 --- a/processor/routingprocessor/internal/metadata/generated_telemetry_test.go +++ b/processor/routingprocessor/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/routing", m.name) + require.Equal(t, "github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor", m.name) } else { require.Fail(t, "returned Meter not mockMeter") } tracer := Tracer(set) if m, ok := tracer.(mockTracer); ok { - require.Equal(t, "otelcol/routing", m.name) + require.Equal(t, "github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor", m.name) } else { require.Fail(t, "returned Meter not mockTracer") } diff --git a/processor/routingprocessor/metadata.yaml b/processor/routingprocessor/metadata.yaml index 939c644814d9..847b8bc83ae4 100644 --- a/processor/routingprocessor/metadata.yaml +++ b/processor/routingprocessor/metadata.yaml @@ -1,5 +1,4 @@ type: routing -scope_name: otelcol/routing status: class: processor diff --git a/processor/tailsamplingprocessor/internal/metadata/generated_telemetry.go b/processor/tailsamplingprocessor/internal/metadata/generated_telemetry.go index 4ee0fe1cfa46..4db7da0b7bca 100644 --- a/processor/tailsamplingprocessor/internal/metadata/generated_telemetry.go +++ b/processor/tailsamplingprocessor/internal/metadata/generated_telemetry.go @@ -14,11 +14,11 @@ import ( ) func Meter(settings component.TelemetrySettings) metric.Meter { - return settings.MeterProvider.Meter("otelcol/tailsampling") + return settings.MeterProvider.Meter("github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor") } func Tracer(settings component.TelemetrySettings) trace.Tracer { - return settings.TracerProvider.Tracer("otelcol/tailsampling") + return settings.TracerProvider.Tracer("github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor") } // TelemetryBuilder provides an interface for components to report telemetry diff --git a/processor/tailsamplingprocessor/internal/metadata/generated_telemetry_test.go b/processor/tailsamplingprocessor/internal/metadata/generated_telemetry_test.go index 86a2a407c0a3..297d293713a7 100644 --- a/processor/tailsamplingprocessor/internal/metadata/generated_telemetry_test.go +++ b/processor/tailsamplingprocessor/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/tailsampling", m.name) + require.Equal(t, "github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor", m.name) } else { require.Fail(t, "returned Meter not mockMeter") } tracer := Tracer(set) if m, ok := tracer.(mockTracer); ok { - require.Equal(t, "otelcol/tailsampling", m.name) + require.Equal(t, "github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor", m.name) } else { require.Fail(t, "returned Meter not mockTracer") } diff --git a/processor/tailsamplingprocessor/metadata.yaml b/processor/tailsamplingprocessor/metadata.yaml index e2e9c64ef787..a892b8c6930d 100644 --- a/processor/tailsamplingprocessor/metadata.yaml +++ b/processor/tailsamplingprocessor/metadata.yaml @@ -1,5 +1,4 @@ type: tail_sampling -scope_name: otelcol/tailsampling status: class: processor From d57b49a878b909274fbd32514671dda32ed95ce1 Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Thu, 8 Aug 2024 14:14:37 -0700 Subject: [PATCH 2/2] Apply suggestions from code review --- .../codeboten_update-scope-deltatocumulativeprocessor.yaml | 2 +- .chloggen/codeboten_update-scope-filterprocessor.yaml | 2 +- .chloggen/codeboten_update-scope-groupbyattrsprocessor.yaml | 2 +- .chloggen/codeboten_update-scope-groupbytraceprocessor.yaml | 2 +- .chloggen/codeboten_update-scope-k8sattributesprocessor.yaml | 2 +- .../codeboten_update-scope-probabilisticsamplerprocessor.yaml | 2 +- .chloggen/codeboten_update-scope-routingprocessor.yaml | 2 +- .chloggen/codeboten_update-scope-tailsamplingprocessor.yaml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.chloggen/codeboten_update-scope-deltatocumulativeprocessor.yaml b/.chloggen/codeboten_update-scope-deltatocumulativeprocessor.yaml index 5a0024eeaee2..11dabe7542ab 100644 --- a/.chloggen/codeboten_update-scope-deltatocumulativeprocessor.yaml +++ b/.chloggen/codeboten_update-scope-deltatocumulativeprocessor.yaml @@ -10,7 +10,7 @@ component: deltatocumulativeprocessor note: "Update the scope name for telemetry produced by the deltatocumulativeprocessor from `otelcol/deltatocumulative` to `github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor`" # Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. -issues: [34429] +issues: [34550] # (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. diff --git a/.chloggen/codeboten_update-scope-filterprocessor.yaml b/.chloggen/codeboten_update-scope-filterprocessor.yaml index 5e933efbb546..fc0b1bb08f2f 100644 --- a/.chloggen/codeboten_update-scope-filterprocessor.yaml +++ b/.chloggen/codeboten_update-scope-filterprocessor.yaml @@ -10,7 +10,7 @@ component: filterprocessor note: "Update the scope name for telemetry produced by the filterprocessor from `otelcol/filter` to `github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor`" # Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. -issues: [34429] +issues: [34550] # (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. diff --git a/.chloggen/codeboten_update-scope-groupbyattrsprocessor.yaml b/.chloggen/codeboten_update-scope-groupbyattrsprocessor.yaml index 284f7df45cbc..79795a0e8bbd 100644 --- a/.chloggen/codeboten_update-scope-groupbyattrsprocessor.yaml +++ b/.chloggen/codeboten_update-scope-groupbyattrsprocessor.yaml @@ -10,7 +10,7 @@ component: groupbyattrsprocessor note: "Update the scope name for telemetry produced by the groupbyattrsprocessor from `otelcol/groupbyattrs` to `github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor`" # Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. -issues: [34429] +issues: [34550] # (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. diff --git a/.chloggen/codeboten_update-scope-groupbytraceprocessor.yaml b/.chloggen/codeboten_update-scope-groupbytraceprocessor.yaml index b00517824cea..82753b317600 100644 --- a/.chloggen/codeboten_update-scope-groupbytraceprocessor.yaml +++ b/.chloggen/codeboten_update-scope-groupbytraceprocessor.yaml @@ -10,7 +10,7 @@ component: groupbytraceprocessor note: "Update the scope name for telemetry produced by the groupbytraceprocessor from `otelcol/groupbytrace` to `github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor`" # Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. -issues: [34429] +issues: [34550] # (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. diff --git a/.chloggen/codeboten_update-scope-k8sattributesprocessor.yaml b/.chloggen/codeboten_update-scope-k8sattributesprocessor.yaml index c0318d22137b..6813cc3b165f 100644 --- a/.chloggen/codeboten_update-scope-k8sattributesprocessor.yaml +++ b/.chloggen/codeboten_update-scope-k8sattributesprocessor.yaml @@ -10,7 +10,7 @@ component: k8sattributesprocessor note: "Update the scope name for telemetry produced by the k8sattributesprocessor from `otelcol/k8sattributes` to `github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor`" # Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. -issues: [34429] +issues: [34550] # (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. diff --git a/.chloggen/codeboten_update-scope-probabilisticsamplerprocessor.yaml b/.chloggen/codeboten_update-scope-probabilisticsamplerprocessor.yaml index 82bcd84a11e6..958cb0cedbee 100644 --- a/.chloggen/codeboten_update-scope-probabilisticsamplerprocessor.yaml +++ b/.chloggen/codeboten_update-scope-probabilisticsamplerprocessor.yaml @@ -10,7 +10,7 @@ component: probabilisticsamplerprocessor note: "Update the scope name for telemetry produced by the probabilisticsamplerprocessor from `otelcol/probabilisticsampler` to `github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor`" # Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. -issues: [34429] +issues: [34550] # (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. diff --git a/.chloggen/codeboten_update-scope-routingprocessor.yaml b/.chloggen/codeboten_update-scope-routingprocessor.yaml index 70fb8039f461..01a017de8ede 100644 --- a/.chloggen/codeboten_update-scope-routingprocessor.yaml +++ b/.chloggen/codeboten_update-scope-routingprocessor.yaml @@ -10,7 +10,7 @@ component: routingprocessor note: "Update the scope name for telemetry produced by the routingprocessor from `otelcol/routing` to `github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor`" # Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. -issues: [34429] +issues: [34550] # (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. diff --git a/.chloggen/codeboten_update-scope-tailsamplingprocessor.yaml b/.chloggen/codeboten_update-scope-tailsamplingprocessor.yaml index e1c035adf6a2..a89bec107101 100644 --- a/.chloggen/codeboten_update-scope-tailsamplingprocessor.yaml +++ b/.chloggen/codeboten_update-scope-tailsamplingprocessor.yaml @@ -10,7 +10,7 @@ component: tailsamplingprocessor note: "Update the scope name for telemetry produced by the tailsamplingprocessor from `otelcol/tailsampling` to `github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor`" # Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. -issues: [34429] +issues: [34550] # (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.