Merge pull request #52 from derylseale/main

feat: added logback marker to JSON layout if present

Author: jasonjkeller

core/src/main/java/com/newrelic/logging/core/ElementName.java

@@ -6,6 +6,7 @@
 
 public class ElementName {
     public static final String MESSAGE = "message";
+    public static final String MARKER = "marker";
     public static final String TIMESTAMP = "timestamp";
     public static final String THREAD_NAME = "thread.name";
     public static final String LOG_LEVEL = "log.level";

logback/src/main/java/com/newrelic/logging/logback/NewRelicJsonLayout.java

@@ -69,6 +69,10 @@ private void writeToGenerator(ILoggingEvent event, JsonGenerator generator) thro
             }
         }
 
+        if (event.getMarker() != null) {
+            generator.writeStringField(ElementName.MARKER, event.getMarker().getName());
+        }
+
         Object[] customArgumentArray = event.getArgumentArray();
         if (customArgumentArray != null) {
             for (Object oneCustomArgumentObject : customArgumentArray) {

logback11/src/main/java/com/newrelic/logging/logback11/NewRelicJsonLayout.java

@@ -54,6 +54,10 @@ private void writeToGenerator(ILoggingEvent event, JsonGenerator generator) thro
             }
         }
 
+        if (event.getMarker() != null) {
+            generator.writeStringField(ElementName.MARKER, event.getMarker().getName());
+        }
+
         generator.writeEndObject();
     }
 }