From c13cb2e60f77adee97b37a13e4076f490ee5822f Mon Sep 17 00:00:00 2001 From: Tyler Benson Date: Fri, 21 Feb 2020 16:18:52 -0800 Subject: [PATCH] Move a few other classes. --- .../java/datadog/trace/agent/tooling/AgentInstaller.java | 2 +- .../java/datadog/trace/agent/tooling/Instrumenter.java | 1 + .../trace/agent/tooling/bytebuddy/DDTransformers.java | 8 ++++---- .../agent/tooling/{ => bytebuddy}/ExceptionHandlers.java | 2 +- .../tooling/{ => bytebuddy}/GlobalIgnoresMatcher.java | 4 ++-- .../datadog/trace/agent/test/ExceptionHandlerTest.groovy | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) rename dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/{ => bytebuddy}/ExceptionHandlers.java (98%) rename dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/{ => bytebuddy}/GlobalIgnoresMatcher.java (97%) 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 63405cad6a..8dc101368d 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 @@ -1,7 +1,7 @@ package datadog.trace.agent.tooling; import static datadog.trace.agent.tooling.ClassLoaderMatcher.skipClassLoader; -import static datadog.trace.agent.tooling.GlobalIgnoresMatcher.globalIgnoresMatcher; +import static datadog.trace.agent.tooling.bytebuddy.GlobalIgnoresMatcher.globalIgnoresMatcher; import static net.bytebuddy.matcher.ElementMatchers.any; import static net.bytebuddy.matcher.ElementMatchers.nameStartsWith; import static net.bytebuddy.matcher.ElementMatchers.named; diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/Instrumenter.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/Instrumenter.java index 26550e07d0..f532086ae4 100644 --- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/Instrumenter.java +++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/Instrumenter.java @@ -7,6 +7,7 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.not; import datadog.trace.agent.tooling.bytebuddy.DDTransformers; +import datadog.trace.agent.tooling.bytebuddy.ExceptionHandlers; import datadog.trace.agent.tooling.context.FieldBackedProvider; import datadog.trace.agent.tooling.context.InstrumentationContextProvider; import datadog.trace.agent.tooling.context.NoopContextProvider; diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/DDTransformers.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/DDTransformers.java index e50ca8d3c9..371e286158 100644 --- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/DDTransformers.java +++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/DDTransformers.java @@ -12,10 +12,10 @@ public class DDTransformers { new AgentBuilder.Transformer() { @Override public DynamicType.Builder transform( - final DynamicType.Builder builder, - final TypeDescription typeDescription, - final ClassLoader classLoader, - final JavaModule javaModule) { + final DynamicType.Builder builder, + final TypeDescription typeDescription, + final ClassLoader classLoader, + final JavaModule javaModule) { return builder.visit(TypeConstantAdjustment.INSTANCE); } }; diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/ExceptionHandlers.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/ExceptionHandlers.java similarity index 98% rename from dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/ExceptionHandlers.java rename to dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/ExceptionHandlers.java index 49db4f099f..09a275113f 100644 --- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/ExceptionHandlers.java +++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/ExceptionHandlers.java @@ -1,4 +1,4 @@ -package datadog.trace.agent.tooling; +package datadog.trace.agent.tooling.bytebuddy; import datadog.trace.bootstrap.ExceptionLogger; import net.bytebuddy.ClassFileVersion; diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/GlobalIgnoresMatcher.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/GlobalIgnoresMatcher.java similarity index 97% rename from dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/GlobalIgnoresMatcher.java rename to dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/GlobalIgnoresMatcher.java index 39b4271705..9b727a1eb7 100644 --- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/GlobalIgnoresMatcher.java +++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/GlobalIgnoresMatcher.java @@ -1,4 +1,4 @@ -package datadog.trace.agent.tooling; +package datadog.trace.agent.tooling.bytebuddy; import java.util.regex.Pattern; import net.bytebuddy.build.HashCodeAndEqualsPlugin; @@ -6,7 +6,7 @@ import net.bytebuddy.description.type.TypeDescription; import net.bytebuddy.matcher.ElementMatcher; @HashCodeAndEqualsPlugin.Enhance -class GlobalIgnoresMatcher +public class GlobalIgnoresMatcher extends ElementMatcher.Junction.AbstractBase { private static final Pattern COM_MCHANGE_PROXY = diff --git a/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/test/ExceptionHandlerTest.groovy b/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/test/ExceptionHandlerTest.groovy index cedafaea29..ab440408c5 100644 --- a/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/test/ExceptionHandlerTest.groovy +++ b/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/test/ExceptionHandlerTest.groovy @@ -3,7 +3,7 @@ package datadog.trace.agent.test import ch.qos.logback.classic.Level import ch.qos.logback.classic.Logger import ch.qos.logback.core.read.ListAppender -import datadog.trace.agent.tooling.ExceptionHandlers +import datadog.trace.agent.tooling.bytebuddy.ExceptionHandlers import datadog.trace.bootstrap.ExceptionLogger import datadog.trace.util.test.DDSpecification import net.bytebuddy.agent.ByteBuddyAgent