Fix documentErrors metric incorrectly counting version conflict error…#6758
Merged
oeyh merged 1 commit intoApr 18, 2026
Conversation
Keyur-S-Patel
requested review from
KarstenSchnitter,
dinujoh,
dlvenable,
engechas,
graytaylor0,
kkondaka,
oeyh,
san81,
sb2k16 and
srikanthjg
as code owners
graytaylor0
reviewed
Apr 15, 2026
| .withBulkOperation(bulkOperation) | ||
| .withBulkResponseItem(bulkItemResponse) | ||
| .build()); | ||
| documentErrorsCounter.increment(); |
Member
There was a problem hiding this comment.
Thanks for making this change! there was a discussion here on having a condition to skip applying documentErrors only if the document_version_type is set to external. I think that in some cases there can be a true failure when not using external versioning. Can we add that check here?
graytaylor0
previously approved these changes
Apr 15, 2026
…pensearch-project#6601) Events with invalid document_version values are correctly sent to the DLQ but were still being added to the OpenSearch bulk request. Added continue statements after the NumberFormatException and RuntimeException catch blocks in doOutput() to skip the rest of the loop iteration for failed events. Made version conflict handling in BulkRetryStrategy conditional on external versioning. Version conflicts are only silently handled (skipping documentErrors) when document_version_type is set to external or external_gte. For internal versioning or when unset, version conflicts are treated as document errors. BulkRetryStrategy now accepts a boolean isExternalVersioning parameter instead of importing VersionType directly, keeping the OpenSearch client type out of its API. The VersionType check is done in OpenSearchSink via the isExternalVersionType helper method. Signed-off-by: Keyur-S-Patel <keyurpatel.opensource@gmail.com>
Keyur-S-Patel
force-pushed
the
fix/exclude-version-conflict-from-document-errors-5376
branch
from
3754899 to
6d81b89
Compare
graytaylor0
approved these changes
Apr 17, 2026
oeyh
approved these changes
Apr 18, 2026
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
3 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
In
BulkRetryStrategy.handleFailures(), thedocumentErrorsCounterwas being incremented for all item-level errors, including version conflict errors. Version conflict errors are not true document errors — they indicate the latest version of the document already exists in OpenSearch and are not sent to the DLQ. This caused thedocumentErrorsmetric to be inflated, creating a confusing user experience.This change moves
documentErrorsCounter.increment()andgetDocumentStatusCounter().increment()into theelsebranch so they only fire for actual non-retryable failures, skipping version conflicts. This matches the existing behavior already present increateBulkRequestForRetry(). A unit test was added to verify that version conflicts only incrementdocumentsVersionConflictErrorsand notdocumentErrors.Issues Resolved
Resolves #5376
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](https://github.com/opensearch-project/data-prepper/blob/main/CONTRIBUTING.md).