From 444dc5a93eb80e98f839e0d639a62d92823ae966 Mon Sep 17 00:00:00 2001 From: Martin Polden Date: Tue, 3 Sep 2019 13:01:20 +0200 Subject: Access config server through service registry --- .../api/integration/metrics/ConfigServerMetricsService.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'controller-api') diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/metrics/ConfigServerMetricsService.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/metrics/ConfigServerMetricsService.java index 2240afee804..4878c108bca 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/metrics/ConfigServerMetricsService.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/metrics/ConfigServerMetricsService.java @@ -1,10 +1,12 @@ package com.yahoo.vespa.hosted.controller.api.integration.metrics; +import com.google.inject.Inject; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.HostName; import com.yahoo.config.provision.zone.ZoneId; import com.yahoo.vespa.hosted.controller.api.application.v4.model.ClusterMetrics; import com.yahoo.vespa.hosted.controller.api.identifiers.DeploymentId; +import com.yahoo.vespa.hosted.controller.api.integration.ServiceRegistry; import com.yahoo.vespa.hosted.controller.api.integration.configserver.ConfigServer; import com.yahoo.vespa.hosted.controller.api.integration.routing.RotationStatus; @@ -18,11 +20,18 @@ import java.util.function.Function; * * @author ogronnesby */ +// TODO: This module should not contain components. Move this to controller-server. public class ConfigServerMetricsService implements MetricsService { + private final ConfigServer configServerClient; - public ConfigServerMetricsService(ConfigServer configServerClient) { - this.configServerClient = configServerClient; + @Inject + public ConfigServerMetricsService(ServiceRegistry serviceRegistry) { + this(serviceRegistry.configServer()); + } + + ConfigServerMetricsService(ConfigServer configServer) { + this.configServerClient = configServer; } @Override -- cgit v1.2.3