fix(amazonq): Adding backoff and retry for export result archive streaming API. #5320
+260
−60
Conversation
This file contains 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
laileni-aws
reviewed
Feb 3, 2025
| @@ -85,8 +108,43 @@ class AmazonQStreamingClient(private val project: Project) { | |||
| return byteBufferList | |||
| } | |||
|
|
|||
| /** | |||
There was a problem hiding this comment.
nit: If possible we can move this to a shared place.
There was a problem hiding this comment.
Felt it was alright to keep it here in AmazonQStreamingClient class. Assuming that any other streaming APIs will be added here.
There was a problem hiding this comment.
isn't this the same idea as 5470418#diff-b08b1d5a6c68d78f0cdb5d0ff07528a20d2d60156313fd4c4f1a41b69e2a4f36R212
There was a problem hiding this comment.
this streaming API is a suspend function. tried using a common function for both but way to many conflicts
There was a problem hiding this comment.
you can have a thin wrapper for the non-suspending use case instead of duplicating the logic
laileni-aws
approved these changes
Feb 3, 2025
ntarakad-aws
approved these changes
Feb 3, 2025
rli
reviewed
Feb 4, 2025
Comment on lines
+128
to
+147
| fun execute( | ||
| operation: () -> T, | ||
| isRetryable: (Exception) -> Boolean = { it is RetryableException }, | ||
| errorHandler: ((Exception, Int) -> Nothing)? = null, | ||
| ): T { | ||
| while (attempts < MAX_RETRY_ATTEMPTS) { | ||
| try { | ||
| return operation() | ||
| } catch (e: Exception) { | ||
| attempts++ | ||
| if (attempts >= MAX_RETRY_ATTEMPTS || !isRetryable(e)) { | ||
| errorHandler?.invoke(e, attempts) ?: throw e | ||
| } | ||
|
|
||
| Thread.sleep(getJitteredDelay()) | ||
| } | ||
| } | ||
|
|
||
| throw RuntimeException("Unexpected state after $attempts attempts") | ||
| } |
There was a problem hiding this comment.
Suggested change
| fun execute( | |
| operation: () -> T, | |
| isRetryable: (Exception) -> Boolean = { it is RetryableException }, | |
| errorHandler: ((Exception, Int) -> Nothing)? = null, | |
| ): T { | |
| while (attempts < MAX_RETRY_ATTEMPTS) { | |
| try { | |
| return operation() | |
| } catch (e: Exception) { | |
| attempts++ | |
| if (attempts >= MAX_RETRY_ATTEMPTS || !isRetryable(e)) { | |
| errorHandler?.invoke(e, attempts) ?: throw e | |
| } | |
| Thread.sleep(getJitteredDelay()) | |
| } | |
| } | |
| throw RuntimeException("Unexpected state after $attempts attempts") | |
| } | |
| fun execute( | |
| operation: () -> T, | |
| isRetryable: (Exception) -> Boolean = { it is RetryableException }, | |
| errorHandler: ((Exception, Int) -> Nothing)? = null, | |
| ): T = runBlocking { | |
| executeSuspend(operation, isRetryable, errorHandler) | |
| } |
?
| @@ -91,3 +115,60 @@ class AmazonQStreamingClient(private val project: Project) { | |||
| fun getInstance(project: Project) = project.service<AmazonQStreamingClient>() | |||
| } | |||
| } | |||
|
|
|||
| class RetryableOperation<T> { | |||
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.
Types of changes
Description
We have seen rise of the ExportResultArchive API failures to 15 per week, with retryable error messages.
Adding backoff and retry to mitigate these errors.
Checklist
License
I confirm that my contribution is made under the terms of the Apache 2.0 license.