Address PR comments

Signed-off-by: Taylor Gray <[email protected]>
opensearch-project · Aug 15, 2023 · e08fd18 · e08fd18
1 parent e481c84
commit e08fd18
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/...ain/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConfiguration.java b/...ain/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConfiguration.java
@@ -129,11 +129,9 @@ private IndexConfiguration(final Builder builder) {
         String documentIdField = builder.documentIdField;
         String documentId = builder.documentId;
         if (indexType.equals(IndexType.TRACE_ANALYTICS_RAW)) {
-            documentIdField = "spanId";
-            documentId = "spanId";
+            documentId = "${spanId}";
         } else if (indexType.equals(IndexType.TRACE_ANALYTICS_SERVICE_MAP)) {
-            documentIdField = "hashId";
-            documentId = "hashId";
+            documentId = "${hashId}";
         }
         this.documentIdField = documentIdField;
         this.documentId = documentId;

diff --git a/...ava/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConfigurationTests.java b/...ava/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConfigurationTests.java
@@ -286,7 +286,7 @@ public void testReadIndexConfig_RawIndexType() {
         assertEquals(60_000L, indexConfiguration.getFlushTimeout());
         assertEquals(false, indexConfiguration.isEstimateBulkSizeUsingCompression());
         assertEquals(2, indexConfiguration.getMaxLocalCompressionsForEstimation());
-        assertEquals("spanId", indexConfiguration.getDocumentIdField());
+        assertEquals("${spanId}", indexConfiguration.getDocumentId());
     }
 
     @Test
@@ -312,7 +312,7 @@ public void testReadIndexConfig_ServiceMapIndexType() {
         assertEquals(60_000L, indexConfiguration.getFlushTimeout());
         assertEquals(false, indexConfiguration.isEstimateBulkSizeUsingCompression());
         assertEquals(2, indexConfiguration.getMaxLocalCompressionsForEstimation());
-        assertEquals("hashId", indexConfiguration.getDocumentIdField());
+        assertEquals("${hashId}", indexConfiguration.getDocumentId());
     }
 
     @Test
@@ -335,7 +335,7 @@ public void testReadIndexConfigCustom() {
         assertEquals(testFlushTimeout, indexConfiguration.getFlushTimeout());
         assertEquals(true, indexConfiguration.isEstimateBulkSizeUsingCompression());
         assertEquals(5, indexConfiguration.getMaxLocalCompressionsForEstimation());
-        assertEquals(testIdField, indexConfiguration.getDocumentIdField());
+        assertEquals(testIdField, indexConfiguration.getDocumentId());
     }
 
     @Test
@@ -356,7 +356,7 @@ public void testReadIndexConfig_ExplicitCustomIndexType() {
         assertFalse(indexConfiguration.getIndexTemplate().isEmpty());
         assertEquals(testBulkSize, indexConfiguration.getBulkSize());
         assertEquals(testFlushTimeout, indexConfiguration.getFlushTimeout());
-        assertEquals(testIdField, indexConfiguration.getDocumentIdField());
+        assertEquals(testIdField, indexConfiguration.getDocumentId());
     }
 
     @Test
@@ -458,7 +458,7 @@ private PluginSetting getPluginSetting(Map<String, Object> metadata) {
     }
 
     private Map<String, Object> initializeConfigMetaData(
-            String indexType, String indexAlias, String templateFilePath, Long bulkSize, Long flushTimeout, String documentIdField) {
+            String indexType, String indexAlias, String templateFilePath, Long bulkSize, Long flushTimeout, String documentId) {
         final Map<String, Object> metadata = new HashMap<>();
         if (indexType != null) {
             metadata.put(IndexConfiguration.INDEX_TYPE, indexType);
@@ -475,8 +475,8 @@ private Map<String, Object> initializeConfigMetaData(
         if (flushTimeout != null) {
             metadata.put(IndexConfiguration.FLUSH_TIMEOUT, flushTimeout);
         }
-        if (documentIdField != null) {
-            metadata.put(IndexConfiguration.DOCUMENT_ID_FIELD, documentIdField);
+        if (documentId != null) {
+            metadata.put(IndexConfiguration.DOCUMENT_ID, documentId);
         }
         return metadata;
     }