Make CWL retry indefinitely for retryable errors when no DLQ configured#6355
Merged
kkondaka merged 2 commits intoopensearch-project:mainfrom Dec 17, 2025
Merged
Make CWL retry indefinitely for retryable errors when no DLQ configured#6355kkondaka merged 2 commits intoopensearch-project:mainfrom
kkondaka merged 2 commits intoopensearch-project:mainfrom
Conversation
Signed-off-by: Krishna Kondaka <krishkdk@amazon.com>
Signed-off-by: Krishna Kondaka <krishkdk@amazon.com>
viquer
approved these changes
Dec 16, 2025
dlvenable
reviewed
Dec 16, 2025
| public static final String CLOUDWATCH_LOGS_EVENTS_SUCCEEDED = "cloudWatchLogsEventsSucceeded"; | ||
| public static final String CLOUDWATCH_LOGS_EVENTS_FAILED = "cloudWatchLogsEventsFailed"; | ||
| public static final String CLOUDWATCH_LOGS_REQUESTS_FAILED = "cloudWatchLogsRequestsFailed"; | ||
| public static final String CLOUDWATCH_LOGS_REQUEST_MULTI_FAILED = "cloudWatchLogsRequestMultipleFailures"; |
Member
There was a problem hiding this comment.
Are you trying to track the requests that retry more than one time? If so is this name more clear
cloudWatchLogsRequestsWithMultipleRetries
Collaborator
Author
There was a problem hiding this comment.
Another metric for multiple failures so that alarms can be setup on multiple failures. As per cloudwatch logs team, single failure may be OK but multiple failures is serious enough to be alarmed and immediate action is needed.
Member
There was a problem hiding this comment.
What are "multiple failures" exactly? Different error responses for the same request on retries?
| .logGroup(cloudWatchLogsSinkConfig.getLogGroup()) | ||
| .logStream(cloudWatchLogsSinkConfig.getLogStream()) | ||
| .retryCount(cloudWatchLogsSinkConfig.getMaxRetries()) | ||
| .retryCount(dlqPushHandler == null ? Integer.MAX_VALUE : cloudWatchLogsSinkConfig.getMaxRetries()) |
Member
There was a problem hiding this comment.
Do we want to retry all error infinitely? Should some be non-retryable?
Collaborator
Author
There was a problem hiding this comment.
This is applicable only for retryable errors (CloudWatchLogsException OR SdkClientException) . Non-retryable errors (all other exceptions) are never retried.
graytaylor0
approved these changes
Dec 17, 2025
san81
approved these changes
Dec 17, 2025
wandna-amazon
pushed a commit
to wandna-amazon/data-prepper
that referenced
this pull request
Jan 8, 2026
…ed (opensearch-project#6355) * Make CWL retry indefinitely for retryable errors when no DLQ configured Signed-off-by: Krishna Kondaka <krishkdk@amazon.com> * Added tests Signed-off-by: Krishna Kondaka <krishkdk@amazon.com> --------- Signed-off-by: Krishna Kondaka <krishkdk@amazon.com> Signed-off-by: Nathan Wand <wandna@amazon.com>
simonelbaz
pushed a commit
to simonelbaz/data-prepper
that referenced
this pull request
Jan 31, 2026
…ed (opensearch-project#6355) * Make CWL retry indefinitely for retryable errors when no DLQ configured Signed-off-by: Krishna Kondaka <krishkdk@amazon.com> * Added tests Signed-off-by: Krishna Kondaka <krishkdk@amazon.com> --------- Signed-off-by: Krishna Kondaka <krishkdk@amazon.com> Signed-off-by: Simon ELBAZ <elbazsimon9@gmail.com>
simonelbaz
pushed a commit
to simonelbaz/data-prepper
that referenced
this pull request
Jan 31, 2026
…ed (opensearch-project#6355) * Make CWL retry indefinitely for retryable errors when no DLQ configured Signed-off-by: Krishna Kondaka <krishkdk@amazon.com> * Added tests Signed-off-by: Krishna Kondaka <krishkdk@amazon.com> --------- Signed-off-by: Krishna Kondaka <krishkdk@amazon.com>
simonelbaz
pushed a commit
to simonelbaz/data-prepper
that referenced
this pull request
Jan 31, 2026
…ed (opensearch-project#6355) * Make CWL retry indefinitely for retryable errors when no DLQ configured Signed-off-by: Krishna Kondaka <krishkdk@amazon.com> * Added tests Signed-off-by: Krishna Kondaka <krishkdk@amazon.com> --------- Signed-off-by: Krishna Kondaka <krishkdk@amazon.com>
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
5 participants
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.
Description
Make CWL retry indefinitely for retryable errors when no DLQ configured.
Also, added a new metric to count multiple failures (every 5 failures)
Issues Resolved
Resolves #6300
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.