Skip to content

Commit 6aa4e14

Browse files
mmorel-35mmorel-35
committed
[chore]: enable error-nil and nil-compare rules from testifylint
1 parent fd0e9ef commit 6aa4e14

File tree

61 files changed

+166
-146
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+166
-146
lines changed

‎.golangci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -137,14 +137,14 @@ linters-settings:
137137
- compares
138138
- empty
139139
- error-is-as
140-
- error-nil
141140
- expected-actual
142141
- float-compare
142+
- formatter
143143
- go-require
144144
- negative-positive
145-
- nil-compare
146145
- require-error
147146
- suite-dont-use-pkg
147+
- suite-subtest-run
148148
- useless-assert
149149
enable-all: true
150150

‎Makefile

+8
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,14 @@ golint:
147147
gogovulncheck:
148148
$(MAKE) $(FOR_GROUP_TARGET) TARGET="govulncheck"
149149

150+
.PHONY: gotestifylint
151+
gotestifylint:
152+
$(MAKE) $(FOR_GROUP_TARGET) TARGET="testifylint"
153+
154+
.PHONY: gotestifylint-fix
155+
gotestifylint-fix:
156+
$(MAKE) $(FOR_GROUP_TARGET) TARGET="testifylint-fix"
157+
150158
.PHONY: goporto
151159
goporto: $(PORTO)
152160
$(PORTO) -w --include-internal --skip-dirs "^cmd$$" ./

‎Makefile.Common

+11
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,10 @@ BUILDER := $(TOOLS_BIN_DIR)/builder
7272
GOVULNCHECK := $(TOOLS_BIN_DIR)/govulncheck
7373
GCI := $(TOOLS_BIN_DIR)/gci
7474
GOTESTSUM := $(TOOLS_BIN_DIR)/gotestsum
75+
TESTIFYLINT := $(TOOLS_BIN_DIR)/testifylint
7576

7677
GOTESTSUM_OPT?= --rerun-fails=1
78+
TESTIFYLINT_OPT?= --enable-all --disable=compares,empty,error-is-as,expected-actual,float-compare,formatter,go-require,negative-positive,require-error,suite-dont-use-pkg,suite-subtest-run,useless-assert
7779

7880
# BUILD_TYPE should be one of (dev, release).
7981
BUILD_TYPE?=release
@@ -220,6 +222,15 @@ misspell-correction: $(TOOLS_BIN_DIR)/misspell
220222
moddownload:
221223
$(GOCMD) mod download
222224

225+
.PHONY: testifylint
226+
testifylint: $(TESTIFYLINT)
227+
@echo "running $(TESTIFYLINT)"
228+
$(TESTIFYLINT) $(TESTIFYLINT_OPT) ./...
229+
230+
.PHONY: testifylint-fix
231+
testifylint-fix:
232+
@$(MAKE) testifylint TESTIFYLINT_OPT="${TESTIFYLINT_OPT} --fix"
233+
223234
.PHONY: gci
224235
gci: $(TOOLS_BIN_DIR)/gci
225236
@echo "running $(GCI)"

‎exporter/alibabacloudlogserviceexporter/trace_exporter_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func TestNewTracesExporter(t *testing.T) {
3131
// This will put trace data to send buffer and return success.
3232
err = got.ConsumeTraces(context.Background(), traces)
3333
assert.NoError(t, err)
34-
assert.Nil(t, got.Shutdown(context.Background()))
34+
assert.NoError(t, got.Shutdown(context.Background()))
3535
}
3636

3737
func TestNewFailsWithEmptyTracesExporterName(t *testing.T) {

‎exporter/awsemfexporter/emf_exporter_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -314,10 +314,10 @@ func TestPushMetricsDataWithErr(t *testing.T) {
314314
metricNames: []string{"metric_1", "metric_2"},
315315
metricValues: [][]float64{{100}, {4}},
316316
})
317-
assert.NotNil(t, exp.pushMetricsData(ctx, md))
318-
assert.NotNil(t, exp.pushMetricsData(ctx, md))
319-
assert.Nil(t, exp.pushMetricsData(ctx, md))
320-
assert.Nil(t, exp.shutdown(ctx))
317+
assert.Error(t, exp.pushMetricsData(ctx, md))
318+
assert.Error(t, exp.pushMetricsData(ctx, md))
319+
assert.NoError(t, exp.pushMetricsData(ctx, md))
320+
assert.NoError(t, exp.shutdown(ctx))
321321
}
322322

