From 001fe069ffa2a1766fb431dc76fefcd20773e8f4 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Wed, 26 Feb 2020 15:23:52 +0100 Subject: Revert "Bratseth/node metrics" --- .../src/main/java/ai/vespa/metricsproxy/core/VespaMetrics.java | 1 - .../src/main/java/ai/vespa/metricsproxy/http/ValuesFetcher.java | 1 - .../metricsproxy/http/application/ApplicationMetricsRetriever.java | 1 - .../ai/vespa/metricsproxy/http/application/NodeMetricsClient.java | 2 +- .../main/java/ai/vespa/metricsproxy/metric/model/ConsumerId.java | 1 - .../src/main/java/ai/vespa/metricsproxy/service/CpuJiffies.java | 2 -- .../main/java/ai/vespa/metricsproxy/service/HttpMetricFetcher.java | 6 ++---- .../src/main/java/ai/vespa/metricsproxy/service/SystemPoller.java | 1 - 8 files changed, 3 insertions(+), 12 deletions(-) (limited to 'metrics-proxy/src') 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 c04dca465a1..c9d7618b9d7 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 @@ -35,7 +35,6 @@ import static com.google.common.base.Strings.isNullOrEmpty; * @author gjoranv */ public class VespaMetrics { - private static final Logger log = Logger.getLogger(VespaMetrics.class.getPackage().getName()); public static final ConsumerId VESPA_CONSUMER_ID = toConsumerId("Vespa"); diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/ValuesFetcher.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/ValuesFetcher.java index 51bdae1aab3..ae0ef2fa57a 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/ValuesFetcher.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/ValuesFetcher.java @@ -21,7 +21,6 @@ import static ai.vespa.metricsproxy.metric.model.ConsumerId.toConsumerId; * @author gjoranv */ public class ValuesFetcher { - private static final Logger log = Logger.getLogger(ValuesFetcher.class.getName()); public static final ConsumerId DEFAULT_PUBLIC_CONSUMER_ID = toConsumerId("default"); diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetriever.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetriever.java index 9ddd7885fcb..c51970ce3ae 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetriever.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetriever.java @@ -33,7 +33,6 @@ import static java.util.stream.Collectors.toMap; * @author gjoranv */ public class ApplicationMetricsRetriever extends AbstractComponent { - private static final Logger log = Logger.getLogger(ApplicationMetricsRetriever.class.getName()); private static final int PARALLELISM = 20; diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/NodeMetricsClient.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/NodeMetricsClient.java index 01cf6b19836..f2ee326029a 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/NodeMetricsClient.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/NodeMetricsClient.java @@ -32,7 +32,6 @@ import static java.util.Collections.emptyList; * @author gjoranv */ public class NodeMetricsClient { - private static final Logger log = Logger.getLogger(NodeMetricsClient.class.getName()); static final Duration METRICS_TTL = Duration.ofSeconds(30); @@ -81,6 +80,7 @@ public class NodeMetricsClient { return snapshotsRetrieved; } + /** * Convenience class for storing a metrics snapshot with its timestamp. */ diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/ConsumerId.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/ConsumerId.java index 795d1005b10..62de9649bb0 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/ConsumerId.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/ConsumerId.java @@ -7,7 +7,6 @@ import java.util.Objects; * @author gjoranv */ public class ConsumerId { - public final String id; private ConsumerId(String id) { this.id = id; } diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/CpuJiffies.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/CpuJiffies.java index e07a67770bc..481068f0df2 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/CpuJiffies.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/CpuJiffies.java @@ -2,7 +2,6 @@ package ai.vespa.metricsproxy.service; class CpuJiffies { - private int cpuId; private long jiffies; @@ -38,5 +37,4 @@ class CpuJiffies { public long getTotalJiffies() { return jiffies; } - } diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/HttpMetricFetcher.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/HttpMetricFetcher.java index 9068be81b65..922a2a15ffd 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/HttpMetricFetcher.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/HttpMetricFetcher.java @@ -20,7 +20,6 @@ import java.util.logging.Logger; * @author bjorncs */ public abstract class HttpMetricFetcher { - private final static Logger log = Logger.getLogger(HttpMetricFetcher.class.getPackage().getName()); public final static String STATE_PATH = "/state/v1/"; // The call to apache will do 3 retries. As long as we check the services in series, we can't have this too high. @@ -32,8 +31,8 @@ public abstract class HttpMetricFetcher { /** - * @param service the service to fetch metrics from - * @param port the port to use + * @param service The service to fetch metrics from + * @param port The port to use */ HttpMetricFetcher(VespaService service, int port, String path) { this.service = service; @@ -87,5 +86,4 @@ public abstract class HttpMetricFetcher { .build()) .build(); } - } diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/SystemPoller.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/SystemPoller.java index c8fbc83eb59..379e5296bb8 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/SystemPoller.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/SystemPoller.java @@ -24,7 +24,6 @@ import java.util.logging.Logger; * @author Eirik Nygaard */ public class SystemPoller { - final private static Logger log = Logger.getLogger(SystemPoller.class.getName()); private final int pollingIntervalSecs; -- cgit v1.2.3