diff options
author | Arne Juul <arnej@yahoo-inc.com> | 2017-12-07 15:56:06 +0000 |
---|---|---|
committer | Arne Juul <arnej@yahoo-inc.com> | 2017-12-14 14:46:48 +0000 |
commit | e5fa4cf948b1275fdca6e06f88740f601b8704dc (patch) | |
tree | 30ca48676bddf9907c946541a7829a19bc3a1fa2 /container-core | |
parent | b27bada7c6b22d83557c6592d8c00fea2a6c35fe (diff) |
add jdisc Metric wiring
rename metric (will be tagged as a "container" metric anyway)
Diffstat (limited to 'container-core')
4 files changed, 12 insertions, 7 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/config/StatisticsRequestHandler.java b/container-core/src/main/java/com/yahoo/container/config/StatisticsRequestHandler.java index f0170d65b66..1e5c22f4023 100644 --- a/container-core/src/main/java/com/yahoo/container/config/StatisticsRequestHandler.java +++ b/container-core/src/main/java/com/yahoo/container/config/StatisticsRequestHandler.java @@ -2,6 +2,7 @@ package com.yahoo.container.config; import com.google.inject.Inject; +import com.yahoo.jdisc.Metric; import com.yahoo.container.ConfigHack; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; @@ -25,8 +26,8 @@ import java.util.concurrent.Executor; public class StatisticsRequestHandler extends ThreadedHttpRequestHandler { @Inject - public StatisticsRequestHandler(Executor executor) { - super(executor); + public StatisticsRequestHandler(Executor executor, Metric metric) { + super(executor, metric); } @Override diff --git a/container-core/src/main/java/com/yahoo/container/handler/AccessLogRequestHandler.java b/container-core/src/main/java/com/yahoo/container/handler/AccessLogRequestHandler.java index 335d0601adc..241ae269fc9 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/AccessLogRequestHandler.java +++ b/container-core/src/main/java/com/yahoo/container/handler/AccessLogRequestHandler.java @@ -1,8 +1,11 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.container.handler; +import com.google.inject.Inject; + import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; +import com.yahoo.jdisc.Metric; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; import com.yahoo.container.jdisc.ThreadedHttpRequestHandler; @@ -22,8 +25,9 @@ public class AccessLogRequestHandler extends ThreadedHttpRequestHandler { private final CircularArrayAccessLogKeeper circularArrayAccessLogKeeper; private final JsonFactory jsonFactory = new JsonFactory(); - public AccessLogRequestHandler(Executor executor, CircularArrayAccessLogKeeper circularArrayAccessLogKeeper) { - super(executor); + @Inject + public AccessLogRequestHandler(Executor executor, Metric metric, CircularArrayAccessLogKeeper circularArrayAccessLogKeeper) { + super(executor, metric); this.circularArrayAccessLogKeeper = circularArrayAccessLogKeeper; } diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedRequestHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedRequestHandler.java index f6e1c1d6d5a..861ee40dbf5 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedRequestHandler.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedRequestHandler.java @@ -101,7 +101,7 @@ public abstract class ThreadedRequestHandler extends AbstractRequestHandler { */ @Override public final ContentChannel handleRequest(Request request, ResponseHandler responseHandler) { - metric.add("container.handled.requests", 1, contextFor(request.getBindingMatch())); + metric.add("handled.requests", 1, contextFor(request.getBindingMatch())); if (request.getTimeout(TimeUnit.SECONDS) == null) { Duration timeout = getTimeout(); if (timeout != null) { @@ -195,7 +195,7 @@ public abstract class ThreadedRequestHandler extends AbstractRequestHandler { if ( tryHasResponded()) throw new IllegalStateException("Response already handled"); ContentChannel cc = responseHandler.handleResponse(response); long millis = request.timeElapsed(TimeUnit.MILLISECONDS); - metric.set("container.handled.latency", millis, contextFor(request.getBindingMatch())); + metric.set("handled.latency", millis, contextFor(request.getBindingMatch())); return cc; } diff --git a/container-core/src/test/java/com/yahoo/container/handler/AccessLogRequestHandlerTest.java b/container-core/src/test/java/com/yahoo/container/handler/AccessLogRequestHandlerTest.java index 6e69cd77304..14869654267 100644 --- a/container-core/src/test/java/com/yahoo/container/handler/AccessLogRequestHandlerTest.java +++ b/container-core/src/test/java/com/yahoo/container/handler/AccessLogRequestHandlerTest.java @@ -17,7 +17,7 @@ public class AccessLogRequestHandlerTest { private final CircularArrayAccessLogKeeper keeper = new CircularArrayAccessLogKeeper(); private final Executor executor = mock(Executor.class); - private final AccessLogRequestHandler handler = new AccessLogRequestHandler(executor, keeper); + private final AccessLogRequestHandler handler = new AccessLogRequestHandler(executor, null, keeper); private final ByteArrayOutputStream out = new ByteArrayOutputStream(); @Test |