Skip to content

Commit 9d6e54f

Browse files
mmorel-35f7o
mmorel-35
authored and
f7o
committed
[chore]: enable bool-compare rule from testifylint (open-telemetry#34912)
#### Description Testifylint is a linter that provides best practices with the use of testify. This PR enables [bool-compare](https://github.com/Antonboom/testifylint?tab=readme-ov-file#bool-compare) rule from [testifylint](https://github.com/Antonboom/testifylint) It's linter provided by golangci-lint. Here all available rules are activated except those who require to be fixed. This PR only fixes bool-compare so the quantity of changes stays reasonnable for reviewers. Signed-off-by: Matthieu MOREL <[email protected]>
1 parent 0e7ce0c commit 9d6e54f

File tree

48 files changed

+159
-141
lines changed

Some content is hidden

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

48 files changed

+159
-141
lines changed

‎.golangci.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,23 @@ linters-settings:
132132
predeclared:
133133
ignore: copy
134134

135+
testifylint:
136+
disable:
137+
- compares
138+
- empty
139+
- error-is-as
140+
- error-nil
141+
- expected-actual
142+
- float-compare
143+
- go-require
144+
- len
145+
- negative-positive
146+
- nil-compare
147+
- require-error
148+
- suite-dont-use-pkg
149+
- useless-assert
150+
enable-all: true
151+
135152
linters:
136153
enable:
137154
- decorder
@@ -152,6 +169,7 @@ linters:
152169
- revive
153170
- staticcheck
154171
- tenv
172+
- testifylint
155173
- unconvert
156174
- unparam
157175
- unused

‎connector/routingconnector/logs_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,5 +463,5 @@ func TestLogsConnectorCapabilities(t *testing.T) {
463463
)
464464

465465
require.NoError(t, err)
466-
assert.Equal(t, false, conn.Capabilities().MutatesData)
466+
assert.False(t, conn.Capabilities().MutatesData)
467467
}

‎connector/routingconnector/metrics_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -493,5 +493,5 @@ func TestMetricsConnectorCapabilities(t *testing.T) {
493493
)
494494

495495
require.NoError(t, err)
496-
assert.Equal(t, false, conn.Capabilities().MutatesData)
496+
assert.False(t, conn.Capabilities().MutatesData)
497497
}

‎connector/routingconnector/traces_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,5 +417,5 @@ func TestTraceConnectorCapabilities(t *testing.T) {
417417
)
418418

419419
require.NoError(t, err)
420-
assert.Equal(t, false, conn.Capabilities().MutatesData)
420+
assert.False(t, conn.Capabilities().MutatesData)
421421
}

‎connector/servicegraphconnector/internal/store/store_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func TestStoreUpsertEdge(t *testing.T) {
3030
e.ClientService = clientService
3131
})
3232
require.NoError(t, err)
33-
require.Equal(t, true, isNew)
33+
require.True(t, isNew)
3434
assert.Equal(t, 1, s.Len())
3535

3636
// Nothing should be evicted as TTL is set to 1h
@@ -44,7 +44,7 @@ func TestStoreUpsertEdge(t *testing.T) {
4444
e.ServerService = "server"
4545
})
4646
require.NoError(t, err)
47-
require.Equal(t, false, isNew)
47+
require.False(t, isNew)
4848
// Edge is complete and should have been removed
4949
assert.Equal(t, 0, s.Len())
5050

@@ -57,7 +57,7 @@ func TestStoreUpsertEdge(t *testing.T) {
5757
e.expiration = time.UnixMicro(0)
5858
})
5959
require.NoError(t, err)
60-
require.Equal(t, true, isNew)
60+
require.True(t, isNew)
6161
assert.Equal(t, 1, s.Len())
6262
assert.Equal(t, 1, onCompletedCount)
6363
assert.Equal(t, 0, onExpireCount)
@@ -80,7 +80,7 @@ func TestStoreUpsertEdge_errTooManyItems(t *testing.T) {
8080
e.ClientService = clientService
8181
})
8282
require.NoError(t, err)
83-
require.Equal(t, true, isNew)
83+
require.True(t, isNew)
8484
assert.Equal(t, 1, s.Len())
8585

