Added ELC logger

browsermob-core/pom.xml

@@ -69,6 +69,11 @@
             <artifactId>jackson-core</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>co.elastic.logging</groupId>
+            <artifactId>log4j2-ecs-layout</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>

browsermob-core/src/main/java/net/lightbody/bmp/filters/HarCaptureFilter.java

@@ -32,10 +32,11 @@
 import net.lightbody.bmp.proxy.CaptureType;
 import net.lightbody.bmp.util.BeansJsonMapper;
 import net.lightbody.bmp.util.BrowserMobHttpUtil;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.ThreadContext;
+import org.apache.logging.log4j.message.StringMapMessage;
 import org.littleshoot.proxy.impl.ProxyUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.slf4j.MDC;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
@@ -57,7 +58,7 @@
 import static net.lightbody.bmp.filters.StatsDMetricsFilter.prepareMetric;
 
 public class HarCaptureFilter extends HttpsAwareFiltersAdapter {
-    private static final Logger log = LoggerFactory.getLogger(HarCaptureFilter.class);
+    private static final Logger log = LogManager.getLogger();
     private static final InheritableThreadLocal<HarRequest> isAlreadyLoggedIn = new InheritableThreadLocal<>();
 
     /**
@@ -796,14 +797,16 @@ protected static void logFailedRequestIfRequired(HarRequest request, HarResponse
         if ((Objects.isNull(isAlreadyLoggedIn.get()) ||
                 isAlreadyLoggedIn.get().hashCode() != request.hashCode())
                 && (response.getStatus() >= 500 || response.getStatus() == 0)) {
-            MDC.put("caller", "mobproxy");
-            MDC.put("http_response_code", String.valueOf(response.getStatus()));
-            MDC.put("http_host", request.getUrl());
-            MDC.put("request_details", BeansJsonMapper.getJsonString(request));
-            MDC.put("method", request.getMethod());
-            MDC.put("response", BeansJsonMapper.getJsonString(response));
-            log.error("received bad status code");
+            log.error(new StringMapMessage()
+                    .with("message", "received bad status code")
+                    .with("caller", "mobproxy")
+                    .with("http_response_code", String.valueOf(response.getStatus()))
+                    .with("http_host", request.getUrl())
+                    .with("request_details", BeansJsonMapper.getJsonString(request))
+                    .with("method", request.getMethod())
+                    .with("response", BeansJsonMapper.getJsonString(response)));
             isAlreadyLoggedIn.set(request);
+            ThreadContext.clearMap();
         }
     }
 

browsermob-dist/pom.xml

@@ -45,6 +45,11 @@
             <artifactId>logstash-gelf</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>co.elastic.logging</groupId>
+            <artifactId>log4j2-ecs-layout</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>

pom.xml

@@ -239,6 +239,11 @@
                 <version>${logstash-gelf.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>co.elastic.logging</groupId>
+                <artifactId>log4j2-ecs-layout</artifactId>
+                <version>0.5.0</version>
+            </dependency>
 
             <dependency>
                 <groupId>com.google.guava</groupId>