Backport: fix(gateway): enable retry support for gateway errors#15220
Merged
Conversation
## Background #14216 Gateway errors (GatewayInternalServerError, GatewayRateLimitError, GatewayTimeoutError) were never retried by `maxRetries` because `asGatewayError()` converts the original APICallError into a GatewayError subclass before the retry logic sees it. The retry function only checked APICallError.isInstance(error), which always returned false for Gateway errors ## Summary - Add `isRetryable` to `GatewayError` base class, derived from `statusCode` using the same logic as `APICallError` (408, 409, 429, >= 500) - Extend `_retryWithExponentialBackoff` to also check `GatewayError.isInstance(error) && error.isRetryable` - For retry-after header extraction, unwrap `error.cause` when the error is a `GatewayError` with an `APICallError` cause ## Manual Verification na ## Checklist - [x] All commits are signed (PRs with unsigned commits cannot be merged) - [x] Tests have been added / updated (for bug fixes / features) - [ ] Documentation has been added / updated (for bug fixes / features) - [x] A _patch_ changeset for relevant packages has been added (for bug fixes / features - run `pnpm changeset` in the project root) - [x] I have reviewed this pull request (self-review) ## Related Issues fixes #14216 Co-authored-by: Pini Shvartsman <7192105+PiniShv@users.noreply.github.com>
aayush-kapoor
approved these changes
May 12, 2026
Contributor
Author
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
1 participant
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.
This is an automated backport of #15213 to the release-v6.0 branch. FYI @aayush-kapoor