[gomodules] Update imports to match go.mod (#168)

uber-go · Aug 30, 2021 · bd44280 · bd44280
1 parent 3e0027a
commit bd44280
Show file tree

Hide file tree

Showing 39 changed files with 141 additions and 249 deletions.
diff --git a/Makefile b/Makefile
@@ -21,7 +21,7 @@ dependencies:
 	go install ./vendor/github.com/golang/lint/golint
 
 .PHONY: lint
-lint:
+lint: gomodtidy
 	@rm -rf lint.log
 	@echo "Checking formatting..."
 	@gofmt -d -s $(PKG_FILES) 2>&1 | grep -v '$(LINT_IGNORE)' | tee lint.log
@@ -35,6 +35,15 @@ lint:
 	@./check_license.sh | grep -v '$(LICENSE_IGNORE)' | tee -a lint.log
 	@[ ! -s lint.log ]
 
+.PHONY: gomodtidy
+gomodtidy: go.mod go.sum
+	go mod tidy
+	@if ! git diff --quiet $^; then \
+		echo "go mod tidy changed files:" && \
+		git status --porcelain $^ && \
+		false; \
+	fi
+
 .PHONY: test
 test:
 	go test -race -v $(PKGS)

diff --git a/example/main.go b/example/main.go
@@ -24,7 +24,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/uber-go/tally"
+	tally "github.com/uber-go/tally/v4"
 )
 
 type printStatsReporter struct{}

diff --git a/instrument/call.go b/instrument/call.go
@@ -20,7 +20,9 @@
 
 package instrument
 
