diff options
Diffstat (limited to 'jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscHttpServlet.java')
-rw-r--r-- | jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscHttpServlet.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscHttpServlet.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscHttpServlet.java index 27f72c7b4bf..3b81dd94e11 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscHttpServlet.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscHttpServlet.java @@ -6,7 +6,6 @@ import com.yahoo.jdisc.Metric; import com.yahoo.jdisc.handler.OverloadException; import javax.servlet.ServletException; -import javax.servlet.ServletRequest; import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; @@ -15,6 +14,7 @@ import java.io.IOException; import java.util.Arrays; import java.util.Enumeration; import java.util.HashSet; +import java.util.Map; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -91,7 +91,7 @@ class JDiscHttpServlet extends HttpServlet { throws ServletException, IOException { request.setAttribute(JDiscServerConnector.REQUEST_ATTRIBUTE, getConnector(request)); - Metric.Context metricContext = getMetricContext(request); + Metric.Context metricContext = context.metric.createContext(getRequestMetricDimensions(request)); context.metric.add(JettyHttpServer.Metrics.NUM_REQUESTS, 1, metricContext); context.metric.add(JettyHttpServer.Metrics.JDISC_HTTP_REQUESTS, 1, metricContext); context.metric.add(JettyHttpServer.Metrics.MANHATTAN_NUM_REQUESTS, 1, metricContext); @@ -114,7 +114,7 @@ class JDiscHttpServlet extends HttpServlet { try { switch (request.getDispatcherType()) { case REQUEST: - new HttpRequestDispatch(context, accessLogEntry, getMetricContext(request), request, response) + new HttpRequestDispatch(context, accessLogEntry, getRequestMetricDimensions(request), request, response) .dispatch(); break; default: @@ -130,8 +130,8 @@ class JDiscHttpServlet extends HttpServlet { } } - private static Metric.Context getMetricContext(ServletRequest request) { - return JDiscServerConnector.fromRequest(request).getMetricContext(); + private static Map<String, Object> getRequestMetricDimensions(HttpServletRequest request) { + return JDiscServerConnector.fromRequest(request).getRequestMetricDimensions(request); } private static String formatAttributes(final HttpServletRequest request) { |