From ac7abcdfa84710430eb455f0d57c989ad5108a6e Mon Sep 17 00:00:00 2001 From: Luca Abbati Date: Fri, 21 Jun 2019 15:52:20 -0400 Subject: [PATCH] Fix expression to include tracing of log4j1 MDC in agent installer --- .../main/java/datadog/trace/agent/tooling/AgentInstaller.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java index 2e08c127cd..b51197d4ad 100644 --- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java +++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java @@ -127,8 +127,7 @@ public class AgentInstaller { .or(nameStartsWith("com.singularity.")) .or(nameStartsWith("com.jinspired.")) .or(nameStartsWith("org.jinspired.")) - .or(nameStartsWith("org.apache.log4j.")) - .and(not(named("org.apache.log4j.MDC"))) + .or(nameStartsWith("org.apache.log4j.").and(not(named("org.apache.log4j.MDC")))) .or(nameStartsWith("org.slf4j.").and(not(named("org.slf4j.MDC")))) .or(nameContains("$JaxbAccessor")) .or(nameContains("CGLIB$$"))