Merge pull request #17604 from vespa-engine/bratseth/completion

Add completion to scaling events in rest API's

6 files changed, 21 insertions, 4 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/Cluster.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/Cluster.java
index d356f5eb89f..07de259be2f 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/Cluster.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/Cluster.java
@@ -107,16 +107,19 @@ public class Cluster {
 
         private final ClusterResources from, to;
         private final Instant at;
+        private final Optional<Instant> completion;
 
-        public ScalingEvent(ClusterResources from, ClusterResources to, Instant at) {
+        public ScalingEvent(ClusterResources from, ClusterResources to, Instant at, Optional<Instant> completion) {
             this.from = from;
             this.to = to;
             this.at = at;
+            this.completion = completion;
         }
 
         public ClusterResources from() { return from; }
         public ClusterResources to() { return to; }
         public Instant at() { return at; }
+        public Optional<Instant> completion() { return completion; }
 
     }
 
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ScalingEventData.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ScalingEventData.java
index b33a7436522..1ac24695afe 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ScalingEventData.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ScalingEventData.java
@@ -7,6 +7,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yahoo.vespa.hosted.controller.api.integration.configserver.Cluster;
 
 import java.time.Instant;
+import java.util.Optional;
 
 /**
  * @author bratseth
@@ -24,8 +25,17 @@ public class ScalingEventData {
     @JsonProperty("at")
     public Long at;
 
+    @JsonProperty("completion")
+    public Long completion;
+
     public Cluster.ScalingEvent toScalingEvent() {
-        return new Cluster.ScalingEvent(from.toClusterResources(), to.toClusterResources(), Instant.ofEpochMilli(at));
+        return new Cluster.ScalingEvent(from.toClusterResources(), to.toClusterResources(), Instant.ofEpochMilli(at),
+                                        toOptionalInstant(completion));
+    }
+
+    private Optional<Instant> toOptionalInstant(Long epochMillis) {
+        if (epochMillis == null) return Optional.empty();
+        return Optional.of(Instant.ofEpochMilli(epochMillis));
     }
 
 }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
index 9a358f63293..914f64e06f1 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
@@ -2098,6 +2098,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
             toSlime(scalingEvent.from(), scalingEventObject.setObject("from"));
             toSlime(scalingEvent.to(), scalingEventObject.setObject("to"));
             scalingEventObject.setLong("at", scalingEvent.at().toEpochMilli());
+            scalingEvent.completion().ifPresent(completion -> scalingEventObject.setLong("completion", completion.toEpochMilli()));
         }
     }
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java
index ca52e31d04c..8d60a55a1c3 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java
@@ -121,7 +121,8 @@ public class ConfigServerMock extends AbstractComponent implements ConfigServer
                                       new Cluster.Utilization(0.1, 0.2, 0.3, 0.4, 0.5, 0.6),
                                       List.of(new Cluster.ScalingEvent(new ClusterResources(0, 0, NodeResources.unspecified()),
                                                                        current,
-                                                                       Instant.ofEpochMilli(1234))),
+                                                                       Instant.ofEpochMilli(1234),
+                                                                       Optional.of(Instant.ofEpochMilli(2234)))),
                                       "the autoscaling status",
                                       Duration.ofMinutes(6),
                                       0.7,
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-clusters.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-clusters.json
index 499a425087d..9df83cb2089 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-clusters.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-clusters.json
@@ -90,7 +90,8 @@
             },
             "cost": "(ignore)"
           },
-          "at": 1234
+          "at": 1234,
+          "completion": 2234
         }
       ],
       "autoscalingStatus": "the autoscaling status",
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/ApplicationSerializer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/ApplicationSerializer.java
index 692d757f41d..95909a64b52 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/ApplicationSerializer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/ApplicationSerializer.java
@@ -99,6 +99,7 @@ public class ApplicationSerializer {
             toSlime(scalingEvent.from(), scalingEventObject.setObject("from"));
             toSlime(scalingEvent.to(), scalingEventObject.setObject("to"));
             scalingEventObject.setLong("at", scalingEvent.at().toEpochMilli());
+            scalingEvent.completion().ifPresent(completion -> scalingEventObject.setLong("completion", completion.toEpochMilli()));
         }
     }