Skip to content

Commit 1577dd5

Browse files
qdm12qdm12
committed
chore(metrics): use libevm metrics package and delete local metrics
1 parent 68711e0 commit 1577dd5

File tree

97 files changed

+64
-5913
lines changed

Some content is hidden

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

97 files changed

+64
-5913
lines changed

‎core/blockchain.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ import (
3939
"sync/atomic"
4040
"time"
4141

42+
"github.com/ava-labs/libevm/metrics"
4243
"github.com/ava-labs/subnet-evm/commontype"
4344
"github.com/ava-labs/subnet-evm/consensus"
4445
"github.com/ava-labs/subnet-evm/consensus/misc/eip4844"
@@ -48,7 +49,6 @@ import (
4849
"github.com/ava-labs/subnet-evm/core/types"
4950
"github.com/ava-labs/subnet-evm/core/vm"
5051
"github.com/ava-labs/subnet-evm/internal/version"
51-
"github.com/ava-labs/subnet-evm/metrics"
5252
"github.com/ava-labs/subnet-evm/params"
5353
"github.com/ava-labs/subnet-evm/trie"
5454
"github.com/ava-labs/subnet-evm/triedb"

‎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
@@ -32,7 +32,7 @@ import (
3232
"encoding/binary"
3333

3434
"github.com/ava-labs/avalanchego/utils/wrappers"
35-
"github.com/ava-labs/subnet-evm/metrics"
35+
"github.com/ava-labs/libevm/metrics"
3636
"github.com/ethereum/go-ethereum/common"
3737
"github.com/ethereum/go-ethereum/crypto"
3838
)

‎core/state/metrics.go‎

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

2727
package state
2828

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

3131
var (
3232
accountUpdatedMeter = metrics.NewRegisteredMeter("state/update/account", nil)

‎core/state/snapshot/snapshot.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ import (
3434
"sync"
3535
"time"
3636

37+
"github.com/ava-labs/libevm/metrics"
3738
"github.com/ava-labs/subnet-evm/core/rawdb"
3839
"github.com/ava-labs/subnet-evm/core/types"
39-
"github.com/ava-labs/subnet-evm/metrics"
4040
"github.com/ava-labs/subnet-evm/triedb"
4141
"github.com/ethereum/go-ethereum/common"
4242
"github.com/ethereum/go-ethereum/ethdb"

‎core/state/state_object.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ import (
3232
"io"
3333
"time"
3434

35+
"github.com/ava-labs/libevm/metrics"
3536
"github.com/ava-labs/subnet-evm/core/types"
36-
"github.com/ava-labs/subnet-evm/metrics"
3737
"github.com/ava-labs/subnet-evm/trie/trienode"
3838
"github.com/ethereum/go-ethereum/common"
3939
"github.com/ethereum/go-ethereum/crypto"

‎core/state/statedb.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ import (
3232
"sort"
3333
"time"
3434

35+
"github.com/ava-labs/libevm/metrics"
3536
"github.com/ava-labs/subnet-evm/core/rawdb"
3637
"github.com/ava-labs/subnet-evm/core/state/snapshot"
3738
"github.com/ava-labs/subnet-evm/core/types"
38-
"github.com/ava-labs/subnet-evm/metrics"
3939
"github.com/ava-labs/subnet-evm/params"
4040
"github.com/ava-labs/subnet-evm/predicate"
4141
"github.com/ava-labs/subnet-evm/trie"

‎core/state/trie_prefetcher.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ package state
1919
import (
2020
"sync"
2121

22+
"github.com/ava-labs/libevm/metrics"
2223
"github.com/ava-labs/subnet-evm/libevm/options"
23-
"github.com/ava-labs/subnet-evm/metrics"
2424
"github.com/ethereum/go-ethereum/common"
2525
"github.com/ethereum/go-ethereum/log"
2626
)

‎core/state/trie_prefetcher_extra_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ import (
1313
"testing"
1414

1515
"github.com/ava-labs/avalanchego/database"
16+
"github.com/ava-labs/libevm/metrics"
1617
"github.com/ava-labs/subnet-evm/core/rawdb"
1718
"github.com/ava-labs/subnet-evm/core/state/snapshot"
1819
"github.com/ava-labs/subnet-evm/core/types"
19-
"github.com/ava-labs/subnet-evm/metrics"
2020
"github.com/ava-labs/subnet-evm/triedb"
2121
"github.com/ava-labs/subnet-evm/triedb/hashdb"
2222
"github.com/ethereum/go-ethereum/common"

‎core/txpool/blobpool/blobpool.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ import (
3939
"sync"
4040
"time"
4141

42+
"github.com/ava-labs/libevm/metrics"
4243
"github.com/ava-labs/subnet-evm/consensus/dummy"
4344
"github.com/ava-labs/subnet-evm/consensus/misc/eip4844"
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/ethereum/go-ethereum/common"
5151
"github.com/ethereum/go-ethereum/event"

0 commit comments

Comments
 (0)