[chore]: use ErrorContains with testify (#11680)

#### Description use ErrorContains with testify when possible Signed-off-by: Matthieu MOREL <[email protected]>
open-telemetry · Nov 14, 2024 · 51d57f0 · 51d57f0
1 parent c5a69c2
commit 51d57f0
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 39 deletions.
diff --git a/component/componenttest/configtest_test.go b/component/componenttest/configtest_test.go
@@ -139,8 +139,7 @@ func TestCheckConfigStruct(t *testing.T) {
 			if tt.wantErrMsgSubStr == "" {
 				assert.NoError(t, err)
 			} else {
-				require.Error(t, err)
-				assert.Contains(t, err.Error(), tt.wantErrMsgSubStr)
+				require.ErrorContains(t, err, tt.wantErrMsgSubStr)
 			}
 		})
 	}

diff --git a/pdata/internal/json/attribute_test.go b/pdata/internal/json/attribute_test.go
@@ -183,9 +183,7 @@ func TestReadValueInvliadBytesValue(t *testing.T) {
 	defer jsoniter.ConfigFastest.ReturnIterator(iter)
 
 	ReadValue(iter, &otlpcommon.AnyValue{})
-	if assert.Error(t, iter.Error) {
-		assert.Contains(t, iter.Error.Error(), "base64")
-	}
+	assert.ErrorContains(t, iter.Error, "base64")
 }
 
 func TestReadArrayUnknownField(t *testing.T) {

diff --git a/pdata/plog/json_test.go b/pdata/plog/json_test.go
@@ -123,17 +123,15 @@ func TestUnmarshalJsoniterLogWrongTraceID(t *testing.T) {
 	iter := jsoniter.ConfigFastest.BorrowIterator([]byte(jsonStr))
 	defer jsoniter.ConfigFastest.ReturnIterator(iter)
 	NewLogRecord().unmarshalJsoniter(iter)
-	require.Error(t, iter.Error)
-	assert.Contains(t, iter.Error.Error(), "parse trace_id")
+	require.ErrorContains(t, iter.Error, "parse trace_id")
 }
 
 func TestUnmarshalJsoniterLogWrongSpanID(t *testing.T) {
 	jsonStr := `{"body":{}, "spanId":"--"}`
 	iter := jsoniter.ConfigFastest.BorrowIterator([]byte(jsonStr))
 	defer jsoniter.ConfigFastest.ReturnIterator(iter)
 	NewLogRecord().unmarshalJsoniter(iter)
-	require.Error(t, iter.Error)
-	assert.Contains(t, iter.Error.Error(), "parse span_id")
+	require.ErrorContains(t, iter.Error, "parse span_id")
 }
 
 func BenchmarkJSONUnmarshal(b *testing.B) {

diff --git a/pdata/pmetric/json_test.go b/pdata/pmetric/json_test.go
@@ -531,19 +531,15 @@ func TestExemplarInvalidTraceID(t *testing.T) {
 	iter := jsoniter.ConfigFastest.BorrowIterator([]byte(jsonStr))
 	defer jsoniter.ConfigFastest.ReturnIterator(iter)
 	NewExemplar().unmarshalJsoniter(iter)
-	if assert.Error(t, iter.Error) {
-		assert.Contains(t, iter.Error.Error(), "parse trace_id")
-	}
+	assert.ErrorContains(t, iter.Error, "parse trace_id")
 }
 
 func TestExemplarInvalidSpanID(t *testing.T) {
 	jsonStr := `{"spanId":"--"}`
 	iter := jsoniter.ConfigFastest.BorrowIterator([]byte(jsonStr))
 	defer jsoniter.ConfigFastest.ReturnIterator(iter)
 	NewExemplar().unmarshalJsoniter(iter)
-	if assert.Error(t, iter.Error) {
-		assert.Contains(t, iter.Error.Error(), "parse span_id")
-	}
+	assert.ErrorContains(t, iter.Error, "parse span_id")
 }
 
 func TestExemplar(t *testing.T) {

diff --git a/pdata/pprofile/json_test.go b/pdata/pprofile/json_test.go
@@ -167,9 +167,7 @@ func TestUnmarshalJsoniterProfileInvalidProfileIDField(t *testing.T) {
 	iter := jsoniter.ConfigFastest.BorrowIterator([]byte(jsonStr))
 	defer jsoniter.ConfigFastest.ReturnIterator(iter)
 	NewProfileContainer().unmarshalJsoniter(iter)
-	if assert.Error(t, iter.Error) {
-		assert.Contains(t, iter.Error.Error(), "parse profile_id")
-	}
+	assert.ErrorContains(t, iter.Error, "parse profile_id")
 }
 
 func TestUnmarshalJsoniterResourceProfiles(t *testing.T) {
@@ -287,19 +285,15 @@ func TestUnmarshalJsoniterLinkInvalidTraceIDField(t *testing.T) {
 	iter := jsoniter.ConfigFastest.BorrowIterator([]byte(jsonStr))
 	defer jsoniter.ConfigFastest.ReturnIterator(iter)
 	NewLink().unmarshalJsoniter(iter)
-	if assert.Error(t, iter.Error) {
-		assert.Contains(t, iter.Error.Error(), "parse trace_id")
-	}
+	assert.ErrorContains(t, iter.Error, "parse trace_id")
 }
 
 func TestUnmarshalJsoniterSpanLinkInvalidSpanIDField(t *testing.T) {
 	jsonStr := `{"span_id":"--"}`
 	iter := jsoniter.ConfigFastest.BorrowIterator([]byte(jsonStr))
 	defer jsoniter.ConfigFastest.ReturnIterator(iter)
 	NewLink().unmarshalJsoniter(iter)
-	if assert.Error(t, iter.Error) {
-		assert.Contains(t, iter.Error.Error(), "parse span_id")
-	}
+	assert.ErrorContains(t, iter.Error, "parse span_id")
 }
 
 func TestUnmarshalJsoniterLabel(t *testing.T) {

diff --git a/pdata/ptrace/json_test.go b/pdata/ptrace/json_test.go
@@ -159,29 +159,23 @@ func TestUnmarshalJsoniterSpanInvalidTraceIDField(t *testing.T) {
 	iter := jsoniter.ConfigFastest.BorrowIterator([]byte(jsonStr))
 	defer jsoniter.ConfigFastest.ReturnIterator(iter)
 	NewSpan().unmarshalJsoniter(iter)
-	if assert.Error(t, iter.Error) {
-		assert.Contains(t, iter.Error.Error(), "parse trace_id")
-	}
+	assert.ErrorContains(t, iter.Error, "parse trace_id")
 }
 
 func TestUnmarshalJsoniterSpanInvalidSpanIDField(t *testing.T) {
 	jsonStr := `{"span_id":"--"}`
 	iter := jsoniter.ConfigFastest.BorrowIterator([]byte(jsonStr))
 	defer jsoniter.ConfigFastest.ReturnIterator(iter)
 	NewSpan().unmarshalJsoniter(iter)
-	if assert.Error(t, iter.Error) {
-		assert.Contains(t, iter.Error.Error(), "parse span_id")
-	}
+	assert.ErrorContains(t, iter.Error, "parse span_id")
 }
 
 func TestUnmarshalJsoniterSpanInvalidParentSpanIDField(t *testing.T) {
 	jsonStr := `{"parent_span_id":"--"}`
 	iter := jsoniter.ConfigFastest.BorrowIterator([]byte(jsonStr))
 	defer jsoniter.ConfigFastest.ReturnIterator(iter)
 	NewSpan().unmarshalJsoniter(iter)
-	if assert.Error(t, iter.Error) {
-		assert.Contains(t, iter.Error.Error(), "parse parent_span_id")
-	}
+	assert.ErrorContains(t, iter.Error, "parse parent_span_id")
 }
 
 func TestUnmarshalJsoniterSpanStatus(t *testing.T) {
@@ -209,19 +203,15 @@ func TestUnmarshalJsoniterSpanLinkInvalidTraceIDField(t *testing.T) {
 	iter := jsoniter.ConfigFastest.BorrowIterator([]byte(jsonStr))
 	defer jsoniter.ConfigFastest.ReturnIterator(iter)
 	NewSpanLink().unmarshalJsoniter(iter)
-	if assert.Error(t, iter.Error) {
-		assert.Contains(t, iter.Error.Error(), "parse trace_id")
-	}
+	assert.ErrorContains(t, iter.Error, "parse trace_id")
 }
 
 func TestUnmarshalJsoniterSpanLinkInvalidSpanIDField(t *testing.T) {
 	jsonStr := `{"span_id":"--"}`
 	iter := jsoniter.ConfigFastest.BorrowIterator([]byte(jsonStr))
 	defer jsoniter.ConfigFastest.ReturnIterator(iter)
 	NewSpanLink().unmarshalJsoniter(iter)
-	if assert.Error(t, iter.Error) {
-		assert.Contains(t, iter.Error.Error(), "parse span_id")
-	}
+	assert.ErrorContains(t, iter.Error, "parse span_id")
 }
 
 func TestUnmarshalJsoniterSpanEvent(t *testing.T) {