[chore]: enable bool-compare rule from testifylint (#5829)

#### 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 <matthieu.morel35@gmail.com> Co-authored-by: Damien Mathieu <42@dmathieu.com>
open-telemetry · Sep 20, 2024 · aef9e4f · aef9e4f
1 parent a200e0a
commit aef9e4f
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 37 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -25,6 +25,7 @@ linters:
     - revive
     - staticcheck
     - tenv
+    - testifylint
     - typecheck
     - unconvert
     - unused
@@ -302,3 +303,16 @@ linters-settings:
       # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md#waitgroup-by-value
       - name: waitgroup-by-value
         disabled: false
+  testifylint:
+    enable-all: true
+    disable:
+      - empty
+      - error-is-as
+      - error-nil
+      - expected-actual
+      - float-compare
+      - go-require
+      - len
+      - negative-positive
+      - require-error
+      - suite-extra-assert-call
diff --git a/exporters/otlp/otlpmetric/otlpmetricgrpc/internal/oconf/options_test.go b/exporters/otlp/otlpmetric/otlpmetricgrpc/internal/oconf/options_test.go
@@ -101,7 +101,7 @@ func TestConfigs(t *testing.T) {
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "someendpoint", c.Metrics.Endpoint)
 				assert.Equal(t, "/somepath", c.Metrics.URLPath)
-				assert.Equal(t, true, c.Metrics.Insecure)
+				assert.True(t, c.Metrics.Insecure)
 			},
 		},
 		{
@@ -112,7 +112,7 @@ func TestConfigs(t *testing.T) {
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "someendpoint", c.Metrics.Endpoint)
 				assert.Equal(t, "/somepath", c.Metrics.URLPath)
-				assert.Equal(t, false, c.Metrics.Insecure)
+				assert.False(t, c.Metrics.Insecure)
 			},
 		},
 		{
@@ -213,7 +213,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_endpoint", c.Metrics.Endpoint)
-				assert.Equal(t, true, c.Metrics.Insecure)
+				assert.True(t, c.Metrics.Insecure)
 			},
 		},
 		{
@@ -223,7 +223,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_endpoint", c.Metrics.Endpoint)
-				assert.Equal(t, true, c.Metrics.Insecure)
+				assert.True(t, c.Metrics.Insecure)
 			},
 		},
 		{
@@ -233,7 +233,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_endpoint", c.Metrics.Endpoint)
-				assert.Equal(t, false, c.Metrics.Insecure)
+				assert.False(t, c.Metrics.Insecure)
 			},
 		},
 		{
@@ -244,7 +244,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_metrics_endpoint", c.Metrics.Endpoint)
-				assert.Equal(t, true, c.Metrics.Insecure)
+				assert.True(t, c.Metrics.Insecure)
 			},
 		},
 

diff --git a/exporters/otlp/otlpmetric/otlpmetrichttp/internal/oconf/options_test.go b/exporters/otlp/otlpmetric/otlpmetrichttp/internal/oconf/options_test.go
@@ -101,7 +101,7 @@ func TestConfigs(t *testing.T) {
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "someendpoint", c.Metrics.Endpoint)
 				assert.Equal(t, "/somepath", c.Metrics.URLPath)
-				assert.Equal(t, true, c.Metrics.Insecure)
+				assert.True(t, c.Metrics.Insecure)
 			},
 		},
 		{
@@ -112,7 +112,7 @@ func TestConfigs(t *testing.T) {
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "someendpoint", c.Metrics.Endpoint)
 				assert.Equal(t, "/somepath", c.Metrics.URLPath)
-				assert.Equal(t, false, c.Metrics.Insecure)
+				assert.False(t, c.Metrics.Insecure)
 			},
 		},
 		{
@@ -213,7 +213,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_endpoint", c.Metrics.Endpoint)
-				assert.Equal(t, true, c.Metrics.Insecure)
+				assert.True(t, c.Metrics.Insecure)
 			},
 		},
 		{
@@ -223,7 +223,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_endpoint", c.Metrics.Endpoint)
-				assert.Equal(t, true, c.Metrics.Insecure)
+				assert.True(t, c.Metrics.Insecure)
 			},
 		},
 		{
@@ -233,7 +233,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_endpoint", c.Metrics.Endpoint)
-				assert.Equal(t, false, c.Metrics.Insecure)
+				assert.False(t, c.Metrics.Insecure)
 			},
 		},
 		{
@@ -244,7 +244,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_metrics_endpoint", c.Metrics.Endpoint)
-				assert.Equal(t, true, c.Metrics.Insecure)
+				assert.True(t, c.Metrics.Insecure)
 			},
 		},
 

