Cleaned up ZKMetricsUpdater instantiation

2 files changed, 4 insertions, 7 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/monitoring/Metrics.java b/configserver/src/main/java/com/yahoo/vespa/config/server/monitoring/Metrics.java
index babc28c7080..5813c3eb04a 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/monitoring/Metrics.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/monitoring/Metrics.java
@@ -45,9 +45,11 @@ public class Metrics extends TimerTask implements MetricUpdaterFactory {
         requests = createCounter(METRIC_REQUESTS, statistics);
         failedRequests = createCounter(METRIC_FAILED_REQUESTS, statistics);
         procTimeCounter = createCounter("procTime", statistics);
-        timer.scheduleAtFixedRate(this, 5000, (long) (healthMonitorConfig.snapshot_interval() * 1000));
+
         log.log(LogLevel.DEBUG, "Metric update interval is " + healthMonitorConfig.snapshot_interval() + " seconds");
-        zkMetricUpdater = new ZKMetricUpdater(this, zkServerConfig, healthMonitorConfig);
+        long intervalMs = (long) (healthMonitorConfig.snapshot_interval() * 1000);
+        timer.scheduleAtFixedRate(this, 5000, intervalMs);
+        zkMetricUpdater = new ZKMetricUpdater(zkServerConfig, 4500, intervalMs);
     }
 
     public static Metrics createTestMetrics() {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/monitoring/ZKMetricUpdater.java b/configserver/src/main/java/com/yahoo/vespa/config/server/monitoring/ZKMetricUpdater.java
index 83d57a30ab9..fc0845d71ca 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/monitoring/ZKMetricUpdater.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/monitoring/ZKMetricUpdater.java
@@ -1,7 +1,6 @@
 package com.yahoo.vespa.config.server.monitoring;
 
 import com.yahoo.cloud.config.ZookeeperServerConfig;
-import com.yahoo.container.jdisc.config.HealthMonitorConfig;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -43,10 +42,6 @@ public class ZKMetricUpdater extends TimerTask {
     private final Timer timer = new Timer();
     private final int zkPort;
 
-    public ZKMetricUpdater(Metrics metrics, ZookeeperServerConfig zkServerConfig, HealthMonitorConfig healthMonitorConfig) {
-        this(zkServerConfig, 4500, (long) (healthMonitorConfig.snapshot_interval() * 1000));
-    }
-
     public ZKMetricUpdater(ZookeeperServerConfig zkServerConfig, long delay, long interval) {
         this.zkPort = zkServerConfig.clientPort();
         if (interval > 0) {