Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #113 - problems with latency tests and request handler name 

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
This commit is contained in:
Lachlan Roberts 2018-11-28 10:52:17 +01:00
parent 8aa3655c55
commit 63aa9ce97d
3 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jetty-server/src/main/java/org/eclipse/jetty/server/CustomRequestLog.java
View File

@ -1162,8 +1162,13 @@ public class CustomRequestLog extends ContainerLifeCycle implements RequestLog
private static void logLatencyMicroseconds(StringBuilder b, Request request, Response response)
{
long latency = System.currentTimeMillis() - request.getTimeStamp();
b.append(TimeUnit.MILLISECONDS.toMicros(latency));
long currentTime = System.currentTimeMillis();
long requestTime = request.getTimeStamp();
long latency_ms = currentTime - requestTime;
long latency_us = TimeUnit.MILLISECONDS.toMicros(latency_ms);
b.append(latency_us);
}
private static void logLatencyMilliseconds(StringBuilder b, Request request, Response response)

35
jetty-server/src/test/java/org/eclipse/jetty/server/handler/CustomRequestLogTest.java
View File

@ -53,7 +53,7 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.lessThanOrEqualTo;
import static org.hamcrest.Matchers.not;
@ -69,6 +69,7 @@ public class CustomRequestLogTest
ServerConnector _serverConnector;
URI _serverURI;
private final static long DELAY = 2000;
@BeforeEach
public void before() throws Exception
@ -394,13 +395,16 @@ public class CustomRequestLogTest
testHandlerServerStart("%{us}T");
long lowerBound = System.currentTimeMillis();
_connector.getResponse("GET / HTTP/1.0\n\n");
_connector.getResponse("GET /delay HTTP/1.0\n\n");
String log = _entries.poll(5,TimeUnit.SECONDS);
long upperBound = requestTimes.poll(5 ,TimeUnit.SECONDS);
long duration = upperBound-lowerBound;
assertThat(Long.parseLong(log), greaterThan((long)0));
assertThat(Long.parseLong(log), lessThanOrEqualTo(TimeUnit.MILLISECONDS.toMicros(duration)));
long measuredDuration = Long.parseLong(log);
long durationLowerBound = TimeUnit.MILLISECONDS.toMicros(DELAY);
long durationUpperBound = TimeUnit.MILLISECONDS.toMicros(upperBound-lowerBound + DELAY);
assertThat(measuredDuration, greaterThanOrEqualTo(durationLowerBound));
assertThat(measuredDuration, lessThanOrEqualTo(durationUpperBound));
}
@Test
@ -409,13 +413,16 @@ public class CustomRequestLogTest
testHandlerServerStart("%{ms}T");
long lowerBound = System.currentTimeMillis();
_connector.getResponse("GET / HTTP/1.0\n\n");
_connector.getResponse("GET /delay HTTP/1.0\n\n");
String log = _entries.poll(5,TimeUnit.SECONDS);
long upperBound = requestTimes.poll(5 ,TimeUnit.SECONDS);
long duration = upperBound-lowerBound;
assertThat(Long.parseLong(log), greaterThan((long)0));
assertThat(Long.parseLong(log), lessThanOrEqualTo(duration));
long measuredDuration = Long.parseLong(log);
long durationLowerBound = DELAY;
long durationUpperBound = upperBound-lowerBound + DELAY;
assertThat(measuredDuration, greaterThanOrEqualTo(durationLowerBound));
assertThat(measuredDuration, lessThanOrEqualTo(durationUpperBound));
}
@Test
@ -428,10 +435,12 @@ public class CustomRequestLogTest
String log = _entries.poll(5,TimeUnit.SECONDS);
long upperBound = requestTimes.poll(5 ,TimeUnit.SECONDS);
long measuredDuration = Long.parseLong(log);
long durationLowerBound = TimeUnit.MILLISECONDS.toSeconds(DELAY);
long durationUpperBound = TimeUnit.MILLISECONDS.toSeconds(upperBound-lowerBound + DELAY);
long duration = upperBound-lowerBound;
assertThat(Long.parseLong(log), greaterThan((long)0));
assertThat(Long.parseLong(log), lessThanOrEqualTo(TimeUnit.MILLISECONDS.toMicros(duration)));
assertThat(measuredDuration, greaterThanOrEqualTo(durationLowerBound));
assertThat(measuredDuration, lessThanOrEqualTo(durationUpperBound));
}
@Test
@ -563,7 +572,7 @@ public class CustomRequestLogTest
{
try
{
Thread.sleep(2000);
Thread.sleep(DELAY);
}
catch (InterruptedException e)
{

3
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/CustomRequestLogTest.java
View File

@ -21,6 +21,7 @@ package org.eclipse.jetty.servlet;
import java.io.IOException;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.TimeUnit;
import javax.servlet.ServletException;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServlet;
@ -92,7 +93,7 @@ public class CustomRequestLogTest
{
testHandlerServerStart("RequestHandler: %R");
_connector.getResponse("GET / HTTP/1.0\n\n");
_connector.getResponse("GET /context/servlet/ HTTP/1.0\n\n");
String log = _entries.poll(5,TimeUnit.SECONDS);
assertThat(log, Matchers.containsString("TestServlet"));
}