Upgrade armon/go-metrics to hashicorp/go-metrics (#1066)

* Upgrade armon/go-metrics to hashicorp/go-metrics

* metrics test: update test expectations

---------

Co-authored-by: Tim Gross <[email protected]>

Author: mkeeler

agent/agent.go

@@ -11,8 +11,8 @@ import (
 	"os/signal"
 	"syscall"
 
-	metrics "github.com/armon/go-metrics"
 	"github.com/hashicorp/go-hclog"
+	metrics "github.com/hashicorp/go-metrics"
 	"github.com/hashicorp/nomad-autoscaler/agent/config"
 	"github.com/hashicorp/nomad-autoscaler/plugins/manager"
 	"github.com/hashicorp/nomad-autoscaler/policy"

agent/http/metrics_test.go

@@ -32,7 +32,7 @@ func TestServer_getMetrics(t *testing.T) {
 			inputReq:             httptest.NewRequest("GET", "/v1/metrics", nil),
 			inputWriter:          httptest.NewRecorder(),
 			expectedRespCode:     200,
-			expectedRespContains: "Counters\":[],\"Gauges\":[],\"Points\":[],\"Samples\":[]",
+			expectedRespContains: `"Counters":[],"Gauges":[],"Points":[],"PrecisionGauges":null,"Samples":[]`,
 			enableProm:           false,
 			name:                 "correct request for JSON metrics",
 		},

agent/telemetry.go

@@ -7,10 +7,10 @@ import (
 	"fmt"
 	"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"
+	metrics "github.com/hashicorp/go-metrics"
+	"github.com/hashicorp/go-metrics/circonus"
+	"github.com/hashicorp/go-metrics/datadog"
+	"github.com/hashicorp/go-metrics/prometheus"
 	"github.com/hashicorp/nomad-autoscaler/agent/config"
 )
 

agent/testing.go

@@ -6,7 +6,7 @@ package agent
 import (
 	"net/http"
 
-	metrics "github.com/armon/go-metrics"
+	metrics "github.com/hashicorp/go-metrics"
 )
 
 type MockAgentHTTP struct{}

go.mod

@@ -10,7 +10,6 @@ require (
 	github.com/DataDog/datadog-api-client-go v1.16.0
 	github.com/IBM/go-sdk-core/v5 v5.21.0
 	github.com/IBM/vpc-go-sdk v0.71.1
-	github.com/armon/go-metrics v0.4.1
 	github.com/aws/aws-sdk-go-v2 v1.24.0
 	github.com/aws/aws-sdk-go-v2/config v1.26.1
 	github.com/aws/aws-sdk-go-v2/credentials v1.16.12
@@ -19,6 +18,7 @@ require (
 	github.com/google/go-cmp v0.7.0
 	github.com/hashicorp/go-cleanhttp v0.5.2
 	github.com/hashicorp/go-hclog v1.6.3
+	github.com/hashicorp/go-metrics v0.5.4
 	github.com/hashicorp/go-msgpack v1.1.5
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/hashicorp/go-plugin v1.7.0

go.sum

@@ -9,8 +9,8 @@ import (
 	"sync"
 	"time"
 
-	metrics "github.com/armon/go-metrics"
 	"github.com/hashicorp/go-hclog"
+	metrics "github.com/hashicorp/go-metrics"
 	"github.com/hashicorp/go-multierror"
 	"github.com/hashicorp/go-plugin"
 	"github.com/hashicorp/nomad-autoscaler/agent/config"

plugins/manager/manager.go

@@ -9,8 +9,8 @@ import (
 	"sort"
 	"time"
 
-	metrics "github.com/armon/go-metrics"
 	hclog "github.com/hashicorp/go-hclog"
+	metrics "github.com/hashicorp/go-metrics"
 	"github.com/hashicorp/nomad-autoscaler/plugins/apm"
 	"github.com/hashicorp/nomad-autoscaler/plugins/strategy"
 	"github.com/hashicorp/nomad-autoscaler/sdk"

policy/check.go

@@ -12,8 +12,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-autoscaler/plugins/apm"
 	"github.com/hashicorp/nomad-autoscaler/plugins/strategy"
 	targetpkg "github.com/hashicorp/nomad-autoscaler/plugins/target"

policy/handler.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-autoscaler/plugins/manager"
 	targetpkg "github.com/hashicorp/nomad-autoscaler/plugins/target"
 	"github.com/hashicorp/nomad-autoscaler/sdk"