Rename log4j-thread-context modules to log4j-context-data (#4957)

open-telemetry · Dec 21, 2021 · 88121c1 · 88121c1
1 parent 191a9a0
commit 88121c1
Show file tree

Hide file tree

Showing 18 changed files with 12 additions and 12 deletions.
diff --git a/...context-2-common/testing/build.gradle.kts → ...xt-data-2-common/testing/build.gradle.kts b/...context-2-common/testing/build.gradle.kts → ...xt-data-2-common/testing/build.gradle.kts
diff --git a/...testing/src/main/groovy/Log4j2Test.groovy → ...testing/src/main/groovy/Log4j2Test.groovy b/...testing/src/main/groovy/Log4j2Test.groovy → ...testing/src/main/groovy/Log4j2Test.groovy
diff --git a/...rumentation/log4j/v2_16/ListAppender.java → ...rumentation/log4j/v2_16/ListAppender.java b/...rumentation/log4j/v2_16/ListAppender.java → ...rumentation/log4j/v2_16/ListAppender.java
diff --git a/...esting/src/main/resources/log4j2-test.xml → ...esting/src/main/resources/log4j2-test.xml b/...esting/src/main/resources/log4j2-test.xml → ...esting/src/main/resources/log4j2-test.xml
diff --git a/...d-context-2.16/javaagent/build.gradle.kts → ...text-data-2.16/javaagent/build.gradle.kts b/...d-context-2.16/javaagent/build.gradle.kts → ...text-data-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-thread-context:log4j-thread-context-2.16:library-autoconfigure"))
+  implementation(project(":instrumentation:log4j:log4j-context-data:log4j-context-data-2.16:library-autoconfigure"))
 
-  testInstrumentation(project(":instrumentation:log4j:log4j-thread-context:log4j-thread-context-2.7:javaagent"))
+  testInstrumentation(project(":instrumentation:log4j:log4j-context-data:log4j-context-data-2.7:javaagent"))
 
-  testImplementation(project(":instrumentation:log4j:log4j-thread-context:log4j-thread-context-2-common:testing"))
+  testImplementation(project(":instrumentation:log4j:log4j-context-data:log4j-context-data-2-common:testing"))
 }
 
 tasks {

diff --git a/...4j/v2_16/Log4j2InstrumentationModule.java → ...4j/v2_16/Log4j2InstrumentationModule.java b/...4j/v2_16/Log4j2InstrumentationModule.java → ...4j/v2_16/Log4j2InstrumentationModule.java
@@ -22,7 +22,7 @@
 @AutoService(InstrumentationModule.class)
 public class Log4j2InstrumentationModule extends InstrumentationModule {
   public Log4j2InstrumentationModule() {
-    super("log4j-thread-context", "log4j-thread-context-2.16");
+    super("log4j-context-data", "log4j-context-data-2.16");
   }
 
   @Override

diff --git a/...ent/src/test/groovy/AutoLog4j2Test.groovy → ...ent/src/test/groovy/AutoLog4j2Test.groovy b/...ent/src/test/groovy/AutoLog4j2Test.groovy → ...ent/src/test/groovy/AutoLog4j2Test.groovy
diff --git a/...text-2.16/library-autoconfigure/README.md → ...data-2.16/library-autoconfigure/README.md b/...text-2.16/library-autoconfigure/README.md → ...data-2.16/library-autoconfigure/README.md
diff --git a/...16/library-autoconfigure/build.gradle.kts → ...16/library-autoconfigure/build.gradle.kts b/...16/library-autoconfigure/build.gradle.kts → ...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-thread-context:log4j-thread-context-2-common:testing"))
+  testImplementation(project(":instrumentation:log4j:log4j-context-data:log4j-context-data-2-common:testing"))
 }
diff --git a/..._16/OpenTelemetryContextDataProvider.java → ..._16/OpenTelemetryContextDataProvider.java b/..._16/OpenTelemetryContextDataProvider.java → ..._16/OpenTelemetryContextDataProvider.java
diff --git a/...gging.log4j.core.util.ContextDataProvider → ...gging.log4j.core.util.ContextDataProvider b/...gging.log4j.core.util.ContextDataProvider → ...gging.log4j.core.util.ContextDataProvider
diff --git a/.../src/test/groovy/LibraryLog4j2Test.groovy → .../src/test/groovy/LibraryLog4j2Test.groovy b/.../src/test/groovy/LibraryLog4j2Test.groovy → .../src/test/groovy/LibraryLog4j2Test.groovy
diff --git a/...ad-context-2.7/javaagent/build.gradle.kts → ...ntext-data-2.7/javaagent/build.gradle.kts b/...ad-context-2.7/javaagent/build.gradle.kts → ...ntext-data-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-thread-context:log4j-thread-context-2.16:javaagent"))
+  testInstrumentation(project(":instrumentation:log4j:log4j-context-data:log4j-context-data-2.16:javaagent"))
 
-  testImplementation(project(":instrumentation:log4j:log4j-thread-context:log4j-thread-context-2-common:testing"))
+  testImplementation(project(":instrumentation:log4j:log4j-context-data:log4j-context-data-2-common:testing"))
 
   latestDepTestLibrary("org.apache.logging.log4j:log4j-core:2.15.0")
 }
diff --git a/...xtDataInjectorFactoryInstrumentation.java → ...xtDataInjectorFactoryInstrumentation.java b/...xtDataInjectorFactoryInstrumentation.java → ...xtDataInjectorFactoryInstrumentation.java
diff --git a/...4j/v2_7/Log4j27InstrumentationModule.java → ...4j/v2_7/Log4j27InstrumentationModule.java b/...4j/v2_7/Log4j27InstrumentationModule.java → ...4j/v2_7/Log4j27InstrumentationModule.java
@@ -18,7 +18,7 @@
 @AutoService(InstrumentationModule.class)
 public class Log4j27InstrumentationModule extends InstrumentationModule {
   public Log4j27InstrumentationModule() {
-    super("log4j-thread-context", "log4j-thread-context-2.7");
+    super("log4j-context-data", "log4j-context-data-2.7");
   }
 
   @Override

diff --git a/..._7/SpanDecoratingContextDataInjector.java → ..._7/SpanDecoratingContextDataInjector.java b/..._7/SpanDecoratingContextDataInjector.java → ..._7/SpanDecoratingContextDataInjector.java
diff --git a/...aagent/src/test/groovy/Log4j27Test.groovy → ...aagent/src/test/groovy/Log4j27Test.groovy b/...aagent/src/test/groovy/Log4j27Test.groovy → ...aagent/src/test/groovy/Log4j27Test.groovy
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -269,10 +269,10 @@ include(":instrumentation:liberty:liberty:javaagent")
 include(":instrumentation:liberty:liberty-dispatcher:javaagent")
 include(":instrumentation:log4j:log4j-appender-1.2:javaagent")
 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-context-data:log4j-context-data-2.7:javaagent")
+include(":instrumentation:log4j:log4j-context-data:log4j-context-data-2.16:javaagent")
+include(":instrumentation:log4j:log4j-context-data:log4j-context-data-2.16:library-autoconfigure")
+include(":instrumentation:log4j:log4j-context-data:log4j-context-data-2-common:testing")
 include(":instrumentation:log4j:log4j-appender-2.16:javaagent")
 include(":instrumentation:log4j:log4j-appender-2.16:library")
 include(":instrumentation:logback:logback-appender-1.0:javaagent")