Rename log4j2 module to reflect library name

2019-06-13 19:33:58 +02:00 · 2019-06-13 19:33:58 +02:00 · d9eb480f3c
parent 22477efb7a
commit d9eb480f3c
4 changed files with 14 additions and 8 deletions
--- a/dd-java-agent/instrumentation/log4j-thread-context/log4j-thread-context.gradle
+++ b/dd-java-agent/instrumentation/log4j-thread-context/log4j-thread-context.gradle
@ -4,13 +4,19 @@ ext {
  log4jVersion = '2.11.2'
 }

-//muzzle {
-//  pass {
-//    group = 'org.slf4j'
-//    module = 'slf4j-api'
-//    versions = '(,)'
-//  }
-//}
+muzzle {
+  pass {
+    group = 'org.apache.logging.log4j'
+    module = 'log4j-core'
+    versions = '(,)'
+  }
+
+  pass {
+    group = 'org.apache.logging.log4j'
+    module = 'log4j-api'
+    versions = '(,)'
+  }
+}

 dependencies {
  compile project(':dd-trace-api')
--- a/dd-java-agent/instrumentation/log4j-thread-context/src/main/java/datadog/trace/instrumentation/slf4j/mdc/ThreadContextInstrumentation.java
+++ b/dd-java-agent/instrumentation/log4j-thread-context/src/main/java/datadog/trace/instrumentation/slf4j/mdc/ThreadContextInstrumentation.java
--- a/dd-java-agent/instrumentation/log4j-thread-context/src/test/groovy/Log4jThreadContextTest.groovy
+++ b/dd-java-agent/instrumentation/log4j-thread-context/src/test/groovy/Log4jThreadContextTest.groovy
--- a/settings.gradle
+++ b/settings.gradle
@ -66,7 +66,7 @@ include ':dd-java-agent:instrumentation:jsp-2.3'
 include ':dd-java-agent:instrumentation:kafka-clients-0.11'
 include ':dd-java-agent:instrumentation:kafka-streams-0.11'
 include ':dd-java-agent:instrumentation:lettuce-5'
-include ':dd-java-agent:instrumentation:log4j-thread-context'
+include ':dd-java-agent:instrumentation:log4j2'
 include ':dd-java-agent:instrumentation:mongo'
 include ':dd-java-agent:instrumentation:mongo:driver-3.1'
 include ':dd-java-agent:instrumentation:mongo:driver-async-3.3'