Start Datadog appender when doing agentless log submission for Log4j2 (…

…#7160)
DataDog · Jun 11, 2024 · 54461ee · 54461ee
1 parent 5294fac
commit 54461ee
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/...ntake/src/main/java/datadog/trace/instrumentation/log4j2/LoggerConfigInstrumentation.java b/...ntake/src/main/java/datadog/trace/instrumentation/log4j2/LoggerConfigInstrumentation.java
@@ -6,9 +6,11 @@
 import datadog.trace.agent.tooling.Instrumenter;
 import datadog.trace.agent.tooling.InstrumenterModule;
 import datadog.trace.api.Config;
+import java.util.Map;
 import java.util.Set;
 import net.bytebuddy.asm.Advice;
 import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.core.Appender;
 import org.apache.logging.log4j.core.config.LoggerConfig;
 
 @AutoService(InstrumenterModule.class)
@@ -44,7 +46,18 @@ public void methodAdvice(MethodTransformer transformer) {
   public static class LoggerConfigConstructorAdvice {
     @Advice.OnMethodExit(suppress = Throwable.class)
     public static void onExit(@Advice.This LoggerConfig loggerConfig) {
+      Map<String, Appender> appenders = loggerConfig.getAppenders();
+      if (appenders != null) {
+        for (Appender appender : appenders.values()) {
+          if (appender instanceof DatadogAppender) {
+            return;
+          }
+        }
+      }
+
       DatadogAppender appender = new DatadogAppender("datadog", null);
+      appender.start();
+
       Config config = Config.get();
       Level level = Level.valueOf(config.getAgentlessLogSubmissionLevel());
       loggerConfig.addAppender(appender, level, null);