Add method addTopLevelLabel() to EcsEncoder and EcsLayout (#41) (#42)

Author: Bjoern2

ecs-logging-core/src/test/java/co/elastic/logging/AbstractEcsLoggingTest.java

@@ -82,6 +82,14 @@ void testTopLevelLabels() throws Exception {
         assertThat(getLastLogLine().get("transaction.id").textValue()).isEqualTo("0af7651916cd43dd8448eb211c80319c");
         assertThat(getLastLogLine().get("span.id").textValue()).isEqualTo("foo");
     }
+    
+    @Test
+    void testCustomTopLevelLabels() throws Exception {
+        putMdc("top_level", "foo");
+        debug("test");
+        assertThat(getLastLogLine().get("labels.top_level")).isNull();
+        assertThat(getLastLogLine().get("top_level").textValue()).isEqualTo("foo");
+    }
 
     @Test
     void testLogException() throws Exception {

ecs-logging-core/src/test/java/co/elastic/logging/EcsJsonSerializerTest.java

@@ -70,7 +70,7 @@ void serializeExceptionAsArray() throws IOException {
         exception.printStackTrace(new PrintWriter(stringWriter));
         assertThat(StreamSupport.stream(jsonNode.get("error.stack_trace").spliterator(), false)
                 .map(JsonNode::textValue)
-                .collect(Collectors.joining("\n", "", "\n")))
+                .collect(Collectors.joining(System.lineSeparator(), "", System.lineSeparator())))
                 .isEqualTo(stringWriter.toString());
     }
 

log4j-ecs-layout/src/main/java/co/elastic/logging/log4j/EcsLayout.java

@@ -99,4 +99,8 @@ public void setIncludeOrigin(boolean includeOrigin) {
     public void setStackTraceAsArray(boolean stackTraceAsArray) {
         this.stackTraceAsArray = stackTraceAsArray;
     }
+    
+    public void addTopLevelLabel(String topLevelLabel) {
+        this.topLevelLabels.add(topLevelLabel);
+    }
 }

log4j-ecs-layout/src/test/java/co/elastic/logging/log4j/Log4jEcsLayoutTest.java

@@ -52,6 +52,7 @@ void setUp() {
         ecsLayout.setServiceName("test");
         ecsLayout.setStackTraceAsArray(true);
         ecsLayout.setIncludeOrigin(true);
+        ecsLayout.addTopLevelLabel("top_level");
         appender.setLayout(ecsLayout);
     }
 

logback-ecs-encoder/src/main/java/co/elastic/logging/logback/EcsEncoder.java

@@ -86,6 +86,10 @@ public byte[] encode(ILoggingEvent event) {
         // all these allocations kinda hurt
         return builder.toString().getBytes(UTF_8);
     }
+    
+    public void addTopLevelLabel(String topLevelLabel) {
+        this.topLevelLabels.add(topLevelLabel);
+    }
 
     private void serializeMarkers(ILoggingEvent event, StringBuilder builder) {
         Marker marker = event.getMarker();

logback-ecs-encoder/src/test/java/co/elastic/logging/logback/EcsEncoderTest.java

@@ -46,6 +46,7 @@ void setUp() {
         ecsEncoder.setIncludeMarkers(true);
         ecsEncoder.setStackTraceAsArray(true);
         ecsEncoder.setIncludeOrigin(true);
+        ecsEncoder.addTopLevelLabel("top_level");
         ecsEncoder.start();
         appender.setEncoder(ecsEncoder);
         appender.start();

logback-ecs-encoder/src/test/resources/logback-config.xml

@@ -6,6 +6,7 @@
             <includeMarkers>true</includeMarkers>
             <includeOrigin>true</includeOrigin>
             <stackTraceAsArray>true</stackTraceAsArray>
+            <topLevelLabel>top_level</topLevelLabel>
         </encoder>
     </appender>
     <root level="DEBUG">