From bf6aeddea3241669dbabf0a4e954d5d230390ca6 Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Sat, 14 Sep 2024 10:48:55 +0000 Subject: [PATCH] [chore]: enable go-require rule from testifylint Signed-off-by: Matthieu MOREL --- .golangci.yml | 1 - Makefile.Common | 2 +- receiver/apachereceiver/scraper_test.go | 3 +- receiver/apachesparkreceiver/client_test.go | 51 +++++++++--------- receiver/bigipreceiver/client_test.go | 45 ++++++++-------- receiver/couchdbreceiver/client_test.go | 5 +- receiver/elasticsearchreceiver/client_test.go | 5 +- receiver/expvarreceiver/scraper_test.go | 3 +- receiver/flinkmetricsreceiver/client_test.go | 53 ++++++++++--------- .../fluentforwardreceiver/receiver_test.go | 9 ++-- receiver/haproxyreceiver/scraper_test.go | 37 ++++++------- 11 files changed, 111 insertions(+), 103 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index ec43cda688336..86777518d77ee 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -136,7 +136,6 @@ linters-settings: disable: - float-compare - formatter - - go-require - require-error - suite-subtest-run - useless-assert diff --git a/Makefile.Common b/Makefile.Common index 2e9b53cfe4224..f0b6dea5bb5cf 100644 --- a/Makefile.Common +++ b/Makefile.Common @@ -77,7 +77,7 @@ GOTESTSUM := $(TOOLS_BIN_DIR)/gotestsum TESTIFYLINT := $(TOOLS_BIN_DIR)/testifylint GOTESTSUM_OPT?= --rerun-fails=1 -TESTIFYLINT_OPT?= --enable-all --disable=float-compare,formatter,go-require,require-error,suite-subtest-run,useless-assert +TESTIFYLINT_OPT?= --enable-all --disable=float-compare,formatter,require-error,suite-subtest-run,useless-assert # BUILD_TYPE should be one of (dev, release). BUILD_TYPE?=release diff --git a/receiver/apachereceiver/scraper_test.go b/receiver/apachereceiver/scraper_test.go index 295c1a6fb8c77..beeb1530f7a51 100644 --- a/receiver/apachereceiver/scraper_test.go +++ b/receiver/apachereceiver/scraper_test.go @@ -13,6 +13,7 @@ import ( "path/filepath" "testing" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" @@ -189,7 +190,7 @@ Load15: 0.3 Total Duration: 1501 Scoreboard: S_DD_L_GGG_____W__IIII_C________________W__________________________________.........................____WR______W____W________________________C______________________________________W_W____W______________R_________R________C_________WK_W________K_____W__C__________W___R______............................................................................................................................. `)) - require.NoError(t, err) + assert.NoError(t, err) return } rw.WriteHeader(404) diff --git a/receiver/apachesparkreceiver/client_test.go b/receiver/apachesparkreceiver/client_test.go index 7c81b31322e76..cd0a1f1665d70 100644 --- a/receiver/apachesparkreceiver/client_test.go +++ b/receiver/apachesparkreceiver/client_test.go @@ -13,6 +13,7 @@ import ( "strings" "testing" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" @@ -82,7 +83,7 @@ func TestClusterStats(t *testing.T) { w.WriteHeader(http.StatusUnauthorized) } else { _, err := w.Write(data) - require.NoError(t, err) + assert.NoError(t, err) } })) defer ts.Close() @@ -102,11 +103,11 @@ func TestClusterStats(t *testing.T) { var err error if strings.HasSuffix(r.RequestURI, "/metrics/json") { _, err = w.Write([]byte("[{}]")) - require.NoError(t, err) + assert.NoError(t, err) } else { _, err = w.Write(data) } - require.NoError(t, err) + assert.NoError(t, err) })) defer ts.Close() @@ -125,9 +126,9 @@ func TestClusterStats(t *testing.T) { var err error if strings.HasSuffix(r.RequestURI, "/metrics/json") { _, err = w.Write(data) - require.NoError(t, err) + assert.NoError(t, err) } - require.NoError(t, err) + assert.NoError(t, err) })) defer ts.Close() @@ -165,7 +166,7 @@ func TestApplications(t *testing.T) { w.WriteHeader(http.StatusUnauthorized) } else { _, err := w.Write(data) - require.NoError(t, err) + assert.NoError(t, err) } })) defer ts.Close() @@ -185,11 +186,11 @@ func TestApplications(t *testing.T) { var err error if strings.HasSuffix(r.RequestURI, "applications") { _, err = w.Write([]byte("")) - require.NoError(t, err) + assert.NoError(t, err) } else { _, err = w.Write(data) } - require.NoError(t, err) + assert.NoError(t, err) })) defer ts.Close() @@ -208,9 +209,9 @@ func TestApplications(t *testing.T) { var err error if strings.HasSuffix(r.RequestURI, "applications") { _, err = w.Write(data) - require.NoError(t, err) + assert.NoError(t, err) } - require.NoError(t, err) + assert.NoError(t, err) })) defer ts.Close() @@ -248,7 +249,7 @@ func TestStageStats(t *testing.T) { w.WriteHeader(http.StatusUnauthorized) } else { _, err := w.Write(data) - require.NoError(t, err) + assert.NoError(t, err) } })) defer ts.Close() @@ -268,11 +269,11 @@ func TestStageStats(t *testing.T) { var err error if strings.HasSuffix(r.RequestURI, "stages") { _, err = w.Write([]byte("")) - require.NoError(t, err) + assert.NoError(t, err) } else { _, err = w.Write(data) } - require.NoError(t, err) + assert.NoError(t, err) })) defer ts.Close() @@ -291,9 +292,9 @@ func TestStageStats(t *testing.T) { var err error if strings.HasSuffix(r.RequestURI, "stages") { _, err = w.Write(data) - require.NoError(t, err) + assert.NoError(t, err) } - require.NoError(t, err) + assert.NoError(t, err) })) defer ts.Close() @@ -331,7 +332,7 @@ func TestExecutorStats(t *testing.T) { w.WriteHeader(http.StatusUnauthorized) } else { _, err := w.Write(data) - require.NoError(t, err) + assert.NoError(t, err) } })) defer ts.Close() @@ -351,11 +352,11 @@ func TestExecutorStats(t *testing.T) { var err error if strings.HasSuffix(r.RequestURI, "executors") { _, err = w.Write([]byte("")) - require.NoError(t, err) + assert.NoError(t, err) } else { _, err = w.Write(data) } - require.NoError(t, err) + assert.NoError(t, err) })) defer ts.Close() @@ -374,9 +375,9 @@ func TestExecutorStats(t *testing.T) { var err error if strings.HasSuffix(r.RequestURI, "executors") { _, err = w.Write(data) - require.NoError(t, err) + assert.NoError(t, err) } - require.NoError(t, err) + assert.NoError(t, err) })) defer ts.Close() @@ -414,7 +415,7 @@ func TestJobStats(t *testing.T) { w.WriteHeader(http.StatusUnauthorized) } else { _, err := w.Write(data) - require.NoError(t, err) + assert.NoError(t, err) } })) defer ts.Close() @@ -434,11 +435,11 @@ func TestJobStats(t *testing.T) { var err error if strings.HasSuffix(r.RequestURI, "jobs") { _, err = w.Write([]byte("")) - require.NoError(t, err) + assert.NoError(t, err) } else { _, err = w.Write(data) } - require.NoError(t, err) + assert.NoError(t, err) })) defer ts.Close() @@ -457,9 +458,9 @@ func TestJobStats(t *testing.T) { var err error if strings.HasSuffix(r.RequestURI, "jobs") { _, err = w.Write(data) - require.NoError(t, err) + assert.NoError(t, err) } - require.NoError(t, err) + assert.NoError(t, err) })) defer ts.Close() diff --git a/receiver/bigipreceiver/client_test.go b/receiver/bigipreceiver/client_test.go index 4bf162a751350..9d5c12e5b0fd1 100644 --- a/receiver/bigipreceiver/client_test.go +++ b/receiver/bigipreceiver/client_test.go @@ -14,6 +14,7 @@ import ( "strings" "testing" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" @@ -127,7 +128,7 @@ func TestGetNewToken(t *testing.T) { // Setup test server ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { _, err := w.Write([]byte("[{}]")) - require.NoError(t, err) + assert.NoError(t, err) })) defer ts.Close() @@ -147,7 +148,7 @@ func TestGetNewToken(t *testing.T) { // Setup test server ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { _, err := w.Write(data) - require.NoError(t, err) + assert.NoError(t, err) })) defer ts.Close() @@ -181,7 +182,7 @@ func TestGetVirtualServers(t *testing.T) { w.WriteHeader(http.StatusUnauthorized) } else { _, err := w.Write(data) - require.NoError(t, err) + assert.NoError(t, err) } })) defer ts.Close() @@ -202,11 +203,11 @@ func TestGetVirtualServers(t *testing.T) { var err error if strings.HasSuffix(r.RequestURI, "stats") { _, err = w.Write([]byte("[{}]")) - require.NoError(t, err) + assert.NoError(t, err) } else { _, err = w.Write(data) } - require.NoError(t, err) + assert.NoError(t, err) })) defer ts.Close() @@ -229,7 +230,7 @@ func TestGetVirtualServers(t *testing.T) { } else { _, err = w.Write(data) } - require.NoError(t, err) + assert.NoError(t, err) })) defer ts.Close() @@ -249,7 +250,7 @@ func TestGetVirtualServers(t *testing.T) { ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { if strings.HasSuffix(r.RequestURI, "stats") { _, err := w.Write(statsData) - require.NoError(t, err) + assert.NoError(t, err) } else { w.WriteHeader(http.StatusUnauthorized) } @@ -279,7 +280,7 @@ func TestGetVirtualServers(t *testing.T) { } else { _, err = w.Write([]byte("[{}]")) } - require.NoError(t, err) + assert.NoError(t, err) })) defer ts.Close() @@ -306,7 +307,7 @@ func TestGetVirtualServers(t *testing.T) { } else { _, err = w.Write([]byte("{}")) } - require.NoError(t, err) + assert.NoError(t, err) })) defer ts.Close() @@ -335,7 +336,7 @@ func TestGetVirtualServers(t *testing.T) { } else { _, err = w.Write(data) } - require.NoError(t, err) + assert.NoError(t, err) })) defer ts.Close() @@ -358,7 +359,7 @@ func TestGetVirtualServers(t *testing.T) { // Setup test server ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { _, err := w.Write([]byte("{}")) - require.NoError(t, err) + assert.NoError(t, err) })) defer ts.Close() @@ -404,7 +405,7 @@ func TestGetPools(t *testing.T) { // Setup test server ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { _, err := w.Write([]byte("[{}]")) - require.NoError(t, err) + assert.NoError(t, err) })) defer ts.Close() @@ -423,7 +424,7 @@ func TestGetPools(t *testing.T) { // Setup test server ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { _, err := w.Write(data) - require.NoError(t, err) + assert.NoError(t, err) })) defer ts.Close() @@ -445,7 +446,7 @@ func TestGetPools(t *testing.T) { // Setup test server ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { _, err := w.Write([]byte("{}")) - require.NoError(t, err) + assert.NoError(t, err) })) defer ts.Close() @@ -495,7 +496,7 @@ func TestGetPoolMembers(t *testing.T) { // Setup test server ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { _, err := w.Write([]byte("[{}]")) - require.NoError(t, err) + assert.NoError(t, err) })) defer ts.Close() @@ -519,7 +520,7 @@ func TestGetPoolMembers(t *testing.T) { ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { if strings.Contains(r.RequestURI, "~Common~dev") { _, err := w.Write(data1) - require.NoError(t, err) + assert.NoError(t, err) } else { w.WriteHeader(http.StatusUnauthorized) } @@ -547,7 +548,7 @@ func TestGetPoolMembers(t *testing.T) { ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { if strings.Contains(r.RequestURI, "~Common~dev") { _, err := w.Write([]byte("{}")) - require.NoError(t, err) + assert.NoError(t, err) } else { w.WriteHeader(http.StatusUnauthorized) } @@ -581,7 +582,7 @@ func TestGetPoolMembers(t *testing.T) { } else { _, err = w.Write(data2) } - require.NoError(t, err) + assert.NoError(t, err) })) defer ts.Close() @@ -607,7 +608,7 @@ func TestGetPoolMembers(t *testing.T) { // Setup test server ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { _, err := w.Write([]byte("{}")) - require.NoError(t, err) + assert.NoError(t, err) })) defer ts.Close() @@ -657,7 +658,7 @@ func TestGetNodes(t *testing.T) { // Setup test server ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { _, err := w.Write([]byte("[{}]")) - require.NoError(t, err) + assert.NoError(t, err) })) defer ts.Close() @@ -676,7 +677,7 @@ func TestGetNodes(t *testing.T) { // Setup test server ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { _, err := w.Write(data) - require.NoError(t, err) + assert.NoError(t, err) })) defer ts.Close() @@ -698,7 +699,7 @@ func TestGetNodes(t *testing.T) { // Setup test server ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { _, err := w.Write([]byte("{}")) - require.NoError(t, err) + assert.NoError(t, err) })) defer ts.Close() diff --git a/receiver/couchdbreceiver/client_test.go b/receiver/couchdbreceiver/client_test.go index 2e7169e70d14a..3306e5a145011 100644 --- a/receiver/couchdbreceiver/client_test.go +++ b/receiver/couchdbreceiver/client_test.go @@ -10,6 +10,7 @@ import ( "strings" "testing" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/confighttp" @@ -145,13 +146,13 @@ func TestGetNodeStats(t *testing.T) { if strings.Contains(r.URL.Path, "/invalid_json") { w.WriteHeader(200) _, err := w.Write([]byte(`{"}`)) - require.NoError(t, err) + assert.NoError(t, err) return } if strings.Contains(r.URL.Path, "/_stats/couchdb") { w.WriteHeader(200) _, err := w.Write([]byte(`{"key":["value"]}`)) - require.NoError(t, err) + assert.NoError(t, err) return } w.WriteHeader(404) diff --git a/receiver/elasticsearchreceiver/client_test.go b/receiver/elasticsearchreceiver/client_test.go index bf0af5f81645e..c9e5a2d491250 100644 --- a/receiver/elasticsearchreceiver/client_test.go +++ b/receiver/elasticsearchreceiver/client_test.go @@ -13,6 +13,7 @@ import ( "strings" "testing" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/confighttp" @@ -638,14 +639,14 @@ func newMockServer(t *testing.T, opts ...mockServerOption) *httptest.Server { if req.URL.Path == "/" { rw.WriteHeader(200) _, err := rw.Write(mock.metadata) - require.NoError(t, err) + assert.NoError(t, err) return } for prefix, payload := range mock.prefixes { if strings.HasPrefix(req.URL.Path, prefix) { rw.WriteHeader(200) _, err := rw.Write(payload) - require.NoError(t, err) + assert.NoError(t, err) return } } diff --git a/receiver/expvarreceiver/scraper_test.go b/receiver/expvarreceiver/scraper_test.go index 38d6a22f142f3..713a8274e51f3 100644 --- a/receiver/expvarreceiver/scraper_test.go +++ b/receiver/expvarreceiver/scraper_test.go @@ -11,6 +11,7 @@ import ( "path/filepath" "testing" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pmetric" @@ -89,7 +90,7 @@ func newMockServer(tb testing.TB, responseBodyFile string) *httptest.Server { if req.URL.Path == defaultPath { rw.WriteHeader(http.StatusOK) _, err := rw.Write(fileContents) - require.NoError(tb, err) + assert.NoError(tb, err) return } rw.WriteHeader(http.StatusNotFound) diff --git a/receiver/flinkmetricsreceiver/client_test.go b/receiver/flinkmetricsreceiver/client_test.go index d11d9b018d943..01a07ca4a6b4c 100644 --- a/receiver/flinkmetricsreceiver/client_test.go +++ b/receiver/flinkmetricsreceiver/client_test.go @@ -14,6 +14,7 @@ import ( "regexp" "testing" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" @@ -142,7 +143,7 @@ func TestGetJobmanagerMetrics(t *testing.T) { testFunc: func(t *testing.T) { ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { _, err := w.Write([]byte("{")) - require.NoError(t, err) + assert.NoError(t, err) })) defer ts.Close() @@ -159,7 +160,7 @@ func TestGetJobmanagerMetrics(t *testing.T) { jobmanagerMetricValuesData := loadAPIResponseData(t, apiResponses, jobmanagerMetricValues) ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { _, err := w.Write(jobmanagerMetricValuesData) - require.NoError(t, err) + assert.NoError(t, err) })) defer ts.Close() @@ -211,7 +212,7 @@ func TestGetTaskmanagersMetrics(t *testing.T) { testFunc: func(t *testing.T) { ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { _, err := w.Write([]byte(`{`)) - require.NoError(t, err) + assert.NoError(t, err) })) defer ts.Close() @@ -229,12 +230,12 @@ func TestGetTaskmanagersMetrics(t *testing.T) { ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { if match, _ := regexp.MatchString(taskmanagerIDsRegex, r.URL.Path); match { _, err := w.Write(taskmanagerIDs) - require.NoError(t, err) + assert.NoError(t, err) return } _, err := w.Write([]byte("{")) - require.NoError(t, err) + assert.NoError(t, err) })) defer ts.Close() @@ -253,13 +254,13 @@ func TestGetTaskmanagersMetrics(t *testing.T) { ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { if match, _ := regexp.MatchString(taskmanagerIDsRegex, r.URL.Path); match { _, err := w.Write(taskmanagerIDs) - require.NoError(t, err) + assert.NoError(t, err) return } if match, _ := regexp.MatchString(taskmanagerMetricNamesRegex, r.URL.Path); match { _, err := w.Write(taskmanagerMetricValuesData) - require.NoError(t, err) + assert.NoError(t, err) return } })) @@ -312,7 +313,7 @@ func TestGetJobsMetrics(t *testing.T) { testFunc: func(t *testing.T) { ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { _, err := w.Write([]byte(`{`)) - require.NoError(t, err) + assert.NoError(t, err) })) defer ts.Close() @@ -330,11 +331,11 @@ func TestGetJobsMetrics(t *testing.T) { ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { if r.URL.Path == jobsOverviewEndpoint { _, err := w.Write(jobsOverviewData) - require.NoError(t, err) + assert.NoError(t, err) return } _, err := w.Write([]byte(`{`)) - require.NoError(t, err) + assert.NoError(t, err) })) defer ts.Close() @@ -353,12 +354,12 @@ func TestGetJobsMetrics(t *testing.T) { ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { if r.URL.Path == jobsOverviewEndpoint { _, err := w.Write(jobsOverviewData) - require.NoError(t, err) + assert.NoError(t, err) return } if match, _ := regexp.MatchString(jobsMetricNamesRegex, r.URL.Path); match { _, err := w.Write(jobsMetricValuesData) - require.NoError(t, err) + assert.NoError(t, err) return } })) @@ -414,7 +415,7 @@ func TestGetSubtasksMetrics(t *testing.T) { testFunc: func(t *testing.T) { ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { _, err := w.Write([]byte("{")) - require.NoError(t, err) + assert.NoError(t, err) })) defer ts.Close() @@ -432,11 +433,11 @@ func TestGetSubtasksMetrics(t *testing.T) { jobsData := loadAPIResponseData(t, apiResponses, jobsIDs) if r.URL.Path == jobsEndpoint { _, err := w.Write(jobsData) - require.NoError(t, err) + assert.NoError(t, err) return } _, err := w.Write([]byte("{")) - require.NoError(t, err) + assert.NoError(t, err) })) defer ts.Close() @@ -455,16 +456,16 @@ func TestGetSubtasksMetrics(t *testing.T) { jobsWithIDData := loadAPIResponseData(t, apiResponses, jobsWithID) if r.URL.Path == jobsEndpoint { _, err := w.Write(jobsData) - require.NoError(t, err) + assert.NoError(t, err) return } if match, _ := regexp.MatchString(jobsWithIDRegex, r.URL.Path); match { _, err := w.Write(jobsWithIDData) - require.NoError(t, err) + assert.NoError(t, err) return } _, err := w.Write([]byte("{")) - require.NoError(t, err) + assert.NoError(t, err) })) defer ts.Close() @@ -484,21 +485,21 @@ func TestGetSubtasksMetrics(t *testing.T) { verticesData := loadAPIResponseData(t, apiResponses, vertices) if r.URL.Path == jobsEndpoint { _, err := w.Write(jobsData) - require.NoError(t, err) + assert.NoError(t, err) return } if match, _ := regexp.MatchString(jobsWithIDRegex, r.URL.Path); match { _, err := w.Write(jobsWithIDData) - require.NoError(t, err) + assert.NoError(t, err) return } if match, _ := regexp.MatchString(verticesRegex, r.URL.Path); match { _, err := w.Write(verticesData) - require.NoError(t, err) + assert.NoError(t, err) return } _, err := w.Write([]byte("{")) - require.NoError(t, err) + assert.NoError(t, err) })) defer ts.Close() @@ -519,22 +520,22 @@ func TestGetSubtasksMetrics(t *testing.T) { ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { if r.URL.Path == jobsEndpoint { _, err := w.Write(jobsData) - require.NoError(t, err) + assert.NoError(t, err) return } if match, _ := regexp.MatchString(jobsWithIDRegex, r.URL.Path); match { _, err := w.Write(jobsWithIDData) - require.NoError(t, err) + assert.NoError(t, err) return } if match, _ := regexp.MatchString(verticesRegex, r.URL.Path); match { _, err := w.Write(verticesData) - require.NoError(t, err) + assert.NoError(t, err) return } if match, _ := regexp.MatchString(subtaskMetricNamesRegex, r.URL.Path); match { _, err := w.Write(subtaskMetricValuesData) - require.NoError(t, err) + assert.NoError(t, err) return } })) diff --git a/receiver/fluentforwardreceiver/receiver_test.go b/receiver/fluentforwardreceiver/receiver_test.go index 6831819de3375..d90e69296bbc5 100644 --- a/receiver/fluentforwardreceiver/receiver_test.go +++ b/receiver/fluentforwardreceiver/receiver_test.go @@ -13,6 +13,7 @@ import ( "testing" "time" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/tinylib/msgp/msgp" "go.opentelemetry.io/collector/consumer/consumertest" @@ -51,7 +52,7 @@ func setupServer(t *testing.T) (func() net.Conn, *consumertest.LogsSink, *observ go func() { <-ctx.Done() - require.NoError(t, receiver.Shutdown(ctx)) + assert.NoError(t, receiver.Shutdown(ctx)) }() return connect, next, logObserver, cancel @@ -381,10 +382,10 @@ func TestHighVolume(t *testing.T) { for j := 0; j < totalMessagesPerRoutine; j++ { eventBytes := makeSampleEvent(fmt.Sprintf("tag-%d-%d", num, j)) n, err := conn.Write(eventBytes) - require.NoError(t, err) - require.Equal(t, len(eventBytes), n) + assert.NoError(t, err) + assert.Equal(t, len(eventBytes), n) } - require.NoError(t, conn.Close()) + assert.NoError(t, conn.Close()) wg.Done() }(i) } diff --git a/receiver/haproxyreceiver/scraper_test.go b/receiver/haproxyreceiver/scraper_test.go index 38bb9c2178a20..ed6001750d22e 100644 --- a/receiver/haproxyreceiver/scraper_test.go +++ b/receiver/haproxyreceiver/scraper_test.go @@ -11,6 +11,7 @@ import ( "path/filepath" "testing" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/receiver/receivertest" @@ -28,22 +29,22 @@ func Test_scraper_readStats(t *testing.T) { go func() { c, err2 := l.Accept() - require.NoError(t, err2) + assert.NoError(t, err2) buf := make([]byte, 512) nr, err2 := c.Read(buf) - require.NoError(t, err2) + assert.NoError(t, err2) data := string(buf[0:nr]) switch data { case "show stat\n": stats, err2 := os.ReadFile(filepath.Join("testdata", "stats.txt")) - require.NoError(t, err2) + assert.NoError(t, err2) _, err2 = c.Write(stats) - require.NoError(t, err2) - require.NoError(t, c.Close()) + assert.NoError(t, err2) + assert.NoError(t, c.Close()) default: - require.Fail(t, fmt.Sprintf("invalid message: %v", data)) + assert.Fail(t, fmt.Sprintf("invalid message: %v", data)) } }() @@ -72,22 +73,22 @@ func Test_scraper_readStatsWithIncompleteValues(t *testing.T) { go func() { c, err2 := l.Accept() - require.NoError(t, err2) + assert.NoError(t, err2) buf := make([]byte, 512) nr, err2 := c.Read(buf) - require.NoError(t, err2) + assert.NoError(t, err2) data := string(buf[0:nr]) switch data { case "show stat\n": stats, err2 := os.ReadFile(filepath.Join("testdata", "30252_stats.txt")) - require.NoError(t, err2) + assert.NoError(t, err2) _, err2 = c.Write(stats) - require.NoError(t, err2) - require.NoError(t, c.Close()) + assert.NoError(t, err2) + assert.NoError(t, c.Close()) default: - require.Fail(t, fmt.Sprintf("invalid message: %v", data)) + assert.Fail(t, fmt.Sprintf("invalid message: %v", data)) } }() @@ -116,22 +117,22 @@ func Test_scraper_readStatsWithNoValues(t *testing.T) { go func() { c, err2 := l.Accept() - require.NoError(t, err2) + assert.NoError(t, err2) buf := make([]byte, 512) nr, err2 := c.Read(buf) - require.NoError(t, err2) + assert.NoError(t, err2) data := string(buf[0:nr]) switch data { case "show stat\n": stats, err2 := os.ReadFile(filepath.Join("testdata", "empty_stats.txt")) - require.NoError(t, err2) + assert.NoError(t, err2) _, err2 = c.Write(stats) - require.NoError(t, err2) - require.NoError(t, c.Close()) + assert.NoError(t, err2) + assert.NoError(t, c.Close()) default: - require.Fail(t, fmt.Sprintf("invalid message: %v", data)) + assert.Fail(t, fmt.Sprintf("invalid message: %v", data)) } }()