Merge pull request #4429 from vespa-engine/hmusum/simplify-and-avoid-creating-string-unnecessarily-when-logging

Simplify and avoid creating strings unnecessarily

5 files changed, 21 insertions, 41 deletions

diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ClientUpdater.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ClientUpdater.java
index a4d5fd16990..0ed5d04e36e 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ClientUpdater.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ClientUpdater.java
@@ -21,9 +21,7 @@ class ClientUpdater {
     private final RpcServer rpcServer;
     private final DelayedResponses delayedResponses;
 
-    ClientUpdater(RpcServer rpcServer,
-                  ConfigProxyStatistics statistics,
-                  DelayedResponses delayedResponses) {
+    ClientUpdater(RpcServer rpcServer, ConfigProxyStatistics statistics, DelayedResponses delayedResponses) {
         this.rpcServer = rpcServer;
         this.statistics = statistics;
         this.delayedResponses = delayedResponses;
@@ -37,28 +35,20 @@ class ClientUpdater {
      * @param config new config
      */
     void updateSubscribers(RawConfig config) {
-        if (log.isLoggable(LogLevel.DEBUG)) {
-            log.log(LogLevel.DEBUG, "Config updated for " + config.getKey() + "," + config.getGeneration());
-        }
+        log.log(LogLevel.DEBUG, () -> "Config updated for " + config.getKey() + "," + config.getGeneration());
         sendResponse(config);
     }
 
     private void sendResponse(RawConfig config) {
         if (config.isError()) { statistics.incErrorCount(); }
-        if (log.isLoggable(LogLevel.DEBUG)) {
-            log.log(LogLevel.DEBUG, "Sending response for " + config.getKey() + "," + config.getGeneration());
-        }
+        log.log(LogLevel.DEBUG, () -> "Sending response for " + config.getKey() + "," + config.getGeneration());
         DelayQueue<DelayedResponse> responseDelayQueue = delayedResponses.responses();
-        if (log.isLoggable(LogLevel.SPAM)) {
-            log.log(LogLevel.SPAM, "Delayed response queue: " + responseDelayQueue);
-        }
+        log.log(LogLevel.SPAM, () -> "Delayed response queue: " + responseDelayQueue);
         if (responseDelayQueue.size() == 0) {
-            log.log(LogLevel.DEBUG, "There exists no matching element on delayed response queue for " + config.getKey());
+            log.log(LogLevel.DEBUG, () -> "There exists no matching element on delayed response queue for " + config.getKey());
             return;
         } else {
-            if (log.isLoggable(LogLevel.DEBUG)) {
-                log.log(LogLevel.DEBUG, "Delayed response queue has " + responseDelayQueue.size() + " elements");
-            }
+            log.log(LogLevel.DEBUG, () -> "Delayed response queue has " + responseDelayQueue.size() + " elements");
         }
         DelayedResponse[] responses = responseDelayQueue.toArray(new DelayedResponse[0]);
         boolean found = false;
@@ -67,21 +57,17 @@ class ClientUpdater {
             if (request.getConfigKey().equals(config.getKey())) {
                 if (delayedResponses.remove(response)) {
                     found = true;
-                    if (log.isLoggable(LogLevel.DEBUG)) {
-                        log.log(LogLevel.DEBUG, "Call returnOkResponse for " + config.getKey() + "," + config.getGeneration());
-                    }
+                    log.log(LogLevel.DEBUG, () -> "Call returnOkResponse for " + config.getKey() + "," + config.getGeneration());
                     rpcServer.returnOkResponse(request, config);
                 } else {
-                    log.log(LogLevel.INFO, "Could not remove " + config.getKey() + " from delayed delayedResponses queue, already removed");
+                    log.log(LogLevel.INFO, "Could not remove " + config.getKey() + " from delayedResponses queue, already removed");
                 }
             }
         }
         if (!found) {
-            log.log(LogLevel.DEBUG, "Found no recipient for " + config.getKey() + " in delayed response queue");
-        }
-        if (log.isLoggable(LogLevel.DEBUG)) {
-            log.log(LogLevel.DEBUG, "Finished updating config for " + config.getKey() + "," + config.getGeneration());
+            log.log(LogLevel.DEBUG, () -> "Found no recipient for " + config.getKey() + " in delayed response queue");
         }
+        log.log(LogLevel.DEBUG, () -> "Finished updating config for " + config.getKey() + "," + config.getGeneration());
     }
 
 }
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java
index fe5976e9c1f..68985bd598a 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java
@@ -20,7 +20,6 @@ import java.util.logging.Logger;
  *
  * @author hmusum
  */
-// TODO: Rename now that it also support file distribution request
 public class ConfigProxyRpcServer implements Runnable, TargetWatcher, RpcServer {
 
     private final static Logger log = Logger.getLogger(ConfigProxyRpcServer.class.getName());
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCache.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCache.java
index 7fd173ab98d..7914b7a80b6 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCache.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCache.java
@@ -19,7 +19,6 @@ import java.util.logging.Logger;
 
 /**
  * @author hmusum
- * @since 5.1.9
  */
 public class MemoryCache {
     private static final Logger log = Logger.getLogger(MemoryCache.class.getName());
@@ -41,9 +40,7 @@ public class MemoryCache {
     public void put(RawConfig config) {
         if (config.isError()) return;
 
-        if (log.isLoggable(LogLevel.DEBUG)) {
-            log.log(LogLevel.DEBUG, "Putting '" + config + "' into memory cache");
-        }
+        log.log(LogLevel.DEBUG, () -> "Putting '" + config + "' into memory cache");
         cache.put(new ConfigCacheKey(config.getKey(), config.getDefMd5()), config);
     }
 
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCacheConfigClient.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCacheConfigClient.java
index a1c07b91155..4b6e9172f8b 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCacheConfigClient.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCacheConfigClient.java
@@ -10,8 +10,9 @@ import java.util.List;
 import java.util.logging.Logger;
 
 /**
+ * The client used for getting config when running in 'memorycache' mode.
+ *
  * @author hmusum
- * @since 5.1.10
  */
 class MemoryCacheConfigClient implements ConfigSourceClient {
 
@@ -30,11 +31,11 @@ class MemoryCacheConfigClient implements ConfigSourceClient {
      */
     @Override
     public RawConfig getConfig(RawConfig input, JRTServerConfigRequest request) {
-        log.log(LogLevel.DEBUG, "Getting config from cache");
+        log.log(LogLevel.DEBUG, () -> "Getting config from cache");
         ConfigKey<?> key = input.getKey();
         RawConfig cached = cache.get(new ConfigCacheKey(key, input.getDefMd5()));
         if (cached != null) {
-            log.log(LogLevel.DEBUG, "Found config " + key + " in cache");
+            log.log(LogLevel.DEBUG, () -> "Found config " + key + " in cache");
             return cached;
         } else {
             return null;
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java
index d0095121c8e..0f80f228b36 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java
@@ -23,7 +23,6 @@ import java.util.logging.Logger;
  * An Rpc client to a config source
  *
  * @author hmusum
- * @since 5.1.9
  */
 class RpcConfigSourceClient implements ConfigSourceClient {
 
@@ -83,7 +82,7 @@ class RpcConfigSourceClient implements ConfigSourceClient {
                 Target target = supervisor.connect(spec);
                 target.invokeSync(req, 30.0);
                 if (target.isValid()) {
-                    log.log(LogLevel.DEBUG, "Created connection to config source at " + spec.toString());
+                    log.log(LogLevel.DEBUG, () -> "Created connection to config source at " + spec.toString());
                     return;
                 } else {
                     log.log(LogLevel.INFO, "Could not connect to config source at " + spec.toString());
@@ -123,13 +122,11 @@ class RpcConfigSourceClient implements ConfigSourceClient {
 
         RawConfig ret = null;
         if (cachedConfig != null) {
-            log.log(LogLevel.DEBUG, "Found config " + configCacheKey + " in cache, generation=" + cachedConfig.getGeneration() +
+            log.log(LogLevel.DEBUG, () -> "Found config " + configCacheKey + " in cache, generation=" + cachedConfig.getGeneration() +
                     ",configmd5=" + cachedConfig.getConfigMd5());
-            if (log.isLoggable(LogLevel.SPAM)) {
-                log.log(LogLevel.SPAM, "input config=" + input + ",cached config=" + cachedConfig);
-            }
+            log.log(LogLevel.SPAM, () -> "input config=" + input + ",cached config=" + cachedConfig);
             if (ProxyServer.configOrGenerationHasChanged(cachedConfig, request)) {
-                log.log(LogLevel.SPAM, "Cached config is not equal to requested, will return it");
+                log.log(LogLevel.SPAM, () -> "Cached config is not equal to requested, will return it");
                 if (delayedResponses.remove(delayedResponse)) {
                     // unless another thread already did it
                     ret = cachedConfig;
@@ -148,9 +145,9 @@ class RpcConfigSourceClient implements ConfigSourceClient {
     private void subscribeToConfig(RawConfig input, ConfigCacheKey configCacheKey) {
         synchronized (activeSubscribersLock) {
             if (activeSubscribers.containsKey(configCacheKey)) {
-                log.log(LogLevel.DEBUG, "Already a subscriber running for: " + configCacheKey);
+                log.log(LogLevel.DEBUG, () -> "Already a subscriber running for: " + configCacheKey);
             } else {
-                log.log(LogLevel.DEBUG, "Could not find good config in cache, creating subscriber for: " + configCacheKey);
+                log.log(LogLevel.DEBUG, () -> "Could not find good config in cache, creating subscriber for: " + configCacheKey);
                 UpstreamConfigSubscriber subscriber = new UpstreamConfigSubscriber(input, clientUpdater, configSourceSet, timingValues, requesterPool, memoryCache);
                 try {
                     subscriber.subscribe();