From 8731373a4626d1333881dcd56ecaee9bcabeeecc Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Tue, 6 Aug 2024 16:20:55 -0700 Subject: [PATCH 1/2] [receiver/oracledbreceiver] update scope name for consistency Update the scope name for telemetry produced by the oracledbreceiverreceiver from otelcol/oracledbreceiver to github.com/open-telemetry/opentelemetry-collector-contrib/receiver/oracledbreceiverreceiver Part of https://github.com/open-telemetry/opentelemetry-collector/issues/9494 Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- ...deboten_update-scope-oracledbreceiver.yaml | 27 +++++++++++++++++++ .../internal/metadata/generated_metrics.go | 2 +- receiver/oracledbreceiver/metadata.yaml | 1 - 3 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 .chloggen/codeboten_update-scope-oracledbreceiver.yaml diff --git a/.chloggen/codeboten_update-scope-oracledbreceiver.yaml b/.chloggen/codeboten_update-scope-oracledbreceiver.yaml new file mode 100644 index 000000000000..2d91838bc625 --- /dev/null +++ b/.chloggen/codeboten_update-scope-oracledbreceiver.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: oracledbreceiver + +# 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 oracledbreceiver from `otelcol/oracledbreceiver` to `github.com/open-telemetry/opentelemetry-collector-contrib/receiver/oracledbreceiver`" + +# 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/oracledbreceiver/internal/metadata/generated_metrics.go b/receiver/oracledbreceiver/internal/metadata/generated_metrics.go index 531ac9bb8a31..6adfd4afe4f1 100644 --- a/receiver/oracledbreceiver/internal/metadata/generated_metrics.go +++ b/receiver/oracledbreceiver/internal/metadata/generated_metrics.go @@ -1519,7 +1519,7 @@ func WithStartTimeOverride(start pcommon.Timestamp) ResourceMetricsOption { func (mb *MetricsBuilder) EmitForResource(rmo ...ResourceMetricsOption) { rm := pmetric.NewResourceMetrics() ils := rm.ScopeMetrics().AppendEmpty() - ils.Scope().SetName("otelcol/oracledbreceiver") + ils.Scope().SetName("github.com/open-telemetry/opentelemetry-collector-contrib/receiver/oracledbreceiver") ils.Scope().SetVersion(mb.buildInfo.Version) ils.Metrics().EnsureCapacity(mb.metricsCapacity) mb.metricOracledbConsistentGets.emit(ils.Metrics()) diff --git a/receiver/oracledbreceiver/metadata.yaml b/receiver/oracledbreceiver/metadata.yaml index 1d220c621b63..fdc84e8f8a21 100644 --- a/receiver/oracledbreceiver/metadata.yaml +++ b/receiver/oracledbreceiver/metadata.yaml @@ -1,5 +1,4 @@ type: oracledb -scope_name: otelcol/oracledbreceiver status: class: receiver From b704040ed2dab3ea732bf2dde1fadd53df56377c Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Wed, 7 Aug 2024 12:13:26 -0700 Subject: [PATCH 2/2] Update .chloggen/codeboten_update-scope-oracledbreceiver.yaml --- .chloggen/codeboten_update-scope-oracledbreceiver.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.chloggen/codeboten_update-scope-oracledbreceiver.yaml b/.chloggen/codeboten_update-scope-oracledbreceiver.yaml index 2d91838bc625..867cd8758d9f 100644 --- a/.chloggen/codeboten_update-scope-oracledbreceiver.yaml +++ b/.chloggen/codeboten_update-scope-oracledbreceiver.yaml @@ -10,7 +10,7 @@ component: oracledbreceiver note: "Update the scope name for telemetry produced by the oracledbreceiver from `otelcol/oracledbreceiver` to `github.com/open-telemetry/opentelemetry-collector-contrib/receiver/oracledbreceiver`" # Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. -issues: [34429] +issues: [34491] # (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.