Skip to content

Fix delete_source removing parsed field when writing to root in parse… #6443

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

Open
DayneD89 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix delete_source removing parsed field when writing to root in parse… #6443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion .../main/java/org/opensearch/dataprepper/plugins/processor/parse/AbstractParseProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,13 +147,17 @@ public Collection<Record<Event>> doExecute(final Collection<Record<Event>> recor
parsedValue = parseUsingPointer(event, parsedValue, pointer, doWriteToRoot);
}

if (doWriteToRoot && deleteSourceRequested) {
event.delete(this.source);
}

if (doWriteToRoot) {
writeToRoot(event, parsedValue);
} else if (overwriteIfDestinationExists || !event.containsKey(destination)) {
event.put(destination, parsedValue, normalizeKeys);
}

if(deleteSourceRequested) {
if (deleteSourceRequested && !doWriteToRoot) {
event.delete(this.source);
}
} catch (Exception e) {
Expand Down
18 changes: 18 additions & 0 deletions .../java/org/opensearch/dataprepper/plugins/processor/parse/json/ParseJsonProcessorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,24 @@ void test_when_deleteSourceFlagEnabled() {
verifyNoInteractions(handleFailedEventsOption);
}

@Test
void test_when_deleteSourceFlagEnabled_and_parsedJsonContainsSourceFieldName() {
when(processorConfig.isDeleteSourceRequested()).thenReturn(true);
parseJsonProcessor = createObjectUnderTest();

// JSON where parsed key "message" matches source field name "message"
final String jsonWithMatchingKey = "{\"message\":\"hi\",\"level\":1}";
final Event parsedEvent = createAndParseMessageEvent(jsonWithMatchingKey);

// Source field deleted, but parsed "message" value preserved
assertThat(parsedEvent.get("message", String.class), equalTo("hi"));
assertThat(parsedEvent.get("level", Integer.class), equalTo(1));

verifyNoInteractions(processingFailuresCounter);
verifyNoInteractions(parseErrorsCounter);
verifyNoInteractions(handleFailedEventsOption);
}

@Test
void test_when_nestedJSONArrayOfJSON_then_parsedIntoArrayAndIndicesAccessible() {
parseJsonProcessor = createObjectUnderTest();
Expand Down
Loading