From a59c98a36951c90f195a1471f6f07e5c4f3d5b3d Mon Sep 17 00:00:00 2001 From: Krishna Kondaka Date: Mon, 7 Apr 2025 23:56:56 +0000 Subject: [PATCH 1/3] Rename OTEL standard template mappings index-types Signed-off-by: Krishna Kondaka --- .../plugins/sink/opensearch/index/IndexConfiguration.java | 8 ++++---- .../plugins/sink/opensearch/index/IndexConstants.java | 6 +++--- .../sink/opensearch/index/IndexManagerFactory.java | 6 +++--- .../plugins/sink/opensearch/index/IndexType.java | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConfiguration.java b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConfiguration.java index 15f879a8e2..651b3a5b71 100644 --- a/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConfiguration.java +++ b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConfiguration.java @@ -164,7 +164,7 @@ private IndexConfiguration(final Builder builder) { String documentIdField = builder.documentIdField; String documentId = builder.documentId; - if (indexType.equals(IndexType.TRACE_ANALYTICS_RAW) || indexType.equals(IndexType.TRACE_ANALYTICS_RAW_STANDARD)) { + if (indexType.equals(IndexType.TRACE_ANALYTICS_RAW) || indexType.equals(IndexType.TRACE_ANALYTICS_RAW_OTEL)) { documentId = "${spanId}"; } else if (indexType.equals(IndexType.TRACE_ANALYTICS_SERVICE_MAP)) { documentId = "${hashId}"; @@ -430,17 +430,17 @@ private Map readIndexTemplate(final String templateFile, final I InputStream s3TemplateFile = null; if (indexType.equals(IndexType.TRACE_ANALYTICS_RAW)) { templateURL = loadExistingTemplate(templateType, IndexConstants.RAW_DEFAULT_TEMPLATE_FILE); - } else if (indexType.equals(IndexType.TRACE_ANALYTICS_RAW_STANDARD)) { + } else if (indexType.equals(IndexType.TRACE_ANALYTICS_RAW_OTEL)) { templateURL = loadExistingTemplate(templateType, IndexConstants.RAW_STANDARD_TEMPLATE_FILE); } else if (indexType.equals(IndexType.TRACE_ANALYTICS_SERVICE_MAP)) { templateURL = loadExistingTemplate(templateType, IndexConstants.SERVICE_MAP_DEFAULT_TEMPLATE_FILE); } else if (indexType.equals(IndexType.LOG_ANALYTICS)) { templateURL = loadExistingTemplate(templateType, IndexConstants.LOGS_DEFAULT_TEMPLATE_FILE); - } else if (indexType.equals(IndexType.LOG_ANALYTICS_STANDARD)) { + } else if (indexType.equals(IndexType.LOG_ANALYTICS_OTEL)) { templateURL = loadExistingTemplate(templateType, IndexConstants.LOGS_STANDARD_TEMPLATE_FILE); } else if (indexType.equals(IndexType.METRIC_ANALYTICS)) { templateURL = loadExistingTemplate(templateType, IndexConstants.METRICS_DEFAULT_TEMPLATE_FILE); - } else if (indexType.equals(IndexType.METRIC_ANALYTICS_STANDARD)) { + } else if (indexType.equals(IndexType.METRIC_ANALYTICS_OTEL)) { templateURL = loadExistingTemplate(templateType, IndexConstants.METRICS_STANDARD_TEMPLATE_FILE); } else if (templateFile != null) { if (templateFile.toLowerCase().startsWith(S3_PREFIX)) { diff --git a/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConstants.java b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConstants.java index 21f6cf7d42..29f18737ea 100644 --- a/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConstants.java +++ b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConstants.java @@ -42,10 +42,10 @@ public class IndexConstants { // TODO: extract out version number into version enum TYPE_TO_DEFAULT_ALIAS.put(IndexType.TRACE_ANALYTICS_SERVICE_MAP, "otel-v1-apm-service-map"); TYPE_TO_DEFAULT_ALIAS.put(IndexType.TRACE_ANALYTICS_RAW, "otel-v1-apm-span"); - TYPE_TO_DEFAULT_ALIAS.put(IndexType.TRACE_ANALYTICS_RAW_STANDARD, "otel-v1-apm-span"); + TYPE_TO_DEFAULT_ALIAS.put(IndexType.TRACE_ANALYTICS_RAW_OTEL, "otel-v1-apm-span"); TYPE_TO_DEFAULT_ALIAS.put(IndexType.LOG_ANALYTICS, "logs-otel-v1"); - TYPE_TO_DEFAULT_ALIAS.put(IndexType.LOG_ANALYTICS_STANDARD, "logs-otel-v1"); + TYPE_TO_DEFAULT_ALIAS.put(IndexType.LOG_ANALYTICS_OTEL, "logs-otel-v1"); TYPE_TO_DEFAULT_ALIAS.put(IndexType.METRIC_ANALYTICS, "metrics-otel-v1"); - TYPE_TO_DEFAULT_ALIAS.put(IndexType.METRIC_ANALYTICS_STANDARD, "metrics-otel-v1"); + TYPE_TO_DEFAULT_ALIAS.put(IndexType.METRIC_ANALYTICS_OTEL, "metrics-otel-v1"); } } diff --git a/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexManagerFactory.java b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexManagerFactory.java index 86e52ec0d7..2d4fd0611e 100644 --- a/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexManagerFactory.java +++ b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexManagerFactory.java @@ -51,7 +51,7 @@ public final IndexManager getIndexManager(final IndexType indexType, IndexManager indexManager; switch (indexType) { case TRACE_ANALYTICS_RAW: - case TRACE_ANALYTICS_RAW_STANDARD: + case TRACE_ANALYTICS_RAW_OTEL: indexManager = new TraceAnalyticsRawIndexManager( restHighLevelClient, openSearchClient, openSearchSinkConfiguration, clusterSettingsParser, templateStrategy, indexAlias); break; @@ -60,12 +60,12 @@ public final IndexManager getIndexManager(final IndexType indexType, restHighLevelClient, openSearchClient, openSearchSinkConfiguration, clusterSettingsParser, templateStrategy, indexAlias); break; case LOG_ANALYTICS: - case LOG_ANALYTICS_STANDARD: + case LOG_ANALYTICS_OTEL: indexManager = new LogAnalyticsIndexManager( restHighLevelClient, openSearchClient, openSearchSinkConfiguration, clusterSettingsParser, templateStrategy, indexAlias); break; case METRIC_ANALYTICS: - case METRIC_ANALYTICS_STANDARD: + case METRIC_ANALYTICS_OTEL: indexManager = new MetricAnalyticsIndexManager( restHighLevelClient, openSearchClient, openSearchSinkConfiguration, clusterSettingsParser, templateStrategy, indexAlias); break; diff --git a/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexType.java b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexType.java index ac4e885d6c..ee2df441b0 100644 --- a/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexType.java +++ b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexType.java @@ -13,12 +13,12 @@ public enum IndexType { TRACE_ANALYTICS_RAW("trace-analytics-raw"), - TRACE_ANALYTICS_RAW_STANDARD("trace-analytics-standard-raw"), + TRACE_ANALYTICS_RAW_OTEL("trace-analytics-otel-raw"), TRACE_ANALYTICS_SERVICE_MAP("trace-analytics-service-map"), LOG_ANALYTICS("log-analytics"), - LOG_ANALYTICS_STANDARD("log-analytics-standard"), + LOG_ANALYTICS_OTEL("log-analytics-otel"), METRIC_ANALYTICS("metric-analytics"), - METRIC_ANALYTICS_STANDARD("metric-analytics-standard"), + METRIC_ANALYTICS_OTEL("metric-analytics-otel"), CUSTOM("custom"), MANAGEMENT_DISABLED("management_disabled"); From c31486caf5a275df7a7de854a4dfcf061d864d62 Mon Sep 17 00:00:00 2001 From: Krishna Kondaka Date: Tue, 8 Apr 2025 00:29:09 +0000 Subject: [PATCH 2/3] Fixed tests Signed-off-by: Krishna Kondaka --- .../plugins/sink/opensearch/index/IndexTypeTests.java | 8 ++++---- .../index/TraceAnalyticsRawIndexManagerTests.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexTypeTests.java b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexTypeTests.java index 16f929ab3e..8641b758f0 100644 --- a/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexTypeTests.java +++ b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexTypeTests.java @@ -26,17 +26,17 @@ public void getByValue() { assertEquals(Optional.of(IndexType.CUSTOM), IndexType.getByValue("custom")); assertEquals(Optional.of(IndexType.MANAGEMENT_DISABLED), IndexType.getByValue("management_disabled")); assertEquals(Optional.of(IndexType.TRACE_ANALYTICS_RAW), IndexType.getByValue("trace-analytics-raw")); - assertEquals(Optional.of(IndexType.TRACE_ANALYTICS_RAW_STANDARD), IndexType.getByValue("trace-analytics-standard-raw")); + assertEquals(Optional.of(IndexType.TRACE_ANALYTICS_RAW_OTEL), IndexType.getByValue("trace-analytics-otel-raw")); assertEquals(Optional.of(IndexType.TRACE_ANALYTICS_SERVICE_MAP), IndexType.getByValue("trace-analytics-service-map")); assertEquals(Optional.of(IndexType.LOG_ANALYTICS), IndexType.getByValue("log-analytics")); - assertEquals(Optional.of(IndexType.LOG_ANALYTICS_STANDARD), IndexType.getByValue("log-analytics-standard")); + assertEquals(Optional.of(IndexType.LOG_ANALYTICS_OTEL), IndexType.getByValue("log-analytics-otel")); assertEquals(Optional.of(IndexType.METRIC_ANALYTICS), IndexType.getByValue("metric-analytics")); - assertEquals(Optional.of(IndexType.METRIC_ANALYTICS_STANDARD), IndexType.getByValue("metric-analytics-standard")); + assertEquals(Optional.of(IndexType.METRIC_ANALYTICS_OTEL), IndexType.getByValue("metric-analytics-otel")); } @Test public void getIndexTypeValues() { - assertEquals("[trace-analytics-raw, trace-analytics-standard-raw, trace-analytics-service-map, log-analytics, log-analytics-standard, metric-analytics, metric-analytics-standard, custom, management_disabled]", IndexType.getIndexTypeValues()); + assertEquals("[trace-analytics-raw, trace-analytics-otel-raw, trace-analytics-service-map, log-analytics, log-analytics-otel, metric-analytics, metric-analytics-otel, custom, management_disabled]", IndexType.getIndexTypeValues()); } @ParameterizedTest diff --git a/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/TraceAnalyticsRawIndexManagerTests.java b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/TraceAnalyticsRawIndexManagerTests.java index 77af774f99..7e015b97b1 100644 --- a/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/TraceAnalyticsRawIndexManagerTests.java +++ b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/TraceAnalyticsRawIndexManagerTests.java @@ -277,7 +277,7 @@ void checkAndCreateIndex_NeedToCreateNewIndex() throws IOException { @Test void checkAndCreateIndex_NeedToCreateNewIndex_withStandardIndexManager() throws IOException { traceAnalyticsRawStandardIndexManager = indexManagerFactory.getIndexManager( - IndexType.TRACE_ANALYTICS_RAW_STANDARD, openSearchClient, restHighLevelClient, openSearchSinkConfiguration, templateStrategy); + IndexType.TRACE_ANALYTICS_RAW_OTEL, openSearchClient, restHighLevelClient, openSearchSinkConfiguration, templateStrategy); when(openSearchIndicesClient.existsAlias(any(ExistsAliasRequest.class))).thenReturn(new BooleanResponse(false)); when(openSearchIndicesClient.create(any(CreateIndexRequest.class))) From b4bf556965bb15649df34a9ba1723abaf99899fd Mon Sep 17 00:00:00 2001 From: Krishna Kondaka Date: Fri, 11 Apr 2025 17:49:46 +0000 Subject: [PATCH 3/3] Renamed to use 'plain' in place of 'standard' Signed-off-by: Krishna Kondaka --- .../plugins/sink/opensearch/index/IndexConfiguration.java | 8 ++++---- .../plugins/sink/opensearch/index/IndexConstants.java | 6 +++--- .../sink/opensearch/index/IndexManagerFactory.java | 6 +++--- .../plugins/sink/opensearch/index/IndexType.java | 6 +++--- .../plugins/sink/opensearch/index/IndexTypeTests.java | 8 ++++---- .../index/TraceAnalyticsRawIndexManagerTests.java | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConfiguration.java b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConfiguration.java index 651b3a5b71..e64b80ceba 100644 --- a/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConfiguration.java +++ b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConfiguration.java @@ -164,7 +164,7 @@ private IndexConfiguration(final Builder builder) { String documentIdField = builder.documentIdField; String documentId = builder.documentId; - if (indexType.equals(IndexType.TRACE_ANALYTICS_RAW) || indexType.equals(IndexType.TRACE_ANALYTICS_RAW_OTEL)) { + if (indexType.equals(IndexType.TRACE_ANALYTICS_RAW) || indexType.equals(IndexType.TRACE_ANALYTICS_RAW_PLAIN)) { documentId = "${spanId}"; } else if (indexType.equals(IndexType.TRACE_ANALYTICS_SERVICE_MAP)) { documentId = "${hashId}"; @@ -430,17 +430,17 @@ private Map readIndexTemplate(final String templateFile, final I InputStream s3TemplateFile = null; if (indexType.equals(IndexType.TRACE_ANALYTICS_RAW)) { templateURL = loadExistingTemplate(templateType, IndexConstants.RAW_DEFAULT_TEMPLATE_FILE); - } else if (indexType.equals(IndexType.TRACE_ANALYTICS_RAW_OTEL)) { + } else if (indexType.equals(IndexType.TRACE_ANALYTICS_RAW_PLAIN)) { templateURL = loadExistingTemplate(templateType, IndexConstants.RAW_STANDARD_TEMPLATE_FILE); } else if (indexType.equals(IndexType.TRACE_ANALYTICS_SERVICE_MAP)) { templateURL = loadExistingTemplate(templateType, IndexConstants.SERVICE_MAP_DEFAULT_TEMPLATE_FILE); } else if (indexType.equals(IndexType.LOG_ANALYTICS)) { templateURL = loadExistingTemplate(templateType, IndexConstants.LOGS_DEFAULT_TEMPLATE_FILE); - } else if (indexType.equals(IndexType.LOG_ANALYTICS_OTEL)) { + } else if (indexType.equals(IndexType.LOG_ANALYTICS_PLAIN)) { templateURL = loadExistingTemplate(templateType, IndexConstants.LOGS_STANDARD_TEMPLATE_FILE); } else if (indexType.equals(IndexType.METRIC_ANALYTICS)) { templateURL = loadExistingTemplate(templateType, IndexConstants.METRICS_DEFAULT_TEMPLATE_FILE); - } else if (indexType.equals(IndexType.METRIC_ANALYTICS_OTEL)) { + } else if (indexType.equals(IndexType.METRIC_ANALYTICS_PLAIN)) { templateURL = loadExistingTemplate(templateType, IndexConstants.METRICS_STANDARD_TEMPLATE_FILE); } else if (templateFile != null) { if (templateFile.toLowerCase().startsWith(S3_PREFIX)) { diff --git a/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConstants.java b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConstants.java index 29f18737ea..4a27cf2baf 100644 --- a/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConstants.java +++ b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConstants.java @@ -42,10 +42,10 @@ public class IndexConstants { // TODO: extract out version number into version enum TYPE_TO_DEFAULT_ALIAS.put(IndexType.TRACE_ANALYTICS_SERVICE_MAP, "otel-v1-apm-service-map"); TYPE_TO_DEFAULT_ALIAS.put(IndexType.TRACE_ANALYTICS_RAW, "otel-v1-apm-span"); - TYPE_TO_DEFAULT_ALIAS.put(IndexType.TRACE_ANALYTICS_RAW_OTEL, "otel-v1-apm-span"); + TYPE_TO_DEFAULT_ALIAS.put(IndexType.TRACE_ANALYTICS_RAW_PLAIN, "otel-v1-apm-span"); TYPE_TO_DEFAULT_ALIAS.put(IndexType.LOG_ANALYTICS, "logs-otel-v1"); - TYPE_TO_DEFAULT_ALIAS.put(IndexType.LOG_ANALYTICS_OTEL, "logs-otel-v1"); + TYPE_TO_DEFAULT_ALIAS.put(IndexType.LOG_ANALYTICS_PLAIN, "logs-otel-v1"); TYPE_TO_DEFAULT_ALIAS.put(IndexType.METRIC_ANALYTICS, "metrics-otel-v1"); - TYPE_TO_DEFAULT_ALIAS.put(IndexType.METRIC_ANALYTICS_OTEL, "metrics-otel-v1"); + TYPE_TO_DEFAULT_ALIAS.put(IndexType.METRIC_ANALYTICS_PLAIN, "metrics-otel-v1"); } } diff --git a/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexManagerFactory.java b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexManagerFactory.java index 2d4fd0611e..dc4ee94d09 100644 --- a/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexManagerFactory.java +++ b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexManagerFactory.java @@ -51,7 +51,7 @@ public final IndexManager getIndexManager(final IndexType indexType, IndexManager indexManager; switch (indexType) { case TRACE_ANALYTICS_RAW: - case TRACE_ANALYTICS_RAW_OTEL: + case TRACE_ANALYTICS_RAW_PLAIN: indexManager = new TraceAnalyticsRawIndexManager( restHighLevelClient, openSearchClient, openSearchSinkConfiguration, clusterSettingsParser, templateStrategy, indexAlias); break; @@ -60,12 +60,12 @@ public final IndexManager getIndexManager(final IndexType indexType, restHighLevelClient, openSearchClient, openSearchSinkConfiguration, clusterSettingsParser, templateStrategy, indexAlias); break; case LOG_ANALYTICS: - case LOG_ANALYTICS_OTEL: + case LOG_ANALYTICS_PLAIN: indexManager = new LogAnalyticsIndexManager( restHighLevelClient, openSearchClient, openSearchSinkConfiguration, clusterSettingsParser, templateStrategy, indexAlias); break; case METRIC_ANALYTICS: - case METRIC_ANALYTICS_OTEL: + case METRIC_ANALYTICS_PLAIN: indexManager = new MetricAnalyticsIndexManager( restHighLevelClient, openSearchClient, openSearchSinkConfiguration, clusterSettingsParser, templateStrategy, indexAlias); break; diff --git a/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexType.java b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexType.java index ee2df441b0..c00e5c6415 100644 --- a/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexType.java +++ b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexType.java @@ -13,12 +13,12 @@ public enum IndexType { TRACE_ANALYTICS_RAW("trace-analytics-raw"), - TRACE_ANALYTICS_RAW_OTEL("trace-analytics-otel-raw"), + TRACE_ANALYTICS_RAW_PLAIN("trace-analytics-plain-raw"), TRACE_ANALYTICS_SERVICE_MAP("trace-analytics-service-map"), LOG_ANALYTICS("log-analytics"), - LOG_ANALYTICS_OTEL("log-analytics-otel"), + LOG_ANALYTICS_PLAIN("log-analytics-plain"), METRIC_ANALYTICS("metric-analytics"), - METRIC_ANALYTICS_OTEL("metric-analytics-otel"), + METRIC_ANALYTICS_PLAIN("metric-analytics-plain"), CUSTOM("custom"), MANAGEMENT_DISABLED("management_disabled"); diff --git a/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexTypeTests.java b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexTypeTests.java index 8641b758f0..d325a98f11 100644 --- a/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexTypeTests.java +++ b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexTypeTests.java @@ -26,17 +26,17 @@ public void getByValue() { assertEquals(Optional.of(IndexType.CUSTOM), IndexType.getByValue("custom")); assertEquals(Optional.of(IndexType.MANAGEMENT_DISABLED), IndexType.getByValue("management_disabled")); assertEquals(Optional.of(IndexType.TRACE_ANALYTICS_RAW), IndexType.getByValue("trace-analytics-raw")); - assertEquals(Optional.of(IndexType.TRACE_ANALYTICS_RAW_OTEL), IndexType.getByValue("trace-analytics-otel-raw")); + assertEquals(Optional.of(IndexType.TRACE_ANALYTICS_RAW_PLAIN), IndexType.getByValue("trace-analytics-plain-raw")); assertEquals(Optional.of(IndexType.TRACE_ANALYTICS_SERVICE_MAP), IndexType.getByValue("trace-analytics-service-map")); assertEquals(Optional.of(IndexType.LOG_ANALYTICS), IndexType.getByValue("log-analytics")); - assertEquals(Optional.of(IndexType.LOG_ANALYTICS_OTEL), IndexType.getByValue("log-analytics-otel")); + assertEquals(Optional.of(IndexType.LOG_ANALYTICS_PLAIN), IndexType.getByValue("log-analytics-plain")); assertEquals(Optional.of(IndexType.METRIC_ANALYTICS), IndexType.getByValue("metric-analytics")); - assertEquals(Optional.of(IndexType.METRIC_ANALYTICS_OTEL), IndexType.getByValue("metric-analytics-otel")); + assertEquals(Optional.of(IndexType.METRIC_ANALYTICS_PLAIN), IndexType.getByValue("metric-analytics-plain")); } @Test public void getIndexTypeValues() { - assertEquals("[trace-analytics-raw, trace-analytics-otel-raw, trace-analytics-service-map, log-analytics, log-analytics-otel, metric-analytics, metric-analytics-otel, custom, management_disabled]", IndexType.getIndexTypeValues()); + assertEquals("[trace-analytics-raw, trace-analytics-plain-raw, trace-analytics-service-map, log-analytics, log-analytics-plain, metric-analytics, metric-analytics-plain, custom, management_disabled]", IndexType.getIndexTypeValues()); } @ParameterizedTest diff --git a/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/TraceAnalyticsRawIndexManagerTests.java b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/TraceAnalyticsRawIndexManagerTests.java index 7e015b97b1..54cf066e78 100644 --- a/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/TraceAnalyticsRawIndexManagerTests.java +++ b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/TraceAnalyticsRawIndexManagerTests.java @@ -277,7 +277,7 @@ void checkAndCreateIndex_NeedToCreateNewIndex() throws IOException { @Test void checkAndCreateIndex_NeedToCreateNewIndex_withStandardIndexManager() throws IOException { traceAnalyticsRawStandardIndexManager = indexManagerFactory.getIndexManager( - IndexType.TRACE_ANALYTICS_RAW_OTEL, openSearchClient, restHighLevelClient, openSearchSinkConfiguration, templateStrategy); + IndexType.TRACE_ANALYTICS_RAW_PLAIN, openSearchClient, restHighLevelClient, openSearchSinkConfiguration, templateStrategy); when(openSearchIndicesClient.existsAlias(any(ExistsAliasRequest.class))).thenReturn(new BooleanResponse(false)); when(openSearchIndicesClient.create(any(CreateIndexRequest.class)))