Skip to content

Commit 090d80a

Browse files
committed
Fix most staticcheck errors
1 parent 22502fb commit 090d80a

File tree

40 files changed

+57
-91
lines changed

40 files changed

+57
-91
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ all-srcs:
4242
.DEFAULT_GOAL := addlicense-fmt-vet-lint-goimports-misspell-staticcheck-test
4343

4444
.PHONY: addlicense-fmt-vet-lint-goimports-misspell-staticcheck-test
45-
addlicense-fmt-vet-lint-goimports-misspell-test: addlicense fmt vet lint goimports misspell staticcheck test
45+
addlicense-fmt-vet-lint-goimports-misspell-staticcheck-test: addlicense fmt vet lint goimports misspell staticcheck test
4646

4747
.PHONY: e2e-test
4848
e2e-test: otelsvc

config/config.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ func loadReceivers(v *viper.Viper, factories map[string]receiver.Factory) (confi
176176
keyMap := v.GetStringMap(receiversKeyName)
177177

178178
// Prepare resulting map
179-
receivers := make(configmodels.Receivers, 0)
179+
receivers := make(configmodels.Receivers)
180180

181181
// Iterate over input map and create a config for each.
182182
for key := range keyMap {
@@ -242,7 +242,7 @@ func loadExporters(v *viper.Viper, factories map[string]exporter.Factory) (confi
242242
keyMap := v.GetStringMap(exportersKeyName)
243243

244244
// Prepare resulting map
245-
exporters := make(configmodels.Exporters, 0)
245+
exporters := make(configmodels.Exporters)
246246

247247
// Iterate over exporters and create a config for each.
248248
for key := range keyMap {
@@ -299,7 +299,7 @@ func loadProcessors(v *viper.Viper, factories map[string]processor.Factory) (con
299299
keyMap := v.GetStringMap(processorsKeyName)
300300

301301
// Prepare resulting map.
302-
processors := make(configmodels.Processors, 0)
302+
processors := make(configmodels.Processors)
303303

304304
// Iterate over processors and create a config for each.
305305
for key := range keyMap {
@@ -356,7 +356,7 @@ func loadPipelines(v *viper.Viper) (configmodels.Pipelines, error) {
356356
keyMap := v.GetStringMap(pipelinesKeyName)
357357

358358
// Prepare resulting map.
359-
pipelines := make(configmodels.Pipelines, 0)
359+
pipelines := make(configmodels.Pipelines)
360360

361361
// Iterate over input map and create a config for each.
362362
for key := range keyMap {

exporter/exporterhelper/metricshelper_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ func newPushMetricsData(droppedSpans int, retError error) PushMetricsData {
9494
}
9595

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

exporter/exporterhelper/tracehelper_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ func checkRecordedMetricsForTraceExporter(t *testing.T, te exporter.TraceExporte
132132
doneFn := observabilitytest.SetupRecordedMetricsTest()
133133
defer doneFn()
134134

135-
spans := make([]*tracepb.Span, 2, 2)
135+
spans := make([]*tracepb.Span, 2)
136136
td := consumerdata.TraceData{Spans: spans}
137137
ctx := observability.ContextWithReceiverName(context.Background(), fakeReceiverName)
138138
const numBatches = 7
@@ -151,7 +151,7 @@ func checkRecordedMetricsForTraceExporter(t *testing.T, te exporter.TraceExporte
151151
}
152152

153153
func generateTraceTraffic(t *testing.T, te exporter.TraceExporter, numRequests int, wantError error) {
154-
td := consumerdata.TraceData{Spans: make([]*tracepb.Span, 1, 1)}
154+
td := consumerdata.TraceData{Spans: make([]*tracepb.Span, 1)}
155155
ctx, span := trace.StartSpan(context.Background(), fakeParentSpanName, trace.WithSampler(trace.AlwaysSample()))
156156
defer span.End()
157157
for i := 0; i < numRequests; i++ {

exporter/exportertest/nop_exporter_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func TestNopTraceExporter_NoErrors(t *testing.T) {
3131
if err := nte.ConsumeTraceData(context.Background(), td); err != nil {
3232
t.Fatalf("Wanted nil got error")
3333
}
34-
if "nop_trace" != nte.TraceExportFormat() {
34+
if nte.TraceExportFormat() != "nop_trace" {
3535
t.Fatalf("Wanted nop_trace got %s", nte.TraceExportFormat())
3636
}
3737
}
@@ -45,7 +45,7 @@ func TestNopTraceExporter_WithErrors(t *testing.T) {
4545
if got := nte.ConsumeTraceData(context.Background(), td); got != want {
4646
t.Fatalf("Want %v Got %v", want, got)
4747
}
48-
if "nop_trace" != nte.TraceExportFormat() {
48+
if nte.TraceExportFormat() != "nop_trace" {
4949
t.Fatalf("Wanted nop_trace got %s", nte.TraceExportFormat())
5050
}
5151
}
@@ -58,7 +58,7 @@ func TestNopMetricsExporter_NoErrors(t *testing.T) {
5858
if err := nme.ConsumeMetricsData(context.Background(), md); err != nil {
5959
t.Fatalf("Wanted nil got error")
6060
}
61-
if "nop_metrics" != nme.MetricsExportFormat() {
61+
if nme.MetricsExportFormat() != "nop_metrics" {
6262
t.Fatalf("Wanted nop_metrics got %s", nme.MetricsExportFormat())
6363
}
6464
}
@@ -72,7 +72,7 @@ func TestNopMetricsExporter_WithErrors(t *testing.T) {
7272
if got := nme.ConsumeMetricsData(context.Background(), md); got != want {
7373
t.Fatalf("Want %v Got %v", want, got)
7474
}
75-
if "nop_metrics" != nme.MetricsExportFormat() {
75+
if nme.MetricsExportFormat() != "nop_metrics" {
7676
t.Fatalf("Wanted nop_metrics got %s", nme.MetricsExportFormat())
7777
}
7878
}

exporter/exportertest/sink_exporter_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func TestSinkTraceExporter(t *testing.T) {
3939
if !reflect.DeepEqual(got, want) {
4040
t.Errorf("Mismatches responses\nGot:\n\t%v\nWant:\n\t%v\n", got, want)
4141
}
42-
if "sink_trace" != sink.TraceExportFormat() {
42+
if sink.TraceExportFormat() != "sink_trace" {
4343
t.Errorf("Wanted sink_trace got %s", sink.TraceExportFormat())
4444
}
4545
}
@@ -60,7 +60,7 @@ func TestSinkMetricsExporter(t *testing.T) {
6060
if !reflect.DeepEqual(got, want) {
6161
t.Errorf("Mismatches responses\nGot:\n\t%v\nWant:\n\t%v\n", got, want)
6262
}
63-
if "sink_metrics" != sink.MetricsExportFormat() {
63+
if sink.MetricsExportFormat() != "sink_metrics" {
6464
t.Errorf("Wanted sink_metrics got %s", sink.MetricsExportFormat())
6565
}
6666
}

exporter/jaegerexporter/jaeger_thrift_http_sender.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ func (s *JaegerThriftHTTPSender) ConsumeTraceData(ctx context.Context, td consum
111111
io.Copy(ioutil.Discard, resp.Body)
112112
resp.Body.Close()
113113
if resp.StatusCode >= http.StatusBadRequest {
114-
return fmt.Errorf("Jaeger Thirft HTTP sender error: %d", resp.StatusCode)
114+
return fmt.Errorf("jaeger Thirft HTTP sender error: %d", resp.StatusCode)
115115
}
116116
return nil
117117
}

exporter/loggingexporter/logging_exporter_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func TestLoggingTraceExporterNoErrors(t *testing.T) {
3434
if err := lte.ConsumeTraceData(context.Background(), td); err != nil {
3535
t.Fatalf("Wanted nil got %v", err)
3636
}
37-
if "logging_trace" != lte.TraceExportFormat() {
37+
if lte.TraceExportFormat() != "logging_trace" {
3838
t.Errorf("Wanted logging_trace got %v", lte.TraceExportFormat())
3939
}
4040
}
@@ -50,7 +50,7 @@ func TestLoggingMetricsExporterNoErrors(t *testing.T) {
5050
if err := lme.ConsumeMetricsData(context.Background(), md); err != nil {
5151
t.Fatalf("Wanted nil got %v", err)
5252
}
53-
if "logging_metrics" != lme.MetricsExportFormat() {
53+
if lme.MetricsExportFormat() != "logging_metrics" {
5454
t.Errorf("Wanted logging_metrics got %v", lme.MetricsExportFormat())
5555
}
5656
}

exporter/opencensusexporter/opencensus.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ type opencensusConfig struct {
5757
}
5858

5959
type ocagentExporter struct {
60-
counter uint32
6160
exporters chan *ocagent.Exporter
6261
}
6362

exporter/prometheusexporter/factory_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ func TestCreateTraceExporter(t *testing.T) {
4141
}
4242

4343
func TestCreateMetricsExporter(t *testing.T) {
44-
const defaultTestEndPoint = "127.0.0.1:55678"
4544
tests := []struct {
4645
name string
4746
config Config

0 commit comments

Comments
 (0)