From 30b9dd4581fd34d4ba5aa2454380ddd44c5c239a Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Tue, 6 Aug 2024 14:06:12 -0700 Subject: [PATCH 1/2] [receiver/vcenter] update scope name for consistency Update the scope name for telemetry produced by the vcenterreceiver from otelcol/vcenter to github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver Part of https://github.com/open-telemetry/opentelemetry-collector/issues/9494 Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- ...eboten_update-scope-receivers-vcenter.yaml | 27 +++++++++++++++++++ .../internal/metadata/generated_metrics.go | 2 +- receiver/vcenterreceiver/metadata.yaml | 1 - .../testdata/integration/expected.yaml | 26 +++++++++--------- .../metrics/expected-all-enabled.yaml | 22 +++++++-------- .../testdata/metrics/expected.yaml | 22 +++++++-------- 6 files changed, 63 insertions(+), 37 deletions(-) create mode 100644 .chloggen/codeboten_update-scope-receivers-vcenter.yaml diff --git a/.chloggen/codeboten_update-scope-receivers-vcenter.yaml b/.chloggen/codeboten_update-scope-receivers-vcenter.yaml new file mode 100644 index 000000000000..87ce590a4414 --- /dev/null +++ b/.chloggen/codeboten_update-scope-receivers-vcenter.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: vcenterreceiver + +# 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 vcenterreceiver from otelcol/vcenter to github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [] + +# (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/vcenterreceiver/internal/metadata/generated_metrics.go b/receiver/vcenterreceiver/internal/metadata/generated_metrics.go index 416cd1fba84b..5530447dae68 100644 --- a/receiver/vcenterreceiver/internal/metadata/generated_metrics.go +++ b/receiver/vcenterreceiver/internal/metadata/generated_metrics.go @@ -4067,7 +4067,7 @@ func WithStartTimeOverride(start pcommon.Timestamp) ResourceMetricsOption { func (mb *MetricsBuilder) EmitForResource(rmo ...ResourceMetricsOption) { rm := pmetric.NewResourceMetrics() ils := rm.ScopeMetrics().AppendEmpty() - ils.Scope().SetName("otelcol/vcenterreceiver") + ils.Scope().SetName("github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver") ils.Scope().SetVersion(mb.buildInfo.Version) ils.Metrics().EnsureCapacity(mb.metricsCapacity) mb.metricVcenterClusterCPUEffective.emit(ils.Metrics()) diff --git a/receiver/vcenterreceiver/metadata.yaml b/receiver/vcenterreceiver/metadata.yaml index fd819f993250..8789b5b645c9 100644 --- a/receiver/vcenterreceiver/metadata.yaml +++ b/receiver/vcenterreceiver/metadata.yaml @@ -1,5 +1,4 @@ type: vcenter -scope_name: otelcol/vcenterreceiver status: class: receiver diff --git a/receiver/vcenterreceiver/testdata/integration/expected.yaml b/receiver/vcenterreceiver/testdata/integration/expected.yaml index e32259146619..b5b7d14fa14f 100644 --- a/receiver/vcenterreceiver/testdata/integration/expected.yaml +++ b/receiver/vcenterreceiver/testdata/integration/expected.yaml @@ -120,7 +120,7 @@ resourceMetrics: timeUnixNano: "2000000" unit: '{virtual_machines}' scope: - name: otelcol/vcenterreceiver + name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver version: latest - resource: attributes: @@ -225,7 +225,7 @@ resourceMetrics: timeUnixNano: "2000000" unit: '{virtual_machine_templates}' scope: - name: otelcol/vcenterreceiver + name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver version: latest - resource: attributes: @@ -266,7 +266,7 @@ resourceMetrics: name: vcenter.datastore.disk.utilization unit: '%' scope: - name: otelcol/vcenterreceiver + name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver version: latest - resource: attributes: @@ -322,7 +322,7 @@ resourceMetrics: name: vcenter.host.memory.utilization unit: '%' scope: - name: otelcol/vcenterreceiver + name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver version: latest - resource: attributes: @@ -381,7 +381,7 @@ resourceMetrics: name: vcenter.host.memory.utilization unit: '%' scope: - name: otelcol/vcenterreceiver + name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver version: latest - resource: attributes: @@ -440,7 +440,7 @@ resourceMetrics: name: vcenter.host.memory.utilization unit: '%' scope: - name: otelcol/vcenterreceiver + name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver version: latest - resource: attributes: @@ -499,7 +499,7 @@ resourceMetrics: name: vcenter.host.memory.utilization unit: '%' scope: - name: otelcol/vcenterreceiver + name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver version: latest - resource: attributes: @@ -536,7 +536,7 @@ resourceMetrics: timeUnixNano: "2000000" unit: '{shares}' scope: - name: otelcol/vcenterreceiver + name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver version: latest - resource: attributes: @@ -573,7 +573,7 @@ resourceMetrics: timeUnixNano: "2000000" unit: '{shares}' scope: - name: otelcol/vcenterreceiver + name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver version: latest - resource: attributes: @@ -662,7 +662,7 @@ resourceMetrics: timeUnixNano: "2000000" unit: MiBy scope: - name: otelcol/vcenterreceiver + name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver version: latest - resource: attributes: @@ -751,7 +751,7 @@ resourceMetrics: timeUnixNano: "2000000" unit: MiBy scope: - name: otelcol/vcenterreceiver + name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver version: latest - resource: attributes: @@ -843,7 +843,7 @@ resourceMetrics: timeUnixNano: "2000000" unit: MiBy scope: - name: otelcol/vcenterreceiver + name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver version: latest - resource: attributes: @@ -935,5 +935,5 @@ resourceMetrics: timeUnixNano: "2000000" unit: MiBy scope: - name: otelcol/vcenterreceiver + name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver version: latest diff --git a/receiver/vcenterreceiver/testdata/metrics/expected-all-enabled.yaml b/receiver/vcenterreceiver/testdata/metrics/expected-all-enabled.yaml index 4aef7a14bc92..50c5e558b6dc 100644 --- a/receiver/vcenterreceiver/testdata/metrics/expected-all-enabled.yaml +++ b/receiver/vcenterreceiver/testdata/metrics/expected-all-enabled.yaml @@ -130,7 +130,7 @@ resourceMetrics: timeUnixNano: "2000000" unit: '{virtual_machines}' scope: - name: otelcol/vcenterreceiver + name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver version: latest - resource: attributes: @@ -345,7 +345,7 @@ resourceMetrics: name: vcenter.cluster.vsan.throughput unit: By/s scope: - name: otelcol/vcenterreceiver + name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver version: latest - resource: attributes: @@ -386,7 +386,7 @@ resourceMetrics: name: vcenter.datastore.disk.utilization unit: '%' scope: - name: otelcol/vcenterreceiver + name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver version: latest - resource: attributes: @@ -3142,7 +3142,7 @@ resourceMetrics: name: vcenter.host.vsan.throughput unit: By/s scope: - name: otelcol/vcenterreceiver + name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver version: latest - resource: attributes: @@ -5901,7 +5901,7 @@ resourceMetrics: name: vcenter.host.vsan.throughput unit: By/s scope: - name: otelcol/vcenterreceiver + name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver version: latest - resource: attributes: @@ -6012,7 +6012,7 @@ resourceMetrics: timeUnixNano: "2000000" unit: MiBy scope: - name: otelcol/vcenterreceiver + name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver version: latest - resource: attributes: @@ -6123,7 +6123,7 @@ resourceMetrics: timeUnixNano: "2000000" unit: MiBy scope: - name: otelcol/vcenterreceiver + name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver version: latest - resource: attributes: @@ -6165,7 +6165,7 @@ resourceMetrics: timeUnixNano: "2000000" unit: By scope: - name: otelcol/vcenterreceiver + name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver version: latest - resource: attributes: @@ -6799,7 +6799,7 @@ resourceMetrics: timeUnixNano: "1000000" unit: '{KiBy/s}' scope: - name: otelcol/vcenterreceiver + name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver version: latest - resource: attributes: @@ -7535,7 +7535,7 @@ resourceMetrics: name: vcenter.vm.vsan.throughput unit: By/s scope: - name: otelcol/vcenterreceiver + name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver version: latest - resource: attributes: @@ -8271,5 +8271,5 @@ resourceMetrics: name: vcenter.vm.vsan.throughput unit: By/s scope: - name: otelcol/vcenterreceiver + name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver version: latest diff --git a/receiver/vcenterreceiver/testdata/metrics/expected.yaml b/receiver/vcenterreceiver/testdata/metrics/expected.yaml index c25cec04bff2..0f9a1fdbf624 100644 --- a/receiver/vcenterreceiver/testdata/metrics/expected.yaml +++ b/receiver/vcenterreceiver/testdata/metrics/expected.yaml @@ -130,7 +130,7 @@ resourceMetrics: timeUnixNano: "2000000" unit: '{virtual_machines}' scope: - name: otelcol/vcenterreceiver + name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver version: latest - resource: attributes: @@ -345,7 +345,7 @@ resourceMetrics: name: vcenter.cluster.vsan.throughput unit: By/s scope: - name: otelcol/vcenterreceiver + name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver version: latest - resource: attributes: @@ -386,7 +386,7 @@ resourceMetrics: name: vcenter.datastore.disk.utilization unit: '%' scope: - name: otelcol/vcenterreceiver + name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver version: latest - resource: attributes: @@ -3142,7 +3142,7 @@ resourceMetrics: name: vcenter.host.vsan.throughput unit: By/s scope: - name: otelcol/vcenterreceiver + name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver version: latest - resource: attributes: @@ -5901,7 +5901,7 @@ resourceMetrics: name: vcenter.host.vsan.throughput unit: By/s scope: - name: otelcol/vcenterreceiver + name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver version: latest - resource: attributes: @@ -5993,7 +5993,7 @@ resourceMetrics: timeUnixNano: "1000000" unit: MiBy scope: - name: otelcol/vcenterreceiver + name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver version: latest - resource: attributes: @@ -6085,7 +6085,7 @@ resourceMetrics: timeUnixNano: "1000000" unit: MiBy scope: - name: otelcol/vcenterreceiver + name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver version: latest - resource: attributes: @@ -6127,7 +6127,7 @@ resourceMetrics: timeUnixNano: "2000000" unit: By scope: - name: otelcol/vcenterreceiver + name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver version: latest - resource: attributes: @@ -6761,7 +6761,7 @@ resourceMetrics: timeUnixNano: "1000000" unit: '{KiBy/s}' scope: - name: otelcol/vcenterreceiver + name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver version: latest - resource: attributes: @@ -7497,7 +7497,7 @@ resourceMetrics: name: vcenter.vm.vsan.throughput unit: By/s scope: - name: otelcol/vcenterreceiver + name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver version: latest - resource: attributes: @@ -8233,5 +8233,5 @@ resourceMetrics: name: vcenter.vm.vsan.throughput unit: By/s scope: - name: otelcol/vcenterreceiver + name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver version: latest From 3fc6111af61688e34c6efb8c69872f4a1376e927 Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Tue, 6 Aug 2024 14:19:17 -0700 Subject: [PATCH 2/2] Update .chloggen/codeboten_update-scope-receivers-vcenter.yaml --- .chloggen/codeboten_update-scope-receivers-vcenter.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.chloggen/codeboten_update-scope-receivers-vcenter.yaml b/.chloggen/codeboten_update-scope-receivers-vcenter.yaml index 87ce590a4414..85d1e054cfe8 100644 --- a/.chloggen/codeboten_update-scope-receivers-vcenter.yaml +++ b/.chloggen/codeboten_update-scope-receivers-vcenter.yaml @@ -10,7 +10,7 @@ component: vcenterreceiver note: Update the scope name for telemetry produced by the vcenterreceiver from otelcol/vcenter to github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver # Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. -issues: [] +issues: [34449] # (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.