Fixed missing logging placeholders. (#10439)

Author: AlexeyKuznetsov-DD

dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/Initializer.java

@@ -85,9 +85,8 @@ public static boolean initialize(boolean forceJmx) {
         if (reasonNotLoaded != null) {
           LOG.debug(
               SEND_TELEMETRY,
-              "Failed to load JVM access library: "
-                  + jvmAccessHolder.getReasonNotLoaded().getMessage()
-                  + ". Crash tracking will need to rely on user provided JVM arguments.");
+              "Failed to load JVM access library: {}. Crash tracking will need to rely on user provided JVM arguments.",
+              jvmAccessHolder.getReasonNotLoaded().getMessage());
           return false;
         } else {
           JVMAccess.Flags flags = jvmAccessHolder.getComponent().flags();
@@ -230,7 +229,8 @@ private static void initializeCrashUploader(FlagAccess flags) {
       if (!rslt && LOG.isDebugEnabled()) {
         LOG.debug(
             SEND_TELEMETRY,
-            "Unable to set OnError flag to " + onErrorVal + ". Crash-tracking may not work.");
+            "Unable to set OnError flag to {}. Crash-tracking may not work.",
+            onErrorVal);
       }
 
       CrashUploaderScriptInitializer.initialize(uploadScript, onErrorFile);
@@ -269,9 +269,8 @@ private static void initializeOOMENotifier(FlagAccess flags) {
       if (!rslt && LOG.isDebugEnabled()) {
         LOG.debug(
             SEND_TELEMETRY,
-            "Unable to set OnOutOfMemoryError flag to "
-                + onOutOfMemoryVal
-                + ". OOME tracking may not work.");
+            "Unable to set OnOutOfMemoryError flag to {}. OOME tracking may not work.",
+            onOutOfMemoryVal);
       }
 
       OOMENotifierScriptInitializer.initialize(notifierScript);
@@ -298,7 +297,8 @@ private static void logInitializationError(String msg, Throwable t) {
     } else {
       LOG.warn(
           SEND_TELEMETRY,
-          msg + " [{}] (Change the logging level to debug to see the full stacktrace)",
+          "{} [{}] (Change the logging level to debug to see the full stacktrace)",
+          msg,
           t.getMessage());
     }
   }

dd-java-agent/agent-llmobs/src/main/java/datadog/trace/llmobs/EvalProcessingWorker.java

@@ -139,8 +139,8 @@ public void run() {
         Thread.currentThread().interrupt();
       }
       log.debug(
-          "eval processor worker exited. submitting evals stopped. unsubmitted evals left: "
-              + !queuesAreEmpty());
+          "eval processor worker exited. submitting evals stopped. unsubmitted evals left: {}",
+          !queuesAreEmpty());
     }
 
     private void runDutyCycle() throws InterruptedException {

dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/HelperInjector.java

@@ -159,9 +159,8 @@ public DynamicType.Builder<?> transform(
           if (log.isErrorEnabled()) {
             // requestingName is concatenated to ensure it is sent to telemetry
             log.error(
-                "Failed to inject helper classes - instrumentation.class="
-                    + requestingName
-                    + " instrumentation.target.classloader={} instrumentation.target.class={}",
+                "Failed to inject helper classes - instrumentation.class={} instrumentation.target.classloader={} instrumentation.target.class={}",
+                requestingName,
                 classLoader,
                 typeDescription,
                 e);

dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/usm/UsmExtractorImpl.java

@@ -23,7 +23,8 @@ public void send(UsmMessage message) {
     if (message.validate()) {
       BaseUsmMessage bm = (BaseUsmMessage) message;
 
-      log.debug(" sending ioctl: " + String.format("%08x", UsmMessageImpl.USM_IOCTL_ID.intValue()));
+      log.debug(
+          " sending ioctl: {}", String.format("%08x", UsmMessageImpl.USM_IOCTL_ID.intValue()));
       NativeLong res =
           CLibrary.Instance.ioctl(
               new NativeLong(0),

dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/usm/UsmMessageImpl.java

@@ -48,9 +48,7 @@ public final Pointer getBufferPtr() {
     @Override
     public boolean validate() {
       if (offset > getMessageSize()) {
-        log.warn(
-            String.format(
-                "invalid message size, expected: %d actual: %d", getMessageSize(), offset));
+        log.warn("invalid message size, expected: {} actual: {}", getMessageSize(), offset);
         return false;
       }
       return true;
@@ -158,17 +156,9 @@ public RequestUsmMessage(UsmConnection connection, byte[] buffer, int bufferOffs
       super(MessageType.REQUEST, connection);
 
       log.debug("Request packet:");
-      log.debug(
-          "src host: "
-              + connection.getSrcIP().toString()
-              + " src port: "
-              + connection.getSrcPort());
-      log.debug(
-          "dst host: "
-              + connection.getDstIP().toString()
-              + " dst port: "
-              + connection.getDstPort());
-      log.debug("intercepted byte len: " + len);
+      log.debug("src host: {} src port: {}", connection.getSrcIP(), connection.getSrcPort());
+      log.debug("dst host: {} dst port: {}", connection.getDstIP(), connection.getDstPort());
+      log.debug("intercepted byte len: {}", len);
 
       // check the buffer is not larger than max allowed,
       if (len - bufferOffset <= MAX_HTTPS_BUFFER_SIZE) {

dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/csi/StringConcatCategory2Example.java

@@ -9,9 +9,9 @@ public class StringConcatCategory2Example implements BiFunction<String, String,
   private static final Logger LOGGER = LoggerFactory.getLogger(StringConcatCategory2Example.class);
 
   public String apply(final String first, final String second) {
-    LOGGER.debug("Before apply : " + (System.currentTimeMillis() / 1000L));
+    LOGGER.debug("Before apply : {}", System.currentTimeMillis() / 1000L);
     final String result = first.concat(second);
-    LOGGER.debug("After apply : " + (System.currentTimeMillis() / 1000L));
+    LOGGER.debug("After apply : {}", System.currentTimeMillis() / 1000L);
     return result;
   }
 }

dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/JettyBlockingHelper.java

@@ -77,7 +77,7 @@ public class JettyBlockingHelper {
       isAsyncStartedMH =
           lookup().findVirtual(Request.class, "isAsyncStarted", methodType(boolean.class));
     } catch (NoSuchMethodException | IllegalAccessException e) {
-      log.debug("Could not find " + Request.class.getName() + "#isAsyncStarted()");
+      log.debug("Could not find {}#isAsyncStarted()", Request.class.getName());
 
       try {
         Class<?> asyncContinuationCls =

dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/java/datadog/trace/instrumentation/maven3/MavenProjectConfiguratorTest.java

@@ -77,8 +77,8 @@ public void testTracerInjection(String pomPath, String goal, String[] additional
       assertTrue(argLinePreserved, "Original argLine was not preserved");
 
     } catch (Exception | Error e) {
-      LOGGER.info("Build output:\n\n" + stdOutBaos);
-      LOGGER.info("Build error:\n\n" + stdErrBaos);
+      LOGGER.info("Build output:\n\n{}", stdOutBaos);
+      LOGGER.info("Build error:\n\n{}", stdErrBaos);
       throw e;
     }
   }

dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/java/datadog/trace/instrumentation/maven3/MavenUtilsTest.java

@@ -498,22 +498,21 @@ private static String getLatestMavenSurefireVersion() {
         if (versionList.getLength() > 0) {
           String version = versionList.item(0).getTextContent();
           if (!version.contains("alpha") && !version.contains("beta")) {
-            LOGGER.info("Will run the 'latest' tests with version " + version);
+            LOGGER.info("Will run the 'latest' tests with version {}", version);
             return version;
           }
         }
       } else {
         LOGGER.warn(
-            "Could not get latest Maven Surefire version, response from repo.maven.apache.org is "
-                + response.code()
-                + ":"
-                + response.body().string());
+            "Could not get latest Maven Surefire version, response from repo.maven.apache.org is {}:{}",
+            response.code(),
+            response.body().string());
       }
     } catch (Exception e) {
       LOGGER.warn("Could not get latest Maven Surefire version", e);
     }
     String hardcodedLatestVersion = "3.5.0"; // latest version that is known to work
-    LOGGER.info("Will run the 'latest' tests with hard-coded version " + hardcodedLatestVersion);
+    LOGGER.info("Will run the 'latest' tests with hard-coded version {}", hardcodedLatestVersion);
     return hardcodedLatestVersion;
   }
 }

dd-smoke-tests/datastreams/kafkaschemaregistry/src/main/java/datadog/smoketest/datastreams/kafkaschemaregistry/KafkaProducerWithSchemaRegistry.java

@@ -48,7 +48,7 @@ public static void produce() {
         new org.apache.kafka.clients.producer.KafkaProducer<>(properties);
 
     Duration duration = Duration.newBuilder().setSeconds(10).build();
-    log.info("duration is " + duration.getSeconds());
+    log.info("duration is {}", duration.getSeconds());
 
     try {
       for (int i = 1; i <= 20; i++) {