Fix meterdb metrics for root db (#4476)

Author: StephenButtolph

database/factory/factory.go

@@ -6,88 +6,59 @@ package factory
 import (
 	"fmt"
 
-	"github.com/ava-labs/avalanchego/api/metrics"
+	"github.com/prometheus/client_golang/prometheus"
+
 	"github.com/ava-labs/avalanchego/database"
 	"github.com/ava-labs/avalanchego/database/corruptabledb"
 	"github.com/ava-labs/avalanchego/database/leveldb"
 	"github.com/ava-labs/avalanchego/database/memdb"
-	"github.com/ava-labs/avalanchego/database/meterdb"
 	"github.com/ava-labs/avalanchego/database/pebbledb"
 	"github.com/ava-labs/avalanchego/database/versiondb"
 	"github.com/ava-labs/avalanchego/utils/logging"
 )
 
 // New creates a new database instance based on the provided configuration.
 //
-// It also wraps the database with a corruptable DB and a meter DB.
+// It also wraps the database with a corruptable DB.
 //
 // dbName is the name of the database, either leveldb, memdb, or pebbledb.
 // dbPath is the path to the database folder.
 // readOnly indicates if the database should be read-only.
 // dbConfig is the database configuration in JSON format.
-// dbMetricsPrefix is used to create a new metrics registerer for the database.
-// meterDBRegName is used to create a new metrics registerer for the meter DB.
 func New(
 	name string,
 	path string,
 	readOnly bool,
 	config []byte,
-	gatherer metrics.MultiGatherer,
+	reg prometheus.Registerer,
 	logger logging.Logger,
-	metricsPrefix string,
-	meterDBRegName string,
 ) (database.Database, error) {
-	dbRegisterer, err := metrics.MakeAndRegister(
-		gatherer,
-		metricsPrefix,
+	var (
+		db  database.Database
+		err error
 	)
-	if err != nil {
-		return nil, err
-	}
-	var db database.Database
-	// start the db
 	switch name {
 	case leveldb.Name:
-		db, err = leveldb.New(path, config, logger, dbRegisterer)
-		if err != nil {
-			return nil, fmt.Errorf("couldn't create %s at %s: %w", leveldb.Name, path, err)
-		}
+		db, err = leveldb.New(path, config, logger, reg)
 	case memdb.Name:
 		db = memdb.New()
 	case pebbledb.Name:
-		db, err = pebbledb.New(path, config, logger, dbRegisterer)
-		if err != nil {
-			return nil, fmt.Errorf("couldn't create %s at %s: %w", pebbledb.Name, path, err)
-		}
+		db, err = pebbledb.New(path, config, logger, reg)
 	default:
-		return nil, fmt.Errorf(
-			"db-type was %q but should have been one of {%s, %s, %s}",
-			name,
+		err = fmt.Errorf(
+			"db-type must be one of {%s, %s, %s}",
 			leveldb.Name,
 			memdb.Name,
 			pebbledb.Name,
 		)
 	}
+	if err != nil {
+		return nil, fmt.Errorf("couldn't create %q at %q: %w", name, path, err)
+	}
 
-	// Wrap with corruptable DB
 	db = corruptabledb.New(db, logger)
-
 	if readOnly && name != memdb.Name {
 		db = versiondb.New(db)
 	}
-
-	meterDBReg, err := metrics.MakeAndRegister(
-		gatherer,
-		meterDBRegName,
-	)
-	if err != nil {
-		return nil, err
-	}
-
-	db, err = meterdb.New(meterDBReg, db)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create meterdb: %w", err)
-	}
-
 	return db, nil
 }

go.mod

@@ -23,7 +23,7 @@ require (
 	github.com/antithesishq/antithesis-sdk-go v0.3.8
 	github.com/ava-labs/coreth v0.16.0-rc.0
 	github.com/ava-labs/libevm v1.13.15-0.20251016142715-1bccf4f2ddb2
-	github.com/ava-labs/subnet-evm v0.8.0-fuji-rc.0.0.20251028200304-b91527f73c61
+	github.com/ava-labs/subnet-evm v0.8.1-db-metrics-fix
 	github.com/btcsuite/btcd/btcutil v1.1.3
 	github.com/cespare/xxhash/v2 v2.3.0
 	github.com/cockroachdb/pebble v0.0.0-20230928194634-aa077af62593

go.sum

@@ -79,8 +79,8 @@ github.com/ava-labs/libevm v1.13.15-0.20251016142715-1bccf4f2ddb2 h1:hQ15IJxY7WO
 github.com/ava-labs/libevm v1.13.15-0.20251016142715-1bccf4f2ddb2/go.mod h1:DqSotSn4Dx/UJV+d3svfW8raR+cH7+Ohl9BpsQ5HlGU=
 github.com/ava-labs/simplex v0.0.0-20250919142550-9cdfff10fd19 h1:S6oFasZsplNmw8B2S8cMJQMa62nT5ZKGzZRdCpd+5qQ=
 github.com/ava-labs/simplex v0.0.0-20250919142550-9cdfff10fd19/go.mod h1:GVzumIo3zR23/qGRN2AdnVkIPHcKMq/D89EGWZfMGQ0=
-github.com/ava-labs/subnet-evm v0.8.0-fuji-rc.0.0.20251028200304-b91527f73c61 h1:9wIpv0Sw/LsGSFqvszIpWFacHXrj2ezMrUG/WLCYKaw=
-github.com/ava-labs/subnet-evm v0.8.0-fuji-rc.0.0.20251028200304-b91527f73c61/go.mod h1:XtwTC47oU3sUFRdSIFKlG9IYoWW30UyFCT9tpnMv4lY=
+github.com/ava-labs/subnet-evm v0.8.1-db-metrics-fix h1:hESwxfeJQTI0FtQYP3/npWGh+4ifj5I3ehYcqzE41zI=
+github.com/ava-labs/subnet-evm v0.8.1-db-metrics-fix/go.mod h1:7Jypx176jtNk7Yzz8upQ2K9lcIUp2QaVVudUiWj/L1s=
 github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=

node/node.go

@@ -36,6 +36,7 @@ import (
 	"github.com/ava-labs/avalanchego/config/node"
 	"github.com/ava-labs/avalanchego/database"
 	"github.com/ava-labs/avalanchego/database/leveldb"
+	"github.com/ava-labs/avalanchego/database/meterdb"
 	"github.com/ava-labs/avalanchego/database/pebbledb"
 	"github.com/ava-labs/avalanchego/database/prefixdb"
 	"github.com/ava-labs/avalanchego/genesis"
@@ -769,21 +770,39 @@ func (n *Node) initDatabase() error {
 	// dbFolderName is appended to the database path given in the config
 	dbFullPath := filepath.Join(n.Config.DatabaseConfig.Path, dbFolderName)
 
-	var err error
-	n.DB, err = databasefactory.New(
+	dbReg, err := metrics.MakeAndRegister(
+		n.MetricsGatherer,
+		dbNamespace,
+	)
+	if err != nil {
+		return err
+	}
+
+	db, err := databasefactory.New(
 		n.Config.DatabaseConfig.Name,
 		dbFullPath,
 		n.Config.DatabaseConfig.ReadOnly,
 		n.Config.DatabaseConfig.Config,
-		n.MetricsGatherer,
+		dbReg,
 		n.Log,
-		dbNamespace,
-		"all",
 	)
 	if err != nil {
 		return fmt.Errorf("couldn't create database: %w", err)
 	}
 
+	meterDBReg, err := metrics.MakeAndRegister(
+		n.MeterDBMetricsGatherer,
+		"all",
+	)
+	if err != nil {
+		return err
+	}
+
+	n.DB, err = meterdb.New(meterDBReg, db)
+	if err != nil {
+		return err
+	}
+
 	rawExpectedGenesisHash := hashing.ComputeHash256(n.Config.GenesisBytes)
 
 	rawGenesisHash, err := n.DB.Get(genesisHashKey)