Combine NodeAdmin update metrics methods

3 files changed, 6 insertions, 17 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdmin.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdmin.java
index 00ec985ba0c..7de2aae77c8 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdmin.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdmin.java
@@ -16,11 +16,8 @@ public interface NodeAdmin {
     /** Start/stop NodeAgents and schedule next NodeAgent ticks with the given NodeAgentContexts */
     void refreshContainersToRun(Set<NodeAgentContext> nodeAgentContexts);
 
-    /** Gather node agent and its docker container metrics and forward them to the {@code MetricReceiverWrapper} */
-    void updateNodeAgentMetrics();
-
-    /** Gather node admin metrics and forward them to the {@code MetricReceiverWrapper} */
-    void updateNodeAdminMetrics();
+    /** Update node admin metrics */
+    void updateMetrics();
 
     /**
      * Attempts to freeze/unfreeze all NodeAgents and itself. To freeze a NodeAgent means that
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java
index de3e6a7c64f..2da934b635d 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java
@@ -44,7 +44,7 @@ public class NodeAdminImpl implements NodeAdmin {
     private final GaugeWrapper jvmHeapUsed;
     private final GaugeWrapper jvmHeapFree;
     private final GaugeWrapper jvmHeapTotal;
-    private final CounterWrapper numberOfUnhandledExceptionsInNodeAgent;
+    private final CounterWrapper numberOfUnhandledExceptions;
 
     public NodeAdminImpl(NodeAgentFactory nodeAgentFactory, MetricReceiverWrapper metricReceiver, Clock clock) {
         this((NodeAgentWithSchedulerFactory) nodeAgentContext -> create(clock, nodeAgentFactory, nodeAgentContext),
@@ -103,19 +103,12 @@ public class NodeAdminImpl implements NodeAdmin {
     }
 
     @Override
-    public void updateNodeAgentMetrics() {
-        int numberContainersWaitingImage = 0;
-        int numberOfNewUnhandledExceptions = 0;
+    public void updateMetrics() {
         for (NodeAgentWithScheduler nodeAgentWithScheduler : nodeAgentWithSchedulerByHostname.values()) {
-            numberOfNewUnhandledExceptions += nodeAgentWithScheduler.getAndResetNumberOfUnhandledExceptions();
+            numberOfUnhandledExceptions.add(nodeAgentWithScheduler.getAndResetNumberOfUnhandledExceptions());
             nodeAgentWithScheduler.updateContainerNodeMetrics();
         }
 
-        numberOfUnhandledExceptionsInNodeAgent.add(numberOfNewUnhandledExceptions);
-    }
-
-    @Override
-    public void updateNodeAdminMetrics() {
         Runtime runtime = Runtime.getRuntime();
         long freeMemory = runtime.freeMemory();
         long totalMemory = runtime.totalMemory();
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdater.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdater.java
index 2cd15a3ebe4..f3302bd2359 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdater.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdater.java
@@ -80,8 +80,7 @@ public class NodeAdminStateUpdater {
         metricsScheduler.scheduleAtFixedRate(() -> {
             try {
                 if (suspendedStates.contains(currentState)) return;
-                nodeAdmin.updateNodeAgentMetrics();
-                nodeAdmin.updateNodeAdminMetrics();
+                nodeAdmin.updateMetrics();
             } catch (Throwable e) {
                 log.log(Level.WARNING, "Metric fetcher scheduler failed", e);
             }