From e577af4dbc191a873a518fc6b4df25e1fc68b214 Mon Sep 17 00:00:00 2001
From: Daniel Hochman <danielhochman@users.noreply.github.com>
Date: Mon, 24 Jan 2022 12:34:13 -0600
Subject: [PATCH] housekeeping: upgrade uber-go/tally to v4 (#1983)
---
backend/cmd/migrate/migrate.go | 2 +-
backend/gateway/gateway.go | 4 +--
backend/gateway/stats/debug_reporter.go | 2 +-
backend/gateway/stats/prometheus_reporter.go | 2 +-
backend/gateway/stats/runtime.go | 2 +-
backend/gateway/stats/runtime_test.go | 2 +-
backend/gateway/stats/stats_test.go | 2 +-
.../gateway/stats/statsd_tagged_reporter.go | 4 +--
backend/go.mod | 7 +----
backend/go.sum | 30 ++++++++++++-------
.../helper/testserver/testserver.go | 2 +-
backend/middleware/accesslog/accesslog.go | 2 +-
backend/middleware/audit/audit.go | 2 +-
backend/middleware/authn/authn.go | 2 +-
backend/middleware/authz/authz.go | 2 +-
.../errorintercept/errorintercept.go | 2 +-
backend/middleware/middleware.go | 2 +-
backend/middleware/stats/stats.go | 2 +-
backend/middleware/timeouts/timeouts.go | 2 +-
backend/middleware/validate/validate.go | 2 +-
backend/mock/service/auditmock/auditmock.go | 2 +-
backend/mock/service/authzmock/authzmock.go | 2 +-
backend/mock/service/awsmock/awsmock.go | 2 +-
.../experimentstoremock.go | 2 +-
.../service/envoyadminmock/envoyadminmock.go | 2 +-
.../mock/service/feedbackmock/feedbackmock.go | 2 +-
backend/mock/service/githubmock/githubmock.go | 2 +-
backend/mock/service/k8smock/k8smock.go | 2 +-
.../mock/service/topologymock/topologymock.go | 2 +-
backend/module/assets/assets.go | 2 +-
backend/module/audit/audit.go | 2 +-
backend/module/authn/authn.go | 2 +-
backend/module/authz/authz.go | 2 +-
backend/module/authz/authz_test.go | 2 +-
backend/module/aws/aws.go | 2 +-
backend/module/aws/aws_test.go | 2 +-
backend/module/bot/slackbot/slackbot.go | 2 +-
backend/module/bot/slackbot/slackbot_test.go | 2 +-
.../experimentation/api/experimentation.go | 2 +-
.../xds/internal/xdstest/xdstest.go | 2 +-
.../chaos/experimentation/xds/poller.go | 2 +-
.../chaos/experimentation/xds/poller_test.go | 2 +-
.../module/chaos/experimentation/xds/xds.go | 2 +-
.../chaos/experimentation/xds/xds_test.go | 2 +-
.../redis_experimentation.go | 2 +-
.../server_experimentation.go | 2 +-
backend/module/dynamodb/aws.go | 2 +-
backend/module/dynamodb/aws_test.go | 2 +-
backend/module/envoytriage/envoytriage.go | 2 +-
backend/module/featureflag/featureflag.go | 2 +-
.../module/featureflag/featureflag_test.go | 2 +-
backend/module/feedback/feedback.go | 2 +-
backend/module/feedback/feedback_test.go | 2 +-
backend/module/healthcheck/healthcheck.go | 2 +-
.../module/healthcheck/healthcheck_test.go | 2 +-
backend/module/k8s/k8s.go | 2 +-
backend/module/k8s/k8s_test.go | 2 +-
backend/module/kinesis/aws.go | 2 +-
backend/module/kinesis/aws_test.go | 2 +-
backend/module/module.go | 2 +-
backend/module/proxy/proxy.go | 2 +-
backend/module/proxy/proxy_test.go | 2 +-
backend/module/resolver/resolver.go | 2 +-
backend/module/sourcecontrol/sourcecontrol.go | 2 +-
.../sourcecontrol/sourcecontrol_test.go | 2 +-
backend/module/topology/topology.go | 2 +-
backend/module/topology/topology_test.go | 2 +-
backend/resolver/aws/aws.go | 2 +-
backend/resolver/aws/aws_test.go | 2 +-
backend/resolver/core/core.go | 2 +-
backend/resolver/core/core_test.go | 2 +-
backend/resolver/k8s/k8s.go | 2 +-
backend/resolver/resolver.go | 2 +-
backend/retry/options.go | 2 +-
backend/retry/retry.go | 2 +-
backend/retry/retry_test.go | 2 +-
backend/service/audit/setup.go | 2 +-
backend/service/audit/setup_test.go | 2 +-
.../service/audit/storage/local/localstore.go | 2 +-
.../audit/storage/local/localstore_test.go | 2 +-
backend/service/audit/storage/sql/sql.go | 2 +-
backend/service/auditsink/logger/logger.go | 2 +-
backend/service/auditsink/slack/slack.go | 2 +-
backend/service/auditsink/slack/slack_test.go | 2 +-
backend/service/authn/authn.go | 2 +-
backend/service/authn/storage.go | 2 +-
backend/service/authz/authz.go | 2 +-
backend/service/aws/aws.go | 2 +-
backend/service/aws/aws_test.go | 2 +-
backend/service/bot/bot.go | 2 +-
backend/service/bot/bot_test.go | 2 +-
.../experimentation/experimentstore/storer.go | 2 +-
.../experimentstore/storer_test.go | 2 +-
.../experimentation/terminator/terminator.go | 2 +-
.../terminator/terminator_test.go | 2 +-
backend/service/db/postgres/setup.go | 2 +-
backend/service/db/postgres/setup_test.go | 2 +-
backend/service/envoyadmin/envoyadmin.go | 2 +-
backend/service/feedback/feedback.go | 2 +-
backend/service/feedback/feedback_test.go | 2 +-
backend/service/github/github.go | 2 +-
backend/service/k8s/cache_test.go | 2 +-
backend/service/k8s/k8s.go | 2 +-
backend/service/k8s/k8s_test.go | 2 +-
backend/service/service.go | 2 +-
backend/service/sourcegraph/sourcegraph.go | 2 +-
.../service/sourcegraph/sourcegraph_test.go | 2 +-
backend/service/topology/cache_test.go | 2 +-
backend/service/topology/topology.go | 2 +-
backend/service/topology/topology_test.go | 2 +-
.../amiibo/backend/module/amiibo/amiibo.go | 3 +-
.../amiibo/backend/service/amiibo/amiibo.go | 3 +-
.../gateway/backend/module/echo/echo.go | 2 +-
.../gateway/backend/module/echo/echo_test.go | 2 +-
114 files changed, 137 insertions(+), 130 deletions(-)
diff --git a/backend/cmd/migrate/migrate.go b/backend/cmd/migrate/migrate.go
index 97c0a422..e049fd60 100644
--- a/backend/cmd/migrate/migrate.go
+++ b/backend/cmd/migrate/migrate.go
@@ -13,7 +13,7 @@ import (
"github.com/golang-migrate/migrate/v4/database/postgres"
_ "github.com/golang-migrate/migrate/v4/source/file"
_ "github.com/lib/pq"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
gatewayv1 "github.com/lyft/clutch/backend/api/config/gateway/v1"
diff --git a/backend/gateway/gateway.go b/backend/gateway/gateway.go
index 87f01e78..dd8448cc 100644
--- a/backend/gateway/gateway.go
+++ b/backend/gateway/gateway.go
@@ -12,8 +12,8 @@ import (
"time"
"github.com/joho/godotenv"
- "github.com/uber-go/tally"
- tallyprom "github.com/uber-go/tally/prometheus"
+ "github.com/uber-go/tally/v4"
+ tallyprom "github.com/uber-go/tally/v4/prometheus"
"go.uber.org/zap"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
diff --git a/backend/gateway/stats/debug_reporter.go b/backend/gateway/stats/debug_reporter.go
index 915785e4..b29eaad6 100644
--- a/backend/gateway/stats/debug_reporter.go
+++ b/backend/gateway/stats/debug_reporter.go
@@ -3,7 +3,7 @@ package stats
import (
"time"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
)
diff --git a/backend/gateway/stats/prometheus_reporter.go b/backend/gateway/stats/prometheus_reporter.go
index dc6cb9fb..ec030957 100644
--- a/backend/gateway/stats/prometheus_reporter.go
+++ b/backend/gateway/stats/prometheus_reporter.go
@@ -1,7 +1,7 @@
package stats
import (
- tallyprom "github.com/uber-go/tally/prometheus"
+ tallyprom "github.com/uber-go/tally/v4/prometheus"
gatewayv1 "github.com/lyft/clutch/backend/api/config/gateway/v1"
)
diff --git a/backend/gateway/stats/runtime.go b/backend/gateway/stats/runtime.go
index b6f0319f..213bbd4c 100644
--- a/backend/gateway/stats/runtime.go
+++ b/backend/gateway/stats/runtime.go
@@ -5,7 +5,7 @@ import (
"runtime"
"time"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
gatewayv1 "github.com/lyft/clutch/backend/api/config/gateway/v1"
)
diff --git a/backend/gateway/stats/runtime_test.go b/backend/gateway/stats/runtime_test.go
index 6f1953a5..669f9921 100644
--- a/backend/gateway/stats/runtime_test.go
+++ b/backend/gateway/stats/runtime_test.go
@@ -5,7 +5,7 @@ import (
"testing"
"time"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
gatewayv1 "github.com/lyft/clutch/backend/api/config/gateway/v1"
)
diff --git a/backend/gateway/stats/stats_test.go b/backend/gateway/stats/stats_test.go
index f2f99952..0dffaa04 100644
--- a/backend/gateway/stats/stats_test.go
+++ b/backend/gateway/stats/stats_test.go
@@ -6,7 +6,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
)
type mockReporter struct {
diff --git a/backend/gateway/stats/statsd_tagged_reporter.go b/backend/gateway/stats/statsd_tagged_reporter.go
index 77754439..7cb95f37 100644
--- a/backend/gateway/stats/statsd_tagged_reporter.go
+++ b/backend/gateway/stats/statsd_tagged_reporter.go
@@ -6,8 +6,8 @@ import (
"time"
"github.com/cactus/go-statsd-client/statsd"
- "github.com/uber-go/tally"
- tallystatsd "github.com/uber-go/tally/statsd"
+ "github.com/uber-go/tally/v4"
+ tallystatsd "github.com/uber-go/tally/v4/statsd"
gatewayv1 "github.com/lyft/clutch/backend/api/config/gateway/v1"
)
diff --git a/backend/go.mod b/backend/go.mod
index a8151ed7..e700e817 100644
--- a/backend/go.mod
+++ b/backend/go.mod
@@ -39,10 +39,6 @@ require (
github.com/jhump/protoreflect v1.10.1
github.com/joho/godotenv v1.4.0
github.com/lib/pq v1.10.4
- github.com/m3db/prometheus_client_golang v0.8.1 // indirect
- github.com/m3db/prometheus_client_model v0.1.0 // indirect
- github.com/m3db/prometheus_common v0.1.0 // indirect
- github.com/m3db/prometheus_procfs v0.8.1 // indirect
github.com/mitchellh/hashstructure/v2 v2.0.2
github.com/shurcooL/githubv4 v0.0.0-20220115235240-a14260e6f8a2
github.com/shurcooL/graphql v0.0.0-20200928012149-18c5c3165e3a
@@ -50,8 +46,7 @@ require (
github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546
github.com/slack-go/slack v0.10.1
github.com/stretchr/testify v1.7.0
- github.com/twmb/murmur3 v1.1.5 // indirect
- github.com/uber-go/tally v3.4.2+incompatible
+ github.com/uber-go/tally/v4 v4.1.1
go.uber.org/zap v1.20.0
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8
diff --git a/backend/go.sum b/backend/go.sum
index baa6a150..c842f0f1 100644
--- a/backend/go.sum
+++ b/backend/go.sum
@@ -105,6 +105,7 @@ github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuy
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:CgnQgUtFrFz9mxFNtED3jI5tLDjKlOM+oUF/sTk6ps0=
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA=
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
@@ -215,12 +216,15 @@ github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod h1:bbYlZJ7
github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8=
github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0BsqsP2LwDJ9aOkm/6J86V6lyAXCoQWGw3K50=
github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE=
+github.com/cactus/go-statsd-client/statsd v0.0.0-20200423205355-cb0885a1018c/go.mod h1:l/bIBLeOl9eX+wxJAzxS4TveKRtAqlyDpHjhkfO0MEI=
github.com/cactus/go-statsd-client/statsd v0.0.0-20200623234511-94959e3146b2 h1:GgJnJEJYymy/lx+1zXOO2TvGPRQJJ9vz4onxnA9gF3k=
github.com/cactus/go-statsd-client/statsd v0.0.0-20200623234511-94959e3146b2/go.mod h1:l/bIBLeOl9eX+wxJAzxS4TveKRtAqlyDpHjhkfO0MEI=
github.com/cenkalti/backoff/v4 v4.0.2/go.mod h1:eEew/i+1Q6OrCDZh3WiXYv3+nJwBASZ8Bog/87DQnVg=
github.com/census-instrumentation/opencensus-proto v0.2.1 h1:glEXhBS5PSLLv4IXzLA5yPRVX4bilULVyxxbrfOtDAk=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
+github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod h1:xUQBLp4RLc5zJtWY++yjOoMoB5lihDt7fai+75m+rGw=
github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod h1:cfwC0EG7HMUenopBsUf9d89JlCLQIfgVcNsNN0t6T2M=
@@ -455,9 +459,11 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2
github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
github.com/go-latex/latex v0.0.0-20210118124228-b3d85cf34e07/go.mod h1:CO1AlKB2CSIqUrmQPqA0gdRIlnLEY0gK5JGjh37zN5U=
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
github.com/go-logr/logr v1.2.0 h1:QK40JKJyMdUDz+h+xvCsru/bJhvG0UxvePV0ufL/AcE=
@@ -755,6 +761,7 @@ github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqx
github.com/joho/godotenv v1.4.0 h1:3l4+N6zfMWnkbPEXKng2o2/MR5mSwTrBih4ZEkkz1lg=
github.com/joho/godotenv v1.4.0/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
+github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
@@ -765,6 +772,7 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1
github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=
@@ -818,14 +826,6 @@ github.com/lib/pq v1.10.4 h1:SO9z7FRPzA03QhHKJrH5BXA6HU1rS4V2nIVrrNC1iYk=
github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
github.com/lyft/protoc-gen-star v0.5.3 h1:zSGLzsUew8RT+ZKPHc3jnf8XLaVyHzTcAFBzHtCNR20=
github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w=
-github.com/m3db/prometheus_client_golang v0.8.1 h1:t7w/tcFws81JL1j5sqmpqcOyQOpH4RDOmIe3A3fdN3w=
-github.com/m3db/prometheus_client_golang v0.8.1/go.mod h1:8R/f1xYhXWq59KD/mbRqoBulXejss7vYtYzWmruNUwI=
-github.com/m3db/prometheus_client_model v0.1.0 h1:cg1+DiuyT6x8h9voibtarkH1KT6CmsewBSaBhe8wzLo=
-github.com/m3db/prometheus_client_model v0.1.0/go.mod h1:Qfsxn+LypxzF+lNhak7cF7k0zxK7uB/ynGYoj80zcD4=
-github.com/m3db/prometheus_common v0.1.0 h1:YJu6eCIV6MQlcwND24cRG/aRkZDX1jvYbsNNs1ZYr0w=
-github.com/m3db/prometheus_common v0.1.0/go.mod h1:EBmDQaMAy4B8i+qsg1wMXAelLNVbp49i/JOeVszQ/rs=
-github.com/m3db/prometheus_procfs v0.8.1 h1:LsxWzVELhDU9sLsZTaFLCeAwCn7bC7qecZcK4zobs/g=
-github.com/m3db/prometheus_procfs v0.8.1/go.mod h1:N8lv8fLh3U3koZx1Bnisj60GYUMDpWb09x1R+dmMOJo=
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
@@ -896,6 +896,7 @@ github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8m
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
github.com/mutecomm/go-sqlcipher/v4 v4.4.0/go.mod h1:PyN04SaWalavxRGH9E8ZftG6Ju7rsPrGmQRjrEaVpiY=
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
github.com/nakagami/firebirdsql v0.0.0-20190310045651-3c02a58cfed8/go.mod h1:86wM1zFnC6/uDBfZGNwB65O+pR2OFi5q/YQaEUid1qA=
github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM=
@@ -979,10 +980,13 @@ github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDf
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=
github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
+github.com/prometheus/client_golang v1.11.0 h1:HNkLOAEQMIDv/K+04rukrLx6ch7msSRwf3/SASFAGtQ=
+github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M=
github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
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=
@@ -990,6 +994,8 @@ github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8
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=
github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
+github.com/prometheus/common v0.26.0 h1:iMAkS2TDoNWnKM+Kopnx/8tnEStIfpYA0ur0xQzzhMQ=
+github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
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-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
@@ -1000,6 +1006,7 @@ github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDa
github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
+github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3xv4=
github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
github.com/remyoudompheng/bigfft v0.0.0-20190728182440-6a916e37a237/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
@@ -1097,8 +1104,8 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1
github.com/twitchtv/twirp v8.1.0+incompatible/go.mod h1:RRJoFSAmTEh2weEqWtpPE3vFK5YBhA6bqp2l1kfCC5A=
github.com/twmb/murmur3 v1.1.5 h1:i9OLS9fkuLzBXjt6dptlAEyk58fJsSTXbRg3SgVyqgk=
github.com/twmb/murmur3 v1.1.5/go.mod h1:Qq/R7NUyOfr65zD+6Q5IHKsJLwP7exErjN6lyyq3OSQ=
-github.com/uber-go/tally v3.4.2+incompatible h1:wEKPHq3KIjguuHz/M6SXVjDlUTh+39OtnhlLWsfR7z0=
-github.com/uber-go/tally v3.4.2+incompatible/go.mod h1:YDTIBxdXyOU/sCWilKB4bgyufu1cEi0jdVnRdxvjnmU=
+github.com/uber-go/tally/v4 v4.1.1 h1:jhy6WOZp4nHyCqeV43x3Wz370LXUGBhgW2JmzOIHCWI=
+github.com/uber-go/tally/v4 v4.1.1/go.mod h1:aXeSTDMl4tNosyf6rdU8jlgScHyjEGGtfJ/uwCIf/vM=
github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
@@ -1405,6 +1412,7 @@ golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200817155316-9781c653f443/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -1436,6 +1444,7 @@ golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20210502180810-71e4cd670f79/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -1730,6 +1739,7 @@ gopkg.in/square/go-jose.v2 v2.6.0 h1:NGk74WTnPKBNUhNzQX7PYcTLUjoq7mzKk2OKbvwk2iI
gopkg.in/square/go-jose.v2 v2.6.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+gopkg.in/validator.v2 v2.0.0-20200605151824-2b28d334fa05/go.mod h1:o4V0GXN9/CAmCsvJ0oXYZvrZOe7syiDZSN1GWGZTGzc=
gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
diff --git a/backend/internal/test/integration/helper/testserver/testserver.go b/backend/internal/test/integration/helper/testserver/testserver.go
index 37e0f429..105c9558 100644
--- a/backend/internal/test/integration/helper/testserver/testserver.go
+++ b/backend/internal/test/integration/helper/testserver/testserver.go
@@ -4,7 +4,7 @@ import (
"net"
"strings"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
diff --git a/backend/middleware/accesslog/accesslog.go b/backend/middleware/accesslog/accesslog.go
index 3a821829..60f9429a 100644
--- a/backend/middleware/accesslog/accesslog.go
+++ b/backend/middleware/accesslog/accesslog.go
@@ -8,7 +8,7 @@ import (
"context"
"fmt"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
diff --git a/backend/middleware/audit/audit.go b/backend/middleware/audit/audit.go
index c1024cbe..50f9f77b 100644
--- a/backend/middleware/audit/audit.go
+++ b/backend/middleware/audit/audit.go
@@ -9,7 +9,7 @@ import (
"errors"
"fmt"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
diff --git a/backend/middleware/authn/authn.go b/backend/middleware/authn/authn.go
index 1cde9b04..dc7aa9ac 100644
--- a/backend/middleware/authn/authn.go
+++ b/backend/middleware/authn/authn.go
@@ -10,7 +10,7 @@ import (
"strings"
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
diff --git a/backend/middleware/authz/authz.go b/backend/middleware/authz/authz.go
index 07237906..d0ae37e2 100644
--- a/backend/middleware/authz/authz.go
+++ b/backend/middleware/authz/authz.go
@@ -8,7 +8,7 @@ import (
"context"
"errors"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
diff --git a/backend/middleware/errorintercept/errorintercept.go b/backend/middleware/errorintercept/errorintercept.go
index 3fe082d9..03b26377 100644
--- a/backend/middleware/errorintercept/errorintercept.go
+++ b/backend/middleware/errorintercept/errorintercept.go
@@ -7,7 +7,7 @@ package errorintercept
import (
"context"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"google.golang.org/grpc"
"google.golang.org/protobuf/types/known/anypb"
diff --git a/backend/middleware/middleware.go b/backend/middleware/middleware.go
index 71222928..7a006019 100644
--- a/backend/middleware/middleware.go
+++ b/backend/middleware/middleware.go
@@ -5,7 +5,7 @@ import (
"github.com/gobwas/glob"
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"google.golang.org/grpc"
)
diff --git a/backend/middleware/stats/stats.go b/backend/middleware/stats/stats.go
index 4eaadb2c..a3421352 100644
--- a/backend/middleware/stats/stats.go
+++ b/backend/middleware/stats/stats.go
@@ -8,7 +8,7 @@ import (
"context"
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"google.golang.org/grpc"
"google.golang.org/grpc/status"
diff --git a/backend/middleware/timeouts/timeouts.go b/backend/middleware/timeouts/timeouts.go
index 3e457633..8c1cc563 100644
--- a/backend/middleware/timeouts/timeouts.go
+++ b/backend/middleware/timeouts/timeouts.go
@@ -9,7 +9,7 @@ import (
"fmt"
"time"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
diff --git a/backend/middleware/validate/validate.go b/backend/middleware/validate/validate.go
index 7a9e151a..f370437e 100644
--- a/backend/middleware/validate/validate.go
+++ b/backend/middleware/validate/validate.go
@@ -7,7 +7,7 @@ package validate
import (
"github.com/golang/protobuf/ptypes/any"
validator "github.com/grpc-ecosystem/go-grpc-middleware/validator"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"google.golang.org/grpc"
diff --git a/backend/mock/service/auditmock/auditmock.go b/backend/mock/service/auditmock/auditmock.go
index 3a9ef0f5..83dc5c5b 100644
--- a/backend/mock/service/auditmock/auditmock.go
+++ b/backend/mock/service/auditmock/auditmock.go
@@ -7,7 +7,7 @@ import (
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"google.golang.org/protobuf/types/known/timestamppb"
diff --git a/backend/mock/service/authzmock/authzmock.go b/backend/mock/service/authzmock/authzmock.go
index 9da8a452..df546a7c 100644
--- a/backend/mock/service/authzmock/authzmock.go
+++ b/backend/mock/service/authzmock/authzmock.go
@@ -4,7 +4,7 @@ import (
"context"
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
authzv1 "github.com/lyft/clutch/backend/api/authz/v1"
diff --git a/backend/mock/service/awsmock/awsmock.go b/backend/mock/service/awsmock/awsmock.go
index 00fefc83..81a0c1cc 100644
--- a/backend/mock/service/awsmock/awsmock.go
+++ b/backend/mock/service/awsmock/awsmock.go
@@ -13,7 +13,7 @@ import (
"github.com/aws/aws-sdk-go-v2/service/sts"
"github.com/aws/smithy-go/middleware"
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
dynamodbv1 "github.com/lyft/clutch/backend/api/aws/dynamodb/v1"
diff --git a/backend/mock/service/chaos/experimentation/experimentstoremock/experimentstoremock.go b/backend/mock/service/chaos/experimentation/experimentstoremock/experimentstoremock.go
index e79e1b5f..eee688bb 100644
--- a/backend/mock/service/chaos/experimentation/experimentstoremock/experimentstoremock.go
+++ b/backend/mock/service/chaos/experimentation/experimentstoremock/experimentstoremock.go
@@ -5,7 +5,7 @@ import (
"fmt"
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
experimentation "github.com/lyft/clutch/backend/api/chaos/experimentation/v1"
diff --git a/backend/mock/service/envoyadminmock/envoyadminmock.go b/backend/mock/service/envoyadminmock/envoyadminmock.go
index 324cc2d0..ba4625e1 100644
--- a/backend/mock/service/envoyadminmock/envoyadminmock.go
+++ b/backend/mock/service/envoyadminmock/envoyadminmock.go
@@ -6,7 +6,7 @@ import (
"net/http"
"strings"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"google.golang.org/protobuf/types/known/anypb"
diff --git a/backend/mock/service/feedbackmock/feedbackmock.go b/backend/mock/service/feedbackmock/feedbackmock.go
index d995e55d..e9beaca5 100644
--- a/backend/mock/service/feedbackmock/feedbackmock.go
+++ b/backend/mock/service/feedbackmock/feedbackmock.go
@@ -4,7 +4,7 @@ import (
"context"
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
feedbackv1 "github.com/lyft/clutch/backend/api/feedback/v1"
diff --git a/backend/mock/service/githubmock/githubmock.go b/backend/mock/service/githubmock/githubmock.go
index eed6eefb..0081334b 100644
--- a/backend/mock/service/githubmock/githubmock.go
+++ b/backend/mock/service/githubmock/githubmock.go
@@ -7,7 +7,7 @@ import (
"github.com/golang/protobuf/ptypes/any"
githubv3 "github.com/google/go-github/v37/github"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
sourcecontrolv1 "github.com/lyft/clutch/backend/api/sourcecontrol/v1"
diff --git a/backend/mock/service/k8smock/k8smock.go b/backend/mock/service/k8smock/k8smock.go
index f73abac4..93537752 100644
--- a/backend/mock/service/k8smock/k8smock.go
+++ b/backend/mock/service/k8smock/k8smock.go
@@ -5,7 +5,7 @@ import (
"math/rand"
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
batchv1 "k8s.io/api/batch/v1"
diff --git a/backend/mock/service/topologymock/topologymock.go b/backend/mock/service/topologymock/topologymock.go
index 88c0b2a3..557994a7 100644
--- a/backend/mock/service/topologymock/topologymock.go
+++ b/backend/mock/service/topologymock/topologymock.go
@@ -5,7 +5,7 @@ import (
"errors"
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"google.golang.org/protobuf/types/known/structpb"
diff --git a/backend/module/assets/assets.go b/backend/module/assets/assets.go
index 7a5a0f94..0bb94c44 100644
--- a/backend/module/assets/assets.go
+++ b/backend/module/assets/assets.go
@@ -8,7 +8,7 @@ import (
"context"
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
assetsv1 "github.com/lyft/clutch/backend/api/assets/v1"
diff --git a/backend/module/audit/audit.go b/backend/module/audit/audit.go
index 71e557a4..47f62007 100644
--- a/backend/module/audit/audit.go
+++ b/backend/module/audit/audit.go
@@ -11,7 +11,7 @@ import (
"time"
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
auditv1 "github.com/lyft/clutch/backend/api/audit/v1"
diff --git a/backend/module/authn/authn.go b/backend/module/authn/authn.go
index 4dae3d6b..8b56f45c 100644
--- a/backend/module/authn/authn.go
+++ b/backend/module/authn/authn.go
@@ -11,7 +11,7 @@ import (
"time"
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"golang.org/x/oauth2"
"google.golang.org/grpc"
diff --git a/backend/module/authz/authz.go b/backend/module/authz/authz.go
index bf06a4dd..222736c5 100644
--- a/backend/module/authz/authz.go
+++ b/backend/module/authz/authz.go
@@ -9,7 +9,7 @@ import (
"errors"
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
authzv1 "github.com/lyft/clutch/backend/api/authz/v1"
diff --git a/backend/module/authz/authz_test.go b/backend/module/authz/authz_test.go
index 4175e00c..42649377 100644
--- a/backend/module/authz/authz_test.go
+++ b/backend/module/authz/authz_test.go
@@ -4,7 +4,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap/zaptest"
"github.com/lyft/clutch/backend/mock/service/authzmock"
diff --git a/backend/module/aws/aws.go b/backend/module/aws/aws.go
index e3887e3b..fec9e3ed 100644
--- a/backend/module/aws/aws.go
+++ b/backend/module/aws/aws.go
@@ -8,7 +8,7 @@ import (
"errors"
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
ec2v1 "github.com/lyft/clutch/backend/api/aws/ec2/v1"
diff --git a/backend/module/aws/aws_test.go b/backend/module/aws/aws_test.go
index 37308380..54cd1595 100644
--- a/backend/module/aws/aws_test.go
+++ b/backend/module/aws/aws_test.go
@@ -5,7 +5,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap/zaptest"
ec2v1 "github.com/lyft/clutch/backend/api/aws/ec2/v1"
diff --git a/backend/module/bot/slackbot/slackbot.go b/backend/module/bot/slackbot/slackbot.go
index 6da65404..67b392b8 100644
--- a/backend/module/bot/slackbot/slackbot.go
+++ b/backend/module/bot/slackbot/slackbot.go
@@ -11,7 +11,7 @@ import (
"github.com/slack-go/slack"
"github.com/slack-go/slack/slackevents"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
diff --git a/backend/module/bot/slackbot/slackbot_test.go b/backend/module/bot/slackbot/slackbot_test.go
index 561cee3a..ff607a1d 100644
--- a/backend/module/bot/slackbot/slackbot_test.go
+++ b/backend/module/bot/slackbot/slackbot_test.go
@@ -7,7 +7,7 @@ import (
"github.com/slack-go/slack"
"github.com/slack-go/slack/slacktest"
"github.com/stretchr/testify/assert"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
"go.uber.org/zap/zaptest"
diff --git a/backend/module/chaos/experimentation/api/experimentation.go b/backend/module/chaos/experimentation/api/experimentation.go
index def3bf02..a33c6a98 100644
--- a/backend/module/chaos/experimentation/api/experimentation.go
+++ b/backend/module/chaos/experimentation/api/experimentation.go
@@ -9,7 +9,7 @@ import (
"time"
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"golang.org/x/net/context"
diff --git a/backend/module/chaos/experimentation/xds/internal/xdstest/xdstest.go b/backend/module/chaos/experimentation/xds/internal/xdstest/xdstest.go
index de02d750..0060fc51 100644
--- a/backend/module/chaos/experimentation/xds/internal/xdstest/xdstest.go
+++ b/backend/module/chaos/experimentation/xds/internal/xdstest/xdstest.go
@@ -4,7 +4,7 @@ import (
"time"
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"google.golang.org/protobuf/types/known/anypb"
"google.golang.org/protobuf/types/known/durationpb"
diff --git a/backend/module/chaos/experimentation/xds/poller.go b/backend/module/chaos/experimentation/xds/poller.go
index 9845d17a..0bb70023 100644
--- a/backend/module/chaos/experimentation/xds/poller.go
+++ b/backend/module/chaos/experimentation/xds/poller.go
@@ -10,7 +10,7 @@ import (
gcpCacheV3 "github.com/envoyproxy/go-control-plane/pkg/cache/v3"
pstruct "github.com/golang/protobuf/ptypes/struct"
"github.com/mitchellh/hashstructure/v2"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
experimentation "github.com/lyft/clutch/backend/api/chaos/experimentation/v1"
diff --git a/backend/module/chaos/experimentation/xds/poller_test.go b/backend/module/chaos/experimentation/xds/poller_test.go
index 99cd5257..53521b26 100644
--- a/backend/module/chaos/experimentation/xds/poller_test.go
+++ b/backend/module/chaos/experimentation/xds/poller_test.go
@@ -15,7 +15,7 @@ import (
"github.com/golang/protobuf/ptypes/any"
pstruct "github.com/golang/protobuf/ptypes/struct"
"github.com/stretchr/testify/assert"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"google.golang.org/protobuf/proto"
"google.golang.org/protobuf/types/known/anypb"
diff --git a/backend/module/chaos/experimentation/xds/xds.go b/backend/module/chaos/experimentation/xds/xds.go
index 261118d6..797bd2db 100644
--- a/backend/module/chaos/experimentation/xds/xds.go
+++ b/backend/module/chaos/experimentation/xds/xds.go
@@ -16,7 +16,7 @@ import (
gcpCacheV3 "github.com/envoyproxy/go-control-plane/pkg/cache/v3"
gcpServerV3 "github.com/envoyproxy/go-control-plane/pkg/server/v3"
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
rpc_status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/protobuf/proto"
diff --git a/backend/module/chaos/experimentation/xds/xds_test.go b/backend/module/chaos/experimentation/xds/xds_test.go
index d5cbf3be..8a1cc384 100644
--- a/backend/module/chaos/experimentation/xds/xds_test.go
+++ b/backend/module/chaos/experimentation/xds/xds_test.go
@@ -10,7 +10,7 @@ import (
gcpDiscoveryV3 "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3"
gcpRuntimeServiceV3 "github.com/envoyproxy/go-control-plane/envoy/service/runtime/v3"
"github.com/stretchr/testify/assert"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
rpc_status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/protobuf/types/known/anypb"
"google.golang.org/protobuf/types/known/durationpb"
diff --git a/backend/module/chaos/redisexperimentation/redis_experimentation.go b/backend/module/chaos/redisexperimentation/redis_experimentation.go
index 0ae97124..48f6de6d 100644
--- a/backend/module/chaos/redisexperimentation/redis_experimentation.go
+++ b/backend/module/chaos/redisexperimentation/redis_experimentation.go
@@ -9,7 +9,7 @@ import (
"fmt"
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
experimentationv1 "github.com/lyft/clutch/backend/api/chaos/experimentation/v1"
diff --git a/backend/module/chaos/serverexperimentation/server_experimentation.go b/backend/module/chaos/serverexperimentation/server_experimentation.go
index fa259c6a..fe7a8d75 100644
--- a/backend/module/chaos/serverexperimentation/server_experimentation.go
+++ b/backend/module/chaos/serverexperimentation/server_experimentation.go
@@ -9,7 +9,7 @@ import (
"fmt"
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
experimentationv1 "github.com/lyft/clutch/backend/api/chaos/experimentation/v1"
diff --git a/backend/module/dynamodb/aws.go b/backend/module/dynamodb/aws.go
index 07326c48..e9d40b45 100644
--- a/backend/module/dynamodb/aws.go
+++ b/backend/module/dynamodb/aws.go
@@ -4,7 +4,7 @@ import (
"errors"
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
dynamodbv1 "github.com/lyft/clutch/backend/api/aws/dynamodb/v1"
diff --git a/backend/module/dynamodb/aws_test.go b/backend/module/dynamodb/aws_test.go
index 69e296ed..4a10c92c 100644
--- a/backend/module/dynamodb/aws_test.go
+++ b/backend/module/dynamodb/aws_test.go
@@ -5,7 +5,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap/zaptest"
dynamodbv1 "github.com/lyft/clutch/backend/api/aws/dynamodb/v1"
diff --git a/backend/module/envoytriage/envoytriage.go b/backend/module/envoytriage/envoytriage.go
index cf799d97..a7348c9e 100644
--- a/backend/module/envoytriage/envoytriage.go
+++ b/backend/module/envoytriage/envoytriage.go
@@ -9,7 +9,7 @@ import (
"errors"
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
envoytriagev1 "github.com/lyft/clutch/backend/api/envoytriage/v1"
diff --git a/backend/module/featureflag/featureflag.go b/backend/module/featureflag/featureflag.go
index e4d9756c..231b95ea 100644
--- a/backend/module/featureflag/featureflag.go
+++ b/backend/module/featureflag/featureflag.go
@@ -4,7 +4,7 @@ import (
"context"
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
featureflagcfgv1 "github.com/lyft/clutch/backend/api/config/module/featureflag/v1"
diff --git a/backend/module/featureflag/featureflag_test.go b/backend/module/featureflag/featureflag_test.go
index 0a513801..fdfc8f6f 100644
--- a/backend/module/featureflag/featureflag_test.go
+++ b/backend/module/featureflag/featureflag_test.go
@@ -5,7 +5,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap/zaptest"
featureflagv1 "github.com/lyft/clutch/backend/api/config/module/featureflag/v1"
diff --git a/backend/module/feedback/feedback.go b/backend/module/feedback/feedback.go
index 9c166bea..605fca6a 100644
--- a/backend/module/feedback/feedback.go
+++ b/backend/module/feedback/feedback.go
@@ -9,7 +9,7 @@ import (
"errors"
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
diff --git a/backend/module/feedback/feedback_test.go b/backend/module/feedback/feedback_test.go
index 81625d6e..199a51b0 100644
--- a/backend/module/feedback/feedback_test.go
+++ b/backend/module/feedback/feedback_test.go
@@ -4,7 +4,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap/zaptest"
"google.golang.org/protobuf/types/known/anypb"
diff --git a/backend/module/healthcheck/healthcheck.go b/backend/module/healthcheck/healthcheck.go
index e1cee533..20277556 100644
--- a/backend/module/healthcheck/healthcheck.go
+++ b/backend/module/healthcheck/healthcheck.go
@@ -8,7 +8,7 @@ import (
"context"
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
healthcheckv1 "github.com/lyft/clutch/backend/api/healthcheck/v1"
diff --git a/backend/module/healthcheck/healthcheck_test.go b/backend/module/healthcheck/healthcheck_test.go
index 7bc43b86..a06efaca 100644
--- a/backend/module/healthcheck/healthcheck_test.go
+++ b/backend/module/healthcheck/healthcheck_test.go
@@ -5,7 +5,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap/zaptest"
healthcheckv1 "github.com/lyft/clutch/backend/api/healthcheck/v1"
diff --git a/backend/module/k8s/k8s.go b/backend/module/k8s/k8s.go
index 24fffd8a..6aca3908 100644
--- a/backend/module/k8s/k8s.go
+++ b/backend/module/k8s/k8s.go
@@ -8,7 +8,7 @@ import (
"errors"
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
k8sv1 "github.com/lyft/clutch/backend/api/k8s/v1"
diff --git a/backend/module/k8s/k8s_test.go b/backend/module/k8s/k8s_test.go
index 62c0d97f..d26d197c 100644
--- a/backend/module/k8s/k8s_test.go
+++ b/backend/module/k8s/k8s_test.go
@@ -5,7 +5,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap/zaptest"
"google.golang.org/protobuf/types/known/structpb"
diff --git a/backend/module/kinesis/aws.go b/backend/module/kinesis/aws.go
index aa1c2951..909d2c7f 100644
--- a/backend/module/kinesis/aws.go
+++ b/backend/module/kinesis/aws.go
@@ -4,7 +4,7 @@ import (
"errors"
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
kinesisv1 "github.com/lyft/clutch/backend/api/aws/kinesis/v1"
diff --git a/backend/module/kinesis/aws_test.go b/backend/module/kinesis/aws_test.go
index b47dee98..dbe695e9 100644
--- a/backend/module/kinesis/aws_test.go
+++ b/backend/module/kinesis/aws_test.go
@@ -5,7 +5,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap/zaptest"
kinesisv1 "github.com/lyft/clutch/backend/api/aws/kinesis/v1"
diff --git a/backend/module/module.go b/backend/module/module.go
index cd79f230..7f2a3556 100644
--- a/backend/module/module.go
+++ b/backend/module/module.go
@@ -5,7 +5,7 @@ import (
"github.com/golang/protobuf/ptypes/any"
"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"google.golang.org/grpc"
)
diff --git a/backend/module/proxy/proxy.go b/backend/module/proxy/proxy.go
index a625ac4c..9115a6a0 100644
--- a/backend/module/proxy/proxy.go
+++ b/backend/module/proxy/proxy.go
@@ -12,7 +12,7 @@ import (
"strings"
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
diff --git a/backend/module/proxy/proxy_test.go b/backend/module/proxy/proxy_test.go
index bbaeb036..a4d6d586 100644
--- a/backend/module/proxy/proxy_test.go
+++ b/backend/module/proxy/proxy_test.go
@@ -10,7 +10,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap/zaptest"
"google.golang.org/protobuf/types/known/anypb"
"google.golang.org/protobuf/types/known/structpb"
diff --git a/backend/module/resolver/resolver.go b/backend/module/resolver/resolver.go
index 20a48758..43b15637 100644
--- a/backend/module/resolver/resolver.go
+++ b/backend/module/resolver/resolver.go
@@ -10,7 +10,7 @@ import (
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
diff --git a/backend/module/sourcecontrol/sourcecontrol.go b/backend/module/sourcecontrol/sourcecontrol.go
index 67a46222..5c2944e4 100644
--- a/backend/module/sourcecontrol/sourcecontrol.go
+++ b/backend/module/sourcecontrol/sourcecontrol.go
@@ -11,7 +11,7 @@ import (
"sort"
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
sourcecontrolconfigv1 "github.com/lyft/clutch/backend/api/config/module/sourcecontrol/v1"
diff --git a/backend/module/sourcecontrol/sourcecontrol_test.go b/backend/module/sourcecontrol/sourcecontrol_test.go
index f728946e..ebd964e3 100644
--- a/backend/module/sourcecontrol/sourcecontrol_test.go
+++ b/backend/module/sourcecontrol/sourcecontrol_test.go
@@ -6,7 +6,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap/zaptest"
sourcecontrolv1 "github.com/lyft/clutch/backend/api/sourcecontrol/v1"
diff --git a/backend/module/topology/topology.go b/backend/module/topology/topology.go
index f39a3841..e7878b24 100644
--- a/backend/module/topology/topology.go
+++ b/backend/module/topology/topology.go
@@ -5,7 +5,7 @@ import (
"errors"
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
topologyv1 "github.com/lyft/clutch/backend/api/topology/v1"
diff --git a/backend/module/topology/topology_test.go b/backend/module/topology/topology_test.go
index a63e37be..d7ad4199 100644
--- a/backend/module/topology/topology_test.go
+++ b/backend/module/topology/topology_test.go
@@ -4,7 +4,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap/zaptest"
"github.com/lyft/clutch/backend/mock/service/topologymock"
diff --git a/backend/resolver/aws/aws.go b/backend/resolver/aws/aws.go
index 3cb110d8..e62137cb 100644
--- a/backend/resolver/aws/aws.go
+++ b/backend/resolver/aws/aws.go
@@ -10,7 +10,7 @@ import (
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
diff --git a/backend/resolver/aws/aws_test.go b/backend/resolver/aws/aws_test.go
index b454bab7..ed704c70 100644
--- a/backend/resolver/aws/aws_test.go
+++ b/backend/resolver/aws/aws_test.go
@@ -6,7 +6,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap/zaptest"
resolverv1 "github.com/lyft/clutch/backend/api/resolver/v1"
diff --git a/backend/resolver/core/core.go b/backend/resolver/core/core.go
index 42a41673..67668c5c 100644
--- a/backend/resolver/core/core.go
+++ b/backend/resolver/core/core.go
@@ -6,7 +6,7 @@ import (
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
diff --git a/backend/resolver/core/core_test.go b/backend/resolver/core/core_test.go
index 196efd15..d5044b07 100644
--- a/backend/resolver/core/core_test.go
+++ b/backend/resolver/core/core_test.go
@@ -4,7 +4,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap/zaptest"
"github.com/lyft/clutch/backend/mock/service/topologymock"
diff --git a/backend/resolver/k8s/k8s.go b/backend/resolver/k8s/k8s.go
index 81a7eb22..f00557c6 100644
--- a/backend/resolver/k8s/k8s.go
+++ b/backend/resolver/k8s/k8s.go
@@ -12,7 +12,7 @@ import (
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
diff --git a/backend/resolver/resolver.go b/backend/resolver/resolver.go
index 5f76ebb3..5ab84609 100644
--- a/backend/resolver/resolver.go
+++ b/backend/resolver/resolver.go
@@ -6,7 +6,7 @@ import (
"reflect"
protodeprecated "github.com/golang/protobuf/proto"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"google.golang.org/grpc/status"
"google.golang.org/protobuf/proto"
diff --git a/backend/retry/options.go b/backend/retry/options.go
index 9b8084ad..42815999 100644
--- a/backend/retry/options.go
+++ b/backend/retry/options.go
@@ -5,7 +5,7 @@ import (
"math/big"
"time"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
)
// BackoffStrategy is used to determine the delay between retries.
diff --git a/backend/retry/retry.go b/backend/retry/retry.go
index 74870996..6eec3ef9 100644
--- a/backend/retry/retry.go
+++ b/backend/retry/retry.go
@@ -6,7 +6,7 @@ import (
"strings"
"time"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
)
diff --git a/backend/retry/retry_test.go b/backend/retry/retry_test.go
index efa75131..e37a1074 100644
--- a/backend/retry/retry_test.go
+++ b/backend/retry/retry_test.go
@@ -7,7 +7,7 @@ import (
"time"
"github.com/stretchr/testify/assert"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap/zaptest"
)
diff --git a/backend/service/audit/setup.go b/backend/service/audit/setup.go
index 80c46805..022ade0e 100644
--- a/backend/service/audit/setup.go
+++ b/backend/service/audit/setup.go
@@ -15,7 +15,7 @@ import (
"time"
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"google.golang.org/protobuf/encoding/protojson"
diff --git a/backend/service/audit/setup_test.go b/backend/service/audit/setup_test.go
index d96b0f8e..3cd4ef7d 100644
--- a/backend/service/audit/setup_test.go
+++ b/backend/service/audit/setup_test.go
@@ -4,7 +4,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap/zaptest"
"google.golang.org/protobuf/types/known/anypb"
diff --git a/backend/service/audit/storage/local/localstore.go b/backend/service/audit/storage/local/localstore.go
index 6b612dfe..709e0367 100644
--- a/backend/service/audit/storage/local/localstore.go
+++ b/backend/service/audit/storage/local/localstore.go
@@ -7,7 +7,7 @@ import (
"time"
"github.com/golang/protobuf/proto"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"google.golang.org/protobuf/types/known/timestamppb"
diff --git a/backend/service/audit/storage/local/localstore_test.go b/backend/service/audit/storage/local/localstore_test.go
index 962a956a..4a9cdff2 100644
--- a/backend/service/audit/storage/local/localstore_test.go
+++ b/backend/service/audit/storage/local/localstore_test.go
@@ -7,7 +7,7 @@ import (
"time"
"github.com/stretchr/testify/assert"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap/zaptest"
auditv1 "github.com/lyft/clutch/backend/api/audit/v1"
diff --git a/backend/service/audit/storage/sql/sql.go b/backend/service/audit/storage/sql/sql.go
index 4e33518c..9ef364c6 100644
--- a/backend/service/audit/storage/sql/sql.go
+++ b/backend/service/audit/storage/sql/sql.go
@@ -8,7 +8,7 @@ import (
"fmt"
"time"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
rpcstatus "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/protobuf/encoding/protojson"
diff --git a/backend/service/auditsink/logger/logger.go b/backend/service/auditsink/logger/logger.go
index ab2ee283..39beba73 100644
--- a/backend/service/auditsink/logger/logger.go
+++ b/backend/service/auditsink/logger/logger.go
@@ -6,7 +6,7 @@ package logger
import (
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
auditv1 "github.com/lyft/clutch/backend/api/audit/v1"
diff --git a/backend/service/auditsink/slack/slack.go b/backend/service/auditsink/slack/slack.go
index 0f870735..e72766f7 100644
--- a/backend/service/auditsink/slack/slack.go
+++ b/backend/service/auditsink/slack/slack.go
@@ -14,7 +14,7 @@ import (
"github.com/golang/protobuf/ptypes/any"
"github.com/slack-go/slack"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"google.golang.org/protobuf/encoding/protojson"
diff --git a/backend/service/auditsink/slack/slack_test.go b/backend/service/auditsink/slack/slack_test.go
index 07723e68..fe788b05 100644
--- a/backend/service/auditsink/slack/slack_test.go
+++ b/backend/service/auditsink/slack/slack_test.go
@@ -5,7 +5,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap/zaptest"
"google.golang.org/protobuf/types/known/anypb"
diff --git a/backend/service/authn/authn.go b/backend/service/authn/authn.go
index d033f397..c6d13dd9 100644
--- a/backend/service/authn/authn.go
+++ b/backend/service/authn/authn.go
@@ -10,7 +10,7 @@ import (
"time"
"github.com/dgrijalva/jwt-go"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"golang.org/x/oauth2"
"google.golang.org/protobuf/types/known/anypb"
diff --git a/backend/service/authn/storage.go b/backend/service/authn/storage.go
index ad9c7ab7..1c59cf39 100644
--- a/backend/service/authn/storage.go
+++ b/backend/service/authn/storage.go
@@ -7,7 +7,7 @@ package authn
import (
"context"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"golang.org/x/oauth2"
"google.golang.org/grpc/codes"
diff --git a/backend/service/authz/authz.go b/backend/service/authz/authz.go
index 8edf7465..e02a7055 100644
--- a/backend/service/authz/authz.go
+++ b/backend/service/authz/authz.go
@@ -9,7 +9,7 @@ import (
"fmt"
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
authzv1 "github.com/lyft/clutch/backend/api/authz/v1"
diff --git a/backend/service/aws/aws.go b/backend/service/aws/aws.go
index eb6178ac..154e293b 100644
--- a/backend/service/aws/aws.go
+++ b/backend/service/aws/aws.go
@@ -26,7 +26,7 @@ import (
"github.com/aws/aws-sdk-go-v2/service/s3"
"github.com/aws/aws-sdk-go-v2/service/sts"
"github.com/iancoleman/strcase"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"golang.org/x/sync/semaphore"
"google.golang.org/grpc/codes"
diff --git a/backend/service/aws/aws_test.go b/backend/service/aws/aws_test.go
index a128ee34..fa14eeed 100644
--- a/backend/service/aws/aws_test.go
+++ b/backend/service/aws/aws_test.go
@@ -15,7 +15,7 @@ import (
"github.com/aws/smithy-go"
"github.com/golang/protobuf/ptypes/any"
"github.com/stretchr/testify/assert"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap/zaptest"
"google.golang.org/grpc/status"
"google.golang.org/protobuf/types/known/anypb"
diff --git a/backend/service/bot/bot.go b/backend/service/bot/bot.go
index 5f0d6a66..27edac87 100644
--- a/backend/service/bot/bot.go
+++ b/backend/service/bot/bot.go
@@ -8,7 +8,7 @@ import (
"context"
"fmt"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"google.golang.org/protobuf/types/known/anypb"
diff --git a/backend/service/bot/bot_test.go b/backend/service/bot/bot_test.go
index 7dd456a8..c080f1af 100644
--- a/backend/service/bot/bot_test.go
+++ b/backend/service/bot/bot_test.go
@@ -5,7 +5,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap/zaptest"
"google.golang.org/protobuf/types/known/anypb"
diff --git a/backend/service/chaos/experimentation/experimentstore/storer.go b/backend/service/chaos/experimentation/experimentstore/storer.go
index 8fb9e7c1..e275c1d8 100644
--- a/backend/service/chaos/experimentation/experimentstore/storer.go
+++ b/backend/service/chaos/experimentation/experimentstore/storer.go
@@ -11,7 +11,7 @@ import (
"time"
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
diff --git a/backend/service/chaos/experimentation/experimentstore/storer_test.go b/backend/service/chaos/experimentation/experimentstore/storer_test.go
index b738f41b..71e7440f 100644
--- a/backend/service/chaos/experimentation/experimentstore/storer_test.go
+++ b/backend/service/chaos/experimentation/experimentstore/storer_test.go
@@ -12,7 +12,7 @@ import (
"github.com/DATA-DOG/go-sqlmock"
"github.com/golang/protobuf/ptypes/any"
"github.com/stretchr/testify/assert"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"google.golang.org/protobuf/encoding/protojson"
"google.golang.org/protobuf/proto"
diff --git a/backend/service/chaos/experimentation/terminator/terminator.go b/backend/service/chaos/experimentation/terminator/terminator.go
index 8c3ae1b5..352fa327 100644
--- a/backend/service/chaos/experimentation/terminator/terminator.go
+++ b/backend/service/chaos/experimentation/terminator/terminator.go
@@ -11,7 +11,7 @@ import (
"sync/atomic"
"time"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"google.golang.org/protobuf/proto"
"google.golang.org/protobuf/types/known/anypb"
diff --git a/backend/service/chaos/experimentation/terminator/terminator_test.go b/backend/service/chaos/experimentation/terminator/terminator_test.go
index dd6bd75c..fbfb6ef9 100644
--- a/backend/service/chaos/experimentation/terminator/terminator_test.go
+++ b/backend/service/chaos/experimentation/terminator/terminator_test.go
@@ -7,7 +7,7 @@ import (
"time"
"github.com/stretchr/testify/assert"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"google.golang.org/protobuf/types/known/anypb"
"google.golang.org/protobuf/types/known/durationpb"
diff --git a/backend/service/db/postgres/setup.go b/backend/service/db/postgres/setup.go
index a618adf7..d0b9d438 100644
--- a/backend/service/db/postgres/setup.go
+++ b/backend/service/db/postgres/setup.go
@@ -12,7 +12,7 @@ import (
"github.com/golang/protobuf/ptypes/any"
_ "github.com/lib/pq"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
postgresv1 "github.com/lyft/clutch/backend/api/config/service/db/postgres/v1"
diff --git a/backend/service/db/postgres/setup_test.go b/backend/service/db/postgres/setup_test.go
index f130ec87..9a272ac1 100644
--- a/backend/service/db/postgres/setup_test.go
+++ b/backend/service/db/postgres/setup_test.go
@@ -5,7 +5,7 @@ import (
"github.com/golang/protobuf/ptypes/any"
"github.com/stretchr/testify/assert"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap/zaptest"
"google.golang.org/protobuf/types/known/anypb"
diff --git a/backend/service/envoyadmin/envoyadmin.go b/backend/service/envoyadmin/envoyadmin.go
index ba63618c..62477b2a 100644
--- a/backend/service/envoyadmin/envoyadmin.go
+++ b/backend/service/envoyadmin/envoyadmin.go
@@ -11,7 +11,7 @@ import (
"net/http"
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"golang.org/x/sync/errgroup"
diff --git a/backend/service/feedback/feedback.go b/backend/service/feedback/feedback.go
index 72a3ecfe..a5f99641 100644
--- a/backend/service/feedback/feedback.go
+++ b/backend/service/feedback/feedback.go
@@ -11,7 +11,7 @@ import (
"fmt"
"time"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
diff --git a/backend/service/feedback/feedback_test.go b/backend/service/feedback/feedback_test.go
index 7124e419..f8459790 100644
--- a/backend/service/feedback/feedback_test.go
+++ b/backend/service/feedback/feedback_test.go
@@ -4,7 +4,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap/zaptest"
feedbackv1 "github.com/lyft/clutch/backend/api/feedback/v1"
diff --git a/backend/service/github/github.go b/backend/service/github/github.go
index 48be2222..1d14e36a 100644
--- a/backend/service/github/github.go
+++ b/backend/service/github/github.go
@@ -25,7 +25,7 @@ import (
"github.com/golang/protobuf/ptypes/any"
githubv3 "github.com/google/go-github/v37/github"
"github.com/shurcooL/githubv4"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"golang.org/x/oauth2"
"google.golang.org/grpc/codes"
diff --git a/backend/service/k8s/cache_test.go b/backend/service/k8s/cache_test.go
index 7670bf3f..27ccc148 100644
--- a/backend/service/k8s/cache_test.go
+++ b/backend/service/k8s/cache_test.go
@@ -4,7 +4,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap/zaptest"
"google.golang.org/protobuf/types/known/anypb"
corev1 "k8s.io/api/core/v1"
diff --git a/backend/service/k8s/k8s.go b/backend/service/k8s/k8s.go
index 5333b490..07a7a7f6 100644
--- a/backend/service/k8s/k8s.go
+++ b/backend/service/k8s/k8s.go
@@ -8,7 +8,7 @@ import (
"context"
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"golang.org/x/sync/semaphore"
batchv1 "k8s.io/api/batch/v1"
diff --git a/backend/service/k8s/k8s_test.go b/backend/service/k8s/k8s_test.go
index d107a27a..55c7e5b0 100644
--- a/backend/service/k8s/k8s_test.go
+++ b/backend/service/k8s/k8s_test.go
@@ -9,7 +9,7 @@ import (
"github.com/golang/protobuf/ptypes/any"
"github.com/stretchr/testify/assert"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap/zaptest"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
diff --git a/backend/service/service.go b/backend/service/service.go
index d97e717a..b688e72f 100644
--- a/backend/service/service.go
+++ b/backend/service/service.go
@@ -2,7 +2,7 @@ package service
import (
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
)
diff --git a/backend/service/sourcegraph/sourcegraph.go b/backend/service/sourcegraph/sourcegraph.go
index f8d734d1..59f485ff 100644
--- a/backend/service/sourcegraph/sourcegraph.go
+++ b/backend/service/sourcegraph/sourcegraph.go
@@ -8,7 +8,7 @@ import (
"github.com/golang/protobuf/ptypes/any"
"github.com/shurcooL/graphql"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"golang.org/x/oauth2"
diff --git a/backend/service/sourcegraph/sourcegraph_test.go b/backend/service/sourcegraph/sourcegraph_test.go
index eab1d556..f716db43 100644
--- a/backend/service/sourcegraph/sourcegraph_test.go
+++ b/backend/service/sourcegraph/sourcegraph_test.go
@@ -9,7 +9,7 @@ import (
"github.com/shurcooL/graphql"
"github.com/stretchr/testify/assert"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap/zaptest"
"google.golang.org/protobuf/types/known/anypb"
diff --git a/backend/service/topology/cache_test.go b/backend/service/topology/cache_test.go
index 1043f574..18802bf3 100644
--- a/backend/service/topology/cache_test.go
+++ b/backend/service/topology/cache_test.go
@@ -7,7 +7,7 @@ import (
"time"
"github.com/stretchr/testify/assert"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap/zaptest"
"google.golang.org/protobuf/types/known/anypb"
"google.golang.org/protobuf/types/known/structpb"
diff --git a/backend/service/topology/topology.go b/backend/service/topology/topology.go
index 85be52da..6323bef8 100644
--- a/backend/service/topology/topology.go
+++ b/backend/service/topology/topology.go
@@ -11,7 +11,7 @@ import (
"time"
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"golang.org/x/net/context"
"google.golang.org/protobuf/encoding/protojson"
diff --git a/backend/service/topology/topology_test.go b/backend/service/topology/topology_test.go
index 1f1355ba..f70046e4 100644
--- a/backend/service/topology/topology_test.go
+++ b/backend/service/topology/topology_test.go
@@ -4,7 +4,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap/zaptest"
"google.golang.org/protobuf/types/known/anypb"
diff --git a/examples/amiibo/backend/module/amiibo/amiibo.go b/examples/amiibo/backend/module/amiibo/amiibo.go
index fb5bb769..dcb17882 100644
--- a/examples/amiibo/backend/module/amiibo/amiibo.go
+++ b/examples/amiibo/backend/module/amiibo/amiibo.go
@@ -1,3 +1,4 @@
+//go:build ignore
// +build ignore
package amiibo
@@ -7,7 +8,7 @@ import (
"errors"
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
amiibov1 "github.com/lyft/clutch/backend/api/amiibo/v1"
diff --git a/examples/amiibo/backend/service/amiibo/amiibo.go b/examples/amiibo/backend/service/amiibo/amiibo.go
index 67939899..4f476077 100644
--- a/examples/amiibo/backend/service/amiibo/amiibo.go
+++ b/examples/amiibo/backend/service/amiibo/amiibo.go
@@ -1,3 +1,4 @@
+//go:build ignore
// +build ignore
package amiibo
@@ -11,7 +12,7 @@ import (
"strings"
"github.com/golang/protobuf/ptypes/any"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
"google.golang.org/grpc/status"
diff --git a/tools/scaffolding/templates/gateway/backend/module/echo/echo.go b/tools/scaffolding/templates/gateway/backend/module/echo/echo.go
index f3472d55..12724aff 100644
--- a/tools/scaffolding/templates/gateway/backend/module/echo/echo.go
+++ b/tools/scaffolding/templates/gateway/backend/module/echo/echo.go
@@ -6,7 +6,7 @@ import (
"github.com/golang/protobuf/ptypes/any"
"github.com/lyft/clutch/backend/module"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap"
echov1 "{{ .RepoProvider}}/{{ .RepoOwner }}/{{ .RepoName}}/backend/api/echo/v1"
diff --git a/tools/scaffolding/templates/gateway/backend/module/echo/echo_test.go b/tools/scaffolding/templates/gateway/backend/module/echo/echo_test.go
index ebbb702d..f5ecf47c 100644
--- a/tools/scaffolding/templates/gateway/backend/module/echo/echo_test.go
+++ b/tools/scaffolding/templates/gateway/backend/module/echo/echo_test.go
@@ -5,7 +5,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
- "github.com/uber-go/tally"
+ "github.com/uber-go/tally/v4"
"go.uber.org/zap/zaptest"
"github.com/lyft/clutch/backend/module/moduletest"
--
GitLab