Revert "Merge pull request #28879 from vespa-engine/revert-28869-jonmv/job-runner-thread-metrics"

This reverts commit 67351aa3e2adbbb4872097ed799f1ca837f35e6d, reversing
changes made to aed7902ee0371efb89747d467c4a2f8124ddc08d.

2 files changed, 60 insertions, 2 deletions

diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTester.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTester.java
index 1cc549ec6ca..c16234b3948 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTester.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTester.java
@@ -75,8 +75,7 @@ public class DeploymentTester {
         tester = controllerTester;
         jobs = tester.controller().jobController();
         cloud = (MockTesterCloud) tester.controller().jobController().cloud();
-        runner = new JobRunner(tester.controller(), maintenanceInterval, JobRunnerTest.inThreadExecutor(),
-                               new InternalStepRunner(tester.controller()));
+        runner = new JobRunner(tester.controller(), maintenanceInterval, JobRunnerTest.inThreadExecutor(), new InternalStepRunner(tester.controller()));
         upgrader = new Upgrader(tester.controller(), maintenanceInterval);
         upgrader.setUpgradesPerMinute(1); // Anything that makes it at least one for any maintenance period is fine.
         readyJobsTrigger = new ReadyJobsTrigger(tester.controller(), maintenanceInterval);
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunnerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunnerTest.java
index e87d4f1f3f0..53be33fdfd7 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunnerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunnerTest.java
@@ -1,8 +1,10 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller.maintenance;
 
+import ai.vespa.metrics.ControllerMetrics;
 import com.yahoo.component.Version;
 import com.yahoo.config.provision.ApplicationId;
+import com.yahoo.jdisc.test.MockMetric;
 import com.yahoo.vespa.hosted.controller.api.integration.deployment.JobId;
 import com.yahoo.vespa.hosted.controller.api.integration.deployment.JobType;
 import com.yahoo.vespa.hosted.controller.api.integration.deployment.RevisionId;
@@ -22,6 +24,7 @@ import com.yahoo.vespa.hosted.controller.deployment.StepRunner;
 import com.yahoo.vespa.hosted.controller.deployment.Submission;
 import com.yahoo.vespa.hosted.controller.deployment.Versions;
 import com.yahoo.vespa.hosted.controller.integration.MetricsMock;
+import com.yahoo.vespa.hosted.controller.maintenance.JobRunner.Metrics;
 import org.junit.jupiter.api.Test;
 
 import java.time.Duration;
@@ -37,7 +40,9 @@ import java.util.concurrent.BrokenBarrierException;
 import java.util.concurrent.CyclicBarrier;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.Phaser;
+import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -121,6 +126,60 @@ public class JobRunnerTest {
     }
 
     @Test
+    void metrics() {
+        Phaser phaser = new Phaser(4);
+        StepRunner runner = (step, id) -> {
+            phaser.arrive();
+            phaser.arriveAndAwaitAdvance();
+            return Optional.of(running);
+        };
+        ExecutorService executor = new ThreadPoolExecutor(3, 3, 0, TimeUnit.SECONDS, new LinkedBlockingQueue<>(), (task, pool) -> task.run());
+        DeploymentTester tester = new DeploymentTester();
+        MockMetric metric = new MockMetric();
+        Metrics metrics = new Metrics(metric, Duration.ofDays(1));
+        JobRunner jobs = new JobRunner(tester.controller(), Duration.ofDays(1), executor, runner, metrics);
+        tester.newDeploymentContext().submit();
+
+        assertEquals(Map.of(), metric.metrics());
+        metrics.report();
+        assertEquals(Map.of(ControllerMetrics.DEPLOYMENT_JOBS_QUEUED.baseName(),
+                            Map.of(Map.of(), 0.0),
+                            ControllerMetrics.DEPLOYMENT_JOBS_ACTIVE.baseName(),
+                            Map.of(Map.of(), 0.0)),
+                     metric.metrics());
+        tester.triggerJobs();
+
+        assertEquals(2, tester.jobs().active().size());
+        jobs.maintain();
+        phaser.arriveAndAwaitAdvance();
+        metrics.report();
+        assertEquals(Map.of(ControllerMetrics.DEPLOYMENT_JOBS_QUEUED.baseName(),
+                            Map.of(Map.of(), 1.0),
+                            ControllerMetrics.DEPLOYMENT_JOBS_ACTIVE.baseName(),
+                            Map.of(Map.of(), 3.0)),
+                     metric.metrics());
+
+        phaser.arrive();
+        phaser.arriveAndAwaitAdvance();
+        metrics.report();
+        assertEquals(Map.of(ControllerMetrics.DEPLOYMENT_JOBS_QUEUED.baseName(),
+                            Map.of(Map.of(), 1.0),
+                            ControllerMetrics.DEPLOYMENT_JOBS_ACTIVE.baseName(),
+                            Map.of(Map.of(), 3.0)),
+                     metric.metrics());
+
+        jobs.shutdown();
+        phaser.forceTermination();
+        jobs.awaitShutdown();
+        metrics.report();
+        assertEquals(Map.of(ControllerMetrics.DEPLOYMENT_JOBS_QUEUED.baseName(),
+                            Map.of(Map.of(), 0.0),
+                            ControllerMetrics.DEPLOYMENT_JOBS_ACTIVE.baseName(),
+                            Map.of(Map.of(), 0.0)),
+                     metric.metrics());
+    }
+
+    @Test
     void stepLogic() {
         DeploymentTester tester = new DeploymentTester();
         JobController jobs = tester.controller().jobController();