From 4ea035b70e31781783113a4b6eb56c21c7c02bf3 Mon Sep 17 00:00:00 2001 From: Øyvind Grønnesby Date: Mon, 12 Dec 2022 16:50:14 +0100 Subject: Create a metric for maintainer execution time --- .../test/java/com/yahoo/concurrent/maintenance/JobControlTest.java | 2 +- .../test/java/com/yahoo/concurrent/maintenance/MaintainerTest.java | 4 +++- .../test/java/com/yahoo/concurrent/maintenance/TestMaintainer.java | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'vespajlib/src/test/java/com/yahoo') diff --git a/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/JobControlTest.java b/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/JobControlTest.java index 62fcd885494..0e183b05ee8 100644 --- a/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/JobControlTest.java +++ b/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/JobControlTest.java @@ -84,7 +84,7 @@ public class JobControlTest { private static class NoopJobMetrics extends JobMetrics { @Override - public void completed(String job, double successFactor) { } + public void completed(String job, double successFactor, long durationMs) { } } diff --git a/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/MaintainerTest.java b/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/MaintainerTest.java index 604c29e7289..bb62b1189a1 100644 --- a/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/MaintainerTest.java +++ b/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/MaintainerTest.java @@ -70,10 +70,12 @@ public class MaintainerTest { private static class TestJobMetrics extends JobMetrics { double successFactor = 0.0; + long durationMs = 0; @Override - public void completed(String job, double successFactor) { + public void completed(String job, double successFactor, long durationMs) { this.successFactor = successFactor; + this.durationMs = durationMs; } } diff --git a/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/TestMaintainer.java b/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/TestMaintainer.java index 1946f688df6..d8191b98a51 100644 --- a/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/TestMaintainer.java +++ b/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/TestMaintainer.java @@ -1,6 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.concurrent.maintenance; +import java.time.Clock; import java.time.Duration; import java.time.Instant; import java.util.List; @@ -15,7 +16,7 @@ class TestMaintainer extends Maintainer { private RuntimeException exceptionToThrow = null; public TestMaintainer(String name, JobControl jobControl, JobMetrics jobMetrics) { - super(name, Duration.ofDays(1), Instant.now(), jobControl, jobMetrics, List.of(), false); + super(name, Duration.ofDays(1), Clock.systemUTC(), jobControl, jobMetrics, List.of(), false); } public int totalRuns() { -- cgit v1.2.3