Track retry counts originating from early middleware errors #17274
+57
−4
Conversation
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
EliteTK
temporarily deployed
to
uv-test-registries
GitHub Actions
Inactive
Contributor
Author
EliteTK
changed the title
konstin
approved these changes
Jan 5, 2026
|
|
||
| // Create a server that fails with a more fundamental error so we trigger | ||
| // earlier error paths | ||
| Mock::given(method("GET")) |
Member
There was a problem hiding this comment.
Can you move this to a helper too, with a doc comment about which error path this checks?
konstin
added a commit
that referenced
this pull request
Jan 6, 2026
Previously, we had a retry count both on the top level error type, and on an error variant, and had a conversion step in between. When reviewing #17274, I noticed we can simplify that.
tmeijn
pushed a commit
to tmeijn/dotfiles
that referenced
this pull request
Jan 9, 2026
This MR contains the following updates: | Package | Update | Change | |---|---|---| | [astral-sh/uv](https://github.com/astral-sh/uv) | patch | `0.9.21` → `0.9.22` | MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot). **Proposed changes to behavior should be submitted there as MRs.** --- ### Release Notes <details> <summary>astral-sh/uv (astral-sh/uv)</summary> ### [`v0.9.22`](https://github.com/astral-sh/uv/blob/HEAD/CHANGELOG.md#0922) [Compare Source](astral-sh/uv@0.9.21...0.9.22) Released on 2026-01-06. ##### Enhancements - Use a dedicated error message when lockfile can't be found ([#​17318](astral-sh/uv#17318)) ##### Bug fixes - Filter unusable wheels from the lockfile for more architectures ([#​17317](astral-sh/uv#17317)) - Correctly count retries originating from early middleware errors ([#​17274](astral-sh/uv#17274)) ##### Documentation - Clarify requirements file format in docs ([#​17284](astral-sh/uv#17284)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0Mi43NS4xIiwidXBkYXRlZEluVmVyIjoiNDIuNzUuMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiUmVub3ZhdGUgQm90IiwiYXV0b21hdGlvbjpib3QtYXV0aG9yZWQiLCJkZXBlbmRlbmN5LXR5cGU6OnBhdGNoIl19-->
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.
Summary
Fixes #17266.
The retry count was getting dropped by
ErrorKind::from_retry_middlewareand<Error as From<ErrorKind>>::fromso we were doing more retries than we should have.Test Plan
Added a testcase for the specific error path in the issue. Added an expect to the other retry test too.