Skip to content

Commit f4db039

Browse files
committed
chore(metrics): use libevm metrics package and delete local metrics
- delete content of `metrics` package except `prometheus` package - only keep subnet-evm specifics in `metrics/prometheus` - Bring over refactoring and fixes done in ava-labs/libevm#103 - Bring over test refactoring done in ava-labs/libevm#103
1 parent 2c08400 commit f4db039

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+273
-5831
lines changed

core/blockchain.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ import (
4545
"github.com/ava-labs/libevm/ethdb"
4646
"github.com/ava-labs/libevm/event"
4747
"github.com/ava-labs/libevm/log"
48+
"github.com/ava-labs/libevm/metrics"
4849
"github.com/ava-labs/libevm/trie"
4950
"github.com/ava-labs/libevm/triedb"
5051
"github.com/ava-labs/subnet-evm/commontype"
@@ -55,7 +56,6 @@ import (
5556
"github.com/ava-labs/subnet-evm/core/state/snapshot"
5657
"github.com/ava-labs/subnet-evm/core/types"
5758
"github.com/ava-labs/subnet-evm/internal/version"
58-
"github.com/ava-labs/subnet-evm/metrics"
5959
"github.com/ava-labs/subnet-evm/params"
6060
"github.com/ava-labs/subnet-evm/triedb/hashdb"
6161
"github.com/ava-labs/subnet-evm/triedb/pathdb"

core/main_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ func TestMain(m *testing.M) {
1515
opts := []goleak.Option{
1616
// No good way to shut down these goroutines:
1717
goleak.IgnoreTopFunction("github.com/ava-labs/subnet-evm/core/state/snapshot.(*diskLayer).generate"),
18-
goleak.IgnoreTopFunction("github.com/ava-labs/subnet-evm/metrics.(*meterArbiter).tick"),
18+
goleak.IgnoreTopFunction("github.com/ava-labs/libevm/metrics.(*meterArbiter).tick"),
1919
goleak.IgnoreTopFunction("github.com/syndtr/goleveldb/leveldb.(*DB).mpoolDrain"),
2020
}
2121
goleak.VerifyTestMain(m, opts...)

core/rawdb/schema.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import (
3434
"github.com/ava-labs/avalanchego/utils/wrappers"
3535
"github.com/ava-labs/libevm/common"
3636
"github.com/ava-labs/libevm/crypto"
37-
"github.com/ava-labs/subnet-evm/metrics"
37+
"github.com/ava-labs/libevm/metrics"
3838
)
3939

4040
// The fields below define the low level database schema prefixing.

core/state/snapshot/snapshot.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ import (
3939
"github.com/ava-labs/libevm/ethdb"
4040
"github.com/ava-labs/libevm/libevm/stateconf"
4141
"github.com/ava-labs/libevm/log"
42+
"github.com/ava-labs/libevm/metrics"
4243
"github.com/ava-labs/libevm/triedb"
4344
"github.com/ava-labs/subnet-evm/core/rawdb"
44-
"github.com/ava-labs/subnet-evm/metrics"
4545
)
4646

4747
const (

core/state/trie_prefetcher_extra_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ import (
1515
"github.com/ava-labs/avalanchego/database"
1616
"github.com/ava-labs/libevm/common"
1717
"github.com/ava-labs/libevm/ethdb"
18+
"github.com/ava-labs/libevm/metrics"
1819
"github.com/ava-labs/libevm/triedb"
1920
"github.com/ava-labs/subnet-evm/core/rawdb"
2021
"github.com/ava-labs/subnet-evm/core/state/snapshot"
2122
"github.com/ava-labs/subnet-evm/core/types"
22-
"github.com/ava-labs/subnet-evm/metrics"
2323
"github.com/ava-labs/subnet-evm/triedb/hashdb"
2424
"github.com/stretchr/testify/require"
2525
)

core/txpool/blobpool/blobpool.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ import (
4242
"github.com/ava-labs/libevm/common"
4343
"github.com/ava-labs/libevm/event"
4444
"github.com/ava-labs/libevm/log"
45+
"github.com/ava-labs/libevm/metrics"
4546
"github.com/ava-labs/libevm/rlp"
4647
"github.com/ava-labs/subnet-evm/consensus/misc/eip4844"
4748
"github.com/ava-labs/subnet-evm/core"
4849
"github.com/ava-labs/subnet-evm/core/state"
4950
"github.com/ava-labs/subnet-evm/core/txpool"
5051
"github.com/ava-labs/subnet-evm/core/types"
51-
"github.com/ava-labs/subnet-evm/metrics"
5252
"github.com/ava-labs/subnet-evm/params"
5353
"github.com/ava-labs/subnet-evm/plugin/evm/header"
5454
"github.com/holiman/billy"

core/txpool/blobpool/metrics.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
package blobpool
2828

29-
import "github.com/ava-labs/subnet-evm/metrics"
29+
import "github.com/ava-labs/libevm/metrics"
3030

3131
var (
3232
// datacapGauge tracks the user's configured capacity for the blob pool. It

core/txpool/legacypool/legacypool.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ import (
4040
"github.com/ava-labs/libevm/common/prque"
4141
"github.com/ava-labs/libevm/event"
4242
"github.com/ava-labs/libevm/log"
43+
"github.com/ava-labs/libevm/metrics"
4344
"github.com/ava-labs/subnet-evm/commontype"
4445
"github.com/ava-labs/subnet-evm/core"
4546
"github.com/ava-labs/subnet-evm/core/state"
4647
"github.com/ava-labs/subnet-evm/core/txpool"
4748
"github.com/ava-labs/subnet-evm/core/types"
48-
"github.com/ava-labs/subnet-evm/metrics"
4949
"github.com/ava-labs/subnet-evm/params"
5050
"github.com/ava-labs/subnet-evm/plugin/evm/header"
5151
"github.com/ava-labs/subnet-evm/precompile/contracts/feemanager"

core/txpool/txpool.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ import (
3636
"github.com/ava-labs/libevm/common"
3737
"github.com/ava-labs/libevm/event"
3838
"github.com/ava-labs/libevm/log"
39+
"github.com/ava-labs/libevm/metrics"
3940
"github.com/ava-labs/subnet-evm/core"
4041
"github.com/ava-labs/subnet-evm/core/types"
41-
"github.com/ava-labs/subnet-evm/metrics"
4242
)
4343

4444
var (

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ require (
2424
github.com/onsi/ginkgo/v2 v2.13.1
2525
github.com/prometheus/client_golang v1.16.0
2626
github.com/prometheus/client_model v0.3.0
27-
github.com/shirou/gopsutil v3.21.11+incompatible
2827
github.com/spf13/cast v1.5.0
2928
github.com/spf13/pflag v1.0.5
3029
github.com/spf13/viper v1.12.0
@@ -38,7 +37,6 @@ require (
3837
golang.org/x/exp v0.0.0-20241215155358-4a5509556b9e
3938
golang.org/x/mod v0.22.0
4039
golang.org/x/sync v0.10.0
41-
golang.org/x/sys v0.29.0
4240
golang.org/x/time v0.3.0
4341
golang.org/x/tools v0.29.0
4442
google.golang.org/protobuf v1.35.2
@@ -134,6 +132,7 @@ require (
134132
github.com/rogpeppe/go-internal v1.12.0 // indirect
135133
github.com/rs/cors v1.7.0 // indirect
136134
github.com/russross/blackfriday/v2 v2.1.0 // indirect
135+
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
137136
github.com/sirupsen/logrus v1.9.0 // indirect
138137
github.com/spf13/afero v1.8.2 // indirect
139138
github.com/spf13/jwalterweatherman v1.1.0 // indirect
@@ -156,6 +155,7 @@ require (
156155
go.uber.org/multierr v1.11.0 // indirect
157156
golang.org/x/net v0.34.0 // indirect
158157
golang.org/x/oauth2 v0.21.0 // indirect
158+
golang.org/x/sys v0.29.0 // indirect
159159
golang.org/x/term v0.28.0 // indirect
160160
golang.org/x/text v0.21.0 // indirect
161161
gonum.org/v1/gonum v0.11.0 // indirect

0 commit comments

Comments
 (0)