Report metric for queued name service requests

2 files changed, 32 insertions, 1 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 1594c3c3613..b6c7e369f07 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
@@ -53,13 +53,19 @@ public class DeploymentTester {
     private final OutstandingChangeDeployer outstandingChangeDeployer;
     private final ReadyJobsTrigger readyJobTrigger;
     private final NameServiceDispatcher nameServiceDispatcher;
+    private final boolean updateDnsAutomatically;
 
     public DeploymentTester() {
         this(new ControllerTester());
     }
 
     public DeploymentTester(ControllerTester tester) {
+        this(tester, true);
+    }
+
+    public DeploymentTester(ControllerTester tester, boolean updateDnsAutomatically) {
         this.tester = tester;
+        this.updateDnsAutomatically = updateDnsAutomatically;
         tester.curator().writeUpgradesPerMinute(100);
 
         JobControl jobControl = new JobControl(tester.curator());
@@ -218,7 +224,9 @@ public class DeploymentTester {
         } else {
             assertFalse(applications().require(application.id()).change().hasTargets());
         }
-        updateDns();
+        if (updateDnsAutomatically) {
+            updateDns();
+        }
     }
 
     public void completeUpgrade(Application application, Version version, String upgradePolicy) {
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporterTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporterTest.java
index 7a54936191a..b18c39f4042 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporterTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporterTest.java
@@ -237,6 +237,29 @@ public class MetricsReporterTest {
                      getMetric(MetricsReporter.DEPLOYMENT_BUILD_AGE_SECONDS, tester.app()));
     }
 
+    @Test
+    public void test_name_service_queue_size_metric() {
+        DeploymentTester tester = new DeploymentTester(new ControllerTester(), false);
+        ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
+                .environment(Environment.prod)
+                .globalServiceId("default")
+                .region("us-west-1")
+                .region("us-east-3")
+                .build();
+        MetricsReporter reporter = createReporter(tester.controller(), metrics, SystemName.main);
+        Application application = tester.createApplication("app1", "tenant1", 1, 11L);
+        reporter.maintain();
+        assertEquals("Queue is empty initially", 0, metrics.getMetric(MetricsReporter.NAME_SERVICE_REQUESTS_QUEUED).intValue());
+
+        tester.deployCompletely(application, applicationPackage);
+        reporter.maintain();
+        assertEquals("Deployment queues name services requests", 6, metrics.getMetric(MetricsReporter.NAME_SERVICE_REQUESTS_QUEUED).intValue());
+
+        tester.updateDns();
+        reporter.maintain();
+        assertEquals("Queue consumed", 0, metrics.getMetric(MetricsReporter.NAME_SERVICE_REQUESTS_QUEUED).intValue());
+    }
+
     private Duration getAverageDeploymentDuration(Application application) {
         return Duration.ofSeconds(getMetric(MetricsReporter.DEPLOYMENT_AVERAGE_DURATION, application).longValue());
     }