From 5c6aa52213abdaa2abcea99b04d593cee6da1706 Mon Sep 17 00:00:00 2001
From: Lauri Tulmin <ltulmin@splunk.com>
Date: Sat, 1 Jun 2024 11:20:09 +0300
Subject: [PATCH] Add log4j annotation processor (#11503)

---
 instrumentation/log4j/log4j-appender-2.17/library/README.md    | 2 +-
 .../log4j/log4j-appender-2.17/library/build.gradle.kts         | 1 +
 .../log4j-appender-2.17/library/src/test/resources/log4j2.xml  | 3 +--
 .../testing/src/main/resources/log4j2-test.xml                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/instrumentation/log4j/log4j-appender-2.17/library/README.md b/instrumentation/log4j/log4j-appender-2.17/library/README.md
index 9da7e800ec..4b765b1d4a 100644
--- a/instrumentation/log4j/log4j-appender-2.17/library/README.md
+++ b/instrumentation/log4j/log4j-appender-2.17/library/README.md
@@ -37,7 +37,7 @@ The following demonstrates how you might configure the appender in your `log4j.x
 
 ```xml
 <?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="WARN" packages="io.opentelemetry.instrumentation.log4j.appender.v2_17">
+<Configuration status="WARN">
   <Appenders>
     <Console name="Console" target="SYSTEM_OUT">
       <PatternLayout
diff --git a/instrumentation/log4j/log4j-appender-2.17/library/build.gradle.kts b/instrumentation/log4j/log4j-appender-2.17/library/build.gradle.kts
index 640d90b299..a93a67fc67 100644
--- a/instrumentation/log4j/log4j-appender-2.17/library/build.gradle.kts
+++ b/instrumentation/log4j/log4j-appender-2.17/library/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
 
 dependencies {
   library("org.apache.logging.log4j:log4j-core:2.17.0")
+  annotationProcessor("org.apache.logging.log4j:log4j-core:2.17.0")
 
   testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
 
diff --git a/instrumentation/log4j/log4j-appender-2.17/library/src/test/resources/log4j2.xml b/instrumentation/log4j/log4j-appender-2.17/library/src/test/resources/log4j2.xml
index 818a1c3623..cd4610375e 100644
--- a/instrumentation/log4j/log4j-appender-2.17/library/src/test/resources/log4j2.xml
+++ b/instrumentation/log4j/log4j-appender-2.17/library/src/test/resources/log4j2.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="WARN"
-  packages="com.example.appender,io.opentelemetry.instrumentation.log4j.appender.v2_17">
+<Configuration status="WARN">
   <Appenders>
     <Console name="Console" target="SYSTEM_OUT">
       <PatternLayout
diff --git a/instrumentation/log4j/log4j-context-data/log4j-context-data-common/testing/src/main/resources/log4j2-test.xml b/instrumentation/log4j/log4j-context-data/log4j-context-data-common/testing/src/main/resources/log4j2-test.xml
index 9394620bef..fce95a4f69 100644
--- a/instrumentation/log4j/log4j-context-data/log4j-context-data-common/testing/src/main/resources/log4j2-test.xml
+++ b/instrumentation/log4j/log4j-context-data/log4j-context-data-common/testing/src/main/resources/log4j2-test.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="WARN" packages="com.example.appender">
+<Configuration status="WARN">
   <Appenders>
     <Console name="Console" target="SYSTEM_OUT">
       <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} traceId: %X{trace_id} spanId: %X{span_id} flags: %X{trace_flags} baggage.baggage_key: %X{baggage.baggage_key} - %msg%n" />