fix cases where the only resource attributes are scalar

open-telemetry · Aug 21, 2023 · 862a057 · 862a057
1 parent b578006
commit 862a057
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 33 deletions.
diff --git a/receiver/snmpreceiver/scraper.go b/receiver/snmpreceiver/scraper.go
@@ -23,14 +23,14 @@ var (
 	// Error messages
 	errMsgBadValueType                   = `returned metric SNMP data type for OID '%s' is not supported`
 	errMsgIndexedAttributesBadValueType  = `returned attribute SNMP data type for OID '%s' from column OID '%s' is not supported`
-	errMsgScalarAttributesBadValueType = `returned attribute SNMP data type for OID '%s' is not supported`
+	errMsgScalarAttributesBadValueType   = `returned attribute SNMP data type for OID '%s' is not supported`
 	errMsgOIDAttributeEmptyValue         = `not creating indexed metric '%s' datapoint: %w`
 	errMsgAttributeEmptyValue            = `metric OID attribute value is blank`
 	errMsgResourceAttributeEmptyValue    = `related resource attribute value is blank`
 	errMsgOIDResourceAttributeEmptyValue = `not creating indexed metric '%s' or resource: %w`
 	errMsgScalarOIDProcessing            = `problem processing scalar metric data for OID '%s': %w`
 	errMsgIndexedMetricOIDProcessing     = `problem processing indexed metric data for OID '%s' from column OID '%s': %w`
-	errMsgScalarAttributeOIDProcessing	 = `problem processing scalar attribute data from scalar OID '%s': %w`
+	errMsgScalarAttributeOIDProcessing   = `problem processing scalar attribute data from scalar OID '%s': %w`
 	errMsgIndexedAttributeOIDProcessing  = `problem processing indexed attribute data for OID '%s' from column OID '%s': %w`
 )
 
@@ -200,7 +200,14 @@ func (s *snmpScraper) indexedDataToMetric(
 	// Create a resource key using all of the relevant resource attribute names along
 	// with the row index of the SNMP data
 	resourceAttributeNames := configHelper.getResourceAttributeNames(data.columnOID)
-	resourceKey := getResourceKey(resourceAttributeNames, indexString)
+
+	var resourceKey string
+	// If we only have scalar resource attributes, we don't need multiple resources
+	if len(resourceAttributes) == len(columnOIDScalarResourceAttributeValues) {
+		resourceKey = getResourceKey(resourceAttributeNames, "0")
+	} else {
+		resourceKey = getResourceKey(resourceAttributeNames, indexString)
+	}
 
 	// Create a new resource if needed
 	resource := metricHelper.getResource(resourceKey)

diff --git a/...data/expected_metrics/24_scalar_ra_string_and_coid_attr_string_on_coid_metric_golden.yaml b/...data/expected_metrics/24_scalar_ra_string_and_coid_attr_string_on_coid_metric_golden.yaml
@@ -15,21 +15,6 @@ resourceMetrics:
                       value:
                         stringValue: string1
                   timeUnixNano: "1651783494931319000"
-            name: metric1
-            unit: By
-        scope:
-          name: otelcol/snmpreceiver
-          version: latest
-  - resource:
-      attributes:
-        - key: rattr1
-          value:
-            stringValue: scalar
-    scopeMetrics:
-      - metrics:
-          - description: test description
-            gauge:
-              dataPoints:
                 - asInt: "4"
                   attributes:
                     - key: attr1

diff --git a/...ver/testdata/expected_metrics/25_scalar_ra_string_and_ivp_attr_on_coid_metric_golden.yaml b/...ver/testdata/expected_metrics/25_scalar_ra_string_and_ivp_attr_on_coid_metric_golden.yaml
@@ -15,21 +15,6 @@ resourceMetrics:
                       value:
                         stringValue: prefix.1
                   timeUnixNano: "1651783494931319000"
-            name: metric1
-            unit: By
-        scope:
-          name: otelcol/snmpreceiver
-          version: latest
-  - resource:
-      attributes:
-        - key: rattr1
-          value:
-            stringValue: scalar
-    scopeMetrics:
-      - metrics:
-          - description: test description
-            gauge:
-              dataPoints:
                 - asInt: "4"
                   attributes:
                     - key: attr1