From bab3dd527a64c89a7edfa0ac5d4b7d04d0f6c018 Mon Sep 17 00:00:00 2001 From: Draco Date: Sun, 4 Jan 2026 15:17:48 -0500 Subject: [PATCH 1/2] feat(reexecution): collect leveldb and meterdb metrics in reexecution tests --- tests/reexecute/c/vm_reexecute.go | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/tests/reexecute/c/vm_reexecute.go b/tests/reexecute/c/vm_reexecute.go index 0022b055d3db..5531a7c37758 100644 --- a/tests/reexecute/c/vm_reexecute.go +++ b/tests/reexecute/c/vm_reexecute.go @@ -23,12 +23,15 @@ import ( "github.com/ava-labs/avalanchego/api/metrics" "github.com/ava-labs/avalanchego/database/leveldb" + "github.com/ava-labs/avalanchego/database/meterdb" "github.com/ava-labs/avalanchego/graft/coreth/plugin/evm" "github.com/ava-labs/avalanchego/snow/engine/snowman/block" "github.com/ava-labs/avalanchego/tests" "github.com/ava-labs/avalanchego/tests/fixture/tmpnet" "github.com/ava-labs/avalanchego/tests/reexecute" + "github.com/ava-labs/avalanchego/utils/constants" "github.com/ava-labs/avalanchego/utils/logging" + "github.com/ava-labs/avalanchego/utils/metric" "github.com/ava-labs/avalanchego/utils/perms" "github.com/ava-labs/avalanchego/utils/timer" ) @@ -224,8 +227,19 @@ func benchmarkReexecuteRange( r.NoError(err) dbLogger := tests.NewDefaultLogger("db") - - db, err := leveldb.New(vmDBDir, nil, dbLogger, prometheus.NewRegistry()) + dbReg, err := metrics.MakeAndRegister( + prefixGatherer, + metric.AppendNamespace(constants.PlatformName, "db"), + ) + r.NoError(err) + db, err := leveldb.New(vmDBDir, nil, dbLogger, dbReg) + r.NoError(err) + meterDBReg, err := metrics.MakeAndRegister( + prefixGatherer, + metric.AppendNamespace(constants.PlatformName, "meterdb"), + ) + r.NoError(err) + db, err = meterdb.New(meterDBReg, db) r.NoError(err) defer func() { log.Info("shutting down DB") From 06f26649cf8e0c11d41382eae80809c00acfdb45 Mon Sep 17 00:00:00 2001 From: Draco Date: Wed, 7 Jan 2026 09:14:31 -0500 Subject: [PATCH 2/2] chore: rename registry vars --- tests/reexecute/c/vm_reexecute.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/reexecute/c/vm_reexecute.go b/tests/reexecute/c/vm_reexecute.go index 5531a7c37758..40549148be35 100644 --- a/tests/reexecute/c/vm_reexecute.go +++ b/tests/reexecute/c/vm_reexecute.go @@ -227,19 +227,19 @@ func benchmarkReexecuteRange( r.NoError(err) dbLogger := tests.NewDefaultLogger("db") - dbReg, err := metrics.MakeAndRegister( + dbRegistry, err := metrics.MakeAndRegister( prefixGatherer, metric.AppendNamespace(constants.PlatformName, "db"), ) r.NoError(err) - db, err := leveldb.New(vmDBDir, nil, dbLogger, dbReg) + db, err := leveldb.New(vmDBDir, nil, dbLogger, dbRegistry) r.NoError(err) - meterDBReg, err := metrics.MakeAndRegister( + meterDBRegistry, err := metrics.MakeAndRegister( prefixGatherer, metric.AppendNamespace(constants.PlatformName, "meterdb"), ) r.NoError(err) - db, err = meterdb.New(meterDBReg, db) + db, err = meterdb.New(meterDBRegistry, db) r.NoError(err) defer func() { log.Info("shutting down DB")