summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2022-10-19 15:36:09 +0200
committerHenning Baldersheim <balder@yahoo-inc.com>2022-10-19 15:36:09 +0200
commit95a0b2778e6dd4fd5a9326838c75198f2016d180 (patch)
tree9ad10f884a79697296b386d65ce15967b05f71aa
parent71922a7b3329fc90cd0f1a51568680758c7dc72a (diff)
Use the same metric context that you have already aquired.
-rw-r--r--container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscHttpServlet.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscHttpServlet.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscHttpServlet.java
index dbe2b2ad5d5..4b4aff0a9bd 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscHttpServlet.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscHttpServlet.java
@@ -97,7 +97,7 @@ class JDiscHttpServlet extends HttpServlet {
super.service(request, response);
} else if (method.equals(Method.PATCH.name())) {
// PATCH method is not handled by the Servlet spec
- dispatchHttpRequest(request, response);
+ dispatchHttpRequest(request, response, metricContext);
} else {
// Divergence from HTTP / Servlet spec: JDisc returns 405 for both unknown and known (but unsupported) methods.
response.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED);
@@ -105,12 +105,16 @@ class JDiscHttpServlet extends HttpServlet {
}
private void dispatchHttpRequest(HttpServletRequest request, HttpServletResponse response) throws IOException {
+ dispatchHttpRequest(request, response, getMetricContext(request));
+ }
+
+ private void dispatchHttpRequest(HttpServletRequest request, HttpServletResponse response, Metric.Context metricContext) throws IOException {
AccessLogEntry accessLogEntry = new AccessLogEntry();
request.setAttribute(ATTRIBUTE_NAME_ACCESS_LOG_ENTRY, accessLogEntry);
try {
switch (request.getDispatcherType()) {
case REQUEST:
- new HttpRequestDispatch(context, accessLogEntry, getMetricContext(request), request, response).dispatchRequest();
+ new HttpRequestDispatch(context, accessLogEntry, metricContext, request, response).dispatchRequest();
break;
default:
if (log.isLoggable(Level.INFO)) {