chore: add metric kind

tests/reexecute/c/metrics.go

@@ -12,51 +12,57 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+type metricKind uint
+
+const (
+	counter metricKind = iota + 1
+	gauge
+)
+
 var (
 	gasMetric = topLevelMetric{
 		name:  "gas",
 		query: "avalanche_evm_eth_chain_block_gas_used_processed",
+		kind:  counter,
 	}
 	meterVMMetrics = []topLevelMetric{
 		{
 			name:  "block_parse",
 			query: "avalanche_meterchainvm_C_parse_block_sum",
+			kind:  gauge,
 		},
 		{
 			name:  "block_verify",
 			query: "avalanche_meterchainvm_C_verify_sum",
+			kind:  gauge,
 		},
 		{
 			name:  "block_accept",
 			query: "avalanche_meterchainvm_C_accept_sum",
+			kind:  gauge,
 		},
 	}
 )
 
-func getCounterMetricValue(registry prometheus.Gatherer, query string) (float64, error) {
-	metricFamilies, err := registry.Gather()
-	if err != nil {
-		return 0, fmt.Errorf("failed to gather metrics: %w", err)
-	}
-
-	for _, mf := range metricFamilies {
-		if mf.GetName() == query {
-			return mf.GetMetric()[0].Counter.GetValue(), nil
-		}
-	}
-
-	return 0, fmt.Errorf("metric %s not found", query)
-}
-
-func getGaugeMetricValue(registry prometheus.Gatherer, query string) (float64, error) {
+func getMetricValue(registry prometheus.Gatherer, metric topLevelMetric) (float64, error) {
 	metricFamilies, err := registry.Gather()
 	if err != nil {
 		return 0, fmt.Errorf("failed to gather metrics: %w", err)
 	}
 
+	query := metric.query
 	for _, mf := range metricFamilies {
-		if mf.GetName() == query {
-			return mf.GetMetric()[0].Gauge.GetValue(), nil
+		switch metric.kind {
+		case counter:
+			if mf.GetName() == query {
+				return mf.GetMetric()[0].Counter.GetValue(), nil
+			}
+		case gauge:
+			if mf.GetName() == query {
+				return mf.GetMetric()[0].Gauge.GetValue(), nil
+			}
+		default:
+			return 0, fmt.Errorf("metric type unknown: %d", metric.kind)
 		}
 	}
 
@@ -66,12 +72,13 @@ func getGaugeMetricValue(registry prometheus.Gatherer, query string) (float64, e
 type topLevelMetric struct {
 	name  string
 	query string
+	kind  metricKind
 }
 
 func getTopLevelMetrics(b *testing.B, registry prometheus.Gatherer, elapsed time.Duration) {
 	r := require.New(b)
 
-	totalGas, err := getCounterMetricValue(registry, gasMetric.query)
+	totalGas, err := getMetricValue(registry, gasMetric)
 	r.NoError(err)
 	r.NotZero(totalGas, "denominator metric %q has value 0", gasMetric.name)
 
@@ -90,7 +97,7 @@ func getTopLevelMetrics(b *testing.B, registry prometheus.Gatherer, elapsed time
 
 	totalMSTrackedPerGGas := float64(0)
 	for _, metric := range meterVMMetrics {
-		metricVal, err := getGaugeMetricValue(registry, metric.query)
+		metricVal, err := getMetricValue(registry, metric)
 		r.NoError(err)
 
 		metricValMS := (metricVal / nsPerMs) / totalGGas