replace gofmt with goimports (#1197)

* replace gofmt with goimports - also fixed errors found by goimports. * fix travis build.
census-instrumentation · Feb 7, 2020 · a7631f6 · a7631f6
1 parent d835ff8
commit a7631f6
Show file tree

Hide file tree

Showing 16 changed files with 53 additions and 48 deletions.
diff --git a/Makefile b/Makefile
@@ -8,7 +8,7 @@ ALL_PKGS := $(shell go list $(sort $(dir $(ALL_SRC))))
 GOTEST_OPT?=-v -race -timeout 30s
 GOTEST_OPT_WITH_COVERAGE = $(GOTEST_OPT) -coverprofile=coverage.txt -covermode=atomic
 GOTEST=go test
-GOFMT=gofmt
+GOIMPORTS=goimports
 GOLINT=golint
 GOVET=go vet
 EMBEDMD=embedmd
@@ -17,14 +17,14 @@ TRACE_ID_LINT_EXCEPTION="type name will be used as trace.TraceID by other packag
 TRACE_OPTION_LINT_EXCEPTION="type name will be used as trace.TraceOptions by other packages"
 README_FILES := $(shell find . -name '*README.md' | sort | tr '\n' ' ')
 
-.DEFAULT_GOAL := fmt-lint-vet-embedmd-test
+.DEFAULT_GOAL := imports-lint-vet-embedmd-test
 
-.PHONY: fmt-lint-vet-embedmd-test
-fmt-lint-vet-embedmd-test: fmt lint vet embedmd test
+.PHONY: imports-lint-vet-embedmd-test
+imports-lint-vet-embedmd-test: imports lint vet embedmd test
 
 # TODO enable test-with-coverage in tavis
 .PHONY: travis-ci
-travis-ci: fmt lint vet embedmd test test-386
+travis-ci: imports lint vet embedmd test test-386
 
 all-pkgs:
 	@echo $(ALL_PKGS) | tr ' ' '\n' | sort
@@ -44,15 +44,15 @@ test-386:
 test-with-coverage:
 	$(GOTEST) $(GOTEST_OPT_WITH_COVERAGE) $(ALL_PKGS)
 
-.PHONY: fmt
-fmt:
-	@FMTOUT=`$(GOFMT) -s -l $(ALL_SRC) 2>&1`; \
-	if [ "$$FMTOUT" ]; then \
-		echo "$(GOFMT) FAILED => gofmt the following files:\n"; \
-		echo "$$FMTOUT\n"; \
+.PHONY: imports
+imports:
+	@IMPORTSOUT=`$(GOIMPORTS) -l $(ALL_SRC) 2>&1`; \
+	if [ "$$IMPORTSOUT" ]; then \
+		echo "$(GOIMPORTS) FAILED => goimports the following files:\n"; \
+		echo "$$IMPORTSOUT\n"; \
 		exit 1; \
 	else \
-	    echo "Fmt finished successfully"; \
+	    echo "Imports finished successfully"; \
 	fi
 
 .PHONY: lint
@@ -91,6 +91,7 @@ embedmd:
 
 .PHONY: install-tools
 install-tools:
-	go get -u golang.org/x/tools/cmd/cover
 	go get -u golang.org/x/lint/golint
+	go get -u golang.org/x/tools/cmd/cover
+	go get -u golang.org/x/tools/cmd/goimports
 	go get -u github.com/rakyll/embedmd
diff --git a/examples/grpc/helloworld_client/main.go b/examples/grpc/helloworld_client/main.go
@@ -15,11 +15,11 @@
 package main
 
 import (
+	"context"
 	"log"
 	"os"
 	"time"
 
-	"context"
 	"go.opencensus.io/examples/exporter"
 	pb "go.opencensus.io/examples/grpc/proto"
 	"go.opencensus.io/plugin/ocgrpc"

diff --git a/examples/grpc/helloworld_server/main.go b/examples/grpc/helloworld_server/main.go
@@ -17,13 +17,13 @@
 package main
 
 import (
+	"context"
 	"log"
 	"math/rand"
 	"net"
 	"net/http"
 	"time"
 
-	"context"
 	"go.opencensus.io/examples/exporter"
 	pb "go.opencensus.io/examples/grpc/proto"
 	"go.opencensus.io/plugin/ocgrpc"

diff --git a/examples/grpc/proto/helloworld.pb.go b/examples/grpc/proto/helloworld.pb.go
diff --git a/internal/testpb/test.pb.go b/internal/testpb/test.pb.go
diff --git a/plugin/ocgrpc/client.go b/plugin/ocgrpc/client.go
@@ -16,8 +16,8 @@ package ocgrpc
 
 import (
 	"context"
-	"go.opencensus.io/trace"
 
+	"go.opencensus.io/trace"
 	"google.golang.org/grpc/stats"
 )
 

diff --git a/plugin/ocgrpc/grpc_test.go b/plugin/ocgrpc/grpc_test.go
@@ -15,17 +15,16 @@
 package ocgrpc
 
 import (
+	"context"
 	"sync"
 	"testing"
 	"time"
 
-	"context"
-	"go.opencensus.io/stats/view"
 	"google.golang.org/grpc/metadata"
+	"google.golang.org/grpc/stats"
 
+	"go.opencensus.io/stats/view"
 	"go.opencensus.io/trace"
-
-	"google.golang.org/grpc/stats"
 )
 
 func TestClientHandler(t *testing.T) {

diff --git a/plugin/ocgrpc/server.go b/plugin/ocgrpc/server.go
@@ -16,9 +16,10 @@ package ocgrpc
 
 import (
 	"context"
-	"go.opencensus.io/trace"
 
 	"google.golang.org/grpc/stats"
+
+	"go.opencensus.io/trace"
 )
 
 // ServerHandler implements gRPC stats.Handler recording OpenCensus stats and

diff --git a/plugin/ocgrpc/server_stats_handler_test.go b/plugin/ocgrpc/server_stats_handler_test.go
@@ -16,19 +16,18 @@
 package ocgrpc
 
 import (
+	"context"
 	"reflect"
 	"testing"
 
-	"context"
-	"go.opencensus.io/trace"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/stats"
+	"google.golang.org/grpc/status"
 
 	"go.opencensus.io/metric/metricdata"
 	"go.opencensus.io/stats/view"
 	"go.opencensus.io/tag"
-
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/stats"
-	"google.golang.org/grpc/status"
+	"go.opencensus.io/trace"
 )
 
 func TestServerDefaultCollections(t *testing.T) {

diff --git a/plugin/ocgrpc/trace_common.go b/plugin/ocgrpc/trace_common.go
@@ -15,16 +15,16 @@
 package ocgrpc
 
 import (
+	"context"
 	"strings"
 
 	"google.golang.org/grpc/codes"
-
-	"context"
-	"go.opencensus.io/trace"
-	"go.opencensus.io/trace/propagation"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/stats"
 	"google.golang.org/grpc/status"
+
+	"go.opencensus.io/trace"
+	"go.opencensus.io/trace/propagation"
 )
 
 const traceContextKey = "grpc-trace-bin"

diff --git a/plugin/ocgrpc/trace_common_test.go b/plugin/ocgrpc/trace_common_test.go
@@ -15,12 +15,13 @@
 package ocgrpc
 
 import (
+	"context"
 	"testing"
 
-	"context"
-	"go.opencensus.io/trace"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/stats"
+
+	"go.opencensus.io/trace"
 )
 
 func TestClientHandler_traceTagRPC(t *testing.T) {

diff --git a/plugin/ocgrpc/trace_test.go b/plugin/ocgrpc/trace_test.go
@@ -15,11 +15,11 @@
 package ocgrpc_test
 
 import (
+	"context"
 	"io"
 	"testing"
 	"time"
 
-	"context"
 	"go.opencensus.io/internal/testpb"
 	"go.opencensus.io/trace"
 )

diff --git a/plugin/runmetrics/example_test.go b/plugin/runmetrics/example_test.go
@@ -3,11 +3,12 @@ package runmetrics_test
 import (
 	"context"
 	"fmt"
+	"log"
+	"sort"
+
 	"go.opencensus.io/metric/metricdata"
 	"go.opencensus.io/metric/metricexport"
 	"go.opencensus.io/plugin/runmetrics"
-	"log"
-	"sort"
 )
 
 type printExporter struct {

diff --git a/plugin/runmetrics/producer.go b/plugin/runmetrics/producer.go
@@ -2,11 +2,12 @@ package runmetrics
 
 import (
 	"errors"
+	"runtime"
+	"sync"
+
 	"go.opencensus.io/metric"
 	"go.opencensus.io/metric/metricdata"
 	"go.opencensus.io/metric/metricproducer"
-	"runtime"
-	"sync"
 )
 
 type (

diff --git a/plugin/runmetrics/producer_test.go b/plugin/runmetrics/producer_test.go
@@ -2,12 +2,14 @@ package runmetrics_test
 
 import (
 	"context"
+	"testing"
+
 	"github.com/stretchr/testify/assert"
+
 	"go.opencensus.io/metric/metricdata"
 	"go.opencensus.io/metric/metricexport"
 	"go.opencensus.io/metric/metricproducer"
 	"go.opencensus.io/plugin/runmetrics"
-	"testing"
 )
 
 type testExporter struct {

diff --git a/trace/examples_test.go b/trace/examples_test.go
@@ -15,9 +15,9 @@
 package trace_test
 
 import (
+	"context"
 	"fmt"
 
-	"context"
 	"go.opencensus.io/trace"
 )