Add includeOrigin flag

depends on elastic/ecs#563
closes elastic#3

README.md

@@ -76,6 +76,9 @@ We recommend using this library to log into a JSON log file and let Filebeat sen
 |[`@timestamp`](https://www.elastic.co/guide/en/ecs/current/ecs-base.html) | [`LogEvent#getTimeMillis()`](https://logging.apache.org/log4j/log4j-2.3/log4j-core/apidocs/org/apache/logging/log4j/core/LogEvent.html#getTimeMillis()) |
 |[`log.level`](https://www.elastic.co/guide/en/ecs/current/ecs-log.html) | [`LogEvent#getLevel()`](https://logging.apache.org/log4j/log4j-2.3/log4j-core/apidocs/org/apache/logging/log4j/core/LogEvent.html#getLevel()) |
 |[`log.logger`](https://www.elastic.co/guide/en/ecs/current/ecs-log.html)|[`LogEvent#getLoggerName()`](https://logging.apache.org/log4j/log4j-2.3/log4j-core/apidocs/org/apache/logging/log4j/core/LogEvent.html#getLoggerName())|
+|[`log.origin.file`](https://www.elastic.co/guide/en/ecs/current/ecs-log.html)|[StackTraceElement#getFileName()](https://docs.oracle.com/javase/6/docs/api/java/lang/StackTraceElement.html#getFileName())|
+|[`log.origin.function`](https://www.elastic.co/guide/en/ecs/current/ecs-log.html)|[`[StackTraceElement#getMethodName()]()`](https://docs.oracle.com/javase/6/docs/api/java/lang/StackTraceElement.html#getMethodName())|
+|[`log.origin.line`](https://www.elastic.co/guide/en/ecs/current/ecs-log.html)|[`[StackTraceElement#getLineNumber()]()`](https://docs.oracle.com/javase/6/docs/api/java/lang/StackTraceElement.html#getLineNumber())|
 |[`message`](https://www.elastic.co/guide/en/ecs/current/ecs-base.html)|[`LogEvent#getMessage()`](https://logging.apache.org/log4j/log4j-2.3/log4j-core/apidocs/org/apache/logging/log4j/core/LogEvent.html#getMessage())|
 |[`error.code`](https://www.elastic.co/guide/en/ecs/current/ecs-error.html)|[`Throwable#getClass()`](https://docs.oracle.com/javase/7/docs/api/java/lang/Object.html#getClass())|
 |[`error.message`](https://www.elastic.co/guide/en/ecs/current/ecs-error.html)|[`Throwable#getStackTrace()`](https://docs.oracle.com/javase/7/docs/api/java/lang/Throwable.html#getMessage())|

ecs-logging-core/src/main/java/co/elastic/logging/EcsJsonSerializer.java

@@ -115,6 +115,25 @@ public static void serializeTagEnd(StringBuilder builder) {
         builder.append("],");
     }
 
+    public static void serializeOrigin(StringBuilder builder, StackTraceElement stackTraceElement) {
+        if (stackTraceElement != null) {
+            serializeOrigin(builder, stackTraceElement.getFileName(), stackTraceElement.getMethodName(), stackTraceElement.getLineNumber());
+        }
+    }
+
+    public static void serializeOrigin(StringBuilder builder, String fileName, String methodName, int lineNumber) {
+        builder.append("\"log.origin\":{");
+        builder.append("\"file\":\"");
+        JsonUtils.quoteAsString(fileName, builder);
+        builder.append("\",");
+        builder.append("\"function\":\"");
+        JsonUtils.quoteAsString(methodName, builder);
+        builder.append("\",");
+        builder.append("\"line\":");
+        builder.append(lineNumber);
+        builder.append("},");
+    }
+
     public static void serializeLabels(StringBuilder builder, Map<String, ?> labels, Set<String> topLevelLabels) {
         if (!labels.isEmpty()) {
             for (Map.Entry<String, ?> entry : labels.entrySet()) {

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

@@ -93,6 +93,14 @@ void testLogException() throws Exception {
         assertThat(stackTrace).contains("at co.elastic.logging.AbstractEcsLoggingTest.testLogException");
     }
 
+    @Test
+    void testLogOrigin() throws Exception {
+        debug("test");
+        assertThat(getLastLogLine().get("log.origin").get("file").textValue()).endsWith(".java");
+        assertThat(getLastLogLine().get("log.origin").get("function").textValue()).isEqualTo("debug");
+        assertThat(getLastLogLine().get("log.origin").get("line").intValue()).isPositive();
+    }
+
     public abstract void putMdc(String key, String value);
 
     public boolean putNdc(String message) {

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

@@ -26,6 +26,7 @@
 
 import co.elastic.logging.EcsJsonSerializer;
 import org.apache.log4j.Layout;
+import org.apache.log4j.spi.LocationInfo;
 import org.apache.log4j.spi.LoggingEvent;
 import org.apache.log4j.spi.ThrowableInformation;
 
@@ -37,6 +38,7 @@ public class EcsLayout extends Layout {
     private boolean stackTraceAsArray = false;
     private String serviceName;
     private Set<String> topLevelLabels = new HashSet<String>(EcsJsonSerializer.DEFAULT_TOP_LEVEL_LABELS);
+    private boolean includeOrigin;
 
     @Override
     public String format(LoggingEvent event) {
@@ -49,6 +51,12 @@ public String format(LoggingEvent event) {
         EcsJsonSerializer.serializeLoggerName(builder, event.getLoggerName());
         EcsJsonSerializer.serializeLabels(builder, event.getProperties(), topLevelLabels);
         EcsJsonSerializer.serializeTag(builder, event.getNDC());
+        if (includeOrigin) {
+            LocationInfo locationInformation = event.getLocationInformation();
+            if (locationInformation != null) {
+                EcsJsonSerializer.serializeOrigin(builder, locationInformation.getFileName(), locationInformation.getMethodName(), getLineNumber(locationInformation));
+            }
+        }
         ThrowableInformation throwableInformation = event.getThrowableInformation();
         if (throwableInformation != null) {
             EcsJsonSerializer.serializeException(builder, throwableInformation.getThrowable(), stackTraceAsArray);
@@ -57,6 +65,19 @@ public String format(LoggingEvent event) {
         return builder.toString();
     }
 
+    private static int getLineNumber(LocationInfo locationInformation) {
+        int lineNumber = -1;
+        String lineNumberString = locationInformation.getLineNumber();
+        if (!LocationInfo.NA.equals(lineNumberString)) {
+            try {
+                lineNumber = Integer.parseInt(lineNumberString);
+            } catch (NumberFormatException e) {
+                // ignore
+            }
+        }
+        return lineNumber;
+    }
+
     @Override
     public boolean ignoresThrowable() {
         return false;
@@ -71,6 +92,10 @@ public void setServiceName(String serviceName) {
         this.serviceName = serviceName;
     }
 
+    public void setIncludeOrigin(boolean includeOrigin) {
+        this.includeOrigin = includeOrigin;
+    }
+
     public void setStackTraceAsArray(boolean stackTraceAsArray) {
         this.stackTraceAsArray = stackTraceAsArray;
     }

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

@@ -31,11 +31,11 @@
 import java.util.List;
 
 class ListAppender extends AppenderSkeleton {
-    private List<LoggingEvent> logEvents = new ArrayList<>();
+    private List<String> logEvents = new ArrayList<>();
 
     @Override
     protected void append(LoggingEvent event) {
-        logEvents.add(event);
+        logEvents.add(layout.format(event));
     }
 
     @Override
@@ -45,10 +45,10 @@ public void close() {
 
     @Override
     public boolean requiresLayout() {
-        return false;
+        return true;
     }
 
-    public List<LoggingEvent> getLogEvents() {
+    public List<String> getLogEvents() {
         return logEvents;
     }
 }

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

@@ -31,14 +31,11 @@
 import org.apache.log4j.MDC;
 import org.apache.log4j.NDC;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.BeforeEach;
 
 import java.io.IOException;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 class Log4jEcsLayoutTest extends AbstractEcsLoggingTest {
 
     private Logger logger;
@@ -54,6 +51,8 @@ void setUp() {
         ecsLayout = new EcsLayout();
         ecsLayout.setServiceName("test");
         ecsLayout.setStackTraceAsArray(true);
+        ecsLayout.setIncludeOrigin(true);
+        appender.setLayout(ecsLayout);
     }
 
     @BeforeEach
@@ -87,7 +86,7 @@ public void error(String message, Throwable t) {
 
     @Override
     public JsonNode getLastLogLine() throws IOException {
-        return objectMapper.readTree(ecsLayout.format(appender.getLogEvents().get(0)));
+        return objectMapper.readTree(appender.getLogEvents().get(0));
     }
 
 }

log4j2-ecs-layout/README.md

@@ -47,6 +47,7 @@ Instead of the usual `<PatternLayout/>`, use `<EcsLayout serviceName="my-app"/>`
 |serviceName      |String |       |Sets the `service.name` field so you can filter your logs by a particular service |
 |includeMarkers   |boolean|`false`|Log [Markers](https://logging.apache.org/log4j/2.0/manual/markers.html) as `tags` |
 |stackTraceAsArray|boolean|`false`|Serializes the `error.stack_trace` as a JSON array where each element is in a new line to improve readability. Note that this requires a slightly more complex Filebeat setup. See also https://github.com/elastic/java-ecs-logging/blob/master/README.md#TODO|
+|includeOrigin    |boolean|`false`|If `true`, adds the `log.origin.file`, `log.origin.function` and `log.origin.line` fields. Note that you also have to set `includeLocation="true"` on your loggers and appenders if you are using the async ones. |
 
 To include any custom field in the output, use following syntax:
 

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

@@ -76,14 +76,16 @@ public void accept(final String key, final Object value, final StringBuilder str
     private final KeyValuePair[] additionalFields;
     private final Set<String> topLevelLabels;
     private final boolean stackTraceAsArray;
-    private String serviceName;
-    private boolean includeMarkers;
+    private final String serviceName;
+    private final boolean includeMarkers;
+    private final boolean includeOrigin;
 
-    private EcsLayout(Configuration config, String serviceName, boolean includeMarkers, KeyValuePair[] additionalFields, Collection<String> topLevelLabels, boolean stackTraceAsArray) {
+    private EcsLayout(Configuration config, String serviceName, boolean includeMarkers, KeyValuePair[] additionalFields, Collection<String> topLevelLabels, boolean includeOrigin, boolean stackTraceAsArray) {
         super(config, UTF_8, null, null);
         this.serviceName = serviceName;
         this.includeMarkers = includeMarkers;
         this.topLevelLabels = new HashSet<String>(topLevelLabels);
+        this.includeOrigin = includeOrigin;
         this.stackTraceAsArray = stackTraceAsArray;
         this.topLevelLabels.add("trace.id");
         this.topLevelLabels.add("transaction.id");
@@ -121,6 +123,9 @@ private StringBuilder toText(LogEvent event, StringBuilder builder, boolean gcFr
         EcsJsonSerializer.serializeLoggerName(builder, event.getLoggerName());
         serializeLabels(event, builder);
         serializeTags(event, builder);
+        if (includeOrigin) {
+            EcsJsonSerializer.serializeOrigin(builder, event.getSource());
+        }
         EcsJsonSerializer.serializeException(builder, event.getThrown(), stackTraceAsArray);
         EcsJsonSerializer.serializeObjectEnd(builder);
         return builder;
@@ -225,6 +230,8 @@ public static class Builder extends AbstractStringLayout.Builder<EcsLayout.Build
         private KeyValuePair[] additionalFields;
         @PluginElement("TopLevelLabels")
         private String[] topLevelLabels;
+        @PluginBuilderAttribute("includeOrigin")
+        private boolean includeOrigin;
 
         Builder() {
             super();
@@ -243,6 +250,10 @@ public boolean isIncludeMarkers() {
             return includeMarkers;
         }
 
+        public boolean isIncludeOrigin() {
+            return includeOrigin;
+        }
+
         public String[] getTopLevelLabels() {
             return topLevelLabels;
         }
@@ -272,14 +283,19 @@ public EcsLayout.Builder setIncludeMarkers(final boolean includeMarkers) {
             return asBuilder();
         }
 
+        public EcsLayout.Builder setIncludeOrigin(final boolean includeOrigin) {
+            this.includeOrigin = includeOrigin;
+            return asBuilder();
+        }
+
         public EcsLayout.Builder setStackTraceAsArray(boolean stackTraceAsArray) {
             this.stackTraceAsArray = stackTraceAsArray;
             return asBuilder();
         }
 
         @Override
         public EcsLayout build() {
-            return new EcsLayout(getConfiguration(), serviceName, includeMarkers, additionalFields, topLevelLabels == null ? Collections.<String>emptyList() : Arrays.<String>asList(topLevelLabels), stackTraceAsArray);
+            return new EcsLayout(getConfiguration(), serviceName, includeMarkers, additionalFields, topLevelLabels == null ? Collections.<String>emptyList() : Arrays.<String>asList(topLevelLabels), includeOrigin, stackTraceAsArray);
         }
 
         public boolean isStackTraceAsArray() {

log4j2-ecs-layout/src/test/java/co/elastic/logging/log4j2/Log4j2EcsLayoutTest.java

@@ -68,6 +68,7 @@ void setUp() {
                 .setConfiguration(ctx.getConfiguration())
                 .setServiceName("test")
                 .setIncludeMarkers(true)
+                .setIncludeOrigin(true)
                 .setStackTraceAsArray(true)
                 .setAdditionalFields(new KeyValuePair[]{
                         new KeyValuePair("cluster.uuid", "9fe9134b-20b0-465e-acf9-8cc09ac9053b"),

log4j2-ecs-layout/src/test/resources/log4j2-test.xml

@@ -5,7 +5,7 @@
     </Properties>
     <Appenders>
         <List name="TestAppender">
-            <EcsLayout serviceName="test" includeMarkers="true" stackTraceAsArray="true">
+            <EcsLayout serviceName="test" includeMarkers="true" includeOrigin="true" stackTraceAsArray="true">
                 <KeyValuePair key="cluster.uuid" value="9fe9134b-20b0-465e-acf9-8cc09ac9053b"/>
                 <KeyValuePair key="node.id" value="${node.id}"/>
                 <KeyValuePair key="empty" value="${empty}"/>

logback-ecs-encoder/README.md

@@ -65,3 +65,4 @@ All you have to do is to use the `co.elastic.logging.logback.EcsEncoder` instead
 |serviceName      |String |       |Sets the `service.name` field so you can filter your logs by a particular service |
 |includeMarkers   |boolean|`false`|Log [Markers](https://www.slf4j.org/api/org/slf4j/Marker.html) as `tags` |
 |stackTraceAsArray|boolean|`false`|Serializes the `error.stack_trace` as a JSON array where each element is in a new line to improve readability. Note that this requires a slightly more complex Filebeat setup. See also https://github.com/elastic/java-ecs-logging/blob/master/README.md#TODO|
+|includeOrigin    |boolean|`false`|If `true`, adds the `log.origin.file`, `log.origin.function` and `log.origin.line` fields|

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

@@ -45,6 +45,7 @@ public class EcsEncoder extends EncoderBase<ILoggingEvent> {
     private boolean includeMarkers = false;
     private ThrowableProxyConverter throwableProxyConverter;
     private Set<String> topLevelLabels = new HashSet<String>(EcsJsonSerializer.DEFAULT_TOP_LEVEL_LABELS);
+    private boolean includeOrigin;
 
     @Override
     public byte[] headerBytes() {
@@ -69,6 +70,12 @@ public byte[] encode(ILoggingEvent event) {
         EcsJsonSerializer.serializeThreadName(builder, event.getThreadName());
         EcsJsonSerializer.serializeLoggerName(builder, event.getLoggerName());
         EcsJsonSerializer.serializeLabels(builder, event.getMDCPropertyMap(), topLevelLabels);
+        if (includeOrigin) {
+            StackTraceElement[] callerData = event.getCallerData();
+            if (callerData != null && callerData.length > 0) {
+                EcsJsonSerializer.serializeOrigin(builder, callerData[0]);
+            }
+        }
         IThrowableProxy throwableProxy = event.getThrowableProxy();
         if (throwableProxy instanceof ThrowableProxy) {
             EcsJsonSerializer.serializeException(builder, ((ThrowableProxy) throwableProxy).getThrowable(), stackTraceAsArray);
@@ -115,4 +122,8 @@ public void setIncludeMarkers(boolean includeMarkers) {
     public void setStackTraceAsArray(boolean stackTraceAsArray) {
         this.stackTraceAsArray = stackTraceAsArray;
     }
+
+    public void setIncludeOrigin(boolean includeOrigin) {
+        this.includeOrigin = includeOrigin;
+    }
 }

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

@@ -25,35 +25,34 @@
 package co.elastic.logging.logback;
 
 import ch.qos.logback.classic.LoggerContext;
-import ch.qos.logback.classic.spi.ILoggingEvent;
-import ch.qos.logback.core.read.ListAppender;
 import com.fasterxml.jackson.databind.JsonNode;
 import org.junit.jupiter.api.BeforeEach;
 
 import java.io.IOException;
 
 class EcsEncoderTest extends AbstractEcsEncoderTest {
 
-    private ListAppender<ILoggingEvent> appender;
-    private EcsEncoder ecsEncoder;
+    private OutputStreamAppender appender;
 
     @BeforeEach
     void setUp() {
         LoggerContext context = new LoggerContext();
         logger = context.getLogger(getClass());
-        appender = new ListAppender<>();
+        appender = new OutputStreamAppender();
         appender.setContext(context);
-        appender.start();
         logger.addAppender(appender);
-        ecsEncoder = new EcsEncoder();
+        EcsEncoder ecsEncoder = new EcsEncoder();
         ecsEncoder.setServiceName("test");
         ecsEncoder.setIncludeMarkers(true);
         ecsEncoder.setStackTraceAsArray(true);
+        ecsEncoder.setIncludeOrigin(true);
         ecsEncoder.start();
+        appender.setEncoder(ecsEncoder);
+        appender.start();
     }
 
     @Override
     public JsonNode getLastLogLine() throws IOException {
-        return objectMapper.readTree(ecsEncoder.encode(appender.list.get(0)));
+        return objectMapper.readTree(appender.getBytes());
     }
 }

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

@@ -4,6 +4,7 @@
         <encoder class="co.elastic.logging.logback.EcsEncoder">
             <serviceName>test</serviceName>
             <includeMarkers>true</includeMarkers>
+            <includeOrigin>true</includeOrigin>
             <stackTraceAsArray>true</stackTraceAsArray>
         </encoder>
     </appender>