Use Instant.parse ISO-8601

2 files changed, 3 insertions, 11 deletions

diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Container.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Container.java
index 38837a4b12b..c4d03e4a16d 100644
--- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Container.java
+++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Container.java
@@ -2,22 +2,18 @@
 package com.yahoo.vespa.hosted.dockerapi;
 
 import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
-import java.time.format.DateTimeFormatter;
 import java.util.Objects;
 
 /**
  * @author stiankri
  */
 public class Container {
-    private static final DateTimeFormatter DOCKER_DATE_FORMAT = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSSSSSSSX");
     public final String hostname;
     public final DockerImage image;
     public final ContainerName name;
     public final State state;
     public final int pid;
-    public final String created;
+    public final Instant created;
 
     public Container(
             final String hostname,
@@ -31,7 +27,7 @@ public class Container {
         this.name = containerName;
         this.state = state;
         this.pid = pid;
-        this.created = created;
+        this.created = Instant.parse(created);
     }
 
     // For testing only
@@ -44,10 +40,6 @@ public class Container {
         this(hostname, image, containerName, state, pid, "2017-02-13T13:45:12.133713371Z");
     }
 
-    public Instant getCreatedAsInstant() {
-        return LocalDateTime.parse(created, DOCKER_DATE_FORMAT).toInstant(ZoneOffset.UTC);
-    }
-
     @Override
     public boolean equals(final Object obj) {
         if (!(obj instanceof Container)) {
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 4e92735b51a..29590dddb05 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
@@ -164,7 +164,7 @@ public class NodeAgentImpl implements NodeAgent {
                 .filter(container -> container.state.isRunning())
                 .ifPresent(container -> {
                     vespaVersion = dockerOperations.getVespaVersion(container.name);
-                    lastCpuMetric = new CpuUsageReporter(container.getCreatedAsInstant());
+                    lastCpuMetric = new CpuUsageReporter(container.created);
                 });
 
         loopThread = new Thread(this::loop);