Revert "Fix docker metrics"

2 files changed, 8 insertions, 9 deletions

diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/metrics/MetricReceiverWrapper.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/metrics/MetricReceiverWrapper.java
index 657907c3f47..776211635fb 100644
--- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/metrics/MetricReceiverWrapper.java
+++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/metrics/MetricReceiverWrapper.java
@@ -91,9 +91,9 @@ public class MetricReceiverWrapper {
         synchronized (monitor) {
             List<DimensionMetrics> dimensionMetrics = new ArrayList<>();
             applicationMetrics.entrySet()
-                    .forEach(e -> e.getValue().metricsByDimensions().entrySet().stream()
-                            .map(entry -> new DimensionMetrics(e.getKey(), entry.getKey(), entry.getValue()))
-                            .forEach(dimensionMetrics::add));
+                              .forEach(e -> e.getValue().metricsByDimensions().entrySet().stream()
+                                             .map(entry -> new DimensionMetrics(e.getKey(), entry.getKey(), entry.getValue()))
+                                             .map(dimensionMetrics::add));
             return dimensionMetrics;
         }
     }
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
index fd8e200e673..f60ba83460d 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
@@ -102,6 +102,8 @@ public class NodeAgentImpl implements NodeAgent {
                 NodeRepositoryImpl.containerNameFromHostName(hostName));
         this.metricReceiver = metricReceiver;
         this.environment = environment;
+
+        container.map(Container::getCreatedAsInstant).ifPresent(created -> lastCpuMetric = new CpuUsageReporter(created));
     }
 
     @Override
@@ -160,13 +162,10 @@ public class NodeAgentImpl implements NodeAgent {
             throw new RuntimeException("Can not restart a node agent.");
         }
 
-        // If the container is already running, initialize vespaVersion and lastCpuMetric
-        dockerOperations.getContainer(hostname)
+        // If the container is already running, initialize vespaVersion
+        vespaVersion = dockerOperations.getContainer(hostname)
                 .filter(container -> container.state.isRunning())
-                .ifPresent(container -> {
-                    vespaVersion = dockerOperations.getVespaVersion(container.name);
-                    lastCpuMetric = new CpuUsageReporter(container.getCreatedAsInstant());
-                });
+                .flatMap(container -> dockerOperations.getVespaVersion(container.name));
 
         loopThread = new Thread(this::loop);
         loopThread.setName("loop-" + hostname);