[receiver/snmp] Add column and scalar OID metrics to resources that have scalar OID attributes

receiver/snmpreceiver/config.go

@@ -208,7 +208,7 @@ type SumMetric struct {
 type ScalarOID struct {
 	// OID is required and is the scalar OID that is associated with a metric
 	OID string `mapstructure:"oid"`
-	// ResourceAttributes is optional and may contain values of Scalar OIDs to associate this metric with
+	// ResourceAttributes is optional and may contain values of (Scalar OIDs only) to associate this metric with
 	ResourceAttributes []string `mapstructure:"resource_attributes"`
 	// Attributes is optional and may contain names and values associated with enum
 	// AttributeConfigs to associate with the value of the scalar OID

receiver/snmpreceiver/config_helper.go

@@ -80,36 +80,28 @@ func newConfigHelper(cfg *Config) *configHelper {
 		ch.attributeColumnOIDs = append(ch.attributeColumnOIDs, attributeCfg.OID)
 	}
 
-	// Find all resource attribute scalar OIDs
+	// Find all resource attribute scalar and column OIDs
 	for name, resourceAttributeCfg := range cfg.ResourceAttributes {
-		if resourceAttributeCfg.ScalarOID == "" {
-			continue
-		}
-
-		// Data is returned by the client with '.' prefix on the OIDs.
-		// Making sure the prefix exists here in the configs so we can match it up with returned data later
-		if !strings.HasPrefix(resourceAttributeCfg.ScalarOID, ".") {
-			resourceAttributeCfg.ScalarOID = "." + resourceAttributeCfg.ScalarOID
-			cfg.ResourceAttributes[name] = resourceAttributeCfg
-		}
-		ch.resourceAttributeScalarOIDs = append(ch.resourceAttributeScalarOIDs, resourceAttributeCfg.ScalarOID)
-	}
-
-	// Find all resource attribute column OIDs
-	for name, resourceAttributeCfg := range cfg.ResourceAttributes {
-		if resourceAttributeCfg.OID == "" {
+		if resourceAttributeCfg.ScalarOID != "" {
+			// Data is returned by the client with '.' prefix on the OIDs.
+			// Making sure the prefix exists here in the configs so we can match it up with returned data later
+			if !strings.HasPrefix(resourceAttributeCfg.ScalarOID, ".") {
+				resourceAttributeCfg.ScalarOID = "." + resourceAttributeCfg.ScalarOID
+				cfg.ResourceAttributes[name] = resourceAttributeCfg
+			}
+			ch.resourceAttributeScalarOIDs = append(ch.resourceAttributeScalarOIDs, resourceAttributeCfg.ScalarOID)
 			continue
 		}
-
-		// Data is returned by the client with '.' prefix on the OIDs.
-		// Making sure the prefix exists here in the configs so we can match it up with returned data later
-		if !strings.HasPrefix(resourceAttributeCfg.OID, ".") {
-			resourceAttributeCfg.OID = "." + resourceAttributeCfg.OID
-			cfg.ResourceAttributes[name] = resourceAttributeCfg
+		if resourceAttributeCfg.OID != "" {
+			// Data is returned by the client with '.' prefix on the OIDs.
+			// Making sure the prefix exists here in the configs so we can match it up with returned data later
+			if !strings.HasPrefix(resourceAttributeCfg.OID, ".") {
+				resourceAttributeCfg.OID = "." + resourceAttributeCfg.OID
+				cfg.ResourceAttributes[name] = resourceAttributeCfg
+			}
+			ch.resourceAttributeColumnOIDs = append(ch.resourceAttributeColumnOIDs, resourceAttributeCfg.OID)
 		}
-		ch.resourceAttributeColumnOIDs = append(ch.resourceAttributeColumnOIDs, resourceAttributeCfg.OID)
 	}
-
 	return &ch
 }
 

receiver/snmpreceiver/scraper.go

@@ -105,11 +105,11 @@ func (s *snmpScraper) scrapeScalarMetrics(
 		return
 	}
 	// Retrieve scalar OID SNMP data for resource attributes
-	scalarOIDScalarResourceAttributeValues := s.scrapeScalarResourceAttributes(configHelper.getResourceAttributeScalarOIDs(), scraperErrors)
+	scalarResourceAttributes := s.scrapeScalarResourceAttributes(configHelper.getResourceAttributeScalarOIDs(), scraperErrors)
 
 	// For each piece of SNMP data, attempt to create the necessary OTEL structures (resources/metrics/datapoints)
 	for _, data := range scalarData {
-		if err := s.scalarDataToMetric(data, metricHelper, configHelper, scalarOIDScalarResourceAttributeValues); err != nil {
+		if err := s.scalarDataToMetric(data, metricHelper, configHelper, scalarResourceAttributes); err != nil {
 			scraperErrors.AddPartial(1, fmt.Errorf(errMsgScalarOIDProcessing, data.oid, err))
 		}
 	}
@@ -154,7 +154,7 @@ func (s *snmpScraper) scalarDataToMetric(
 	data SNMPData,
 	metricHelper *otelMetricHelper,
 	configHelper *configHelper,
-	scalarOIDScalarResourceAttributeValues map[string]string, 
+	scalarResourceAttributes map[string]string, 
 ) error {
 	// Get the related metric name for this SNMP indexed data
 	metricName := configHelper.getMetricName(data.oid)
@@ -164,34 +164,29 @@ func (s *snmpScraper) scalarDataToMetric(
 	dataPointAttributes := getScalarDataPointAttributes(configHelper, data.oid)
 
 	// Get resource attributes
-	resourceAttributes, err := getResourceAttributes(configHelper, data.oid, "0", map[string]indexedAttributeValues{}, scalarOIDScalarResourceAttributeValues)
+	resourceAttributes, err := getResourceAttributes(configHelper, data.oid, "0", map[string]indexedAttributeValues{}, scalarResourceAttributes)
 	if err != nil {
 		return fmt.Errorf(errMsgOIDResourceAttributeEmptyValue, metricName, err)
 	}
 
 	// Create a resource key using all of the relevant resource attribute names 
 	resourceAttributeNames := configHelper.getResourceAttributeNames(data.oid)
 
+	var resourceKey string
 	if len(resourceAttributeNames) > 0 {
-		resourceKey := getResourceKey(resourceAttributeNames, "0")
-
-		// Create a new resource if needed
-		resource := metricHelper.getResource(resourceKey)
-		if resource == nil {
-			metricHelper.createResource(resourceKey, resourceAttributes)
-		}
-
-		return addMetricDataPointToResource(data, metricHelper, configHelper, metricName, resourceKey, dataPointAttributes)	
+		resourceKey = getResourceKey(resourceAttributeNames, "")
 	} else {
 		// Create general resource if we don't have any resource attributes
-		resource := metricHelper.getResource(generalResourceKey)
-		if resource == nil {
-			metricHelper.createResource(generalResourceKey, map[string]string{})
-		}
+		resourceKey = generalResourceKey
+	}
 
-		return addMetricDataPointToResource(data, metricHelper, configHelper, metricName, generalResourceKey, dataPointAttributes)
+	// Create a new resource if needed
+	resource := metricHelper.getResource(resourceKey)
+	if resource == nil {
+		metricHelper.createResource(resourceKey, resourceAttributes)
 	}
 
+	return addMetricDataPointToResource(data, metricHelper, configHelper, metricName, resourceKey, dataPointAttributes)	
 }
 
 // indexedDataToMetric will take one piece of column OID SNMP indexed metric data and turn it
@@ -229,7 +224,7 @@ func (s *snmpScraper) indexedDataToMetric(
 	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")
+		resourceKey = getResourceKey(resourceAttributeNames, "")
 	} else {
 		resourceKey = getResourceKey(resourceAttributeNames, indexString)
 	}
@@ -380,7 +375,7 @@ func (s *snmpScraper) scrapeScalarResourceAttributes(
 	scalarOIDs []string,
 	scraperErrors *scrapererror.ScrapeErrors,
 ) map[string]string {
-	scalarOIDAttributeValues :=  map[string]string{}
+	scalarOIDAttributeValues :=  make(map[string]string, len(scalarOIDs))
 
 	// If no scalar OID resource attribute configs, nothing else to do
 	if len (scalarOIDs) == 0 {