From fe8a43dd63e5573e8c60be0afe73d46b7ade40b5 Mon Sep 17 00:00:00 2001 From: Taylor Gray Date: Tue, 5 Mar 2024 14:14:02 -0600 Subject: [PATCH 1/2] Add check for if performance_metadata is enabled before adding metadata for grok processing time to Events Signed-off-by: Taylor Gray --- .../plugins/processor/grok/GrokProcessor.java | 14 ++++++++------ .../plugins/processor/grok/GrokProcessorTests.java | 1 + 2 files changed, 9 insertions(+), 6 deletions(-) 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> doExecute(final Collection> 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(); From c858baa532bdbf6cb9e2c262176a06a1f5efd7b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Mar 2024 20:15:09 +0000 Subject: [PATCH 2/2] Bump org.assertj:assertj-core Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.2 to 3.25.3. - [Release notes](https://github.com/assertj/assertj/releases) - [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.2...assertj-build-3.25.3) --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- data-prepper-plugins/otel-trace-raw-processor/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data-prepper-plugins/otel-trace-raw-processor/build.gradle b/data-prepper-plugins/otel-trace-raw-processor/build.gradle index faa3188179..6d9994abbb 100644 --- a/data-prepper-plugins/otel-trace-raw-processor/build.gradle +++ b/data-prepper-plugins/otel-trace-raw-processor/build.gradle @@ -19,7 +19,7 @@ dependencies { implementation 'com.fasterxml.jackson.core:jackson-databind' implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml' implementation 'com.github.ben-manes.caffeine:caffeine:3.1.8' - testImplementation 'org.assertj:assertj-core:3.25.2' + testImplementation 'org.assertj:assertj-core:3.25.3' testImplementation testLibs.mockito.inline }