diff --git a/exporters/otlp/otlptrace/otlptracegrpc/internal/otlpconfig/options_test.go b/exporters/otlp/otlptrace/otlptracegrpc/internal/otlpconfig/options_test.go
@@ -99,7 +99,7 @@ func TestConfigs(t *testing.T) {
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "someendpoint", c.Traces.Endpoint)
 				assert.Equal(t, "/somepath", c.Traces.URLPath)
-				assert.Equal(t, true, c.Traces.Insecure)
+				assert.True(t, c.Traces.Insecure)
 			},
 		},
 		{
@@ -110,7 +110,7 @@ func TestConfigs(t *testing.T) {
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "someendpoint", c.Traces.Endpoint)
 				assert.Equal(t, "/somepath", c.Traces.URLPath)
-				assert.Equal(t, false, c.Traces.Insecure)
+				assert.False(t, c.Traces.Insecure)
 			},
 		},
 		{
@@ -211,7 +211,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_endpoint", c.Traces.Endpoint)
-				assert.Equal(t, true, c.Traces.Insecure)
+				assert.True(t, c.Traces.Insecure)
 			},
 		},
 		{
@@ -221,7 +221,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_endpoint", c.Traces.Endpoint)
-				assert.Equal(t, true, c.Traces.Insecure)
+				assert.True(t, c.Traces.Insecure)
 			},
 		},
 		{
@@ -231,7 +231,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_endpoint", c.Traces.Endpoint)
-				assert.Equal(t, false, c.Traces.Insecure)
+				assert.False(t, c.Traces.Insecure)
 			},
 		},
 		{
@@ -242,7 +242,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_traces_endpoint", c.Traces.Endpoint)
-				assert.Equal(t, true, c.Traces.Insecure)
+				assert.True(t, c.Traces.Insecure)
 			},
 		},
 

diff --git a/exporters/otlp/otlptrace/otlptracehttp/internal/otlpconfig/options_test.go b/exporters/otlp/otlptrace/otlptracehttp/internal/otlpconfig/options_test.go
@@ -99,7 +99,7 @@ func TestConfigs(t *testing.T) {
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "someendpoint", c.Traces.Endpoint)
 				assert.Equal(t, "/somepath", c.Traces.URLPath)
-				assert.Equal(t, true, c.Traces.Insecure)
+				assert.True(t, c.Traces.Insecure)
 			},
 		},
 		{
@@ -110,7 +110,7 @@ func TestConfigs(t *testing.T) {
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "someendpoint", c.Traces.Endpoint)
 				assert.Equal(t, "/somepath", c.Traces.URLPath)
-				assert.Equal(t, false, c.Traces.Insecure)
+				assert.False(t, c.Traces.Insecure)
 			},
 		},
 		{
@@ -211,7 +211,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_endpoint", c.Traces.Endpoint)
-				assert.Equal(t, true, c.Traces.Insecure)
+				assert.True(t, c.Traces.Insecure)
 			},
 		},
 		{
@@ -221,7 +221,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_endpoint", c.Traces.Endpoint)
-				assert.Equal(t, true, c.Traces.Insecure)
+				assert.True(t, c.Traces.Insecure)
 			},
 		},
 		{
@@ -231,7 +231,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_endpoint", c.Traces.Endpoint)
-				assert.Equal(t, false, c.Traces.Insecure)
+				assert.False(t, c.Traces.Insecure)
 			},
 		},
 		{
@@ -242,7 +242,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_traces_endpoint", c.Traces.Endpoint)
-				assert.Equal(t, true, c.Traces.Insecure)
+				assert.True(t, c.Traces.Insecure)
 			},
 		},
 

