From 658120f76ef12cd4a3e17bf378f9b60c8ca1c379 Mon Sep 17 00:00:00 2001
From: Yury Gribkov <yury.gribkov@gmail.com>
Date: Wed, 3 Sep 2025 10:27:56 -0700
Subject: [PATCH] Error Logs Remediation

---
 .../controller/ProfilerSettingsSupport.java   |  3 ++-
 .../trace/agent/tooling/HelperInjector.java   |  1 -
 .../telemetry/log/LogPeriodicAction.java      | 22 -------------------
 .../log/LogPeriodicActionTest.groovy          |  2 +-
 4 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ProfilerSettingsSupport.java b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ProfilerSettingsSupport.java
index ed2e8a688be..d64fe983cc6 100644
--- a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ProfilerSettingsSupport.java
+++ b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ProfilerSettingsSupport.java
@@ -212,7 +212,8 @@ private static int getStackDepth() {
         try {
           return Integer.parseInt(value.substring(start, end));
         } catch (NumberFormatException e) {
-          logger.debug(SEND_TELEMETRY, "Failed to parse stack depth from JFR options: " + value, e);
+          logger.debug(
+              SEND_TELEMETRY, "Failed to parse stack depth from JFR options: {}", value, e);
         }
       }
     }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/HelperInjector.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/HelperInjector.java
index 3c543731625..85a425101e2 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/HelperInjector.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/HelperInjector.java
@@ -158,7 +158,6 @@ public DynamicType.Builder<?> transform(
                 "Failed to inject helper classes - instrumentation.class="
                     + requestingName
                     + " instrumentation.target.classloader={} instrumentation.target.class={}",
-                requestingName,
                 classLoader,
                 typeDescription,
                 e);
diff --git a/telemetry/src/main/java/datadog/telemetry/log/LogPeriodicAction.java b/telemetry/src/main/java/datadog/telemetry/log/LogPeriodicAction.java
index d099e8ba32e..e949782b4ba 100644
--- a/telemetry/src/main/java/datadog/telemetry/log/LogPeriodicAction.java
+++ b/telemetry/src/main/java/datadog/telemetry/log/LogPeriodicAction.java
@@ -63,16 +63,6 @@ private static String renderStackTrace(Throwable t) {
       } else {
         result.append(name);
       }
-
-      if (isDataDogCode(t)) {
-        String msg = t.getMessage();
-        result.append(": ");
-        if (msg == null || msg.isEmpty()) {
-          result.append(UNKNOWN);
-        } else {
-          result.append(msg);
-        }
-      }
       result.append('\n');
 
       final StackTraceElement[] stacktrace = t.getStackTrace();
@@ -127,18 +117,6 @@ private static int countCommonFrames(
     return count;
   }
 
-  private static boolean isDataDogCode(Throwable t) {
-    StackTraceElement[] stackTrace = t.getStackTrace();
-    if (stackTrace == null || stackTrace.length == 0) {
-      return false;
-    }
-    String cn = stackTrace[0].getClassName();
-    if (cn.isEmpty()) {
-      return false;
-    }
-    return cn.startsWith("datadog.") || cn.startsWith("com.datadog.");
-  }
-
   private static boolean shouldRedactClass(final String className) {
     for (final String prefix : PACKAGE_ALLOW_LIST) {
       if (className.startsWith(prefix)) {
diff --git a/telemetry/src/test/groovy/datadog/telemetry/log/LogPeriodicActionTest.groovy b/telemetry/src/test/groovy/datadog/telemetry/log/LogPeriodicActionTest.groovy
index 1142594e0fa..8930d234756 100644
--- a/telemetry/src/test/groovy/datadog/telemetry/log/LogPeriodicActionTest.groovy
+++ b/telemetry/src/test/groovy/datadog/telemetry/log/LogPeriodicActionTest.groovy
@@ -50,7 +50,7 @@ class LogPeriodicActionTest extends DDSpecification {
     1 * telemetryService.addLogMessage(_) >> { args -> logMessage = args[0] }
     0 * _
     logMessage.getMessage() == 'test'
-    logMessage.getStackTrace() == "${MutableException.canonicalName}: exception\n" +
+    logMessage.getStackTrace() == "${MutableException.canonicalName}\n" +
       "  at datadog.MyClass.method(file:42)\n"
   }