Skip to content

Refactors the OpenSearch sink to split out the ingestion code from the rest#6795

Merged
dlvenable merged 1 commit intoopensearch-project:mainfrom
dlvenable:opensearch-sink-ingester-refactor
May 6, 2026
Merged

Refactors the OpenSearch sink to split out the ingestion code from the rest#6795
dlvenable merged 1 commit intoopensearch-project:mainfrom
dlvenable:opensearch-sink-ingester-refactor

Conversation

@dlvenable
Copy link
Copy Markdown
Member

@dlvenable dlvenable commented Apr 30, 2026

Description

I'm looking to update the opensearch sink to support OpenSearch's pull-based indexing.

As part of this work, I'm refactoring the OpenSearchSink class by adding an Ingester interface to handle the bulk of the data ingestion work. This separates concerns of index management, action determination, and ingestion.

Issues Resolved

None. But this contributes toward #6796.

Check List

  • New functionality includes testing.
  • New functionality has a documentation issue. Please link to it in this PR.
    • New functionality has javadoc added
  • Commits are signed with a real name per the DCO

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.

…her work such as index management. I plan to use this work to help support pull-based ingestion within this sink. This commit is just for refactoring since it is already significant.

Signed-off-by: David Venable <dlv@amazon.com>
@dlvenable dlvenable force-pushed the opensearch-sink-ingester-refactor branch from e1df733 to cc6c5c5 Compare May 6, 2026 14:04
@dlvenable
Copy link
Copy Markdown
Member Author

The mTLS tests are new and are failing in main as well.

https://github.com/opensearch-project/data-prepper/actions/runs/25442178408/job/74636200566

@graytaylor0
Copy link
Copy Markdown
Member

graytaylor0 commented May 6, 2026

I see that some of the integration tests are failing with opensearch exceptions. I don't think these were failing previously.

Edit: I see you called this out as an existing issue. Makes sense

@dlvenable dlvenable merged commit 5de8aa8 into opensearch-project:main May 6, 2026
91 of 100 checks passed
srikanthpadakanti added a commit to srikanthpadakanti/data-prepper that referenced this pull request May 7, 2026
The connectionConfiguration local variable was moved out of
doInitializeInternal scope by PR opensearch-project#6795. Use the getter from
openSearchSinkConfig instead.

Signed-off-by: Srikanth Padakanti <srikanth_padakanti@apple.com>
dlvenable pushed a commit that referenced this pull request May 7, 2026
Auto generate test PEM files at runtime using BouncyCastle

Use @tempdir for PEM file cleanup instead of deleteOnExit

The connectionConfiguration local variable was moved out of
doInitializeInternal scope by PR #6795. Use the getter from
openSearchSinkConfig instead.

Fix mTLS integration test to present client cert on verification client

The verification RestClient also needs to present a client certificate
when OpenSearch has clientauth_mode: REQUIRE. Added a local client
builder with client cert support. Also simplified the workflow mTLS
config logic with prefix detection.


Signed-off-by: Srikanth Padakanti <srikanth_padakanti@apple.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants