diff options
author | Arne Juul <arnej@yahoo-inc.com> | 2018-01-05 12:20:35 +0000 |
---|---|---|
committer | Arne Juul <arnej@yahoo-inc.com> | 2018-01-05 12:20:38 +0000 |
commit | d13d3171cd3faceb129642d26b2dc5466438514e (patch) | |
tree | ffd6dc06ca2d942778cfe59daec77430e5708d38 /controller-server | |
parent | 088e5856f70b2b9fee9600c8e65335c85957dd31 (diff) |
use LoggingRequestHandler.Context in constructors
* this implicitly wires in a Metric, allowing handler invocations
to be measured in the ThreadedRequestHandler superclass.
Diffstat (limited to 'controller-server')
7 files changed, 15 insertions, 28 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/RootHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/RootHandler.java index 50c4efc2d27..89baa1cfa39 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/RootHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/RootHandler.java @@ -9,12 +9,10 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; import com.yahoo.container.jdisc.LoggingRequestHandler; -import com.yahoo.container.logging.AccessLog; import java.io.IOException; import java.io.OutputStream; import java.net.URI; -import java.util.concurrent.Executor; /** * Responds to requests for the root path of the controller by listing the available web service API's. @@ -28,8 +26,8 @@ import java.util.concurrent.Executor; */ public class RootHandler extends LoggingRequestHandler { - public RootHandler(Executor executor, AccessLog accessLog) { - super(executor, accessLog); + public RootHandler(LoggingRequestHandler.Context parentCtx) { + super(parentCtx); } @Override diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java index a7d072d1dae..21230cb8e0d 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java @@ -14,7 +14,6 @@ import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneId; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; import com.yahoo.container.jdisc.LoggingRequestHandler; -import com.yahoo.container.logging.AccessLog; import com.yahoo.io.IOUtils; import com.yahoo.log.LogLevel; import com.yahoo.slime.Cursor; @@ -94,7 +93,6 @@ import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Scanner; -import java.util.concurrent.Executor; import java.util.logging.Level; /** @@ -112,9 +110,10 @@ public class ApplicationApiHandler extends LoggingRequestHandler { private final AthenzClientFactory athenzClientFactory; @Inject - public ApplicationApiHandler(Executor executor, AccessLog accessLog, Controller controller, Authorizer authorizer, + public ApplicationApiHandler(LoggingRequestHandler.Context parentCtx, + Controller controller, Authorizer authorizer, AthenzClientFactory athenzClientFactory) { - super(executor, accessLog); + super(parentCtx); this.controller = controller; this.authorizer = authorizer; this.athenzClientFactory = athenzClientFactory; diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiHandler.java index 162827cdb99..a9eaaf4048c 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiHandler.java @@ -4,7 +4,6 @@ package com.yahoo.vespa.hosted.controller.restapi.controller; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; import com.yahoo.container.jdisc.LoggingRequestHandler; -import com.yahoo.container.logging.AccessLog; import com.yahoo.io.IOUtils; import com.yahoo.slime.Inspector; import com.yahoo.text.Utf8; @@ -20,7 +19,6 @@ import com.yahoo.yolean.Exceptions; import java.io.IOException; import java.io.InputStream; import java.io.UncheckedIOException; -import java.util.concurrent.Executor; import java.util.logging.Level; /** @@ -34,8 +32,8 @@ public class ControllerApiHandler extends LoggingRequestHandler { private final ControllerMaintenance maintenance; - public ControllerApiHandler(Executor executor, AccessLog accessLog, ControllerMaintenance maintenance) { - super(executor, accessLog); + public ControllerApiHandler(LoggingRequestHandler.Context parentCtx, ControllerMaintenance maintenance) { + super(parentCtx); this.maintenance = maintenance; } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java index 27b219cd892..8338d341a2b 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java @@ -7,7 +7,6 @@ import com.yahoo.config.provision.ApplicationId; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; import com.yahoo.container.jdisc.LoggingRequestHandler; -import com.yahoo.container.logging.AccessLog; import com.yahoo.slime.Cursor; import com.yahoo.slime.Slime; import com.yahoo.vespa.hosted.controller.Application; @@ -23,7 +22,6 @@ import com.yahoo.vespa.hosted.controller.restapi.Path; import com.yahoo.yolean.Exceptions; import java.util.Optional; -import java.util.concurrent.Executor; import java.util.logging.Level; import static com.yahoo.vespa.hosted.controller.application.DeploymentJobs.JobError.outOfCapacity; @@ -40,8 +38,8 @@ public class DeploymentApiHandler extends LoggingRequestHandler { private final Controller controller; - public DeploymentApiHandler(Executor executor, AccessLog accessLog, Controller controller) { - super(executor, accessLog); + public DeploymentApiHandler(LoggingRequestHandler.Context parentCtx, Controller controller) { + super(parentCtx); this.controller = controller; } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/ScrewdriverApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/ScrewdriverApiHandler.java index 4d4f01bc1a6..17181950a29 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/ScrewdriverApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/ScrewdriverApiHandler.java @@ -5,7 +5,6 @@ import com.yahoo.config.provision.ApplicationId; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; import com.yahoo.container.jdisc.LoggingRequestHandler; -import com.yahoo.container.logging.AccessLog; import com.yahoo.io.IOUtils; import com.yahoo.jdisc.http.HttpRequest.Method; import com.yahoo.slime.Cursor; @@ -29,7 +28,6 @@ import java.io.InputStream; import java.util.List; import java.util.Optional; import java.util.Scanner; -import java.util.concurrent.Executor; import java.util.logging.Level; import java.util.logging.Logger; @@ -47,8 +45,8 @@ public class ScrewdriverApiHandler extends LoggingRequestHandler { private final Controller controller; - public ScrewdriverApiHandler(Executor executor, AccessLog accessLog, Controller controller) { - super(executor, accessLog); + public ScrewdriverApiHandler(LoggingRequestHandler.Context parentCtx, Controller controller) { + super(parentCtx); this.controller = controller; } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/zone/v1/ZoneApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/zone/v1/ZoneApiHandler.java index 282dd79b317..f38ea14bbd8 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/zone/v1/ZoneApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/zone/v1/ZoneApiHandler.java @@ -7,7 +7,6 @@ import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneId; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; import com.yahoo.container.jdisc.LoggingRequestHandler; -import com.yahoo.container.logging.AccessLog; import com.yahoo.slime.Cursor; import com.yahoo.slime.Slime; import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneRegistry; @@ -18,7 +17,6 @@ import com.yahoo.yolean.Exceptions; import java.util.Comparator; import java.util.List; -import java.util.concurrent.Executor; import java.util.logging.Level; import java.util.stream.Collectors; @@ -32,8 +30,8 @@ public class ZoneApiHandler extends LoggingRequestHandler { private final ZoneRegistry zoneRegistry; - public ZoneApiHandler(Executor executor, AccessLog accessLog, ZoneRegistry zoneRegistry) { - super(executor, accessLog); + public ZoneApiHandler(LoggingRequestHandler.Context parentCtx, ZoneRegistry zoneRegistry) { + super(parentCtx); this.zoneRegistry = zoneRegistry; } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiHandler.java index 68dc2325687..21c7000ef6a 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiHandler.java @@ -5,7 +5,6 @@ import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneId; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; import com.yahoo.container.jdisc.LoggingRequestHandler; -import com.yahoo.container.logging.AccessLog; import com.yahoo.slime.Cursor; import com.yahoo.slime.Slime; import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneRegistry; @@ -18,7 +17,6 @@ import com.yahoo.vespa.hosted.controller.restapi.SlimeJsonResponse; import com.yahoo.yolean.Exceptions; import java.io.IOException; -import java.util.concurrent.Executor; import java.util.logging.Level; /** @@ -34,9 +32,9 @@ public class ZoneApiHandler extends LoggingRequestHandler { private final ZoneRegistry zoneRegistry; private final ConfigServerRestExecutor proxy; - public ZoneApiHandler(Executor executor, AccessLog accessLog, ZoneRegistry zoneRegistry, + public ZoneApiHandler(LoggingRequestHandler.Context parentCtx, ZoneRegistry zoneRegistry, ConfigServerRestExecutor proxy) { - super(executor, accessLog); + super(parentCtx); this.zoneRegistry = zoneRegistry; this.proxy = proxy; } |