diff --git a/data-prepper-plugins/grok-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/grok/GrokProcessor.java b/data-prepper-plugins/grok-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/grok/GrokProcessor.java
index 391d50f603..8b8b7f2e90 100644
--- a/data-prepper-plugins/grok-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/grok/GrokProcessor.java
+++ b/data-prepper-plugins/grok-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/grok/GrokProcessor.java
@@ -149,13 +149,15 @@ public Collection<Record<Event>> doExecute(final Collection<Record<Event>> recor
 
             final Instant endTime = Instant.now();
 
-            Long totalEventTimeInGrok = (Long) event.getMetadata().getAttribute(TOTAL_TIME_SPENT_IN_GROK_METADATA_KEY);
-            if (totalEventTimeInGrok == null) {
-                totalEventTimeInGrok = 0L;
-            }
+            if (grokProcessorConfig.getIncludePerformanceMetadata()) {
+                Long totalEventTimeInGrok = (Long) event.getMetadata().getAttribute(TOTAL_TIME_SPENT_IN_GROK_METADATA_KEY);
+                if (totalEventTimeInGrok == null) {
+                    totalEventTimeInGrok = 0L;
+                }
 
-            final long timeSpentInThisGrok = endTime.toEpochMilli() - startTime.toEpochMilli();
-            event.getMetadata().setAttribute(TOTAL_TIME_SPENT_IN_GROK_METADATA_KEY, totalEventTimeInGrok + timeSpentInThisGrok);
+                final long timeSpentInThisGrok = endTime.toEpochMilli() - startTime.toEpochMilli();
+                event.getMetadata().setAttribute(TOTAL_TIME_SPENT_IN_GROK_METADATA_KEY, totalEventTimeInGrok + timeSpentInThisGrok);
+            }
          }
         return records;
     }
diff --git a/data-prepper-plugins/grok-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/grok/GrokProcessorTests.java b/data-prepper-plugins/grok-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/grok/GrokProcessorTests.java
index d2ff11c3e0..e6fc984d8e 100644
--- a/data-prepper-plugins/grok-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/grok/GrokProcessorTests.java
+++ b/data-prepper-plugins/grok-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/grok/GrokProcessorTests.java
@@ -190,6 +190,7 @@ public void testMatchMerge() throws JsonProcessingException, ExecutionException,
         assertThat(grokkedRecords.get(0).getData(), notNullValue());
         assertThat(grokkedRecords.get(0).getData().getMetadata(), notNullValue());
         assertThat(grokkedRecords.get(0).getData().getMetadata().getAttribute(TOTAL_PATTERNS_ATTEMPTED_METADATA_KEY), equalTo(null));
+        assertThat(grokkedRecords.get(0).getData().getMetadata().getAttribute(TOTAL_TIME_SPENT_IN_GROK_METADATA_KEY), equalTo(null));
         assertRecordsAreEqual(grokkedRecords.get(0), resultRecord);
 
         verify(grokProcessingMatchCounter, times(1)).increment();
diff --git a/data-prepper-plugins/opensearch/build.gradle b/data-prepper-plugins/opensearch/build.gradle
index 72ad6b4488..1c4bfe7104 100644
--- a/data-prepper-plugins/opensearch/build.gradle
+++ b/data-prepper-plugins/opensearch/build.gradle
@@ -35,7 +35,7 @@ dependencies {
     implementation 'com.github.ben-manes.caffeine:caffeine:3.1.8'
     implementation 'software.amazon.awssdk:apache-client'
     implementation 'software.amazon.awssdk:netty-nio-client'
-    implementation 'co.elastic.clients:elasticsearch-java:7.17.0'
+    implementation 'co.elastic.clients:elasticsearch-java:8.13.0'
     implementation('org.apache.maven:maven-artifact:3.0.3') {
         exclude group: 'org.codehaus.plexus'
     }