Skip to content

otlp: wrap the Cause error when context is canceled #7811

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

Open
bboreham wants to merge 1 commit into
base: main
Choose a base branch
from
Open

otlp: wrap the Cause error when context is canceled #7811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion exporters/otlp/otlplog/otlploghttp/internal/retry/retry.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion exporters/otlp/otlpmetric/otlpmetricgrpc/internal/retry/retry.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion exporters/otlp/otlpmetric/otlpmetrichttp/internal/retry/retry.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion exporters/otlp/otlptrace/otlptracegrpc/internal/retry/retry.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion exporters/otlp/otlptrace/otlptracehttp/internal/retry/retry.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/shared/otlp/retry/retry.go.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func (c Config) RequestFunc(evaluate EvaluateFunc) RequestFunc {

// Check if context is canceled before attempting to wait and retry.
if ctx.Err() != nil {
return fmt.Errorf("%w: %w", ctx.Err(), err)
return fmt.Errorf("%w: %w", context.Cause(ctx), err)
Copy link
Copy Markdown
Member

@pellared pellared Jan 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add a new test case in TestWait that would cover the change?

}

if maxElapsedTime != 0 && time.Since(startTime) > maxElapsedTime {
Expand Down
Loading