Add script that auto orders imports (#676)

* Add script to auto order imports Signed-off-by: Won Jun Jang <wjang@uber.com>
jaegertracing · Feb 4, 2018 · fcbd210 · fcbd210
1 parent 2fb6fa5
commit fcbd210
Show file tree

Hide file tree

Showing 32 changed files with 143 additions and 46 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@
 *.xml
 *.swp
 fmt.log
+import.log
 lint.log
 cover.html
 .envrc

diff --git a/Makefile b/Makefile
@@ -18,6 +18,7 @@ GOVET=go vet
 GOFMT=gofmt
 FMT_LOG=fmt.log
 LINT_LOG=lint.log
+IMPORT_LOG=import.log
 
 GIT_SHA=$(shell git rev-parse HEAD)
 GIT_CLOSEST_TAG=$(shell git describe --abbrev=0 --tags)
@@ -98,6 +99,7 @@ nocover:
 
 .PHONY: fmt
 fmt:
+	./scripts/import-order-cleanup.sh inplace
 	$(GOFMT) -e -s -l -w $(ALL_SRC)
 	./scripts/updateLicenses.sh
 
@@ -109,7 +111,8 @@ lint:
 	@[ ! -s "$(LINT_LOG)" ] || (echo "Lint Failures" | cat - $(LINT_LOG) && false)
 	@$(GOFMT) -e -s -l $(ALL_SRC) > $(FMT_LOG)
 	@./scripts/updateLicenses.sh >> $(FMT_LOG)
-	@[ ! -s "$(FMT_LOG)" ] || (echo "Go fmt or license check failures, run 'make fmt'" | cat - $(FMT_LOG) && false)
+	@./scripts/import-order-cleanup.sh stdout > $(IMPORT_LOG)
+	@[ ! -s "$(FMT_LOG)" -a ! -s "$(IMPORT_LOG)" ] || (echo "Go fmt, license check, or import ordering failures, run 'make fmt'" | cat - $(FMT_LOG) && false)
 
 .PHONY: install-glide
 install-glide:

diff --git a/cmd/agent/app/reporter/reporter_test.go b/cmd/agent/app/reporter/reporter_test.go
@@ -19,11 +19,11 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/jaegertracing/jaeger/thrift-gen/jaeger"
-	"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
 	"github.com/stretchr/testify/assert"
 
 	"github.com/jaegertracing/jaeger/cmd/agent/app/testutils"
+	"github.com/jaegertracing/jaeger/thrift-gen/jaeger"
+	"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
 )
 
 func TestMultiReporter(t *testing.T) {

diff --git a/cmd/agent/app/servers/tbuffered_server_test.go b/cmd/agent/app/servers/tbuffered_server_test.go
@@ -24,12 +24,11 @@ import (
 	"github.com/uber/jaeger-lib/metrics"
 	mTestutils "github.com/uber/jaeger-lib/metrics/testutils"
 
-	"github.com/jaegertracing/jaeger/thrift-gen/agent"
-	"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
-
 	"github.com/jaegertracing/jaeger/cmd/agent/app/customtransports"
 	"github.com/jaegertracing/jaeger/cmd/agent/app/servers/thriftudp"
 	"github.com/jaegertracing/jaeger/cmd/agent/app/testutils"
+	"github.com/jaegertracing/jaeger/thrift-gen/agent"
+	"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
 )
 
 func TestTBufferedServer(t *testing.T) {

diff --git a/cmd/builder/builder_options_test.go b/cmd/builder/builder_options_test.go
@@ -18,9 +18,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"go.uber.org/zap"
-
 	"github.com/uber/jaeger-lib/metrics"
+	"go.uber.org/zap"
 )
 
 func TestApplyOptions(t *testing.T) {

diff --git a/cmd/collector/app/metrics.go b/cmd/collector/app/metrics.go
@@ -17,8 +17,9 @@ package app
 import (
 	"sync"
 
-	"github.com/jaegertracing/jaeger/model"
 	"github.com/uber/jaeger-lib/metrics"
+
+	"github.com/jaegertracing/jaeger/model"
 )
 
 const (

diff --git a/cmd/collector/app/metrics_test.go b/cmd/collector/app/metrics_test.go
@@ -19,9 +19,9 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
+	jaegerM "github.com/uber/jaeger-lib/metrics"
 
 	"github.com/jaegertracing/jaeger/model"
-	jaegerM "github.com/uber/jaeger-lib/metrics"
 )
 
 func TestProcessorMetrics(t *testing.T) {

diff --git a/cmd/collector/app/options.go b/cmd/collector/app/options.go
@@ -15,12 +15,11 @@
 package app
 
 import (
-	"go.uber.org/zap"
-
-	"github.com/jaegertracing/jaeger/model"
 	"github.com/uber/jaeger-lib/metrics"
+	"go.uber.org/zap"
 
 	"github.com/jaegertracing/jaeger/cmd/collector/app/sanitizer"
+	"github.com/jaegertracing/jaeger/model"
 )
 
 const (

diff --git a/cmd/collector/app/options_test.go b/cmd/collector/app/options_test.go
@@ -18,10 +18,10 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/uber/jaeger-lib/metrics"
 	"go.uber.org/zap"
 
 	"github.com/jaegertracing/jaeger/model"
-	"github.com/uber/jaeger-lib/metrics"
 )
 
 func TestAllOptionSet(t *testing.T) {

diff --git a/cmd/collector/app/sanitizer/service_name_sanitizer_test.go b/cmd/collector/app/sanitizer/service_name_sanitizer_test.go
@@ -17,8 +17,9 @@ package sanitizer
 import (
 	"testing"
 
-	"github.com/jaegertracing/jaeger/model"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/jaegertracing/jaeger/model"
 )
 
 var (

diff --git a/cmd/collector/app/sanitizer/utf8_sanitizer.go b/cmd/collector/app/sanitizer/utf8_sanitizer.go
@@ -18,9 +18,10 @@ import (
 	"fmt"
 	"unicode/utf8"
 
-	"github.com/jaegertracing/jaeger/model"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
+
+	"github.com/jaegertracing/jaeger/model"
 )
 
 const (

diff --git a/cmd/collector/app/sanitizer/utf8_sanitizer_test.go b/cmd/collector/app/sanitizer/utf8_sanitizer_test.go
@@ -18,9 +18,10 @@ import (
 	"encoding/hex"
 	"testing"
 
-	"github.com/jaegertracing/jaeger/model"
 	"github.com/stretchr/testify/assert"
 	"go.uber.org/zap"
+
+	"github.com/jaegertracing/jaeger/model"
 )
 
 func invalidUTF8() string {

diff --git a/cmd/collector/app/span_processor.go b/cmd/collector/app/span_processor.go
@@ -20,11 +20,10 @@ import (
 	"github.com/uber/tchannel-go"
 	"go.uber.org/zap"
 
-	"github.com/jaegertracing/jaeger/model"
-	"github.com/jaegertracing/jaeger/storage/spanstore"
-
 	"github.com/jaegertracing/jaeger/cmd/collector/app/sanitizer"
+	"github.com/jaegertracing/jaeger/model"
 	"github.com/jaegertracing/jaeger/pkg/queue"
+	"github.com/jaegertracing/jaeger/storage/spanstore"
 )
 
 type spanProcessor struct {

diff --git a/cmd/collector/app/zipkin/json_test.go b/cmd/collector/app/zipkin/json_test.go
@@ -20,9 +20,10 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
 )
 
 var endpointFmt = `{"serviceName": "%s", "ipv4": "%s", "ipv6": "%s", "port": %d}`

diff --git a/cmd/query/app/handler_test.go b/cmd/query/app/handler_test.go
@@ -30,6 +30,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
+	jaeger "github.com/uber/jaeger-client-go"
 	"go.uber.org/zap"
 
 	"github.com/jaegertracing/jaeger/model"
@@ -38,7 +39,6 @@ import (
 	depsmocks "github.com/jaegertracing/jaeger/storage/dependencystore/mocks"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 	spanstoremocks "github.com/jaegertracing/jaeger/storage/spanstore/mocks"
-	jaeger "github.com/uber/jaeger-client-go"
 )
 
 const millisToNanosMultiplier = int64(time.Millisecond / time.Nanosecond)

diff --git a/examples/hotrod/services/customer/database.go b/examples/hotrod/services/customer/database.go
@@ -19,7 +19,6 @@ import (
 	"errors"
 
 	"go.uber.org/zap"
-
 	"github.com/opentracing/opentracing-go"
 	tags "github.com/opentracing/opentracing-go/ext"
 

diff --git a/model/converter/json/process_hashtable_test.go b/model/converter/json/process_hashtable_test.go
@@ -17,8 +17,9 @@ package json
 import (
 	"testing"
 
-	"github.com/jaegertracing/jaeger/model"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/jaegertracing/jaeger/model"
 )
 
 func TestProcessHashtable(t *testing.T) {

diff --git a/model/converter/json/to_domain.go b/model/converter/json/to_domain.go
@@ -19,9 +19,10 @@ import (
 	"fmt"
 	"strconv"
 
+	"github.com/pkg/errors"
+
 	"github.com/jaegertracing/jaeger/model"
 	"github.com/jaegertracing/jaeger/model/json"
-	"github.com/pkg/errors"
 )
 
 // SpanToDomain converts json.Span with embedded Process into model.Span format.

diff --git a/model/converter/thrift/zipkin/to_domain_test.go b/model/converter/thrift/zipkin/to_domain_test.go
@@ -25,13 +25,13 @@ import (
 	"time"
 
 	"github.com/kr/pretty"
+	"github.com/opentracing/opentracing-go"
+	"github.com/opentracing/opentracing-go/ext"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/jaegertracing/jaeger/model"
 	z "github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
-	"github.com/opentracing/opentracing-go"
-	"github.com/opentracing/opentracing-go/ext"
 )
 
 const NumberOfFixtures = 3

diff --git a/model/hash_test.go b/model/hash_test.go
@@ -20,8 +20,9 @@ import (
 	"io"
 	"testing"
 
-	"github.com/jaegertracing/jaeger/model"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/jaegertracing/jaeger/model"
 )
 
 type mockHashWwiterAnswer struct {

diff --git a/model/keyvalue_test.go b/model/keyvalue_test.go
@@ -15,12 +15,11 @@
 package model_test
 
 import (
+	"encoding/json"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 
-	"encoding/json"
-
 	"github.com/jaegertracing/jaeger/model"
 )
 

diff --git a/model/process_test.go b/model/process_test.go
@@ -15,16 +15,15 @@
 package model_test
 
 import (
+	"errors"
 	"hash/fnv"
 	"io"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-
-	"errors"
+	"github.com/stretchr/testify/require"
 
 	"github.com/jaegertracing/jaeger/model"
-	"github.com/stretchr/testify/require"
 )
 
 func TestProcessEqual(t *testing.T) {

diff --git a/model/span.go b/model/span.go
@@ -15,13 +15,12 @@
 package model
 
 import (
+	"encoding/gob"
 	"fmt"
 	"io"
 	"strconv"
 	"time"
 
-	"encoding/gob"
-
 	"github.com/opentracing/opentracing-go/ext"
 )
 

diff --git a/model/span_test.go b/model/span_test.go
@@ -15,17 +15,16 @@
 package model_test
 
 import (
+	"bytes"
 	"encoding/json"
 	"testing"
 	"time"
 
 	"github.com/opentracing/opentracing-go/ext"
 	"github.com/stretchr/testify/assert"
-
-	"bytes"
+	"github.com/stretchr/testify/require"
 
 	"github.com/jaegertracing/jaeger/model"
-	"github.com/stretchr/testify/require"
 )
 
 type TraceIDContainer struct {

diff --git a/pkg/cassandra/metrics/table_test.go b/pkg/cassandra/metrics/table_test.go
@@ -19,9 +19,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jaegertracing/jaeger/pkg/testutils"
 	"github.com/stretchr/testify/assert"
 	"github.com/uber/jaeger-lib/metrics"
+
+	"github.com/jaegertracing/jaeger/pkg/testutils"
 )
 
 func TestTableEmit(t *testing.T) {

diff --git a/pkg/discovery/notifier_test.go b/pkg/discovery/notifier_test.go
@@ -15,9 +15,8 @@
 package discovery
 
 import (
-	"testing"
-
 	"sync"
+	"testing"
 
 	"github.com/stretchr/testify/assert"
 )

diff --git a/pkg/healthcheck/internal_test.go b/pkg/healthcheck/internal_test.go
@@ -21,9 +21,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jaegertracing/jaeger/pkg/testutils"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/jaegertracing/jaeger/pkg/testutils"
 )
 
 func TestHttpCall(t *testing.T) {

diff --git a/pkg/queue/bounded_queue_test.go b/pkg/queue/bounded_queue_test.go
@@ -15,13 +15,12 @@
 package queue
 
 import (
+	"reflect"
 	"sync"
 	"sync/atomic"
 	"testing"
 	"time"
 
-	"reflect"
-
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/uber/jaeger-lib/metrics"

diff --git a/plugin/storage/cassandra/factory_test.go b/plugin/storage/cassandra/factory_test.go
@@ -25,7 +25,6 @@ import (
 	"github.com/jaegertracing/jaeger/pkg/cassandra"
 	"github.com/jaegertracing/jaeger/pkg/cassandra/mocks"
 	"github.com/jaegertracing/jaeger/pkg/config"
-
 	"github.com/jaegertracing/jaeger/storage"
 )
 

diff --git a/plugin/storage/es/spanstore/reader_test.go b/plugin/storage/es/spanstore/reader_test.go
@@ -23,6 +23,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
+	"github.com/uber/jaeger-lib/metrics"
 	"go.uber.org/zap"
 	"gopkg.in/olivere/elastic.v5"
 
@@ -31,7 +32,6 @@ import (
 	"github.com/jaegertracing/jaeger/pkg/es/mocks"
 	"github.com/jaegertracing/jaeger/pkg/testutils"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
-	"github.com/uber/jaeger-lib/metrics"
 )
 
 var exampleESSpan = []byte(
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ @@
     *.xml
     *.swp
     fmt.log
+    import.log
     lint.log
     cover.html
     .envrc
@@ Expand Down @@