BMP 2.1.28 promotion

README.md

@@ -395,7 +395,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.28-SNAPSHOT</version>
+        <version>2.1.29-SNAPSHOT</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.28-SNAPSHOT</version>
+        <version>2.1.29-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -163,6 +163,22 @@ public HarCaptureFilter(HttpRequest originalRequest, ChannelHandlerContext ctx,
         this.harEntry = new HarEntry(currentPageRef);
     }
 
+    @Override
+    public HttpObject proxyToClientResponse(HttpObject httpObject) {
+        if (httpObject instanceof LastHttpContent) {
+            if (harEntry.getResponse().getStatus() == 0) {
+                HarCaptureFilter.logFailedRequestIfRequired(harEntry.getRequest(), harEntry.getResponse());
+                createStatsDClient();
+                statsDClient.get().increment(getProxyPrefix().concat(prepareMetric(harEntry.getRequest().getUrl()))
+                        .concat("." + harEntry.getResponse().getStatus()).concat(".request_timeout"));
+                stopStatsDClient();
+
+            }
+        }
+
+        return super.proxyToClientResponse(httpObject);
+    }
+
     @Override
     public HttpResponse clientToProxyRequest(HttpObject httpObject) {
         // if a ServerResponseCaptureFilter is configured, delegate to it to collect the client request. if it is not

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

@@ -1,17 +1,11 @@
 package net.lightbody.bmp.filters;
 
 import com.google.common.cache.CacheBuilder;
-import com.timgroup.statsd.NonBlockingStatsDClient;
-import com.timgroup.statsd.StatsDClient;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.http.HttpObject;
 import io.netty.handler.codec.http.HttpRequest;
 import io.netty.handler.codec.http.HttpResponse;
-import net.lightbody.bmp.core.har.Har;
-import net.lightbody.bmp.core.har.HarEntry;
-import net.lightbody.bmp.core.har.HarRequest;
-import net.lightbody.bmp.core.har.HarResponse;
-import net.lightbody.bmp.core.har.HarTimings;
+import net.lightbody.bmp.core.har.*;
 import net.lightbody.bmp.filters.support.HttpConnectTiming;
 import net.lightbody.bmp.filters.util.HarCaptureUtil;
 import net.lightbody.bmp.util.HttpUtil;
@@ -25,8 +19,6 @@
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.TimeUnit;
 
-import static net.lightbody.bmp.filters.StatsDMetricsFilter.*;
-
 /**
  * This filter captures HAR data for HTTP CONNECT requests. CONNECTs are "meta" requests that must be made before HTTPS
  * requests, but are not populated as separate requests in the HAR. Most information from HTTP CONNECTs (such as SSL
@@ -38,7 +30,6 @@
  */
 public class HttpConnectHarCaptureFilter extends HttpsAwareFiltersAdapter implements ModifiedRequestAwareFilter {
     private static final Logger log = LoggerFactory.getLogger(HttpConnectHarCaptureFilter.class);
-    private static final StatsDClient statsDClient = new NonBlockingStatsDClient("automated_tests", getStatsDHost(), getStatsDPort());
 
     /**
      * The currently active HAR at the time the current request is received.
@@ -336,8 +327,6 @@ private HarEntry createHarEntryForFailedCONNECT(String errorMessage) {
 
         HarResponse response = HarCaptureUtil.createHarResponseForFailure();
         harEntry.setResponse(response);
-        statsDClient.increment(getProxyPrefix().concat(prepareMetric(harEntry.getRequest().getUrl()))
-                .concat("." + harEntry.getResponse().getStatus()).concat(".failed_connect_request"));
 
         response.setError(errorMessage);
 

browsermob-core/src/test/groovy/net/lightbody/bmp/proxy/WhitelistTest.groovy

@@ -37,7 +37,7 @@ class WhitelistTest extends MockServerTest {
     @Test
     void testWhitelistCannotShortCircuitCONNECT() {
         HttpRequest request = mock(HttpRequest.class)
-        when(request.getMethod()).thenReturn(HttpMethod.CONNECT)
+        when(request.method()).thenReturn(HttpMethod.CONNECT)
         when(request.uri()).thenReturn('somedomain.com:443')
         when(request.protocolVersion()).thenReturn(HttpVersion.HTTP_1_1)
 

browsermob-dist/pom.xml

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

browsermob-legacy/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>browsermob-proxy</artifactId>
         <groupId>net.lightbody.bmp</groupId>
-        <version>2.1.28-SNAPSHOT</version>
+        <version>2.1.29-SNAPSHOT</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.28-SNAPSHOT</version>
+        <version>2.1.29-SNAPSHOT</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.28-SNAPSHOT</version>
+        <version>2.1.29-SNAPSHOT</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.28-SNAPSHOT</version>
+    <version>2.1.29-SNAPSHOT</version>
     <modules>
         <module>browsermob-core</module>
         <module>browsermob-legacy</module>
@@ -176,11 +176,11 @@
                             <inherited>false</inherited>
                             <phase>install</phase>
                             <configuration>
-                                <file>${basedir}/resources/jar/littleproxy-1.1.4.jar</file>
+                                <file>${basedir}/resources/jar/littleproxy-1.1.5.jar</file>
                                 <repositoryLayout>default</repositoryLayout>
                                 <groupId>org.littleshoot</groupId>
                                 <artifactId>littleproxy</artifactId>
-                                <version>1.1.4</version>
+                                <version>1.1.5</version>
                                 <packaging>jar</packaging>
                             </configuration>
                             <goals>
@@ -308,7 +308,7 @@
             <dependency>
                 <groupId>org.littleshoot</groupId>
                 <artifactId>littleproxy</artifactId>
-                <version>1.1.4</version>
+                <version>1.1.5</version>
             </dependency>