Use log.file instead of file

See also elastic/ecs#802
felixbarny · Apr 23, 2020 · 61cbbc8 · 61cbbc8
1 parent a2549ff
commit 61cbbc8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/report/serialize/DslJsonSerializer.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/report/serialize/DslJsonSerializer.java
@@ -236,13 +236,16 @@ public void serializeFileMetaData(File file) {
         jw.writeByte(JsonWriter.OBJECT_START);
         writeFieldName("metadata");
         jw.writeByte(JsonWriter.OBJECT_START);
+        writeFieldName("log");
+        jw.writeByte(JsonWriter.OBJECT_START);
         writeFieldName("file");
         jw.writeByte(JsonWriter.OBJECT_START);
         writeField("path", file.getAbsolutePath());
         writeLastField("name", file.getName());
         jw.writeByte(JsonWriter.OBJECT_END);
         jw.writeByte(JsonWriter.OBJECT_END);
         jw.writeByte(JsonWriter.OBJECT_END);
+        jw.writeByte(JsonWriter.OBJECT_END);
         jw.writeByte(NEW_LINE);
     }
 

diff --git a/...hipper-plugin/src/test/java/co/elastic/apm/agent/log/shipper/ApmServerLogShipperTest.java b/...hipper-plugin/src/test/java/co/elastic/apm/agent/log/shipper/ApmServerLogShipperTest.java
@@ -96,7 +96,7 @@ public void testSendLogs() throws Exception {
         List<String> events = getEvents();
         mockApmServer.verify(postRequestedFor(urlEqualTo(ApmServerLogShipper.LOGS_ENDPOINT)));
         assertThat(events).hasSize(3);
-        JsonNode fileMetadata = new ObjectMapper().readTree(events.get(1)).get("metadata").get("file");
+        JsonNode fileMetadata = new ObjectMapper().readTree(events.get(1)).get("metadata").get("log").get("file");
         assertThat(fileMetadata.get("name").textValue()).isEqualTo(logFile.getName());
         assertThat(fileMetadata.get("path").textValue()).isEqualTo(logFile.getAbsolutePath());
         assertThat(events.get(2)).isEqualTo("foo");