Skip to content

[9.0] Correctly apply field path to JSON processor when adding contents to document root (#135479) #135498

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

Merged
merged 3 commits into from
Sep 26, 2025
Merged

[9.0] Correctly apply field path to JSON processor when adding contents to document root (#135479) #135498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
18c295c
Correctly apply field path to JSON processor when adding contents to …
jbaiera Sep 25, 2025
e1c4e52
Remove missing test util
jbaiera Sep 26, 2025
24cc0b2
Merge branch '9.0' into backport/9.0/pr-135479
jbaiera Sep 26, 2025
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: 6 additions & 0 deletions docs/changelog/135479.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 135479
summary: Correctly apply field path to JSON processor when adding contents to document
root
area: Ingest Node
type: bug
issues: []
9 changes: 7 additions & 2 deletions modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/JsonProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,10 @@ public static void apply(
boolean strictJsonParsing
) {
Object value = apply(ctx.get(fieldName), allowDuplicateKeys, strictJsonParsing);
mergeParsedJson(ctx, value, conflictStrategy);
}

private static void mergeParsedJson(Map<String, Object> ctx, Object value, ConflictStrategy conflictStrategy) {
if (value instanceof Map) {
@SuppressWarnings("unchecked")
Map<String, Object> map = (Map<String, Object>) value;
Expand Down Expand Up @@ -183,10 +187,11 @@ public static void recursiveMerge(Map<String, Object> target, Map<String, Object

@Override
public IngestDocument execute(IngestDocument document) throws Exception {
Object value = apply(document.getFieldValue(field, Object.class), allowDuplicateKeys, strictJsonParsing);
if (addToRoot) {
apply(document.getSourceAndMetadata(), field, allowDuplicateKeys, addToRootConflictStrategy, strictJsonParsing);
mergeParsedJson(document.getSourceAndMetadata(), value, addToRootConflictStrategy);
} else {
document.setFieldValue(targetField, apply(document.getFieldValue(field, Object.class), allowDuplicateKeys, strictJsonParsing));
document.setFieldValue(targetField, value);
}
return document;
}
Expand Down
22 changes: 22 additions & 0 deletions modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/JsonProcessorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,28 @@ public void testAddToRoot() throws Exception {
assertEquals("see", sourceAndMetadata.get("c"));
}

public void testAddToRootNestedField() throws Exception {
String processorTag = randomAlphaOfLength(3);
String randomTargetField = randomAlphaOfLength(2);
JsonProcessor jsonProcessor = new JsonProcessor(processorTag, null, "a.b", randomTargetField, true, REPLACE, false);

String json = "{\"a\": 1, \"b\": 2}";
Map<String, Object> subfield = new HashMap<>();
subfield.put("b", json);

Map<String, Object> document = new HashMap<>();
document.put("a", subfield);
document.put("c", "see");

IngestDocument ingestDocument = RandomDocumentPicks.randomIngestDocument(random(), document);
jsonProcessor.execute(ingestDocument);

Map<String, Object> sourceAndMetadata = ingestDocument.getSourceAndMetadata();
assertEquals(1, sourceAndMetadata.get("a"));
assertEquals(2, sourceAndMetadata.get("b"));
assertEquals("see", sourceAndMetadata.get("c"));
}

public void testDuplicateKeys() throws Exception {
String processorTag = randomAlphaOfLength(3);
JsonProcessor lenientJsonProcessor = new JsonProcessor(processorTag, null, "a", null, true, REPLACE, true);
Expand Down