Migrated Data Prepper to use the opensearch-java client for bulk requests #1381
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
…ests rather than the REST High Level Client. opensearch-project#1347 Signed-off-by: David Venable <[email protected]>
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #1381 +/- ##
=========================================
Coverage 94.08% 94.08%
Complexity 1156 1156
=========================================
Files 162 162
Lines 3248 3248
Branches 263 263
=========================================
Hits 3056 3056
Misses 138 138
Partials 54 54 ☔ View full report in Codecov by Sentry. |
asifsmohammed
approved these changes
May 12, 2022
| JsonProvider jsonProvider = jsonpMapper.jsonProvider(); | ||
| final JsonData jsonData = JsonData.from(jsonProvider.createParser(new StringReader(jsonString)), jsonpMapper); | ||
|
|
||
| final String serializedJsonLength = jsonData.toJson().toString(); |
There was a problem hiding this comment.
Nit: Variable name should be serializedJson or should have length() method in this line.
chenqi0805
approved these changes
May 12, 2022
| import com.fasterxml.jackson.databind.ObjectMapper; | ||
| import io.micrometer.core.instrument.Measurement; | ||
| import org.apache.commons.io.FileUtils; | ||
| import org.apache.http.util.EntityUtils; | ||
| import org.hamcrest.MatcherAssert; | ||
| import org.junit.After; | ||
| import org.junit.Assert; |
There was a problem hiding this comment.
Since now we are using JUnit 5, this could be replaced. Could be in follow up PRs.
There was a problem hiding this comment.
Yes, I agree. This change is already significant, and so I wanted to minimize the number of unnecessary changes. I noticed this when doing it, but didn't want to add even more change.
4 tasks
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.
Description
This PR updates Data Prepper to use the opensearch-java client for _bulk requests to OpenSearch. It does not update all interactions to the opensearch-java client. Others can come in subsequent PRs.
With this change, Data Prepper also runs against OpenSearch 2.0.0-rc1.
Related changes included in this PR include:
Record<String>andRecord<Event>models. Previously these tests only ran againstRecord<Sink>.Issues Resolved
Resolves #1347
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.