From d9eb480f3ca38fd0e482e5e4336db0903ea1d30f Mon Sep 17 00:00:00 2001
From: Luca Abbati <luca.abbati@datadoghq.com>
Date: Thu, 13 Jun 2019 19:33:58 +0200
Subject: [PATCH] Rename log4j2 module to reflect library name

---
 .../log4j2.gradle}                            | 20 ++++++++++++-------
 .../mdc/ThreadContextInstrumentation.java     |  0
 .../test/groovy/Log4jThreadContextTest.groovy |  0
 settings.gradle                               |  2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)
 rename dd-java-agent/instrumentation/{log4j-thread-context/log4j-thread-context.gradle => log4j2/log4j2.gradle} (72%)
 rename dd-java-agent/instrumentation/{log4j-thread-context => log4j2}/src/main/java/datadog/trace/instrumentation/slf4j/mdc/ThreadContextInstrumentation.java (100%)
 rename dd-java-agent/instrumentation/{log4j-thread-context => log4j2}/src/test/groovy/Log4jThreadContextTest.groovy (100%)

diff --git a/dd-java-agent/instrumentation/log4j-thread-context/log4j-thread-context.gradle b/dd-java-agent/instrumentation/log4j2/log4j2.gradle
similarity index 72%
rename from dd-java-agent/instrumentation/log4j-thread-context/log4j-thread-context.gradle
rename to dd-java-agent/instrumentation/log4j2/log4j2.gradle
index 6dbf22fc26..981f623b63 100644
--- a/dd-java-agent/instrumentation/log4j-thread-context/log4j-thread-context.gradle
+++ b/dd-java-agent/instrumentation/log4j2/log4j2.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')
diff --git a/dd-java-agent/instrumentation/log4j-thread-context/src/main/java/datadog/trace/instrumentation/slf4j/mdc/ThreadContextInstrumentation.java b/dd-java-agent/instrumentation/log4j2/src/main/java/datadog/trace/instrumentation/slf4j/mdc/ThreadContextInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/log4j-thread-context/src/main/java/datadog/trace/instrumentation/slf4j/mdc/ThreadContextInstrumentation.java
rename to dd-java-agent/instrumentation/log4j2/src/main/java/datadog/trace/instrumentation/slf4j/mdc/ThreadContextInstrumentation.java
diff --git a/dd-java-agent/instrumentation/log4j-thread-context/src/test/groovy/Log4jThreadContextTest.groovy b/dd-java-agent/instrumentation/log4j2/src/test/groovy/Log4jThreadContextTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/log4j-thread-context/src/test/groovy/Log4jThreadContextTest.groovy
rename to dd-java-agent/instrumentation/log4j2/src/test/groovy/Log4jThreadContextTest.groovy
diff --git a/settings.gradle b/settings.gradle
index 568e34cd19..4bceeaa7aa 100644
--- 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'