From 6511e5ee25a4dde5a9f6663e49ac471e8f5feaf3 Mon Sep 17 00:00:00 2001 From: "kyrylo.bilchenko" Date: Thu, 4 Apr 2019 12:45:13 +0200 Subject: [PATCH 1/2] BMP_2.1.24 release change the order of logging the failed connect request --- .../lightbody/bmp/filters/HttpConnectHarCaptureFilter.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/filters/HttpConnectHarCaptureFilter.java b/browsermob-core/src/main/java/net/lightbody/bmp/filters/HttpConnectHarCaptureFilter.java index 7619ca595..6533d06ad 100644 --- a/browsermob-core/src/main/java/net/lightbody/bmp/filters/HttpConnectHarCaptureFilter.java +++ b/browsermob-core/src/main/java/net/lightbody/bmp/filters/HttpConnectHarCaptureFilter.java @@ -163,6 +163,7 @@ public void proxyToServerResolutionFailed(String hostAndPort) { harEntry.getTimings().setDns(System.nanoTime() - dnsResolutionStartedNanos, TimeUnit.NANOSECONDS); } + HarCaptureFilter.logFailedRequestIfRequired(harEntry.getRequest(), harEntry.getResponse()); httpConnectTimes.remove(clientAddress); } @@ -178,6 +179,7 @@ public void proxyToServerConnectionFailed() { harEntry.getTimings().setConnect(System.nanoTime() - connectionStartedNanos, TimeUnit.NANOSECONDS); } + HarCaptureFilter.logFailedRequestIfRequired(harEntry.getRequest(), harEntry.getResponse()); httpConnectTimes.remove(clientAddress); } @@ -223,6 +225,7 @@ else if (sendFinishedNanos > 0L && responseReceiveStartedNanos == 0L) { else if (responseReceiveStartedNanos > 0L) { harEntry.getTimings().setReceive(timeoutTimestampNanos - responseReceiveStartedNanos, TimeUnit.NANOSECONDS); } + HarCaptureFilter.logFailedRequestIfRequired(harEntry.getRequest(), harEntry.getResponse()); } @Override @@ -343,7 +346,6 @@ private HarEntry createHarEntryForFailedCONNECT(String errorMessage) { populateServerIpAddress(harEntry); - HarCaptureFilter.logFailedRequestIfRequired(harEntry.getRequest(), harEntry.getResponse()); return harEntry; } From 63442a94c856ec6e3e1b64b8b05a337ee192ae38 Mon Sep 17 00:00:00 2001 From: "kyrylo.bilchenko" Date: Thu, 4 Apr 2019 14:21:32 +0200 Subject: [PATCH 2/2] Fix versions --- 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 c83761823..08aaf6ce7 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.24-SNAPSHOT + 2.1.24 test ``` diff --git a/browsermob-core/pom.xml b/browsermob-core/pom.xml index b6f77501b..cee4a5114 100644 --- a/browsermob-core/pom.xml +++ b/browsermob-core/pom.xml @@ -6,7 +6,7 @@ browsermob-proxy net.lightbody.bmp - 2.1.24-SNAPSHOT + 2.1.24 4.0.0 diff --git a/browsermob-dist/pom.xml b/browsermob-dist/pom.xml index 93abb9b47..548ef65ae 100644 --- a/browsermob-dist/pom.xml +++ b/browsermob-dist/pom.xml @@ -4,7 +4,7 @@ browsermob-proxy net.lightbody.bmp - 2.1.24-SNAPSHOT + 2.1.24 4.0.0 diff --git a/browsermob-legacy/pom.xml b/browsermob-legacy/pom.xml index a154b0d0c..69c8dc8de 100644 --- a/browsermob-legacy/pom.xml +++ b/browsermob-legacy/pom.xml @@ -6,7 +6,7 @@ browsermob-proxy net.lightbody.bmp - 2.1.24-SNAPSHOT + 2.1.24 4.0.0 diff --git a/browsermob-rest/pom.xml b/browsermob-rest/pom.xml index 144405a84..079f1a189 100644 --- a/browsermob-rest/pom.xml +++ b/browsermob-rest/pom.xml @@ -5,7 +5,7 @@ browsermob-proxy net.lightbody.bmp - 2.1.24-SNAPSHOT + 2.1.24 4.0.0 diff --git a/mitm/pom.xml b/mitm/pom.xml index 7aa96b2af..3abdbd544 100644 --- a/mitm/pom.xml +++ b/mitm/pom.xml @@ -4,7 +4,7 @@ browsermob-proxy net.lightbody.bmp - 2.1.24-SNAPSHOT + 2.1.24 4.0.0 diff --git a/pom.xml b/pom.xml index 7fc8df66d..8e726d2cb 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 net.lightbody.bmp browsermob-proxy - 2.1.24-SNAPSHOT + 2.1.24 browsermob-core browsermob-legacy