-import "github.com/uber-go/tally"
+import (
+	tally "github.com/uber-go/tally/v4"
+)
 
 const (
 	resultType        = "result_type"

diff --git a/instrument/call_test.go b/instrument/call_test.go
@@ -25,7 +25,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/uber-go/tally"
+	"github.com/uber-go/tally/v4"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

diff --git a/internal/cache/tag_cache.go b/internal/cache/tag_cache.go
@@ -23,8 +23,8 @@ package cache
 import (
 	"sync"
 
-	"github.com/uber-go/tally/internal/identity"
-	m3thrift "github.com/uber-go/tally/m3/thrift/v2"
+	"github.com/uber-go/tally/v4/internal/identity"
+	m3thrift "github.com/uber-go/tally/v4/m3/thrift/v2"
 )
 
 // TagCache is an identity.Accumulator-based tag cache.

diff --git a/internal/identity/accumulator_benchmark_test.go b/internal/identity/accumulator_benchmark_test.go
@@ -24,7 +24,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/uber-go/tally/internal/identity"
+	"github.com/uber-go/tally/v4/internal/identity"
 )
 
 func BenchmarkAccumulator_StringStringMap(b *testing.B) {

diff --git a/m3/config_test.go b/m3/config_test.go
@@ -23,10 +23,9 @@ package m3
 import (
 	"testing"
 
-	"github.com/uber-go/tally/m3/thriftudp"
-
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"github.com/uber-go/tally/v4/m3/thriftudp"
 )
 
 func TestConfigSimple(t *testing.T) {

diff --git a/m3/customtransports/buffered_read_transport.go b/m3/customtransports/buffered_read_transport.go
@@ -23,7 +23,7 @@ package customtransport
 import (
 	"bytes"
 
-	"github.com/uber-go/tally/thirdparty/github.com/apache/thrift/lib/go/thrift"
+	"github.com/uber-go/tally/v4/thirdparty/github.com/apache/thrift/lib/go/thrift"
 )
 
 // TBufferedReadTransport is a thrift.TTransport that reads from a buffer

diff --git a/m3/customtransports/m3_calc_transport_test.go b/m3/customtransports/m3_calc_transport_test.go
@@ -24,7 +24,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"github.com/uber-go/tally/thirdparty/github.com/apache/thrift/lib/go/thrift"
+	"github.com/uber-go/tally/v4/thirdparty/github.com/apache/thrift/lib/go/thrift"
 )
 
 // Make sure that TCalcTransport implements TRichTransport.

diff --git a/m3/example/local_server.go b/m3/example/local_server.go
@@ -26,10 +26,10 @@ import (
 	"net"
 	"sync/atomic"
 
-	"github.com/uber-go/tally/m3"
-	customtransport "github.com/uber-go/tally/m3/customtransports"
-	m3thrift "github.com/uber-go/tally/m3/thrift/v1"
-	"github.com/uber-go/tally/thirdparty/github.com/apache/thrift/lib/go/thrift"
+	"github.com/uber-go/tally/v4/m3"
+	customtransport "github.com/uber-go/tally/v4/m3/customtransports"
+	m3thrift "github.com/uber-go/tally/v4/m3/thrift/v1"
+	"github.com/uber-go/tally/v4/thirdparty/github.com/apache/thrift/lib/go/thrift"
 )
 
 type batchCallback func(batch *m3thrift.MetricBatch)

diff --git a/m3/example/m3_main.go b/m3/example/m3_main.go
@@ -29,9 +29,9 @@ import (
 	"os"
 	"time"
 
-	"github.com/uber-go/tally"
-	"github.com/uber-go/tally/m3"
-	m3thrift "github.com/uber-go/tally/m3/thrift/v1"
+	tally "github.com/uber-go/tally/v4"
+	"github.com/uber-go/tally/v4/m3"
+	m3thrift "github.com/uber-go/tally/v4/m3/thrift/v1"
 
 	validator "gopkg.in/validator.v2"
 	yaml "gopkg.in/yaml.v2"

diff --git a/m3/reporter.go b/m3/reporter.go
@@ -32,12 +32,12 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
-	"github.com/uber-go/tally"
-	"github.com/uber-go/tally/internal/cache"
-	customtransport "github.com/uber-go/tally/m3/customtransports"
-	m3thrift "github.com/uber-go/tally/m3/thrift/v2"
-	"github.com/uber-go/tally/m3/thriftudp"
-	"github.com/uber-go/tally/thirdparty/github.com/apache/thrift/lib/go/thrift"
+	tally "github.com/uber-go/tally/v4"
+	"github.com/uber-go/tally/v4/internal/cache"
+	customtransport "github.com/uber-go/tally/v4/m3/customtransports"
+	m3thrift "github.com/uber-go/tally/v4/m3/thrift/v2"
+	"github.com/uber-go/tally/v4/m3/thriftudp"
+	"github.com/uber-go/tally/v4/thirdparty/github.com/apache/thrift/lib/go/thrift"
 	"go.uber.org/atomic"
 )
 

diff --git a/m3/reporter_benchmark_test.go b/m3/reporter_benchmark_test.go
@@ -25,7 +25,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/uber-go/tally"
+	tally "github.com/uber-go/tally/v4"
 )
 
 func BenchmarkNewMetric(b *testing.B) {

diff --git a/m3/reporter_integration_test.go b/m3/reporter_integration_test.go
@@ -26,21 +26,21 @@ import (
 	"os"
 	"os/exec"
 	"path"
+	"path/filepath"
 	"sync"
 	"testing"
 
 	"github.com/stretchr/testify/require"
 )
 
-var (
-	mainFileFmt = `
+var mainFileFmt = `
 package main
 
 import (
 	"time"
 
-	"github.com/uber-go/tally"
-	"github.com/uber-go/tally/m3"
+	tally "github.com/uber-go/tally/v4"
+	"github.com/uber-go/tally/v4/m3"
 )
 
 func main() {
@@ -63,7 +63,6 @@ func main() {
 	scope.Timer("my-timer").Record(456 * time.Millisecond)
 }
 	`
-)
 
 // TestIntegrationProcessFlushOnExit tests whether data is correctly flushed
 // when the scope is closed for shortly lived programs
@@ -74,10 +73,13 @@ func TestIntegrationProcessFlushOnExit(t *testing.T) {
 }
 
 func testProcessFlushOnExit(t *testing.T, i int) {
-	dir, err := ioutil.TempDir("", "foo")
+	dir, err := os.MkdirTemp(".", "foo")
 	require.NoError(t, err)
 	defer os.RemoveAll(dir)
 
+	dir, err = filepath.Abs(dir)
+	require.NoError(t, err)
+
 	var wg sync.WaitGroup
 	server := newFakeM3Server(t, &wg, true, Compact)
 	go server.Serve()
@@ -86,7 +88,7 @@ func testProcessFlushOnExit(t *testing.T, i int) {
 	mainFile := path.Join(dir, "main.go")
 	mainFileContents := fmt.Sprintf(mainFileFmt, server.Addr)
 
-	fileErr := ioutil.WriteFile(mainFile, []byte(mainFileContents), 0666)
+	fileErr := ioutil.WriteFile(mainFile, []byte(mainFileContents), 0o666)
 	require.NoError(t, fileErr)
 
 	binary := path.Join(dir, "m3testemit")

diff --git a/m3/reporter_test.go b/m3/reporter_test.go
@@ -32,11 +32,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/uber-go/tally"
-	customtransport "github.com/uber-go/tally/m3/customtransports"
-	m3thrift "github.com/uber-go/tally/m3/thrift/v2"
-	"github.com/uber-go/tally/m3/thriftudp"
-	"github.com/uber-go/tally/thirdparty/github.com/apache/thrift/lib/go/thrift"
+	tally "github.com/uber-go/tally/v4"
+	customtransport "github.com/uber-go/tally/v4/m3/customtransports"
+	m3thrift "github.com/uber-go/tally/v4/m3/thrift/v2"
+	"github.com/uber-go/tally/v4/m3/thriftudp"
+	"github.com/uber-go/tally/v4/thirdparty/github.com/apache/thrift/lib/go/thrift"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -49,8 +49,10 @@ const (
 	shortInterval = 10 * time.Millisecond
 )
 
-var localListenAddr = &net.UDPAddr{IP: net.IPv4(127, 0, 0, 1)}
-var defaultCommonTags = map[string]string{"env": "test", "host": "test"}
+var (
+	localListenAddr   = &net.UDPAddr{IP: net.IPv4(127, 0, 0, 1)}
+	defaultCommonTags = map[string]string{"env": "test", "host": "test"}
+)
 
 var protocols = []Protocol{Compact, Binary}
 

diff --git a/m3/resource_pool.go b/m3/resource_pool.go
@@ -21,10 +21,10 @@
 package m3
 
 import (
-	"github.com/uber-go/tally"
-	customtransport "github.com/uber-go/tally/m3/customtransports"
-	m3thrift "github.com/uber-go/tally/m3/thrift/v2"
-	"github.com/uber-go/tally/thirdparty/github.com/apache/thrift/lib/go/thrift"
+	tally "github.com/uber-go/tally/v4"
+	customtransport "github.com/uber-go/tally/v4/m3/customtransports"
+	m3thrift "github.com/uber-go/tally/v4/m3/thrift/v2"
+	"github.com/uber-go/tally/v4/thirdparty/github.com/apache/thrift/lib/go/thrift"
 )
 
 const (

diff --git a/m3/resource_pool_test.go b/m3/resource_pool_test.go
@@ -23,10 +23,9 @@ package m3
 import (
 	"testing"
 
-	m3thrift "github.com/uber-go/tally/m3/thrift/v2"
-	"github.com/uber-go/tally/thirdparty/github.com/apache/thrift/lib/go/thrift"
-
 	"github.com/stretchr/testify/require"
+	m3thrift "github.com/uber-go/tally/v4/m3/thrift/v2"
+	"github.com/uber-go/tally/v4/thirdparty/github.com/apache/thrift/lib/go/thrift"
 )
 
 func TestM3ResourcePoolMetric(t *testing.T) {

diff --git a/m3/sanitize.go b/m3/sanitize.go
@@ -21,24 +21,22 @@
 package m3
 
 import (
-	"github.com/uber-go/tally"
+	tally "github.com/uber-go/tally/v4"
 )
 
-var (
-	// DefaultSanitizerOpts are the options for the default M3 sanitizer.
-	DefaultSanitizerOpts = tally.SanitizeOptions{
-		NameCharacters: tally.ValidCharacters{
-			Ranges:     tally.AlphanumericRange,
-			Characters: tally.UnderscoreDashDotCharacters,
-		},
-		KeyCharacters: tally.ValidCharacters{
-			Ranges:     tally.AlphanumericRange,
-			Characters: tally.UnderscoreDashCharacters,
-		},
-		ValueCharacters: tally.ValidCharacters{
-			Ranges:     tally.AlphanumericRange,
-			Characters: tally.UnderscoreDashDotCharacters,
-		},
-		ReplacementCharacter: tally.DefaultReplacementCharacter,
-	}
-)
+// DefaultSanitizerOpts are the options for the default M3 sanitizer.
+var DefaultSanitizerOpts = tally.SanitizeOptions{
+	NameCharacters: tally.ValidCharacters{
+		Ranges:     tally.AlphanumericRange,
+		Characters: tally.UnderscoreDashDotCharacters,
+	},
+	KeyCharacters: tally.ValidCharacters{
+		Ranges:     tally.AlphanumericRange,
+		Characters: tally.UnderscoreDashCharacters,
+	},
+	ValueCharacters: tally.ValidCharacters{
+		Ranges:     tally.AlphanumericRange,
+		Characters: tally.UnderscoreDashDotCharacters,
+	},
+	ReplacementCharacter: tally.DefaultReplacementCharacter,
+}
diff --git a/m3/scope_test.go b/m3/scope_test.go
@@ -25,9 +25,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/uber-go/tally"
-
 	"github.com/stretchr/testify/require"
+	tally "github.com/uber-go/tally/v4"
 )
 
 var commonTags = map[string]string{"env": "test"}

diff --git a/m3/thrift/Makefile b/m3/thrift/Makefile
@@ -1,7 +1,7 @@
-# thrift_version := v1.0.0
-
 gen-thrift:
-	@thrift --gen go:thrift_import="github.com/uber-go/tally/thirdparty/github.com/apache/thrift/lib/go/thrift" -out . v1/v1.thrift && rm -rf v1/m3-remote
+	@thrift --gen go:thrift_import="github.com/uber-go/tally/v4/thirdparty/github.com/apache/thrift/lib/go/thrift" -out . v1/v1.thrift && rm -rf v1/m3-remote
 	@echo Generated v1 Go Thrift in metrics/m3/thrift/v1.
-	@thrift --gen go:thrift_import="github.com/uber-go/tally/thirdparty/github.com/apache/thrift/lib/go/thrift" -out . v2/v2.thrift && rm -rf v2/m3-remote
+	@thrift --gen go:thrift_import="github.com/uber-go/tally/v4/thirdparty/github.com/apache/thrift/lib/go/thrift" -out . v2/v2.thrift && rm -rf v2/m3-remote
 	@echo Generated v2 Go Thrift in metrics/m3/thrift/v2.
+	@git apply thrift.diff
+	@echo Applied thrift.diff.
diff --git a/m3/thrift/v1/constants.go b/m3/thrift/v1/constants.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,7 @@ import ( @@
     	"fmt"
     	"time"
-    	"github.com/uber-go/tally"
+    	tally "github.com/uber-go/tally/v4"
     )
     type printStatsReporter struct{}
@@ Expand Down @@