Merge branch 'main' into testifylint/go-require

.golangci.yml

@@ -247,9 +247,9 @@ linters-settings:
   testifylint:
     enable-all: true
     disable:
-      - compares
       - expected-actual
       - float-compare
       - formatter
+      - go-require
       - negative-positive
       - require-error

instrumentation/runtime/runtime_test.go

@@ -182,7 +182,7 @@ func assertNonZeroValues(t *testing.T, sm metricdata.ScopeMetrics) {
 		switch a := m.Data.(type) {
 		case metricdata.Sum[int64]:
 			for _, dp := range a.DataPoints {
-				assert.True(t, dp.Value > 0, fmt.Sprintf("Metric %q should have a non-zero value for point with attributes %+v", m.Name, dp.Attributes))
+				assert.Positive(t, dp.Value, fmt.Sprintf("Metric %q should have a non-zero value for point with attributes %+v", m.Name, dp.Attributes))
 			}
 		default:
 			t.Fatalf("unexpected data type %v", a)

propagators/b3/b3_propagator_test.go

@@ -301,7 +301,7 @@ func TestB3EncodingOperations(t *testing.T) {
 	for i, e := range encodings {
 		for j := i + 1; j < i+len(encodings); j++ {
 			o := encodings[j%len(encodings)]
-			assert.False(t, e == o, "%v == %v", e, o)
+			assert.NotEqual(t, e, o, "%v == %v", e, o)
 		}
 	}