1 files changed, 7 insertions, 4 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintainer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintainer.java
index 39904a5b2f2..a1a1a16ab9e 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintainer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintainer.java
@@ -14,6 +14,7 @@ import com.yahoo.vespa.flags.FlagSource;
 import com.yahoo.vespa.flags.ListFlag;
 import com.yahoo.vespa.flags.PermanentFlags;
 
+import java.time.Clock;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.Arrays;
@@ -33,8 +34,8 @@ public abstract class ConfigServerMaintainer extends Maintainer {
 
     /** Creates a maintainer where maintainers on different nodes in this cluster run with even delay. */
     ConfigServerMaintainer(ApplicationRepository applicationRepository, Curator curator, FlagSource flagSource,
-                           Instant now, Duration interval, boolean useLock) {
-        super(null, interval, now, new JobControl(new JobControlFlags(curator, flagSource, useLock)),
+                           Clock clock, Duration interval, boolean useLock) {
+        super(null, interval, clock, new JobControl(new JobControlFlags(curator, flagSource, useLock)),
               new ConfigServerJobMetrics(applicationRepository.metric()), cluster(curator), false);
         this.applicationRepository = applicationRepository;
     }
@@ -48,8 +49,10 @@ public abstract class ConfigServerMaintainer extends Maintainer {
         }
 
         @Override
-        public void completed(String job, double successFactor) {
-            metric.set("maintenance.successFactor", successFactor, metric.createContext(Map.of("job", job)));
+        public void completed(String job, double successFactor, long durationMs) {
+            var context = metric.createContext(Map.of("job", job));
+            metric.set("maintenance.successFactor", successFactor, context);
+            metric.set("maintenance.duration", durationMs, context);
         }
 
     }