From ddb060d8b3e5ee79bed5c49998a7e5de4a355150 Mon Sep 17 00:00:00 2001 From: Luiz Aoqui Date: Tue, 28 Nov 2023 12:37:57 -0500 Subject: [PATCH] deps: update go-metrics to v0.5.3 (#19190) Update `go-metrics` to v0.5.3 to pick https://github.com/hashicorp/go-metrics/pull/146. --- 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 | 2 +- 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 | 4 ++-- go.sum | 13 +++++++++++-- lib/auth/jwt/validator.go | 2 +- nomad/acl_endpoint.go | 2 +- nomad/alloc_endpoint.go | 2 +- nomad/auth/auth.go | 2 +- nomad/autopilot.go | 2 +- nomad/blocked_evals.go | 2 +- nomad/client_alloc_endpoint.go | 2 +- nomad/client_csi_endpoint.go | 2 +- 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/lock/delay.go | 2 +- nomad/lock/ttl.go | 2 +- nomad/namespace_endpoint.go | 2 +- nomad/node_endpoint.go | 2 +- nomad/node_pool_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 +- 62 files changed, 76 insertions(+), 67 deletions(-) diff --git a/client/acl.go b/client/acl.go index b4a5e0f5ec5..d12eac6406d 100644 --- a/client/acl.go +++ b/client/acl.go @@ -6,7 +6,7 @@ package client import ( "time" - "github.com/armon/go-metrics" + "github.com/hashicorp/go-metrics" "github.com/hashicorp/go-set/v2" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/nomad/structs" diff --git a/client/agent_endpoint.go b/client/agent_endpoint.go index 0e4d1d322cc..838a07c33bf 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 d063fd54dff..7594a2bbd68 100644 --- a/client/alloc_endpoint.go +++ b/client/alloc_endpoint.go @@ -12,7 +12,7 @@ import ( "net/http" "time" - "github.com/armon/go-metrics" + "github.com/hashicorp/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 a8ad6228f11..e59be1e2076 100644 --- a/client/allocrunner/taskrunner/task_runner.go +++ b/client/allocrunner/taskrunner/task_runner.go @@ -12,8 +12,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 c402f7dcbbd..38f5ca79eca 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 1df8fa5cead..2322c0515e0 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 ac5ddc81e9c..d318997fdbb 100644 --- a/client/client_stats_endpoint.go +++ b/client/client_stats_endpoint.go @@ -6,7 +6,7 @@ package client import ( "time" - metrics "github.com/armon/go-metrics" + metrics "github.com/hashicorp/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 dcbcd70e50f..8443fdbb01d 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 240a73c4bb5..70585847a8c 100644 --- a/client/fs_endpoint.go +++ b/client/fs_endpoint.go @@ -18,7 +18,7 @@ import ( "syscall" "time" - metrics "github.com/armon/go-metrics" + metrics "github.com/hashicorp/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 bfffc074c5f..574ae1e2c6c 100644 --- a/client/meta_endpoint.go +++ b/client/meta_endpoint.go @@ -7,7 +7,7 @@ import ( "net/http" "time" - "github.com/armon/go-metrics" + "github.com/hashicorp/go-metrics" "github.com/hashicorp/nomad/nomad/structs" "golang.org/x/exp/maps" ) diff --git a/client/rpc.go b/client/rpc.go index 2482a9f68d2..89660d04cf5 100644 --- a/client/rpc.go +++ b/client/rpc.go @@ -11,7 +11,7 @@ import ( "strings" "time" - metrics "github.com/armon/go-metrics" + metrics "github.com/hashicorp/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 f5b1b4f97c6..c3e0fd21f7c 100644 --- a/client/vaultclient/vaultclient.go +++ b/client/vaultclient/vaultclient.go @@ -13,8 +13,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" diff --git a/command/agent/agent.go b/command/agent/agent.go index 77a637fd650..891bfb68bfc 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 7d4d3febc30..c8bf12b90da 100644 --- a/command/agent/command.go +++ b/command/agent/command.go @@ -19,13 +19,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 debcd67f358..63ba9db2e69 100644 --- a/command/agent/consul/service_client.go +++ b/command/agent/consul/service_client.go @@ -19,9 +19,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/v2" "github.com/hashicorp/nomad/client/serviceregistration" "github.com/hashicorp/nomad/helper" diff --git a/command/agent/http.go b/command/agent/http.go index 4f7e20f07b3..23fbfe48464 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 fac79b2d8ee..65f632fd9cc 100644 --- a/command/agent/metrics_endpoint_test.go +++ b/command/agent/metrics_endpoint_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/armon/go-metrics" + "github.com/hashicorp/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 702898ce0a6..5ae07ada0ab 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 d763935515e..9f5954536d5 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,6 @@ go 1.21 // Pinned dependencies are noted in github.com/hashicorp/nomad/issues/11826. replace ( github.com/Microsoft/go-winio => github.com/endocrimes/go-winio v0.4.13-0.20190628114223-fb47a8b41948 - github.com/armon/go-metrics => github.com/armon/go-metrics v0.0.0-20230509193637-d9ca9af9f1f9 github.com/hashicorp/consul/api => github.com/hashicorp/consul/api v1.10.1-0.20230925152502-e5f5fc9301c7 github.com/hashicorp/hcl => github.com/hashicorp/hcl v1.0.1-0.20201016140508-a07e7d50bbee ) @@ -18,7 +17,6 @@ require ( github.com/Masterminds/sprig/v3 v3.2.3 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/brianvoe/gofakeit/v6 v6.20.1 github.com/container-storage-interface/spec v1.7.0 @@ -61,6 +59,7 @@ 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-netaddrs v0.1.0 @@ -163,6 +162,7 @@ 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 08db1a0f249..68ae2bc7b53 100644 --- a/go.sum +++ b/go.sum @@ -237,6 +237,7 @@ 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= @@ -294,8 +295,10 @@ 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-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-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-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= @@ -849,6 +852,8 @@ 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= @@ -1227,6 +1232,7 @@ 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= @@ -1243,6 +1249,7 @@ 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= @@ -1252,6 +1259,7 @@ github.com/prometheus/common v0.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc= 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= @@ -1533,6 +1541,7 @@ 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 b1ebaacf8ce..2e93014141c 100644 --- a/lib/auth/jwt/validator.go +++ b/lib/auth/jwt/validator.go @@ -10,8 +10,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_endpoint.go b/nomad/acl_endpoint.go index bea0dd98c7f..02eb486eb94 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/v2" policy "github.com/hashicorp/nomad/acl" diff --git a/nomad/alloc_endpoint.go b/nomad/alloc_endpoint.go index 4dd75662545..bcc4a85917a 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/auth/auth.go b/nomad/auth/auth.go index 3d05553bc1e..5fd4e7d8b7a 100644 --- a/nomad/auth/auth.go +++ b/nomad/auth/auth.go @@ -11,8 +11,8 @@ import ( "strings" "time" - "github.com/armon/go-metrics" "github.com/hashicorp/go-hclog" + "github.com/hashicorp/go-metrics" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/helper" "github.com/hashicorp/nomad/nomad/state" diff --git a/nomad/autopilot.go b/nomad/autopilot.go index 1afcd6955d8..ee154e5e3ae 100644 --- a/nomad/autopilot.go +++ b/nomad/autopilot.go @@ -8,7 +8,7 @@ import ( "fmt" "strconv" - metrics "github.com/armon/go-metrics" + metrics "github.com/hashicorp/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 f227a3c7cfc..606f2785060 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 b548b46cc1a..aebbab80d24 100644 --- a/nomad/client_alloc_endpoint.go +++ b/nomad/client_alloc_endpoint.go @@ -11,8 +11,8 @@ import ( "net/http" "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 8f2faf943f1..f6b26073095 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 9869e43cc70..85222e4bf13 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 dbf577b6d38..30944ab8516 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 d74bcdedbdc..bd67585f2ad 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 a30e61d8ee7..ea1175e749c 100644 --- a/nomad/consul.go +++ b/nomad/consul.go @@ -12,9 +12,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 ba14fe51042..63a7f0e5c2a 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 e775f07a7c0..3e9259e0b8d 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 bee38f9cc9d..1ab0dac0816 100644 --- a/nomad/eval_broker.go +++ b/nomad/eval_broker.go @@ -13,7 +13,7 @@ import ( "sync" "time" - metrics "github.com/armon/go-metrics" + metrics "github.com/hashicorp/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 018115355f1..2fd3c5daa7d 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 35ab1390507..e4e1f4e7752 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 2b207b6ed41..0ea3bf0f767 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 031431a78ac..da54bd77cdb 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/v2" "github.com/hashicorp/nomad/acl" diff --git a/nomad/keyring_endpoint.go b/nomad/keyring_endpoint.go index 5508aa05d2c..b3869799ec5 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 9b48e8ad442..c6024ad658e 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/lock/delay.go b/nomad/lock/delay.go index 1255a47f1c1..5f75ccc7565 100644 --- a/nomad/lock/delay.go +++ b/nomad/lock/delay.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/armon/go-metrics" + "github.com/hashicorp/go-metrics" "github.com/hashicorp/nomad/helper" ) diff --git a/nomad/lock/ttl.go b/nomad/lock/ttl.go index 752cb87899a..daeb49e732a 100644 --- a/nomad/lock/ttl.go +++ b/nomad/lock/ttl.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/armon/go-metrics" + "github.com/hashicorp/go-metrics" "github.com/hashicorp/nomad/helper" ) diff --git a/nomad/namespace_endpoint.go b/nomad/namespace_endpoint.go index ae557cc6ee7..b31d2bfbedc 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 87a9c4bad89..35c598641b8 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 ac71ba72102..ead8fc5d2b0 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 1baf9ddfa9b..c88e3d3fadd 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 026a8023694..aa02b40feed 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 9f080109c1a..9f256a7e21b 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 465481d1ff9..c5adf141c86 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 bd9f23e6387..0173e2238fe 100644 --- a/nomad/plan_queue.go +++ b/nomad/plan_queue.go @@ -9,7 +9,7 @@ import ( "sync" "time" - metrics "github.com/armon/go-metrics" + metrics "github.com/hashicorp/go-metrics" "github.com/hashicorp/nomad/helper" "github.com/hashicorp/nomad/nomad/structs" ) diff --git a/nomad/rpc.go b/nomad/rpc.go index f8dcfc0a4a8..e4360cc784a 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 8caf7a8b9bb..30011d36fda 100644 --- a/nomad/rpc_rate_metrics.go +++ b/nomad/rpc_rate_metrics.go @@ -4,7 +4,7 @@ package nomad import ( - "github.com/armon/go-metrics" + "github.com/hashicorp/go-metrics" "github.com/hashicorp/nomad/nomad/structs" ) diff --git a/nomad/scaling_endpoint.go b/nomad/scaling_endpoint.go index d7b3766fd00..c559f92842e 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 dceb259bdb5..40ee6b250eb 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 c748fdb2aab..d881752cf69 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/raft" autopilot "github.com/hashicorp/raft-autopilot" diff --git a/nomad/service_registration_endpoint.go b/nomad/service_registration_endpoint.go index 57402cb4a51..f1a34bb74a1 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/v2" diff --git a/nomad/stream/event_broker.go b/nomad/stream/event_broker.go index db24e7e2c65..ffbed9ddbd9 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 1261e8fe89d..7c9a4dc8110 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/auth" diff --git a/nomad/vault.go b/nomad/vault.go index 8d5ba610a3a..10601b5437f 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 ad66f454924..69107cc48a8 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 9870548e761..f6675aff221 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"