Use ALL_SRC for golint and otherwise clean up code

Signed-off-by: Isaac Hier <ihier@uber.com>

Author: Isaac Hier

Makefile

@@ -1,35 +1,21 @@
 PROJECT_ROOT=github.com/jaegertracing/jaeger
-# TOP_PKGS is used with 'go test'
-TOP_PKGS := $(shell go list ./... | \
-	sed -E "s|${PROJECT_ROOT}/([^/]+)(/.*)?$$|./\1/...|g" | \
-	sort | \
-	uniq | \
-	grep -v \
-		-e github.com/jaegertracing/jaeger \
-		-e ./thrift-gen \
-		-e ./swagger-gen \
-		-e ./proto-gen \
-		-e ./examples \
-		-e ./scripts \
-	)
-
 STORAGE_PKGS = ./plugin/storage/integration/...
 
 # all .go files that are not auto-generated and should be auto-formatted and linted.
-ALL_SRC := $(shell find . -name "*.go" | \
-	grep -v \
-		-e vendor \
-		-e /thrift-gen/ \
-		-e /swagger-gen/ \
-		-e /proto-gen/ \
-		-e /examples/ \
-		-e doc.go \
-		-e model.pb.go \
-		-e model_test.pb.go \
-        -e ".*/\..*" \
-        -e ".*/_.*" \
-        -e ".*/mocks.*" \
-	)
+ALL_SRC := $(shell find . -name '*.go' \
+				   -not -name 'doc.go' \
+				   -not -name '_*' \
+				   -not -name '.*' \
+				   -not -name 'mocks*' \
+				   -not -name '*_test.go' \
+				   -not -name 'model.pb.go' \
+				   -not -name 'model_test.pb.go' \
+				   -not -path './examples/*' \
+				   -not -path './vendor/*' \
+				   -not -path '*/mocks/*' \
+				   -not -path '*/*-gen/*' \
+				   -type f | \
+				sort)
 
 # ALL_PKGS is used with 'go cover'
 ALL_PKGS := $(shell go list $(sort $(dir $(ALL_SRC))))
@@ -95,7 +81,7 @@ clean:
 
 .PHONY: test
 test: go-gen
-	bash -c "set -e; set -o pipefail; $(GOTEST) $(TOP_PKGS) | $(COLORIZE)"
+	bash -c "set -e; set -o pipefail; $(GOTEST) ./... | $(COLORIZE)"
 
 .PHONY: integration-test
 integration-test: go-gen
@@ -115,7 +101,7 @@ all-srcs:
 cover: nocover
 	@echo pre-compiling tests
 	@time go test -i $(ALL_PKGS)
-	@./scripts/cover.sh $(shell go list $(TOP_PKGS))
+	@./scripts/cover.sh $(shell go list ./...)
 	grep -E -v 'model.pb.*.go' cover.out > cover-nogen.out
 	mv cover-nogen.out cover.out
 	go tool cover -html=cover.out -o cover.html
@@ -133,33 +119,20 @@ fmt:
 
 .PHONY: lint-gosec
 lint-gosec:
-	$(GOSEC) $(TOP_PKGS)
+	$(GOSEC) ./...
 
 .PHONY: lint
 lint: lint-gosec
-	$(GOVET) $(TOP_PKGS)
-	$(GOSIMPLE) $(TOP_PKGS)
+	$(GOVET) ./...
+	$(GOSIMPLE) ./...
 	@cat /dev/null > $(LINT_LOG)
-	$(GOLINT) $(TOP_PKGS) | \
-		grep -v \
-			-e pkg/es/wrapper.go \
-			-e /mocks/ \
-			-e thrift-gen \
-			-e thrift-0.9.2 \
-			-e model.pb.go \
-			-e model_test.pb.go \
-			>> $(LINT_LOG) \
-		|| true;
+	$(GOLINT) $(ALL_SRC) >> $(LINT_LOG) || true;
 	@[ ! -s "$(LINT_LOG)" ] || (echo "Lint Failures" | cat - $(LINT_LOG) && false)
 	@$(GOFMT) -e -s -l $(ALL_SRC) > $(FMT_LOG)
 	@./scripts/updateLicenses.sh >> $(FMT_LOG)
 	@./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:
-	@echo "Jaeger has migrated to dep, please run 'make install-dep'" 1>&2
-
 .PHONY: install-dep
 install-dep:
 	@which dep > /dev/null || curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh

examples/hotrod/pkg/log/factory.go

@@ -35,7 +35,7 @@ func NewFactory(logger *zap.Logger) Factory {
 
 // Bg creates a context-unaware logger.
 func (b Factory) Bg() Logger {
-	return logger{logger: b.logger}
+	return logger(b)
 }
 
 // For returns a context-aware Logger. If the context

examples/hotrod/services/customer/database.go

@@ -76,6 +76,7 @@ func (d *database) Get(ctx context.Context, customerID string) (*Customer, error
 		span := d.tracer.StartSpan("SQL SELECT", opentracing.ChildOf(span.Context()))
 		tags.SpanKindRPCClient.Set(span)
 		tags.PeerService.Set(span, "mysql")
+		// #nosec
 		span.SetTag("sql.query", "SELECT * FROM customer WHERE customer_id="+customerID)
 		defer span.Finish()
 		ctx = opentracing.ContextWithSpan(ctx, span)

examples/hotrod/services/driver/redis.go

@@ -60,6 +60,7 @@ func (r *Redis) FindDriverIDs(ctx context.Context, location string) []string {
 
 	drivers := make([]string, 10)
 	for i := range drivers {
+		// #nosec
 		drivers[i] = fmt.Sprintf("T7%05dC", rand.Int()%100000)
 	}
 	r.logger.For(ctx).Info("Found drivers", zap.Strings("drivers", drivers))
@@ -85,6 +86,7 @@ func (r *Redis) GetDriver(ctx context.Context, driverID string) (Driver, error)
 		return Driver{}, err
 	}
 
+	// #nosec
 	return Driver{
 		DriverID: driverID,
 		Location: fmt.Sprintf("%d,%d", rand.Int()%1000, rand.Int()%1000),