Add static check and fix all errors (#218)

* Add static check

Fixes #155.

* Fix most staticcheck errors

* More fixes

* Fix id_batcher

Author: songy23

Makefile

@@ -23,6 +23,7 @@ GOOS=$(shell go env GOOS)
 ADDLICENCESE= addlicense
 MISSPELL=misspell -error
 MISSPELL_CORRECTION=misspell -w
+STATICCHECK=staticcheck
 
 GIT_SHA=$(shell git rev-parse --short HEAD)
 BUILD_INFO_IMPORT_PATH=github.com/open-telemetry/opentelemetry-service/internal/version
@@ -38,10 +39,10 @@ all-pkgs:
 all-srcs:
 	@echo $(ALL_SRC) | tr ' ' '\n' | sort
 
-.DEFAULT_GOAL := addlicense-fmt-vet-lint-goimports-misspell-test
+.DEFAULT_GOAL := addlicense-fmt-vet-lint-goimports-misspell-staticcheck-test
 
-.PHONY: addlicense-fmt-vet-lint-goimports-misspell-test
-addlicense-fmt-vet-lint-goimports-misspell-test: addlicense fmt vet lint goimports misspell test
+.PHONY: addlicense-fmt-vet-lint-goimports-misspell-staticcheck-test
+addlicense-fmt-vet-lint-goimports-misspell-staticcheck-test: addlicense fmt vet lint goimports misspell staticcheck test
 
 .PHONY: e2e-test
 e2e-test: otelsvc
@@ -52,7 +53,7 @@ test:
 	$(GOTEST) $(GOTEST_OPT) $(ALL_PKGS)
 
 .PHONY: travis-ci
-travis-ci: fmt vet lint goimports misspell test-with-cover otelsvc
+travis-ci: fmt vet lint goimports misspell staticcheck test-with-cover otelsvc
 	$(MAKE) -C testbed install-tools
 	$(MAKE) -C testbed runtests
 
@@ -117,6 +118,10 @@ misspell:
 misspell-correction:
 	$(MISSPELL_CORRECTION) $(ALL_SRC_AND_DOC)
 
+.PHONY: staticcheck
+staticcheck:
+	$(STATICCHECK) ./...
+
 .PHONY: vet
 vet:
 	@$(GOVET) ./...
@@ -128,7 +133,8 @@ install-tools:
 	  github.com/google/addlicense \
 	  golang.org/x/lint/golint \
 	  golang.org/x/tools/cmd/goimports \
-	  github.com/client9/misspell/cmd/misspell
+	  github.com/client9/misspell/cmd/misspell \
+	  honnef.co/go/tools/cmd/staticcheck
 
 .PHONY: otelsvc
 otelsvc:

config/config.go

@@ -191,7 +191,7 @@ func loadReceivers(v *viper.Viper, factories map[string]receiver.Factory) (confi
 	enabledReceiver := false
 
 	// Prepare resulting map
-	receivers := make(configmodels.Receivers, 0)
+	receivers := make(configmodels.Receivers)
 
 	// Iterate over input map and create a config for each.
 	for key := range keyMap {
@@ -271,7 +271,7 @@ func loadExporters(v *viper.Viper, factories map[string]exporter.Factory) (confi
 	keyMap := v.GetStringMap(exportersKeyName)
 
 	// Prepare resulting map
-	exporters := make(configmodels.Exporters, 0)
+	exporters := make(configmodels.Exporters)
 
 	// Iterate over exporters and create a config for each.
 	for key := range keyMap {
@@ -328,7 +328,7 @@ func loadProcessors(v *viper.Viper, factories map[string]processor.Factory) (con
 	keyMap := v.GetStringMap(processorsKeyName)
 
 	// Prepare resulting map.
-	processors := make(configmodels.Processors, 0)
+	processors := make(configmodels.Processors)
 
 	// Iterate over processors and create a config for each.
 	for key := range keyMap {
@@ -385,7 +385,7 @@ func loadPipelines(v *viper.Viper) (configmodels.Pipelines, error) {
 	keyMap := v.GetStringMap(pipelinesKeyName)
 
 	// Prepare resulting map.
-	pipelines := make(configmodels.Pipelines, 0)
+	pipelines := make(configmodels.Pipelines)
 
 	// Iterate over input map and create a config for each.
 	for key := range keyMap {

exporter/exporterhelper/metricshelper_test.go

@@ -94,7 +94,7 @@ func newPushMetricsData(droppedSpans int, retError error) PushMetricsData {
 }
 
 func generateMetricsTraffic(t *testing.T, te exporter.MetricsExporter, numRequests int, wantError error) {
-	td := consumerdata.MetricsData{Metrics: make([]*metricspb.Metric, 1, 1)}
+	td := consumerdata.MetricsData{Metrics: make([]*metricspb.Metric, 1)}
 	ctx, span := trace.StartSpan(context.Background(), fakeParentSpanName, trace.WithSampler(trace.AlwaysSample()))
 	defer span.End()
 	for i := 0; i < numRequests; i++ {

exporter/exporterhelper/tracehelper_test.go

@@ -132,7 +132,7 @@ func checkRecordedMetricsForTraceExporter(t *testing.T, te exporter.TraceExporte
 	doneFn := observabilitytest.SetupRecordedMetricsTest()
 	defer doneFn()
 
-	spans := make([]*tracepb.Span, 2, 2)
+	spans := make([]*tracepb.Span, 2)
 	td := consumerdata.TraceData{Spans: spans}
 	ctx := observability.ContextWithReceiverName(context.Background(), fakeReceiverName)
 	const numBatches = 7
@@ -151,7 +151,7 @@ func checkRecordedMetricsForTraceExporter(t *testing.T, te exporter.TraceExporte
 }
 
 func generateTraceTraffic(t *testing.T, te exporter.TraceExporter, numRequests int, wantError error) {
-	td := consumerdata.TraceData{Spans: make([]*tracepb.Span, 1, 1)}
+	td := consumerdata.TraceData{Spans: make([]*tracepb.Span, 1)}
 	ctx, span := trace.StartSpan(context.Background(), fakeParentSpanName, trace.WithSampler(trace.AlwaysSample()))
 	defer span.End()
 	for i := 0; i < numRequests; i++ {

exporter/exportertest/nop_exporter_test.go

@@ -31,7 +31,7 @@ func TestNopTraceExporter_NoErrors(t *testing.T) {
 	if err := nte.ConsumeTraceData(context.Background(), td); err != nil {
 		t.Fatalf("Wanted nil got error")
 	}
-	if "nop_trace" != nte.TraceExportFormat() {
+	if nte.TraceExportFormat() != "nop_trace" {
 		t.Fatalf("Wanted nop_trace got %s", nte.TraceExportFormat())
 	}
 }
@@ -45,7 +45,7 @@ func TestNopTraceExporter_WithErrors(t *testing.T) {
 	if got := nte.ConsumeTraceData(context.Background(), td); got != want {
 		t.Fatalf("Want %v Got %v", want, got)
 	}
-	if "nop_trace" != nte.TraceExportFormat() {
+	if nte.TraceExportFormat() != "nop_trace" {
 		t.Fatalf("Wanted nop_trace got %s", nte.TraceExportFormat())
 	}
 }
@@ -58,7 +58,7 @@ func TestNopMetricsExporter_NoErrors(t *testing.T) {
 	if err := nme.ConsumeMetricsData(context.Background(), md); err != nil {
 		t.Fatalf("Wanted nil got error")
 	}
-	if "nop_metrics" != nme.MetricsExportFormat() {
+	if nme.MetricsExportFormat() != "nop_metrics" {
 		t.Fatalf("Wanted nop_metrics got %s", nme.MetricsExportFormat())
 	}
 }
@@ -72,7 +72,7 @@ func TestNopMetricsExporter_WithErrors(t *testing.T) {
 	if got := nme.ConsumeMetricsData(context.Background(), md); got != want {
 		t.Fatalf("Want %v Got %v", want, got)
 	}
-	if "nop_metrics" != nme.MetricsExportFormat() {
+	if nme.MetricsExportFormat() != "nop_metrics" {
 		t.Fatalf("Wanted nop_metrics got %s", nme.MetricsExportFormat())
 	}
 }

exporter/exportertest/sink_exporter_test.go

@@ -39,7 +39,7 @@ func TestSinkTraceExporter(t *testing.T) {
 	if !reflect.DeepEqual(got, want) {
 		t.Errorf("Mismatches responses\nGot:\n\t%v\nWant:\n\t%v\n", got, want)
 	}
-	if "sink_trace" != sink.TraceExportFormat() {
+	if sink.TraceExportFormat() != "sink_trace" {
 		t.Errorf("Wanted sink_trace got %s", sink.TraceExportFormat())
 	}
 }
@@ -60,7 +60,7 @@ func TestSinkMetricsExporter(t *testing.T) {
 	if !reflect.DeepEqual(got, want) {
 		t.Errorf("Mismatches responses\nGot:\n\t%v\nWant:\n\t%v\n", got, want)
 	}
-	if "sink_metrics" != sink.MetricsExportFormat() {
+	if sink.MetricsExportFormat() != "sink_metrics" {
 		t.Errorf("Wanted sink_metrics got %s", sink.MetricsExportFormat())
 	}
 }

exporter/jaegerexporter/jaeger_thrift_http_sender.go

@@ -111,7 +111,7 @@ func (s *JaegerThriftHTTPSender) ConsumeTraceData(ctx context.Context, td consum
 	io.Copy(ioutil.Discard, resp.Body)
 	resp.Body.Close()
 	if resp.StatusCode >= http.StatusBadRequest {
-		return fmt.Errorf("Jaeger Thirft HTTP sender error: %d", resp.StatusCode)
+		return fmt.Errorf("jaeger Thirft HTTP sender error: %d", resp.StatusCode)
 	}
 	return nil
 }

exporter/loggingexporter/logging_exporter_test.go

@@ -34,7 +34,7 @@ func TestLoggingTraceExporterNoErrors(t *testing.T) {
 	if err := lte.ConsumeTraceData(context.Background(), td); err != nil {
 		t.Fatalf("Wanted nil got %v", err)
 	}
-	if "logging_trace" != lte.TraceExportFormat() {
+	if lte.TraceExportFormat() != "logging_trace" {
 		t.Errorf("Wanted logging_trace got %v", lte.TraceExportFormat())
 	}
 }
@@ -50,7 +50,7 @@ func TestLoggingMetricsExporterNoErrors(t *testing.T) {
 	if err := lme.ConsumeMetricsData(context.Background(), md); err != nil {
 		t.Fatalf("Wanted nil got %v", err)
 	}
-	if "logging_metrics" != lme.MetricsExportFormat() {
+	if lme.MetricsExportFormat() != "logging_metrics" {
 		t.Errorf("Wanted logging_metrics got %v", lme.MetricsExportFormat())
 	}
 }

exporter/opencensusexporter/opencensus.go

@@ -57,7 +57,6 @@ type opencensusConfig struct {
 }
 
 type ocagentExporter struct {
-	counter   uint32
 	exporters chan *ocagent.Exporter
 }
 

exporter/prometheusexporter/factory_test.go

@@ -41,7 +41,6 @@ func TestCreateTraceExporter(t *testing.T) {
 }
 
 func TestCreateMetricsExporter(t *testing.T) {
-	const defaultTestEndPoint = "127.0.0.1:55678"
 	tests := []struct {
 		name     string
 		config   Config