Skip to content
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

replace armon dependency with hashicorp #400

Merged
merged 1 commit into from
Oct 4, 2024
Merged

replace armon dependency with hashicorp #400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion consensus/polybft/consensus_metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"time"

"github.com/0xPolygon/polygon-edge/types"
"github.com/armon/go-metrics"
"github.com/hashicorp/go-metrics"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion consensus/polybft/fsm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion consensus/polybft/stats.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package polybft
import (
"time"

"github.com/armon/go-metrics"
"github.com/hashicorp/go-metrics"
"github.com/prometheus/client_golang/prometheus"
)

Expand Down
3 changes: 2 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
2 changes: 1 addition & 1 deletion jsonrpc/dispatcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion network/gossip.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion network/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion network/server_identity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions server/server_metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion syncer/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion syncer/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion syncer/syncer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion txpool/slot_gauge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion txpool/txpool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down