From b01efec0fd7638b8b6bbbe077742f02afb8c199f Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Wed, 15 Dec 2021 10:02:40 -0800 Subject: [PATCH] Split out log4j appender (#4907) --- .../library-autoconfigure/build.gradle.kts | 5 ----- .../log4j/log4j-2.13.2/library/build.gradle.kts | 13 +++++++++++++ .../log4j/v2_13_2/LogEventMapper.java | 0 .../log4j/v2_13_2/OpenTelemetryAppender.java | 0 .../log4j/v2_13_2/OpenTelemetryLog4j.java | 0 .../v2_13_2/OpenTelemetryAppenderConfigTest.java | 0 .../log4j/v2_13_2/OpenTelemetryAppenderTest.java | 0 .../log4j/v2_13_2/OpenTelemetryLog4jTest.java | 0 .../src/test/resources/log4j2-test.xml | 0 settings.gradle.kts | 1 + 10 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 instrumentation/log4j/log4j-2.13.2/library/build.gradle.kts rename instrumentation/log4j/log4j-2.13.2/{library-autoconfigure => library}/src/main/java/io/opentelemetry/instrumentation/log4j/v2_13_2/LogEventMapper.java (100%) rename instrumentation/log4j/log4j-2.13.2/{library-autoconfigure => library}/src/main/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryAppender.java (100%) rename instrumentation/log4j/log4j-2.13.2/{library-autoconfigure => library}/src/main/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryLog4j.java (100%) rename instrumentation/log4j/log4j-2.13.2/{library-autoconfigure => library}/src/test/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryAppenderConfigTest.java (100%) rename instrumentation/log4j/log4j-2.13.2/{library-autoconfigure => library}/src/test/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryAppenderTest.java (100%) rename instrumentation/log4j/log4j-2.13.2/{library-autoconfigure => library}/src/test/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryLog4jTest.java (100%) rename instrumentation/log4j/log4j-2.13.2/{library-autoconfigure => library}/src/test/resources/log4j2-test.xml (100%) 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 index d78dc9e80b42..207b68b9a79b 100644 --- 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,8 +3,6 @@ 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 @@ -12,7 +10,4 @@ dependencies { 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 new file mode 100644 index 000000000000..a22684071bce --- /dev/null +++ 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/instrumentation/log4j/log4j-2.13.2/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/log4j/v2_13_2/LogEventMapper.java b/instrumentation/log4j/log4j-2.13.2/library/src/main/java/io/opentelemetry/instrumentation/log4j/v2_13_2/LogEventMapper.java similarity index 100% rename from instrumentation/log4j/log4j-2.13.2/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/log4j/v2_13_2/LogEventMapper.java rename to instrumentation/log4j/log4j-2.13.2/library/src/main/java/io/opentelemetry/instrumentation/log4j/v2_13_2/LogEventMapper.java diff --git a/instrumentation/log4j/log4j-2.13.2/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryAppender.java b/instrumentation/log4j/log4j-2.13.2/library/src/main/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryAppender.java similarity index 100% rename from instrumentation/log4j/log4j-2.13.2/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryAppender.java rename to instrumentation/log4j/log4j-2.13.2/library/src/main/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryAppender.java diff --git a/instrumentation/log4j/log4j-2.13.2/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryLog4j.java b/instrumentation/log4j/log4j-2.13.2/library/src/main/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryLog4j.java similarity index 100% rename from instrumentation/log4j/log4j-2.13.2/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryLog4j.java rename to instrumentation/log4j/log4j-2.13.2/library/src/main/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryLog4j.java diff --git a/instrumentation/log4j/log4j-2.13.2/library-autoconfigure/src/test/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryAppenderConfigTest.java b/instrumentation/log4j/log4j-2.13.2/library/src/test/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryAppenderConfigTest.java similarity index 100% rename from instrumentation/log4j/log4j-2.13.2/library-autoconfigure/src/test/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryAppenderConfigTest.java rename to instrumentation/log4j/log4j-2.13.2/library/src/test/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryAppenderConfigTest.java diff --git a/instrumentation/log4j/log4j-2.13.2/library-autoconfigure/src/test/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryAppenderTest.java b/instrumentation/log4j/log4j-2.13.2/library/src/test/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryAppenderTest.java similarity index 100% rename from instrumentation/log4j/log4j-2.13.2/library-autoconfigure/src/test/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryAppenderTest.java rename to instrumentation/log4j/log4j-2.13.2/library/src/test/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryAppenderTest.java diff --git a/instrumentation/log4j/log4j-2.13.2/library-autoconfigure/src/test/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryLog4jTest.java b/instrumentation/log4j/log4j-2.13.2/library/src/test/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryLog4jTest.java similarity index 100% rename from instrumentation/log4j/log4j-2.13.2/library-autoconfigure/src/test/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryLog4jTest.java rename to instrumentation/log4j/log4j-2.13.2/library/src/test/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryLog4jTest.java diff --git a/instrumentation/log4j/log4j-2.13.2/library-autoconfigure/src/test/resources/log4j2-test.xml b/instrumentation/log4j/log4j-2.13.2/library/src/test/resources/log4j2-test.xml similarity index 100% rename from instrumentation/log4j/log4j-2.13.2/library-autoconfigure/src/test/resources/log4j2-test.xml rename to instrumentation/log4j/log4j-2.13.2/library/src/test/resources/log4j2-test.xml diff --git a/settings.gradle.kts b/settings.gradle.kts index 9d5039257b74..9b20891bf4f4 100644 --- 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")