From 8e5306959f9180164410db850dd88efd88082053 Mon Sep 17 00:00:00 2001 From: "kyrylo.bilchenko" Date: Tue, 7 May 2019 14:08:34 +0200 Subject: [PATCH 1/3] Update logs handling and statsd --- README.md | 2 +- browsermob-core/pom.xml | 2 +- .../lightbody/bmp/filters/StatsDMetricsFilter.java | 13 ++++++------- browsermob-dist/pom.xml | 2 +- browsermob-legacy/pom.xml | 2 +- browsermob-rest/pom.xml | 2 +- mitm/pom.xml | 2 +- pom.xml | 2 +- 8 files changed, 13 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 5cace265f..d13b83014 100644 --- a/README.md +++ b/README.md @@ -395,7 +395,7 @@ When you build the latest code from source, you'll have access to the latest sna net.lightbody.bmp browsermob-core - 2.1.29-SNAPSHOT + 2.1.29 test ``` diff --git a/browsermob-core/pom.xml b/browsermob-core/pom.xml index f0f20862d..558f5b3c7 100644 --- a/browsermob-core/pom.xml +++ b/browsermob-core/pom.xml @@ -6,7 +6,7 @@ browsermob-proxy net.lightbody.bmp - 2.1.29-SNAPSHOT + 2.1.29 4.0.0 diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/filters/StatsDMetricsFilter.java b/browsermob-core/src/main/java/net/lightbody/bmp/filters/StatsDMetricsFilter.java index 7f5575bb2..95a18e3be 100644 --- a/browsermob-core/src/main/java/net/lightbody/bmp/filters/StatsDMetricsFilter.java +++ b/browsermob-core/src/main/java/net/lightbody/bmp/filters/StatsDMetricsFilter.java @@ -3,12 +3,12 @@ import com.timgroup.statsd.NonBlockingStatsDClient; import com.timgroup.statsd.StatsDClient; import io.netty.channel.ChannelHandlerContext; +import io.netty.handler.codec.http.FullHttpResponse; import io.netty.handler.codec.http.HttpObject; import io.netty.handler.codec.http.HttpRequest; import io.netty.handler.codec.http.HttpResponse; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; -import org.littleshoot.proxy.HttpFiltersAdapter; import java.net.URI; import java.net.URISyntaxException; @@ -19,17 +19,16 @@ public StatsDMetricsFilter(HttpRequest originalRequest, ChannelHandlerContext ct } @Override - public HttpObject serverToProxyResponse(HttpObject httpObject) { - if (HttpResponse.class.isAssignableFrom(httpObject.getClass())) { - HttpResponse httpResponse = (HttpResponse) httpObject; - int status = httpResponse.status().code(); - prepareStatsDMetrics(status); + public HttpObject proxyToClientResponse(HttpObject httpObject) { + if (FullHttpResponse.class.isAssignableFrom(httpObject.getClass())) { + HttpResponse httpResponse = (FullHttpResponse) httpObject; + prepareStatsDMetrics(httpResponse.status().code()); } return super.serverToProxyResponse(httpObject); } private void prepareStatsDMetrics(int status) { - if (status > 399 || status == 0) { + if (status > 399) { String url = getFullUrl(originalRequest); String metric = getProxyPrefix().concat( prepareMetric(url)).concat(String.format(".%s", status)); diff --git a/browsermob-dist/pom.xml b/browsermob-dist/pom.xml index 32e80f85d..f1bdbd1f3 100644 --- a/browsermob-dist/pom.xml +++ b/browsermob-dist/pom.xml @@ -4,7 +4,7 @@ browsermob-proxy net.lightbody.bmp - 2.1.29-SNAPSHOT + 2.1.29 4.0.0 diff --git a/browsermob-legacy/pom.xml b/browsermob-legacy/pom.xml index 37b2b5635..5c9ddf41c 100644 --- a/browsermob-legacy/pom.xml +++ b/browsermob-legacy/pom.xml @@ -6,7 +6,7 @@ browsermob-proxy net.lightbody.bmp - 2.1.29-SNAPSHOT + 2.1.29 4.0.0 diff --git a/browsermob-rest/pom.xml b/browsermob-rest/pom.xml index a425e6343..9db386fdf 100644 --- a/browsermob-rest/pom.xml +++ b/browsermob-rest/pom.xml @@ -5,7 +5,7 @@ browsermob-proxy net.lightbody.bmp - 2.1.29-SNAPSHOT + 2.1.29 4.0.0 diff --git a/mitm/pom.xml b/mitm/pom.xml index dc5519677..ed11120a6 100644 --- a/mitm/pom.xml +++ b/mitm/pom.xml @@ -4,7 +4,7 @@ browsermob-proxy net.lightbody.bmp - 2.1.29-SNAPSHOT + 2.1.29 4.0.0 diff --git a/pom.xml b/pom.xml index 4389eb4d3..02cfa3f64 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 net.lightbody.bmp browsermob-proxy - 2.1.29-SNAPSHOT + 2.1.29 browsermob-core browsermob-legacy From 269ebc81d1759118e88a34adfdc5e08b11270cd7 Mon Sep 17 00:00:00 2001 From: "kyrylo.bilchenko" Date: Wed, 8 May 2019 11:49:07 +0200 Subject: [PATCH 2/3] Small update --- .../main/java/net/lightbody/bmp/filters/BlacklistFilter.java | 2 +- .../java/net/lightbody/bmp/filters/StatsDMetricsFilter.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/filters/BlacklistFilter.java b/browsermob-core/src/main/java/net/lightbody/bmp/filters/BlacklistFilter.java index 239179b78..0eef83d36 100644 --- a/browsermob-core/src/main/java/net/lightbody/bmp/filters/BlacklistFilter.java +++ b/browsermob-core/src/main/java/net/lightbody/bmp/filters/BlacklistFilter.java @@ -39,7 +39,7 @@ public HttpResponse clientToProxyRequest(HttpObject httpObject) { if (entry.matches(url, httpRequest.method().name())) { HttpResponseStatus status = HttpResponseStatus.valueOf(entry.getStatusCode()); - HttpResponse resp = new DefaultFullHttpResponse(httpRequest.getProtocolVersion(), status); + HttpResponse resp = new DefaultFullHttpResponse(httpRequest.protocolVersion(), status); HttpUtil.setContentLength(resp, 0L); return resp; diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/filters/StatsDMetricsFilter.java b/browsermob-core/src/main/java/net/lightbody/bmp/filters/StatsDMetricsFilter.java index 95a18e3be..8ee5967c2 100644 --- a/browsermob-core/src/main/java/net/lightbody/bmp/filters/StatsDMetricsFilter.java +++ b/browsermob-core/src/main/java/net/lightbody/bmp/filters/StatsDMetricsFilter.java @@ -28,7 +28,7 @@ public HttpObject proxyToClientResponse(HttpObject httpObject) { } private void prepareStatsDMetrics(int status) { - if (status > 399) { + if (status > 399 || status == 0) { String url = getFullUrl(originalRequest); String metric = getProxyPrefix().concat( prepareMetric(url)).concat(String.format(".%s", status)); From 1c6141670eb2301b08636b191d7a9da43f956e04 Mon Sep 17 00:00:00 2001 From: "kyrylo.bilchenko" Date: Wed, 8 May 2019 12:03:38 +0200 Subject: [PATCH 3/3] Snapshot version --- README.md | 2 +- browsermob-core/pom.xml | 2 +- browsermob-dist/pom.xml | 2 +- browsermob-legacy/pom.xml | 2 +- browsermob-rest/pom.xml | 2 +- mitm/pom.xml | 2 +- pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index d13b83014..d046e01fc 100644 --- a/README.md +++ b/README.md @@ -395,7 +395,7 @@ When you build the latest code from source, you'll have access to the latest sna net.lightbody.bmp browsermob-core - 2.1.29 + 2.1.30-SNAPSHOT test ``` diff --git a/browsermob-core/pom.xml b/browsermob-core/pom.xml index 558f5b3c7..72fecc3a8 100644 --- a/browsermob-core/pom.xml +++ b/browsermob-core/pom.xml @@ -6,7 +6,7 @@ browsermob-proxy net.lightbody.bmp - 2.1.29 + 2.1.30-SNAPSHOT 4.0.0 diff --git a/browsermob-dist/pom.xml b/browsermob-dist/pom.xml index f1bdbd1f3..5ef9ed488 100644 --- a/browsermob-dist/pom.xml +++ b/browsermob-dist/pom.xml @@ -4,7 +4,7 @@ browsermob-proxy net.lightbody.bmp - 2.1.29 + 2.1.30-SNAPSHOT 4.0.0 diff --git a/browsermob-legacy/pom.xml b/browsermob-legacy/pom.xml index 5c9ddf41c..b4270a895 100644 --- a/browsermob-legacy/pom.xml +++ b/browsermob-legacy/pom.xml @@ -6,7 +6,7 @@ browsermob-proxy net.lightbody.bmp - 2.1.29 + 2.1.30-SNAPSHOT 4.0.0 diff --git a/browsermob-rest/pom.xml b/browsermob-rest/pom.xml index 9db386fdf..b21b28e1c 100644 --- a/browsermob-rest/pom.xml +++ b/browsermob-rest/pom.xml @@ -5,7 +5,7 @@ browsermob-proxy net.lightbody.bmp - 2.1.29 + 2.1.30-SNAPSHOT 4.0.0 diff --git a/mitm/pom.xml b/mitm/pom.xml index ed11120a6..db3b95bc7 100644 --- a/mitm/pom.xml +++ b/mitm/pom.xml @@ -4,7 +4,7 @@ browsermob-proxy net.lightbody.bmp - 2.1.29 + 2.1.30-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 02cfa3f64..ee2035012 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 net.lightbody.bmp browsermob-proxy - 2.1.29 + 2.1.30-SNAPSHOT browsermob-core browsermob-legacy