More lazy debug log message generation

7 files changed, 13 insertions, 13 deletions

diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcConnector.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcConnector.java
index 6eb35b78f14..9d93b440a1d 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcConnector.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcConnector.java
@@ -31,7 +31,7 @@ public class RpcConnector extends AbstractComponent {
         Spec spec = new Spec(config.port());
         try {
             acceptor = supervisor.listen(spec);
-            log.log(FINE, "Listening on " + spec.host() + ":" + acceptor.port());
+            log.log(FINE, () -> "Listening on " + spec.host() + ":" + acceptor.port());
         } catch (ListenFailedException e) {
             stop();
             log.log(INFO, "Failed listening at " + spec.host() + ":" + spec.port());
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcServer.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcServer.java
index 79af500cde7..ee3cddf3fcb 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcServer.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcServer.java
@@ -146,7 +146,7 @@ public class RpcServer {
 
     void setExtraMetrics(Request req) {
         String metricsJson = req.parameters().get(0).asString();
-        log.log(FINE, "setExtraMetrics called with argument: " + metricsJson);
+        log.log(FINE, () -> "setExtraMetrics called with argument: " + metricsJson);
         withExceptionHandling(req, () -> metricsManager.setExtraMetrics(toMetricsPackets(metricsJson)));
     }
 
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/ConfigSentinelClient.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/ConfigSentinelClient.java
index a017b968e08..ab05e778ea6 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/ConfigSentinelClient.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/ConfigSentinelClient.java
@@ -59,7 +59,7 @@ public class ConfigSentinelClient extends AbstractComponent {
     synchronized void ping(VespaService s) {
         List<VespaService> services = new ArrayList<>();
         services.add(s);
-        log.log(Level.FINE, "Ping for service " + s);
+        log.log(Level.FINE, () -> "Ping for service " + s);
         try {
             setStatus(services);
         } catch (Exception e) {
@@ -93,7 +93,7 @@ public class ConfigSentinelClient extends AbstractComponent {
         //from the sentinel
         for (VespaService s : services) {
             if ((!s.getServiceName().equals("configserver")) && !updatedServices.contains(s)) {
-                log.log(Level.FINE,"Service " + s +  " is no longer found with sentinel - setting alive = false");
+                log.log(Level.FINE, () -> "Service " + s +  " is no longer found with sentinel - setting alive = false");
                 s.setAlive(false);
             }
         }
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/HttpMetricFetcher.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/HttpMetricFetcher.java
index 333d8696413..b4c116d1903 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/HttpMetricFetcher.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/HttpMetricFetcher.java
@@ -51,11 +51,11 @@ public abstract class HttpMetricFetcher {
 
         String u = "http://localhost:" + port + path;
         this.url = URI.create(u);
-        log.log(Level.FINE, "Fetching metrics from " + u + " with timeout " + CONNECTION_TIMEOUT);
+        log.log(Level.FINE, () -> "Fetching metrics from " + u + " with timeout " + CONNECTION_TIMEOUT);
     }
 
     InputStream getJson() throws IOException,InterruptedException, ExecutionException {
-        log.log(Level.FINE, "Connecting to url " + url + " for service '" + service + "'");
+        log.log(Level.FINE, () -> "Connecting to url " + url + " for service '" + service + "'");
         Future<Message<HttpResponse, InputStream>> response = httpClient.execute(
                 new BasicRequestProducer(Method.GET, url),
                 new BasicResponseConsumer<>(new AbstractClassicEntityConsumer<>(BUFFER_SIZE, Runnable::run) {
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/RemoteHealthMetricFetcher.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/RemoteHealthMetricFetcher.java
index 2ebf5b2532c..09087c32914 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/RemoteHealthMetricFetcher.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/RemoteHealthMetricFetcher.java
@@ -66,7 +66,7 @@ public class RemoteHealthMetricFetcher extends HttpMetricFetcher {
             return HealthMetric.get(code, message);
 
         } catch (IOException e) {
-            log.log(Level.FINE, "Failed to parse json response from metrics page:" + e + ":" + data);
+            log.log(Level.FINE, () -> "Failed to parse json response from metrics page:" + e + ":" + data);
             return HealthMetric.getUnknown("Not able to parse json from status page");
         }
     }
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/SystemPoller.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/SystemPoller.java
index 05e65449163..5d119fc30e6 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/SystemPoller.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/SystemPoller.java
@@ -99,7 +99,7 @@ public class SystemPoller {
             return;
         }
 
-        log.log(Level.FINE, "Monitoring system metrics for " + services.size() + " services");
+        log.log(Level.FINE, () -> "Monitoring system metrics for " + services.size() + " services");
 
         long sysJiffies = getNormalizedSystemJiffies();
         for (VespaService s : services) {
@@ -110,10 +110,10 @@ public class SystemPoller {
             }
 
             Metrics metrics = new Metrics();
-            log.log(Level.FINE, "Current size of system metrics for service  " + s + " is " + metrics.size());
+            log.log(Level.FINE, () -> "Current size of system metrics for service  " + s + " is " + metrics.size());
 
             long[] size = getMemoryUsage(s);
-            log.log(Level.FINE, "Updating memory metric for service " + s);
+            log.log(Level.FINE, () -> "Updating memory metric for service " + s);
 
             metrics.add(new Metric("memory_virt", size[memoryTypeVirtual], startTime / 1000));
             metrics.add(new Metric("memory_rss", size[memoryTypeResident], startTime / 1000));
@@ -150,7 +150,7 @@ public class SystemPoller {
         try {
             in = new BufferedReader(new FileReader("/proc/" + pid + "/stat"));
         } catch (FileNotFoundException ex) {
-            log.log(Level.FINE, "Unable to find pid " + pid + " in proc directory, for service " + service.getInstanceName());
+            log.log(Level.FINE, () -> "Unable to find pid " + pid + " in proc directory, for service " + service.getInstanceName());
             service.setAlive(false);
             return 0;
         }
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/VespaServices.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/VespaServices.java
index 71f8a5f2b21..b0ea7e709a1 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/VespaServices.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/VespaServices.java
@@ -48,12 +48,12 @@ public class VespaServices {
     private List<VespaService> createServices(VespaServicesConfig servicesConfig, String monitoringSystemName) {
         List<VespaService> services = new ArrayList<>();
         for (Service s : servicesConfig.service()) {
-            log.log(FINE, "Creating service " + s.name());
+            log.log(FINE, () -> "Creating service " + s.name());
             VespaService vespaService = VespaService.create(s.name(), s.configId(), s.port(), monitoringSystemName,
                                                             createServiceDimensions(s));
             services.add(vespaService);
         }
-        log.log(FINE, "Created new services: " + services.size());
+        log.log(FINE, () -> "Created new services: " + services.size());
         return services;
     }