Added fluentD logger (#33)

* Added fluentD logger

* Naming fix

* Logic fix

Author: kirillbilchenko

README.md

@@ -396,7 +396,7 @@ When you build the latest code from source, you'll have access to the latest sna
     <dependency>
         <groupId>net.lightbody.bmp</groupId>
         <artifactId>browsermob-core</artifactId>
-        <version>2.1.36</version>
+        <version>2.1.37</version>
         <scope>test</scope>
     </dependency>
 ```

browsermob-core/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>browsermob-proxy</artifactId>
         <groupId>net.lightbody.bmp</groupId>
-        <version>2.1.36</version>
+        <version>2.1.37</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -69,6 +69,12 @@
             <artifactId>jackson-core</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.fluentd</groupId>
+            <artifactId>fluent-logger</artifactId>
+        </dependency>
+
+
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>

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

@@ -17,10 +17,11 @@
 import net.lightbody.bmp.proxy.CaptureType;
 import net.lightbody.bmp.util.BeansJsonMapper;
 import net.lightbody.bmp.util.BrowserMobHttpUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.fluentd.logger.FluentLogger;
 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;
@@ -30,12 +31,22 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import static net.lightbody.bmp.filters.StatsDMetricsFilter.*;
+import static net.lightbody.bmp.filters.StatsDMetricsFilter.getProxyPrefix;
+import static net.lightbody.bmp.filters.StatsDMetricsFilter.getStatsDHost;
+import static net.lightbody.bmp.filters.StatsDMetricsFilter.getStatsDPort;
+import static net.lightbody.bmp.filters.StatsDMetricsFilter.prepareMetric;
 
 public class HarCaptureFilter extends HttpsAwareFiltersAdapter {
     private static final Logger log = LoggerFactory.getLogger(HarCaptureFilter.class);
+    private static FluentLogger LOG;
     private static final InheritableThreadLocal<HarRequest> isAlreadyLoggedIn = new InheritableThreadLocal<>();
 
+    static {
+        if (StringUtils.isNotEmpty(System.getProperty("fluentdHost")) || StringUtils.isNotEmpty(System.getProperty("fluentdPort"))) {
+            LOG = FluentLogger.getLogger("mobproxy", System.getProperty("fluentdHost"), Integer.parseInt(System.getProperty("fluentdPort")));
+        }
+    }
+
     /**
      * The currently active HAR at the time the current request is received.
      */
@@ -769,15 +780,17 @@ public void serverToProxyResponseReceived() {
     }
 
     protected static void logFailedRequestIfRequired(HarRequest request, HarResponse response) {
-        if ((Objects.isNull(isAlreadyLoggedIn.get()) || isAlreadyLoggedIn.get().hashCode() != request.hashCode())
+        if (Objects.nonNull(LOG) &&
+                (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");
+            Map<String, Object> data = new HashMap<String, Object>();
+            data.put("caller", "mobproxy");
+            data.put("http_response_code", String.valueOf(response.getStatus()));
+            data.put("http_host", request.getUrl());
+            data.put("request_details", BeansJsonMapper.getJsonString(request));
+            data.put("method", request.getMethod());
+            data.put("response", BeansJsonMapper.getJsonString(response));
+            LOG.log("failure", data);
             isAlreadyLoggedIn.set(request);
         }
     }

browsermob-dist/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>browsermob-proxy</artifactId>
         <groupId>net.lightbody.bmp</groupId>
-        <version>2.1.36</version>
+        <version>2.1.37</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -45,6 +45,11 @@
             <artifactId>logstash-gelf</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.fluentd</groupId>
+            <artifactId>fluent-logger</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>

browsermob-legacy/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>browsermob-proxy</artifactId>
         <groupId>net.lightbody.bmp</groupId>
-        <version>2.1.36</version>
+        <version>2.1.37</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

browsermob-rest/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>browsermob-proxy</artifactId>
         <groupId>net.lightbody.bmp</groupId>
-        <version>2.1.36</version>
+        <version>2.1.37</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

mitm/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>browsermob-proxy</artifactId>
         <groupId>net.lightbody.bmp</groupId>
-        <version>2.1.36</version>
+        <version>2.1.37</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.lightbody.bmp</groupId>
     <artifactId>browsermob-proxy</artifactId>
-    <version>2.1.36</version>
+    <version>2.1.37</version>
     <modules>
         <module>browsermob-core</module>
         <module>browsermob-legacy</module>
@@ -240,9 +240,9 @@
             </dependency>
 
             <dependency>
-                <groupId>com.twimba</groupId>
-                <artifactId>fluentd4log4j</artifactId>
-                <version>1.0.1</version>
+                <groupId>org.fluentd</groupId>
+                <artifactId>fluent-logger</artifactId>
+                <version>0.3.4</version>
             </dependency>
 
             <dependency>