Skip to content

Commit a0887ed

Browse files
Fix NEGATIVE_INFINITY formatting, null password guard, and EventHandle placement
1 parent 9df5edf commit a0887ed

3 files changed

Lines changed: 5 additions & 2 deletions

File tree

data-prepper-plugins/opensearch/src/integrationTest/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchSinkTsdbIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ private OpenSearchSinkConfig generateOpenSearchSinkConfig(final String indexType
467467
metadata.put("insecure", true);
468468
final String user = System.getProperty("tests.opensearch.user");
469469
final String password = System.getProperty("tests.opensearch.password");
470-
if (user != null) {
470+
if (user != null && password != null) {
471471
metadata.put(AUTHENTICATION, Map.of(USERNAME, user, PASSWORD, password));
472472
}
473473
final String distributionVersion = DeclaredOpenSearchVersion.OPENDISTRO_0_10.compareTo(

data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchSink.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ public void doOutput(final Collection<Record<Event>> records) {
484484
for (int i = 0; i < tsdbDocs.size(); i++) {
485485
final SerializedJson doc = SerializedJson.fromStringAndOptionals(tsdbDocs.get(i), null, null, null);
486486
final BulkOperation op = getBulkOperationForAction(tsdbAction, doc, null, indexName, null);
487-
final BulkOperationWrapper wrapper = (i == 0)
487+
final BulkOperationWrapper wrapper = (i == tsdbDocs.size() - 1)
488488
? new BulkOperationWrapper(op, event.getEventHandle(), null, null)
489489
: new BulkOperationWrapper(op, (EventHandle) null, null, null);
490490
wrappers.add(wrapper);

data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/TSDBDocumentBuilder.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,9 @@ private static String formatDouble(final Double value) {
252252
if (value == Double.POSITIVE_INFINITY) {
253253
return "+Inf";
254254
}
255+
if (value == Double.NEGATIVE_INFINITY) {
256+
return "-Inf";
257+
}
255258
if (value == (long) value.doubleValue()) {
256259
return String.valueOf((long) value.doubleValue());
257260
}

0 commit comments

Comments
 (0)