Skip to content

Commit 3c2a004

Browse files
mmorel-35jriguera
authored andcommitted
[chore]: enable go-require rule from testifylint (open-telemetry#35190)
#### Description Testifylint is a linter that provides best practices with the use of testify. This PR enables [go-require](https://github.com/Antonboom/testifylint?tab=readme-ov-file#go-require) rule from [testifylint](https://github.com/Antonboom/testifylint) --------- Signed-off-by: Matthieu MOREL <[email protected]>
1 parent c92d627 commit 3c2a004

File tree

58 files changed

+329
-301
lines changed

Some content is hidden

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

58 files changed

+329
-301
lines changed

.golangci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@ linters-settings:
136136
disable:
137137
- float-compare
138138
- formatter
139-
- go-require
140139
- require-error
141140
- suite-subtest-run
142141
- useless-assert

Makefile.Common

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ GOTESTSUM := $(TOOLS_BIN_DIR)/gotestsum
7777
TESTIFYLINT := $(TOOLS_BIN_DIR)/testifylint
7878

7979
GOTESTSUM_OPT?= --rerun-fails=1
80-
TESTIFYLINT_OPT?= --enable-all --disable=float-compare,formatter,go-require,require-error,suite-subtest-run,useless-assert
80+
TESTIFYLINT_OPT?= --enable-all --disable=float-compare,formatter,require-error,suite-subtest-run,useless-assert
8181

8282
# BUILD_TYPE should be one of (dev, release).
8383
BUILD_TYPE?=release

cmd/telemetrygen/internal/e2etest/e2e_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"testing"
99
"time"
1010

11+
"github.com/stretchr/testify/assert"
1112
"github.com/stretchr/testify/require"
1213
"go.opentelemetry.io/collector/component/componenttest"
1314
"go.opentelemetry.io/collector/consumer/consumertest"
@@ -53,7 +54,7 @@ func TestGenerateTraces(t *testing.T) {
5354
}
5455
go func() {
5556
err = traces.Start(cfg)
56-
require.NoError(t, err)
57+
assert.NoError(t, err)
5758
}()
5859
require.Eventually(t, func() bool {
5960
return len(sink.AllTraces()) > 0

connector/spanmetricsconnector/connector_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -659,7 +659,7 @@ func TestConcurrentShutdown(t *testing.T) {
659659
for i := 0; i < concurrency; i++ {
660660
go func() {
661661
err := p.Shutdown(ctx)
662-
require.NoError(t, err)
662+
assert.NoError(t, err)
663663
wg.Done()
664664
}()
665665
}

exporter/carbonexporter/exporter_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ func TestConsumeMetrics(t *testing.T) {
142142
defer writersWG.Done()
143143
<-startCh
144144
for j := 0; j < tt.writesPerProducer; j++ {
145-
require.NoError(t, exp.ConsumeMetrics(context.Background(), tt.md))
145+
assert.NoError(t, exp.ConsumeMetrics(context.Background(), tt.md))
146146
}
147147
}()
148148
}
@@ -332,10 +332,10 @@ func (cs *carbonServer) start(t *testing.T, numExpectedReq int) {
332332
// Close is expected to cause error.
333333
return
334334
}
335-
require.NoError(t, err)
335+
assert.NoError(t, err)
336336
go func(conn net.Conn) {
337337
defer func() {
338-
require.NoError(t, conn.Close())
338+
assert.NoError(t, conn.Close())
339339
}()
340340

341341
reader := bufio.NewReader(conn)
@@ -344,7 +344,7 @@ func (cs *carbonServer) start(t *testing.T, numExpectedReq int) {
344344
if errors.Is(err, io.EOF) {
345345
return
346346
}
347-
require.NoError(t, err)
347+
assert.NoError(t, err)
348348

349349
if cs.expectedContainsValue != "" {
350350
assert.Contains(t, string(buf), cs.expectedContainsValue)

exporter/datadogexporter/internal/hostmetadata/metadata_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,13 +190,13 @@ func TestPushMetadata(t *testing.T) {
190190
assert.Equal(t, "apikey", r.Header.Get("DD-Api-Key"))
191191
assert.Equal(t, "otelcontribcol/1.0", r.Header.Get("User-Agent"))
192192
reader, err := gzip.NewReader(r.Body)
193-
require.NoError(t, err)
193+
assert.NoError(t, err)
194194
body, err := io.ReadAll(reader)
195-
require.NoError(t, err)
195+
assert.NoError(t, err)
196196

197197
var recvMetadata payload.HostMetadata
198198
err = json.Unmarshal(body, &recvMetadata)
199-
require.NoError(t, err)
199+
assert.NoError(t, err)
200200
assert.Equal(t, mockMetadata, recvMetadata)
201201
})
202202

exporter/honeycombmarkerexporter/logs_exporter_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ func TestExportMarkers(t *testing.T) {
124124
decodedBody := map[string]any{}
125125
err := json.NewDecoder(req.Body).Decode(&decodedBody)
126126

127-
require.NoError(t, err)
127+
assert.NoError(t, err)
128128

129129
assert.Equal(t, len(tt.attributeMap), len(decodedBody))
130130

exporter/loadbalancingexporter/log_exporter_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ func TestRollingUpdatesWhenConsumeLogs(t *testing.T) {
466466
return
467467
case <-ticker.C:
468468
go func() {
469-
require.NoError(t, p.ConsumeLogs(ctx, randomLogs()))
469+
assert.NoError(t, p.ConsumeLogs(ctx, randomLogs()))
470470
}()
471471
}
472472
}

exporter/loadbalancingexporter/metrics_exporter_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -847,7 +847,7 @@ func TestRollingUpdatesWhenConsumeMetrics(t *testing.T) {
847847
return
848848
case <-ticker.C:
849849
go func() {
850-
require.NoError(t, p.ConsumeMetrics(ctx, randomMetrics(t, 1, 1, 1, 1)))
850+
assert.NoError(t, p.ConsumeMetrics(ctx, randomMetrics(t, 1, 1, 1, 1)))
851851
}()
852852
}
853853
}

exporter/loadbalancingexporter/trace_exporter_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ func TestRollingUpdatesWhenConsumeTraces(t *testing.T) {
569569
return
570570
case <-ticker.C:
571571
go func() {
572-
require.NoError(t, p.ConsumeTraces(ctx, randomTraces()))
572+
assert.NoError(t, p.ConsumeTraces(ctx, randomTraces()))
573573
}()
574574
}
575575
}

0 commit comments

Comments
 (0)