Refactor: Let the node repo own the metrics db

22 files changed, 135 insertions, 136 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java
index f7ed4ebad3a..530afabcea9 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java
@@ -13,6 +13,7 @@ import com.yahoo.vespa.curator.Curator;
 import com.yahoo.vespa.flags.FlagSource;
 import com.yahoo.vespa.hosted.provision.Node.State;
 import com.yahoo.vespa.hosted.provision.applications.Applications;
+import com.yahoo.vespa.hosted.provision.autoscale.MetricsDb;
 import com.yahoo.vespa.hosted.provision.lb.LoadBalancers;
 import com.yahoo.vespa.hosted.provision.maintenance.InfrastructureVersions;
 import com.yahoo.vespa.hosted.provision.node.Agent;
@@ -30,12 +31,8 @@ import com.yahoo.vespa.hosted.provision.provisioning.HostResourcesCalculator;
 import com.yahoo.vespa.hosted.provision.provisioning.ProvisionServiceProvider;
 
 import java.time.Clock;
-import java.time.Duration;
-import java.time.Instant;
 import java.util.List;
 import java.util.Optional;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
 /**
@@ -45,8 +42,6 @@ import java.util.stream.Collectors;
  */
 public class NodeRepository extends AbstractComponent {
 
-    private static final Logger log = Logger.getLogger(NodeRepository.class.getName());
-
     private final CuratorDatabaseClient db;
     private final Clock clock;
     private final Zone zone;
@@ -63,6 +58,7 @@ public class NodeRepository extends AbstractComponent {
     private final Applications applications;
     private final LoadBalancers loadBalancers;
     private final FlagSource flagSource;
+    private final MetricsDb metricsDb;
     private final int spareCount;
 
     /**
@@ -75,7 +71,8 @@ public class NodeRepository extends AbstractComponent {
                           ProvisionServiceProvider provisionServiceProvider,
                           Curator curator,
                           Zone zone,
-                          FlagSource flagSource) {
+                          FlagSource flagSource,
+                          MetricsDb metricsDb) {
         this(flavors,
              provisionServiceProvider,
              curator,
@@ -85,6 +82,7 @@ public class NodeRepository extends AbstractComponent {
              DockerImage.fromString(config.containerImage())
                         .withReplacedBy(DockerImage.fromString(config.containerImageReplacement())),
              flagSource,
+             metricsDb,
              config.useCuratorClientCache(),
              zone.environment().isProduction() && !zone.getCloud().dynamicProvisioning() ? 1 : 0,
              config.nodeCacheSize());
@@ -102,6 +100,7 @@ public class NodeRepository extends AbstractComponent {
                           NameResolver nameResolver,
                           DockerImage containerImage,
                           FlagSource flagSource,
+                          MetricsDb metricsDb,
                           boolean useCuratorClientCache,
                           int spareCount,
                           long nodeCacheSize) {
@@ -126,22 +125,9 @@ public class NodeRepository extends AbstractComponent {
         this.applications = new Applications(db);
         this.loadBalancers = new LoadBalancers(db);
         this.flagSource = flagSource;
+        this.metricsDb = metricsDb;
         this.spareCount = spareCount;
-        rewriteNodes();
-    }
-
-    /** Read and write all nodes to make sure they are stored in the latest version of the serialized format */
-    private void rewriteNodes() {
-        Instant start = clock.instant();
-        int nodesWritten = 0;
-        for (State state : State.values()) {
-            List<Node> nodes = db.readNodes(state);
-            // TODO(mpolden): This should take the lock before writing
-            db.writeTo(state, nodes, Agent.system, Optional.empty());
-            nodesWritten += nodes.size();
-        }
-        Instant end = clock.instant();
-        log.log(Level.INFO, String.format("Rewrote %d nodes in %s", nodesWritten, Duration.between(start, end)));
+        nodes.rewrite();
     }
 
     /** Returns the curator database client used by this */
@@ -183,6 +169,8 @@ public class NodeRepository extends AbstractComponent {
 
     public FlagSource flagSource() { return flagSource; }
 
+    public MetricsDb metricsDb() { return metricsDb; }
+
     /** Returns the time keeper of this system */
     public Clock clock() { return clock; }
 
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Autoscaler.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Autoscaler.java
index 2a51a921a9f..1d0ba3da6c5 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Autoscaler.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Autoscaler.java
@@ -26,12 +26,10 @@ public class Autoscaler {
     /** What resource difference is worth a reallocation? */
     private static final double resourceDifferenceWorthReallocation = 0.1;
 
-    private final MetricsDb metricsDb;
     private final NodeRepository nodeRepository;
     private final AllocationOptimizer allocationOptimizer;
 
-    public Autoscaler(MetricsDb metricsDb, NodeRepository nodeRepository) {
-        this.metricsDb = metricsDb;
+    public Autoscaler(NodeRepository nodeRepository) {
         this.nodeRepository = nodeRepository;
         this.allocationOptimizer = new AllocationOptimizer(nodeRepository);
     }
@@ -63,7 +61,7 @@ public class Autoscaler {
                                                      cluster,
                                                      clusterNodes.clusterSpec(),
                                                      clusterNodes,
-                                                     metricsDb,
+                                                     nodeRepository.metricsDb(),
                                                      nodeRepository.clock());
 
         if ( ! clusterIsStable(clusterNodes, nodeRepository))
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MemoryMetricsDb.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MemoryMetricsDb.java
index bf8d354665a..377374e8bc5 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MemoryMetricsDb.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MemoryMetricsDb.java
@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
  */
 public class MemoryMetricsDb implements MetricsDb {
 
-    private final NodeRepository nodeRepository;
+    private final Clock clock;
 
     /** Metric time series by node (hostname). Each list of metric snapshots is sorted by increasing timestamp */
     private final Map<String, NodeTimeseries> nodeTimeseries = new HashMap<>();
@@ -37,12 +37,12 @@ public class MemoryMetricsDb implements MetricsDb {
     /** Lock all access for now since we modify lists inside a map */
     private final Object lock = new Object();
 
-    public MemoryMetricsDb(NodeRepository nodeRepository) {
-        this.nodeRepository = nodeRepository;
+    public MemoryMetricsDb(Clock clock) {
+        this.clock = clock;
     }
 
     @Override
-    public Clock clock() { return nodeRepository.clock(); }
+    public Clock clock() { return clock; }
 
     @Override
     public void addNodeMetrics(Collection<Pair<String, NodeMetricSnapshot>> nodeMetrics) {
@@ -70,7 +70,7 @@ public class MemoryMetricsDb implements MetricsDb {
 
     @Override
     public List<NodeTimeseries> getNodeTimeseries(Duration period, Set<String> hostnames) {
-        Instant startTime = nodeRepository.clock().instant().minus(period);
+        Instant startTime = clock().instant().minus(period);
         synchronized (lock) {
             return hostnames.stream()
                             .map(hostname -> nodeTimeseries.getOrDefault(hostname, new NodeTimeseries(hostname, List.of())).justAfter(startTime))
@@ -91,7 +91,7 @@ public class MemoryMetricsDb implements MetricsDb {
             // 12 hours with 1k nodes and 3 resources and 1 measurement/sec is about 5Gb
             for (String hostname : nodeTimeseries.keySet()) {
                 var timeseries = nodeTimeseries.get(hostname);
-                timeseries = timeseries.justAfter(nodeRepository.clock().instant().minus(Autoscaler.maxScalingWindow()));
+                timeseries = timeseries.justAfter(clock().instant().minus(Autoscaler.maxScalingWindow()));
                 if (timeseries.isEmpty())
                     nodeTimeseries.remove(hostname);
                 else
@@ -106,9 +106,6 @@ public class MemoryMetricsDb implements MetricsDb {
     private void add(String hostname, NodeMetricSnapshot snapshot) {
         NodeTimeseries timeseries = nodeTimeseries.get(hostname);
         if (timeseries == null) { // new node
-            Optional<Node> node = nodeRepository.nodes().node(hostname);
-            if (node.isEmpty()) return;
-            if (node.get().allocation().isEmpty()) return;
             timeseries = new NodeTimeseries(hostname, new ArrayList<>());
             nodeTimeseries.put(hostname, timeseries);
         }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsDb.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsDb.java
index 568c5f88661..672aad25b66 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsDb.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsDb.java
@@ -50,8 +50,8 @@ public interface MetricsDb {
 
     void close();
 
-    static MemoryMetricsDb createTestInstance(NodeRepository nodeRepository) {
-        return new MemoryMetricsDb(nodeRepository);
+    static MemoryMetricsDb createTestInstance(Clock clock) {
+        return new MemoryMetricsDb(clock);
     }
 
 }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainer.java
index 40d495a47ee..17d33ef501c 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainer.java
@@ -33,18 +33,15 @@ import java.util.Set;
 public class AutoscalingMaintainer extends NodeRepositoryMaintainer {
 
     private final Autoscaler autoscaler;
-    private final MetricsDb metricsDb;
     private final Deployer deployer;
     private final Metric metric;
 
     public AutoscalingMaintainer(NodeRepository nodeRepository,
-                                 MetricsDb metricsDb,
                                  Deployer deployer,
                                  Metric metric,
                                  Duration interval) {
         super(nodeRepository, interval, metric);
-        this.autoscaler = new Autoscaler(metricsDb, nodeRepository);
-        this.metricsDb = metricsDb;
+        this.autoscaler = new Autoscaler(nodeRepository);
         this.deployer = deployer;
         this.metric = metric;
     }
@@ -115,8 +112,8 @@ public class AutoscalingMaintainer extends NodeRepositoryMaintainer {
                         .anyMatch(node -> node.history().hasEventAt(History.Event.Type.retired, event.at())))
             return cluster;
         // - 2. all nodes have switched to the right config generation
-        for (NodeTimeseries nodeTimeseries : metricsDb.getNodeTimeseries(Duration.between(event.at(), clock().instant()),
-                                                                         clusterNodes)) {
+        for (var nodeTimeseries : nodeRepository().metricsDb().getNodeTimeseries(Duration.between(event.at(), clock().instant()),
+                                                                                 clusterNodes)) {
             Optional<NodeMetricSnapshot> firstOnNewGeneration =
                     nodeTimeseries.asList().stream()
                                            .filter(snapshot -> snapshot.generation() >= event.generation()).findFirst();
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMetricsDbMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMetricsDbMaintainer.java
index f4509c0713e..f95094f891c 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMetricsDbMaintainer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMetricsDbMaintainer.java
@@ -24,16 +24,13 @@ public class NodeMetricsDbMaintainer extends NodeRepositoryMaintainer {
     private static final int maxWarningsPerInvocation = 2;
 
     private final MetricsFetcher metricsFetcher;
-    private final MetricsDb metricsDb;
 
     public NodeMetricsDbMaintainer(NodeRepository nodeRepository,
                                    MetricsFetcher metricsFetcher,
-                                   MetricsDb metricsDb,
                                    Duration interval,
                                    Metric metric) {
         super(nodeRepository, interval, metric);
         this.metricsFetcher = metricsFetcher;
-        this.metricsDb = metricsDb;
     }
 
     @Override
@@ -54,7 +51,7 @@ public class NodeMetricsDbMaintainer extends NodeRepositoryMaintainer {
                 if (++done < applications.size())
                     Thread.sleep(pauseMs);
             }
-            metricsDb.gc();
+            nodeRepository().metricsDb().gc();
 
             // Suppress failures for manual zones for now to avoid noise
             return nodeRepository().zone().environment().isManuallyDeployed() || warnings.get() == 0;
@@ -75,8 +72,8 @@ public class NodeMetricsDbMaintainer extends NodeRepositoryMaintainer {
             warnings.add(1);
         }
         else if (response != null) {
-            metricsDb.addNodeMetrics(response.nodeMetrics());
-            metricsDb.addClusterMetrics(application, response.clusterMetrics());
+            nodeRepository().metricsDb().addNodeMetrics(response.nodeMetrics());
+            nodeRepository().metricsDb().addClusterMetrics(application, response.clusterMetrics());
         }
     }
 
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java
index 7f41f89f664..98f28da8c82 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java
@@ -39,7 +39,7 @@ public class NodeRepositoryMaintenance extends AbstractComponent {
                                      HostLivenessTracker hostLivenessTracker, ServiceMonitor serviceMonitor,
                                      Zone zone, Orchestrator orchestrator, Metric metric,
                                      ProvisionServiceProvider provisionServiceProvider, FlagSource flagSource,
-                                     MetricsFetcher metricsFetcher, MetricsDb metricsDb) {
+                                     MetricsFetcher metricsFetcher) {
         DefaultTimes defaults = new DefaultTimes(zone, deployer);
 
         PeriodicApplicationMaintainer periodicApplicationMaintainer = new PeriodicApplicationMaintainer(deployer, metric, nodeRepository, defaults.redeployMaintainerInterval,
@@ -64,9 +64,9 @@ public class NodeRepositoryMaintenance extends AbstractComponent {
         maintainers.add(new SpareCapacityMaintainer(deployer, nodeRepository, metric, defaults.spareCapacityMaintenanceInterval));
         maintainers.add(new OsUpgradeActivator(nodeRepository, defaults.osUpgradeActivatorInterval, metric));
         maintainers.add(new Rebalancer(deployer, nodeRepository, metric, defaults.rebalancerInterval));
-        maintainers.add(new NodeMetricsDbMaintainer(nodeRepository, metricsFetcher, metricsDb, defaults.nodeMetricsCollectionInterval, metric));
-        maintainers.add(new AutoscalingMaintainer(nodeRepository, metricsDb, deployer, metric, defaults.autoscalingInterval));
-        maintainers.add(new ScalingSuggestionsMaintainer(nodeRepository, metricsDb, defaults.scalingSuggestionsInterval, metric));
+        maintainers.add(new NodeMetricsDbMaintainer(nodeRepository, metricsFetcher, defaults.nodeMetricsCollectionInterval, metric));
+        maintainers.add(new AutoscalingMaintainer(nodeRepository, deployer, metric, defaults.autoscalingInterval));
+        maintainers.add(new ScalingSuggestionsMaintainer(nodeRepository, defaults.scalingSuggestionsInterval, metric));
         maintainers.add(new SwitchRebalancer(nodeRepository, defaults.switchRebalancerInterval, metric, deployer));
 
         provisionServiceProvider.getLoadBalancerService(nodeRepository)
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ScalingSuggestionsMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ScalingSuggestionsMaintainer.java
index e2b89879141..c217580872b 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ScalingSuggestionsMaintainer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ScalingSuggestionsMaintainer.java
@@ -29,11 +29,10 @@ public class ScalingSuggestionsMaintainer extends NodeRepositoryMaintainer {
     private final Autoscaler autoscaler;
 
     public ScalingSuggestionsMaintainer(NodeRepository nodeRepository,
-                                        MetricsDb metricsDb,
                                         Duration interval,
                                         Metric metric) {
         super(nodeRepository, interval, metric);
-        this.autoscaler = new Autoscaler(metricsDb, nodeRepository);
+        this.autoscaler = new Autoscaler(nodeRepository);
     }
 
     @Override
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java
index cb9fb8182d4..f12699e0d81 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java
@@ -15,6 +15,7 @@ import com.yahoo.vespa.hosted.provision.NoSuchNodeException;
 import com.yahoo.vespa.hosted.provision.Node;
 import com.yahoo.vespa.hosted.provision.NodeList;
 import com.yahoo.vespa.hosted.provision.NodeMutex;
+import com.yahoo.vespa.hosted.provision.NodeRepository;
 import com.yahoo.vespa.hosted.provision.maintenance.NodeFailer;
 import com.yahoo.vespa.hosted.provision.node.filter.NodeFilter;
 import com.yahoo.vespa.hosted.provision.node.filter.NodeListFilter;
@@ -33,6 +34,8 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.BiFunction;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -51,6 +54,8 @@ import java.util.stream.Stream;
 // Nodes might have an application assigned in dirty.
 public class Nodes {
 
+    private static final Logger log = Logger.getLogger(Nodes.class.getName());
+
     private final Zone zone;
     private final Clock clock;
     private final CuratorDatabaseClient db;
@@ -61,6 +66,20 @@ public class Nodes {
         this.db = db;
     }
 
+    /** Read and write all nodes to make sure they are stored in the latest version of the serialized format */
+    public void rewrite() {
+        Instant start = clock.instant();
+        int nodesWritten = 0;
+        for (Node.State state : Node.State.values()) {
+            List<Node> nodes = db.readNodes(state);
+            // TODO(mpolden): This should take the lock before writing
+            db.writeTo(state, nodes, Agent.system, Optional.empty());
+            nodesWritten += nodes.size();
+        }
+        Instant end = clock.instant();
+        log.log(Level.INFO, String.format("Rewrote %d nodes in %s", nodesWritten, Duration.between(start, end)));
+    }
+
     // ---------------- Query API ----------------------------------------------------------------
 
     /**
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java
index 75fa3aec1e2..a54acbe52ae 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java
@@ -52,7 +52,6 @@ public class NodeRepositoryProvisioner implements Provisioner {
     private static final Logger log = Logger.getLogger(NodeRepositoryProvisioner.class.getName());
 
     private final NodeRepository nodeRepository;
-    private final MetricsDb metricsDb;
     private final AllocationOptimizer allocationOptimizer;
     private final CapacityPolicies capacityPolicies;
     private final Zone zone;
@@ -63,11 +62,9 @@ public class NodeRepositoryProvisioner implements Provisioner {
 
     @Inject
     public NodeRepositoryProvisioner(NodeRepository nodeRepository,
-                                     MetricsDb metricsDb,
                                      Zone zone,
                                      ProvisionServiceProvider provisionServiceProvider, FlagSource flagSource) {
         this.nodeRepository = nodeRepository;
-        this.metricsDb = metricsDb;
         this.allocationOptimizer = new AllocationOptimizer(nodeRepository);
         this.capacityPolicies = new CapacityPolicies(nodeRepository);
         this.zone = zone;
@@ -167,7 +164,7 @@ public class NodeRepositoryProvisioner implements Provisioner {
                 firstDeployment // start at min, preserve current resources otherwise
                 ? new AllocatableClusterResources(requested.minResources(), clusterSpec, nodeRepository)
                 : new AllocatableClusterResources(nodes.asList(), nodeRepository, clusterSpec.isExclusive());
-        var clusterModel = new ClusterModel(application, cluster, clusterSpec, nodes, metricsDb, nodeRepository.clock());
+        var clusterModel = new ClusterModel(application, cluster, clusterSpec, nodes, nodeRepository.metricsDb(), nodeRepository.clock());
         return within(Limits.of(requested), currentResources, firstDeployment, clusterModel);
     }
 
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java
index 32952eeb860..6d27acf77d1 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java
@@ -68,6 +68,7 @@ public class MockNodeRepository extends NodeRepository {
               new MockNameResolver().mockAnyLookup(),
               DockerImage.fromString("docker-registry.domain.tld:8080/dist/vespa"),
               new InMemoryFlagSource(),
+              new MemoryMetricsDb(Clock.fixed(Instant.ofEpochMilli(123), ZoneId.of("Z"))),
               true,
               0, 1000);
         this.flavors = flavors;
@@ -78,7 +79,6 @@ public class MockNodeRepository extends NodeRepository {
 
     private void populate() {
         NodeRepositoryProvisioner provisioner = new NodeRepositoryProvisioner(this,
-                                                                              new MemoryMetricsDb(this),
                                                                               Zone.defaultZone(),
                                                                               new MockProvisionServiceProvider(),
                                                                               new InMemoryFlagSource());
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTester.java
index 1c03dcadbd4..2a375f49d78 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTester.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTester.java
@@ -10,6 +10,7 @@ import com.yahoo.config.provisioning.FlavorsConfig;
 import com.yahoo.test.ManualClock;
 import com.yahoo.vespa.curator.mock.MockCurator;
 import com.yahoo.vespa.flags.InMemoryFlagSource;
+import com.yahoo.vespa.hosted.provision.autoscale.MemoryMetricsDb;
 import com.yahoo.vespa.hosted.provision.node.Agent;
 import com.yahoo.vespa.hosted.provision.node.IP;
 import com.yahoo.vespa.hosted.provision.provisioning.EmptyProvisionServiceProvider;
@@ -43,6 +44,7 @@ public class NodeRepositoryTester {
                                             new MockNameResolver().mockAnyLookup(),
                                             DockerImage.fromString("docker-registry.domain.tld:8080/dist/vespa"),
                                             new InMemoryFlagSource(),
+                                            new MemoryMetricsDb(clock),
                                             true,
                                             0, 1000);
     }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingIntegrationTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingIntegrationTest.java
index 8c6c116a225..2eab0453d58 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingIntegrationTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingIntegrationTest.java
@@ -34,7 +34,7 @@ public class AutoscalingIntegrationTest {
         MetricsV2MetricsFetcher fetcher = new MetricsV2MetricsFetcher(tester.nodeRepository(),
                                                                       new OrchestratorMock(),
                                                                       new MockHttpClient(tester.clock()));
-        Autoscaler autoscaler = new Autoscaler(tester.nodeMetricsDb(), tester.nodeRepository());
+        Autoscaler autoscaler = new Autoscaler(tester.nodeRepository());
 
         ApplicationId application1 = tester.applicationId("test1");
         ClusterSpec cluster1 = tester.clusterSpec(ClusterSpec.Type.container, "test");
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTester.java
index 89da20c5550..a5d8256439f 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTester.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTester.java
@@ -46,7 +46,6 @@ class AutoscalingTester {
 
     private final ProvisioningTester provisioningTester;
     private final Autoscaler autoscaler;
-    private final MemoryMetricsDb db;
     private final MockHostResourcesCalculator hostResourcesCalculator;
 
     /** Creates an autoscaling tester with a single host type ready */
@@ -73,8 +72,7 @@ class AutoscalingTester {
                                                              .build();
 
         hostResourcesCalculator = new MockHostResourcesCalculator(zone);
-        db = MetricsDb.createTestInstance(provisioningTester.nodeRepository());
-        autoscaler = new Autoscaler(db, nodeRepository());
+        autoscaler = new Autoscaler(nodeRepository());
     }
 
     public ProvisioningTester provisioning() { return provisioningTester; }
@@ -143,14 +141,15 @@ class AutoscalingTester {
                 float cpu = value * oneExtraNodeFactor;
                 float memory  = (float) ClusterModel.idealMemoryLoad * otherResourcesLoad * oneExtraNodeFactor;
                 float disk = (float) ClusterModel.idealDiskLoad * otherResourcesLoad * oneExtraNodeFactor;
-                db.addNodeMetrics(List.of(new Pair<>(node.hostname(), new NodeMetricSnapshot(clock().instant(),
-                                                                                             cpu,
-                                                                                             memory,
-                                                                                             disk,
-                                                                                             0,
-                                                                                             true,
-                                                                                             true,
-                                                                                             0.0))));
+                nodeMetricsDb().addNodeMetrics(List.of(new Pair<>(node.hostname(),
+                                                                  new NodeMetricSnapshot(clock().instant(),
+                                                                                         cpu,
+                                                                                         memory,
+                                                                                         disk,
+                                                                                         0,
+                                                                                         true,
+                                                                                         true,
+                                                                                         0.0))));
             }
         }
     }
@@ -175,14 +174,15 @@ class AutoscalingTester {
                 float cpu  = (float) 0.2 * otherResourcesLoad * oneExtraNodeFactor;
                 float memory = value * oneExtraNodeFactor;
                 float disk = (float) ClusterModel.idealDiskLoad * otherResourcesLoad * oneExtraNodeFactor;
-                db.addNodeMetrics(List.of(new Pair<>(node.hostname(), new NodeMetricSnapshot(clock().instant(),
-                                                                                             cpu,
-                                                                                             memory,
-                                                                                             disk,
-                                                                                             0,
-                                                                                             true,
-                                                                                             true,
-                                                                                             0.0))));
+                nodeMetricsDb().addNodeMetrics(List.of(new Pair<>(node.hostname(),
+                                                                  new NodeMetricSnapshot(clock().instant(),
+                                                                                         cpu,
+                                                                                         memory,
+                                                                                         disk,
+                                                                                         0,
+                                                                                         true,
+                                                                                         true,
+                                                                                         0.0))));
             }
         }
     }
@@ -197,14 +197,15 @@ class AutoscalingTester {
         for (int i = 0; i < count; i++) {
             clock().advance(Duration.ofMinutes(1));
             for (Node node : nodes) {
-                db.addNodeMetrics(List.of(new Pair<>(node.hostname(), new NodeMetricSnapshot(clock().instant(),
-                                                                                             cpu,
-                                                                                             memory,
-                                                                                             disk,
-                                                                                             generation,
-                                                                                             inService,
-                                                                                             stable,
-                                                                                             0.0))));
+                nodeMetricsDb().addNodeMetrics(List.of(new Pair<>(node.hostname(),
+                                                                  new NodeMetricSnapshot(clock().instant(),
+                                                                                         cpu,
+                                                                                         memory,
+                                                                                         disk,
+                                                                                         generation,
+                                                                                         inService,
+                                                                                         stable,
+                                                                                         0.0))));
             }
         }
     }
@@ -242,7 +243,10 @@ class AutoscalingTester {
                                     IntFunction<Double> queryRate,
                                     IntFunction<Double> writeRate) {
         for (int i = 0; i < measurements; i++) {
-            db.addClusterMetrics(application, Map.of(cluster, new ClusterMetricSnapshot(clock().instant(), queryRate.apply(i), writeRate.apply(i))));
+            nodeMetricsDb().addClusterMetrics(application,
+                                              Map.of(cluster, new ClusterMetricSnapshot(clock().instant(),
+                                                                                        queryRate.apply(i),
+                                                                                        writeRate.apply(i))));
             clock().advance(Duration.ofMinutes(5));
         }
     }
@@ -253,13 +257,16 @@ class AutoscalingTester {
                                          int measurements,
                                          IntFunction<Double> queryRate) {
         for (int i = 0; i < measurements; i++) {
-            db.addClusterMetrics(application, Map.of(cluster, new ClusterMetricSnapshot(clock().instant(), queryRate.apply(i), 0.0)));
+            nodeMetricsDb().addClusterMetrics(application,
+                                              Map.of(cluster, new ClusterMetricSnapshot(clock().instant(),
+                                                                                        queryRate.apply(i),
+                                                                                        0.0)));
             clock().advance(Duration.ofMinutes(5));
         }
     }
 
     public void clearQueryRateMeasurements(ApplicationId application, ClusterSpec.Id cluster) {
-        db.clearClusterMetrics(application, cluster);
+        ((MemoryMetricsDb)nodeMetricsDb()).clearClusterMetrics(application, cluster);
     }
 
     public Autoscaler.Advice autoscale(ApplicationId applicationId, ClusterSpec.Id clusterId,
@@ -307,7 +314,7 @@ class AutoscalingTester {
         return provisioningTester.nodeRepository();
     }
 
-    public MetricsDb nodeMetricsDb() { return db; }
+    public MetricsDb nodeMetricsDb() { return nodeRepository().metricsDb(); }
 
     private static class MockHostResourcesCalculator implements HostResourcesCalculator {
 
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/NodeMetricsDbTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/NodeMetricsDbTest.java
index 76e56004871..330038aa690 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/NodeMetricsDbTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/NodeMetricsDbTest.java
@@ -37,7 +37,6 @@ public class NodeMetricsDbTest {
         String node0 = hosts.iterator().next().hostname();
 
         ManualClock clock = tester.clock();
-        MetricsDb db = MetricsDb.createTestInstance(tester.nodeRepository());
         Collection<Pair<String, NodeMetricSnapshot>> values = new ArrayList<>();
         for (int i = 0; i < 40; i++) {
             values.add(new Pair<>(node0, new NodeMetricSnapshot(clock.instant(),
@@ -50,14 +49,14 @@ public class NodeMetricsDbTest {
                                                                 0.0)));
             clock.advance(Duration.ofMinutes(120));
         }
-        db.addNodeMetrics(values);
+        tester.nodeRepository().metricsDb().addNodeMetrics(values);
 
         // Avoid off-by-one bug when the below windows starts exactly on one of the above getEpochSecond() timestamps.
         clock.advance(Duration.ofMinutes(1));
 
-        assertEquals(35, measurementCount(db.getNodeTimeseries(Duration.ofHours(72), Set.of(node0))));
-        db.gc();
-        assertEquals(23, measurementCount(db.getNodeTimeseries(Duration.ofHours(72), Set.of(node0))));
+        assertEquals(35, measurementCount(tester.nodeRepository().metricsDb().getNodeTimeseries(Duration.ofHours(72), Set.of(node0))));
+        tester.nodeRepository().metricsDb().gc();
+        assertEquals(23, measurementCount(tester.nodeRepository().metricsDb().getNodeTimeseries(Duration.ofHours(72), Set.of(node0))));
     }
 
     private int measurementCount(List<NodeTimeseries> measurements) {
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainerTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainerTester.java
index 755f7608cd9..7313fc1797f 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainerTester.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainerTester.java
@@ -37,7 +37,6 @@ import java.util.stream.Collectors;
 public class AutoscalingMaintainerTester {
 
     private final ProvisioningTester provisioningTester;
-    private final MetricsDb metricsDb;
     private final AutoscalingMaintainer maintainer;
     private final MockDeployer deployer;
 
@@ -49,9 +48,7 @@ public class AutoscalingMaintainerTester {
         Map<ApplicationId, MockDeployer.ApplicationContext> apps = Arrays.stream(appContexts)
                                                                          .collect(Collectors.toMap(c -> c.id(), c -> c));
         deployer = new MockDeployer(provisioningTester.provisioner(), provisioningTester.clock(), apps);
-        metricsDb = MetricsDb.createTestInstance(provisioningTester.nodeRepository());
         maintainer = new AutoscalingMaintainer(provisioningTester.nodeRepository(),
-                                               metricsDb,
                                                deployer,
                                                new TestMetric(),
                                                Duration.ofMinutes(1));
@@ -63,7 +60,6 @@ public class AutoscalingMaintainerTester {
     public ManualClock clock() { return provisioningTester.clock(); }
     public MockDeployer deployer() { return deployer; }
     public AutoscalingMaintainer maintainer() { return maintainer; }
-    public MetricsDb nodeMetricsDb() { return metricsDb; }
 
     public static ApplicationId makeApplicationId(String name) { return ProvisioningTester.applicationId(name); }
     public static ClusterSpec containerClusterSpec() { return ProvisioningTester.containerClusterSpec(); }
@@ -76,14 +72,15 @@ public class AutoscalingMaintainerTester {
         NodeList nodes = nodeRepository().nodes().list(Node.State.active).owner(applicationId);
         for (int i = 0; i < count; i++) {
             for (Node node : nodes)
-                metricsDb.addNodeMetrics(List.of(new Pair<>(node.hostname(), new NodeMetricSnapshot(clock().instant(),
-                                                                                                    cpu,
-                                                                                                    mem,
-                                                                                                    disk,
-                                                                                                    generation,
-                                                                                                    true,
-                                                                                                    true,
-                                                                                                    0.0))));
+                nodeRepository().metricsDb().addNodeMetrics(List.of(new Pair<>(node.hostname(),
+                                                                               new NodeMetricSnapshot(clock().instant(),
+                                                                                                      cpu,
+                                                                                                      mem,
+                                                                                                      disk,
+                                                                                                      generation,
+                                                                                                      true,
+                                                                                                      true,
+                                                                                                      0.0))));
         }
     }
 
@@ -94,7 +91,8 @@ public class AutoscalingMaintainerTester {
                                          IntFunction<Double> queryRate) {
         Instant time = clock().instant();
         for (int i = 0; i < measurements; i++) {
-            metricsDb.addClusterMetrics(application, Map.of(cluster, new ClusterMetricSnapshot(time, queryRate.apply(i), 0.0)));
+            nodeRepository().metricsDb().addClusterMetrics(application,
+                                                           Map.of(cluster, new ClusterMetricSnapshot(time, queryRate.apply(i), 0.0)));
             time = time.plus(Duration.ofMinutes(5));
         }
     }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityCheckerTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityCheckerTester.java
index ece3f180870..7e1def4b754 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityCheckerTester.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityCheckerTester.java
@@ -25,6 +25,7 @@ import com.yahoo.vespa.curator.mock.MockCurator;
 import com.yahoo.vespa.flags.InMemoryFlagSource;
 import com.yahoo.vespa.hosted.provision.Node;
 import com.yahoo.vespa.hosted.provision.NodeRepository;
+import com.yahoo.vespa.hosted.provision.autoscale.MemoryMetricsDb;
 import com.yahoo.vespa.hosted.provision.node.Agent;
 import com.yahoo.vespa.hosted.provision.node.IP;
 import com.yahoo.vespa.hosted.provision.provisioning.EmptyProvisionServiceProvider;
@@ -70,6 +71,7 @@ public class CapacityCheckerTester {
                                             new MockNameResolver().mockAnyLookup(),
                                             DockerImage.fromString("docker-registry.domain.tld:8080/dist/vespa"),
                                             new InMemoryFlagSource(),
+                                            new MemoryMetricsDb(clock),
                                             true,
                                             0, 1000);
     }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMetricsDbMaintainerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMetricsDbMaintainerTest.java
index 5af787092d5..5b2f7ce91e8 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMetricsDbMaintainerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMetricsDbMaintainerTest.java
@@ -39,15 +39,13 @@ public class NodeMetricsDbMaintainerTest {
         OrchestratorMock orchestrator = new OrchestratorMock();
         MockHttpClient httpClient = new MockHttpClient();
         MetricsV2MetricsFetcher fetcher = new MetricsV2MetricsFetcher(tester.nodeRepository(), orchestrator, httpClient);
-        MetricsDb db = MetricsDb.createTestInstance(tester.nodeRepository());
         NodeMetricsDbMaintainer maintainer = new NodeMetricsDbMaintainer(tester.nodeRepository(),
                                                                          fetcher,
-                                                                         db,
                                                                          Duration.ofHours(1),
                                                                          new TestMetric());
         assertTrue(maintainer.maintain());
-        List<NodeTimeseries> timeseriesList = db.getNodeTimeseries(Duration.ofDays(1),
-                                                                   Set.of("host-1.yahoo.com", "host-2.yahoo.com"));
+        List<NodeTimeseries> timeseriesList = tester.nodeRepository().metricsDb().getNodeTimeseries(Duration.ofDays(1),
+                                                                                                    Set.of("host-1.yahoo.com", "host-2.yahoo.com"));
         assertEquals(2, timeseriesList.size());
         List<NodeMetricSnapshot> allSnapshots = timeseriesList.stream()
                                                               .flatMap(timeseries -> timeseries.asList().stream())
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ScalingSuggestionsMaintainerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ScalingSuggestionsMaintainerTest.java
index 10851252c98..29a93c463ce 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ScalingSuggestionsMaintainerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ScalingSuggestionsMaintainerTest.java
@@ -51,8 +51,6 @@ public class ScalingSuggestionsMaintainerTest {
         ApplicationId app2 = ProvisioningTester.applicationId("app2");
         ClusterSpec cluster2 = ProvisioningTester.contentClusterSpec();
 
-        MetricsDb metricsDb = MetricsDb.createTestInstance(tester.nodeRepository());
-
         tester.makeReadyNodes(20, "flt", NodeType.host, 8);
         tester.activateTenantHosts();
 
@@ -64,11 +62,10 @@ public class ScalingSuggestionsMaintainerTest {
                                                     false, true));
 
         tester.clock().advance(Duration.ofHours(13));
-        addMeasurements(0.90f, 0.90f, 0.90f, 0, 500, app1, tester.nodeRepository(), metricsDb);
-        addMeasurements(0.99f, 0.99f, 0.99f, 0, 500, app2, tester.nodeRepository(), metricsDb);
+        addMeasurements(0.90f, 0.90f, 0.90f, 0, 500, app1, tester.nodeRepository());
+        addMeasurements(0.99f, 0.99f, 0.99f, 0, 500, app2, tester.nodeRepository());
 
         ScalingSuggestionsMaintainer maintainer = new ScalingSuggestionsMaintainer(tester.nodeRepository(),
-                                                                                   metricsDb,
                                                                                    Duration.ofMinutes(1),
                                                                                    new TestMetric());
         maintainer.maintain();
@@ -80,14 +77,14 @@ public class ScalingSuggestionsMaintainerTest {
 
         // Utilization goes way down
         tester.clock().advance(Duration.ofHours(13));
-        addMeasurements(0.10f, 0.10f, 0.10f, 0, 500, app1, tester.nodeRepository(), metricsDb);
+        addMeasurements(0.10f, 0.10f, 0.10f, 0, 500, app1, tester.nodeRepository());
         maintainer.maintain();
         assertEquals("Suggestion stays at the peak value observed",
                      "12 nodes with [vcpu: 6.0, memory: 5.1 Gb, disk 15.0 Gb, bandwidth: 0.1 Gbps]",
                      suggestionOf(app1, cluster1, tester).get().resources().toString());
         // Utilization is still way down and a week has passed
         tester.clock().advance(Duration.ofDays(7));
-        addMeasurements(0.10f, 0.10f, 0.10f, 0, 500, app1, tester.nodeRepository(), metricsDb);
+        addMeasurements(0.10f, 0.10f, 0.10f, 0, 500, app1, tester.nodeRepository());
         maintainer.maintain();
         assertEquals("Peak suggestion has been  outdated",
                      "5 nodes with [vcpu: 1.8, memory: 4.0 Gb, disk 10.0 Gb, bandwidth: 0.1 Gbps]",
@@ -95,13 +92,13 @@ public class ScalingSuggestionsMaintainerTest {
         assertTrue(shouldSuggest(app1, cluster1, tester));
 
         tester.clock().advance(Duration.ofDays(3));
-        addMeasurements(0.7f, 0.7f, 0.7f, 0, 500, app1, tester.nodeRepository(), metricsDb);
+        addMeasurements(0.7f, 0.7f, 0.7f, 0, 500, app1, tester.nodeRepository());
         maintainer.maintain();
         var suggested = tester.nodeRepository().applications().get(app1).get().cluster(cluster1.id()).get().suggestedResources().get().resources();
         tester.deploy(app1, cluster1, Capacity.from(suggested, suggested, false, true));
         tester.clock().advance(Duration.ofDays(2));
         addMeasurements(0.2f, 0.7f, 0.6f,
-                        0, 500, app1, tester.nodeRepository(), metricsDb);
+                        0, 500, app1, tester.nodeRepository());
         maintainer.maintain();
         assertEquals("Suggestion is to keep the current allocation",
                      suggested,
@@ -119,19 +116,21 @@ public class ScalingSuggestionsMaintainerTest {
                      .shouldSuggestResources(currentResources);
     }
 
-    public void addMeasurements(float cpu, float memory, float disk, int generation, int count, ApplicationId applicationId,
-                                NodeRepository nodeRepository, MetricsDb db) {
+    public void addMeasurements(float cpu, float memory, float disk, int generation, int count,
+                                ApplicationId applicationId,
+                                NodeRepository nodeRepository) {
         NodeList nodes = nodeRepository.nodes().list(Node.State.active).owner(applicationId);
         for (int i = 0; i < count; i++) {
             for (Node node : nodes)
-                db.addNodeMetrics(List.of(new Pair<>(node.hostname(), new NodeMetricSnapshot(nodeRepository.clock().instant(),
-                                                                                             cpu,
-                                                                                             memory,
-                                                                                             disk,
-                                                                                             generation,
-                                                                                             true,
-                                                                                             true,
-                                                                                             0.0))));
+                nodeRepository.metricsDb().addNodeMetrics(List.of(new Pair<>(node.hostname(),
+                                                                             new NodeMetricSnapshot(nodeRepository.clock().instant(),
+                                                                                                    cpu,
+                                                                                                    memory,
+                                                                                                    disk,
+                                                                                                    generation,
+                                                                                                    true,
+                                                                                                    true,
+                                                                                                    0.0))));
         }
     }
 
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainerTest.java
index bb3788ba186..2790c8dc9c3 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainerTest.java
@@ -18,6 +18,7 @@ import com.yahoo.vespa.curator.mock.MockCurator;
 import com.yahoo.vespa.flags.InMemoryFlagSource;
 import com.yahoo.vespa.hosted.provision.Node;
 import com.yahoo.vespa.hosted.provision.NodeRepository;
+import com.yahoo.vespa.hosted.provision.autoscale.MemoryMetricsDb;
 import com.yahoo.vespa.hosted.provision.node.Agent;
 import com.yahoo.vespa.hosted.provision.node.IP;
 import com.yahoo.vespa.hosted.provision.provisioning.EmptyProvisionServiceProvider;
@@ -254,14 +255,16 @@ public class SpareCapacityMaintainerTest {
 
         private SpareCapacityMaintainerTester(int maxIterations) {
             NodeFlavors flavors = new NodeFlavors(new FlavorConfigBuilder().build());
+            ManualClock clock = new ManualClock();
             nodeRepository = new NodeRepository(flavors,
                                                 new EmptyProvisionServiceProvider(),
                                                 new MockCurator(),
-                                                new ManualClock(),
+                                                clock,
                                                 new Zone(Environment.prod, RegionName.from("us-east-3")),
                                                 new MockNameResolver().mockAnyLookup(),
                                                 DockerImage.fromString("docker-registry.domain.tld:8080/dist/vespa"),
                                                 new InMemoryFlagSource(),
+                                                new MemoryMetricsDb(clock),
                                                 true,
                                                 1, 1000);
             deployer = new MockDeployer(nodeRepository);
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/InfraDeployerImplTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/InfraDeployerImplTest.java
index cbfaaeaf61c..73eec4b2988 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/InfraDeployerImplTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/InfraDeployerImplTest.java
@@ -62,7 +62,6 @@ public class InfraDeployerImplTest {
     private final NodeRepositoryTester tester = new NodeRepositoryTester();
     private final NodeRepository nodeRepository = tester.nodeRepository();
     private final Provisioner provisioner = spy(new NodeRepositoryProvisioner(nodeRepository,
-                                                                              new MemoryMetricsDb(nodeRepository),
                                                                               Zone.defaultZone(),
                                                                               new EmptyProvisionServiceProvider(),
                                                                               new InMemoryFlagSource()));
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java
index 00d87bc448e..df101c416c1 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java
@@ -112,12 +112,12 @@ public class ProvisioningTester {
                                                  nameResolver,
                                                  containerImage,
                                                  flagSource,
+                                                 new MemoryMetricsDb(clock),
                                                  true,
                                                  spareCount,
                                                  1000);
         this.orchestrator = orchestrator;
         this.provisioner = new NodeRepositoryProvisioner(nodeRepository,
-                                                         new MemoryMetricsDb(nodeRepository),
                                                          zone,
                                                          provisionServiceProvider,
                                                          flagSource);