1 files changed, 20 insertions, 14 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 31268c823ba..b780243bd19 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
@@ -2,7 +2,6 @@
 package com.yahoo.jdisc.http.server.jetty;
 
 import com.yahoo.container.logging.AccessLogEntry;
-import com.yahoo.jdisc.Metric.Context;
 import com.yahoo.jdisc.References;
 import com.yahoo.jdisc.ResourceReference;
 import com.yahoo.jdisc.Response;
@@ -14,6 +13,7 @@ import com.yahoo.jdisc.http.HttpHeaders;
 import com.yahoo.jdisc.http.HttpRequest;
 import org.eclipse.jetty.io.EofException;
 import org.eclipse.jetty.server.HttpConnection;
+import org.eclipse.jetty.server.Request;
 
 import javax.servlet.AsyncContext;
 import javax.servlet.ServletInputStream;
@@ -21,6 +21,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
+import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -45,7 +46,7 @@ class HttpRequestDispatch {
 
     private final JDiscContext jDiscContext;
     private final AsyncContext async;
-    private final HttpServletRequest servletRequest;
+    private final Request jettyRequest;
 
     private final ServletResponseController servletResponseController;
     private final RequestHandler requestHandler;
@@ -53,16 +54,15 @@ class HttpRequestDispatch {
 
     public HttpRequestDispatch(JDiscContext jDiscContext,
                                AccessLogEntry accessLogEntry,
-                               Context metricContext,
+                               Map<String, Object> requestMetricDimensions,
                                HttpServletRequest servletRequest,
                                HttpServletResponse servletResponse) throws IOException {
         this.jDiscContext = jDiscContext;
 
         requestHandler = newRequestHandler(jDiscContext, accessLogEntry, servletRequest);
 
-        this.metricReporter = new MetricReporter(jDiscContext.metric, metricContext,
-                ((org.eclipse.jetty.server.Request) servletRequest).getTimeStamp());
-        this.servletRequest = servletRequest;
+        this.jettyRequest = (Request) servletRequest;
+        this.metricReporter = new MetricReporter(jDiscContext.metric, requestMetricDimensions, jettyRequest.getTimeStamp());
         honourMaxKeepAliveRequests();
         this.servletResponseController = new ServletResponseController(
                 servletRequest,
@@ -73,6 +73,7 @@ class HttpRequestDispatch {
 
         this.async = servletRequest.startAsync();
         async.setTimeout(0);
+        metricReporter.uriLength(jettyRequest.getOriginalURI().length());
     }
 
     public void dispatch() throws IOException {
@@ -102,7 +103,7 @@ class HttpRequestDispatch {
 
     private void honourMaxKeepAliveRequests() {
         if (jDiscContext.serverConfig.maxKeepAliveRequests() > 0) {
-            HttpConnection connection = getConnection(servletRequest);
+            HttpConnection connection = getConnection(jettyRequest);
             if (connection.getMessagesIn() >= jDiscContext.serverConfig.maxKeepAliveRequests()) {
                 connection.getGenerator().setPersistent(false);
             }
@@ -123,14 +124,16 @@ class HttpRequestDispatch {
             }
 
             boolean reportedError = false;
+            parent.metricReporter.contentSize((int) parent.jettyRequest.getContentRead());
 
             if (error != null) {
                 if (error instanceof CompletionException && error.getCause() instanceof EofException) {
                     log.log(Level.FINE,
                             error,
-                            () -> "Network connection was unexpectedly terminated: " + parent.servletRequest.getRequestURI());
+                            () -> "Network connection was unexpectedly terminated: " + parent.jettyRequest.getRequestURI());
+                    parent.metricReporter.prematurelyClosed();
                 } else if (!(error instanceof OverloadException || error instanceof BindingNotFoundException)) {
-                    log.log(Level.WARNING, "Request failed: " + parent.servletRequest.getRequestURI(), error);
+                    log.log(Level.WARNING, "Request failed: " + parent.jettyRequest.getRequestURI(), error);
                 }
                 reportedError = true;
                 parent.metricReporter.failedResponse();
@@ -140,7 +143,7 @@ class HttpRequestDispatch {
 
             try {
                 parent.async.complete();
-                log.finest(() -> "Request completed successfully: " + parent.servletRequest.getRequestURI());
+                log.finest(() -> "Request completed successfully: " + parent.jettyRequest.getRequestURI());
             } catch (Throwable throwable) {
                 Level level = reportedError ? Level.FINE: Level.WARNING;
                 log.log(level, "async.complete failed", throwable);
@@ -150,15 +153,18 @@ class HttpRequestDispatch {
 
     @SuppressWarnings("try")
     private ServletRequestReader handleRequest() throws IOException {
-        HttpRequest jdiscRequest = HttpRequestFactory.newJDiscRequest(jDiscContext.container, servletRequest);
+        HttpRequest jdiscRequest = HttpRequestFactory.newJDiscRequest(jDiscContext.container, jettyRequest);
         ContentChannel requestContentChannel;
 
         try (ResourceReference ref = References.fromResource(jdiscRequest)) {
-            HttpRequestFactory.copyHeaders(servletRequest, jdiscRequest);
+            HttpRequestFactory.copyHeaders(jettyRequest, jdiscRequest);
             requestContentChannel = requestHandler.handleRequest(jdiscRequest, servletResponseController.responseHandler);
+            // Note: The matched binding is only available after FilteringRequestHandler has called resolveHandler() on the current Container instance.
+            //       resolveHandler() will assigned the matched binding on the Request object.
+            metricReporter.setBindingMatch(jdiscRequest.getBindingMatch());
         }
 
-        ServletInputStream servletInputStream = servletRequest.getInputStream();
+        ServletInputStream servletInputStream = jettyRequest.getInputStream();
 
         ServletRequestReader servletRequestReader =
                 new ServletRequestReader(
@@ -181,7 +187,7 @@ class HttpRequestDispatch {
 
     ContentChannel handleRequestFilterResponse(Response response) {
         try {
-            servletRequest.getInputStream().close();
+            jettyRequest.getInputStream().close();
             ContentChannel responseContentChannel = servletResponseController.responseHandler.handleResponse(response);
             servletResponseController.finishedFuture().whenComplete(completeRequestCallback);
             return responseContentChannel;