From ec6b8fa8e267a22638d56afc91878f43444e54dd Mon Sep 17 00:00:00 2001
From: Radoslav Kirilov <rkirilow@gmail.com>
Date: Fri, 11 Oct 2024 10:56:38 +0300
Subject: [PATCH] feat(javaagent-log-appender): transfer appender settings to
 system properties

JavaAgent instrumentation of Log Appenders does not respect logger configs like `log4j2.xml` or `logback.xml`
as it uses direct patching of loggers to do the same and no appenders set in the loggers.
---
 javaagent-log-appender/build.gradle.kts               | 10 ++++++++++
 javaagent-log-appender/src/main/resources/log4j2.xml  |  6 ++----
 javaagent-log-appender/src/main/resources/logback.xml |  8 +-------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/javaagent-log-appender/build.gradle.kts b/javaagent-log-appender/build.gradle.kts
index b4f347e0ac..45a1fb0a5d 100644
--- a/javaagent-log-appender/build.gradle.kts
+++ b/javaagent-log-appender/build.gradle.kts
@@ -49,5 +49,15 @@ application {
 tasks.named<JavaExec>("run") {
     doFirst {
         jvmArgs("-javaagent:${agent.singleFile}")
+        // log4j-appender properties
+        jvmArgs(
+            "-Dotel.instrumentation.log4j-appender.experimental.capture-map-message-attributes=true",
+            "-Dotel.instrumentation.log4j-appender.experimental-log-attributes=true"
+        )
+        // logback-appender properties
+        jvmArgs(
+            "-Dotel.instrumentation.logback-appender.experimental-log-attributes=true",
+            "-Dotel.instrumentation.logback-appender.experimental.capture-key-value-pair-attributes=true"
+        )
     }
 }
diff --git a/javaagent-log-appender/src/main/resources/log4j2.xml b/javaagent-log-appender/src/main/resources/log4j2.xml
index 3601b98441..8c91e02f01 100644
--- a/javaagent-log-appender/src/main/resources/log4j2.xml
+++ b/javaagent-log-appender/src/main/resources/log4j2.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="WARN" packages="io.opentelemetry.instrumentation.log4j.appender.v2_17">
+<Configuration status="WARN">
     <Appenders>
         <Console name="ConsoleAppender" target="SYSTEM_OUT" follow="true">
             <PatternLayout pattern="log4j2: %d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
         </Console>
-        <OpenTelemetry name="OpenTelemetryAppender" captureMapMessageAttributes="true" captureExperimentalAttributes="true"/>
     </Appenders>
     <Loggers>
         <Root level="info">
-            <AppenderRef ref="OpenTelemetryAppender" />
             <AppenderRef ref="ConsoleAppender" />
         </Root>
     </Loggers>
-</Configuration>
\ No newline at end of file
+</Configuration>
diff --git a/javaagent-log-appender/src/main/resources/logback.xml b/javaagent-log-appender/src/main/resources/logback.xml
index a14aeb7fae..348cb1f1af 100644
--- a/javaagent-log-appender/src/main/resources/logback.xml
+++ b/javaagent-log-appender/src/main/resources/logback.xml
@@ -7,13 +7,7 @@
             </pattern>
         </encoder>
     </appender>
-    <appender name="OpenTelemetry"
-              class="io.opentelemetry.instrumentation.logback.appender.v1_0.OpenTelemetryAppender">
-        <captureExperimentalAttributes>true</captureExperimentalAttributes>
-        <captureKeyValuePairAttributes>true</captureKeyValuePairAttributes>
-    </appender>
     <root level="INFO">
         <appender-ref ref="console"/>
-        <appender-ref ref="OpenTelemetry"/>
     </root>
-</configuration>
\ No newline at end of file
+</configuration>