Relax grpc errors to allow for upgrade (#6685)

#6679 is changing the gRPC errors, which fails our tests.
This change allows those tests to pass so the upgrade can happen.

Author: dmathieu

exporters/otlp/otlplog/otlploggrpc/internal/retry/retry_test.go

@@ -200,7 +200,7 @@ func TestMaxElapsedTime(t *testing.T) {
 	ctx := context.Background()
 	assert.Contains(t, reqFunc(ctx, func(context.Context) error {
 		return assert.AnError
-	}).Error(), "max retry time elapsed: ")
+	}).Error(), "max retry time")
 }
 
 func TestRetryNotEnabled(t *testing.T) {

exporters/otlp/otlplog/otlploghttp/internal/retry/retry_test.go

@@ -200,7 +200,7 @@ func TestMaxElapsedTime(t *testing.T) {
 	ctx := context.Background()
 	assert.Contains(t, reqFunc(ctx, func(context.Context) error {
 		return assert.AnError
-	}).Error(), "max retry time elapsed: ")
+	}).Error(), "max retry time")
 }
 
 func TestRetryNotEnabled(t *testing.T) {

exporters/otlp/otlpmetric/otlpmetricgrpc/client_test.go

@@ -236,7 +236,7 @@ func TestConfig(t *testing.T) {
 		ctx := context.Background()
 		t.Cleanup(func() { require.NoError(t, exp.Shutdown(ctx)) })
 		err := exp.Export(ctx, &metricdata.ResourceMetrics{})
-		assert.ErrorContains(t, err, context.DeadlineExceeded.Error())
+		assert.ErrorContains(t, err, "DeadlineExceeded")
 	})
 
 	t.Run("WithCustomUserAgent", func(t *testing.T) {

exporters/otlp/otlpmetric/otlpmetricgrpc/internal/retry/retry_test.go

@@ -200,7 +200,7 @@ func TestMaxElapsedTime(t *testing.T) {
 	ctx := context.Background()
 	assert.Contains(t, reqFunc(ctx, func(context.Context) error {
 		return assert.AnError
-	}).Error(), "max retry time elapsed: ")
+	}).Error(), "max retry time")
 }
 
 func TestRetryNotEnabled(t *testing.T) {

exporters/otlp/otlpmetric/otlpmetrichttp/internal/retry/retry_test.go

@@ -200,7 +200,7 @@ func TestMaxElapsedTime(t *testing.T) {
 	ctx := context.Background()
 	assert.Contains(t, reqFunc(ctx, func(context.Context) error {
 		return assert.AnError
-	}).Error(), "max retry time elapsed: ")
+	}).Error(), "max retry time")
 }
 
 func TestRetryNotEnabled(t *testing.T) {

exporters/otlp/otlptrace/otlptracegrpc/internal/retry/retry_test.go

@@ -200,7 +200,7 @@ func TestMaxElapsedTime(t *testing.T) {
 	ctx := context.Background()
 	assert.Contains(t, reqFunc(ctx, func(context.Context) error {
 		return assert.AnError
-	}).Error(), "max retry time elapsed: ")
+	}).Error(), "max retry time")
 }
 
 func TestRetryNotEnabled(t *testing.T) {

exporters/otlp/otlptrace/otlptracehttp/internal/retry/retry_test.go

@@ -200,7 +200,7 @@ func TestMaxElapsedTime(t *testing.T) {
 	ctx := context.Background()
 	assert.Contains(t, reqFunc(ctx, func(context.Context) error {
 		return assert.AnError
-	}).Error(), "max retry time elapsed: ")
+	}).Error(), "max retry time")
 }
 
 func TestRetryNotEnabled(t *testing.T) {

internal/shared/otlp/retry/retry_test.go.tmpl

@@ -200,7 +200,7 @@ func TestMaxElapsedTime(t *testing.T) {
 	ctx := context.Background()
 	assert.Contains(t, reqFunc(ctx, func(context.Context) error {
 		return assert.AnError
-	}).Error(), "max retry time elapsed: ")
+	}).Error(), "max retry time")
 }
 
 func TestRetryNotEnabled(t *testing.T) {