8686
_, err = s.UpsertEdge(key2, func(e *Edge) {
@@ -93,7 +93,7 @@ func TestStoreUpsertEdge_errTooManyItems(t *testing.T) {
9393
e.ClientService = clientService
9494
})
9595
require.NoError(t, err)
96-
require.Equal(t, false, isNew)
96+
require.False(t, isNew)
9797
assert.Equal(t, 1, s.Len())
9898

9999
assert.Equal(t, 0, onCallbackCounter)
@@ -120,7 +120,7 @@ func TestStoreExpire(t *testing.T) {
120120
for key := range keys {
121121
isNew, err := s.UpsertEdge(key, noopCallback)
122122
require.NoError(t, err)
123-
require.Equal(t, true, isNew)
123+
require.True(t, isNew)
124124
}
125125

126126
s.Expire()

‎connector/spanmetricsconnector/connector_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -692,7 +692,7 @@ func TestConnectorCapabilities(t *testing.T) {
692692

693693
// Verify
694694
assert.NotNil(t, c)
695-
assert.Equal(t, false, caps.MutatesData)
695+
assert.False(t, caps.MutatesData)
696696
}
697697

698698
type errConsumer struct {

‎exporter/alertmanagerexporter/alertmanager_exporter_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,11 +138,11 @@ func TestAlertManagerExporterEventNameAttributes(t *testing.T) {
138138
// test - count of attributes
139139
assert.Equal(t, 3, got[0].spanEvent.Attributes().Len())
140140
attr, b := got[0].spanEvent.Attributes().Get("attr1")
141-
assert.Equal(t, true, b)
141+
assert.True(t, b)
142142
assert.Equal(t, "unittest-event", got[0].spanEvent.Name())
143143
assert.Equal(t, "unittest-baz", attr.AsString())
144144
attr, b = got[0].spanEvent.Attributes().Get("attr3")
145-
assert.Equal(t, true, b)
145+
assert.True(t, b)
146146
assert.Equal(t, 5.14, attr.Double())
147147
}
148148

‎exporter/awss3exporter/s3_writer_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func TestS3Key(t *testing.T) {
3838
re := regexp.MustCompile(`keyprefix/year=2022/month=06/day=05/hour=00/minute=00/fileprefixlogs_([0-9]+).json`)
3939
s3Key := getS3Key(tm, "keyprefix", "minute", "fileprefix", "logs", "json", "")
4040
matched := re.MatchString(s3Key)
41-
assert.Equal(t, true, matched)
41+
assert.True(t, matched)
4242
}
4343

4444
func TestS3KeyEmptyFileFormat(t *testing.T) {
@@ -52,7 +52,7 @@ func TestS3KeyEmptyFileFormat(t *testing.T) {
5252
re := regexp.MustCompile(`keyprefix/year=2022/month=06/day=05/hour=00/minute=00/fileprefixlogs_([0-9]+)`)
5353
s3Key := getS3Key(tm, "keyprefix", "minute", "fileprefix", "logs", "", "")
5454
matched := re.MatchString(s3Key)
55-
assert.Equal(t, true, matched)
55+
assert.True(t, matched)
5656
}
5757

5858
func TestS3KeyOfCompressedFile(t *testing.T) {
@@ -66,7 +66,7 @@ func TestS3KeyOfCompressedFile(t *testing.T) {
6666
re := regexp.MustCompile(`keyprefix/year=2022/month=06/day=05/hour=00/minute=00/fileprefixlogs_([0-9]+).json.gz`)
6767
s3Key := getS3Key(tm, "keyprefix", "minute", "fileprefix", "logs", "json", "gzip")
6868
matched := re.MatchString(s3Key)
69-
assert.Equal(t, true, matched)
69+
assert.True(t, matched)
7070
}
7171

7272
func TestS3KeyOfCompressedFileEmptyFileFormat(t *testing.T) {
@@ -80,7 +80,7 @@ func TestS3KeyOfCompressedFileEmptyFileFormat(t *testing.T) {
8080
re := regexp.MustCompile(`keyprefix/year=2022/month=06/day=05/hour=00/minute=00/fileprefixlogs_([0-9]+).gz`)
8181
s3Key := getS3Key(tm, "keyprefix", "minute", "fileprefix", "logs", "", "gzip")
8282
matched := re.MatchString(s3Key)
83-
assert.Equal(t, true, matched)
83+
assert.True(t, matched)
8484
}
8585

8686
func TestGetSessionConfigWithEndpoint(t *testing.T) {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1252,7 +1252,7 @@ func validateLocalRootDependencySubsegment(t *testing.T, segment *awsxray.Segmen
12521252

12531253
assert.Equal(t, "MySDK", *segment.AWS.XRay.SDK)
12541254
assert.Equal(t, "1.20.0", *segment.AWS.XRay.SDKVersion)
1255-
assert.Equal(t, true, *segment.AWS.XRay.AutoInstrumentation)
1255+
assert.True(t, *segment.AWS.XRay.AutoInstrumentation)
12561256

12571257
assert.Equal(t, "UpdateItem", *segment.AWS.Operation)
12581258
assert.Equal(t, "AWSAccountAttribute", *segment.AWS.AccountID)
@@ -1278,7 +1278,7 @@ func validateLocalRootServiceSegment(t *testing.T, segment *awsxray.Segment, spa
12781278
assert.Equal(t, "service.name=myTest", segment.Metadata["default"]["otel.resource.attributes"])
12791279
assert.Equal(t, "MySDK", *segment.AWS.XRay.SDK)
12801280
assert.Equal(t, "1.20.0", *segment.AWS.XRay.SDKVersion)
1281-
assert.Equal(t, true, *segment.AWS.XRay.AutoInstrumentation)
1281+
assert.True(t, *segment.AWS.XRay.AutoInstrumentation)
12821282
assert.Nil(t, segment.AWS.Operation)
12831283
assert.Nil(t, segment.AWS.AccountID)
12841284
assert.Nil(t, segment.AWS.RemoteRegion)
@@ -1406,7 +1406,7 @@ func TestNonLocalRootConsumerProcess(t *testing.T) {
14061406
assert.Equal(t, "service.name=myTest", segments[0].Metadata["default"]["otel.resource.attributes"])
14071407
assert.Equal(t, "MySDK", *segments[0].AWS.XRay.SDK)
14081408
assert.Equal(t, "1.20.0", *segments[0].AWS.XRay.SDKVersion)
1409-
assert.Equal(t, true, *segments[0].AWS.XRay.AutoInstrumentation)
1409+
assert.True(t, *segments[0].AWS.XRay.AutoInstrumentation)
14101410
assert.Equal(t, "UpdateItem", *segments[0].AWS.Operation)
14111411
assert.Nil(t, segments[0].Namespace)
14121412
}
@@ -1563,7 +1563,7 @@ func validateLocalRootWithoutDependency(t *testing.T, segment *awsxray.Segment,
15631563
assert.Equal(t, "service.name=myTest", segment.Metadata["default"]["otel.resource.attributes"])
15641564
assert.Equal(t, "MySDK", *segment.AWS.XRay.SDK)
15651565
assert.Equal(t, "1.20.0", *segment.AWS.XRay.SDKVersion)
1566-
assert.Equal(t, true, *segment.AWS.XRay.AutoInstrumentation)
1566+
assert.True(t, *segment.AWS.XRay.AutoInstrumentation)
15671567

15681568
assert.Equal(t, "UpdateItem", *segment.AWS.Operation)
15691569
assert.Equal(t, "AWSAccountAttribute", *segment.AWS.AccountID)

‎exporter/datasetexporter/config_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ func TestConfigUseProvidedExportResourceInfoValue(t *testing.T) {
157157
})
158158
err := config.Unmarshal(configMap)
159159
assert.NoError(t, err)
160-
assert.Equal(t, true, config.LogsSettings.ExportResourceInfo)
160+
assert.True(t, config.LogsSettings.ExportResourceInfo)
161161
}
162162

163163
func TestConfigUseProvidedExportScopeInfoValue(t *testing.T) {
@@ -172,5 +172,5 @@ func TestConfigUseProvidedExportScopeInfoValue(t *testing.T) {
172172
})
173173
err := config.Unmarshal(configMap)
174174
assert.NoError(t, err)
175-
assert.Equal(t, false, config.LogsSettings.ExportScopeInfo)
175+
assert.False(t, config.LogsSettings.ExportScopeInfo)
176176
}

0 commit comments

Comments
 (0)