Skip to content

Commit 2cece0f

Browse files
abhishek-at-cloudwerxmterhar
authored andcommitted
Add metric-specific labels in googlecloudmonitoringreceiver component (open-telemetry#35828)
#### Description Add metric-specific labels inside the googlecloudmonitoringreceiver component #### Link to tracking issue open-telemetry#35711 #### Testing #### Documentation
1 parent 7dded6e commit 2cece0f

File tree

2 files changed

+38
-4
lines changed

2 files changed

+38
-4
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: enhancement
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: googlecloudmonitoringreceiver
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Add metric-specific labels to googlecloudmonitoringreceiver component
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [35711]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: []

receiver/googlecloudmonitoringreceiver/receiver.go

+11-4
Original file line numberDiff line numberDiff line change
@@ -271,17 +271,24 @@ func (mr *monitoringReceiver) convertGCPTimeSeriesToMetrics(metrics pmetric.Metr
271271
}
272272

273273
// Set metadata (user and system labels)
274-
if timeSeries.Metadata != nil {
275-
for k, v := range timeSeries.Metadata.UserLabels {
274+
if timeSeries.GetMetadata() != nil {
275+
for k, v := range timeSeries.GetMetadata().GetUserLabels() {
276276
resource.Attributes().PutStr(k, v)
277277
}
278-
if timeSeries.Metadata.SystemLabels != nil {
279-
for k, v := range timeSeries.Metadata.SystemLabels.Fields {
278+
if timeSeries.GetMetadata().GetSystemLabels() != nil {
279+
for k, v := range timeSeries.GetMetadata().GetSystemLabels().GetFields() {
280280
resource.Attributes().PutStr(k, fmt.Sprintf("%v", v))
281281
}
282282
}
283283
}
284284

285+
// Add metric-specific labels if they are present
286+
if len(timeSeries.GetMetric().Labels) > 0 {
287+
for k, v := range timeSeries.GetMetric().GetLabels() {
288+
resource.Attributes().PutStr(k, fmt.Sprintf("%v", v))
289+
}
290+
}
291+
285292
// Store the newly created ResourceMetrics in the map
286293
resourceMetricsMap[resourceKey] = rm
287294
}

0 commit comments

Comments
 (0)