[chore]: enable expected-actual rule from testifylint

.golangci.yml

@@ -125,7 +125,6 @@ linters-settings:
     # TODO: enable all rules
     disable:
       - error-is-as
-      - expected-actual
       - float-compare
       - formatter
       - go-require

Makefile.Common

@@ -38,7 +38,7 @@ SEMCONVGEN   := $(TOOLS_BIN_DIR)/semconvgen
 SEMCONVKIT   := $(TOOLS_BIN_DIR)/semconvkit
 TESTIFYLINT  := $(TOOLS_BIN_DIR)/testifylint
 
-TESTIFYLINT_OPT?= --enable-all --disable=error-is-as,expected-actual,float-compare,formatter,go-require,require-error
+TESTIFYLINT_OPT?= --enable-all --disable=error-is-as,float-compare,formatter,go-require,require-error
 
 .PHONY: install-tools
 install-tools: $(TOOLS_BIN_NAMES)

client/client_test.go

@@ -71,7 +71,7 @@ func TestFromContext(t *testing.T) {
 	}
 	for _, tC := range testCases {
 		t.Run(tC.desc, func(t *testing.T) {
-			assert.Equal(t, FromContext(tC.input), tC.expected)
+			assert.Equal(t, tC.expected, FromContext(tC.input))
 		})
 	}
 }

component/componenttest/nop_telemetry_test.go

@@ -23,5 +23,5 @@ func TestNewNopTelemetrySettings(t *testing.T) {
 		nts.MeterProvider.Meter("test")
 	})
 	assert.Equal(t, configtelemetry.LevelNone, nts.MetricsLevel)
-	assert.Equal(t, nts.Resource.Attributes().Len(), 0)
+	assert.Equal(t, 0, nts.Resource.Attributes().Len())
 }

config/confighttp/confighttp_test.go

