From 8d562f91fdee48cc91ed299f471f8d088faf3bca Mon Sep 17 00:00:00 2001 From: Luca Abbati Date: Thu, 13 Jun 2019 19:42:24 +0200 Subject: [PATCH] Rename log4j package removing the left-over from sl4j original class --- .../mdc => log4j}/ThreadContextInstrumentation.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) rename dd-java-agent/instrumentation/log4j2/src/main/java/datadog/trace/instrumentation/{slf4j/mdc => log4j}/ThreadContextInstrumentation.java (92%) diff --git a/dd-java-agent/instrumentation/log4j2/src/main/java/datadog/trace/instrumentation/slf4j/mdc/ThreadContextInstrumentation.java b/dd-java-agent/instrumentation/log4j2/src/main/java/datadog/trace/instrumentation/log4j/ThreadContextInstrumentation.java similarity index 92% rename from dd-java-agent/instrumentation/log4j2/src/main/java/datadog/trace/instrumentation/slf4j/mdc/ThreadContextInstrumentation.java rename to dd-java-agent/instrumentation/log4j2/src/main/java/datadog/trace/instrumentation/log4j/ThreadContextInstrumentation.java index b33e1078d0..644a1a44cf 100644 --- a/dd-java-agent/instrumentation/log4j2/src/main/java/datadog/trace/instrumentation/slf4j/mdc/ThreadContextInstrumentation.java +++ b/dd-java-agent/instrumentation/log4j2/src/main/java/datadog/trace/instrumentation/log4j/ThreadContextInstrumentation.java @@ -1,4 +1,4 @@ -package datadog.trace.instrumentation.slf4j.mdc; +package datadog.trace.instrumentation.log4j; import static java.util.Collections.singletonMap; import static net.bytebuddy.matcher.ElementMatchers.isTypeInitializer; @@ -69,9 +69,11 @@ public class ThreadContextInstrumentation extends Instrumenter.Default { try { final Method putMethod = threadClass.getMethod("put", String.class, String.class); final Method removeMethod = threadClass.getMethod("remove", String.class); - GlobalTracer.get().addScopeListener(new ThreadContextScopeListener(putMethod, removeMethod)); + GlobalTracer.get() + .addScopeListener(new ThreadContextScopeListener(putMethod, removeMethod)); } catch (final NoSuchMethodException e) { - org.slf4j.LoggerFactory.getLogger(threadClass).debug("Failed to add log4j ThreadContext span listener", e); + org.slf4j.LoggerFactory.getLogger(threadClass) + .debug("Failed to add log4j ThreadContext span listener", e); } }