Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 34d31ee

Browse files
amarzialiamarziali
committed
Group log4j modules
1 parent 464d547 commit 34d31ee

File tree

20 files changed

+15
-208
lines changed

20 files changed

+15
-208
lines changed

‎dd-java-agent/instrumentation/log4j1/build.gradle‎ renamed to ‎dd-java-agent/instrumentation/log4j/log4j-1.2.4/build.gradle‎

File renamed without changes.

‎dd-java-agent/instrumentation/log4j1/gradle.lockfile‎ renamed to ‎dd-java-agent/instrumentation/log4j/log4j-1.2.4/gradle.lockfile‎

File renamed without changes.

‎dd-java-agent/instrumentation/log4j1/src/main/java/datadog/trace/instrumentation/log4j1/CategoryInstrumentation.java‎ renamed to ‎dd-java-agent/instrumentation/log4j/log4j-1.2.4/src/main/java/datadog/trace/instrumentation/log4j1/CategoryInstrumentation.java‎

File renamed without changes.

‎dd-java-agent/instrumentation/log4j1/src/main/java/datadog/trace/instrumentation/log4j1/LoggingEventInstrumentation.java‎ renamed to ‎dd-java-agent/instrumentation/log4j/log4j-1.2.4/src/main/java/datadog/trace/instrumentation/log4j1/LoggingEventInstrumentation.java‎

File renamed without changes.

‎dd-java-agent/instrumentation/log4j1/src/test/groovy/MdcTest.groovy‎ renamed to ‎dd-java-agent/instrumentation/log4j/log4j-1.2.4/src/test/groovy/MdcTest.groovy‎

File renamed without changes.

‎dd-java-agent/instrumentation/log4j2/build.gradle‎ renamed to ‎dd-java-agent/instrumentation/log4j/log4j-2.0/build.gradle‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@ muzzle {
1919
assertInverse = true
2020
}
2121

22+
pass {
23+
name = 'logs-intake'
24+
group = 'org.apache.logging.log4j'
25+
module = 'log4j-core'
26+
versions = '[,3.0.0)'
27+
}
28+
2229
pass {
2330
group = 'org.apache.logging.log4j'
2431
module = 'log4j-api'

‎dd-java-agent/instrumentation/log4j2/gradle.lockfile‎ renamed to ‎dd-java-agent/instrumentation/log4j/log4j-2.0/gradle.lockfile‎

File renamed without changes.

‎dd-java-agent/instrumentation/log4j2/logs-intake/src/main/java/datadog/trace/instrumentation/log4j2/DatadogAppender.java‎ renamed to ‎dd-java-agent/instrumentation/log4j/log4j-2.0/src/main/java/datadog/trace/instrumentation/log4j2/DatadogAppender.java‎

File renamed without changes.

‎dd-java-agent/instrumentation/log4j2/logs-intake/src/main/java/datadog/trace/instrumentation/log4j2/LoggerConfigInstrumentation.java‎ renamed to ‎dd-java-agent/instrumentation/log4j/log4j-2.0/src/main/java/datadog/trace/instrumentation/log4j2/LoggerConfigInstrumentation.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@ public String[] helperClassNames() {
3636
return new String[] {packageName + ".DatadogAppender"};
3737
}
3838

39+
@Override
40+
public String muzzleDirective() {
41+
return "logs-intake";
42+
}
43+
3944
@Override
4045
public void methodAdvice(MethodTransformer transformer) {
4146
transformer.applyAdvice(

‎dd-java-agent/instrumentation/log4j2/src/main/java/datadog/trace/instrumentation/log4j2/ThreadContextInstrumentation.java‎ renamed to ‎dd-java-agent/instrumentation/log4j/log4j-2.0/src/main/java/datadog/trace/instrumentation/log4j2/ThreadContextInstrumentation.java‎

File renamed without changes.

0 commit comments

Comments
 (0)