Revert "Merge pull request #12351 from vespa-engine/revert-11875-bratseth/node-metrics"

This reverts commit 37f6c5b31cb2809a54c34dc3a4e51307f3320fbd, reversing
changes made to 76221d0b9b7bda577ac61ce8a79c7b6ee3a8dbb4.

8 files changed, 12 insertions, 3 deletions

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 c9d7618b9d7..c04dca465a1 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,6 +35,7 @@ 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 ae0ef2fa57a..51bdae1aab3 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,6 +21,7 @@ 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 c51970ce3ae..9ddd7885fcb 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,6 +33,7 @@ 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 f2ee326029a..01cf6b19836 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,6 +32,7 @@ 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);
@@ -80,7 +81,6 @@ 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 62de9649bb0..795d1005b10 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,6 +7,7 @@ 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 481068f0df2..e07a67770bc 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,6 +2,7 @@
 package ai.vespa.metricsproxy.service;
 
 class CpuJiffies {
+
     private int cpuId;
     private long jiffies;
 
@@ -37,4 +38,5 @@ 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 922a2a15ffd..9068be81b65 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,6 +20,7 @@ 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.
@@ -31,8 +32,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;
@@ -86,4 +87,5 @@ 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 379e5296bb8..c8fbc83eb59 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,6 +24,7 @@ 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;