Skip to content

Bump org.assertj:assertj-core from 3.25.2 to 3.25.3 in /data-prepper-plugins/otel-trace-raw-processor #541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dependabot wants to merge 2 commits into from
Closed

Bump org.assertj:assertj-core from 3.25.2 to 3.25.3 in /data-prepper-plugins/otel-trace-raw-processor #541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe8a43d
Add check for if performance_metadata is enabled before adding metada…
graytaylor0 Mar 5, 2024
c858baa
Bump org.assertj:assertj-core
dependabot[bot] Mar 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions ...cessor/src/main/java/org/opensearch/dataprepper/plugins/processor/grok/GrokProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
1 change: 1 addition & 0 deletions ...r/src/test/java/org/opensearch/dataprepper/plugins/processor/grok/GrokProcessorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion data-prepper-plugins/otel-trace-raw-processor/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down