From 2cdfd4a222005e6653ddd4457fce3ac53ca482b1 Mon Sep 17 00:00:00 2001 From: gjoranv Date: Fri, 7 Jun 2019 08:40:04 +0200 Subject: Remove unused constructor params. --- .../src/main/java/ai/vespa/metricsproxy/core/VespaMetrics.java | 5 +---- metrics-proxy/src/test/java/ai/vespa/metricsproxy/TestUtil.java | 2 +- .../src/test/java/ai/vespa/metricsproxy/rpc/IntegrationTester.java | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) (limited to 'metrics-proxy') diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/VespaMetrics.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/VespaMetrics.java index becfd9a54ce..054fa704ecb 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/VespaMetrics.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/VespaMetrics.java @@ -41,19 +41,16 @@ import static com.yahoo.log.LogLevel.DEBUG; public class VespaMetrics { private static final Logger log = Logger.getLogger(VespaMetrics.class.getPackage().getName()); - // MUST be the same as the constant defined in config-model public static final ConsumerId VESPA_CONSUMER_ID = toConsumerId("Vespa"); public static final DimensionId METRIC_TYPE_DIMENSION_ID = toDimensionId("metrictype"); public static final DimensionId INSTANCE_DIMENSION_ID = toDimensionId("instance"); - private static final Set DEFAULT_CONSUMERS = Collections.singleton(VESPA_CONSUMER_ID); - private final MetricsConsumers metricsConsumers; private static final MetricsFormatter formatter = new MetricsFormatter(false, false); - public VespaMetrics(MetricsConsumers metricsConsumers, VespaServices vespaServices) { + public VespaMetrics(MetricsConsumers metricsConsumers) { this.metricsConsumers = metricsConsumers; } diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/TestUtil.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/TestUtil.java index 6f86be3aa30..5e8322c4c01 100644 --- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/TestUtil.java +++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/TestUtil.java @@ -31,7 +31,7 @@ public class TestUtil { MetricsConsumers consumers, ApplicationDimensions applicationDimensions, NodeDimensions nodeDimensions) { - VespaMetrics metrics = new VespaMetrics(consumers, vespaServices); + VespaMetrics metrics = new VespaMetrics(consumers); return new MetricsManager(vespaServices, metrics, new ExternalMetrics(consumers), applicationDimensions, nodeDimensions); } diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/IntegrationTester.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/IntegrationTester.java index 9507f01491e..df1ef9e5035 100644 --- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/IntegrationTester.java +++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/IntegrationTester.java @@ -68,7 +68,7 @@ public class IntegrationTester implements AutoCloseable { vespaServices = new VespaServices(servicesConfig(), monitoringConfig(), null); MetricsConsumers consumers = new MetricsConsumers(consumersConfig()); - VespaMetrics vespaMetrics = new VespaMetrics(consumers, vespaServices); + VespaMetrics vespaMetrics = new VespaMetrics(consumers); ExternalMetrics externalMetrics = new ExternalMetrics(consumers); ApplicationDimensions appDimensions = new ApplicationDimensions(applicationDimensionsConfig()); NodeDimensions nodeDimensions = new NodeDimensions(nodeDimensionsConfig()); -- cgit v1.2.3