Merge remote-tracking branch 'eyalkoren/ECS-namespacing-processor' into ECS-namespacing-processor

eyalkoren · eyalkoren · commit d67fa2cc3d0e · 2025-03-30T16:34:33.000+03:00
diff --git a/modules/ingest-ecs/src/main/java/org/elasticsearch/ingest/ecs/EcsNamespaceProcessor.java b/modules/ingest-ecs/src/main/java/org/elasticsearch/ingest/ecs/EcsNamespaceProcessor.java
@@ -252,11 +252,11 @@ static void renameSpecialKeys(IngestDocument document) {
     }
 
     private boolean shouldMoveToResourceAttributes(String key) {
-        return key.startsWith(AGENT_PREFIX +".")
+        return key.startsWith(AGENT_PREFIX + ".")
             || key.equals(AGENT_PREFIX)
             || key.startsWith(CLOUD_PREFIX + ".")
             || key.equals(CLOUD_PREFIX)
-            || key.startsWith(HOST_PREFIX +".")
+            || key.startsWith(HOST_PREFIX + ".")
             || key.equals(HOST_PREFIX);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -252,11 +252,11 @@ static void renameSpecialKeys(IngestDocument document) {`
`252`	`252`	`}`
`253`	`253`
`254`	`254`	`private boolean shouldMoveToResourceAttributes(String key) {`
`255`		`- return key.startsWith(AGENT_PREFIX +".")`
	`255`	`+ return key.startsWith(AGENT_PREFIX + ".")`
`256`	`256`	`\|\| key.equals(AGENT_PREFIX)`
`257`	`257`	`\|\| key.startsWith(CLOUD_PREFIX + ".")`
`258`	`258`	`\|\| key.equals(CLOUD_PREFIX)`
`259`		`- \|\| key.startsWith(HOST_PREFIX +".")`
	`259`	`+ \|\| key.startsWith(HOST_PREFIX + ".")`
`260`	`260`	`\|\| key.equals(HOST_PREFIX);`
`261`	`261`	`}`
`262`	`262`