remove string.format from logger.trace statements

cryostatio · Dec 18, 2020 · 7ed65f8 · 7ed65f8
1 parent e473464
commit 7ed65f8
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 22 deletions.
diff --git a/src/main/java/com/redhat/rhjmc/containerjfr/ContainerJfr.java b/src/main/java/com/redhat/rhjmc/containerjfr/ContainerJfr.java
@@ -60,7 +60,7 @@ public static void main(String[] args) throws Exception {
         final Logger logger = Logger.INSTANCE;
         final Environment environment = new Environment();
 
-        logger.trace(String.format("env: %s", environment.getEnv().toString()));
+        logger.trace("env: {}", environment.getEnv().toString());
 
         logger.info("{} started.", System.getProperty("java.rmi.server.hostname", "container-jfr"));
 

diff --git a/src/main/java/com/redhat/rhjmc/containerjfr/net/SslConfiguration.java b/src/main/java/com/redhat/rhjmc/containerjfr/net/SslConfiguration.java
@@ -89,7 +89,8 @@ class SslConfiguration {
                 strategy = new KeyCertStrategy(key, cert);
                 logger.info(
                         "Selected SSL KeyCert strategy with key {} and cert {}",
-                        key.toString(), cert.toString());
+                        key.toString(),
+                        cert.toString());
                 return;
             }
         }

diff --git a/src/main/java/com/redhat/rhjmc/containerjfr/net/TargetConnectionManager.java b/src/main/java/com/redhat/rhjmc/containerjfr/net/TargetConnectionManager.java
@@ -132,7 +132,7 @@ private JFRConnection attemptConnectAsHostPortPair(ConnectionDescriptor connecti
 
     private JFRConnection connect(JMXServiceURL url, Optional<Credentials> credentials)
             throws Exception {
-        logger.trace(String.format("Locking connection %s", url.toString()));
+        logger.trace("Locking connection {}", url.toString());
         lock.lockInterruptibly();
         return jfrConnectionToolkit
                 .get()
@@ -141,11 +141,7 @@ private JFRConnection connect(JMXServiceURL url, Optional<Credentials> credentia
                         credentials.orElse(null),
                         List.of(
                                 lock::unlock,
-                                () ->
-                                        logger.trace(
-                                                String.format(
-                                                        "Unlocking connection %s",
-                                                        url.toString()))));
+                                () -> logger.trace("Unlocking connection {}", url.toString())));
     }
 
     public interface ConnectedTask<T> {

diff --git a/src/main/java/com/redhat/rhjmc/containerjfr/net/reports/ActiveRecordingReportCache.java b/src/main/java/com/redhat/rhjmc/containerjfr/net/reports/ActiveRecordingReportCache.java
@@ -116,10 +116,10 @@ boolean delete(ConnectionDescriptor connectionDescriptor, String recordingName)
         RecordingDescriptor key = new RecordingDescriptor(connectionDescriptor, recordingName);
         boolean hasKey = cache.asMap().containsKey(key);
         if (hasKey) {
-            logger.trace(String.format("Invalidated active report cache for %s", recordingName));
+            logger.trace("Invalidated active report cache for {}", recordingName);
             cache.invalidate(key);
         } else {
-            logger.trace(String.format("No cache entry for %s to invalidate", recordingName));
+            logger.trace("No cache entry for {} to invalidate", recordingName);
         }
         return hasKey;
     }
@@ -128,9 +128,7 @@ protected String getReport(RecordingDescriptor recordingDescriptor) throws Excep
         Path saveFile = null;
         try {
             generationLock.lock();
-            logger.trace(
-                    String.format(
-                            "Active report cache miss for %s", recordingDescriptor.recordingName));
+            logger.trace("Active report cache miss for {}", recordingDescriptor.recordingName);
             try {
                 saveFile =
                         subprocessReportGeneratorProvider
@@ -163,7 +161,7 @@ protected String getReport(RecordingDescriptor recordingDescriptor) throws Excep
                                                     .findFirst();
                                     if (clone.isPresent()) {
                                         conn.getService().close(clone.get());
-                                        logger.trace("Cleaned dangling recording " + cloneName);
+                                        logger.trace("Cleaned dangling recording {}", cloneName);
                                     }
                                     return null;
                                 });

diff --git a/src/main/java/com/redhat/rhjmc/containerjfr/net/reports/ArchivedRecordingReportCache.java b/src/main/java/com/redhat/rhjmc/containerjfr/net/reports/ArchivedRecordingReportCache.java
@@ -103,10 +103,7 @@ Future<Path> get(String recordingName) {
                     .findFirst()
                     .ifPresentOrElse(
                             recording -> {
-                                logger.trace(
-                                        String.format(
-                                                "Archived report cache miss for %s",
-                                                recordingName));
+                                logger.trace("Archived report cache miss for {}", recordingName);
                                 try {
                                     Path saveFile =
                                             subprocessReportGeneratorProvider
@@ -143,7 +140,7 @@ Future<Path> get(String recordingName) {
 
     boolean delete(String recordingName) {
         try {
-            logger.trace(String.format("Invalidating archived report cache for %s", recordingName));
+            logger.trace("Invalidating archived report cache for {}", recordingName);
             return fs.deleteIfExists(getCachedReportPath(recordingName));
         } catch (IOException ioe) {
             logger.warn(ioe);

diff --git a/src/main/java/com/redhat/rhjmc/containerjfr/net/web/WebServer.java b/src/main/java/com/redhat/rhjmc/containerjfr/net/web/WebServer.java
@@ -195,9 +195,7 @@ public void start() throws FlightRecorderException, SocketException, UnknownHost
                     }
                     route = route.failureHandler(failureHandler);
                     if (!handler.isAvailable()) {
-                        logger.trace(
-                                String.format(
-                                        "%s handler disabled", handler.getClass().getSimpleName()));
+                        logger.trace("{} handler disabled", handler.getClass().getSimpleName());
                         route = route.disable();
                     }
                 });