Skip to content

Relax grpc errors to allow for upgrade #6685

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 23, 2025
Merged

Relax grpc errors to allow for upgrade #6685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
646193b
relax grpc errors to allow for upgrade
dmathieu Apr 22, 2025
264f7f4
Merge branch 'main' into grpc-upgrade-errors
dmathieu Apr 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion exporters/otlp/otlplog/otlploggrpc/internal/retry/retry_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion exporters/otlp/otlplog/otlploghttp/internal/retry/retry_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion exporters/otlp/otlpmetric/otlpmetricgrpc/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion exporters/otlp/otlpmetric/otlpmetricgrpc/internal/retry/retry_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion exporters/otlp/otlpmetric/otlpmetrichttp/internal/retry/retry_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion exporters/otlp/otlptrace/otlptracegrpc/internal/retry/retry_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion exporters/otlp/otlptrace/otlptracehttp/internal/retry/retry_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion internal/shared/otlp/retry/retry_test.go.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Loading