Skip to content

Check context prior to delaying retry in OTLP exporters #7678

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
MrAlias merged 3 commits into from
Dec 7, 2025
Merged

Check context prior to delaying retry in OTLP exporters #7678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7256f7b
Check ctx prior to delaying retry
MrAlias Dec 5, 2025
fc73433
Merge branch 'main' into fix-7673
MrAlias Dec 6, 2025
fedaeb3
Merge branch 'main' into fix-7673
MrAlias Dec 7, 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
5 changes: 5 additions & 0 deletions 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.

5 changes: 5 additions & 0 deletions 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.

5 changes: 5 additions & 0 deletions 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.

5 changes: 5 additions & 0 deletions 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.

5 changes: 5 additions & 0 deletions 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.

5 changes: 5 additions & 0 deletions 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.

5 changes: 5 additions & 0 deletions internal/shared/otlp/retry/retry.go.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,11 @@ func (c Config) RequestFunc(evaluate EvaluateFunc) RequestFunc {
return err
}

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

@bboreham bboreham Jan 16, 2026 •
edited
Loading

Choose a reason for hiding this comment

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

I'd like to suggest using context.Cause() here, which could make the error more useful.

It is already used in this file, from #6898.

I made a PR: #7811

}

if maxElapsedTime != 0 && time.Since(startTime) > maxElapsedTime {
return fmt.Errorf("max retry time elapsed: %w", err)
}
Expand Down