chore(reexecute/c): add back scraping of multiple metrics

tests/reexecute/c/metrics.go

@@ -0,0 +1,106 @@
+// Copyright (C) 2019-2025, Ava Labs, Inc. All rights reserved.
+// See the file LICENSE for licensing terms.
+
+package main
+
+import (
+	"fmt"
+	"time"
+
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/stretchr/testify/require"
+
+	"github.com/ava-labs/avalanchego/tests"
+)
+
+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_parse_block_sum",
+			kind:  gauge,
+		},
+		{
+			name:  "block_verify",
+			query: "avalanche_meterchainvm_verify_sum",
+			kind:  gauge,
+		},
+		{
+			name:  "block_accept",
+			query: "avalanche_meterchainvm_accept_sum",
+			kind:  gauge,
+		},
+	}
+)
+
+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 {
+		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)
+		}
+	}
+
+	return 0, fmt.Errorf("metric %s not found", query)
+}
+
+type topLevelMetric struct {
+	name  string
+	query string
+	kind  metricKind
+}
+
+func getTopLevelMetrics(tc tests.TestContext, tool *benchmarkTool, registry prometheus.Gatherer, elapsed time.Duration) {
+	r := require.New(tc)
+
+	totalGas, err := getMetricValue(registry, gasMetric)
+	r.NoError(err)
+	r.NotZero(totalGas, "denominator metric %q has value 0", gasMetric.name)
+
+	var (
+		mgas                      float64 = 1_000_000
+		ggas                      float64 = 1_000_000_000
+		nanosecondsPerMillisecond float64 = 1_000_000
+	)
+
+	mgasPerSecond := (totalGas / mgas) / elapsed.Seconds()
+	tool.addResult(mgasPerSecond, "mgas/s")
+
+	totalGGas := totalGas / ggas
+	msPerGGas := (float64(elapsed) / nanosecondsPerMillisecond) / totalGGas
+	tool.addResult(msPerGGas, "ms/ggas")
+
+	for _, metric := range meterVMMetrics {
+		metricVal, err := getMetricValue(registry, metric)
+		r.NoError(err)
+
+		metricValMS := (metricVal / nanosecondsPerMillisecond) / totalGGas
+		tool.addResult(metricValMS, metric.name+"_ms/ggas")
+	}
+}

tests/reexecute/c/vm_reexecute.go

@@ -654,28 +654,3 @@ func parseCustomLabels(labelsStr string) (map[string]string, error) {
 	}
 	return labels, nil
 }
-
-func getTopLevelMetrics(tc tests.TestContext, tool *benchmarkTool, registry prometheus.Gatherer, elapsed time.Duration) {
-	r := require.New(tc)
-
-	gasUsed, err := getCounterMetricValue(registry, "avalanche_evm_eth_chain_block_gas_used_processed")
-	r.NoError(err)
-	mgasPerSecond := gasUsed / 1_000_000 / elapsed.Seconds()
-
-	tool.addResult(mgasPerSecond, "mgas/s")
-}
-
-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)
-}