Fix most staticcheck errors

Makefile

@@ -42,7 +42,7 @@ all-srcs:
 .DEFAULT_GOAL := addlicense-fmt-vet-lint-goimports-misspell-staticcheck-test
 
 .PHONY: addlicense-fmt-vet-lint-goimports-misspell-staticcheck-test
-addlicense-fmt-vet-lint-goimports-misspell-test: 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

config/config.go

@@ -176,7 +176,7 @@ func loadReceivers(v *viper.Viper, factories map[string]receiver.Factory) (confi
 	keyMap := v.GetStringMap(receiversKeyName)
 
 	// 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 {
@@ -242,7 +242,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 {
@@ -299,7 +299,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 {
@@ -356,7 +356,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

exporter/zipkinexporter/zipkin.go

@@ -107,7 +107,7 @@ func ZipkinExportersFromViper(v *viper.Viper) (tps []consumer.TraceConsumer, mps
 	}
 	zle, err := newZipkinExporter(endpoint, serviceName, localEndpointURI, uploadPeriod)
 	if err != nil {
-		return nil, nil, nil, fmt.Errorf("Cannot configure Zipkin exporter: %v", err)
+		return nil, nil, nil, fmt.Errorf("cannot configure Zipkin exporter: %v", err)
 	}
 	tps = append(tps, zle)
 	doneFns = append(doneFns, zle.stop)

internal/collector/processor/idbatcher/id_batcher.go

@@ -67,7 +67,6 @@ type batcher struct {
 	cbMutex      sync.Mutex
 	currentBatch Batch
 
-	numBatches                uint64
 	newBatchesInitialCapacity uint64
 	stopchan                  chan bool
 	stopped                   bool
@@ -127,8 +126,8 @@ func (b *batcher) CloseCurrentAndTakeFirstBatch() (Batch, bool) {
 			b.batches <- b.currentBatch
 			b.currentBatch = nextBatch
 			b.cbMutex.Unlock()
+			return readBatch, true
 		}
-		return readBatch, true
 	}
 
 	readBatch := b.currentBatch

internal/collector/processor/metrics.go

@@ -55,7 +55,6 @@ func MetricTagKeys(level telemetry.Level) []tag.Key {
 		fallthrough
 	case telemetry.Basic:
 		tagKeys = append(tagKeys, TagExporterNameKey)
-		break
 	default:
 		return nil
 	}

observability/observabilitytest/observabilitytest.go

@@ -90,7 +90,7 @@ func checkValueForView(vName string, wantTags []tag.Tag, value int64) error {
 
 	rows, err := view.RetrieveData(vName)
 	if err != nil {
-		return fmt.Errorf("Error retrieving view data for view Name %s", vName)
+		return fmt.Errorf("error retrieving view data for view Name %s", vName)
 	}
 
 	for _, row := range rows {
@@ -99,13 +99,13 @@ func checkValueForView(vName string, wantTags []tag.Tag, value int64) error {
 		if reflect.DeepEqual(wantTags, row.Tags) {
 			sum := row.Data.(*view.SumData)
 			if float64(value) != sum.Value {
-				return fmt.Errorf("Different recorded value: want %v got %v", float64(value), sum.Value)
+				return fmt.Errorf("different recorded value: want %v got %v", float64(value), sum.Value)
 			}
 			// We found the result
 			return nil
 		}
 	}
-	return fmt.Errorf("Could not find wantTags: %s in rows %v", wantTags, rows)
+	return fmt.Errorf("could not find wantTags: %s in rows %v", wantTags, rows)
 }
 
 func wantsTagsForExporterView(receiverName string, exporterTagName string) []tag.Tag {

processor/addattributesprocessor/addattributesprocessor.go

@@ -27,7 +27,7 @@ import (
 )
 
 var (
-	errUnsupportedType = errors.New("Unsupported type")
+	errUnsupportedType = errors.New("unsupported type")
 )
 
 type addattributesprocessor struct {

processor/attributekeyprocessor/attributekeyprocessor_test.go

@@ -158,11 +158,11 @@ func Test_attributekeyprocessor_ConsumeTraceData(t *testing.T) {
 				},
 			},
 			td: consumerdata.TraceData{
-				Spans: make([]*tracepb.Span, 1, 1),
+				Spans: make([]*tracepb.Span, 1),
 			},
 			want: []consumerdata.TraceData{
 				{
-					Spans: make([]*tracepb.Span, 1, 1),
+					Spans: make([]*tracepb.Span, 1),
 				},
 			},
 		},

processor/attributekeyprocessor/config_test.go

@@ -28,6 +28,7 @@ import (
 
 func TestLoadConfig(t *testing.T) {
 	receivers, _, exporters, err := config.ExampleComponents()
+	require.NoError(t, err)
 	processors, err := processor.Build(&Factory{})
 	require.NotNil(t, processors)
 	require.NoError(t, err)
@@ -76,6 +77,7 @@ func TestLoadConfig(t *testing.T) {
 
 func TestLoadConfigEmpty(t *testing.T) {
 	receivers, _, exporters, err := config.ExampleComponents()
+	require.NoError(t, err)
 	processors, err := processor.Build(&Factory{})
 	require.NotNil(t, processors)
 	require.NoError(t, err)

processor/attributekeyprocessor/factory.go

@@ -44,7 +44,7 @@ func (f *Factory) CreateDefaultConfig() configmodels.Processor {
 			TypeVal: typeStr,
 			NameVal: typeStr,
 		},
-		Keys: make(map[string]NewKeyProperties, 0),
+		Keys: make(map[string]NewKeyProperties),
 	}
 }
 

processor/nodebatcher/node_batcher.go

@@ -71,8 +71,6 @@ type batcher struct {
 	numTickers        int
 	tickTime          time.Duration
 	timeout           time.Duration
-
-	bucketMu sync.RWMutex
 }
 
 var _ consumer.TraceConsumer = (*batcher)(nil)

processor/probabilisticsampler/config_test.go

@@ -54,6 +54,7 @@ func TestLoadConfig(t *testing.T) {
 
 func TestLoadConfigEmpty(t *testing.T) {
 	receivers, _, exporters, err := config.ExampleComponents()
+	require.NoError(t, err)
 	processors, err := processor.Build(&Factory{})
 	require.NotNil(t, processors)
 	require.NoError(t, err)

processor/tailsampling/processor.go

@@ -68,10 +68,6 @@ type tailSamplingSpanProcessor struct {
 	numTracesOnMap  uint64
 }
 
-const (
-	sourceFormat = "tail-sampling"
-)
-
 var _ processor.TraceProcessor = (*tailSamplingSpanProcessor)(nil)
 
 // NewTraceProcessor returns a processor.TraceProcessor that will perform tail sampling according to the given
@@ -201,7 +197,7 @@ func (tsp *tailSamplingSpanProcessor) ConsumeTraceData(ctx context.Context, td c
 	for id, spans := range idToSpans {
 		lenSpans := int64(len(spans))
 		lenPolicies := len(tsp.policies)
-		initialDecisions := make([]sampling.Decision, lenPolicies, lenPolicies)
+		initialDecisions := make([]sampling.Decision, lenPolicies)
 		for i := 0; i < lenPolicies; i++ {
 			initialDecisions[i] = sampling.Pending
 		}

processor/tailsampling/processor_test.go

@@ -213,7 +213,7 @@ func TestSamplingPolicyTypicalPath(t *testing.T) {
 }
 
 func generateIdsAndBatches(numIds int) ([][]byte, []consumerdata.TraceData) {
-	traceIds := make([][]byte, numIds, numIds)
+	traceIds := make([][]byte, numIds)
 	for i := 0; i < numIds; i++ {
 		traceIds[i] = tracetranslator.UInt64ToByteTraceID(1, uint64(i+1))
 	}
@@ -241,16 +241,6 @@ func generateIdsAndBatches(numIds int) ([][]byte, []consumerdata.TraceData) {
 	return traceIds, tds
 }
 
-func newTestPolicy() []*Policy {
-	return []*Policy{
-		{
-			Name:        "test",
-			Evaluator:   sampling.NewAlwaysSample(),
-			Destination: &mockSpanProcessor{},
-		},
-	}
-}
-
 type mockPolicyEvaluator struct {
 	NextDecision           sampling.Decision
 	NextError              error

receiver/jaegerreceiver/trace_receiver.go

@@ -70,8 +70,7 @@ type jReceiver struct {
 
 	config *Configuration
 
-	agent       *agentapp.Agent
-	agentServer *http.Server
+	agent *agentapp.Agent
 
 	grpc            *grpc.Server
 	tchannel        *tchannel.Channel
@@ -93,7 +92,6 @@ const (
 	// 5775	UDP accept zipkin.thrift over compact thrift protocol
 	// 6831	UDP accept jaeger.thrift over compact thrift protocol
 	// 6832	UDP accept jaeger.thrift over binary thrift protocol
-	defaultZipkinThriftUDPPort  = 5775
 	defaultCompactThriftUDPPort = 6831
 	defaultBinaryThriftUDPPort  = 6832
 

receiver/jaegerreceiver/trace_receiver_test.go

@@ -28,6 +28,7 @@ import (
 	model "github.com/jaegertracing/jaeger/model"
 	"github.com/jaegertracing/jaeger/proto-gen/api_v2"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"go.opencensus.io/trace"
 	"google.golang.org/grpc"
 
@@ -106,6 +107,7 @@ func TestGRPCReception(t *testing.T) {
 	t.Log("StartTraceReception")
 
 	conn, err := grpc.Dial(fmt.Sprintf("0.0.0.0:%d", config.CollectorGRPCPort), grpc.WithInsecure())
+	require.NoError(t, err)
 	defer conn.Close()
 
 	cl := api_v2.NewCollectorServiceClient(conn)

receiver/opencensusreceiver/octrace/opencensus.go

@@ -154,7 +154,6 @@ func (ocr *Receiver) Stop() {
 
 type receiverWorker struct {
 	receiver *Receiver
-	tes      agenttracepb.TraceService_ExportServer
 	cancel   chan struct{}
 }
 

receiver/opencensusreceiver/opencensus.go

@@ -76,7 +76,7 @@ func New(addr string, tc consumer.TraceConsumer, mc consumer.MetricsConsumer, op
 	// TODO: (@odeke-em) use options to enable address binding changes.
 	ln, err := net.Listen("tcp", addr)
 	if err != nil {
-		return nil, fmt.Errorf("Failed to bind to address %q: %v", addr, err)
+		return nil, fmt.Errorf("failed to bind to address %q: %v", addr, err)
 	}
 
 	ocr := &Receiver{