323323
func TestNewExporterWithoutConfig(t *testing.T) {

‎exporter/awsemfexporter/grouped_metric_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ func BenchmarkAddToGroupedMetric(b *testing.B) {
462462
for i := 0; i < numMetrics; i++ {
463463
metadata := generateTestMetricMetadata("namespace", int64(1596151098037), "log-group", "log-stream", "cloudwatch-otel", metrics.At(i).Type())
464464
err := addToGroupedMetric(metrics.At(i), groupedMetrics, metadata, true, nil, testCfg, emfCalcs)
465-
assert.Nil(b, err)
465+
assert.NoError(b, err)
466466
}
467467
}
468468
}

‎exporter/awsemfexporter/metric_translator_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -1984,7 +1984,7 @@ func BenchmarkTranslateOtToGroupedMetricWithInstrLibrary(b *testing.B) {
19841984
for n := 0; n < b.N; n++ {
19851985
groupedMetric := make(map[any]*groupedMetric)
19861986
err := translator.translateOTelToGroupedMetric(rm, groupedMetric, config)
1987-
assert.Nil(b, err)
1987+
assert.NoError(b, err)
19881988
}
19891989
}
19901990

@@ -2007,7 +2007,7 @@ func BenchmarkTranslateOtToGroupedMetricWithoutConfigReplacePattern(b *testing.B
20072007
for n := 0; n < b.N; n++ {
20082008
groupedMetrics := make(map[any]*groupedMetric)
20092009
err := translator.translateOTelToGroupedMetric(rm, groupedMetrics, config)
2010-
assert.Nil(b, err)
2010+
assert.NoError(b, err)
20112011
}
20122012
}
20132013

@@ -2030,7 +2030,7 @@ func BenchmarkTranslateOtToGroupedMetricWithConfigReplaceWithResource(b *testing
20302030
for n := 0; n < b.N; n++ {
20312031
groupedMetrics := make(map[any]*groupedMetric)
20322032
err := translator.translateOTelToGroupedMetric(rm, groupedMetrics, config)
2033-
assert.Nil(b, err)
2033+
assert.NoError(b, err)
20342034
}
20352035
}
20362036

@@ -2053,7 +2053,7 @@ func BenchmarkTranslateOtToGroupedMetricWithConfigReplaceWithLabel(b *testing.B)
20532053
for n := 0; n < b.N; n++ {
20542054
groupedMetrics := make(map[any]*groupedMetric)
20552055
err := translator.translateOTelToGroupedMetric(rm, groupedMetrics, config)
2056-
assert.Nil(b, err)
2056+
assert.NoError(b, err)
20572057
}
20582058
}
20592059

@@ -2071,7 +2071,7 @@ func BenchmarkTranslateOtToGroupedMetricWithoutInstrLibrary(b *testing.B) {
20712071
for n := 0; n < b.N; n++ {
20722072
groupedMetrics := make(map[any]*groupedMetric)
20732073
err := translator.translateOTelToGroupedMetric(rm, groupedMetrics, config)
2074-
assert.Nil(b, err)
2074+
assert.NoError(b, err)
20752075
}
20762076
}
20772077

