Split out log4j appender (#4907)

open-telemetry · Dec 15, 2021 · b01efec · b01efec
1 parent c197b84
commit b01efec
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 5 deletions.
diff --git a/instrumentation/log4j/log4j-2.13.2/library-autoconfigure/build.gradle.kts b/instrumentation/log4j/log4j-2.13.2/library-autoconfigure/build.gradle.kts
@@ -3,16 +3,11 @@ plugins {
 }
 
 dependencies {
-  compileOnly("io.opentelemetry:opentelemetry-sdk-logs")
-
   library("org.apache.logging.log4j:log4j-core:2.13.2")
 
   // Library instrumentation cannot be applied to 2.13.2 due to a bug in Log4J. The agent works
   // around it.
   testLibrary("org.apache.logging.log4j:log4j-core:2.13.3")
 
   testImplementation(project(":instrumentation:log4j:log4j-2-common:testing"))
-  testImplementation("io.opentelemetry:opentelemetry-sdk-logs")
-
-  testImplementation("org.mockito:mockito-core")
 }
diff --git a/instrumentation/log4j/log4j-2.13.2/library/build.gradle.kts b/instrumentation/log4j/log4j-2.13.2/library/build.gradle.kts
@@ -0,0 +1,13 @@
+plugins {
+  id("otel.library-instrumentation")
+}
+
+dependencies {
+  compileOnly("io.opentelemetry:opentelemetry-sdk-logs")
+
+  library("org.apache.logging.log4j:log4j-core:2.13.2")
+
+  testImplementation("io.opentelemetry:opentelemetry-sdk-logs")
+
+  testImplementation("org.mockito:mockito-core")
+}
diff --git a/...ntation/log4j/v2_13_2/LogEventMapper.java → ...ntation/log4j/v2_13_2/LogEventMapper.java b/...ntation/log4j/v2_13_2/LogEventMapper.java → ...ntation/log4j/v2_13_2/LogEventMapper.java
diff --git a/.../log4j/v2_13_2/OpenTelemetryAppender.java → .../log4j/v2_13_2/OpenTelemetryAppender.java b/.../log4j/v2_13_2/OpenTelemetryAppender.java → .../log4j/v2_13_2/OpenTelemetryAppender.java
diff --git a/...ion/log4j/v2_13_2/OpenTelemetryLog4j.java → ...ion/log4j/v2_13_2/OpenTelemetryLog4j.java b/...ion/log4j/v2_13_2/OpenTelemetryLog4j.java → ...ion/log4j/v2_13_2/OpenTelemetryLog4j.java
diff --git a/...13_2/OpenTelemetryAppenderConfigTest.java → ...13_2/OpenTelemetryAppenderConfigTest.java b/...13_2/OpenTelemetryAppenderConfigTest.java → ...13_2/OpenTelemetryAppenderConfigTest.java
diff --git a/...4j/v2_13_2/OpenTelemetryAppenderTest.java → ...4j/v2_13_2/OpenTelemetryAppenderTest.java b/...4j/v2_13_2/OpenTelemetryAppenderTest.java → ...4j/v2_13_2/OpenTelemetryAppenderTest.java
diff --git a/...log4j/v2_13_2/OpenTelemetryLog4jTest.java → ...log4j/v2_13_2/OpenTelemetryLog4jTest.java b/...log4j/v2_13_2/OpenTelemetryLog4jTest.java → ...log4j/v2_13_2/OpenTelemetryLog4jTest.java
diff --git a/...figure/src/test/resources/log4j2-test.xml → ...ibrary/src/test/resources/log4j2-test.xml b/...figure/src/test/resources/log4j2-test.xml → ...ibrary/src/test/resources/log4j2-test.xml
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -266,6 +266,7 @@ include(":instrumentation:liberty:liberty-dispatcher:javaagent")
 include(":instrumentation:log4j:log4j-1.2:javaagent")
 include(":instrumentation:log4j:log4j-2.7:javaagent")
 include(":instrumentation:log4j:log4j-2.13.2:javaagent")
+include(":instrumentation:log4j:log4j-2.13.2:library")
 include(":instrumentation:log4j:log4j-2.13.2:library-autoconfigure")
 include(":instrumentation:log4j:log4j-2-common:testing")
 include(":instrumentation:logback-1.0:javaagent")