exporters/prometheusremotewrite: Do not append '_total' to counter me…

…tric names.

This appears to have been enforcing convention but isn't actually required.

Signed-off-by: Anthony J Mirabella <a9@aneurysm9.com>

exporter/prometheusremotewriteexporter/helper.go

@@ -38,7 +38,6 @@ const (
 	leStr         = "le"
 	quantileStr   = "quantile"
 	pInfStr       = "+Inf"
-	counterSuffix = "_total"
 	delimiter     = "_"
 	keyStr        = "key"
 )
@@ -178,34 +177,14 @@ func getPromMetricName(metric *otlp.Metric, ns string) string {
 		return ""
 	}
 
-	// if the metric is counter, _total suffix should be applied
-	_, isCounter1 := metric.Data.(*otlp.Metric_DoubleSum)
-	_, isCounter2 := metric.Data.(*otlp.Metric_IntSum)
-	isCounter := isCounter1 || isCounter2
-
-	b := strings.Builder{}
-
-	b.WriteString(ns)
-
-	if b.Len() > 0 {
-		b.WriteString(delimiter)
+	var name string
+	if len(ns) > 0 {
+		name = ns + delimiter + metric.GetName()
+	} else {
+		name = metric.GetName()
 	}
-	name := metric.GetName()
-	b.WriteString(name)
-
-	// Including units makes two metrics with the same name and label set belong to two different TimeSeries if the
-	// units are different.
-	/*
-		if b.Len() > 0 && len(desc.GetUnit()) > 0{
-			fmt.Fprintf(&b, delimeter)
-			fmt.Fprintf(&b, desc.GetUnit())
-		}
-	*/
 
-	if b.Len() > 0 && isCounter && !strings.HasSuffix(name, counterSuffix) {
-		b.WriteString(counterSuffix)
-	}
-	return sanitize(b.String())
+	return sanitize(name)
 }
 
 // batchTimeSeries splits series into multiple batch write requests.

exporter/prometheusremotewriteexporter/helper_test.go

@@ -284,10 +284,10 @@ func Test_getPromMetricName(t *testing.T) {
 			validDoubleGauge,
 		},
 		{
-			"total_suffix",
+			"no_counter_suffix",
 			validMetrics1[validIntSum],
 			ns1,
-			"test_ns_" + validIntSum + counterSuffix,
+			"test_ns_" + validIntSum,
 		},
 		{
 			"already_has_total_suffix",