From c53510a6feea10d471640625b815b73e100213cf Mon Sep 17 00:00:00 2001 From: Luiz Aoqui Date: Thu, 7 Dec 2023 18:58:41 -0500 Subject: [PATCH] Revert "deps: update go-metrics to v0.5.3 (#19190) (#19209)" This reverts commit a0d0ff6c0cbfe593b441e75846612afb55fdba27. --- client/acl.go | 2 +- client/agent_endpoint.go | 2 +- client/alloc_endpoint.go | 2 +- client/allocrunner/taskrunner/task_runner.go | 2 +- client/allocrunner/taskrunner/tasklet.go | 2 +- client/client.go | 2 +- client/client_stats_endpoint.go | 2 +- client/csi_endpoint.go | 3 +-- client/fs_endpoint.go | 2 +- client/meta_endpoint.go | 2 +- client/rpc.go | 2 +- client/vaultclient/vaultclient.go | 2 +- command/agent/agent.go | 2 +- command/agent/command.go | 8 ++++---- command/agent/consul/service_client.go | 2 +- command/agent/http.go | 2 +- command/agent/metrics_endpoint_test.go | 2 +- command/agent/testagent.go | 2 +- go.mod | 7 +++++-- go.sum | 13 ++----------- lib/auth/jwt/validator.go | 2 +- nomad/acl.go | 2 +- nomad/acl_endpoint.go | 2 +- nomad/alloc_endpoint.go | 2 +- nomad/autopilot.go | 2 +- nomad/blocked_evals.go | 2 +- nomad/client_alloc_endpoint.go | 2 +- nomad/client_csi_endpoint.go | 3 +-- nomad/client_fs_endpoint.go | 2 +- nomad/client_meta_endpoint.go | 2 +- nomad/client_stats_endpoint.go | 2 +- nomad/consul.go | 2 +- nomad/csi_endpoint.go | 2 +- nomad/deployment_endpoint.go | 2 +- nomad/eval_broker.go | 2 +- nomad/eval_endpoint.go | 2 +- nomad/fsm.go | 2 +- nomad/heartbeat.go | 2 +- nomad/job_endpoint.go | 2 +- nomad/keyring_endpoint.go | 2 +- nomad/leader.go | 2 +- nomad/namespace_endpoint.go | 2 +- nomad/node_endpoint.go | 2 +- nomad/periodic_endpoint.go | 2 +- nomad/plan_apply.go | 2 +- nomad/plan_apply_node_tracker.go | 2 +- nomad/plan_endpoint.go | 2 +- nomad/plan_queue.go | 2 +- nomad/rpc.go | 2 +- nomad/rpc_rate_metrics.go | 2 +- nomad/scaling_endpoint.go | 2 +- nomad/search_endpoint.go | 2 +- nomad/server.go | 2 +- nomad/service_registration_endpoint.go | 2 +- nomad/stream/event_broker.go | 2 +- nomad/variables_endpoint.go | 2 +- nomad/vault.go | 2 +- nomad/worker.go | 2 +- scheduler/reconcile.go | 2 +- 59 files changed, 67 insertions(+), 75 deletions(-) diff --git a/client/acl.go b/client/acl.go index c6eba749d87..e081ffadcbe 100644 --- a/client/acl.go +++ b/client/acl.go @@ -3,7 +3,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 543c4b40fc4..6508fbebe1c 100644 --- a/client/agent_endpoint.go +++ b/client/agent_endpoint.go @@ -15,8 +15,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 52a711f3684..4c8dffd71ea 100644 --- a/client/alloc_endpoint.go +++ b/client/alloc_endpoint.go @@ -8,7 +8,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 3cf6ff38282..c842e8f3d97 100644 --- a/client/allocrunner/taskrunner/task_runner.go +++ b/client/allocrunner/taskrunner/task_runner.go @@ -9,8 +9,8 @@ import ( "sync" "time" + 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" "github.com/hashicorp/nomad/client/allocdir" diff --git a/client/allocrunner/taskrunner/tasklet.go b/client/allocrunner/taskrunner/tasklet.go index c3d15eb09c7..0f6d2e578c2 100644 --- a/client/allocrunner/taskrunner/tasklet.go +++ b/client/allocrunner/taskrunner/tasklet.go @@ -4,8 +4,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 2d2b23ec7bf..5ebd29c41e6 100644 --- a/client/client.go +++ b/client/client.go @@ -13,9 +13,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 e7096c9a258..630707ca68c 100644 --- a/client/client_stats_endpoint.go +++ b/client/client_stats_endpoint.go @@ -3,7 +3,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 dcb0c22b786..2f95ebcd25b 100644 --- a/client/csi_endpoint.go +++ b/client/csi_endpoint.go @@ -6,9 +6,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" "github.com/hashicorp/nomad/client/structs" diff --git a/client/fs_endpoint.go b/client/fs_endpoint.go index ddb72f46f18..4cca219ae2c 100644 --- a/client/fs_endpoint.go +++ b/client/fs_endpoint.go @@ -15,7 +15,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 14f9e397b94..73717eec7de 100644 --- a/client/meta_endpoint.go +++ b/client/meta_endpoint.go @@ -4,7 +4,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 3bce5c8757c..8a5b9a61c13 100644 --- a/client/rpc.go +++ b/client/rpc.go @@ -8,7 +8,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 51bd175b995..3addd0ee1f8 100644 --- a/client/vaultclient/vaultclient.go +++ b/client/vaultclient/vaultclient.go @@ -8,8 +8,8 @@ import ( "sync" "time" + metrics "github.com/armon/go-metrics" hclog "github.com/hashicorp/go-hclog" - metrics "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 0ad6ef911bf..f82a6e8b83a 100644 --- a/command/agent/agent.go +++ b/command/agent/agent.go @@ -13,9 +13,9 @@ import ( "sync" "time" + metrics "github.com/armon/go-metrics" 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 2a68e6ea0e3..a9d275ca08e 100644 --- a/command/agent/command.go +++ b/command/agent/command.go @@ -15,13 +15,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 42640d7a331..3ead28b3779 100644 --- a/command/agent/consul/service_client.go +++ b/command/agent/consul/service_client.go @@ -15,9 +15,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 41ae926ce03..571b5687e47 100644 --- a/command/agent/http.go +++ b/command/agent/http.go @@ -16,12 +16,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 2550428577d..d19ed8f9edb 100644 --- a/command/agent/metrics_endpoint_test.go +++ b/command/agent/metrics_endpoint_test.go @@ -7,7 +7,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 b24557b6eaf..f877e527a7e 100644 --- a/command/agent/testagent.go +++ b/command/agent/testagent.go @@ -11,8 +11,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 8aa7cde92db..4c8568f70eb 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 e2f68be457e..20a24865c3a 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= @@ -847,8 +844,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= @@ -1214,7 +1209,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= @@ -1231,7 +1225,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= @@ -1241,7 +1234,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= @@ -1524,7 +1516,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 b5e5143c140..d252e0b7e8f 100644 --- a/lib/auth/jwt/validator.go +++ b/lib/auth/jwt/validator.go @@ -7,8 +7,8 @@ import ( "slices" "time" + "github.com/armon/go-metrics" "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 54eed54f1de..beeed91210d 100644 --- a/nomad/acl.go +++ b/nomad/acl.go @@ -6,7 +6,7 @@ import ( "net" "time" - metrics "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 d6bd64fbda8..fb85f2b0982 100644 --- a/nomad/acl_endpoint.go +++ b/nomad/acl_endpoint.go @@ -10,10 +10,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 3554ffce1aa..44b60b35845 100644 --- a/nomad/alloc_endpoint.go +++ b/nomad/alloc_endpoint.go @@ -5,9 +5,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 36c1a42bdc3..52a303e5099 100644 --- a/nomad/autopilot.go +++ b/nomad/autopilot.go @@ -5,7 +5,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 25ac7927d3e..49b1c895fe8 100644 --- a/nomad/blocked_evals.go +++ b/nomad/blocked_evals.go @@ -4,8 +4,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 bd83b8ca4c7..1dbeefe3a3b 100644 --- a/nomad/client_alloc_endpoint.go +++ b/nomad/client_alloc_endpoint.go @@ -7,8 +7,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 96f1b58bb6a..875303dafc9 100644 --- a/nomad/client_csi_endpoint.go +++ b/nomad/client_csi_endpoint.go @@ -7,10 +7,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 cad78e15669..30f8a5e7297 100644 --- a/nomad/client_fs_endpoint.go +++ b/nomad/client_fs_endpoint.go @@ -8,8 +8,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 2c1b2e190f3..1795a6abad0 100644 --- a/nomad/client_meta_endpoint.go +++ b/nomad/client_meta_endpoint.go @@ -3,8 +3,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 79d76547ed9..b2ef1914428 100644 --- a/nomad/client_stats_endpoint.go +++ b/nomad/client_stats_endpoint.go @@ -3,8 +3,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 e1e58ed5279..a562f58e560 100644 --- a/nomad/consul.go +++ b/nomad/consul.go @@ -9,9 +9,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 fe9093f0dd9..f31376eba46 100644 --- a/nomad/csi_endpoint.go +++ b/nomad/csi_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/go-multierror" "github.com/hashicorp/nomad/acl" diff --git a/nomad/deployment_endpoint.go b/nomad/deployment_endpoint.go index 163af329ba6..813bff7f702 100644 --- a/nomad/deployment_endpoint.go +++ b/nomad/deployment_endpoint.go @@ -5,9 +5,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 5565946832d..ca7907a1faa 100644 --- a/nomad/eval_broker.go +++ b/nomad/eval_broker.go @@ -10,7 +10,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 ecedfe570b9..b57caf7aabd 100644 --- a/nomad/eval_endpoint.go +++ b/nomad/eval_endpoint.go @@ -6,10 +6,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 754e02c63a1..2cea0ff0b1e 100644 --- a/nomad/fsm.go +++ b/nomad/fsm.go @@ -7,10 +7,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 cab44e6f241..8d37740cff6 100644 --- a/nomad/heartbeat.go +++ b/nomad/heartbeat.go @@ -5,9 +5,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 2065ad8b91e..46501afa9a1 100644 --- a/nomad/job_endpoint.go +++ b/nomad/job_endpoint.go @@ -9,10 +9,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" diff --git a/nomad/keyring_endpoint.go b/nomad/keyring_endpoint.go index 44171a9b497..b35f17c7b8b 100644 --- a/nomad/keyring_endpoint.go +++ b/nomad/keyring_endpoint.go @@ -4,9 +4,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 7e1c0a03cc5..e299fab47d2 100644 --- a/nomad/leader.go +++ b/nomad/leader.go @@ -10,9 +10,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 638988b579d..db638169b94 100644 --- a/nomad/namespace_endpoint.go +++ b/nomad/namespace_endpoint.go @@ -4,8 +4,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 c3c1efd796d..af2492a4402 100644 --- a/nomad/node_endpoint.go +++ b/nomad/node_endpoint.go @@ -10,9 +10,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/periodic_endpoint.go b/nomad/periodic_endpoint.go index 9f9206f8af0..ac60e4a5614 100644 --- a/nomad/periodic_endpoint.go +++ b/nomad/periodic_endpoint.go @@ -4,9 +4,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 48ca2fab2be..b6dbed2ba3f 100644 --- a/nomad/plan_apply.go +++ b/nomad/plan_apply.go @@ -6,9 +6,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 ea79a2df32b..6e964cde01f 100644 --- a/nomad/plan_apply_node_tracker.go +++ b/nomad/plan_apply_node_tracker.go @@ -4,8 +4,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 31e84b41670..2903709ebd4 100644 --- a/nomad/plan_endpoint.go +++ b/nomad/plan_endpoint.go @@ -4,8 +4,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 a56e74e2890..0c1cb554a71 100644 --- a/nomad/plan_queue.go +++ b/nomad/plan_queue.go @@ -6,7 +6,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 3b2d0f1a833..fb3ea741dd8 100644 --- a/nomad/rpc.go +++ b/nomad/rpc.go @@ -14,10 +14,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 faffbda7c8c..b4a6a0bb198 100644 --- a/nomad/rpc_rate_metrics.go +++ b/nomad/rpc_rate_metrics.go @@ -1,7 +1,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 47c68a4c569..7696030e8a5 100644 --- a/nomad/scaling_endpoint.go +++ b/nomad/scaling_endpoint.go @@ -4,9 +4,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 d20333c7ff0..d5b84414264 100644 --- a/nomad/search_endpoint.go +++ b/nomad/search_endpoint.go @@ -6,9 +6,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 e7b03c92748..8ef835108b1 100644 --- a/nomad/server.go +++ b/nomad/server.go @@ -18,9 +18,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 e0cd04a1448..23570f26a08 100644 --- a/nomad/service_registration_endpoint.go +++ b/nomad/service_registration_endpoint.go @@ -8,8 +8,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 ae49923958d..55db9d3db39 100644 --- a/nomad/stream/event_broker.go +++ b/nomad/stream/event_broker.go @@ -8,8 +8,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 0b5dcb92b60..19341940833 100644 --- a/nomad/variables_endpoint.go +++ b/nomad/variables_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" diff --git a/nomad/vault.go b/nomad/vault.go index b41299f6c7e..9f2307d009a 100644 --- a/nomad/vault.go +++ b/nomad/vault.go @@ -15,8 +15,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 f9850d5b07f..2ec305e6126 100644 --- a/nomad/worker.go +++ b/nomad/worker.go @@ -9,9 +9,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 5b8321dbc68..c879df6641c 100644 --- a/scheduler/reconcile.go +++ b/scheduler/reconcile.go @@ -10,8 +10,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"