[Statsd receiver]Add metric type as a label

receiver/statsdreceiver/config.go

@@ -26,4 +26,5 @@ type Config struct {
 	configmodels.ReceiverSettings `mapstructure:",squash"`
 	NetAddr                       confignet.NetAddr `mapstructure:",squash"`
 	AggregationInterval           time.Duration     `mapstructure:"aggregation_interval"`
+	EnableMetricType              bool              `mapstructure:"enable_metric_type"`
 }

receiver/statsdreceiver/factory.go

@@ -31,6 +31,7 @@ const (
 	defaultBindEndpoint        = "localhost:8125"
 	defaultTransport           = "udp"
 	defaultAggregationInterval = 60 * time.Second
+	defaultEnableMetricType    = false
 )
 
 // NewFactory creates a factory for the StatsD receiver.
@@ -53,6 +54,7 @@ func createDefaultConfig() configmodels.Receiver {
 			Transport: defaultTransport,
 		},
 		AggregationInterval: defaultAggregationInterval,
+		EnableMetricType:    defaultEnableMetricType,
 	}
 }
 

receiver/statsdreceiver/protocol/parser.go

@@ -20,7 +20,7 @@ import (
 
 // Parser is something that can map input StatsD strings to OTLP Metric representations.
 type Parser interface {
-	Initialize() error
+	Initialize(enableMetricType bool) error
 	GetMetrics() []*metricspb.Metric
 	Aggregate(line string) error
 }

receiver/statsdreceiver/protocol/statsd_parser.go

@@ -35,10 +35,13 @@ func getSupportedTypes() []string {
 	return []string{"c", "g"}
 }
 
+const TagMetricType = "metric_type"
+
 // StatsDParser supports the Parse method for parsing StatsD messages with Tags.
 type StatsDParser struct {
-	gauges   map[statsDMetricdescription]*metricspb.Metric
-	counters map[statsDMetricdescription]*metricspb.Metric
+	gauges           map[statsDMetricdescription]*metricspb.Metric
+	counters         map[statsDMetricdescription]*metricspb.Metric
+	enableMetricType bool
 }
 
 type statsDMetric struct {
@@ -60,9 +63,10 @@ type statsDMetricdescription struct {
 	labels           label.Distinct
 }
 
-func (p *StatsDParser) Initialize() error {
+func (p *StatsDParser) Initialize(enableMetricType bool) error {
 	p.gauges = make(map[statsDMetricdescription]*metricspb.Metric)
 	p.counters = make(map[statsDMetricdescription]*metricspb.Metric)
+	p.enableMetricType = enableMetricType
 	return nil
 }
 
@@ -90,7 +94,7 @@ var timeNowFunc = func() int64 {
 
 //aggregate for each metric line
 func (p *StatsDParser) Aggregate(line string) error {
-	parsedMetric, err := parseMessageToMetric(line)
+	parsedMetric, err := parseMessageToMetric(line, p.enableMetricType)
 	if err != nil {
 		return err
 	}
@@ -128,7 +132,7 @@ func (p *StatsDParser) Aggregate(line string) error {
 	return nil
 }
 
-func parseMessageToMetric(line string) (statsDMetric, error) {
+func parseMessageToMetric(line string, enableMetricType bool) (statsDMetric, error) {
 	result := statsDMetric{}
 
 	parts := strings.Split(line, "|")
@@ -159,6 +163,10 @@ func parseMessageToMetric(line string) (statsDMetric, error) {
 	}
 
 	additionalParts := parts[2:]
+
+	var kvs []label.KeyValue
+	var sortable label.Sortable
+
 	for _, part := range additionalParts {
 		// TODO: Sample rate doesn't currently have a place to go in the protocol
 		if strings.HasPrefix(part, "@") {
@@ -175,11 +183,6 @@ func parseMessageToMetric(line string) (statsDMetric, error) {
 
 			tagSets := strings.Split(tagsStr, ",")
 
-			result.labelKeys = make([]*metricspb.LabelKey, 0, len(tagSets))
-			result.labelValues = make([]*metricspb.LabelValue, 0, len(tagSets))
-
-			var kvs []label.KeyValue
-			var sortable label.Sortable
 			for _, tagSet := range tagSets {
 				tagParts := strings.Split(tagSet, ":")
 				if len(tagParts) != 2 {
@@ -192,13 +195,11 @@ func parseMessageToMetric(line string) (statsDMetric, error) {
 				})
 				kvs = append(kvs, label.String(tagParts[0], tagParts[1]))
 			}
-			set := label.NewSetWithSortable(kvs, &sortable)
-			result.description.labels = set.Equivalent()
+
 		} else {
 			return result, fmt.Errorf("unrecognized message part: %s", part)
 		}
 	}
-
 	switch result.description.statsdMetricType {
 	case "g":
 		f, err := strconv.ParseFloat(result.value, 64)
@@ -220,6 +221,29 @@ func parseMessageToMetric(line string) (statsDMetric, error) {
 		result.metricType = metricspb.MetricDescriptor_GAUGE_INT64
 	}
 
+	// add metric_type dimension for all metrics
+
+	if enableMetricType {
+		var metricType = ""
+		switch result.description.statsdMetricType {
+		case "g":
+			metricType = "gauge"
+		case "c":
+			metricType = "counter"
+		}
+		result.labelKeys = append(result.labelKeys, &metricspb.LabelKey{Key: TagMetricType})
+		result.labelValues = append(result.labelValues, &metricspb.LabelValue{
+			Value:    metricType,
+			HasValue: true,
+		})
+		kvs = append(kvs, label.String(TagMetricType, metricType))
+	}
+
+	if len(kvs) != 0 {
+		set := label.NewSetWithSortable(kvs, &sortable)
+		result.description.labels = set.Equivalent()
+	}
+
 	return result, nil
 }