diff --git a/.changelog/19375.txt b/.changelog/19375.txt new file mode 100644 index 000000000..cd2869c74 --- /dev/null +++ b/.changelog/19375.txt @@ -0,0 +1,3 @@ +```release-note:bug +metrics: Revert upgrade of `go-metrics` to fix an issue where metrics from dependencies, such as raft, were no longer emitted +``` diff --git a/client/acl.go b/client/acl.go index 1c7fa83eb..878dbe60a 100644 --- a/client/acl.go +++ b/client/acl.go @@ -6,7 +6,7 @@ package client import ( "time" - "github.com/hashicorp/go-metrics" + "github.com/armon/go-metrics" "github.com/hashicorp/go-set" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/nomad/structs" diff --git a/client/agent_endpoint.go b/client/agent_endpoint.go index 3f9202cb0..74bc31439 100644 --- a/client/agent_endpoint.go +++ b/client/agent_endpoint.go @@ -18,8 +18,8 @@ import ( "github.com/hashicorp/nomad/helper/pointer" "github.com/hashicorp/nomad/nomad/structs" + metrics "github.com/armon/go-metrics" log "github.com/hashicorp/go-hclog" - metrics "github.com/hashicorp/go-metrics" sframer "github.com/hashicorp/nomad/client/lib/streamframer" cstructs "github.com/hashicorp/nomad/client/structs" diff --git a/client/alloc_endpoint.go b/client/alloc_endpoint.go index b7501d2cc..7b4aa90c4 100644 --- a/client/alloc_endpoint.go +++ b/client/alloc_endpoint.go @@ -11,7 +11,7 @@ import ( "io" "time" - "github.com/hashicorp/go-metrics" + "github.com/armon/go-metrics" "github.com/hashicorp/go-msgpack/codec" "github.com/hashicorp/nomad/acl" cstructs "github.com/hashicorp/nomad/client/structs" diff --git a/client/allocrunner/taskrunner/task_runner.go b/client/allocrunner/taskrunner/task_runner.go index 4cb7964ca..7800e753b 100644 --- a/client/allocrunner/taskrunner/task_runner.go +++ b/client/allocrunner/taskrunner/task_runner.go @@ -13,8 +13,8 @@ import ( "golang.org/x/exp/slices" + metrics "github.com/armon/go-metrics" log "github.com/hashicorp/go-hclog" - metrics "github.com/hashicorp/go-metrics" multierror "github.com/hashicorp/go-multierror" "github.com/hashicorp/hcl/v2/hcldec" diff --git a/client/allocrunner/taskrunner/tasklet.go b/client/allocrunner/taskrunner/tasklet.go index 1446f4830..90b543557 100644 --- a/client/allocrunner/taskrunner/tasklet.go +++ b/client/allocrunner/taskrunner/tasklet.go @@ -7,8 +7,8 @@ import ( "context" "time" + metrics "github.com/armon/go-metrics" log "github.com/hashicorp/go-hclog" - metrics "github.com/hashicorp/go-metrics" "github.com/hashicorp/nomad/client/allocrunner/taskrunner/interfaces" ) diff --git a/client/client.go b/client/client.go index 5c2185427..83e03d2ae 100644 --- a/client/client.go +++ b/client/client.go @@ -16,9 +16,9 @@ import ( "sync" "time" + metrics "github.com/armon/go-metrics" consulapi "github.com/hashicorp/consul/api" hclog "github.com/hashicorp/go-hclog" - metrics "github.com/hashicorp/go-metrics" multierror "github.com/hashicorp/go-multierror" "github.com/hashicorp/nomad/client/allocdir" "github.com/hashicorp/nomad/client/allocrunner" diff --git a/client/client_stats_endpoint.go b/client/client_stats_endpoint.go index 89155f5fc..bf5ff517c 100644 --- a/client/client_stats_endpoint.go +++ b/client/client_stats_endpoint.go @@ -6,7 +6,7 @@ package client import ( "time" - metrics "github.com/hashicorp/go-metrics" + metrics "github.com/armon/go-metrics" "github.com/hashicorp/nomad/client/structs" nstructs "github.com/hashicorp/nomad/nomad/structs" ) diff --git a/client/csi_endpoint.go b/client/csi_endpoint.go index f948fffed..f8b95a67e 100644 --- a/client/csi_endpoint.go +++ b/client/csi_endpoint.go @@ -9,8 +9,8 @@ import ( "fmt" "time" + metrics "github.com/armon/go-metrics" grpc_retry "github.com/grpc-ecosystem/go-grpc-middleware/retry" - metrics "github.com/hashicorp/go-metrics" "github.com/hashicorp/nomad/client/dynamicplugins" "github.com/hashicorp/nomad/client/pluginmanager/csimanager" diff --git a/client/fs_endpoint.go b/client/fs_endpoint.go index 52b53df54..0c8fe7f0d 100644 --- a/client/fs_endpoint.go +++ b/client/fs_endpoint.go @@ -18,7 +18,7 @@ import ( "syscall" "time" - metrics "github.com/hashicorp/go-metrics" + metrics "github.com/armon/go-metrics" "github.com/hashicorp/go-msgpack/codec" "github.com/hpcloud/tail/watch" diff --git a/client/meta_endpoint.go b/client/meta_endpoint.go index c8174d394..a438dc0a2 100644 --- a/client/meta_endpoint.go +++ b/client/meta_endpoint.go @@ -7,7 +7,7 @@ import ( "net/http" "time" - "github.com/hashicorp/go-metrics" + "github.com/armon/go-metrics" "github.com/hashicorp/nomad/nomad/structs" "golang.org/x/exp/maps" ) diff --git a/client/rpc.go b/client/rpc.go index ddd73a8d2..b078cf4d4 100644 --- a/client/rpc.go +++ b/client/rpc.go @@ -11,7 +11,7 @@ import ( "strings" "time" - metrics "github.com/hashicorp/go-metrics" + metrics "github.com/armon/go-metrics" "github.com/hashicorp/go-msgpack/codec" "github.com/hashicorp/nomad/client/servers" "github.com/hashicorp/nomad/helper" diff --git a/client/vaultclient/vaultclient.go b/client/vaultclient/vaultclient.go index a80f102b4..c68424418 100644 --- a/client/vaultclient/vaultclient.go +++ b/client/vaultclient/vaultclient.go @@ -11,8 +11,8 @@ import ( "sync" "time" + metrics "github.com/armon/go-metrics" hclog "github.com/hashicorp/go-hclog" - "github.com/hashicorp/go-metrics" "github.com/hashicorp/nomad/helper/useragent" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/nomad/structs/config" diff --git a/command/agent/agent.go b/command/agent/agent.go index e3a754463..89242ca44 100644 --- a/command/agent/agent.go +++ b/command/agent/agent.go @@ -16,10 +16,10 @@ import ( "sync" "time" + metrics "github.com/armon/go-metrics" "github.com/dustin/go-humanize" consulapi "github.com/hashicorp/consul/api" log "github.com/hashicorp/go-hclog" - metrics "github.com/hashicorp/go-metrics" uuidparse "github.com/hashicorp/go-uuid" "github.com/hashicorp/nomad/client" clientconfig "github.com/hashicorp/nomad/client/config" diff --git a/command/agent/command.go b/command/agent/command.go index 43068de1e..d33dc21e8 100644 --- a/command/agent/command.go +++ b/command/agent/command.go @@ -18,13 +18,13 @@ import ( "syscall" "time" + metrics "github.com/armon/go-metrics" + "github.com/armon/go-metrics/circonus" + "github.com/armon/go-metrics/datadog" + "github.com/armon/go-metrics/prometheus" checkpoint "github.com/hashicorp/go-checkpoint" discover "github.com/hashicorp/go-discover" hclog "github.com/hashicorp/go-hclog" - metrics "github.com/hashicorp/go-metrics" - "github.com/hashicorp/go-metrics/circonus" - "github.com/hashicorp/go-metrics/datadog" - "github.com/hashicorp/go-metrics/prometheus" gsyslog "github.com/hashicorp/go-syslog" "github.com/hashicorp/logutils" "github.com/hashicorp/nomad/helper" diff --git a/command/agent/consul/service_client.go b/command/agent/consul/service_client.go index 1b5c7680a..70f783ddd 100644 --- a/command/agent/consul/service_client.go +++ b/command/agent/consul/service_client.go @@ -16,9 +16,9 @@ import ( "sync/atomic" "time" + "github.com/armon/go-metrics" "github.com/hashicorp/consul/api" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/go-metrics" "github.com/hashicorp/go-set" "github.com/hashicorp/nomad/client/serviceregistration" "github.com/hashicorp/nomad/helper" diff --git a/command/agent/http.go b/command/agent/http.go index a52b5bfa3..aeeb5666e 100644 --- a/command/agent/http.go +++ b/command/agent/http.go @@ -19,12 +19,12 @@ import ( "sync" "time" + "github.com/armon/go-metrics" assetfs "github.com/elazarl/go-bindata-assetfs" "github.com/gorilla/handlers" "github.com/gorilla/websocket" "github.com/hashicorp/go-connlimit" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/go-metrics" "github.com/hashicorp/go-msgpack/codec" multierror "github.com/hashicorp/go-multierror" "github.com/rs/cors" diff --git a/command/agent/metrics_endpoint_test.go b/command/agent/metrics_endpoint_test.go index d312434e9..3563b45b1 100644 --- a/command/agent/metrics_endpoint_test.go +++ b/command/agent/metrics_endpoint_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/hashicorp/go-metrics" + "github.com/armon/go-metrics" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/nomad/mock" "github.com/hashicorp/nomad/nomad/structs" diff --git a/command/agent/testagent.go b/command/agent/testagent.go index 63b26db11..bc7be0712 100644 --- a/command/agent/testagent.go +++ b/command/agent/testagent.go @@ -14,8 +14,8 @@ import ( "testing" "time" + metrics "github.com/armon/go-metrics" "github.com/hashicorp/go-hclog" - metrics "github.com/hashicorp/go-metrics" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" client "github.com/hashicorp/nomad/client/config" diff --git a/go.mod b/go.mod index 39d4bd9d7..c39d59224 100644 --- a/go.mod +++ b/go.mod @@ -8,6 +8,10 @@ replace ( github.com/hashicorp/hcl => github.com/hashicorp/hcl v1.0.1-0.20201016140508-a07e7d50bbee ) +// Pin dependency with additional logs and defensive code to workaround panic +// described in https://github.com/hashicorp/nomad/issues/15861. +replace github.com/armon/go-metrics => github.com/armon/go-metrics v0.0.0-20230509193637-d9ca9af9f1f9 + // Nomad is built using the current source of the API module replace github.com/hashicorp/nomad/api => ./api @@ -15,6 +19,7 @@ require ( github.com/LK4D4/joincontext v0.0.0-20171026170139-1724345da6d5 github.com/Microsoft/go-winio v0.6.0 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e + github.com/armon/go-metrics v0.4.1 github.com/aws/aws-sdk-go v1.44.184 github.com/container-storage-interface/spec v1.7.0 github.com/containerd/go-cni v1.1.9 @@ -54,7 +59,6 @@ require ( github.com/hashicorp/go-immutable-radix/v2 v2.0.0 github.com/hashicorp/go-kms-wrapping/v2 v2.0.15 github.com/hashicorp/go-memdb v1.3.4 - github.com/hashicorp/go-metrics v0.5.3 github.com/hashicorp/go-msgpack v1.1.5 github.com/hashicorp/go-multierror v1.1.1 github.com/hashicorp/go-plugin v1.4.10 @@ -154,7 +158,6 @@ require ( github.com/agext/levenshtein v1.2.1 // indirect github.com/apparentlymart/go-cidr v1.0.1 // indirect github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect - github.com/armon/go-metrics v0.4.1 // indirect github.com/armon/go-radix v1.0.0 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect diff --git a/go.sum b/go.sum index 5e5325c49..b8dbaf593 100644 --- a/go.sum +++ b/go.sum @@ -237,7 +237,6 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8= github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/datadog-go v3.2.0+incompatible h1:qSG2N4FghB1He/r2mFrWKCaL7dXCilEuNEeAn20fdD4= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/LK4D4/joincontext v0.0.0-20171026170139-1724345da6d5 h1:U7q69tqXiCf6m097GRlNQB0/6SI1qWIOHYHhCEvDxF4= @@ -295,10 +294,8 @@ github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkE 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/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= -github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= -github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod h1:3AMJUQhVx52RsWOnlkpikZr01T/yAVN2gn0861vByNg= -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-20230509193637-d9ca9af9f1f9 h1:51N4T44k8crLrlHy1zgBKGdYKjzjquaXw/RPbq/bH+o= +github.com/armon/go-metrics v0.0.0-20230509193637-d9ca9af9f1f9/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= 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= @@ -850,8 +847,6 @@ github.com/hashicorp/go-kms-wrapping/v2 v2.0.15 h1:f3+/VbanXOmVAaDBKwRiVmeL7EX34 github.com/hashicorp/go-kms-wrapping/v2 v2.0.15/go.mod h1:0dWtzl2ilqKpavgM3id/kFK9L3tjo6fS4OhbVPSYpnQ= github.com/hashicorp/go-memdb v1.3.4 h1:XSL3NR682X/cVk2IeV0d70N4DZ9ljI885xAEU8IoK3c= github.com/hashicorp/go-memdb v1.3.4/go.mod h1:uBTr1oQbtuMgd1SSGoR8YV27eT3sBHbYiNm53bMpgSg= -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 v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-msgpack v1.1.5 h1:9byZdVjKTe5mce63pRVNP1L7UAmdHOTEMGehn6KvJWs= @@ -1217,7 +1212,6 @@ github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:Om github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g= @@ -1234,7 +1228,6 @@ github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvq github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc= @@ -1244,7 +1237,6 @@ github.com/prometheus/common v0.39.0 h1:oOyhkDq05hPZKItWVBkJ6g6AtGxi+fy7F4JvUV8u github.com/prometheus/common v0.39.0/go.mod h1:6XBZ7lYdLCbkAVhwRsWTZn+IN5AB9F/NXd5w0BbEX0Y= github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.0-20190522114515-bc1a522cf7b1/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= @@ -1527,7 +1519,6 @@ golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= diff --git a/lib/auth/jwt/validator.go b/lib/auth/jwt/validator.go index 7420d900c..210f369dd 100644 --- a/lib/auth/jwt/validator.go +++ b/lib/auth/jwt/validator.go @@ -9,10 +9,10 @@ import ( "fmt" "time" + "github.com/armon/go-metrics" + "github.com/hashicorp/cap/jwt" "golang.org/x/exp/slices" - "github.com/hashicorp/cap/jwt" - "github.com/hashicorp/go-metrics" "github.com/hashicorp/nomad/helper" "github.com/hashicorp/nomad/nomad/structs" ) diff --git a/nomad/acl.go b/nomad/acl.go index 43960bda7..4aa378753 100644 --- a/nomad/acl.go +++ b/nomad/acl.go @@ -9,7 +9,7 @@ import ( "net" "time" - "github.com/hashicorp/go-metrics" + metrics "github.com/armon/go-metrics" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/helper" "github.com/hashicorp/nomad/nomad/state" diff --git a/nomad/acl_endpoint.go b/nomad/acl_endpoint.go index fbb1bf10b..724de67fb 100644 --- a/nomad/acl_endpoint.go +++ b/nomad/acl_endpoint.go @@ -13,10 +13,10 @@ import ( "strings" "time" + "github.com/armon/go-metrics" capOIDC "github.com/hashicorp/cap/oidc" "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-memdb" - "github.com/hashicorp/go-metrics" "github.com/hashicorp/go-set" policy "github.com/hashicorp/nomad/acl" diff --git a/nomad/alloc_endpoint.go b/nomad/alloc_endpoint.go index 3c6ef6718..75071047b 100644 --- a/nomad/alloc_endpoint.go +++ b/nomad/alloc_endpoint.go @@ -8,9 +8,9 @@ import ( "net/http" "time" + "github.com/armon/go-metrics" "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-memdb" - "github.com/hashicorp/go-metrics" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/helper/pointer" diff --git a/nomad/autopilot.go b/nomad/autopilot.go index ddade8b62..1f00c0226 100644 --- a/nomad/autopilot.go +++ b/nomad/autopilot.go @@ -8,7 +8,7 @@ import ( "fmt" "strconv" - metrics "github.com/hashicorp/go-metrics" + metrics "github.com/armon/go-metrics" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/raft" autopilot "github.com/hashicorp/raft-autopilot" diff --git a/nomad/blocked_evals.go b/nomad/blocked_evals.go index 7af464395..1971f5d92 100644 --- a/nomad/blocked_evals.go +++ b/nomad/blocked_evals.go @@ -7,8 +7,8 @@ import ( "sync" "time" + "github.com/armon/go-metrics" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/go-metrics" "github.com/hashicorp/nomad/helper" "github.com/hashicorp/nomad/nomad/structs" ) diff --git a/nomad/client_alloc_endpoint.go b/nomad/client_alloc_endpoint.go index 7fb693a89..83ba5fb7e 100644 --- a/nomad/client_alloc_endpoint.go +++ b/nomad/client_alloc_endpoint.go @@ -10,8 +10,8 @@ import ( "net" "time" + "github.com/armon/go-metrics" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/go-metrics" "github.com/hashicorp/go-msgpack/codec" "github.com/hashicorp/nomad/acl" diff --git a/nomad/client_csi_endpoint.go b/nomad/client_csi_endpoint.go index c5b055f95..a8e321b8b 100644 --- a/nomad/client_csi_endpoint.go +++ b/nomad/client_csi_endpoint.go @@ -10,9 +10,9 @@ import ( "strings" "time" + metrics "github.com/armon/go-metrics" log "github.com/hashicorp/go-hclog" memdb "github.com/hashicorp/go-memdb" - metrics "github.com/hashicorp/go-metrics" cstructs "github.com/hashicorp/nomad/client/structs" "github.com/hashicorp/nomad/nomad/structs" diff --git a/nomad/client_fs_endpoint.go b/nomad/client_fs_endpoint.go index 92137e509..eefa26d4a 100644 --- a/nomad/client_fs_endpoint.go +++ b/nomad/client_fs_endpoint.go @@ -11,8 +11,8 @@ import ( "strings" "time" + metrics "github.com/armon/go-metrics" log "github.com/hashicorp/go-hclog" - metrics "github.com/hashicorp/go-metrics" cstructs "github.com/hashicorp/nomad/client/structs" "github.com/hashicorp/nomad/helper/pointer" diff --git a/nomad/client_meta_endpoint.go b/nomad/client_meta_endpoint.go index 64dde8418..8bc4fc7ec 100644 --- a/nomad/client_meta_endpoint.go +++ b/nomad/client_meta_endpoint.go @@ -6,8 +6,8 @@ package nomad import ( "time" + metrics "github.com/armon/go-metrics" log "github.com/hashicorp/go-hclog" - metrics "github.com/hashicorp/go-metrics" "github.com/hashicorp/nomad/nomad/structs" nstructs "github.com/hashicorp/nomad/nomad/structs" ) diff --git a/nomad/client_stats_endpoint.go b/nomad/client_stats_endpoint.go index 9b8b689ba..3f8640a1a 100644 --- a/nomad/client_stats_endpoint.go +++ b/nomad/client_stats_endpoint.go @@ -6,8 +6,8 @@ package nomad import ( "time" + metrics "github.com/armon/go-metrics" log "github.com/hashicorp/go-hclog" - metrics "github.com/hashicorp/go-metrics" nstructs "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/client/structs" diff --git a/nomad/consul.go b/nomad/consul.go index 539426ab7..510adec1a 100644 --- a/nomad/consul.go +++ b/nomad/consul.go @@ -11,9 +11,9 @@ import ( "sync" "time" + "github.com/armon/go-metrics" "github.com/hashicorp/consul/api" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/go-metrics" "github.com/hashicorp/nomad/command/agent/consul" "github.com/hashicorp/nomad/helper" "github.com/hashicorp/nomad/nomad/structs" diff --git a/nomad/csi_endpoint.go b/nomad/csi_endpoint.go index 7f538cff1..2f50ac8b2 100644 --- a/nomad/csi_endpoint.go +++ b/nomad/csi_endpoint.go @@ -11,10 +11,10 @@ import ( "strings" "time" + "github.com/armon/go-metrics" "github.com/dustin/go-humanize" "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-memdb" - "github.com/hashicorp/go-metrics" "github.com/hashicorp/go-multierror" "github.com/hashicorp/nomad/acl" diff --git a/nomad/deployment_endpoint.go b/nomad/deployment_endpoint.go index 8fbe918fb..193ef7c43 100644 --- a/nomad/deployment_endpoint.go +++ b/nomad/deployment_endpoint.go @@ -8,9 +8,9 @@ import ( "net/http" "time" + "github.com/armon/go-metrics" "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-memdb" - "github.com/hashicorp/go-metrics" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/nomad/state" diff --git a/nomad/eval_broker.go b/nomad/eval_broker.go index 457d5012f..eb3a40a80 100644 --- a/nomad/eval_broker.go +++ b/nomad/eval_broker.go @@ -13,7 +13,7 @@ import ( "sync" "time" - metrics "github.com/hashicorp/go-metrics" + metrics "github.com/armon/go-metrics" "github.com/hashicorp/nomad/helper" "github.com/hashicorp/nomad/helper/broker" "github.com/hashicorp/nomad/helper/uuid" diff --git a/nomad/eval_endpoint.go b/nomad/eval_endpoint.go index 9d467a049..d5ef1ba39 100644 --- a/nomad/eval_endpoint.go +++ b/nomad/eval_endpoint.go @@ -9,10 +9,10 @@ import ( "net/http" "time" + "github.com/armon/go-metrics" "github.com/hashicorp/go-bexpr" "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-memdb" - "github.com/hashicorp/go-metrics" "github.com/hashicorp/go-multierror" "github.com/hashicorp/go-version" diff --git a/nomad/fsm.go b/nomad/fsm.go index 5a099ca62..da22041af 100644 --- a/nomad/fsm.go +++ b/nomad/fsm.go @@ -10,10 +10,10 @@ import ( "sync" "time" + "github.com/armon/go-metrics" "github.com/hashicorp/go-bexpr" "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-memdb" - "github.com/hashicorp/go-metrics" "github.com/hashicorp/go-msgpack/codec" "github.com/hashicorp/nomad/helper/pointer" "github.com/hashicorp/nomad/helper/uuid" diff --git a/nomad/heartbeat.go b/nomad/heartbeat.go index bbd0e019c..e900f10de 100644 --- a/nomad/heartbeat.go +++ b/nomad/heartbeat.go @@ -8,9 +8,9 @@ import ( "sync" "time" + metrics "github.com/armon/go-metrics" log "github.com/hashicorp/go-hclog" memdb "github.com/hashicorp/go-memdb" - metrics "github.com/hashicorp/go-metrics" "github.com/hashicorp/nomad/helper" "github.com/hashicorp/nomad/nomad/structs" diff --git a/nomad/job_endpoint.go b/nomad/job_endpoint.go index 61ed20411..af8fa5f3d 100644 --- a/nomad/job_endpoint.go +++ b/nomad/job_endpoint.go @@ -12,10 +12,10 @@ import ( "strings" "time" + "github.com/armon/go-metrics" "github.com/golang/snappy" "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-memdb" - "github.com/hashicorp/go-metrics" "github.com/hashicorp/go-multierror" "github.com/hashicorp/go-set" "github.com/hashicorp/nomad/acl" diff --git a/nomad/keyring_endpoint.go b/nomad/keyring_endpoint.go index b56f2346d..f921d0cbf 100644 --- a/nomad/keyring_endpoint.go +++ b/nomad/keyring_endpoint.go @@ -7,9 +7,9 @@ import ( "fmt" "time" + "github.com/armon/go-metrics" "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-memdb" - "github.com/hashicorp/go-metrics" "github.com/hashicorp/nomad/helper/uuid" "github.com/hashicorp/nomad/nomad/state" diff --git a/nomad/leader.go b/nomad/leader.go index f4e0cd287..d8898b690 100644 --- a/nomad/leader.go +++ b/nomad/leader.go @@ -13,9 +13,9 @@ import ( "sync" "time" + "github.com/armon/go-metrics" "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-memdb" - "github.com/hashicorp/go-metrics" "github.com/hashicorp/go-version" "github.com/hashicorp/nomad/helper" "github.com/hashicorp/nomad/helper/uuid" diff --git a/nomad/namespace_endpoint.go b/nomad/namespace_endpoint.go index 005d42956..ed1d2ae75 100644 --- a/nomad/namespace_endpoint.go +++ b/nomad/namespace_endpoint.go @@ -7,8 +7,8 @@ import ( "fmt" "time" + "github.com/armon/go-metrics" "github.com/hashicorp/go-memdb" - "github.com/hashicorp/go-metrics" "github.com/hashicorp/go-multierror" "github.com/hashicorp/nomad/nomad/state" diff --git a/nomad/node_endpoint.go b/nomad/node_endpoint.go index 4296f3999..17594179e 100644 --- a/nomad/node_endpoint.go +++ b/nomad/node_endpoint.go @@ -13,9 +13,9 @@ import ( "sync" "time" + "github.com/armon/go-metrics" "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-memdb" - "github.com/hashicorp/go-metrics" "github.com/hashicorp/go-multierror" vapi "github.com/hashicorp/vault/api" "golang.org/x/sync/errgroup" diff --git a/nomad/node_pool_endpoint.go b/nomad/node_pool_endpoint.go index 89f1064d0..76195e13c 100644 --- a/nomad/node_pool_endpoint.go +++ b/nomad/node_pool_endpoint.go @@ -9,8 +9,8 @@ import ( "net/http" "time" + metrics "github.com/armon/go-metrics" "github.com/hashicorp/go-memdb" - metrics "github.com/hashicorp/go-metrics" multierror "github.com/hashicorp/go-multierror" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/nomad/state" diff --git a/nomad/periodic_endpoint.go b/nomad/periodic_endpoint.go index ce2d002ad..cd2b49084 100644 --- a/nomad/periodic_endpoint.go +++ b/nomad/periodic_endpoint.go @@ -7,9 +7,9 @@ import ( "fmt" "time" + "github.com/armon/go-metrics" "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-memdb" - "github.com/hashicorp/go-metrics" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/nomad/structs" diff --git a/nomad/plan_apply.go b/nomad/plan_apply.go index fa166e10e..aa85f7ac9 100644 --- a/nomad/plan_apply.go +++ b/nomad/plan_apply.go @@ -9,9 +9,9 @@ import ( "runtime" "time" + metrics "github.com/armon/go-metrics" log "github.com/hashicorp/go-hclog" memdb "github.com/hashicorp/go-memdb" - metrics "github.com/hashicorp/go-metrics" multierror "github.com/hashicorp/go-multierror" "github.com/hashicorp/nomad/helper/uuid" "github.com/hashicorp/nomad/nomad/state" diff --git a/nomad/plan_apply_node_tracker.go b/nomad/plan_apply_node_tracker.go index aa3876f16..49722c25c 100644 --- a/nomad/plan_apply_node_tracker.go +++ b/nomad/plan_apply_node_tracker.go @@ -7,8 +7,8 @@ import ( "fmt" "time" + "github.com/armon/go-metrics" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/go-metrics" lru "github.com/hashicorp/golang-lru/v2" "github.com/hashicorp/nomad/helper" "golang.org/x/time/rate" diff --git a/nomad/plan_endpoint.go b/nomad/plan_endpoint.go index 617ea54e8..8c751bc49 100644 --- a/nomad/plan_endpoint.go +++ b/nomad/plan_endpoint.go @@ -7,8 +7,8 @@ import ( "fmt" "time" + "github.com/armon/go-metrics" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/go-metrics" "github.com/hashicorp/nomad/nomad/structs" ) diff --git a/nomad/plan_queue.go b/nomad/plan_queue.go index c4568f3d3..f62fac01b 100644 --- a/nomad/plan_queue.go +++ b/nomad/plan_queue.go @@ -9,7 +9,7 @@ import ( "sync" "time" - metrics "github.com/hashicorp/go-metrics" + metrics "github.com/armon/go-metrics" "github.com/hashicorp/nomad/helper" "github.com/hashicorp/nomad/nomad/structs" ) diff --git a/nomad/rpc.go b/nomad/rpc.go index 51e80cf9c..5475b4e10 100644 --- a/nomad/rpc.go +++ b/nomad/rpc.go @@ -17,10 +17,10 @@ import ( "strings" "time" + metrics "github.com/armon/go-metrics" "github.com/hashicorp/go-connlimit" log "github.com/hashicorp/go-hclog" memdb "github.com/hashicorp/go-memdb" - metrics "github.com/hashicorp/go-metrics" "github.com/hashicorp/go-msgpack/codec" "github.com/hashicorp/nomad/helper" "github.com/hashicorp/nomad/helper/pool" diff --git a/nomad/rpc_rate_metrics.go b/nomad/rpc_rate_metrics.go index b0c1f2f4f..1f55c87af 100644 --- a/nomad/rpc_rate_metrics.go +++ b/nomad/rpc_rate_metrics.go @@ -4,7 +4,7 @@ package nomad import ( - "github.com/hashicorp/go-metrics" + "github.com/armon/go-metrics" "github.com/hashicorp/nomad/nomad/structs" ) diff --git a/nomad/scaling_endpoint.go b/nomad/scaling_endpoint.go index 780f6b467..ee4dbeda3 100644 --- a/nomad/scaling_endpoint.go +++ b/nomad/scaling_endpoint.go @@ -7,9 +7,9 @@ import ( "strings" "time" + "github.com/armon/go-metrics" "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-memdb" - "github.com/hashicorp/go-metrics" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/nomad/state" "github.com/hashicorp/nomad/nomad/structs" diff --git a/nomad/search_endpoint.go b/nomad/search_endpoint.go index 23731a935..5d5be1c6a 100644 --- a/nomad/search_endpoint.go +++ b/nomad/search_endpoint.go @@ -9,9 +9,9 @@ import ( "strings" "time" + "github.com/armon/go-metrics" "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-memdb" - "github.com/hashicorp/go-metrics" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/nomad/state" diff --git a/nomad/server.go b/nomad/server.go index edb22f603..c3252f8c6 100644 --- a/nomad/server.go +++ b/nomad/server.go @@ -21,9 +21,9 @@ import ( "sync/atomic" "time" + "github.com/armon/go-metrics" consulapi "github.com/hashicorp/consul/api" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/go-metrics" multierror "github.com/hashicorp/go-multierror" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/raft" diff --git a/nomad/service_registration_endpoint.go b/nomad/service_registration_endpoint.go index 871eb64d3..f5abae79b 100644 --- a/nomad/service_registration_endpoint.go +++ b/nomad/service_registration_endpoint.go @@ -11,8 +11,8 @@ import ( "strings" "time" + "github.com/armon/go-metrics" "github.com/hashicorp/go-memdb" - "github.com/hashicorp/go-metrics" "github.com/hashicorp/go-multierror" "github.com/hashicorp/go-set" diff --git a/nomad/stream/event_broker.go b/nomad/stream/event_broker.go index 4807020af..27e270577 100644 --- a/nomad/stream/event_broker.go +++ b/nomad/stream/event_broker.go @@ -11,8 +11,8 @@ import ( "sync/atomic" "time" + "github.com/armon/go-metrics" "github.com/hashicorp/go-memdb" - "github.com/hashicorp/go-metrics" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/nomad/structs" diff --git a/nomad/variables_endpoint.go b/nomad/variables_endpoint.go index a3886c1db..572fec976 100644 --- a/nomad/variables_endpoint.go +++ b/nomad/variables_endpoint.go @@ -10,9 +10,9 @@ import ( "strings" "time" + "github.com/armon/go-metrics" "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-memdb" - "github.com/hashicorp/go-metrics" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/nomad/state" diff --git a/nomad/vault.go b/nomad/vault.go index bbd4297ec..d32777b18 100644 --- a/nomad/vault.go +++ b/nomad/vault.go @@ -18,8 +18,8 @@ import ( "github.com/hashicorp/nomad/helper/useragent" tomb "gopkg.in/tomb.v2" + metrics "github.com/armon/go-metrics" log "github.com/hashicorp/go-hclog" - metrics "github.com/hashicorp/go-metrics" multierror "github.com/hashicorp/go-multierror" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/nomad/structs/config" diff --git a/nomad/worker.go b/nomad/worker.go index 13a5e7ade..af4714256 100644 --- a/nomad/worker.go +++ b/nomad/worker.go @@ -12,9 +12,9 @@ import ( "sync" "time" + metrics "github.com/armon/go-metrics" log "github.com/hashicorp/go-hclog" memdb "github.com/hashicorp/go-memdb" - metrics "github.com/hashicorp/go-metrics" "github.com/hashicorp/go-version" "github.com/hashicorp/nomad/helper" "github.com/hashicorp/nomad/helper/uuid" diff --git a/scheduler/reconcile.go b/scheduler/reconcile.go index 3cc388c01..d631d00b1 100644 --- a/scheduler/reconcile.go +++ b/scheduler/reconcile.go @@ -13,8 +13,8 @@ import ( "sort" "time" + "github.com/armon/go-metrics" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/go-metrics" "github.com/hashicorp/nomad/helper" "github.com/hashicorp/nomad/helper/uuid"