Rename (and move around) log4j instrumentation modules (#4937)

* Rename to log4j-thread-context

* Rename to log4j-mdc-1.2

* move

* update

* subdir

instrumentation/log4j/log4j-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/v1_2/Log4j1InstrumentationModule.java → instrumentation/log4j/log4j-mdc-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/v1_2/Log4j1InstrumentationModule.java

@@ -15,7 +15,7 @@ import java.util.List;
 @AutoService(InstrumentationModule.class)
 public class Log4j1InstrumentationModule extends InstrumentationModule {
   public Log4j1InstrumentationModule() {
-    super("log4j", "log4j-1.2");
+    super("log4j-mdc", "log4j-mdc-1.2");
   }
 
   @Override

instrumentation/log4j/log4j-2.16/javaagent/build.gradle.kts → instrumentation/log4j/log4j-thread-context/log4j-thread-context-2.16/javaagent/build.gradle.kts

@@ -23,11 +23,11 @@ testSets {
 dependencies {
   library("org.apache.logging.log4j:log4j-core:2.16.0")
 
-  implementation(project(":instrumentation:log4j:log4j-2.16:library-autoconfigure"))
+  implementation(project(":instrumentation:log4j:log4j-thread-context:log4j-thread-context-2.16:library-autoconfigure"))
 
-  testInstrumentation(project(":instrumentation:log4j:log4j-2.7:javaagent"))
+  testInstrumentation(project(":instrumentation:log4j:log4j-thread-context:log4j-thread-context-2.7:javaagent"))
 
-  testImplementation(project(":instrumentation:log4j:log4j-2-common:testing"))
+  testImplementation(project(":instrumentation:log4j:log4j-thread-context:log4j-thread-context-2-common:testing"))
 }
 
 tasks {

instrumentation/log4j/log4j-2.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/v2_16/Log4j2InstrumentationModule.java → instrumentation/log4j/log4j-thread-context/log4j-thread-context-2.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/v2_16/Log4j2InstrumentationModule.java

@@ -22,7 +22,7 @@ import net.bytebuddy.matcher.ElementMatcher;
 @AutoService(InstrumentationModule.class)
 public class Log4j2InstrumentationModule extends InstrumentationModule {
   public Log4j2InstrumentationModule() {
-    super("log4j", "log4j-2.16");
+    super("log4j-thread-context", "log4j-thread-context-2.16");
   }
 
   @Override

instrumentation/log4j/log4j-2.16/library-autoconfigure/build.gradle.kts → instrumentation/log4j/log4j-thread-context/log4j-thread-context-2.16/library-autoconfigure/build.gradle.kts

@@ -7,5 +7,5 @@ base.archivesName.set("${base.archivesName.get()}-autoconfigure")
 dependencies {
   library("org.apache.logging.log4j:log4j-core:2.16.0")
 
-  testImplementation(project(":instrumentation:log4j:log4j-2-common:testing"))
+  testImplementation(project(":instrumentation:log4j:log4j-thread-context:log4j-thread-context-2-common:testing"))
 }

instrumentation/log4j/log4j-2.7/javaagent/build.gradle.kts → instrumentation/log4j/log4j-thread-context/log4j-thread-context-2.7/javaagent/build.gradle.kts

@@ -14,9 +14,9 @@ muzzle {
 dependencies {
   library("org.apache.logging.log4j:log4j-core:2.7")
 
-  testInstrumentation(project(":instrumentation:log4j:log4j-2.16:javaagent"))
+  testInstrumentation(project(":instrumentation:log4j:log4j-thread-context:log4j-thread-context-2.16:javaagent"))
 
-  testImplementation(project(":instrumentation:log4j:log4j-2-common:testing"))
+  testImplementation(project(":instrumentation:log4j:log4j-thread-context:log4j-thread-context-2-common:testing"))
 
   latestDepTestLibrary("org.apache.logging.log4j:log4j-core:2.15.0")
 }

instrumentation/log4j/log4j-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/v2_7/Log4j27InstrumentationModule.java → instrumentation/log4j/log4j-thread-context/log4j-thread-context-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/v2_7/Log4j27InstrumentationModule.java

@@ -18,7 +18,7 @@ import net.bytebuddy.matcher.ElementMatcher;
 @AutoService(InstrumentationModule.class)
 public class Log4j27InstrumentationModule extends InstrumentationModule {
   public Log4j27InstrumentationModule() {
-    super("log4j", "log4j-2.7");
+    super("log4j-thread-context", "log4j-thread-context-2.7");
   }
 
   @Override

settings.gradle.kts

@@ -265,12 +265,12 @@ include(":instrumentation:lettuce:lettuce-5.1:testing")
 include(":instrumentation:liberty:compile-stub")
 include(":instrumentation:liberty:liberty:javaagent")
 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.16:javaagent")
-include(":instrumentation:log4j:log4j-2.16:library")
-include(":instrumentation:log4j:log4j-2.16:library-autoconfigure")
-include(":instrumentation:log4j:log4j-2-common:testing")
+include(":instrumentation:log4j:log4j-mdc-1.2:javaagent")
+include(":instrumentation:log4j:log4j-thread-context:log4j-thread-context-2.7:javaagent")
+include(":instrumentation:log4j:log4j-thread-context:log4j-thread-context-2.16:javaagent")
+include(":instrumentation:log4j:log4j-thread-context:log4j-thread-context-2.16:library-autoconfigure")
+include(":instrumentation:log4j:log4j-thread-context:log4j-thread-context-2-common:testing")
+include(":instrumentation:log4j:log4j-appender-2.16:library")
 include(":instrumentation:logback-1.0:javaagent")
 include(":instrumentation:logback-1.0:library")
 include(":instrumentation:logback-1.0:testing")