@@ -1249,8 +1249,8 @@ func TestFailedServerAuth(t *testing.T) {
 	srv.Handler.ServeHTTP(response, httptest.NewRequest("GET", "/", nil))
 
 	// verify
-	assert.Equal(t, response.Result().StatusCode, http.StatusUnauthorized)
-	assert.Equal(t, response.Result().Status, fmt.Sprintf("%v %s", http.StatusUnauthorized, http.StatusText(http.StatusUnauthorized)))
+	assert.Equal(t, http.StatusUnauthorized, response.Result().StatusCode)
+	assert.Equal(t, fmt.Sprintf("%v %s", http.StatusUnauthorized, http.StatusText(http.StatusUnauthorized)), response.Result().Status)
 }
 
 func TestServerWithErrorHandler(t *testing.T) {
@@ -1259,7 +1259,7 @@ func TestServerWithErrorHandler(t *testing.T) {
 		Endpoint: "localhost:0",
 	}
 	eh := func(w http.ResponseWriter, _ *http.Request, _ string, statusCode int) {
-		assert.Equal(t, statusCode, http.StatusBadRequest)
+		assert.Equal(t, http.StatusBadRequest, statusCode)
 		// custom error handler changes returned status code
 		http.Error(w, "invalid request", http.StatusInternalServerError)
 	}
@@ -1281,7 +1281,7 @@ func TestServerWithErrorHandler(t *testing.T) {
 
 	srv.Handler.ServeHTTP(response, req)
 	// verify
-	assert.Equal(t, response.Result().StatusCode, http.StatusInternalServerError)
+	assert.Equal(t, http.StatusInternalServerError, response.Result().StatusCode)
 }
 
 func TestServerWithDecoder(t *testing.T) {
@@ -1309,7 +1309,7 @@ func TestServerWithDecoder(t *testing.T) {
 
 	srv.Handler.ServeHTTP(response, req)
 	// verify
-	assert.Equal(t, response.Result().StatusCode, http.StatusOK)
+	assert.Equal(t, http.StatusOK, response.Result().StatusCode)
 
 }
 
@@ -1356,7 +1356,7 @@ func TestServerWithDecompression(t *testing.T) {
 
 	// verifications is done mostly within the test, but this is only a sanity check
 	// that we got into the test handler
-	assert.Equal(t, resp.StatusCode, http.StatusBadRequest)
+	assert.Equal(t, http.StatusBadRequest, resp.StatusCode)
 }
 
 func TestDefaultMaxRequestBodySize(t *testing.T) {

confmap/internal/e2e/types_test.go

@@ -419,43 +419,42 @@ func TestIssue10787(t *testing.T) {
 	resolver := NewResolver(t, "issue-10787-main.yaml")
 	conf, err := resolver.Resolve(context.Background())
 	require.NoError(t, err)
-	assert.Equal(t, conf.ToStringMap(),
-		map[string]any{
-			"exporters": map[string]any{
-				"debug": map[string]any{
-					"verbosity": "detailed",
-				},
-			},
-			"processors": map[string]any{
-				"batch": nil,
+	assert.Equal(t, map[string]any{
+		"exporters": map[string]any{
+			"debug": map[string]any{
+				"verbosity": "detailed",
 			},
-			"receivers": map[string]any{
-				"otlp": map[string]any{
-					"protocols": map[string]any{
-						"grpc": map[string]any{
-							"endpoint": "0.0.0.0:4317",
-						},
-						"http": map[string]any{
-							"endpoint": "0.0.0.0:4318",
-						},
+		},
+		"processors": map[string]any{
+			"batch": nil,
+		},
+		"receivers": map[string]any{
+			"otlp": map[string]any{
+				"protocols": map[string]any{
+					"grpc": map[string]any{
+						"endpoint": "0.0.0.0:4317",
+					},
+					"http": map[string]any{
+						"endpoint": "0.0.0.0:4318",
 					},
 				},
 			},
-			"service": map[string]any{
-				"pipelines": map[string]any{
-					"traces": map[string]any{
-						"exporters":  []any{"debug"},
-						"processors": []any{"batch"},
-						"receivers":  []any{"otlp"},
-					},
+		},
+		"service": map[string]any{
+			"pipelines": map[string]any{
+				"traces": map[string]any{
+					"exporters":  []any{"debug"},
+					"processors": []any{"batch"},
+					"receivers":  []any{"otlp"},
 				},
-				"telemetry": map[string]any{
-					"metrics": map[string]any{
-						"level": "detailed",
-					},
+			},
+			"telemetry": map[string]any{
+				"metrics": map[string]any{
+					"level": "detailed",
 				},
 			},
 		},
+	}, conf.ToStringMap(),
 	)
 }
 
@@ -582,9 +581,9 @@ func TestIndirectSliceEnvVar(t *testing.T) {
 	var collectorConf CollectorConf
 	err = conf.Unmarshal(&collectorConf)
 	require.NoError(t, err)
-	assert.Equal(t, collectorConf.Exporters.OTLP.Endpoint, "localhost:4317")
-	assert.Equal(t, collectorConf.Service.Pipelines.Logs.Receivers, []string{"nop", "otlp"})
-	assert.Equal(t, collectorConf.Service.Pipelines.Logs.Exporters, []string{"otlp", "nop"})
+	assert.Equal(t, "localhost:4317", collectorConf.Exporters.OTLP.Endpoint)
+	assert.Equal(t, []string{"nop", "otlp"}, collectorConf.Service.Pipelines.Logs.Receivers)
+	assert.Equal(t, []string{"otlp", "nop"}, collectorConf.Service.Pipelines.Logs.Exporters)
 }
 
 func TestIssue10937_MapType(t *testing.T) {

exporter/debugexporter/config_test.go

@@ -94,7 +94,7 @@ func Test_UnmarshalMarshalled(t *testing.T) {
 
 			if tc.expectedErr == "" {
 				assert.NoError(t, err)
-				assert.Equal(t, outCfg, tc.expectedConfig)
+				assert.Equal(t, tc.expectedConfig, outCfg)
 				return
 			}
 			assert.Error(t, err)

exporter/exporterhelper/logs_test.go

@@ -359,7 +359,7 @@ func TestLogsExporter_WithShutdown_ReturnError(t *testing.T) {
 	assert.NotNil(t, le)
 	assert.NoError(t, err)
 
-	assert.Equal(t, le.Shutdown(context.Background()), want)
+	assert.Equal(t, want, le.Shutdown(context.Background()))
 }
 
 func TestLogsRequestExporter_WithShutdown_ReturnError(t *testing.T) {
@@ -371,7 +371,7 @@ func TestLogsRequestExporter_WithShutdown_ReturnError(t *testing.T) {
 	assert.NotNil(t, le)
 	assert.NoError(t, err)
 
-	assert.Equal(t, le.Shutdown(context.Background()), want)
+	assert.Equal(t, want, le.Shutdown(context.Background()))
 }
 
 func newPushLogsDataModifiedDownstream(retError error) consumer.ConsumeLogsFunc {

exporter/exporterhelper/traces_test.go

@@ -365,7 +365,7 @@ func TestTracesExporter_WithShutdown_ReturnError(t *testing.T) {
 	assert.NoError(t, err)
 
 	assert.NoError(t, te.Start(context.Background(), componenttest.NewNopHost()))
-	assert.Equal(t, te.Shutdown(context.Background()), want)
+	assert.Equal(t, want, te.Shutdown(context.Background()))
 }
 
 func TestTracesRequestExporter_WithShutdown_ReturnError(t *testing.T) {
@@ -378,7 +378,7 @@ func TestTracesRequestExporter_WithShutdown_ReturnError(t *testing.T) {
 	assert.NoError(t, err)
 
 	assert.NoError(t, te.Start(context.Background(), componenttest.NewNopHost()))
-	assert.Equal(t, te.Shutdown(context.Background()), want)
+	assert.Equal(t, want, te.Shutdown(context.Background()))
 }
 
 func newTraceDataPusher(retError error) consumer.ConsumeTracesFunc {

exporter/exportertest/contract_checker.go

@@ -228,9 +228,9 @@ func checkLogs(t *testing.T, params CheckConsumeContractParams, mockReceiver com
 // Test is successful if all the elements were received successfully and no error was returned
 func alwaysSucceedsPassed(t *testing.T, allRecordsNumber int, reqCounter requestCounter) {
 	require.Equal(t, allRecordsNumber, reqCounter.success)
-	require.Equal(t, reqCounter.total, allRecordsNumber)
-	require.Equal(t, reqCounter.error.nonpermanent, 0)
-	require.Equal(t, reqCounter.error.permanent, 0)
+	require.Equal(t, allRecordsNumber, reqCounter.total)
+	require.Equal(t, 0, reqCounter.error.nonpermanent)
+	require.Equal(t, 0, reqCounter.error.permanent)
 }
 
 // Test is successful if all the elements were retried on non-permanent errors

exporter/exportertest/mock_consumer_test.go

@@ -130,10 +130,10 @@ func TestConsumeLogsNonPermanent(t *testing.T) {
 	if err != nil {
 		return
 	}
-	assert.Equal(t, mc.reqCounter.error.nonpermanent, 1)
-	assert.Equal(t, mc.reqCounter.error.permanent, 0)
-	assert.Equal(t, mc.reqCounter.success, 0)
-	assert.Equal(t, mc.reqCounter.total, 1)
+	assert.Equal(t, 1, mc.reqCounter.error.nonpermanent)
+	assert.Equal(t, 0, mc.reqCounter.error.permanent)
+	assert.Equal(t, 0, mc.reqCounter.success)
+	assert.Equal(t, 1, mc.reqCounter.total)
 
 }
 
@@ -145,10 +145,10 @@ func TestConsumeLogsPermanent(t *testing.T) {
 	if err != nil {
 		return
 	}
-	assert.Equal(t, mc.reqCounter.error.nonpermanent, 0)
-	assert.Equal(t, mc.reqCounter.error.permanent, 1)
-	assert.Equal(t, mc.reqCounter.success, 0)
-	assert.Equal(t, mc.reqCounter.total, 1)
+	assert.Equal(t, 0, mc.reqCounter.error.nonpermanent)
+	assert.Equal(t, 1, mc.reqCounter.error.permanent)
+	assert.Equal(t, 0, mc.reqCounter.success)
+	assert.Equal(t, 1, mc.reqCounter.total)
 
 }
 
@@ -159,10 +159,10 @@ func TestConsumeLogsSuccess(t *testing.T) {
 	if err != nil {
 		return
 	}
-	assert.Equal(t, mc.reqCounter.error.nonpermanent, 0)
-	assert.Equal(t, mc.reqCounter.error.permanent, 0)
-	assert.Equal(t, mc.reqCounter.success, 1)
-	assert.Equal(t, mc.reqCounter.total, 1)
+	assert.Equal(t, 0, mc.reqCounter.error.nonpermanent)
+	assert.Equal(t, 0, mc.reqCounter.error.permanent)
+	assert.Equal(t, 1, mc.reqCounter.success)
+	assert.Equal(t, 1, mc.reqCounter.total)
 
 }
 
@@ -173,10 +173,10 @@ func TestConsumeTracesNonPermanent(t *testing.T) {
 	if err != nil {
 		return
 	}
-	assert.Equal(t, mc.reqCounter.error.nonpermanent, 1)
-	assert.Equal(t, mc.reqCounter.error.permanent, 0)
-	assert.Equal(t, mc.reqCounter.success, 0)
-	assert.Equal(t, mc.reqCounter.total, 1)
+	assert.Equal(t, 1, mc.reqCounter.error.nonpermanent)
+	assert.Equal(t, 0, mc.reqCounter.error.permanent)
+	assert.Equal(t, 0, mc.reqCounter.success)
+	assert.Equal(t, 1, mc.reqCounter.total)
 
 }
 
@@ -188,10 +188,10 @@ func TestConsumeTracesPermanent(t *testing.T) {
 	if err != nil {
 		return
 	}
-	assert.Equal(t, mc.reqCounter.error.nonpermanent, 0)
-	assert.Equal(t, mc.reqCounter.error.permanent, 1)
-	assert.Equal(t, mc.reqCounter.success, 0)
-	assert.Equal(t, mc.reqCounter.total, 1)
+	assert.Equal(t, 0, mc.reqCounter.error.nonpermanent)
+	assert.Equal(t, 1, mc.reqCounter.error.permanent)
+	assert.Equal(t, 0, mc.reqCounter.success)
+	assert.Equal(t, 1, mc.reqCounter.total)
 
 }
 
@@ -202,10 +202,10 @@ func TestConsumeTracesSuccess(t *testing.T) {
 	if err != nil {
 		return
 	}
-	assert.Equal(t, mc.reqCounter.error.nonpermanent, 0)
-	assert.Equal(t, mc.reqCounter.error.permanent, 0)
-	assert.Equal(t, mc.reqCounter.success, 1)
-	assert.Equal(t, mc.reqCounter.total, 1)
+	assert.Equal(t, 0, mc.reqCounter.error.nonpermanent)
+	assert.Equal(t, 0, mc.reqCounter.error.permanent)
+	assert.Equal(t, 1, mc.reqCounter.success)
+	assert.Equal(t, 1, mc.reqCounter.total)
 
 }
 func TestConsumeMetricsNonPermanent(t *testing.T) {
@@ -215,10 +215,10 @@ func TestConsumeMetricsNonPermanent(t *testing.T) {
 	if err != nil {
 		return
 	}
-	assert.Equal(t, mc.reqCounter.error.nonpermanent, 1)
-	assert.Equal(t, mc.reqCounter.error.permanent, 0)
-	assert.Equal(t, mc.reqCounter.success, 0)
-	assert.Equal(t, mc.reqCounter.total, 1)
+	assert.Equal(t, 1, mc.reqCounter.error.nonpermanent)
+	assert.Equal(t, 0, mc.reqCounter.error.permanent)
+	assert.Equal(t, 0, mc.reqCounter.success)
+	assert.Equal(t, 1, mc.reqCounter.total)
 
 }
 
@@ -229,10 +229,10 @@ func TestConsumeMetricsPermanent(t *testing.T) {
 	if err != nil {
 		return
 	}
-	assert.Equal(t, mc.reqCounter.error.nonpermanent, 0)
-	assert.Equal(t, mc.reqCounter.error.permanent, 1)
-	assert.Equal(t, mc.reqCounter.success, 0)
-	assert.Equal(t, mc.reqCounter.total, 1)
+	assert.Equal(t, 0, mc.reqCounter.error.nonpermanent)
+	assert.Equal(t, 1, mc.reqCounter.error.permanent)
+	assert.Equal(t, 0, mc.reqCounter.success)
+	assert.Equal(t, 1, mc.reqCounter.total)
 
 }
 
@@ -243,14 +243,14 @@ func TestConsumeMetricsSuccess(t *testing.T) {
 	if err != nil {
 		return
 	}
-	assert.Equal(t, mc.reqCounter.error.nonpermanent, 0)
-	assert.Equal(t, mc.reqCounter.error.permanent, 0)
-	assert.Equal(t, mc.reqCounter.success, 1)
-	assert.Equal(t, mc.reqCounter.total, 1)
+	assert.Equal(t, 0, mc.reqCounter.error.nonpermanent)
+	assert.Equal(t, 0, mc.reqCounter.error.permanent)
+	assert.Equal(t, 1, mc.reqCounter.success)
+	assert.Equal(t, 1, mc.reqCounter.total)
 
 }
 
 func TestCapabilites(t *testing.T) {
 	mc := newMockConsumer(func() error { return nil })
-	assert.Equal(t, mc.Capabilities(), consumer.Capabilities{})
+	assert.Equal(t, consumer.Capabilities{}, mc.Capabilities())
 }

exporter/loggingexporter/config_test.go

@@ -138,7 +138,7 @@ func Test_UnmarshalMarshalled(t *testing.T) {
 
 			if tc.expectedErr == "" {
 				assert.NoError(t, err)
-				assert.Equal(t, outCfg, tc.expectedConfig)
+				assert.Equal(t, tc.expectedConfig, outCfg)
 				return
 			}
 			assert.Error(t, err)

exporter/otlpexporter/factory_test.go

@@ -30,10 +30,10 @@ func TestCreateDefaultConfig(t *testing.T) {
 	assert.NoError(t, componenttest.CheckConfigStruct(cfg))
 	ocfg, ok := factory.CreateDefaultConfig().(*Config)
 	assert.True(t, ok)
-	assert.Equal(t, ocfg.RetryConfig, configretry.NewDefaultBackOffConfig())
-	assert.Equal(t, ocfg.QueueConfig, exporterhelper.NewDefaultQueueConfig())
-	assert.Equal(t, ocfg.TimeoutConfig, exporterhelper.NewDefaultTimeoutConfig())
-	assert.Equal(t, ocfg.Compression, configcompression.TypeGzip)
+	assert.Equal(t, configretry.NewDefaultBackOffConfig(), ocfg.RetryConfig)
+	assert.Equal(t, exporterhelper.NewDefaultQueueConfig(), ocfg.QueueConfig)
+	assert.Equal(t, exporterhelper.NewDefaultTimeoutConfig(), ocfg.TimeoutConfig)
+	assert.Equal(t, configcompression.TypeGzip, ocfg.Compression)
 }
 
 func TestCreateMetricsExporter(t *testing.T) {
@@ -181,7 +181,7 @@ func TestCreateTracesExporter(t *testing.T) {
 			if err != nil {
 				// Since the endpoint of OTLP exporter doesn't actually exist,
 				// exporter may already stop because it cannot connect.
-				assert.Equal(t, err.Error(), "rpc error: code = Canceled desc = grpc: the client connection is closing")
+				assert.Equal(t, "rpc error: code = Canceled desc = grpc: the client connection is closing", err.Error())
 			}
 		})
 	}