Enable RetryInfo by default on ResourceExhausted errors - #7088
Merged
electron0zero merged 3 commits intoApr 30, 2026
Conversation
electron0zero
marked this pull request as ready for review
April 30, 2026 08:11
electron0zero
requested review from
carles-grafana,
ie-pham,
javiermolinar,
knylander-grafana,
mapno,
mattdurham,
mdisibio,
oleg-kozlyuk-grafana,
ruslan-mikhailov,
stoewer,
yvrhdn and
zalegrala
as code owners
April 30, 2026 08:11
Contributor
There was a problem hiding this comment.
Pull request overview
Enables OTLP RetryInfo hints by default for ResourceExhausted responses by changing the cluster default distributor.retry_after_on_resource_exhausted from 0 to 5s, and updates documentation/changelog accordingly.
Changes:
- Default
RetryAfterOnResourceExhaustedto5sat the distributor (cluster) level. - Update docs config reference + manifest to reflect the new default and how to disable it.
- Add a changelog entry describing the breaking default change and the opt-out mechanisms.
Reviewed changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| modules/overrides/config.go | Updates default override comment for ingestion.retry_info_enabled. |
| modules/distributor/config.go | Changes cluster default RetryAfterOnResourceExhausted from 0 to 5s. |
| docs/sources/tempo/configuration/manifest.md | Updates generated manifest default for retry_after_on_resource_exhausted to 5s. |
| docs/sources/tempo/configuration/_index.md | Updates config docs to reflect the new default and disable behavior. |
| CHANGELOG.md | Adds a breaking-change entry for the new default behavior. |
![chatgpt-codex-connector[bot]](https://cdn.statically.io/img/avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 9e1443e5ae
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
carles-grafana
approved these changes
Apr 30, 2026
electron0zero
enabled auto-merge (squash)
April 30, 2026 13:44
mattdurham
pushed a commit
to mattdurham/tempo
that referenced
this pull request
Jun 18, 2026
* Enable RetryInfo by default on ResourceExhausted errors * Add CHANGELOG.md * fix review comments
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What this PR does:
Enable RetryInfo by default on ResourceExhausted errors so client can retry on ResourceExhausted errors.
Related: #3019 and #5741
Which issue(s) this PR fixes:
Fixes #
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]