open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Trask Stalnaker 2021-12-21 11:40:03 -08:00 committed by GitHub
parent 191a9a00ce
commit 88121c1583
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
instrumentation/log4j/log4j-thread-context/log4j-thread-context-2-common/testing/build.gradle.kts → instrumentation/log4j/log4j-context-data/log4j-context-data-2-common/testing/build.gradle.kts
View File

0
instrumentation/log4j/log4j-thread-context/log4j-thread-context-2-common/testing/src/main/groovy/Log4j2Test.groovy → instrumentation/log4j/log4j-context-data/log4j-context-data-2-common/testing/src/main/groovy/Log4j2Test.groovy
View File

0
instrumentation/log4j/log4j-thread-context/log4j-thread-context-2-common/testing/src/main/java/io/opentelemetry/instrumentation/log4j/v2_16/ListAppender.java → instrumentation/log4j/log4j-context-data/log4j-context-data-2-common/testing/src/main/java/io/opentelemetry/instrumentation/log4j/v2_16/ListAppender.java
View File

0
instrumentation/log4j/log4j-thread-context/log4j-thread-context-2-common/testing/src/main/resources/log4j2-test.xml → instrumentation/log4j/log4j-context-data/log4j-context-data-2-common/testing/src/main/resources/log4j2-test.xml
View File

6
instrumentation/log4j/log4j-thread-context/log4j-thread-context-2.16/javaagent/build.gradle.kts → instrumentation/log4j/log4j-context-data/log4j-context-data-2.16/javaagent/build.gradle.kts
View File

@ -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 {

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

@ -22,7 +22,7 @@ import net.bytebuddy.matcher.ElementMatcher;
@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

0
instrumentation/log4j/log4j-thread-context/log4j-thread-context-2.16/javaagent/src/test/groovy/AutoLog4j2Test.groovy → instrumentation/log4j/log4j-context-data/log4j-context-data-2.16/javaagent/src/test/groovy/AutoLog4j2Test.groovy
View File

0
instrumentation/log4j/log4j-thread-context/log4j-thread-context-2.16/library-autoconfigure/README.md → instrumentation/log4j/log4j-context-data/log4j-context-data-2.16/library-autoconfigure/README.md
View File

2
instrumentation/log4j/log4j-thread-context/log4j-thread-context-2.16/library-autoconfigure/build.gradle.kts → instrumentation/log4j/log4j-context-data/log4j-context-data-2.16/library-autoconfigure/build.gradle.kts
View File

@ -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"))
}

0
instrumentation/log4j/log4j-thread-context/log4j-thread-context-2.16/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/log4j/v2_16/OpenTelemetryContextDataProvider.java → instrumentation/log4j/log4j-context-data/log4j-context-data-2.16/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/log4j/v2_16/OpenTelemetryContextDataProvider.java
View File

0
instrumentation/log4j/log4j-thread-context/log4j-thread-context-2.16/library-autoconfigure/src/main/resources/META-INF/services/org.apache.logging.log4j.core.util.ContextDataProvider → instrumentation/log4j/log4j-context-data/log4j-context-data-2.16/library-autoconfigure/src/main/resources/META-INF/services/org.apache.logging.log4j.core.util.ContextDataProvider
View File

0
instrumentation/log4j/log4j-thread-context/log4j-thread-context-2.16/library-autoconfigure/src/test/groovy/LibraryLog4j2Test.groovy → instrumentation/log4j/log4j-context-data/log4j-context-data-2.16/library-autoconfigure/src/test/groovy/LibraryLog4j2Test.groovy
View File

4
instrumentation/log4j/log4j-thread-context/log4j-thread-context-2.7/javaagent/build.gradle.kts → instrumentation/log4j/log4j-context-data/log4j-context-data-2.7/javaagent/build.gradle.kts
View File

@ -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")
}

0
instrumentation/log4j/log4j-thread-context/log4j-thread-context-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/v2_7/ContextDataInjectorFactoryInstrumentation.java → instrumentation/log4j/log4j-context-data/log4j-context-data-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/v2_7/ContextDataInjectorFactoryInstrumentation.java
View File

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

@ -18,7 +18,7 @@ import net.bytebuddy.matcher.ElementMatcher;
@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

0
instrumentation/log4j/log4j-thread-context/log4j-thread-context-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/v2_7/SpanDecoratingContextDataInjector.java → instrumentation/log4j/log4j-context-data/log4j-context-data-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/v2_7/SpanDecoratingContextDataInjector.java
View File

0
instrumentation/log4j/log4j-thread-context/log4j-thread-context-2.7/javaagent/src/test/groovy/Log4j27Test.groovy → instrumentation/log4j/log4j-context-data/log4j-context-data-2.7/javaagent/src/test/groovy/Log4j27Test.groovy
View File

8
settings.gradle.kts
View File

@ -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")