@@ -2140,7 +2140,7 @@ func BenchmarkTranslateGroupedMetricToCWMetricWithFiltering(b *testing.B) {
21402140
}
21412141
logger := zap.NewNop()
21422142
err := m.init(logger)
2143-
assert.Nil(b, err)
2143+
assert.NoError(b, err)
21442144
config := &Config{
21452145
MetricDeclarations: []*MetricDeclaration{m},
21462146
DimensionRollupOption: zeroAndSingleDimensionRollup,

‎exporter/awsxrayexporter/internal/translator/segment_test.go

+26-26
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ func TestFixSegmentName(t *testing.T) {
409409

410410
func TestFixAnnotationKey(t *testing.T) {
411411
err := featuregate.GlobalRegistry().Set("exporter.xray.allowDot", false)
412-
assert.Nil(t, err)
412+
assert.NoError(t, err)
413413

414414
validKey := "Key_1"
415415
fixedKey := fixAnnotationKey(validKey)
@@ -424,7 +424,7 @@ func TestFixAnnotationKey(t *testing.T) {
424424

425425
func TestFixAnnotationKeyWithAllowDot(t *testing.T) {
426426
err := featuregate.GlobalRegistry().Set("exporter.xray.allowDot", true)
427-
assert.Nil(t, err)
427+
assert.NoError(t, err)
428428

429429
validKey := "Key_1"
430430
fixedKey := fixAnnotationKey(validKey)
@@ -585,7 +585,7 @@ func TestSpanWithAttributesSegmentMetadata(t *testing.T) {
585585

586586
func TestResourceAttributesCanBeIndexed(t *testing.T) {
587587
err := featuregate.GlobalRegistry().Set("exporter.xray.allowDot", false)
588-
assert.Nil(t, err)
588+
assert.NoError(t, err)
589589

590590
spanName := "/api/locations"
591591
parentSpanID := newSegmentID()
@@ -618,7 +618,7 @@ func TestResourceAttributesCanBeIndexed(t *testing.T) {
618618

619619
func TestResourceAttributesCanBeIndexedWithAllowDot(t *testing.T) {
620620
err := featuregate.GlobalRegistry().Set("exporter.xray.allowDot", true)
621-
assert.Nil(t, err)
621+
assert.NoError(t, err)
622622

623623
spanName := "/api/locations"
624624
parentSpanID := newSegmentID()
@@ -672,7 +672,7 @@ func TestResourceAttributesNotIndexedIfSubsegment(t *testing.T) {
672672

673673
func TestSpanWithSpecialAttributesAsListed(t *testing.T) {
674674
err := featuregate.GlobalRegistry().Set("exporter.xray.allowDot", false)
675-
assert.Nil(t, err)
675+
assert.NoError(t, err)
676676

677677
spanName := "/api/locations"
678678
parentSpanID := newSegmentID()
@@ -692,7 +692,7 @@ func TestSpanWithSpecialAttributesAsListed(t *testing.T) {
692692

693693
func TestSpanWithSpecialAttributesAsListedWithAllowDot(t *testing.T) {
694694
err := featuregate.GlobalRegistry().Set("exporter.xray.allowDot", true)
695-
assert.Nil(t, err)
695+
assert.NoError(t, err)
696696

697697
spanName := "/api/locations"
698698
parentSpanID := newSegmentID()
@@ -712,7 +712,7 @@ func TestSpanWithSpecialAttributesAsListedWithAllowDot(t *testing.T) {
712712

713713
func TestSpanWithSpecialAttributesAsListedAndIndexAll(t *testing.T) {
714714
err := featuregate.GlobalRegistry().Set("exporter.xray.allowDot", false)
715-
assert.Nil(t, err)
715+
assert.NoError(t, err)
716716

717717
spanName := "/api/locations"
718718
parentSpanID := newSegmentID()
@@ -731,7 +731,7 @@ func TestSpanWithSpecialAttributesAsListedAndIndexAll(t *testing.T) {
731731

732732
func TestSpanWithSpecialAttributesAsListedAndIndexAllWithAllowDot(t *testing.T) {
733733
err := featuregate.GlobalRegistry().Set("exporter.xray.allowDot", true)
734-
assert.Nil(t, err)
734+
assert.NoError(t, err)
735735

736736
spanName := "/api/locations"
737737
parentSpanID := newSegmentID()
@@ -1142,7 +1142,7 @@ func TestAwsSdkSpanWithAwsRemoteServiceName(t *testing.T) {
11421142
jsonStr, err := MakeSegmentDocumentString(span, resource, nil, false, nil, false)
11431143

11441144
assert.NotNil(t, jsonStr)
1145-
assert.Nil(t, err)
1145+
assert.NoError(t, err)
11461146
assert.True(t, strings.Contains(jsonStr, "DynamoDb"))
11471147
assert.False(t, strings.Contains(jsonStr, "DynamoDb.PutItem"))
11481148
assert.False(t, strings.Contains(jsonStr, user))
@@ -1336,7 +1336,7 @@ func addSpanLink(span ptrace.Span) {
13361336

13371337
func TestLocalRootConsumer(t *testing.T) {
13381338
err := featuregate.GlobalRegistry().Set("exporter.xray.allowDot", false)
1339-
assert.Nil(t, err)
1339+
assert.NoError(t, err)
13401340

13411341
spanName := "destination operation"
13421342
resource := getBasicResource()
@@ -1352,7 +1352,7 @@ func TestLocalRootConsumer(t *testing.T) {
13521352

13531353
assert.NotNil(t, segments)
13541354
assert.Len(t, segments, 2)
1355-
assert.Nil(t, err)
1355+
assert.NoError(t, err)
13561356

13571357
validateLocalRootDependencySubsegment(t, segments[0], span, *segments[1].ID)
13581358
assert.Nil(t, segments[0].Links)
@@ -1383,7 +1383,7 @@ func TestNonLocalRootConsumerProcess(t *testing.T) {
13831383

13841384
assert.NotNil(t, segments)
13851385
assert.Len(t, segments, 1)
1386-
assert.Nil(t, err)
1386+
assert.NoError(t, err)
13871387

13881388
tempTraceID := span.TraceID()
13891389
expectedTraceID := "1-" + fmt.Sprintf("%x", tempTraceID[0:4]) + "-" + fmt.Sprintf("%x", tempTraceID[4:16])
@@ -1429,15 +1429,15 @@ func TestLocalRootConsumerAWSNamespace(t *testing.T) {
14291429

14301430
assert.NotNil(t, segments)
14311431
assert.Len(t, segments, 2)
1432-
assert.Nil(t, err)
1432+
assert.NoError(t, err)
14331433

14341434
// Ensure that AWS namespace is not overwritten to remote
14351435
assert.Equal(t, "aws", *segments[0].Namespace)
14361436
}
14371437

14381438
func TestLocalRootClient(t *testing.T) {
14391439
err := featuregate.GlobalRegistry().Set("exporter.xray.allowDot", false)
1440-
assert.Nil(t, err)
1440+
assert.NoError(t, err)
14411441

14421442
spanName := "SQS Get"
14431443
resource := getBasicResource()
@@ -1455,7 +1455,7 @@ func TestLocalRootClient(t *testing.T) {
14551455

14561456
assert.NotNil(t, segments)
14571457
assert.Len(t, segments, 2)
1458-
assert.Nil(t, err)
1458+
assert.NoError(t, err)
14591459

14601460
validateLocalRootDependencySubsegment(t, segments[0], span, *segments[1].ID)
14611461
assert.Len(t, segments[0].Links, 1)
@@ -1492,7 +1492,7 @@ func TestLocalRootClientAwsServiceMetrics(t *testing.T) {
14921492

14931493
assert.NotNil(t, segments)
14941494
assert.Len(t, segments, 2)
1495-
assert.Nil(t, err)
1495+
assert.NoError(t, err)
14961496

14971497
subsegment := segments[0]
14981498

@@ -1516,7 +1516,7 @@ func TestLocalRootProducer(t *testing.T) {
15161516

15171517
assert.NotNil(t, segments)
15181518
assert.Len(t, segments, 2)
1519-
assert.Nil(t, err)
1519+
assert.NoError(t, err)
15201520

15211521
validateLocalRootDependencySubsegment(t, segments[0], span, *segments[1].ID)
15221522
assert.Len(t, segments[0].Links, 1)
@@ -1577,7 +1577,7 @@ func validateLocalRootWithoutDependency(t *testing.T, segment *awsxray.Segment,
15771577

15781578
func TestLocalRootServer(t *testing.T) {
15791579
err := featuregate.GlobalRegistry().Set("exporter.xray.allowDot", false)
1580-
assert.Nil(t, err)
1580+
assert.NoError(t, err)
15811581

15821582
spanName := "MyService"
15831583
resource := getBasicResource()
@@ -1593,14 +1593,14 @@ func TestLocalRootServer(t *testing.T) {
15931593

15941594
assert.NotNil(t, segments)
15951595
assert.Len(t, segments, 1)
1596-
assert.Nil(t, err)
1596+
assert.NoError(t, err)
15971597

15981598
validateLocalRootWithoutDependency(t, segments[0], span)
15991599
}
16001600

16011601
func TestLocalRootInternal(t *testing.T) {
16021602
err := featuregate.GlobalRegistry().Set("exporter.xray.allowDot", false)
1603-
assert.Nil(t, err)
1603+
assert.NoError(t, err)
16041604

16051605
spanName := "MyInternalService"
16061606
resource := getBasicResource()
@@ -1616,7 +1616,7 @@ func TestLocalRootInternal(t *testing.T) {
16161616

16171617
assert.NotNil(t, segments)
16181618
assert.Len(t, segments, 1)
1619-
assert.Nil(t, err)
1619+
assert.NoError(t, err)
16201620

16211621
validateLocalRootWithoutDependency(t, segments[0], span)
16221622
}
@@ -1637,7 +1637,7 @@ func TestNotLocalRootInternal(t *testing.T) {
16371637

16381638
assert.NotNil(t, segments)
16391639
assert.Len(t, segments, 1)
1640-
assert.Nil(t, err)
1640+
assert.NoError(t, err)
16411641

16421642
// Validate segment
16431643
assert.Equal(t, "subsegment", *segments[0].Type)
@@ -1661,7 +1661,7 @@ func TestNotLocalRootConsumer(t *testing.T) {
16611661

16621662
assert.NotNil(t, segments)
16631663
assert.Len(t, segments, 1)
1664-
assert.Nil(t, err)
1664+
assert.NoError(t, err)
16651665

16661666
// Validate segment
16671667
assert.Equal(t, "subsegment", *segments[0].Type)
@@ -1685,7 +1685,7 @@ func TestNotLocalRootClient(t *testing.T) {
16851685

16861686
assert.NotNil(t, segments)
16871687
assert.Len(t, segments, 1)
1688-
assert.Nil(t, err)
1688+
assert.NoError(t, err)
16891689

16901690
// Validate segment
16911691
assert.Equal(t, "subsegment", *segments[0].Type)
@@ -1709,7 +1709,7 @@ func TestNotLocalRootProducer(t *testing.T) {
17091709

17101710
assert.NotNil(t, segments)
17111711
assert.Len(t, segments, 1)
1712-
assert.Nil(t, err)
1712+
assert.NoError(t, err)
17131713

17141714
// Validate segment
17151715
assert.Equal(t, "subsegment", *segments[0].Type)
@@ -1735,7 +1735,7 @@ func TestNotLocalRootServer(t *testing.T) {
17351735

17361736
assert.NotNil(t, segments)
17371737
assert.Len(t, segments, 1)
1738-
assert.Nil(t, err)
1738+
assert.NoError(t, err)
17391739

17401740
// Validate segment
17411741
assert.Nil(t, segments[0].Type)

‎exporter/awsxrayexporter/internal/translator/span_links_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,11 @@ func TestOldSpanLinkError(t *testing.T) {
7878

7979
_, error1 := MakeSegment(span, resource, nil, false, nil, false)
8080

81-
assert.NotNil(t, error1)
81+
assert.Error(t, error1)
8282

8383
_, error2 := MakeSegmentDocumentString(span, resource, nil, false, nil, false)
8484

85-
assert.NotNil(t, error2)
85+
assert.Error(t, error2)
8686
}
8787

8888
func TestTwoSpanLinks(t *testing.T) {

0 commit comments

Comments
 (0)