diff --git a/consensus/polybft/consensus_metrics.go b/consensus/polybft/consensus_metrics.go index e0795c4d15..abc756eb2c 100644 --- a/consensus/polybft/consensus_metrics.go +++ b/consensus/polybft/consensus_metrics.go @@ -4,7 +4,7 @@ import ( "time" "github.com/0xPolygon/polygon-edge/types" - "github.com/armon/go-metrics" + "github.com/hashicorp/go-metrics" ) const ( diff --git a/consensus/polybft/fsm.go b/consensus/polybft/fsm.go index d26be444f2..d3726bffb4 100644 --- a/consensus/polybft/fsm.go +++ b/consensus/polybft/fsm.go @@ -9,8 +9,8 @@ import ( "github.com/0xPolygon/go-ibft/messages" "github.com/0xPolygon/go-ibft/messages/proto" - "github.com/armon/go-metrics" "github.com/hashicorp/go-hclog" + "github.com/hashicorp/go-metrics" "github.com/0xPolygon/polygon-edge/bls" "github.com/0xPolygon/polygon-edge/chain" diff --git a/consensus/polybft/stats.go b/consensus/polybft/stats.go index 02ae335e0c..31d9e13213 100644 --- a/consensus/polybft/stats.go +++ b/consensus/polybft/stats.go @@ -3,7 +3,7 @@ package polybft import ( "time" - "github.com/armon/go-metrics" + "github.com/hashicorp/go-metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/go.mod b/go.mod index 20f8ed6d00..fd78d020b1 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,6 @@ require ( github.com/alibabacloud-go/tea v1.2.2 github.com/alibabacloud-go/tea-utils/v2 v2.0.7 github.com/aliyun/credentials-go v1.3.10 - github.com/armon/go-metrics v0.4.1 github.com/aws/aws-sdk-go v1.55.5 github.com/btcsuite/btcd/btcec/v2 v2.3.4 github.com/docker/docker v27.3.1+incompatible @@ -26,6 +25,7 @@ require ( github.com/hashicorp/go-bexpr v0.1.14 github.com/hashicorp/go-hclog v1.6.3 github.com/hashicorp/go-immutable-radix v1.3.1 + github.com/hashicorp/go-metrics v0.5.3 github.com/hashicorp/go-multierror v1.1.1 github.com/hashicorp/golang-lru v1.0.2 github.com/hashicorp/hcl v1.0.1-vault-5 @@ -86,6 +86,7 @@ require ( github.com/alibabacloud-go/tea-utils v1.3.1 // indirect github.com/alibabacloud-go/tea-xml v1.1.3 // indirect github.com/andybalholm/brotli v1.1.0 // indirect + github.com/armon/go-metrics v0.4.1 // indirect github.com/benbjohnson/clock v1.3.5 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/btcsuite/btcd v0.24.2 // indirect diff --git a/go.sum b/go.sum index 23f1f796a3..4785d44449 100644 --- a/go.sum +++ b/go.sum @@ -373,6 +373,8 @@ github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVH github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc= github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-metrics v0.5.3 h1:M5uADWMOGCTUNU1YuC4hfknOeHNaX54LDm4oYSucoNE= +github.com/hashicorp/go-metrics v0.5.3/go.mod h1:KEjodfebIOuBYSAe/bHTm+HChmKSxAOXPBieMLYozDE= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= diff --git a/jsonrpc/dispatcher.go b/jsonrpc/dispatcher.go index a428768114..d31683ef5d 100644 --- a/jsonrpc/dispatcher.go +++ b/jsonrpc/dispatcher.go @@ -12,8 +12,8 @@ import ( "unicode" "github.com/0xPolygon/polygon-edge/accounts" - "github.com/armon/go-metrics" "github.com/hashicorp/go-hclog" + "github.com/hashicorp/go-metrics" jsonIter "github.com/json-iterator/go" ) diff --git a/network/gossip.go b/network/gossip.go index 8f306887e7..ad68ff68e7 100644 --- a/network/gossip.go +++ b/network/gossip.go @@ -8,8 +8,8 @@ import ( "sync/atomic" "github.com/0xPolygon/polygon-edge/helper/common" - "github.com/armon/go-metrics" "github.com/hashicorp/go-hclog" + "github.com/hashicorp/go-metrics" pubsub "github.com/libp2p/go-libp2p-pubsub" "github.com/libp2p/go-libp2p/core/peer" "google.golang.org/protobuf/proto" diff --git a/network/server.go b/network/server.go index 7c6ed3da9a..2382c15509 100644 --- a/network/server.go +++ b/network/server.go @@ -10,7 +10,7 @@ import ( "github.com/0xPolygon/polygon-edge/network/common" "github.com/0xPolygon/polygon-edge/network/dial" "github.com/0xPolygon/polygon-edge/network/discovery" - "github.com/armon/go-metrics" + "github.com/hashicorp/go-metrics" "github.com/libp2p/go-libp2p" "github.com/libp2p/go-libp2p/p2p/security/noise" rawGrpc "google.golang.org/grpc" diff --git a/network/server_identity.go b/network/server_identity.go index 27ed6bc9a7..65c93cc2eb 100644 --- a/network/server_identity.go +++ b/network/server_identity.go @@ -8,7 +8,7 @@ import ( "github.com/0xPolygon/polygon-edge/network/grpc" "github.com/0xPolygon/polygon-edge/network/identity" "github.com/0xPolygon/polygon-edge/network/proto" - "github.com/armon/go-metrics" + "github.com/hashicorp/go-metrics" kbucket "github.com/libp2p/go-libp2p-kbucket" "github.com/libp2p/go-libp2p-kbucket/keyspace" "github.com/libp2p/go-libp2p/core/network" diff --git a/server/server_metrics.go b/server/server_metrics.go index ffcb0a1f6e..a725616d80 100644 --- a/server/server_metrics.go +++ b/server/server_metrics.go @@ -5,8 +5,8 @@ import ( "os" "time" - "github.com/armon/go-metrics" - "github.com/armon/go-metrics/prometheus" + "github.com/hashicorp/go-metrics" + "github.com/hashicorp/go-metrics/prometheus" "gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer" "gopkg.in/DataDog/dd-trace-go.v1/profiler" ) diff --git a/syncer/client.go b/syncer/client.go index 007faeac23..f044dddc40 100644 --- a/syncer/client.go +++ b/syncer/client.go @@ -14,8 +14,8 @@ import ( "github.com/0xPolygon/polygon-edge/network/event" "github.com/0xPolygon/polygon-edge/syncer/proto" "github.com/0xPolygon/polygon-edge/types" - "github.com/armon/go-metrics" "github.com/hashicorp/go-hclog" + "github.com/hashicorp/go-metrics" "github.com/libp2p/go-libp2p/core/peer" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/syncer/service.go b/syncer/service.go index 1e874f6e85..8c37d83183 100644 --- a/syncer/service.go +++ b/syncer/service.go @@ -7,8 +7,8 @@ import ( "github.com/0xPolygon/polygon-edge/network/grpc" "github.com/0xPolygon/polygon-edge/syncer/proto" "github.com/0xPolygon/polygon-edge/types" - "github.com/armon/go-metrics" "github.com/golang/protobuf/ptypes/empty" + "github.com/hashicorp/go-metrics" ) var ( diff --git a/syncer/syncer.go b/syncer/syncer.go index c03d7aba5e..6d51ed9352 100644 --- a/syncer/syncer.go +++ b/syncer/syncer.go @@ -9,8 +9,8 @@ import ( "github.com/0xPolygon/polygon-edge/helper/progress" "github.com/0xPolygon/polygon-edge/network/event" "github.com/0xPolygon/polygon-edge/types" - "github.com/armon/go-metrics" "github.com/hashicorp/go-hclog" + "github.com/hashicorp/go-metrics" "github.com/libp2p/go-libp2p/core/peer" ) diff --git a/txpool/slot_gauge.go b/txpool/slot_gauge.go index 7dae77d400..1f09688d96 100644 --- a/txpool/slot_gauge.go +++ b/txpool/slot_gauge.go @@ -3,7 +3,7 @@ package txpool import ( "sync/atomic" - "github.com/armon/go-metrics" + "github.com/hashicorp/go-metrics" "github.com/0xPolygon/polygon-edge/types" ) diff --git a/txpool/txpool.go b/txpool/txpool.go index c16686b48c..90afff163a 100644 --- a/txpool/txpool.go +++ b/txpool/txpool.go @@ -7,9 +7,9 @@ import ( "sync/atomic" "time" - "github.com/armon/go-metrics" "github.com/golang/protobuf/ptypes/any" "github.com/hashicorp/go-hclog" + "github.com/hashicorp/go-metrics" "github.com/libp2p/go-libp2p/core/peer" "google.golang.org/grpc"