Skip to content

fix: Always register Firewood metrics when enabled #4793

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maru-ava merged 4 commits into from
Jan 6, 2026
Merged

fix: Always register Firewood metrics when enabled #4793

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
596a3f7
fix: Always register Firewood metrics when enabled
alarso16 Dec 29, 2025
74e4af0
fix: add init function
alarso16 Dec 29, 2025
c51c178
Merge branch 'master' into alarso16/firewood-metrics
alarso16 Jan 6, 2026
88fb6b7
chore: license header
alarso16 Jan 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions graft/coreth/plugin/evm/vm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,12 +513,9 @@ func (vm *VM) initializeMetrics() error {
return err
}

if vm.config.MetricsExpensiveEnabled && vm.config.StateScheme == customrawdb.FirewoodScheme {
if err := ffi.StartMetrics(); err != nil {
return fmt.Errorf("failed to start firewood metrics collection: %w", err)
}
if err := vm.ctx.Metrics.Register("firewood", ffi.Gatherer{}); err != nil {
return fmt.Errorf("failed to register firewood metrics: %w", err)
if vm.config.StateScheme == customrawdb.FirewoodScheme {
if err := vm.ctx.Metrics.Register(customrawdb.FirewoodScheme, ffi.Gatherer{}); err != nil {
return fmt.Errorf("registering firewood metrics: %w", err)
}
}
return vm.ctx.Metrics.Register(sdkMetricsPrefix, vm.sdkMetrics)
Expand Down
15 changes: 15 additions & 0 deletions graft/evm/firewood/metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// Copyright (C) 2019-2025, Ava Labs, Inc. All rights reserved.
// See the file LICENSE for licensing terms.

package firewood

import (
"github.com/ava-labs/firewood-go-ethhash/ffi"
"github.com/ava-labs/libevm/log"
)

func init() {
if err := ffi.StartMetrics(); err != nil {
log.Crit("starting firewood metrics", "error", err)
}
}
9 changes: 3 additions & 6 deletions graft/subnet-evm/plugin/evm/vm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,12 +584,9 @@ func (vm *VM) initializeMetrics() error {
return err
}

if vm.config.MetricsExpensiveEnabled && vm.config.StateScheme == customrawdb.FirewoodScheme {
if err := ffi.StartMetrics(); err != nil {
return fmt.Errorf("failed to start firewood metrics collection: %w", err)
}
if err := vm.ctx.Metrics.Register("firewood", ffi.Gatherer{}); err != nil {
return fmt.Errorf("failed to register firewood metrics: %w", err)
if vm.config.StateScheme == customrawdb.FirewoodScheme {
if err := vm.ctx.Metrics.Register(customrawdb.FirewoodScheme, ffi.Gatherer{}); err != nil {
return fmt.Errorf("registering firewood metrics: %w", err)
}
}
return vm.ctx.Metrics.Register(sdkMetricsPrefix, vm.sdkMetrics)
Expand Down
Loading