Revert "Upgrade tally to v4 (fixes #1157) (#1168)" (#1191)

shijiesheng · web-flow · commit db5eb674fe59 · 2022-09-27T14:22:23.000-07:00
This reverts commit 2f29329.
diff --git a/activity/activity.go b/activity/activity.go
@@ -23,7 +23,7 @@ package activity
 import (
 	"context"
 
-	"github.com/uber-go/tally/v4"
+	"github.com/uber-go/tally"
 	"go.uber.org/cadence/internal"
 	"go.uber.org/zap"
 )
diff --git a/go.mod b/go.mod
@@ -14,8 +14,7 @@ require (
 	github.com/pborman/uuid v0.0.0-20160209185913-a97ce2ca70fa
 	github.com/robfig/cron v1.2.0
 	github.com/stretchr/testify v1.5.1
-	github.com/twmb/murmur3 v1.1.6 // indirect
-	github.com/uber-go/tally/v4 v4.1.1
+	github.com/uber-go/tally v3.3.15+incompatible
 	github.com/uber/cadence-idl v0.0.0-20220713235846-fda89e95df1e
 	github.com/uber/jaeger-client-go v2.22.1+incompatible
 	github.com/uber/tchannel-go v1.32.1
diff --git a/go.sum b/go.sum
diff --git a/internal/activity.go b/internal/activity.go
@@ -27,7 +27,7 @@ import (
 	"time"
 
 	"github.com/opentracing/opentracing-go"
-	"github.com/uber-go/tally/v4"
+	"github.com/uber-go/tally"
 	"go.uber.org/cadence/.gen/go/shared"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
diff --git a/internal/client.go b/internal/client.go
@@ -27,7 +27,7 @@ import (
 	"time"
 
 	"github.com/opentracing/opentracing-go"
-	"github.com/uber-go/tally/v4"
+	"github.com/uber-go/tally"
 	"go.uber.org/cadence/.gen/go/cadence/workflowserviceclient"
 	s "go.uber.org/cadence/.gen/go/shared"
 	"go.uber.org/cadence/internal/common/auth"
diff --git a/internal/common/metrics/capturingStatsReporter.go b/internal/common/metrics/capturingStatsReporter.go
@@ -24,7 +24,7 @@ import (
 	"io"
 	"time"
 
-	"github.com/uber-go/tally/v4"
+	"github.com/uber-go/tally"
 )
 
 // NewMetricsScope returns a new metric scope
diff --git a/internal/common/metrics/scope.go b/internal/common/metrics/scope.go
@@ -24,7 +24,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/uber-go/tally/v4"
+	"github.com/uber-go/tally"
 )
 
 type (
diff --git a/internal/common/metrics/scope_test.go b/internal/common/metrics/scope_test.go
@@ -27,7 +27,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
-	"github.com/uber-go/tally/v4"
+	"github.com/uber-go/tally"
 )
 
 func Test_Counter(t *testing.T) {
diff --git a/internal/common/metrics/service_wrapper.go b/internal/common/metrics/service_wrapper.go
@@ -25,7 +25,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/uber-go/tally/v4"
+	"github.com/uber-go/tally"
 	"go.uber.org/cadence/.gen/go/cadence/workflowserviceclient"
 	"go.uber.org/cadence/.gen/go/shared"
 	"go.uber.org/yarpc"
diff --git a/internal/common/metrics/service_wrapper_test.go b/internal/common/metrics/service_wrapper_test.go
@@ -30,7 +30,7 @@ import (
 
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
-	"github.com/uber-go/tally/v4"
+	"github.com/uber-go/tally"
 	"github.com/uber/tchannel-go/thrift"
 	"go.uber.org/cadence/.gen/go/cadence/workflowserviceclient"
 	"go.uber.org/cadence/.gen/go/cadence/workflowservicetest"
diff --git a/internal/interceptors.go b/internal/interceptors.go
@@ -24,7 +24,7 @@ package internal
 import (
 	"time"
 
-	"github.com/uber-go/tally/v4"
+	"github.com/uber-go/tally"
 	"go.uber.org/zap"
 )
 
diff --git a/internal/internal_activity.go b/internal/internal_activity.go
@@ -31,7 +31,7 @@ import (
 	"time"
 
 	"github.com/opentracing/opentracing-go"
-	"github.com/uber-go/tally/v4"
+	"github.com/uber-go/tally"
 	"go.uber.org/cadence/.gen/go/shared"
 	"go.uber.org/cadence/internal/common"
 	"go.uber.org/zap"
diff --git a/internal/internal_event_handlers.go b/internal/internal_event_handlers.go
@@ -32,7 +32,7 @@ import (
 	"time"
 
 	"github.com/opentracing/opentracing-go"
-	"github.com/uber-go/tally/v4"
+	"github.com/uber-go/tally"
 	"go.uber.org/cadence/.gen/go/shared"
 	m "go.uber.org/cadence/.gen/go/shared"
 	"go.uber.org/cadence/internal/common"
diff --git a/internal/internal_task_pollers.go b/internal/internal_task_pollers.go
@@ -31,7 +31,7 @@ import (
 
 	"github.com/opentracing/opentracing-go"
 	"github.com/pborman/uuid"
-	"github.com/uber-go/tally/v4"
+	"github.com/uber-go/tally"
 	"go.uber.org/cadence/.gen/go/cadence/workflowserviceclient"
 	s "go.uber.org/cadence/.gen/go/shared"
 	"go.uber.org/cadence/internal/common"
diff --git a/internal/internal_utils.go b/internal/internal_utils.go
@@ -33,7 +33,7 @@ import (
 	"time"
 
 	"github.com/pborman/uuid"
-	"github.com/uber-go/tally/v4"
+	"github.com/uber-go/tally"
 	s "go.uber.org/cadence/.gen/go/shared"
 	"go.uber.org/cadence/internal/common"
 	"go.uber.org/cadence/internal/common/metrics"
diff --git a/internal/internal_worker.go b/internal/internal_worker.go
@@ -40,7 +40,7 @@ import (
 
 	"github.com/opentracing/opentracing-go"
 	"github.com/pborman/uuid"
-	"github.com/uber-go/tally/v4"
+	"github.com/uber-go/tally"
 	"go.uber.org/cadence/.gen/go/cadence/workflowserviceclient"
 	"go.uber.org/cadence/.gen/go/shared"
 	"go.uber.org/cadence/internal/common/auth"
diff --git a/internal/internal_worker_base.go b/internal/internal_worker_base.go
@@ -32,7 +32,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/uber-go/tally/v4"
+	"github.com/uber-go/tally"
 	"go.uber.org/cadence/.gen/go/shared"
 	"go.uber.org/cadence/internal/common/backoff"
 	"go.uber.org/cadence/internal/common/metrics"
diff --git a/internal/internal_worker_test.go b/internal/internal_worker_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"
 	"go.uber.org/cadence/.gen/go/cadence/workflowservicetest"
 	"go.uber.org/cadence/.gen/go/shared"
 	"go.uber.org/cadence/internal/common"
diff --git a/internal/internal_workflow_client.go b/internal/internal_workflow_client.go
@@ -33,7 +33,7 @@ import (
 
 	"github.com/opentracing/opentracing-go"
 	"github.com/pborman/uuid"
-	"github.com/uber-go/tally/v4"
+	"github.com/uber-go/tally"
 
 	"go.uber.org/cadence/.gen/go/cadence/workflowserviceclient"
 	s "go.uber.org/cadence/.gen/go/shared"
diff --git a/internal/internal_workflow_testsuite.go b/internal/internal_workflow_testsuite.go
@@ -35,7 +35,7 @@ import (
 	"github.com/opentracing/opentracing-go"
 	"github.com/robfig/cron"
 	"github.com/stretchr/testify/mock"
-	"github.com/uber-go/tally/v4"
+	"github.com/uber-go/tally"
 	"go.uber.org/cadence/.gen/go/cadence/workflowserviceclient"
 	"go.uber.org/cadence/.gen/go/cadence/workflowservicetest"
 	"go.uber.org/cadence/.gen/go/shared"
diff --git a/internal/worker.go b/internal/worker.go
@@ -26,7 +26,7 @@ import (
 	"time"
 
 	"github.com/opentracing/opentracing-go"
-	"github.com/uber-go/tally/v4"
+	"github.com/uber-go/tally"
 	"go.uber.org/cadence/.gen/go/cadence/workflowserviceclient"
 	"go.uber.org/cadence/.gen/go/shared"
 	"go.uber.org/cadence/internal/common/auth"
diff --git a/internal/workflow.go b/internal/workflow.go
@@ -28,7 +28,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/uber-go/tally/v4"
+	"github.com/uber-go/tally"
 	s "go.uber.org/cadence/.gen/go/shared"
 	"go.uber.org/cadence/internal/common"
 	"go.uber.org/cadence/internal/common/backoff"
diff --git a/internal/workflow_replayer.go b/internal/workflow_replayer.go
@@ -32,7 +32,7 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/opentracing/opentracing-go"
 	"github.com/pborman/uuid"
-	"github.com/uber-go/tally/v4"
+	"github.com/uber-go/tally"
 	"go.uber.org/cadence/.gen/go/cadence/workflowserviceclient"
 	"go.uber.org/cadence/.gen/go/cadence/workflowservicetest"
 	"go.uber.org/cadence/.gen/go/shared"
diff --git a/internal/workflow_testsuite.go b/internal/workflow_testsuite.go
@@ -28,7 +28,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/mock"
-	"github.com/uber-go/tally/v4"
+	"github.com/uber-go/tally"
 	"go.uber.org/cadence/.gen/go/shared"
 	"go.uber.org/zap"
 )
diff --git a/workflow/workflow.go b/workflow/workflow.go
@@ -21,7 +21,7 @@
 package workflow
 
 import (
-	"github.com/uber-go/tally/v4"
+	"github.com/uber-go/tally"
 	"go.uber.org/cadence/encoded"
 	"go.uber.org/cadence/internal"
 	"go.uber.org/zap"

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ package activity`
`23`	`23`	`import (`
`24`	`24`	`"context"`
`25`	`25`
`26`		`- "github.com/uber-go/tally/v4"`
	`26`	`+ "github.com/uber-go/tally"`
`27`	`27`	`"go.uber.org/cadence/internal"`
`28`	`28`	`"go.uber.org/zap"`
`29`	`29`	`)`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ import (`
`24`	`24`	`"io"`
`25`	`25`	`"time"`
`26`	`26`
`27`		`- "github.com/uber-go/tally/v4"`
	`27`	`+ "github.com/uber-go/tally"`
`28`	`28`	`)`
`29`	`29`
`30`	`30`	`// NewMetricsScope returns a new metric scope`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ import (`
`27`	`27`	`"time"`
`28`	`28`
`29`	`29`	`"github.com/stretchr/testify/require"`
`30`		`- "github.com/uber-go/tally/v4"`
	`30`	`+ "github.com/uber-go/tally"`
`31`	`31`	`)`
`32`	`32`
`33`	`33`	`func Test_Counter(t *testing.T) {`