From 64b737544d54183d702be714aff57b0b97e9bae2 Mon Sep 17 00:00:00 2001 From: abhishek-at-cloudwerx Date: Wed, 16 Oct 2024 15:06:19 +0530 Subject: [PATCH 1/2] refactor: - Add metric-specific labels inside the googlecloudmonitoringreceiver component - Add .chloggen file --- ...bels-in-googlecloudmonitoringreceiver.yaml | 27 +++++++++++++++++++ .../googlecloudmonitoringreceiver/receiver.go | 7 +++++ 2 files changed, 34 insertions(+) create mode 100644 .chloggen/add-metric-labels-in-googlecloudmonitoringreceiver.yaml diff --git a/.chloggen/add-metric-labels-in-googlecloudmonitoringreceiver.yaml b/.chloggen/add-metric-labels-in-googlecloudmonitoringreceiver.yaml new file mode 100644 index 000000000000..6d6f98d22ffa --- /dev/null +++ b/.chloggen/add-metric-labels-in-googlecloudmonitoringreceiver.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: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: googlecloudmonitoringreceiver + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Add metric-specific labels to googlecloudmonitoringreceiver component + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [35711] + +# (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/googlecloudmonitoringreceiver/receiver.go b/receiver/googlecloudmonitoringreceiver/receiver.go index 4b0d6b256e20..0c243c12d25b 100644 --- a/receiver/googlecloudmonitoringreceiver/receiver.go +++ b/receiver/googlecloudmonitoringreceiver/receiver.go @@ -285,6 +285,13 @@ func (mr *monitoringReceiver) convertGCPTimeSeriesToMetrics(metrics pmetric.Metr } } + // Add metric-specific labels if they are present + if len(timeSeries.Metric.Labels) > 0 { + for k, v := range timeSeries.Metric.Labels { + resource.Attributes().PutStr(k, fmt.Sprintf("%v", v)) + } + } + // Store the newly created ResourceMetrics in the map resourceMetricsMap[resourceKey] = rm } From 269f6114fccc781fc18446f622ac49918b72d22c Mon Sep 17 00:00:00 2001 From: abhishek-at-cloudwerx Date: Thu, 17 Oct 2024 11:18:09 +0530 Subject: [PATCH 2/2] refactor: - Update functions to handle nil values --- receiver/googlecloudmonitoringreceiver/receiver.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/receiver/googlecloudmonitoringreceiver/receiver.go b/receiver/googlecloudmonitoringreceiver/receiver.go index 0c243c12d25b..b128feae0c3a 100644 --- a/receiver/googlecloudmonitoringreceiver/receiver.go +++ b/receiver/googlecloudmonitoringreceiver/receiver.go @@ -274,20 +274,20 @@ func (mr *monitoringReceiver) convertGCPTimeSeriesToMetrics(metrics pmetric.Metr } // Set metadata (user and system labels) - if timeSeries.Metadata != nil { - for k, v := range timeSeries.Metadata.UserLabels { + if timeSeries.GetMetadata() != nil { + for k, v := range timeSeries.GetMetadata().GetUserLabels() { resource.Attributes().PutStr(k, v) } - if timeSeries.Metadata.SystemLabels != nil { - for k, v := range timeSeries.Metadata.SystemLabels.Fields { + if timeSeries.GetMetadata().GetSystemLabels() != nil { + for k, v := range timeSeries.GetMetadata().GetSystemLabels().GetFields() { resource.Attributes().PutStr(k, fmt.Sprintf("%v", v)) } } } // Add metric-specific labels if they are present - if len(timeSeries.Metric.Labels) > 0 { - for k, v := range timeSeries.Metric.Labels { + if len(timeSeries.GetMetric().Labels) > 0 { + for k, v := range timeSeries.GetMetric().GetLabels() { resource.Attributes().PutStr(k, fmt.Sprintf("%v", v)) } }