fix metrics naming '_total'

Author: evkuzin

metrics/provider_prometheus.go

@@ -64,16 +64,6 @@ func makeLabels(lvs []string) promclient.Labels {
 	return labels
 }
 
-// extractLabelValues extracts only the values from alternating key-value pairs.
-// e.g., ["service", "foo", "host", "bar"] -> ["foo", "bar"]
-func extractLabelValues(lvs []string) []string {
-	values := make([]string, 0, len(lvs)/2)
-	for i := 1; i < len(lvs); i += 2 {
-		values = append(values, lvs[i])
-	}
-	return values
-}
-
 // promCounter wraps a Prometheus CounterVec and supports deletion of label values.
 type promCounter struct {
 	cv  *promclient.CounterVec

route/metrics_cleanup_test.go

@@ -26,14 +26,14 @@ func TestMetricsCleanup(t *testing.T) {
 
 	rxCv := prometheus.NewCounterVec(prometheus.CounterOpts{
 		Namespace: "fabio",
-		Name:      "route_rx",
+		Name:      "route_rx_total",
 		Help:      "test",
 	}, []string{"service", "host", "path", "target"})
 	reg.MustRegister(rxCv)
 
 	txCv := prometheus.NewCounterVec(prometheus.CounterOpts{
 		Namespace: "fabio",
-		Name:      "route_tx",
+		Name:      "route_tx_total",
 		Help:      "test",
 	}, []string{"service", "host", "path", "target"})
 	reg.MustRegister(txCv)