diff options
Diffstat (limited to 'container-core/src/main/java')
3 files changed, 8 insertions, 4 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)) { diff --git a/container-core/src/main/java/com/yahoo/metrics/simple/Counter.java b/container-core/src/main/java/com/yahoo/metrics/simple/Counter.java index a119902aac7..20303fab671 100644 --- a/container-core/src/main/java/com/yahoo/metrics/simple/Counter.java +++ b/container-core/src/main/java/com/yahoo/metrics/simple/Counter.java @@ -57,7 +57,7 @@ public class Counter { * the point in the metric space at which to add to the metric */ public void add(long n, Point p) { - metricReceiver.update(new Sample(new Measurement(Long.valueOf(n)), new Identifier(name, p), AssumedType.COUNTER)); + metricReceiver.update(new Sample(new Measurement(n), new Identifier(name, p), AssumedType.COUNTER)); } /** diff --git a/container-core/src/main/java/com/yahoo/metrics/simple/Gauge.java b/container-core/src/main/java/com/yahoo/metrics/simple/Gauge.java index 684bf4b5db1..4d9fd7300e8 100644 --- a/container-core/src/main/java/com/yahoo/metrics/simple/Gauge.java +++ b/container-core/src/main/java/com/yahoo/metrics/simple/Gauge.java @@ -43,7 +43,7 @@ public class Gauge { * position/dimension values for the sample */ public void sample(double x, Point p) { - receiver.update(new Sample(new Measurement(Double.valueOf(x)), new Identifier(name, p), AssumedType.GAUGE)); + receiver.update(new Sample(new Measurement(x), new Identifier(name, p), AssumedType.GAUGE)); } /** |