diff options
Diffstat (limited to 'jdisc_http_service/src/main')
-rw-r--r-- | jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestDispatch.java | 4 | ||||
-rw-r--r-- | jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/RequestMetricReporter.java (renamed from jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/MetricReporter.java) | 20 | ||||
-rw-r--r-- | jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletOutputStreamWriter.java | 4 | ||||
-rw-r--r-- | jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletRequestReader.java | 4 | ||||
-rw-r--r-- | jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletResponseController.java | 2 |
5 files changed, 17 insertions, 17 deletions
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestDispatch.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestDispatch.java index cc7ed7ac3e0..2cab06e9e23 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestDispatch.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestDispatch.java @@ -54,7 +54,7 @@ class HttpRequestDispatch { private final ServletResponseController servletResponseController; private final RequestHandler requestHandler; - private final MetricReporter metricReporter; + private final RequestMetricReporter metricReporter; public HttpRequestDispatch(JDiscContext jDiscContext, AccessLogEntry accessLogEntry, @@ -66,7 +66,7 @@ class HttpRequestDispatch { requestHandler = newRequestHandler(jDiscContext, accessLogEntry, servletRequest); this.jettyRequest = (Request) servletRequest; - this.metricReporter = new MetricReporter(jDiscContext.metric, metricContext, jettyRequest.getTimeStamp()); + this.metricReporter = new RequestMetricReporter(jDiscContext.metric, metricContext, jettyRequest.getTimeStamp()); this.servletResponseController = new ServletResponseController(servletRequest, servletResponse, jDiscContext.janitor, diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/MetricReporter.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/RequestMetricReporter.java index ae97d3ccd4c..7596be0415a 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/MetricReporter.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/RequestMetricReporter.java @@ -11,7 +11,7 @@ import java.util.concurrent.atomic.AtomicBoolean; * Responsible for metric reporting for JDisc http request handler support. * @author Tony Vaagenes */ -public class MetricReporter { +class RequestMetricReporter { private final Metric metric; private final Context context; @@ -21,13 +21,13 @@ public class MetricReporter { private final AtomicBoolean firstSetOfTimeToFirstByte = new AtomicBoolean(true); - public MetricReporter(Metric metric, Context context, long requestStartTime) { + RequestMetricReporter(Metric metric, Context context, long requestStartTime) { this.metric = metric; this.context = context; this.requestStartTime = requestStartTime; } - public void successfulWrite(int numBytes) { + void successfulWrite(int numBytes) { setTimeToFirstByteFirstTime(); metric.add(MetricDefinitions.NUM_SUCCESSFUL_WRITES, 1, context); @@ -42,11 +42,11 @@ public class MetricReporter { } } - public void failedWrite() { + void failedWrite() { metric.add(MetricDefinitions.NUM_FAILED_WRITES, 1, context); } - public void successfulResponse() { + void successfulResponse() { setTimeToFirstByteFirstTime(); long requestLatency = getRequestLatency(); @@ -56,18 +56,18 @@ public class MetricReporter { metric.add(MetricDefinitions.NUM_SUCCESSFUL_RESPONSES, 1, context); } - public void failedResponse() { + void failedResponse() { setTimeToFirstByteFirstTime(); metric.set(MetricDefinitions.TOTAL_FAILED_LATENCY, getRequestLatency(), context); metric.add(MetricDefinitions.NUM_FAILED_RESPONSES, 1, context); } - public void prematurelyClosed() { + void prematurelyClosed() { metric.add(MetricDefinitions.NUM_PREMATURELY_CLOSED_CONNECTIONS, 1, context); } - public void successfulRead(int bytes_received) { + void successfulRead(int bytes_received) { metric.set(MetricDefinitions.NUM_BYTES_RECEIVED, bytes_received, context); } @@ -75,11 +75,11 @@ public class MetricReporter { return System.currentTimeMillis() - requestStartTime; } - public void uriLength(int length) { + void uriLength(int length) { metric.set(MetricDefinitions.URI_LENGTH, length, context); } - public void contentSize(int size) { + void contentSize(int size) { metric.set(MetricDefinitions.CONTENT_SIZE, size, context); } } diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletOutputStreamWriter.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletOutputStreamWriter.java index a764c75f766..b4d03385c3b 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletOutputStreamWriter.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletOutputStreamWriter.java @@ -59,7 +59,7 @@ public class ServletOutputStreamWriter { // GuardedBy("monitor") private final Deque<ResponseContentPart> responseContentQueue = new ArrayDeque<>(); - private final MetricReporter metricReporter; + private final RequestMetricReporter metricReporter; /** * When this future completes there will be no more calls against the servlet output stream or servlet response. @@ -70,7 +70,7 @@ public class ServletOutputStreamWriter { final CompletableFuture<Void> finishedFuture = new CompletableFuture<>(); - public ServletOutputStreamWriter(ServletOutputStream outputStream, Executor executor, MetricReporter metricReporter) { + public ServletOutputStreamWriter(ServletOutputStream outputStream, Executor executor, RequestMetricReporter metricReporter) { this.outputStream = outputStream; this.executor = executor; this.metricReporter = metricReporter; diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletRequestReader.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletRequestReader.java index fd1f84f7d49..9e7912f2dc1 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletRequestReader.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletRequestReader.java @@ -43,7 +43,7 @@ class ServletRequestReader implements ReadListener { private final ContentChannel requestContentChannel; private final Executor executor; - private final MetricReporter metricReporter; + private final RequestMetricReporter metricReporter; private int bytesRead; @@ -94,7 +94,7 @@ class ServletRequestReader implements ReadListener { ServletInputStream servletInputStream, ContentChannel requestContentChannel, Executor executor, - MetricReporter metricReporter) { + RequestMetricReporter metricReporter) { Preconditions.checkNotNull(servletInputStream); Preconditions.checkNotNull(requestContentChannel); diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletResponseController.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletResponseController.java index 5dd6b72dc20..60b7878156f 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletResponseController.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletResponseController.java @@ -58,7 +58,7 @@ public class ServletResponseController { HttpServletRequest servletRequest, HttpServletResponse servletResponse, Executor executor, - MetricReporter metricReporter, + RequestMetricReporter metricReporter, boolean developerMode) throws IOException { this.servletRequest = servletRequest; |