From a14471ed1d3ea8f316b9d476489dc178019d7dd5 Mon Sep 17 00:00:00 2001 From: Dentrax Date: Sun, 28 Jul 2024 14:13:31 +0300 Subject: [PATCH] Upgrade armon/go-metrics to hashicorp/go-metrics Fixes #707 Signed-off-by: Dentrax --- cmd/serf/command/agent/command.go | 2 +- cmd/serf/command/agent/invoke.go | 2 +- cmd/serf/command/agent/ipc.go | 2 +- coordinate/client.go | 2 +- coordinate/config.go | 2 +- go.mod | 3 ++- go.sum | 6 ++++-- serf/config.go | 2 +- serf/delegate.go | 2 +- serf/ping_delegate.go | 2 +- serf/serf.go | 2 +- serf/snapshot.go | 2 +- 12 files changed, 16 insertions(+), 13 deletions(-) diff --git a/cmd/serf/command/agent/command.go b/cmd/serf/command/agent/command.go index e8b7b60dd..d947352d7 100644 --- a/cmd/serf/command/agent/command.go +++ b/cmd/serf/command/agent/command.go @@ -16,7 +16,7 @@ import ( "syscall" "time" - "github.com/armon/go-metrics" + "github.com/hashicorp/go-metrics" gsyslog "github.com/hashicorp/go-syslog" "github.com/hashicorp/logutils" "github.com/hashicorp/memberlist" diff --git a/cmd/serf/command/agent/invoke.go b/cmd/serf/command/agent/invoke.go index 8a4dbea0a..83f1031e9 100644 --- a/cmd/serf/command/agent/invoke.go +++ b/cmd/serf/command/agent/invoke.go @@ -15,7 +15,7 @@ import ( "time" "github.com/armon/circbuf" - "github.com/armon/go-metrics" + "github.com/hashicorp/go-metrics" "github.com/hashicorp/serf/serf" ) diff --git a/cmd/serf/command/agent/ipc.go b/cmd/serf/command/agent/ipc.go index 8ff2af336..69b2f56c0 100644 --- a/cmd/serf/command/agent/ipc.go +++ b/cmd/serf/command/agent/ipc.go @@ -37,7 +37,7 @@ import ( "sync/atomic" "time" - "github.com/armon/go-metrics" + "github.com/hashicorp/go-metrics" "github.com/hashicorp/go-msgpack/v2/codec" "github.com/hashicorp/logutils" "github.com/hashicorp/serf/coordinate" diff --git a/coordinate/client.go b/coordinate/client.go index d4404a06d..9eff32de9 100644 --- a/coordinate/client.go +++ b/coordinate/client.go @@ -10,7 +10,7 @@ import ( "sync" "time" - "github.com/armon/go-metrics" + "github.com/hashicorp/go-metrics" ) // Client manages the estimated network coordinate for a given node, and adjusts diff --git a/coordinate/config.go b/coordinate/config.go index 02cce7e98..27c8e6ed5 100644 --- a/coordinate/config.go +++ b/coordinate/config.go @@ -4,7 +4,7 @@ package coordinate import ( - "github.com/armon/go-metrics" + "github.com/hashicorp/go-metrics" ) // Config is used to set the parameters of the Vivaldi-based coordinate mapping diff --git a/go.mod b/go.mod index 25e726881..5e8475dd6 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e - github.com/armon/go-metrics v0.4.1 + github.com/hashicorp/go-metrics v0.5.3 github.com/hashicorp/go-msgpack/v2 v2.1.2 github.com/hashicorp/go-syslog v1.0.0 github.com/hashicorp/logutils v1.0.0 @@ -19,6 +19,7 @@ require ( github.com/Masterminds/goutils v1.1.1 // indirect github.com/Masterminds/semver/v3 v3.1.1 // indirect github.com/Masterminds/sprig/v3 v3.2.1 // indirect + github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da // indirect github.com/armon/go-radix v1.0.0 // indirect github.com/bgentry/speakeasy v0.1.0 // indirect github.com/fatih/color v1.9.0 // indirect diff --git a/go.sum b/go.sum index 9b4e57bd5..2ddb88f86 100644 --- a/go.sum +++ b/go.sum @@ -11,8 +11,8 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e h1:QEF07wC0T1rKkctt1RINW/+RMTVmiwxETico2l3gxJA= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= -github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA= -github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= +github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da h1:8GUt8eRujhVEGZFFEjBj46YV4rDjvGrNxb0KMWYkL2I= +github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= @@ -54,6 +54,8 @@ github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtng 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-msgpack/v2 v2.1.2 h1:4Ee8FTp834e+ewB71RDrQ0VKpyFdrKOjvYtnQ/ltVj0= github.com/hashicorp/go-msgpack/v2 v2.1.2/go.mod h1:upybraOAblm4S7rx0+jeNy+CWWhzywQsSRV5033mMu4= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= diff --git a/serf/config.go b/serf/config.go index c44aa7561..bdec80c4e 100644 --- a/serf/config.go +++ b/serf/config.go @@ -9,7 +9,7 @@ import ( "os" "time" - "github.com/armon/go-metrics" + "github.com/hashicorp/go-metrics" "github.com/hashicorp/memberlist" ) diff --git a/serf/delegate.go b/serf/delegate.go index 405ed2644..32aa1b2b9 100644 --- a/serf/delegate.go +++ b/serf/delegate.go @@ -7,7 +7,7 @@ import ( "bytes" "fmt" - "github.com/armon/go-metrics" + "github.com/hashicorp/go-metrics" "github.com/hashicorp/go-msgpack/v2/codec" "github.com/hashicorp/memberlist" ) diff --git a/serf/ping_delegate.go b/serf/ping_delegate.go index d6ff93ff4..6c9f8c10a 100644 --- a/serf/ping_delegate.go +++ b/serf/ping_delegate.go @@ -7,7 +7,7 @@ import ( "bytes" "time" - "github.com/armon/go-metrics" + "github.com/hashicorp/go-metrics" "github.com/hashicorp/go-msgpack/v2/codec" "github.com/hashicorp/memberlist" "github.com/hashicorp/serf/coordinate" diff --git a/serf/serf.go b/serf/serf.go index a260c8738..d70188937 100644 --- a/serf/serf.go +++ b/serf/serf.go @@ -19,7 +19,7 @@ import ( "sync/atomic" "time" - "github.com/armon/go-metrics" + "github.com/hashicorp/go-metrics" "github.com/hashicorp/go-msgpack/v2/codec" "github.com/hashicorp/memberlist" "github.com/hashicorp/serf/coordinate" diff --git a/serf/snapshot.go b/serf/snapshot.go index 28bb668e6..c94d85d00 100644 --- a/serf/snapshot.go +++ b/serf/snapshot.go @@ -14,7 +14,7 @@ import ( "strings" "time" - "github.com/armon/go-metrics" + "github.com/hashicorp/go-metrics" ) /*