diff --git a/internal/shared/otlp/otlpmetric/oconf/options_test.go.tmpl b/internal/shared/otlp/otlpmetric/oconf/options_test.go.tmpl
@@ -101,7 +101,7 @@ func TestConfigs(t *testing.T) {
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "someendpoint", c.Metrics.Endpoint)
 				assert.Equal(t, "/somepath", c.Metrics.URLPath)
-				assert.Equal(t, true, c.Metrics.Insecure)
+				assert.True(t, c.Metrics.Insecure)
 			},
 		},
 		{
@@ -112,7 +112,7 @@ func TestConfigs(t *testing.T) {
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "someendpoint", c.Metrics.Endpoint)
 				assert.Equal(t, "/somepath", c.Metrics.URLPath)
-				assert.Equal(t, false, c.Metrics.Insecure)
+				assert.False(t, c.Metrics.Insecure)
 			},
 		},
 		{
@@ -213,7 +213,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_endpoint", c.Metrics.Endpoint)
-				assert.Equal(t, true, c.Metrics.Insecure)
+				assert.True(t, c.Metrics.Insecure)
 			},
 		},
 		{
@@ -223,7 +223,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_endpoint", c.Metrics.Endpoint)
-				assert.Equal(t, true, c.Metrics.Insecure)
+				assert.True(t, c.Metrics.Insecure)
 			},
 		},
 		{
@@ -233,7 +233,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_endpoint", c.Metrics.Endpoint)
-				assert.Equal(t, false, c.Metrics.Insecure)
+				assert.False(t, c.Metrics.Insecure)
 			},
 		},
 		{
@@ -244,7 +244,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_metrics_endpoint", c.Metrics.Endpoint)
-				assert.Equal(t, true, c.Metrics.Insecure)
+				assert.True(t, c.Metrics.Insecure)
 			},
 		},
 

diff --git a/internal/shared/otlp/otlptrace/otlpconfig/options_test.go.tmpl b/internal/shared/otlp/otlptrace/otlpconfig/options_test.go.tmpl
@@ -99,7 +99,7 @@ func TestConfigs(t *testing.T) {
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "someendpoint", c.Traces.Endpoint)
 				assert.Equal(t, "/somepath", c.Traces.URLPath)
-				assert.Equal(t, true, c.Traces.Insecure)
+				assert.True(t, c.Traces.Insecure)
 			},
 		},
 		{
@@ -110,7 +110,7 @@ func TestConfigs(t *testing.T) {
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "someendpoint", c.Traces.Endpoint)
 				assert.Equal(t, "/somepath", c.Traces.URLPath)
-				assert.Equal(t, false, c.Traces.Insecure)
+				assert.False(t, c.Traces.Insecure)
 			},
 		},
 		{
@@ -211,7 +211,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_endpoint", c.Traces.Endpoint)
-				assert.Equal(t, true, c.Traces.Insecure)
+				assert.True(t, c.Traces.Insecure)
 			},
 		},
 		{
@@ -221,7 +221,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_endpoint", c.Traces.Endpoint)
-				assert.Equal(t, true, c.Traces.Insecure)
+				assert.True(t, c.Traces.Insecure)
 			},
 		},
 		{
@@ -231,7 +231,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_endpoint", c.Traces.Endpoint)
-				assert.Equal(t, false, c.Traces.Insecure)
+				assert.False(t, c.Traces.Insecure)
 			},
 		},
 		{
@@ -242,7 +242,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_traces_endpoint", c.Traces.Endpoint)
-				assert.Equal(t, true, c.Traces.Insecure)
+				assert.True(t, c.Traces.Insecure)
 			},
 		},
 

diff --git a/log/keyvalue_test.go b/log/keyvalue_test.go
@@ -91,7 +91,7 @@ func TestSortedValueEqual(t *testing.T) {
 	}
 	for _, tc := range testCases {
 		t.Run(tc.value.String(), func(t *testing.T) {
-			assert.Equal(t, true, tc.value.Equal(tc.value2), "%v.Equal(%v)", tc.value, tc.value2)
+			assert.True(t, tc.value.Equal(tc.value2), "%v.Equal(%v)", tc.value, tc.value2)
 		})
 	}
 }