From 7722a927e2a50abb48ab22a6a956aad414080a73 Mon Sep 17 00:00:00 2001 From: mnoah1 Date: Tue, 9 Jun 2026 01:32:04 +0000 Subject: [PATCH] chore(deps): downgrade tally from v4 to v3.5.8 Align with go-code uberfx/tallyfx, which injects tally.Scope from github.com/uber-go/tally rather than tally/v4. --- MODULE.bazel | 2 +- core/metrics/BUILD.bazel | 4 ++-- core/metrics/metrics.go | 2 +- core/metrics/metrics_test.go | 2 +- example/stovepipe/gateway/server/BUILD.bazel | 2 +- example/stovepipe/gateway/server/main.go | 2 +- example/stovepipe/orchestrator/server/BUILD.bazel | 2 +- example/stovepipe/orchestrator/server/main.go | 2 +- example/submitqueue/gateway/server/BUILD.bazel | 2 +- example/submitqueue/gateway/server/main.go | 2 +- example/submitqueue/orchestrator/server/BUILD.bazel | 2 +- example/submitqueue/orchestrator/server/main.go | 2 +- extension/counter/mysql/BUILD.bazel | 2 +- extension/counter/mysql/counter.go | 2 +- extension/messagequeue/mysql/BUILD.bazel | 4 ++-- extension/messagequeue/mysql/delivery_state_store.go | 2 +- extension/messagequeue/mysql/delivery_state_store_test.go | 2 +- extension/messagequeue/mysql/message_store.go | 2 +- extension/messagequeue/mysql/message_store_test.go | 2 +- extension/messagequeue/mysql/offset_store.go | 2 +- extension/messagequeue/mysql/partition_lease_store.go | 2 +- extension/messagequeue/mysql/partition_lease_store_test.go | 2 +- extension/messagequeue/mysql/publisher.go | 2 +- extension/messagequeue/mysql/publisher_test.go | 2 +- extension/messagequeue/mysql/sql.go | 2 +- extension/messagequeue/mysql/sql_test.go | 2 +- extension/messagequeue/mysql/subscriber.go | 2 +- extension/messagequeue/mysql/subscriber_heartbeat_store.go | 2 +- .../messagequeue/mysql/subscriber_heartbeat_store_test.go | 2 +- extension/messagequeue/mysql/subscriber_test.go | 2 +- go.mod | 3 +-- go.sum | 2 -- stovepipe/gateway/controller/BUILD.bazel | 4 ++-- stovepipe/gateway/controller/ping.go | 2 +- stovepipe/gateway/controller/ping_test.go | 2 +- stovepipe/orchestrator/controller/BUILD.bazel | 4 ++-- stovepipe/orchestrator/controller/ping.go | 2 +- stovepipe/orchestrator/controller/ping_test.go | 2 +- submitqueue/core/consumer/BUILD.bazel | 4 ++-- submitqueue/core/consumer/consumer.go | 2 +- submitqueue/core/consumer/consumer_test.go | 2 +- submitqueue/extension/changeprovider/github/BUILD.bazel | 4 ++-- submitqueue/extension/changeprovider/github/provider.go | 2 +- submitqueue/extension/changeprovider/github/provider_test.go | 2 +- submitqueue/extension/mergechecker/github/BUILD.bazel | 4 ++-- submitqueue/extension/mergechecker/github/checker.go | 2 +- submitqueue/extension/mergechecker/github/checker_test.go | 2 +- submitqueue/extension/pusher/git/BUILD.bazel | 4 ++-- submitqueue/extension/pusher/git/git_pusher.go | 2 +- submitqueue/extension/pusher/git/git_pusher_test.go | 2 +- submitqueue/extension/scorer/composite/BUILD.bazel | 4 ++-- submitqueue/extension/scorer/composite/scorer.go | 2 +- submitqueue/extension/scorer/composite/scorer_test.go | 2 +- submitqueue/extension/scorer/fake/BUILD.bazel | 2 +- submitqueue/extension/scorer/fake/fake_test.go | 2 +- submitqueue/extension/scorer/heuristic/BUILD.bazel | 4 ++-- submitqueue/extension/scorer/heuristic/scorer.go | 2 +- submitqueue/extension/scorer/heuristic/scorer_test.go | 2 +- submitqueue/extension/storage/mysql/BUILD.bazel | 2 +- submitqueue/extension/storage/mysql/batch_dependent_store.go | 2 +- submitqueue/extension/storage/mysql/batch_store.go | 2 +- submitqueue/extension/storage/mysql/build_store.go | 2 +- submitqueue/extension/storage/mysql/change_store.go | 2 +- submitqueue/extension/storage/mysql/request_log_store.go | 2 +- submitqueue/extension/storage/mysql/request_store.go | 2 +- submitqueue/extension/storage/mysql/speculation_tree_store.go | 2 +- submitqueue/extension/storage/mysql/storage.go | 2 +- submitqueue/gateway/controller/BUILD.bazel | 4 ++-- submitqueue/gateway/controller/cancel.go | 2 +- submitqueue/gateway/controller/cancel_test.go | 2 +- submitqueue/gateway/controller/land.go | 2 +- submitqueue/gateway/controller/land_test.go | 2 +- submitqueue/gateway/controller/log/BUILD.bazel | 4 ++-- submitqueue/gateway/controller/log/log.go | 2 +- submitqueue/gateway/controller/log/log_test.go | 2 +- submitqueue/gateway/controller/ping.go | 2 +- submitqueue/gateway/controller/ping_test.go | 2 +- submitqueue/gateway/controller/status.go | 2 +- submitqueue/gateway/controller/status_test.go | 2 +- submitqueue/orchestrator/controller/BUILD.bazel | 4 ++-- submitqueue/orchestrator/controller/batch/BUILD.bazel | 4 ++-- submitqueue/orchestrator/controller/batch/batch.go | 2 +- submitqueue/orchestrator/controller/batch/batch_test.go | 2 +- submitqueue/orchestrator/controller/build/BUILD.bazel | 4 ++-- submitqueue/orchestrator/controller/build/build.go | 2 +- submitqueue/orchestrator/controller/build/build_test.go | 2 +- submitqueue/orchestrator/controller/buildsignal/BUILD.bazel | 4 ++-- .../orchestrator/controller/buildsignal/buildsignal.go | 2 +- .../orchestrator/controller/buildsignal/buildsignal_test.go | 2 +- submitqueue/orchestrator/controller/cancel/BUILD.bazel | 4 ++-- submitqueue/orchestrator/controller/cancel/cancel.go | 2 +- submitqueue/orchestrator/controller/cancel/cancel_test.go | 2 +- submitqueue/orchestrator/controller/conclude/BUILD.bazel | 4 ++-- submitqueue/orchestrator/controller/conclude/conclude.go | 2 +- submitqueue/orchestrator/controller/conclude/conclude_test.go | 2 +- submitqueue/orchestrator/controller/dlq/BUILD.bazel | 4 ++-- submitqueue/orchestrator/controller/dlq/batch.go | 2 +- submitqueue/orchestrator/controller/dlq/buildsignal.go | 2 +- submitqueue/orchestrator/controller/dlq/dlq_test.go | 2 +- submitqueue/orchestrator/controller/dlq/log.go | 2 +- submitqueue/orchestrator/controller/dlq/request.go | 2 +- submitqueue/orchestrator/controller/merge/BUILD.bazel | 4 ++-- submitqueue/orchestrator/controller/merge/merge.go | 2 +- submitqueue/orchestrator/controller/merge/merge_test.go | 2 +- submitqueue/orchestrator/controller/ping.go | 2 +- submitqueue/orchestrator/controller/ping_test.go | 2 +- submitqueue/orchestrator/controller/score/BUILD.bazel | 4 ++-- submitqueue/orchestrator/controller/score/score.go | 2 +- submitqueue/orchestrator/controller/score/score_test.go | 2 +- submitqueue/orchestrator/controller/speculate/BUILD.bazel | 4 ++-- submitqueue/orchestrator/controller/speculate/speculate.go | 2 +- .../orchestrator/controller/speculate/speculate_test.go | 2 +- submitqueue/orchestrator/controller/start/BUILD.bazel | 4 ++-- submitqueue/orchestrator/controller/start/start.go | 2 +- submitqueue/orchestrator/controller/start/start_test.go | 2 +- submitqueue/orchestrator/controller/validate/BUILD.bazel | 4 ++-- submitqueue/orchestrator/controller/validate/validate.go | 2 +- submitqueue/orchestrator/controller/validate/validate_test.go | 2 +- test/integration/extension/counter/mysql/BUILD.bazel | 2 +- test/integration/extension/counter/mysql/counter_test.go | 2 +- test/integration/extension/messagequeue/mysql/BUILD.bazel | 2 +- test/integration/extension/messagequeue/mysql/queue_test.go | 2 +- test/integration/submitqueue/core/consumer/BUILD.bazel | 2 +- test/integration/submitqueue/core/consumer/consumer_test.go | 2 +- .../submitqueue/extension/storage/mysql/BUILD.bazel | 2 +- .../submitqueue/extension/storage/mysql/storage_test.go | 2 +- test/integration/submitqueue/gateway/BUILD.bazel | 2 +- test/integration/submitqueue/gateway/suite_test.go | 2 +- 128 files changed, 151 insertions(+), 154 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 4038a46e2..af8557ebd 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -53,7 +53,7 @@ use_repo( "com_github_go_sql_driver_mysql", "com_github_spf13_cobra", "com_github_stretchr_testify", - "com_github_uber_go_tally_v4", + "com_github_uber_go_tally", "in_gopkg_yaml_v3", "org_golang_google_grpc", "org_golang_google_grpc_cmd_protoc_gen_go_grpc", diff --git a/core/metrics/BUILD.bazel b/core/metrics/BUILD.bazel index f01a8cc32..c7ec11702 100644 --- a/core/metrics/BUILD.bazel +++ b/core/metrics/BUILD.bazel @@ -7,7 +7,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//core/errs", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", ], ) @@ -18,6 +18,6 @@ go_test( deps = [ "//core/errs", "@com_github_stretchr_testify//assert", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", ], ) diff --git a/core/metrics/metrics.go b/core/metrics/metrics.go index 39cb917cd..aebf23d04 100644 --- a/core/metrics/metrics.go +++ b/core/metrics/metrics.go @@ -17,7 +17,7 @@ package metrics import ( "time" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/errs" ) diff --git a/core/metrics/metrics_test.go b/core/metrics/metrics_test.go index 03a61224a..ed695f9ed 100644 --- a/core/metrics/metrics_test.go +++ b/core/metrics/metrics_test.go @@ -20,7 +20,7 @@ import ( "time" "github.com/stretchr/testify/assert" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/errs" ) diff --git a/example/stovepipe/gateway/server/BUILD.bazel b/example/stovepipe/gateway/server/BUILD.bazel index d0334013f..05ff307c6 100644 --- a/example/stovepipe/gateway/server/BUILD.bazel +++ b/example/stovepipe/gateway/server/BUILD.bazel @@ -13,7 +13,7 @@ go_library( deps = [ "//stovepipe/gateway/controller", "//stovepipe/gateway/protopb", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_golang_google_grpc//:grpc", "@org_golang_google_grpc//reflection", "@org_uber_go_zap//:zap", diff --git a/example/stovepipe/gateway/server/main.go b/example/stovepipe/gateway/server/main.go index 88428b3b2..677612fcf 100644 --- a/example/stovepipe/gateway/server/main.go +++ b/example/stovepipe/gateway/server/main.go @@ -25,7 +25,7 @@ import ( "syscall" "time" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/stovepipe/gateway/controller" pb "github.com/uber/submitqueue/stovepipe/gateway/protopb" "go.uber.org/zap" diff --git a/example/stovepipe/orchestrator/server/BUILD.bazel b/example/stovepipe/orchestrator/server/BUILD.bazel index 83dbdfb0d..de026e9ab 100644 --- a/example/stovepipe/orchestrator/server/BUILD.bazel +++ b/example/stovepipe/orchestrator/server/BUILD.bazel @@ -13,7 +13,7 @@ go_library( deps = [ "//stovepipe/orchestrator/controller", "//stovepipe/orchestrator/protopb", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_golang_google_grpc//:grpc", "@org_golang_google_grpc//reflection", "@org_uber_go_zap//:zap", diff --git a/example/stovepipe/orchestrator/server/main.go b/example/stovepipe/orchestrator/server/main.go index 1f2b3cc9c..c13ba728c 100644 --- a/example/stovepipe/orchestrator/server/main.go +++ b/example/stovepipe/orchestrator/server/main.go @@ -25,7 +25,7 @@ import ( "syscall" "time" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/stovepipe/orchestrator/controller" pb "github.com/uber/submitqueue/stovepipe/orchestrator/protopb" "go.uber.org/zap" diff --git a/example/submitqueue/gateway/server/BUILD.bazel b/example/submitqueue/gateway/server/BUILD.bazel index 05c868bc6..b036db04d 100644 --- a/example/submitqueue/gateway/server/BUILD.bazel +++ b/example/submitqueue/gateway/server/BUILD.bazel @@ -24,7 +24,7 @@ go_library( "//submitqueue/gateway/controller/log", "//submitqueue/gateway/protopb", "@com_github_go_sql_driver_mysql//:mysql", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_golang_google_grpc//:grpc", "@org_golang_google_grpc//codes", "@org_golang_google_grpc//reflection", diff --git a/example/submitqueue/gateway/server/main.go b/example/submitqueue/gateway/server/main.go index c23a47c57..619370db3 100644 --- a/example/submitqueue/gateway/server/main.go +++ b/example/submitqueue/gateway/server/main.go @@ -27,7 +27,7 @@ import ( "time" _ "github.com/go-sql-driver/mysql" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/errs" genericerrs "github.com/uber/submitqueue/core/errs/generic" mysqlerrs "github.com/uber/submitqueue/core/errs/mysql" diff --git a/example/submitqueue/orchestrator/server/BUILD.bazel b/example/submitqueue/orchestrator/server/BUILD.bazel index d01cdb127..d3a16bee3 100644 --- a/example/submitqueue/orchestrator/server/BUILD.bazel +++ b/example/submitqueue/orchestrator/server/BUILD.bazel @@ -56,7 +56,7 @@ go_library( "//submitqueue/orchestrator/controller/validate", "//submitqueue/orchestrator/protopb", "@com_github_go_sql_driver_mysql//:mysql", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_golang_google_grpc//:grpc", "@org_golang_google_grpc//reflection", "@org_golang_x_oauth2//:oauth2", diff --git a/example/submitqueue/orchestrator/server/main.go b/example/submitqueue/orchestrator/server/main.go index fc5eb294d..91e0d6197 100644 --- a/example/submitqueue/orchestrator/server/main.go +++ b/example/submitqueue/orchestrator/server/main.go @@ -29,7 +29,7 @@ import ( _ "github.com/go-sql-driver/mysql" "golang.org/x/oauth2" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/errs" genericerrs "github.com/uber/submitqueue/core/errs/generic" mysqlerrs "github.com/uber/submitqueue/core/errs/mysql" diff --git a/extension/counter/mysql/BUILD.bazel b/extension/counter/mysql/BUILD.bazel index f123a0894..fd70687b2 100644 --- a/extension/counter/mysql/BUILD.bazel +++ b/extension/counter/mysql/BUILD.bazel @@ -8,6 +8,6 @@ go_library( deps = [ "//core/metrics", "//extension/counter", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", ], ) diff --git a/extension/counter/mysql/counter.go b/extension/counter/mysql/counter.go index 5c2f2ccc5..f6464f10d 100644 --- a/extension/counter/mysql/counter.go +++ b/extension/counter/mysql/counter.go @@ -19,7 +19,7 @@ import ( "database/sql" "fmt" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/metrics" "github.com/uber/submitqueue/extension/counter" ) diff --git a/extension/messagequeue/mysql/BUILD.bazel b/extension/messagequeue/mysql/BUILD.bazel index 581533bc6..4e61e75de 100644 --- a/extension/messagequeue/mysql/BUILD.bazel +++ b/extension/messagequeue/mysql/BUILD.bazel @@ -22,7 +22,7 @@ go_library( "//core/metrics", "//entity/messagequeue", "//extension/messagequeue", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_mock//gomock", "@org_uber_go_zap//:zap", ], @@ -47,7 +47,7 @@ go_test( "@com_github_data_dog_go_sqlmock//:go-sqlmock", "@com_github_stretchr_testify//assert", "@com_github_stretchr_testify//require", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_mock//gomock", "@org_uber_go_zap//zaptest", ], diff --git a/extension/messagequeue/mysql/delivery_state_store.go b/extension/messagequeue/mysql/delivery_state_store.go index e16ee95e7..49e585e47 100644 --- a/extension/messagequeue/mysql/delivery_state_store.go +++ b/extension/messagequeue/mysql/delivery_state_store.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/metrics" "go.uber.org/zap" ) diff --git a/extension/messagequeue/mysql/delivery_state_store_test.go b/extension/messagequeue/mysql/delivery_state_store_test.go index bd5a0903c..0b49b08a0 100644 --- a/extension/messagequeue/mysql/delivery_state_store_test.go +++ b/extension/messagequeue/mysql/delivery_state_store_test.go @@ -23,7 +23,7 @@ import ( "github.com/DATA-DOG/go-sqlmock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "go.uber.org/zap/zaptest" ) diff --git a/extension/messagequeue/mysql/message_store.go b/extension/messagequeue/mysql/message_store.go index db47dd11d..39dfa9055 100644 --- a/extension/messagequeue/mysql/message_store.go +++ b/extension/messagequeue/mysql/message_store.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "go.uber.org/zap" "github.com/uber/submitqueue/core/metrics" diff --git a/extension/messagequeue/mysql/message_store_test.go b/extension/messagequeue/mysql/message_store_test.go index a800a62bf..039f96023 100644 --- a/extension/messagequeue/mysql/message_store_test.go +++ b/extension/messagequeue/mysql/message_store_test.go @@ -24,7 +24,7 @@ import ( "github.com/DATA-DOG/go-sqlmock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "go.uber.org/zap/zaptest" entityqueue "github.com/uber/submitqueue/entity/messagequeue" diff --git a/extension/messagequeue/mysql/offset_store.go b/extension/messagequeue/mysql/offset_store.go index 61318e354..33681c3fd 100644 --- a/extension/messagequeue/mysql/offset_store.go +++ b/extension/messagequeue/mysql/offset_store.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/metrics" ) diff --git a/extension/messagequeue/mysql/partition_lease_store.go b/extension/messagequeue/mysql/partition_lease_store.go index 0fc9982eb..384255bf0 100644 --- a/extension/messagequeue/mysql/partition_lease_store.go +++ b/extension/messagequeue/mysql/partition_lease_store.go @@ -21,7 +21,7 @@ import ( "sort" "time" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/metrics" "go.uber.org/zap" ) diff --git a/extension/messagequeue/mysql/partition_lease_store_test.go b/extension/messagequeue/mysql/partition_lease_store_test.go index d18291c82..6d405833f 100644 --- a/extension/messagequeue/mysql/partition_lease_store_test.go +++ b/extension/messagequeue/mysql/partition_lease_store_test.go @@ -21,7 +21,7 @@ import ( "github.com/DATA-DOG/go-sqlmock" "github.com/stretchr/testify/require" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "go.uber.org/zap/zaptest" ) diff --git a/extension/messagequeue/mysql/publisher.go b/extension/messagequeue/mysql/publisher.go index 47dd2fba2..cfe8246f3 100644 --- a/extension/messagequeue/mysql/publisher.go +++ b/extension/messagequeue/mysql/publisher.go @@ -20,7 +20,7 @@ import ( "sync" "time" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "go.uber.org/zap" "github.com/uber/submitqueue/core/metrics" diff --git a/extension/messagequeue/mysql/publisher_test.go b/extension/messagequeue/mysql/publisher_test.go index 41b288263..b06b0e7dc 100644 --- a/extension/messagequeue/mysql/publisher_test.go +++ b/extension/messagequeue/mysql/publisher_test.go @@ -21,7 +21,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "go.uber.org/mock/gomock" "go.uber.org/zap/zaptest" diff --git a/extension/messagequeue/mysql/sql.go b/extension/messagequeue/mysql/sql.go index 385d4947d..ebd3402ad 100644 --- a/extension/messagequeue/mysql/sql.go +++ b/extension/messagequeue/mysql/sql.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "go.uber.org/zap" extqueue "github.com/uber/submitqueue/extension/messagequeue" diff --git a/extension/messagequeue/mysql/sql_test.go b/extension/messagequeue/mysql/sql_test.go index e08a3558d..5627d8510 100644 --- a/extension/messagequeue/mysql/sql_test.go +++ b/extension/messagequeue/mysql/sql_test.go @@ -21,7 +21,7 @@ import ( "github.com/DATA-DOG/go-sqlmock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "go.uber.org/zap/zaptest" extqueue "github.com/uber/submitqueue/extension/messagequeue" diff --git a/extension/messagequeue/mysql/subscriber.go b/extension/messagequeue/mysql/subscriber.go index b91062512..be866e8ab 100644 --- a/extension/messagequeue/mysql/subscriber.go +++ b/extension/messagequeue/mysql/subscriber.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "go.uber.org/zap" "github.com/uber/submitqueue/core/metrics" diff --git a/extension/messagequeue/mysql/subscriber_heartbeat_store.go b/extension/messagequeue/mysql/subscriber_heartbeat_store.go index 19d9567a8..6d7cc7007 100644 --- a/extension/messagequeue/mysql/subscriber_heartbeat_store.go +++ b/extension/messagequeue/mysql/subscriber_heartbeat_store.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/metrics" "go.uber.org/zap" ) diff --git a/extension/messagequeue/mysql/subscriber_heartbeat_store_test.go b/extension/messagequeue/mysql/subscriber_heartbeat_store_test.go index 50d1e2b7c..55dc7e226 100644 --- a/extension/messagequeue/mysql/subscriber_heartbeat_store_test.go +++ b/extension/messagequeue/mysql/subscriber_heartbeat_store_test.go @@ -23,7 +23,7 @@ import ( "github.com/DATA-DOG/go-sqlmock" "github.com/stretchr/testify/require" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "go.uber.org/zap/zaptest" ) diff --git a/extension/messagequeue/mysql/subscriber_test.go b/extension/messagequeue/mysql/subscriber_test.go index 7c68c48ed..50775e564 100644 --- a/extension/messagequeue/mysql/subscriber_test.go +++ b/extension/messagequeue/mysql/subscriber_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "go.uber.org/mock/gomock" "go.uber.org/zap/zaptest" diff --git a/go.mod b/go.mod index be4dfc6e5..ba21f2e4d 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/go-sql-driver/mysql v1.6.0 github.com/spf13/cobra v1.10.2 github.com/stretchr/testify v1.11.1 - github.com/uber-go/tally/v4 v4.1.17 + github.com/uber-go/tally v3.5.8+incompatible go.uber.org/fx v1.22.0 go.uber.org/mock v0.6.0 go.uber.org/yarpc v1.81.0 @@ -36,7 +36,6 @@ require ( github.com/rogpeppe/go-internal v1.14.1 // indirect github.com/spf13/pflag v1.0.9 // indirect github.com/twmb/murmur3 v1.1.8 // indirect - github.com/uber-go/tally v3.5.8+incompatible // indirect github.com/uber/tchannel-go v1.34.4 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/dig v1.17.1 // indirect diff --git a/go.sum b/go.sum index 4bfc91660..199e1c873 100644 --- a/go.sum +++ b/go.sum @@ -161,8 +161,6 @@ github.com/uber-go/mapdecode v1.0.0/go.mod h1:b5nP15FwXTgpjTjeA9A2uTHXV5UJCl4arw github.com/uber-go/tally v3.3.12+incompatible/go.mod h1:YDTIBxdXyOU/sCWilKB4bgyufu1cEi0jdVnRdxvjnmU= github.com/uber-go/tally v3.5.8+incompatible h1:Z2vK6ib6G/r6bAGu7lAI/98cLPLUOtdHrY2bBikk4wg= github.com/uber-go/tally v3.5.8+incompatible/go.mod h1:YDTIBxdXyOU/sCWilKB4bgyufu1cEi0jdVnRdxvjnmU= -github.com/uber-go/tally/v4 v4.1.17 h1:C+U4BKtVDXTszuzU+WH8JVQvRVnaVKxzZrROFyDrvS8= -github.com/uber-go/tally/v4 v4.1.17/go.mod h1:ZdpiHRGSa3z4NIAc1VlEH4SiknR885fOIF08xmS0gaU= github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o= github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVKhn2Um6rjCsSsg= diff --git a/stovepipe/gateway/controller/BUILD.bazel b/stovepipe/gateway/controller/BUILD.bazel index 1fed7fd4e..de4fdb952 100644 --- a/stovepipe/gateway/controller/BUILD.bazel +++ b/stovepipe/gateway/controller/BUILD.bazel @@ -8,7 +8,7 @@ go_library( deps = [ "//core/metrics", "//stovepipe/gateway/protopb", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_zap//:zap", ], ) @@ -21,7 +21,7 @@ go_test( "//stovepipe/gateway/protopb", "@com_github_stretchr_testify//assert", "@com_github_stretchr_testify//require", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_zap//:zap", ], ) diff --git a/stovepipe/gateway/controller/ping.go b/stovepipe/gateway/controller/ping.go index f76b74774..73b13063b 100644 --- a/stovepipe/gateway/controller/ping.go +++ b/stovepipe/gateway/controller/ping.go @@ -19,7 +19,7 @@ import ( "os" "time" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/metrics" pb "github.com/uber/submitqueue/stovepipe/gateway/protopb" "go.uber.org/zap" diff --git a/stovepipe/gateway/controller/ping_test.go b/stovepipe/gateway/controller/ping_test.go index 88f3f13fb..9cdf4cb53 100644 --- a/stovepipe/gateway/controller/ping_test.go +++ b/stovepipe/gateway/controller/ping_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" pb "github.com/uber/submitqueue/stovepipe/gateway/protopb" "go.uber.org/zap" ) diff --git a/stovepipe/orchestrator/controller/BUILD.bazel b/stovepipe/orchestrator/controller/BUILD.bazel index 3b10b01de..ba95a123a 100644 --- a/stovepipe/orchestrator/controller/BUILD.bazel +++ b/stovepipe/orchestrator/controller/BUILD.bazel @@ -8,7 +8,7 @@ go_library( deps = [ "//core/metrics", "//stovepipe/orchestrator/protopb", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_zap//:zap", ], ) @@ -21,7 +21,7 @@ go_test( "//stovepipe/orchestrator/protopb", "@com_github_stretchr_testify//assert", "@com_github_stretchr_testify//require", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_zap//:zap", ], ) diff --git a/stovepipe/orchestrator/controller/ping.go b/stovepipe/orchestrator/controller/ping.go index c4b682baa..643799030 100644 --- a/stovepipe/orchestrator/controller/ping.go +++ b/stovepipe/orchestrator/controller/ping.go @@ -19,7 +19,7 @@ import ( "os" "time" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/metrics" pb "github.com/uber/submitqueue/stovepipe/orchestrator/protopb" "go.uber.org/zap" diff --git a/stovepipe/orchestrator/controller/ping_test.go b/stovepipe/orchestrator/controller/ping_test.go index 15b7ca20f..5d4390e8f 100644 --- a/stovepipe/orchestrator/controller/ping_test.go +++ b/stovepipe/orchestrator/controller/ping_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" pb "github.com/uber/submitqueue/stovepipe/orchestrator/protopb" "go.uber.org/zap" ) diff --git a/submitqueue/core/consumer/BUILD.bazel b/submitqueue/core/consumer/BUILD.bazel index 5885efd72..97a93b0f7 100644 --- a/submitqueue/core/consumer/BUILD.bazel +++ b/submitqueue/core/consumer/BUILD.bazel @@ -14,7 +14,7 @@ go_library( "//core/metrics", "//entity/messagequeue", "//extension/messagequeue", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_zap//:zap", ], ) @@ -34,7 +34,7 @@ go_test( "//submitqueue/core/consumer/mock", "@com_github_stretchr_testify//assert", "@com_github_stretchr_testify//require", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_mock//gomock", "@org_uber_go_zap//zaptest", ], diff --git a/submitqueue/core/consumer/consumer.go b/submitqueue/core/consumer/consumer.go index b4b62ecb1..f1deaf570 100644 --- a/submitqueue/core/consumer/consumer.go +++ b/submitqueue/core/consumer/consumer.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/errs" "github.com/uber/submitqueue/core/metrics" extqueue "github.com/uber/submitqueue/extension/messagequeue" diff --git a/submitqueue/core/consumer/consumer_test.go b/submitqueue/core/consumer/consumer_test.go index 183cd4edc..d291687a0 100644 --- a/submitqueue/core/consumer/consumer_test.go +++ b/submitqueue/core/consumer/consumer_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/errs" entityqueue "github.com/uber/submitqueue/entity/messagequeue" extqueue "github.com/uber/submitqueue/extension/messagequeue" diff --git a/submitqueue/extension/changeprovider/github/BUILD.bazel b/submitqueue/extension/changeprovider/github/BUILD.bazel index 71ab2a34a..6fa3eacef 100644 --- a/submitqueue/extension/changeprovider/github/BUILD.bazel +++ b/submitqueue/extension/changeprovider/github/BUILD.bazel @@ -15,7 +15,7 @@ go_library( "//submitqueue/entity", "//submitqueue/entity/github", "//submitqueue/extension/changeprovider", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_zap//:zap", ], ) @@ -35,7 +35,7 @@ go_test( "//submitqueue/extension/changeprovider", "@com_github_stretchr_testify//assert", "@com_github_stretchr_testify//require", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_zap//zaptest", ], ) diff --git a/submitqueue/extension/changeprovider/github/provider.go b/submitqueue/extension/changeprovider/github/provider.go index 6f86e6214..15daaa6a2 100644 --- a/submitqueue/extension/changeprovider/github/provider.go +++ b/submitqueue/extension/changeprovider/github/provider.go @@ -6,7 +6,7 @@ import ( "fmt" "net/http" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "go.uber.org/zap" coremetrics "github.com/uber/submitqueue/core/metrics" diff --git a/submitqueue/extension/changeprovider/github/provider_test.go b/submitqueue/extension/changeprovider/github/provider_test.go index 9ae9d0cb7..def8e7673 100644 --- a/submitqueue/extension/changeprovider/github/provider_test.go +++ b/submitqueue/extension/changeprovider/github/provider_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "go.uber.org/zap/zaptest" "github.com/uber/submitqueue/core/httpclient" diff --git a/submitqueue/extension/mergechecker/github/BUILD.bazel b/submitqueue/extension/mergechecker/github/BUILD.bazel index 0491753ab..4dd5a78b7 100644 --- a/submitqueue/extension/mergechecker/github/BUILD.bazel +++ b/submitqueue/extension/mergechecker/github/BUILD.bazel @@ -14,7 +14,7 @@ go_library( "//submitqueue/entity", "//submitqueue/entity/github", "//submitqueue/extension/mergechecker", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_zap//:zap", ], ) @@ -34,7 +34,7 @@ go_test( "//submitqueue/extension/mergechecker", "@com_github_stretchr_testify//assert", "@com_github_stretchr_testify//require", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_zap//zaptest", ], ) diff --git a/submitqueue/extension/mergechecker/github/checker.go b/submitqueue/extension/mergechecker/github/checker.go index 4f92dca33..7fb2dc929 100644 --- a/submitqueue/extension/mergechecker/github/checker.go +++ b/submitqueue/extension/mergechecker/github/checker.go @@ -22,7 +22,7 @@ import ( "io" "net/http" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/metrics" "github.com/uber/submitqueue/submitqueue/entity" entitygithub "github.com/uber/submitqueue/submitqueue/entity/github" diff --git a/submitqueue/extension/mergechecker/github/checker_test.go b/submitqueue/extension/mergechecker/github/checker_test.go index 6bd28e712..f1089a4b1 100644 --- a/submitqueue/extension/mergechecker/github/checker_test.go +++ b/submitqueue/extension/mergechecker/github/checker_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/httpclient" "github.com/uber/submitqueue/submitqueue/entity" "github.com/uber/submitqueue/submitqueue/extension/mergechecker" diff --git a/submitqueue/extension/pusher/git/BUILD.bazel b/submitqueue/extension/pusher/git/BUILD.bazel index 2525962f4..5ae9f8f13 100644 --- a/submitqueue/extension/pusher/git/BUILD.bazel +++ b/submitqueue/extension/pusher/git/BUILD.bazel @@ -10,7 +10,7 @@ go_library( "//submitqueue/entity", "//submitqueue/entity/github", "//submitqueue/extension/pusher", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_zap//:zap", ], ) @@ -24,7 +24,7 @@ go_test( "//submitqueue/extension/pusher", "@com_github_stretchr_testify//assert", "@com_github_stretchr_testify//require", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_zap//zaptest", ], ) diff --git a/submitqueue/extension/pusher/git/git_pusher.go b/submitqueue/extension/pusher/git/git_pusher.go index 5774948dc..7c395ba6d 100644 --- a/submitqueue/extension/pusher/git/git_pusher.go +++ b/submitqueue/extension/pusher/git/git_pusher.go @@ -58,7 +58,7 @@ import ( "strings" "sync" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "go.uber.org/zap" coremetrics "github.com/uber/submitqueue/core/metrics" diff --git a/submitqueue/extension/pusher/git/git_pusher_test.go b/submitqueue/extension/pusher/git/git_pusher_test.go index 1248966e7..33d51a69f 100644 --- a/submitqueue/extension/pusher/git/git_pusher_test.go +++ b/submitqueue/extension/pusher/git/git_pusher_test.go @@ -28,7 +28,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "go.uber.org/zap/zaptest" "github.com/uber/submitqueue/submitqueue/entity" diff --git a/submitqueue/extension/scorer/composite/BUILD.bazel b/submitqueue/extension/scorer/composite/BUILD.bazel index f6272fcaf..1ae9d442c 100644 --- a/submitqueue/extension/scorer/composite/BUILD.bazel +++ b/submitqueue/extension/scorer/composite/BUILD.bazel @@ -9,7 +9,7 @@ go_library( "//core/metrics", "//submitqueue/entity", "//submitqueue/extension/scorer", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", ], ) @@ -22,6 +22,6 @@ go_test( "//submitqueue/extension/scorer", "@com_github_stretchr_testify//assert", "@com_github_stretchr_testify//require", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", ], ) diff --git a/submitqueue/extension/scorer/composite/scorer.go b/submitqueue/extension/scorer/composite/scorer.go index 82f845965..2acce8982 100644 --- a/submitqueue/extension/scorer/composite/scorer.go +++ b/submitqueue/extension/scorer/composite/scorer.go @@ -17,7 +17,7 @@ package composite import ( "context" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/metrics" "github.com/uber/submitqueue/submitqueue/entity" "github.com/uber/submitqueue/submitqueue/extension/scorer" diff --git a/submitqueue/extension/scorer/composite/scorer_test.go b/submitqueue/extension/scorer/composite/scorer_test.go index a6b95878a..09e7266e5 100644 --- a/submitqueue/extension/scorer/composite/scorer_test.go +++ b/submitqueue/extension/scorer/composite/scorer_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/submitqueue/entity" "github.com/uber/submitqueue/submitqueue/extension/scorer" ) diff --git a/submitqueue/extension/scorer/fake/BUILD.bazel b/submitqueue/extension/scorer/fake/BUILD.bazel index 38d5ad717..f1335904e 100644 --- a/submitqueue/extension/scorer/fake/BUILD.bazel +++ b/submitqueue/extension/scorer/fake/BUILD.bazel @@ -22,6 +22,6 @@ go_test( "//submitqueue/extension/scorer/heuristic", "@com_github_stretchr_testify//assert", "@com_github_stretchr_testify//require", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", ], ) diff --git a/submitqueue/extension/scorer/fake/fake_test.go b/submitqueue/extension/scorer/fake/fake_test.go index 228abf36c..5a0529ef8 100644 --- a/submitqueue/extension/scorer/fake/fake_test.go +++ b/submitqueue/extension/scorer/fake/fake_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/submitqueue/entity" "github.com/uber/submitqueue/submitqueue/extension/scorer" "github.com/uber/submitqueue/submitqueue/extension/scorer/heuristic" diff --git a/submitqueue/extension/scorer/heuristic/BUILD.bazel b/submitqueue/extension/scorer/heuristic/BUILD.bazel index 64bf4e874..7b66d7774 100644 --- a/submitqueue/extension/scorer/heuristic/BUILD.bazel +++ b/submitqueue/extension/scorer/heuristic/BUILD.bazel @@ -9,7 +9,7 @@ go_library( "//core/metrics", "//submitqueue/entity", "//submitqueue/extension/scorer", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", ], ) @@ -21,6 +21,6 @@ go_test( "//submitqueue/entity", "@com_github_stretchr_testify//assert", "@com_github_stretchr_testify//require", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", ], ) diff --git a/submitqueue/extension/scorer/heuristic/scorer.go b/submitqueue/extension/scorer/heuristic/scorer.go index 7203d0e6c..b1afea1c4 100644 --- a/submitqueue/extension/scorer/heuristic/scorer.go +++ b/submitqueue/extension/scorer/heuristic/scorer.go @@ -18,7 +18,7 @@ import ( "context" "fmt" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/metrics" "github.com/uber/submitqueue/submitqueue/entity" "github.com/uber/submitqueue/submitqueue/extension/scorer" diff --git a/submitqueue/extension/scorer/heuristic/scorer_test.go b/submitqueue/extension/scorer/heuristic/scorer_test.go index 98d0bcce1..d65a9bae3 100644 --- a/submitqueue/extension/scorer/heuristic/scorer_test.go +++ b/submitqueue/extension/scorer/heuristic/scorer_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/submitqueue/entity" ) diff --git a/submitqueue/extension/storage/mysql/BUILD.bazel b/submitqueue/extension/storage/mysql/BUILD.bazel index 671f83a64..25fefdc5d 100644 --- a/submitqueue/extension/storage/mysql/BUILD.bazel +++ b/submitqueue/extension/storage/mysql/BUILD.bazel @@ -19,6 +19,6 @@ go_library( "//submitqueue/entity", "//submitqueue/extension/storage", "@com_github_go_sql_driver_mysql//:mysql", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", ], ) diff --git a/submitqueue/extension/storage/mysql/batch_dependent_store.go b/submitqueue/extension/storage/mysql/batch_dependent_store.go index eeca563a8..47f8c5f8e 100644 --- a/submitqueue/extension/storage/mysql/batch_dependent_store.go +++ b/submitqueue/extension/storage/mysql/batch_dependent_store.go @@ -22,7 +22,7 @@ import ( "fmt" "github.com/go-sql-driver/mysql" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/metrics" "github.com/uber/submitqueue/submitqueue/entity" diff --git a/submitqueue/extension/storage/mysql/batch_store.go b/submitqueue/extension/storage/mysql/batch_store.go index 05fb5d43c..e6999aac8 100644 --- a/submitqueue/extension/storage/mysql/batch_store.go +++ b/submitqueue/extension/storage/mysql/batch_store.go @@ -23,7 +23,7 @@ import ( "strings" "github.com/go-sql-driver/mysql" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/metrics" "github.com/uber/submitqueue/submitqueue/entity" diff --git a/submitqueue/extension/storage/mysql/build_store.go b/submitqueue/extension/storage/mysql/build_store.go index 92233e6b2..1823592d6 100644 --- a/submitqueue/extension/storage/mysql/build_store.go +++ b/submitqueue/extension/storage/mysql/build_store.go @@ -22,7 +22,7 @@ import ( "fmt" "github.com/go-sql-driver/mysql" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/metrics" "github.com/uber/submitqueue/submitqueue/entity" diff --git a/submitqueue/extension/storage/mysql/change_store.go b/submitqueue/extension/storage/mysql/change_store.go index be25b18fe..ca37ac4ed 100644 --- a/submitqueue/extension/storage/mysql/change_store.go +++ b/submitqueue/extension/storage/mysql/change_store.go @@ -20,7 +20,7 @@ import ( "encoding/json" "fmt" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/metrics" "github.com/uber/submitqueue/submitqueue/entity" diff --git a/submitqueue/extension/storage/mysql/request_log_store.go b/submitqueue/extension/storage/mysql/request_log_store.go index 42c981906..3657fa9a6 100644 --- a/submitqueue/extension/storage/mysql/request_log_store.go +++ b/submitqueue/extension/storage/mysql/request_log_store.go @@ -21,7 +21,7 @@ import ( "fmt" "math/rand/v2" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/metrics" "github.com/uber/submitqueue/submitqueue/entity" diff --git a/submitqueue/extension/storage/mysql/request_store.go b/submitqueue/extension/storage/mysql/request_store.go index bc4e15220..a7c746d6c 100644 --- a/submitqueue/extension/storage/mysql/request_store.go +++ b/submitqueue/extension/storage/mysql/request_store.go @@ -22,7 +22,7 @@ import ( "fmt" "github.com/go-sql-driver/mysql" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/metrics" "github.com/uber/submitqueue/submitqueue/entity" diff --git a/submitqueue/extension/storage/mysql/speculation_tree_store.go b/submitqueue/extension/storage/mysql/speculation_tree_store.go index 2f6b9b20d..2366dadc9 100644 --- a/submitqueue/extension/storage/mysql/speculation_tree_store.go +++ b/submitqueue/extension/storage/mysql/speculation_tree_store.go @@ -22,7 +22,7 @@ import ( "fmt" "github.com/go-sql-driver/mysql" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/metrics" "github.com/uber/submitqueue/submitqueue/entity" diff --git a/submitqueue/extension/storage/mysql/storage.go b/submitqueue/extension/storage/mysql/storage.go index 661fac9c6..4ba0cf41c 100644 --- a/submitqueue/extension/storage/mysql/storage.go +++ b/submitqueue/extension/storage/mysql/storage.go @@ -18,7 +18,7 @@ import ( "database/sql" _ "github.com/go-sql-driver/mysql" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/submitqueue/extension/storage" ) diff --git a/submitqueue/gateway/controller/BUILD.bazel b/submitqueue/gateway/controller/BUILD.bazel index 57d06701e..ab0dabd54 100644 --- a/submitqueue/gateway/controller/BUILD.bazel +++ b/submitqueue/gateway/controller/BUILD.bazel @@ -21,7 +21,7 @@ go_library( "//submitqueue/extension/queueconfig", "//submitqueue/extension/storage", "//submitqueue/gateway/protopb", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_zap//:zap", ], ) @@ -49,7 +49,7 @@ go_test( "//submitqueue/gateway/protopb", "@com_github_stretchr_testify//assert", "@com_github_stretchr_testify//require", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_mock//gomock", "@org_uber_go_zap//:zap", ], diff --git a/submitqueue/gateway/controller/cancel.go b/submitqueue/gateway/controller/cancel.go index cc4e136d5..6718fd741 100644 --- a/submitqueue/gateway/controller/cancel.go +++ b/submitqueue/gateway/controller/cancel.go @@ -19,7 +19,7 @@ import ( "fmt" "time" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/errs" entityqueue "github.com/uber/submitqueue/entity/messagequeue" "github.com/uber/submitqueue/submitqueue/core/consumer" diff --git a/submitqueue/gateway/controller/cancel_test.go b/submitqueue/gateway/controller/cancel_test.go index 435267976..9b0d120fd 100644 --- a/submitqueue/gateway/controller/cancel_test.go +++ b/submitqueue/gateway/controller/cancel_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/errs" entityqueue "github.com/uber/submitqueue/entity/messagequeue" queuemock "github.com/uber/submitqueue/extension/messagequeue/mock" diff --git a/submitqueue/gateway/controller/land.go b/submitqueue/gateway/controller/land.go index 2567a0496..2d0c935b0 100644 --- a/submitqueue/gateway/controller/land.go +++ b/submitqueue/gateway/controller/land.go @@ -19,7 +19,7 @@ import ( "errors" "fmt" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/errs" "github.com/uber/submitqueue/core/metrics" entityqueue "github.com/uber/submitqueue/entity/messagequeue" diff --git a/submitqueue/gateway/controller/land_test.go b/submitqueue/gateway/controller/land_test.go index a3ac07077..2f4334966 100644 --- a/submitqueue/gateway/controller/land_test.go +++ b/submitqueue/gateway/controller/land_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/errs" entityqueue "github.com/uber/submitqueue/entity/messagequeue" countermock "github.com/uber/submitqueue/extension/counter/mock" diff --git a/submitqueue/gateway/controller/log/BUILD.bazel b/submitqueue/gateway/controller/log/BUILD.bazel index 60647c617..ce7eb046a 100644 --- a/submitqueue/gateway/controller/log/BUILD.bazel +++ b/submitqueue/gateway/controller/log/BUILD.bazel @@ -10,7 +10,7 @@ go_library( "//submitqueue/core/consumer", "//submitqueue/entity", "//submitqueue/extension/storage", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_zap//:zap", ], ) @@ -26,7 +26,7 @@ go_test( "//submitqueue/entity", "//submitqueue/extension/storage/mock", "@com_github_stretchr_testify//require", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_mock//gomock", "@org_uber_go_zap//zaptest", ], diff --git a/submitqueue/gateway/controller/log/log.go b/submitqueue/gateway/controller/log/log.go index 311681a05..f19d619ac 100644 --- a/submitqueue/gateway/controller/log/log.go +++ b/submitqueue/gateway/controller/log/log.go @@ -18,7 +18,7 @@ import ( "context" "fmt" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/metrics" "github.com/uber/submitqueue/submitqueue/core/consumer" "github.com/uber/submitqueue/submitqueue/entity" diff --git a/submitqueue/gateway/controller/log/log_test.go b/submitqueue/gateway/controller/log/log_test.go index c88fad1a1..f71432632 100644 --- a/submitqueue/gateway/controller/log/log_test.go +++ b/submitqueue/gateway/controller/log/log_test.go @@ -20,7 +20,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" entityqueue "github.com/uber/submitqueue/entity/messagequeue" queuemock "github.com/uber/submitqueue/extension/messagequeue/mock" "github.com/uber/submitqueue/submitqueue/core/consumer" diff --git a/submitqueue/gateway/controller/ping.go b/submitqueue/gateway/controller/ping.go index f657f096f..3ff22d2c8 100644 --- a/submitqueue/gateway/controller/ping.go +++ b/submitqueue/gateway/controller/ping.go @@ -19,7 +19,7 @@ import ( "os" "time" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" pb "github.com/uber/submitqueue/submitqueue/gateway/protopb" "go.uber.org/zap" ) diff --git a/submitqueue/gateway/controller/ping_test.go b/submitqueue/gateway/controller/ping_test.go index fd15194d6..dd7565e17 100644 --- a/submitqueue/gateway/controller/ping_test.go +++ b/submitqueue/gateway/controller/ping_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" pb "github.com/uber/submitqueue/submitqueue/gateway/protopb" "go.uber.org/zap" ) diff --git a/submitqueue/gateway/controller/status.go b/submitqueue/gateway/controller/status.go index 402d3b972..95f31da5f 100644 --- a/submitqueue/gateway/controller/status.go +++ b/submitqueue/gateway/controller/status.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/errs" "github.com/uber/submitqueue/submitqueue/core/request" "github.com/uber/submitqueue/submitqueue/extension/storage" diff --git a/submitqueue/gateway/controller/status_test.go b/submitqueue/gateway/controller/status_test.go index 12d4fbbd1..5f6ea149e 100644 --- a/submitqueue/gateway/controller/status_test.go +++ b/submitqueue/gateway/controller/status_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/errs" "github.com/uber/submitqueue/submitqueue/entity" "github.com/uber/submitqueue/submitqueue/extension/storage" diff --git a/submitqueue/orchestrator/controller/BUILD.bazel b/submitqueue/orchestrator/controller/BUILD.bazel index 200bfe878..ac66f324c 100644 --- a/submitqueue/orchestrator/controller/BUILD.bazel +++ b/submitqueue/orchestrator/controller/BUILD.bazel @@ -8,7 +8,7 @@ go_library( deps = [ "//core/metrics", "//submitqueue/orchestrator/protopb", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_zap//:zap", ], ) @@ -21,7 +21,7 @@ go_test( "//submitqueue/orchestrator/protopb", "@com_github_stretchr_testify//assert", "@com_github_stretchr_testify//require", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_zap//:zap", ], ) diff --git a/submitqueue/orchestrator/controller/batch/BUILD.bazel b/submitqueue/orchestrator/controller/batch/BUILD.bazel index 68839362a..7a13a84e7 100644 --- a/submitqueue/orchestrator/controller/batch/BUILD.bazel +++ b/submitqueue/orchestrator/controller/batch/BUILD.bazel @@ -13,7 +13,7 @@ go_library( "//submitqueue/entity", "//submitqueue/extension/conflict", "//submitqueue/extension/storage", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_zap//:zap", ], ) @@ -35,7 +35,7 @@ go_test( "//submitqueue/extension/storage/mock", "@com_github_stretchr_testify//assert", "@com_github_stretchr_testify//require", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_mock//gomock", "@org_uber_go_zap//zaptest", ], diff --git a/submitqueue/orchestrator/controller/batch/batch.go b/submitqueue/orchestrator/controller/batch/batch.go index e111d754d..1722e02b0 100644 --- a/submitqueue/orchestrator/controller/batch/batch.go +++ b/submitqueue/orchestrator/controller/batch/batch.go @@ -19,7 +19,7 @@ import ( "errors" "fmt" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/metrics" entityqueue "github.com/uber/submitqueue/entity/messagequeue" "github.com/uber/submitqueue/extension/counter" diff --git a/submitqueue/orchestrator/controller/batch/batch_test.go b/submitqueue/orchestrator/controller/batch/batch_test.go index d881de9f2..6e5c07a62 100644 --- a/submitqueue/orchestrator/controller/batch/batch_test.go +++ b/submitqueue/orchestrator/controller/batch/batch_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" entityqueue "github.com/uber/submitqueue/entity/messagequeue" countermock "github.com/uber/submitqueue/extension/counter/mock" queuemock "github.com/uber/submitqueue/extension/messagequeue/mock" diff --git a/submitqueue/orchestrator/controller/build/BUILD.bazel b/submitqueue/orchestrator/controller/build/BUILD.bazel index c7da34b31..78e26b588 100644 --- a/submitqueue/orchestrator/controller/build/BUILD.bazel +++ b/submitqueue/orchestrator/controller/build/BUILD.bazel @@ -12,7 +12,7 @@ go_library( "//submitqueue/entity", "//submitqueue/extension/buildrunner", "//submitqueue/extension/storage", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_zap//:zap", ], ) @@ -34,7 +34,7 @@ go_test( "//submitqueue/extension/storage/mock", "@com_github_stretchr_testify//assert", "@com_github_stretchr_testify//require", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_mock//gomock", "@org_uber_go_zap//zaptest", ], diff --git a/submitqueue/orchestrator/controller/build/build.go b/submitqueue/orchestrator/controller/build/build.go index 6a9ac930e..4606d9230 100644 --- a/submitqueue/orchestrator/controller/build/build.go +++ b/submitqueue/orchestrator/controller/build/build.go @@ -19,7 +19,7 @@ import ( "errors" "fmt" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/metrics" entityqueue "github.com/uber/submitqueue/entity/messagequeue" "github.com/uber/submitqueue/submitqueue/core/consumer" diff --git a/submitqueue/orchestrator/controller/build/build_test.go b/submitqueue/orchestrator/controller/build/build_test.go index 212c21b77..a144078ed 100644 --- a/submitqueue/orchestrator/controller/build/build_test.go +++ b/submitqueue/orchestrator/controller/build/build_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/errs" entityqueue "github.com/uber/submitqueue/entity/messagequeue" queuemock "github.com/uber/submitqueue/extension/messagequeue/mock" diff --git a/submitqueue/orchestrator/controller/buildsignal/BUILD.bazel b/submitqueue/orchestrator/controller/buildsignal/BUILD.bazel index 1481d4730..51b5b0fb7 100644 --- a/submitqueue/orchestrator/controller/buildsignal/BUILD.bazel +++ b/submitqueue/orchestrator/controller/buildsignal/BUILD.bazel @@ -13,7 +13,7 @@ go_library( "//submitqueue/entity", "//submitqueue/extension/buildrunner", "//submitqueue/extension/storage", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_zap//:zap", ], ) @@ -32,7 +32,7 @@ go_test( "//submitqueue/extension/storage/mock", "@com_github_stretchr_testify//assert", "@com_github_stretchr_testify//require", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_mock//gomock", "@org_uber_go_zap//zaptest", ], diff --git a/submitqueue/orchestrator/controller/buildsignal/buildsignal.go b/submitqueue/orchestrator/controller/buildsignal/buildsignal.go index 9ea902e47..69d9206c4 100644 --- a/submitqueue/orchestrator/controller/buildsignal/buildsignal.go +++ b/submitqueue/orchestrator/controller/buildsignal/buildsignal.go @@ -26,7 +26,7 @@ import ( "context" "fmt" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/errs" "github.com/uber/submitqueue/core/metrics" entityqueue "github.com/uber/submitqueue/entity/messagequeue" diff --git a/submitqueue/orchestrator/controller/buildsignal/buildsignal_test.go b/submitqueue/orchestrator/controller/buildsignal/buildsignal_test.go index afc02e320..5697d7e90 100644 --- a/submitqueue/orchestrator/controller/buildsignal/buildsignal_test.go +++ b/submitqueue/orchestrator/controller/buildsignal/buildsignal_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/errs" entityqueue "github.com/uber/submitqueue/entity/messagequeue" queuemock "github.com/uber/submitqueue/extension/messagequeue/mock" diff --git a/submitqueue/orchestrator/controller/cancel/BUILD.bazel b/submitqueue/orchestrator/controller/cancel/BUILD.bazel index 05460106c..75aca10eb 100644 --- a/submitqueue/orchestrator/controller/cancel/BUILD.bazel +++ b/submitqueue/orchestrator/controller/cancel/BUILD.bazel @@ -11,7 +11,7 @@ go_library( "//submitqueue/core/request", "//submitqueue/entity", "//submitqueue/extension/storage", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_zap//:zap", ], ) @@ -29,7 +29,7 @@ go_test( "//submitqueue/extension/storage/mock", "@com_github_stretchr_testify//assert", "@com_github_stretchr_testify//require", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_mock//gomock", "@org_uber_go_zap//zaptest", ], diff --git a/submitqueue/orchestrator/controller/cancel/cancel.go b/submitqueue/orchestrator/controller/cancel/cancel.go index cddd2336e..6f10bcb43 100644 --- a/submitqueue/orchestrator/controller/cancel/cancel.go +++ b/submitqueue/orchestrator/controller/cancel/cancel.go @@ -58,7 +58,7 @@ import ( "context" "fmt" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" entityqueue "github.com/uber/submitqueue/entity/messagequeue" "github.com/uber/submitqueue/submitqueue/core/consumer" corerequest "github.com/uber/submitqueue/submitqueue/core/request" diff --git a/submitqueue/orchestrator/controller/cancel/cancel_test.go b/submitqueue/orchestrator/controller/cancel/cancel_test.go index 82308c22b..8fa72e86e 100644 --- a/submitqueue/orchestrator/controller/cancel/cancel_test.go +++ b/submitqueue/orchestrator/controller/cancel/cancel_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" entityqueue "github.com/uber/submitqueue/entity/messagequeue" queuemock "github.com/uber/submitqueue/extension/messagequeue/mock" "github.com/uber/submitqueue/submitqueue/core/consumer" diff --git a/submitqueue/orchestrator/controller/conclude/BUILD.bazel b/submitqueue/orchestrator/controller/conclude/BUILD.bazel index 7aab80ea6..5f83b2556 100644 --- a/submitqueue/orchestrator/controller/conclude/BUILD.bazel +++ b/submitqueue/orchestrator/controller/conclude/BUILD.bazel @@ -11,7 +11,7 @@ go_library( "//submitqueue/core/request", "//submitqueue/entity", "//submitqueue/extension/storage", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_zap//:zap", ], ) @@ -30,7 +30,7 @@ go_test( "//submitqueue/extension/storage/mock", "@com_github_stretchr_testify//assert", "@com_github_stretchr_testify//require", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_mock//gomock", "@org_uber_go_zap//zaptest", ], diff --git a/submitqueue/orchestrator/controller/conclude/conclude.go b/submitqueue/orchestrator/controller/conclude/conclude.go index 4d939ab7a..88abe3d38 100644 --- a/submitqueue/orchestrator/controller/conclude/conclude.go +++ b/submitqueue/orchestrator/controller/conclude/conclude.go @@ -18,7 +18,7 @@ import ( "context" "fmt" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/metrics" "github.com/uber/submitqueue/submitqueue/core/consumer" corerequest "github.com/uber/submitqueue/submitqueue/core/request" diff --git a/submitqueue/orchestrator/controller/conclude/conclude_test.go b/submitqueue/orchestrator/controller/conclude/conclude_test.go index dd2b0be29..5f59d738b 100644 --- a/submitqueue/orchestrator/controller/conclude/conclude_test.go +++ b/submitqueue/orchestrator/controller/conclude/conclude_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/errs" entityqueue "github.com/uber/submitqueue/entity/messagequeue" queuemock "github.com/uber/submitqueue/extension/messagequeue/mock" diff --git a/submitqueue/orchestrator/controller/dlq/BUILD.bazel b/submitqueue/orchestrator/controller/dlq/BUILD.bazel index 094d56a5e..e75e49683 100644 --- a/submitqueue/orchestrator/controller/dlq/BUILD.bazel +++ b/submitqueue/orchestrator/controller/dlq/BUILD.bazel @@ -16,7 +16,7 @@ go_library( "//submitqueue/core/consumer", "//submitqueue/entity", "//submitqueue/extension/storage", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_zap//:zap", ], ) @@ -41,7 +41,7 @@ go_test( "//submitqueue/extension/storage/mock", "@com_github_stretchr_testify//assert", "@com_github_stretchr_testify//require", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_mock//gomock", "@org_uber_go_zap//zaptest", ], diff --git a/submitqueue/orchestrator/controller/dlq/batch.go b/submitqueue/orchestrator/controller/dlq/batch.go index 3359b0cbf..a35a4914e 100644 --- a/submitqueue/orchestrator/controller/dlq/batch.go +++ b/submitqueue/orchestrator/controller/dlq/batch.go @@ -18,7 +18,7 @@ import ( "context" "fmt" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/metrics" "github.com/uber/submitqueue/submitqueue/core/consumer" "github.com/uber/submitqueue/submitqueue/entity" diff --git a/submitqueue/orchestrator/controller/dlq/buildsignal.go b/submitqueue/orchestrator/controller/dlq/buildsignal.go index a05ae56f7..9d10bf70c 100644 --- a/submitqueue/orchestrator/controller/dlq/buildsignal.go +++ b/submitqueue/orchestrator/controller/dlq/buildsignal.go @@ -19,7 +19,7 @@ import ( "errors" "fmt" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/metrics" "github.com/uber/submitqueue/submitqueue/core/consumer" "github.com/uber/submitqueue/submitqueue/entity" diff --git a/submitqueue/orchestrator/controller/dlq/dlq_test.go b/submitqueue/orchestrator/controller/dlq/dlq_test.go index a8a0528d0..4ace4fe4c 100644 --- a/submitqueue/orchestrator/controller/dlq/dlq_test.go +++ b/submitqueue/orchestrator/controller/dlq/dlq_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/errs" "github.com/uber/submitqueue/submitqueue/entity" "github.com/uber/submitqueue/submitqueue/extension/storage" diff --git a/submitqueue/orchestrator/controller/dlq/log.go b/submitqueue/orchestrator/controller/dlq/log.go index 38c32c3d0..7b4320159 100644 --- a/submitqueue/orchestrator/controller/dlq/log.go +++ b/submitqueue/orchestrator/controller/dlq/log.go @@ -17,7 +17,7 @@ package dlq import ( "context" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/metrics" "github.com/uber/submitqueue/submitqueue/core/consumer" "go.uber.org/zap" diff --git a/submitqueue/orchestrator/controller/dlq/request.go b/submitqueue/orchestrator/controller/dlq/request.go index 99c997551..646c61eb0 100644 --- a/submitqueue/orchestrator/controller/dlq/request.go +++ b/submitqueue/orchestrator/controller/dlq/request.go @@ -18,7 +18,7 @@ import ( "context" "fmt" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/metrics" "github.com/uber/submitqueue/submitqueue/core/consumer" "github.com/uber/submitqueue/submitqueue/entity" diff --git a/submitqueue/orchestrator/controller/merge/BUILD.bazel b/submitqueue/orchestrator/controller/merge/BUILD.bazel index d2424dd0b..52967da47 100644 --- a/submitqueue/orchestrator/controller/merge/BUILD.bazel +++ b/submitqueue/orchestrator/controller/merge/BUILD.bazel @@ -12,7 +12,7 @@ go_library( "//submitqueue/entity", "//submitqueue/extension/pusher", "//submitqueue/extension/storage", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_zap//:zap", ], ) @@ -32,7 +32,7 @@ go_test( "//submitqueue/extension/storage/mock", "@com_github_stretchr_testify//assert", "@com_github_stretchr_testify//require", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_mock//gomock", "@org_uber_go_zap//zaptest", ], diff --git a/submitqueue/orchestrator/controller/merge/merge.go b/submitqueue/orchestrator/controller/merge/merge.go index ee04b3028..31f1600c7 100644 --- a/submitqueue/orchestrator/controller/merge/merge.go +++ b/submitqueue/orchestrator/controller/merge/merge.go @@ -19,7 +19,7 @@ import ( "errors" "fmt" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "go.uber.org/zap" coremetrics "github.com/uber/submitqueue/core/metrics" diff --git a/submitqueue/orchestrator/controller/merge/merge_test.go b/submitqueue/orchestrator/controller/merge/merge_test.go index 09845a961..7eb5578bc 100644 --- a/submitqueue/orchestrator/controller/merge/merge_test.go +++ b/submitqueue/orchestrator/controller/merge/merge_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "go.uber.org/mock/gomock" "go.uber.org/zap/zaptest" diff --git a/submitqueue/orchestrator/controller/ping.go b/submitqueue/orchestrator/controller/ping.go index 45424264f..069c648c0 100644 --- a/submitqueue/orchestrator/controller/ping.go +++ b/submitqueue/orchestrator/controller/ping.go @@ -19,7 +19,7 @@ import ( "os" "time" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/metrics" pb "github.com/uber/submitqueue/submitqueue/orchestrator/protopb" "go.uber.org/zap" diff --git a/submitqueue/orchestrator/controller/ping_test.go b/submitqueue/orchestrator/controller/ping_test.go index 75f5240d2..999be0ea3 100644 --- a/submitqueue/orchestrator/controller/ping_test.go +++ b/submitqueue/orchestrator/controller/ping_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" pb "github.com/uber/submitqueue/submitqueue/orchestrator/protopb" "go.uber.org/zap" ) diff --git a/submitqueue/orchestrator/controller/score/BUILD.bazel b/submitqueue/orchestrator/controller/score/BUILD.bazel index e1f9aa494..c3194dc30 100644 --- a/submitqueue/orchestrator/controller/score/BUILD.bazel +++ b/submitqueue/orchestrator/controller/score/BUILD.bazel @@ -13,7 +13,7 @@ go_library( "//submitqueue/entity", "//submitqueue/extension/scorer", "//submitqueue/extension/storage", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_zap//:zap", ], ) @@ -32,7 +32,7 @@ go_test( "//submitqueue/extension/storage/mock", "@com_github_stretchr_testify//assert", "@com_github_stretchr_testify//require", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_mock//gomock", "@org_uber_go_zap//zaptest", ], diff --git a/submitqueue/orchestrator/controller/score/score.go b/submitqueue/orchestrator/controller/score/score.go index 6df27ee50..836c4449d 100644 --- a/submitqueue/orchestrator/controller/score/score.go +++ b/submitqueue/orchestrator/controller/score/score.go @@ -18,7 +18,7 @@ import ( "context" "fmt" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/metrics" entityqueue "github.com/uber/submitqueue/entity/messagequeue" "github.com/uber/submitqueue/submitqueue/core/consumer" diff --git a/submitqueue/orchestrator/controller/score/score_test.go b/submitqueue/orchestrator/controller/score/score_test.go index f57a9bb16..a716815fa 100644 --- a/submitqueue/orchestrator/controller/score/score_test.go +++ b/submitqueue/orchestrator/controller/score/score_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/errs" entityqueue "github.com/uber/submitqueue/entity/messagequeue" queuemock "github.com/uber/submitqueue/extension/messagequeue/mock" diff --git a/submitqueue/orchestrator/controller/speculate/BUILD.bazel b/submitqueue/orchestrator/controller/speculate/BUILD.bazel index 70219689d..da930f198 100644 --- a/submitqueue/orchestrator/controller/speculate/BUILD.bazel +++ b/submitqueue/orchestrator/controller/speculate/BUILD.bazel @@ -11,7 +11,7 @@ go_library( "//submitqueue/core/consumer", "//submitqueue/entity", "//submitqueue/extension/storage", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_zap//:zap", ], ) @@ -30,7 +30,7 @@ go_test( "//submitqueue/extension/storage/mock", "@com_github_stretchr_testify//assert", "@com_github_stretchr_testify//require", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_mock//gomock", "@org_uber_go_zap//zaptest", ], diff --git a/submitqueue/orchestrator/controller/speculate/speculate.go b/submitqueue/orchestrator/controller/speculate/speculate.go index 05471979d..371f39bdc 100644 --- a/submitqueue/orchestrator/controller/speculate/speculate.go +++ b/submitqueue/orchestrator/controller/speculate/speculate.go @@ -19,7 +19,7 @@ import ( "errors" "fmt" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/metrics" entityqueue "github.com/uber/submitqueue/entity/messagequeue" "github.com/uber/submitqueue/submitqueue/core/consumer" diff --git a/submitqueue/orchestrator/controller/speculate/speculate_test.go b/submitqueue/orchestrator/controller/speculate/speculate_test.go index 2342bd17f..53b7116a1 100644 --- a/submitqueue/orchestrator/controller/speculate/speculate_test.go +++ b/submitqueue/orchestrator/controller/speculate/speculate_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/errs" entityqueue "github.com/uber/submitqueue/entity/messagequeue" queuemock "github.com/uber/submitqueue/extension/messagequeue/mock" diff --git a/submitqueue/orchestrator/controller/start/BUILD.bazel b/submitqueue/orchestrator/controller/start/BUILD.bazel index f9b1adb18..1f023d4a2 100644 --- a/submitqueue/orchestrator/controller/start/BUILD.bazel +++ b/submitqueue/orchestrator/controller/start/BUILD.bazel @@ -12,7 +12,7 @@ go_library( "//submitqueue/core/request", "//submitqueue/entity", "//submitqueue/extension/storage", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_zap//:zap", ], ) @@ -31,7 +31,7 @@ go_test( "//submitqueue/extension/storage/mock", "@com_github_stretchr_testify//assert", "@com_github_stretchr_testify//require", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_mock//gomock", "@org_uber_go_zap//zaptest", ], diff --git a/submitqueue/orchestrator/controller/start/start.go b/submitqueue/orchestrator/controller/start/start.go index 9a4429298..39f6b784f 100644 --- a/submitqueue/orchestrator/controller/start/start.go +++ b/submitqueue/orchestrator/controller/start/start.go @@ -19,7 +19,7 @@ import ( "errors" "fmt" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/metrics" entityqueue "github.com/uber/submitqueue/entity/messagequeue" "github.com/uber/submitqueue/submitqueue/core/consumer" diff --git a/submitqueue/orchestrator/controller/start/start_test.go b/submitqueue/orchestrator/controller/start/start_test.go index fb5c4c62e..77ed8bfb6 100644 --- a/submitqueue/orchestrator/controller/start/start_test.go +++ b/submitqueue/orchestrator/controller/start/start_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/errs" entityqueue "github.com/uber/submitqueue/entity/messagequeue" queuemock "github.com/uber/submitqueue/extension/messagequeue/mock" diff --git a/submitqueue/orchestrator/controller/validate/BUILD.bazel b/submitqueue/orchestrator/controller/validate/BUILD.bazel index 967490a34..be5acc8e2 100644 --- a/submitqueue/orchestrator/controller/validate/BUILD.bazel +++ b/submitqueue/orchestrator/controller/validate/BUILD.bazel @@ -14,7 +14,7 @@ go_library( "//submitqueue/extension/changeprovider", "//submitqueue/extension/mergechecker", "//submitqueue/extension/storage", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_zap//:zap", ], ) @@ -36,7 +36,7 @@ go_test( "//submitqueue/extension/storage/mock", "@com_github_stretchr_testify//assert", "@com_github_stretchr_testify//require", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_mock//gomock", "@org_uber_go_zap//zaptest", ], diff --git a/submitqueue/orchestrator/controller/validate/validate.go b/submitqueue/orchestrator/controller/validate/validate.go index 6f9a5d7da..5a44309f3 100644 --- a/submitqueue/orchestrator/controller/validate/validate.go +++ b/submitqueue/orchestrator/controller/validate/validate.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/errs" coremetrics "github.com/uber/submitqueue/core/metrics" entityqueue "github.com/uber/submitqueue/entity/messagequeue" diff --git a/submitqueue/orchestrator/controller/validate/validate_test.go b/submitqueue/orchestrator/controller/validate/validate_test.go index a8edf0340..20f4804f2 100644 --- a/submitqueue/orchestrator/controller/validate/validate_test.go +++ b/submitqueue/orchestrator/controller/validate/validate_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "github.com/uber/submitqueue/core/errs" entityqueue "github.com/uber/submitqueue/entity/messagequeue" queuemock "github.com/uber/submitqueue/extension/messagequeue/mock" diff --git a/test/integration/extension/counter/mysql/BUILD.bazel b/test/integration/extension/counter/mysql/BUILD.bazel index c02dc5a20..980774eb8 100644 --- a/test/integration/extension/counter/mysql/BUILD.bazel +++ b/test/integration/extension/counter/mysql/BUILD.bazel @@ -18,6 +18,6 @@ go_test( "@com_github_go_sql_driver_mysql//:mysql", "@com_github_stretchr_testify//require", "@com_github_stretchr_testify//suite", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", ], ) diff --git a/test/integration/extension/counter/mysql/counter_test.go b/test/integration/extension/counter/mysql/counter_test.go index 15615683f..05675460a 100644 --- a/test/integration/extension/counter/mysql/counter_test.go +++ b/test/integration/extension/counter/mysql/counter_test.go @@ -22,7 +22,7 @@ import ( _ "github.com/go-sql-driver/mysql" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" mysqlcounter "github.com/uber/submitqueue/extension/counter/mysql" countersuite "github.com/uber/submitqueue/test/integration/extension/counter" "github.com/uber/submitqueue/test/testutil" diff --git a/test/integration/extension/messagequeue/mysql/BUILD.bazel b/test/integration/extension/messagequeue/mysql/BUILD.bazel index f30878f6b..918ea4bf0 100644 --- a/test/integration/extension/messagequeue/mysql/BUILD.bazel +++ b/test/integration/extension/messagequeue/mysql/BUILD.bazel @@ -21,7 +21,7 @@ go_test( "@com_github_stretchr_testify//assert", "@com_github_stretchr_testify//require", "@com_github_stretchr_testify//suite", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_zap//zaptest", ], ) diff --git a/test/integration/extension/messagequeue/mysql/queue_test.go b/test/integration/extension/messagequeue/mysql/queue_test.go index 02c4d11e5..9d9b62bba 100644 --- a/test/integration/extension/messagequeue/mysql/queue_test.go +++ b/test/integration/extension/messagequeue/mysql/queue_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "go.uber.org/zap/zaptest" entityqueue "github.com/uber/submitqueue/entity/messagequeue" diff --git a/test/integration/submitqueue/core/consumer/BUILD.bazel b/test/integration/submitqueue/core/consumer/BUILD.bazel index c2766418a..a9660b53f 100644 --- a/test/integration/submitqueue/core/consumer/BUILD.bazel +++ b/test/integration/submitqueue/core/consumer/BUILD.bazel @@ -21,7 +21,7 @@ go_test( "@com_github_go_sql_driver_mysql//:mysql", "@com_github_stretchr_testify//require", "@com_github_stretchr_testify//suite", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_uber_go_zap//zaptest", ], ) diff --git a/test/integration/submitqueue/core/consumer/consumer_test.go b/test/integration/submitqueue/core/consumer/consumer_test.go index 11a08dc69..1de83ae09 100644 --- a/test/integration/submitqueue/core/consumer/consumer_test.go +++ b/test/integration/submitqueue/core/consumer/consumer_test.go @@ -11,7 +11,7 @@ import ( _ "github.com/go-sql-driver/mysql" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" "go.uber.org/zap/zaptest" "github.com/uber/submitqueue/core/errs" diff --git a/test/integration/submitqueue/extension/storage/mysql/BUILD.bazel b/test/integration/submitqueue/extension/storage/mysql/BUILD.bazel index a51279e0b..fd6270de0 100644 --- a/test/integration/submitqueue/extension/storage/mysql/BUILD.bazel +++ b/test/integration/submitqueue/extension/storage/mysql/BUILD.bazel @@ -18,6 +18,6 @@ go_test( "@com_github_go_sql_driver_mysql//:mysql", "@com_github_stretchr_testify//require", "@com_github_stretchr_testify//suite", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", ], ) diff --git a/test/integration/submitqueue/extension/storage/mysql/storage_test.go b/test/integration/submitqueue/extension/storage/mysql/storage_test.go index f9cb9c909..03e3ee4a0 100644 --- a/test/integration/submitqueue/extension/storage/mysql/storage_test.go +++ b/test/integration/submitqueue/extension/storage/mysql/storage_test.go @@ -22,7 +22,7 @@ import ( _ "github.com/go-sql-driver/mysql" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" mysqlstorage "github.com/uber/submitqueue/submitqueue/extension/storage/mysql" storagesuite "github.com/uber/submitqueue/test/integration/submitqueue/extension/storage" "github.com/uber/submitqueue/test/testutil" diff --git a/test/integration/submitqueue/gateway/BUILD.bazel b/test/integration/submitqueue/gateway/BUILD.bazel index da3d0d413..8151d3a3f 100644 --- a/test/integration/submitqueue/gateway/BUILD.bazel +++ b/test/integration/submitqueue/gateway/BUILD.bazel @@ -25,7 +25,7 @@ go_test( "@com_github_stretchr_testify//assert", "@com_github_stretchr_testify//require", "@com_github_stretchr_testify//suite", - "@com_github_uber_go_tally_v4//:tally", + "@com_github_uber_go_tally//:tally", "@org_golang_google_grpc//:grpc", "@org_uber_go_zap//:zap", ], diff --git a/test/integration/submitqueue/gateway/suite_test.go b/test/integration/submitqueue/gateway/suite_test.go index 1db104c8e..cc526deae 100644 --- a/test/integration/submitqueue/gateway/suite_test.go +++ b/test/integration/submitqueue/gateway/suite_test.go @@ -35,7 +35,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/uber-go/tally/v4" + "github.com/uber-go/tally" queueMySQL "github.com/uber/submitqueue/extension/messagequeue/mysql" "github.com/uber/submitqueue/submitqueue/core/consumer" corerequest "github.com/uber/submitqueue/submitqueue/core/request"