diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/DatadogClassLoader.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/DatadogClassLoader.java index ee367d59905..7ac89dfafb5 100644 --- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/DatadogClassLoader.java +++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/DatadogClassLoader.java @@ -93,7 +93,9 @@ protected Enumeration findResources(String name) { @Override protected Class loadClass(String name, boolean resolve) throws ClassNotFoundException { if (name.startsWith("datadog.trace.instrumentation.") - && (name.endsWith("$Muzzle") || name.endsWith("Instrumentation"))) { + && (name.endsWith("$Muzzle") + || name.endsWith("Instrumentation") + || name.endsWith("Module"))) { InstrumentationClassLoader cl; if (null == (cl = instrumentationClassLoader.get())) { synchronized (instrumentationClassLoaderLock) { diff --git a/dd-java-agent/agent-builder/src/main/java/datadog/trace/agent/tooling/CombiningTransformerBuilder.java b/dd-java-agent/agent-builder/src/main/java/datadog/trace/agent/tooling/CombiningTransformerBuilder.java index 73656d7cc37..91aadc39b58 100644 --- a/dd-java-agent/agent-builder/src/main/java/datadog/trace/agent/tooling/CombiningTransformerBuilder.java +++ b/dd-java-agent/agent-builder/src/main/java/datadog/trace/agent/tooling/CombiningTransformerBuilder.java @@ -9,7 +9,6 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.namedOneOf; import static net.bytebuddy.matcher.ElementMatchers.not; -import datadog.trace.agent.tooling.Instrumenter.WithPostProcessor; import datadog.trace.agent.tooling.bytebuddy.ExceptionHandlers; import datadog.trace.agent.tooling.context.FieldBackedContextInjector; import datadog.trace.agent.tooling.context.FieldBackedContextMatcher; @@ -73,17 +72,12 @@ public final class CombiningTransformerBuilder private Map contextStore; private AgentBuilder.Transformer contextRequestRewriter; private HelperTransformer helperTransformer; + private Advice.PostProcessor.Factory postProcessor; private MuzzleCheck muzzle; // temporary buffer for collecting advice; reset for each instrumenter private final List advice = new ArrayList<>(); - /** - * Post processor to be applied to instrumenter advices if they implement {@link - * WithPostProcessor} - */ - private Advice.PostProcessor.Factory postProcessor; - public CombiningTransformerBuilder( AgentBuilder agentBuilder, InstrumenterIndex instrumenterIndex) { this.agentBuilder = agentBuilder; @@ -134,6 +128,8 @@ private void prepareInstrumentation(InstrumenterModule module, int instrumentati module.useAgentCodeSource(), module.getClass().getSimpleName(), helperClassNames) : null; + postProcessor = module.postProcessor(); + muzzle = new MuzzleCheck(module, instrumentationId); } @@ -208,9 +204,6 @@ private void buildTypeMatcher(Instrumenter member, int transformationId) { private void buildTypeAdvice(Instrumenter member, int transformationId) { - postProcessor = - member instanceof WithPostProcessor ? ((WithPostProcessor) member).postProcessor() : null; - if (null != helperTransformer) { advice.add(helperTransformer); } diff --git a/dd-java-agent/agent-builder/src/test/groovy/datadog/trace/agent/test/DefaultInstrumenterForkedTest.groovy b/dd-java-agent/agent-builder/src/test/groovy/datadog/trace/agent/test/DefaultInstrumenterForkedTest.groovy index e97061bc899..eb448819bd2 100644 --- a/dd-java-agent/agent-builder/src/test/groovy/datadog/trace/agent/test/DefaultInstrumenterForkedTest.groovy +++ b/dd-java-agent/agent-builder/src/test/groovy/datadog/trace/agent/test/DefaultInstrumenterForkedTest.groovy @@ -141,8 +141,5 @@ class DefaultInstrumenterForkedTest extends DDSpecification { TestDefaultInstrumenter(String instrumentationName, String additionalName) { super(instrumentationName, [additionalName] as String[]) } - - @Override - void methodAdvice(MethodTransformer transformer) {} } } 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 cc724a488d7..a92fb326bd4 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 @@ -5,7 +5,6 @@ import java.security.ProtectionDomain; import java.util.Collection; -import net.bytebuddy.asm.Advice; import net.bytebuddy.asm.AsmVisitorWrapper; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.description.type.TypeDescription; @@ -82,11 +81,6 @@ interface WithTypeStructure { ElementMatcher structureMatcher(); } - /** Instrumentation that wants to apply additional structure checks after type matching. */ - interface WithPostProcessor { - Advice.PostProcessor.Factory postProcessor(); - } - /** Instrumentation that provides advice which affects the whole type. */ interface HasTypeAdvice extends Instrumenter { /** diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterModule.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterModule.java index 253eacc8331..9a6d0d0b35f 100644 --- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterModule.java +++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterModule.java @@ -156,6 +156,11 @@ public ElementMatcher methodIgnoreMatcher() { return isSynthetic(); } + /** Override this to post-process the operand stack of any transformed methods. */ + public Advice.PostProcessor.Factory postProcessor() { + return null; + } + /** * Context stores to define for this instrumentation. Are added to matching class loaders. * @@ -191,7 +196,7 @@ protected final boolean isShortcutMatchingEnabled(boolean defaultToShortcut) { } /** Parent class for all tracing related instrumentations */ - public abstract static class Tracing extends InstrumenterModule implements HasMethodAdvice { + public abstract static class Tracing extends InstrumenterModule { public Tracing(String instrumentationName, String... additionalNames) { super(instrumentationName, additionalNames); } @@ -203,7 +208,7 @@ public boolean isApplicable(Set enabledSystems) { } /** Parent class for all profiling related instrumentations */ - public abstract static class Profiling extends InstrumenterModule implements HasMethodAdvice { + public abstract static class Profiling extends InstrumenterModule { public Profiling(String instrumentationName, String... additionalNames) { super(instrumentationName, additionalNames); } @@ -222,7 +227,7 @@ public boolean isEnabled() { } /** Parent class for all AppSec related instrumentations */ - public abstract static class AppSec extends InstrumenterModule implements HasMethodAdvice { + public abstract static class AppSec extends InstrumenterModule { public AppSec(String instrumentationName, String... additionalNames) { super(instrumentationName, additionalNames); } @@ -235,8 +240,7 @@ public boolean isApplicable(Set enabledSystems) { /** Parent class for all IAST related instrumentations */ @SuppressForbidden - public abstract static class Iast extends InstrumenterModule - implements HasMethodAdvice, WithPostProcessor { + public abstract static class Iast extends InstrumenterModule { public Iast(String instrumentationName, String... additionalNames) { super(instrumentationName, additionalNames); } @@ -291,7 +295,7 @@ protected boolean isOptOutEnabled() { } /** Parent class for all USM related instrumentations */ - public abstract static class Usm extends InstrumenterModule implements HasMethodAdvice { + public abstract static class Usm extends InstrumenterModule { public Usm(String instrumentationName, String... additionalNames) { super(instrumentationName, additionalNames); } @@ -303,7 +307,7 @@ public boolean isApplicable(Set enabledSystems) { } /** Parent class for all CI related instrumentations */ - public abstract static class CiVisibility extends InstrumenterModule implements HasMethodAdvice { + public abstract static class CiVisibility extends InstrumenterModule { public CiVisibility(String instrumentationName, String... additionalNames) { super(instrumentationName, additionalNames); } diff --git a/dd-java-agent/instrumentation/aerospike-4/src/main/java/datadog/trace/instrumentation/aerospike4/AerospikeClientInstrumentation.java b/dd-java-agent/instrumentation/aerospike-4/src/main/java/datadog/trace/instrumentation/aerospike4/AerospikeClientInstrumentation.java index 3aac0208df5..e8ce5a986b8 100644 --- a/dd-java-agent/instrumentation/aerospike-4/src/main/java/datadog/trace/instrumentation/aerospike4/AerospikeClientInstrumentation.java +++ b/dd-java-agent/instrumentation/aerospike-4/src/main/java/datadog/trace/instrumentation/aerospike4/AerospikeClientInstrumentation.java @@ -17,7 +17,7 @@ @AutoService(InstrumenterModule.class) public final class AerospikeClientInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public AerospikeClientInstrumentation() { super("aerospike"); } diff --git a/dd-java-agent/instrumentation/aerospike-4/src/main/java/datadog/trace/instrumentation/aerospike4/CommandInstrumentation.java b/dd-java-agent/instrumentation/aerospike-4/src/main/java/datadog/trace/instrumentation/aerospike4/CommandInstrumentation.java index ac314b78bbe..f7cccf9c0bf 100644 --- a/dd-java-agent/instrumentation/aerospike-4/src/main/java/datadog/trace/instrumentation/aerospike4/CommandInstrumentation.java +++ b/dd-java-agent/instrumentation/aerospike-4/src/main/java/datadog/trace/instrumentation/aerospike4/CommandInstrumentation.java @@ -19,7 +19,7 @@ @AutoService(InstrumenterModule.class) public final class CommandInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public CommandInstrumentation() { super("aerospike"); } diff --git a/dd-java-agent/instrumentation/aerospike-4/src/main/java/datadog/trace/instrumentation/aerospike4/NioEventLoopInstrumentation.java b/dd-java-agent/instrumentation/aerospike-4/src/main/java/datadog/trace/instrumentation/aerospike4/NioEventLoopInstrumentation.java index 33320205ede..bf6f4d82790 100644 --- a/dd-java-agent/instrumentation/aerospike-4/src/main/java/datadog/trace/instrumentation/aerospike4/NioEventLoopInstrumentation.java +++ b/dd-java-agent/instrumentation/aerospike-4/src/main/java/datadog/trace/instrumentation/aerospike4/NioEventLoopInstrumentation.java @@ -16,7 +16,7 @@ @AutoService(InstrumenterModule.class) public final class NioEventLoopInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public NioEventLoopInstrumentation() { super("aerospike", "java_concurrent"); } diff --git a/dd-java-agent/instrumentation/aerospike-4/src/main/java/datadog/trace/instrumentation/aerospike4/PartitionInstrumentation.java b/dd-java-agent/instrumentation/aerospike-4/src/main/java/datadog/trace/instrumentation/aerospike4/PartitionInstrumentation.java index c34471f495e..d80057b0ff7 100644 --- a/dd-java-agent/instrumentation/aerospike-4/src/main/java/datadog/trace/instrumentation/aerospike4/PartitionInstrumentation.java +++ b/dd-java-agent/instrumentation/aerospike-4/src/main/java/datadog/trace/instrumentation/aerospike4/PartitionInstrumentation.java @@ -20,7 +20,7 @@ @AutoService(InstrumenterModule.class) public final class PartitionInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public PartitionInstrumentation() { super("aerospike"); } diff --git a/dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaActorCellInstrumentation.java b/dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaActorCellInstrumentation.java index 2a565178312..e2f260b6754 100644 --- a/dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaActorCellInstrumentation.java +++ b/dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaActorCellInstrumentation.java @@ -21,7 +21,7 @@ @AutoService(InstrumenterModule.class) public class AkkaActorCellInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public AkkaActorCellInstrumentation() { super("akka_actor_receive", "akka_actor", "akka_concurrent", "java_concurrent"); diff --git a/dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaEnvelopeInstrumentation.java b/dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaEnvelopeInstrumentation.java index 498795c1175..97d21f4b0b3 100644 --- a/dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaEnvelopeInstrumentation.java +++ b/dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaEnvelopeInstrumentation.java @@ -15,7 +15,7 @@ @AutoService(InstrumenterModule.class) public class AkkaEnvelopeInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public AkkaEnvelopeInstrumentation() { super("akka_actor_send", "akka_actor", "akka_concurrent", "java_concurrent"); diff --git a/dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaForkJoinExecutorTaskInstrumentation.java b/dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaForkJoinExecutorTaskInstrumentation.java index 9dc98b20fb4..a01d9e95cb3 100644 --- a/dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaForkJoinExecutorTaskInstrumentation.java +++ b/dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaForkJoinExecutorTaskInstrumentation.java @@ -25,7 +25,7 @@ */ @AutoService(InstrumenterModule.class) public final class AkkaForkJoinExecutorTaskInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public AkkaForkJoinExecutorTaskInstrumentation() { super("java_concurrent", "akka_concurrent"); } diff --git a/dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaForkJoinPoolInstrumentation.java b/dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaForkJoinPoolInstrumentation.java index 9e9f139529d..434a446eba9 100644 --- a/dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaForkJoinPoolInstrumentation.java +++ b/dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaForkJoinPoolInstrumentation.java @@ -19,7 +19,7 @@ @AutoService(InstrumenterModule.class) public final class AkkaForkJoinPoolInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public AkkaForkJoinPoolInstrumentation() { super("java_concurrent", "akka_concurrent"); diff --git a/dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaForkJoinTaskInstrumentation.java b/dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaForkJoinTaskInstrumentation.java index 7bc2d7e1756..8a11d44b38f 100644 --- a/dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaForkJoinTaskInstrumentation.java +++ b/dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaForkJoinTaskInstrumentation.java @@ -39,7 +39,7 @@ */ @AutoService(InstrumenterModule.class) public final class AkkaForkJoinTaskInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy, ExcludeFilterProvider { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice, ExcludeFilterProvider { public AkkaForkJoinTaskInstrumentation() { super("java_concurrent", "akka_concurrent"); diff --git a/dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaMailboxInstrumentation.java b/dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaMailboxInstrumentation.java index ae29ad1ab51..c72405ce7e7 100644 --- a/dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaMailboxInstrumentation.java +++ b/dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaMailboxInstrumentation.java @@ -22,7 +22,7 @@ @AutoService(InstrumenterModule.class) public class AkkaMailboxInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType, ExcludeFilterProvider { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, ExcludeFilterProvider { public AkkaMailboxInstrumentation() { super("akka_actor_mailbox", "akka_actor", "akka_concurrent", "java_concurrent"); diff --git a/dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaRoutedActorCellInstrumentation.java b/dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaRoutedActorCellInstrumentation.java index e7918541f4a..621cb2d4740 100644 --- a/dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaRoutedActorCellInstrumentation.java +++ b/dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaRoutedActorCellInstrumentation.java @@ -19,7 +19,7 @@ @AutoService(InstrumenterModule.class) public class AkkaRoutedActorCellInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public AkkaRoutedActorCellInstrumentation() { super("akka_actor_send", "akka_actor", "akka_concurrent", "java_concurrent"); diff --git a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttp2ServerInstrumentation.java b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttp2ServerInstrumentation.java index ee476ed638a..169cb3dbbc0 100644 --- a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttp2ServerInstrumentation.java +++ b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttp2ServerInstrumentation.java @@ -22,7 +22,7 @@ */ @AutoService(InstrumenterModule.class) public final class AkkaHttp2ServerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public AkkaHttp2ServerInstrumentation() { super("akka-http2", "akka-http", "akka-http-server"); } diff --git a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpServerInstrumentation.java b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpServerInstrumentation.java index 5d5b3e05f19..0f2649fbc3a 100644 --- a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpServerInstrumentation.java +++ b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpServerInstrumentation.java @@ -51,7 +51,7 @@ */ @AutoService(InstrumenterModule.class) public final class AkkaHttpServerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public AkkaHttpServerInstrumentation() { super("akka-http", "akka-http-server"); } diff --git a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpSingleRequestInstrumentation.java b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpSingleRequestInstrumentation.java index 08fce4d798d..ed5c35e7ced 100644 --- a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpSingleRequestInstrumentation.java +++ b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpSingleRequestInstrumentation.java @@ -24,7 +24,7 @@ @AutoService(InstrumenterModule.class) public final class AkkaHttpSingleRequestInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public AkkaHttpSingleRequestInstrumentation() { super("akka-http", "akka-http-client"); } diff --git a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaPoolMasterActorInstrumentation.java b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaPoolMasterActorInstrumentation.java index 090052baad6..83e7a74a3e2 100644 --- a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaPoolMasterActorInstrumentation.java +++ b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaPoolMasterActorInstrumentation.java @@ -12,7 +12,7 @@ @AutoService(InstrumenterModule.class) public final class AkkaPoolMasterActorInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public AkkaPoolMasterActorInstrumentation() { super("akka-http", "akka-http-client"); } diff --git a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DefaultExceptionHandlerInstrumentation.java b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DefaultExceptionHandlerInstrumentation.java index b6a0df5e865..dc9e6f1376f 100644 --- a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DefaultExceptionHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DefaultExceptionHandlerInstrumentation.java @@ -15,7 +15,7 @@ @AutoService(InstrumenterModule.class) public class DefaultExceptionHandlerInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public DefaultExceptionHandlerInstrumentation() { super("akka-http", "akka-http-server"); } diff --git a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/Bug4304Instrumentation.java b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/Bug4304Instrumentation.java index 2cf88dd0a66..b185117f882 100644 --- a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/Bug4304Instrumentation.java +++ b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/Bug4304Instrumentation.java @@ -25,7 +25,9 @@ /** See https://github.com/akka/akka-http/issues/4304 */ @AutoService(InstrumenterModule.class) public class Bug4304Instrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForTypeHierarchy, Instrumenter.WithTypeStructure { + implements Instrumenter.ForTypeHierarchy, + Instrumenter.WithTypeStructure, + Instrumenter.HasMethodAdvice { public Bug4304Instrumentation() { super("akka-http"); } diff --git a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/ConfigProvideRemoteAddressHeaderInstrumentation.java b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/ConfigProvideRemoteAddressHeaderInstrumentation.java index 5a5dad2df3d..c11da33cf64 100644 --- a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/ConfigProvideRemoteAddressHeaderInstrumentation.java +++ b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/ConfigProvideRemoteAddressHeaderInstrumentation.java @@ -13,7 +13,7 @@ @AutoService(InstrumenterModule.class) public class ConfigProvideRemoteAddressHeaderInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ConfigProvideRemoteAddressHeaderInstrumentation() { super("akka-http"); } diff --git a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/FormDataToStrictInstrumentation.java b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/FormDataToStrictInstrumentation.java index 4c12b37ca66..d5ec4773986 100644 --- a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/FormDataToStrictInstrumentation.java +++ b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/FormDataToStrictInstrumentation.java @@ -18,7 +18,9 @@ /** @see akka.http.scaladsl.model.Multipart.FormData#toStrict(FiniteDuration, Materializer) */ @AutoService(InstrumenterModule.class) public class FormDataToStrictInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType, ScalaListCollectorMuzzleReferences { + implements Instrumenter.ForSingleType, + Instrumenter.HasMethodAdvice, + ScalaListCollectorMuzzleReferences { public FormDataToStrictInstrumentation() { super("akka-http"); } diff --git a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/JacksonUnmarshallerInstrumentation.java b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/JacksonUnmarshallerInstrumentation.java index e4bbf192564..3901cd579bf 100644 --- a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/JacksonUnmarshallerInstrumentation.java +++ b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/JacksonUnmarshallerInstrumentation.java @@ -16,7 +16,7 @@ @AutoService(InstrumenterModule.class) public class JacksonUnmarshallerInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public JacksonUnmarshallerInstrumentation() { super("akka-http"); diff --git a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/MultipartUnmarshallersInstrumentation.java b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/MultipartUnmarshallersInstrumentation.java index eb409e82e5c..af45bde0fc9 100644 --- a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/MultipartUnmarshallersInstrumentation.java +++ b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/MultipartUnmarshallersInstrumentation.java @@ -14,7 +14,7 @@ /** @see MultipartUnmarshallers */ @AutoService(InstrumenterModule.class) public class MultipartUnmarshallersInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { private static final String TRAIT_NAME = "akka.http.scaladsl.unmarshalling.MultipartUnmarshallers"; diff --git a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/PredefinedFromEntityUnmarshallersInstrumentation.java b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/PredefinedFromEntityUnmarshallersInstrumentation.java index 19111b6c002..efd4b95c30b 100644 --- a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/PredefinedFromEntityUnmarshallersInstrumentation.java +++ b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/PredefinedFromEntityUnmarshallersInstrumentation.java @@ -20,7 +20,7 @@ */ @AutoService(InstrumenterModule.class) public class PredefinedFromEntityUnmarshallersInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { private static final String TRAIT_NAME = "akka.http.scaladsl.unmarshalling.PredefinedFromEntityUnmarshallers"; diff --git a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/SprayUnmarshallerInstrumentation.java b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/SprayUnmarshallerInstrumentation.java index 2bf74a24a2d..6b7212f2a5b 100644 --- a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/SprayUnmarshallerInstrumentation.java +++ b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/SprayUnmarshallerInstrumentation.java @@ -14,7 +14,7 @@ // TODO: move to separate module and have better support @AutoService(InstrumenterModule.class) public class SprayUnmarshallerInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { private static final String TRAIT_NAME = "akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport"; diff --git a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/StrictFormCompanionInstrumentation.java b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/StrictFormCompanionInstrumentation.java index f2f1a34b402..f9d87fbe954 100644 --- a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/StrictFormCompanionInstrumentation.java +++ b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/StrictFormCompanionInstrumentation.java @@ -20,7 +20,7 @@ /** @see akka.http.scaladsl.common.StrictForm$#unmarshaller(Unmarshaller, Unmarshaller) */ @AutoService(InstrumenterModule.class) public class StrictFormCompanionInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public StrictFormCompanionInstrumentation() { super("akka-http"); } diff --git a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/CookieDirectivesInstrumentation.java b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/CookieDirectivesInstrumentation.java index 686770c0faf..2e6f61d7088 100644 --- a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/CookieDirectivesInstrumentation.java +++ b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/CookieDirectivesInstrumentation.java @@ -22,7 +22,7 @@ */ @AutoService(InstrumenterModule.class) public class CookieDirectivesInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public CookieDirectivesInstrumentation() { super("akka-http"); } diff --git a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/CookieHeaderInstrumentation.java b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/CookieHeaderInstrumentation.java index 5539fb450c6..1a0b5a1a5ff 100644 --- a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/CookieHeaderInstrumentation.java +++ b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/CookieHeaderInstrumentation.java @@ -33,7 +33,7 @@ */ @AutoService(InstrumenterModule.class) public class CookieHeaderInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public CookieHeaderInstrumentation() { super("akka-http"); } diff --git a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/ExtractDirectivesInstrumentation.java b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/ExtractDirectivesInstrumentation.java index cba9073952a..306a8bfea0d 100644 --- a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/ExtractDirectivesInstrumentation.java +++ b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/ExtractDirectivesInstrumentation.java @@ -34,7 +34,7 @@ */ @AutoService(InstrumenterModule.class) public class ExtractDirectivesInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public ExtractDirectivesInstrumentation() { super("akka-http"); } diff --git a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/FormDataInstrumentation.java b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/FormDataInstrumentation.java index 86812564222..3f83982bf34 100644 --- a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/FormDataInstrumentation.java +++ b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/FormDataInstrumentation.java @@ -20,7 +20,7 @@ */ @AutoService(InstrumenterModule.class) public class FormDataInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public FormDataInstrumentation() { super("akka-http"); } diff --git a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/FormFieldDirectivesInstrumentation.java b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/FormFieldDirectivesInstrumentation.java index 6e4839f4400..90d2587fd87 100644 --- a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/FormFieldDirectivesInstrumentation.java +++ b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/FormFieldDirectivesInstrumentation.java @@ -30,7 +30,7 @@ */ @AutoService(InstrumenterModule.class) public class FormFieldDirectivesInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { private static final String TRAIT_CLASS = "akka.http.scaladsl.server.directives.FormFieldDirectives"; diff --git a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/HttpHeaderSubclassesInstrumentation.java b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/HttpHeaderSubclassesInstrumentation.java index e87100071cc..a102830d10b 100644 --- a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/HttpHeaderSubclassesInstrumentation.java +++ b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/HttpHeaderSubclassesInstrumentation.java @@ -34,7 +34,7 @@ */ @AutoService(InstrumenterModule.class) public class HttpHeaderSubclassesInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public HttpHeaderSubclassesInstrumentation() { super("akka-http"); } diff --git a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/HttpRequestInstrumentation.java b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/HttpRequestInstrumentation.java index 49553f13bcb..b9ae249e0d1 100644 --- a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/HttpRequestInstrumentation.java +++ b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/HttpRequestInstrumentation.java @@ -36,7 +36,7 @@ */ @AutoService(InstrumenterModule.class) public class HttpRequestInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public HttpRequestInstrumentation() { super("akka-http"); } diff --git a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/MakeTaintableInstrumentation.java b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/MakeTaintableInstrumentation.java index 083db5873c2..a5608c48110 100644 --- a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/MakeTaintableInstrumentation.java +++ b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/MakeTaintableInstrumentation.java @@ -35,7 +35,4 @@ public String[] knownMatchingTypes() { public void typeAdvice(TypeTransformer transformer) { transformer.applyAdvice(new TaintableVisitor(knownMatchingTypes())); } - - @Override - public void methodAdvice(MethodTransformer transformer) {} } diff --git a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/MarshallingDirectivesInstrumentation.java b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/MarshallingDirectivesInstrumentation.java index 99080629116..c76903ed185 100644 --- a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/MarshallingDirectivesInstrumentation.java +++ b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/MarshallingDirectivesInstrumentation.java @@ -28,7 +28,7 @@ */ @AutoService(InstrumenterModule.class) public class MarshallingDirectivesInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public MarshallingDirectivesInstrumentation() { super("akka-http"); diff --git a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/ParameterDirectivesInstrumentation.java b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/ParameterDirectivesInstrumentation.java index 2be7f960fad..f51328e4312 100644 --- a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/ParameterDirectivesInstrumentation.java +++ b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/ParameterDirectivesInstrumentation.java @@ -30,7 +30,7 @@ */ @AutoService(InstrumenterModule.class) public class ParameterDirectivesInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { private static final String TRAIT_NAME = "akka.http.scaladsl.server.directives.ParameterDirectives"; diff --git a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/PathMatcherInstrumentation.java b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/PathMatcherInstrumentation.java index f3b26731b54..021c9f4df57 100644 --- a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/PathMatcherInstrumentation.java +++ b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/PathMatcherInstrumentation.java @@ -25,7 +25,7 @@ */ @AutoService(InstrumenterModule.class) public class PathMatcherInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public PathMatcherInstrumentation() { super("akka-http"); } diff --git a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/RequestContextInstrumentation.java b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/RequestContextInstrumentation.java index 90e897fcc7b..34b9e7a1490 100644 --- a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/RequestContextInstrumentation.java +++ b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/RequestContextInstrumentation.java @@ -25,7 +25,7 @@ /** Propagates taint when fetching the {@link HttpRequest} from the {@link RequestContext}. */ @AutoService(InstrumenterModule.class) public class RequestContextInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public RequestContextInstrumentation() { super("akka-http"); } diff --git a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/UnmarshallerInstrumentation.java b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/UnmarshallerInstrumentation.java index c09bd706b03..18884358437 100644 --- a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/UnmarshallerInstrumentation.java +++ b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/UnmarshallerInstrumentation.java @@ -34,7 +34,7 @@ */ @AutoService(InstrumenterModule.class) public class UnmarshallerInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public UnmarshallerInstrumentation() { super("akka-http"); } diff --git a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/UriInstrumentation.java b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/UriInstrumentation.java index 33ab666f6c3..1c178dfbd5d 100644 --- a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/UriInstrumentation.java +++ b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/UriInstrumentation.java @@ -29,7 +29,7 @@ /** Propagates taint from a {@link Uri} to query strings fetched from it. */ @AutoService(InstrumenterModule.class) public class UriInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public UriInstrumentation() { super("akka-http"); } diff --git a/dd-java-agent/instrumentation/akka-http/akka-http-10.2-iast/src/main/java/datadog/trace/instrumentation/akkahttp102/iast/ParameterDirectivesImplInstrumentation.java b/dd-java-agent/instrumentation/akka-http/akka-http-10.2-iast/src/main/java/datadog/trace/instrumentation/akkahttp102/iast/ParameterDirectivesImplInstrumentation.java index 52804298683..55ce72a8e26 100644 --- a/dd-java-agent/instrumentation/akka-http/akka-http-10.2-iast/src/main/java/datadog/trace/instrumentation/akkahttp102/iast/ParameterDirectivesImplInstrumentation.java +++ b/dd-java-agent/instrumentation/akka-http/akka-http-10.2-iast/src/main/java/datadog/trace/instrumentation/akkahttp102/iast/ParameterDirectivesImplInstrumentation.java @@ -26,7 +26,7 @@ @AutoService(InstrumenterModule.class) public class ParameterDirectivesImplInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ParameterDirectivesImplInstrumentation() { super("akka-http"); } diff --git a/dd-java-agent/instrumentation/akka-http/akka-http-10.6/src/main/java/datadog/trace/instrumentation/akkahttp106/AkkaHttpSingleRequestInstrumentation.java b/dd-java-agent/instrumentation/akka-http/akka-http-10.6/src/main/java/datadog/trace/instrumentation/akkahttp106/AkkaHttpSingleRequestInstrumentation.java index 688a9f06475..7d7596befaa 100644 --- a/dd-java-agent/instrumentation/akka-http/akka-http-10.6/src/main/java/datadog/trace/instrumentation/akkahttp106/AkkaHttpSingleRequestInstrumentation.java +++ b/dd-java-agent/instrumentation/akka-http/akka-http-10.6/src/main/java/datadog/trace/instrumentation/akkahttp106/AkkaHttpSingleRequestInstrumentation.java @@ -9,7 +9,7 @@ @AutoService(InstrumenterModule.class) public final class AkkaHttpSingleRequestInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public AkkaHttpSingleRequestInstrumentation() { super("akka-http", "akka-http-client"); } diff --git a/dd-java-agent/instrumentation/akka-init/src/main/java/datadog/trace/instrumentation/akka/init/DisableTracingActorInitInstrumentation.java b/dd-java-agent/instrumentation/akka-init/src/main/java/datadog/trace/instrumentation/akka/init/DisableTracingActorInitInstrumentation.java index 47898a87caf..835f8664ed1 100644 --- a/dd-java-agent/instrumentation/akka-init/src/main/java/datadog/trace/instrumentation/akka/init/DisableTracingActorInitInstrumentation.java +++ b/dd-java-agent/instrumentation/akka-init/src/main/java/datadog/trace/instrumentation/akka/init/DisableTracingActorInitInstrumentation.java @@ -13,7 +13,7 @@ @AutoService(InstrumenterModule.class) public final class DisableTracingActorInitInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public DisableTracingActorInitInstrumentation() { super("akka_concurrent"); diff --git a/dd-java-agent/instrumentation/apache-httpasyncclient-4/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentation.java b/dd-java-agent/instrumentation/apache-httpasyncclient-4/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentation.java index 975c85b4b31..56a86d1b70d 100644 --- a/dd-java-agent/instrumentation/apache-httpasyncclient-4/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentation.java +++ b/dd-java-agent/instrumentation/apache-httpasyncclient-4/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentation.java @@ -24,7 +24,7 @@ @AutoService(InstrumenterModule.class) public class ApacheHttpAsyncClientInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.CanShortcutTypeMatching { + implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice { public ApacheHttpAsyncClientInstrumentation() { super("httpasyncclient", "apache-httpasyncclient"); diff --git a/dd-java-agent/instrumentation/apache-httpasyncclient-4/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpClientRedirectInstrumentation.java b/dd-java-agent/instrumentation/apache-httpasyncclient-4/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpClientRedirectInstrumentation.java index 008d902df53..8f993bb028c 100644 --- a/dd-java-agent/instrumentation/apache-httpasyncclient-4/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpClientRedirectInstrumentation.java +++ b/dd-java-agent/instrumentation/apache-httpasyncclient-4/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpClientRedirectInstrumentation.java @@ -26,7 +26,7 @@ */ @AutoService(InstrumenterModule.class) public class ApacheHttpClientRedirectInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public ApacheHttpClientRedirectInstrumentation() { super("httpasyncclient", "apache-httpasyncclient", "httpclient-redirect"); diff --git a/dd-java-agent/instrumentation/apache-httpasyncclient-4/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/BasicFutureInstrumentation.java b/dd-java-agent/instrumentation/apache-httpasyncclient-4/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/BasicFutureInstrumentation.java index 7a4ed46525b..eb7fa5bd156 100644 --- a/dd-java-agent/instrumentation/apache-httpasyncclient-4/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/BasicFutureInstrumentation.java +++ b/dd-java-agent/instrumentation/apache-httpasyncclient-4/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/BasicFutureInstrumentation.java @@ -18,7 +18,9 @@ @AutoService(InstrumenterModule.class) public final class BasicFutureInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType, Instrumenter.WithTypeStructure { + implements Instrumenter.ForSingleType, + Instrumenter.WithTypeStructure, + Instrumenter.HasMethodAdvice { public BasicFutureInstrumentation() { super("httpasyncclient", "apache-httpasyncclient"); } diff --git a/dd-java-agent/instrumentation/apache-httpclient-4/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java b/dd-java-agent/instrumentation/apache-httpclient-4/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java index 157dab1824d..9cde4c7a2df 100644 --- a/dd-java-agent/instrumentation/apache-httpclient-4/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java +++ b/dd-java-agent/instrumentation/apache-httpclient-4/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java @@ -22,7 +22,7 @@ @AutoService(InstrumenterModule.class) public class ApacheHttpClientInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.CanShortcutTypeMatching { + implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice { static final String[] MATCHING_TYPES = new String[] { diff --git a/dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpAsyncClientInstrumentation.java b/dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpAsyncClientInstrumentation.java index a40cb2b2acc..a6b6b3a1d24 100644 --- a/dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpAsyncClientInstrumentation.java +++ b/dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpAsyncClientInstrumentation.java @@ -25,7 +25,7 @@ @AutoService(InstrumenterModule.class) public class ApacheHttpAsyncClientInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.CanShortcutTypeMatching { + implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice { public ApacheHttpAsyncClientInstrumentation() { super( diff --git a/dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpClientInstrumentation.java b/dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpClientInstrumentation.java index a62d439fa61..051b5305771 100644 --- a/dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpClientInstrumentation.java +++ b/dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpClientInstrumentation.java @@ -22,7 +22,7 @@ @AutoService(InstrumenterModule.class) public class ApacheHttpClientInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.CanShortcutTypeMatching { + implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice { public ApacheHttpClientInstrumentation() { super( diff --git a/dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/IastHttpUriRequestBaseInstrumentation.java b/dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/IastHttpUriRequestBaseInstrumentation.java index d5e9c0b0f3c..12fece51ef2 100644 --- a/dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/IastHttpUriRequestBaseInstrumentation.java +++ b/dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/IastHttpUriRequestBaseInstrumentation.java @@ -16,7 +16,9 @@ @AutoService(InstrumenterModule.class) public class IastHttpUriRequestBaseInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType, Instrumenter.HasTypeAdvice { + implements Instrumenter.ForSingleType, + Instrumenter.HasTypeAdvice, + Instrumenter.HasMethodAdvice { public IastHttpUriRequestBaseInstrumentation() { super("apache-httpclient", "httpclient5"); diff --git a/dd-java-agent/instrumentation/apache-httpcore-4/src/main/java/datadog/trace/instrumentation/apachehttpcore/IastHttpHostInstrumentation.java b/dd-java-agent/instrumentation/apache-httpcore-4/src/main/java/datadog/trace/instrumentation/apachehttpcore/IastHttpHostInstrumentation.java index e4a6a223601..07be588f80c 100644 --- a/dd-java-agent/instrumentation/apache-httpcore-4/src/main/java/datadog/trace/instrumentation/apachehttpcore/IastHttpHostInstrumentation.java +++ b/dd-java-agent/instrumentation/apache-httpcore-4/src/main/java/datadog/trace/instrumentation/apachehttpcore/IastHttpHostInstrumentation.java @@ -16,7 +16,7 @@ @AutoService(InstrumenterModule.class) public class IastHttpHostInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public IastHttpHostInstrumentation() { super("httpcore", "apache-httpcore", "apache-http-core"); diff --git a/dd-java-agent/instrumentation/apache-httpcore-5/src/main/java/datadog/trace/instrumentation/apachehttpcore5/IastHttpHostInstrumentation.java b/dd-java-agent/instrumentation/apache-httpcore-5/src/main/java/datadog/trace/instrumentation/apachehttpcore5/IastHttpHostInstrumentation.java index 67bb5f83a5a..b91db12ad39 100644 --- a/dd-java-agent/instrumentation/apache-httpcore-5/src/main/java/datadog/trace/instrumentation/apachehttpcore5/IastHttpHostInstrumentation.java +++ b/dd-java-agent/instrumentation/apache-httpcore-5/src/main/java/datadog/trace/instrumentation/apachehttpcore5/IastHttpHostInstrumentation.java @@ -14,7 +14,7 @@ @AutoService(InstrumenterModule.class) public class IastHttpHostInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public IastHttpHostInstrumentation() { super("httpcore-5", "apache-httpcore-5", "apache-http-core-5"); diff --git a/dd-java-agent/instrumentation/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ArmeriaMessageDeframerInstrumentation.java b/dd-java-agent/instrumentation/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ArmeriaMessageDeframerInstrumentation.java index 15b11951e60..70524d4e52a 100644 --- a/dd-java-agent/instrumentation/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ArmeriaMessageDeframerInstrumentation.java +++ b/dd-java-agent/instrumentation/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ArmeriaMessageDeframerInstrumentation.java @@ -23,7 +23,7 @@ @AutoService(InstrumenterModule.class) public class ArmeriaMessageDeframerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public ArmeriaMessageDeframerInstrumentation() { super("armeria-grpc-client", "armeria-grpc", "armeria", "grpc-client", "grpc"); } diff --git a/dd-java-agent/instrumentation/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ClientCallImplInstrumentation.java b/dd-java-agent/instrumentation/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ClientCallImplInstrumentation.java index f5e70e8e9e5..7c44904aa0c 100644 --- a/dd-java-agent/instrumentation/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ClientCallImplInstrumentation.java +++ b/dd-java-agent/instrumentation/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ClientCallImplInstrumentation.java @@ -35,7 +35,7 @@ @AutoService(InstrumenterModule.class) public final class ClientCallImplInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ClientCallImplInstrumentation() { super("armeria-grpc-client", "armeria-grpc", "armeria", "grpc-client", "grpc"); diff --git a/dd-java-agent/instrumentation/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/HandlerRegistryBuilderInstrumentation.java b/dd-java-agent/instrumentation/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/HandlerRegistryBuilderInstrumentation.java index c6b318b497d..3c3f9e3a0ca 100644 --- a/dd-java-agent/instrumentation/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/HandlerRegistryBuilderInstrumentation.java +++ b/dd-java-agent/instrumentation/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/HandlerRegistryBuilderInstrumentation.java @@ -14,7 +14,7 @@ @AutoService(InstrumenterModule.class) public class HandlerRegistryBuilderInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public HandlerRegistryBuilderInstrumentation() { super("armeria-grpc-server", "armeria-grpc", "armeria", "grpc-server", "grpc"); } diff --git a/dd-java-agent/instrumentation/armeria-jetty/src/main/java/datadog/trace/instrumentation/armeria/jetty/ArmeriaHttpConnectionInstrumentation.java b/dd-java-agent/instrumentation/armeria-jetty/src/main/java/datadog/trace/instrumentation/armeria/jetty/ArmeriaHttpConnectionInstrumentation.java index c27711a3033..d6128ce2235 100644 --- a/dd-java-agent/instrumentation/armeria-jetty/src/main/java/datadog/trace/instrumentation/armeria/jetty/ArmeriaHttpConnectionInstrumentation.java +++ b/dd-java-agent/instrumentation/armeria-jetty/src/main/java/datadog/trace/instrumentation/armeria/jetty/ArmeriaHttpConnectionInstrumentation.java @@ -13,7 +13,7 @@ @AutoService(InstrumenterModule.class) public class ArmeriaHttpConnectionInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ArmeriaHttpConnectionInstrumentation() { super("armeria-jetty", "armeria"); } diff --git a/dd-java-agent/instrumentation/armeria-jetty/src/main/java/datadog/trace/instrumentation/armeria/jetty/ArmeriaJettyInstrumentation.java b/dd-java-agent/instrumentation/armeria-jetty/src/main/java/datadog/trace/instrumentation/armeria/jetty/ArmeriaJettyInstrumentation.java index d8447e88080..89f85cdfdf3 100644 --- a/dd-java-agent/instrumentation/armeria-jetty/src/main/java/datadog/trace/instrumentation/armeria/jetty/ArmeriaJettyInstrumentation.java +++ b/dd-java-agent/instrumentation/armeria-jetty/src/main/java/datadog/trace/instrumentation/armeria/jetty/ArmeriaJettyInstrumentation.java @@ -15,7 +15,7 @@ @AutoService(InstrumenterModule.class) public class ArmeriaJettyInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ArmeriaJettyInstrumentation() { super("armeria-jetty", "armeria"); } diff --git a/dd-java-agent/instrumentation/avro/src/main/java/datadog/trace/instrumentation/avro/GenericDatumReaderInstrumentation.java b/dd-java-agent/instrumentation/avro/src/main/java/datadog/trace/instrumentation/avro/GenericDatumReaderInstrumentation.java index f55459bee24..8825489f30c 100644 --- a/dd-java-agent/instrumentation/avro/src/main/java/datadog/trace/instrumentation/avro/GenericDatumReaderInstrumentation.java +++ b/dd-java-agent/instrumentation/avro/src/main/java/datadog/trace/instrumentation/avro/GenericDatumReaderInstrumentation.java @@ -17,7 +17,7 @@ @AutoService(InstrumenterModule.class) public final class GenericDatumReaderInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public GenericDatumReaderInstrumentation() { super("avro"); diff --git a/dd-java-agent/instrumentation/avro/src/main/java/datadog/trace/instrumentation/avro/GenericDatumWriterInstrumentation.java b/dd-java-agent/instrumentation/avro/src/main/java/datadog/trace/instrumentation/avro/GenericDatumWriterInstrumentation.java index b97967a79e6..aadb73e7eb5 100644 --- a/dd-java-agent/instrumentation/avro/src/main/java/datadog/trace/instrumentation/avro/GenericDatumWriterInstrumentation.java +++ b/dd-java-agent/instrumentation/avro/src/main/java/datadog/trace/instrumentation/avro/GenericDatumWriterInstrumentation.java @@ -18,7 +18,7 @@ @AutoService(InstrumenterModule.class) public final class GenericDatumWriterInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public GenericDatumWriterInstrumentation() { super("avro"); diff --git a/dd-java-agent/instrumentation/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeClientInstrumentation.java b/dd-java-agent/instrumentation/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeClientInstrumentation.java index b50acc0ad5c..9dff23eeb67 100644 --- a/dd-java-agent/instrumentation/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeClientInstrumentation.java +++ b/dd-java-agent/instrumentation/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeClientInstrumentation.java @@ -12,7 +12,7 @@ @AutoService(InstrumenterModule.class) public final class EventBridgeClientInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public EventBridgeClientInstrumentation() { super("eventbridge"); } diff --git a/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/AWSHttpClientInstrumentation.java b/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/AWSHttpClientInstrumentation.java index 53ffa909c47..d472d975f23 100644 --- a/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/AWSHttpClientInstrumentation.java +++ b/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/AWSHttpClientInstrumentation.java @@ -24,7 +24,7 @@ */ @AutoService(InstrumenterModule.class) public class AWSHttpClientInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public AWSHttpClientInstrumentation() { super("aws-sdk"); diff --git a/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/HandlerChainFactoryInstrumentation.java b/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/HandlerChainFactoryInstrumentation.java index 2f31d44bd96..339879c7fe7 100644 --- a/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/HandlerChainFactoryInstrumentation.java +++ b/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/HandlerChainFactoryInstrumentation.java @@ -18,7 +18,7 @@ */ @AutoService(InstrumenterModule.class) public final class HandlerChainFactoryInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public HandlerChainFactoryInstrumentation() { super("aws-sdk"); diff --git a/dd-java-agent/instrumentation/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsClientInstrumentation.java b/dd-java-agent/instrumentation/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsClientInstrumentation.java index 5af465c25bf..aa6d1bf8d5d 100644 --- a/dd-java-agent/instrumentation/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsClientInstrumentation.java +++ b/dd-java-agent/instrumentation/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsClientInstrumentation.java @@ -16,7 +16,7 @@ /** AWS SDK v2 instrumentation */ @AutoService(InstrumenterModule.class) public final class AwsClientInstrumentation extends AbstractAwsClientInstrumentation - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { @Override public String instrumentedType() { diff --git a/dd-java-agent/instrumentation/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsHttpClientInstrumentation.java b/dd-java-agent/instrumentation/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsHttpClientInstrumentation.java index 93185903da4..54862564ee1 100644 --- a/dd-java-agent/instrumentation/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsHttpClientInstrumentation.java +++ b/dd-java-agent/instrumentation/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsHttpClientInstrumentation.java @@ -28,7 +28,7 @@ */ @AutoService(InstrumenterModule.class) public final class AwsHttpClientInstrumentation extends AbstractAwsClientInstrumentation - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { @Override public String hierarchyMarkerType() { diff --git a/dd-java-agent/instrumentation/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsClientInstrumentation.java b/dd-java-agent/instrumentation/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsClientInstrumentation.java index b6565469b19..a5036d0c1c7 100644 --- a/dd-java-agent/instrumentation/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsClientInstrumentation.java +++ b/dd-java-agent/instrumentation/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsClientInstrumentation.java @@ -16,7 +16,7 @@ /** AWS SDK v1 SNS instrumentation */ @AutoService(InstrumenterModule.class) public final class SnsClientInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public SnsClientInstrumentation() { super("sns", "aws-sdk"); diff --git a/dd-java-agent/instrumentation/aws-java-sns-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sns/SnsClientInstrumentation.java b/dd-java-agent/instrumentation/aws-java-sns-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sns/SnsClientInstrumentation.java index 0e24d267baf..6cd9b991ad1 100644 --- a/dd-java-agent/instrumentation/aws-java-sns-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sns/SnsClientInstrumentation.java +++ b/dd-java-agent/instrumentation/aws-java-sns-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sns/SnsClientInstrumentation.java @@ -15,7 +15,7 @@ /** AWS SDK v2 SNS instrumentation */ @AutoService(InstrumenterModule.class) public final class SnsClientInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public SnsClientInstrumentation() { super("sns", "aws-sdk"); } diff --git a/dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/QueueBufferConfigInstrumentation.java b/dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/QueueBufferConfigInstrumentation.java index d7353556d04..eee0e4d9b9d 100644 --- a/dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/QueueBufferConfigInstrumentation.java +++ b/dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/QueueBufferConfigInstrumentation.java @@ -18,7 +18,9 @@ @AutoService(InstrumenterModule.class) public class QueueBufferConfigInstrumentation extends AbstractSqsInstrumentation - implements Instrumenter.ForSingleType, Instrumenter.WithTypeStructure { + implements Instrumenter.ForSingleType, + Instrumenter.WithTypeStructure, + Instrumenter.HasMethodAdvice { @Override public String instrumentedType() { diff --git a/dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsClientInstrumentation.java b/dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsClientInstrumentation.java index 64c80169c2f..1aa1414a013 100644 --- a/dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsClientInstrumentation.java +++ b/dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsClientInstrumentation.java @@ -17,7 +17,7 @@ /** AWS SDK v1 instrumentation */ @AutoService(InstrumenterModule.class) public final class SqsClientInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { private static final String INSTRUMENTATION_NAME = "aws-sdk"; public SqsClientInstrumentation() { diff --git a/dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsJmsMessageInstrumentation.java b/dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsJmsMessageInstrumentation.java index d645cb40bf9..1230881e728 100644 --- a/dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsJmsMessageInstrumentation.java +++ b/dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsJmsMessageInstrumentation.java @@ -19,7 +19,7 @@ @AutoService(InstrumenterModule.class) public class SqsJmsMessageInstrumentation extends AbstractSqsInstrumentation - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { @Override public String instrumentedType() { diff --git a/dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsReceiveRequestInstrumentation.java b/dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsReceiveRequestInstrumentation.java index 7045b0cd5c2..0e133aa121e 100644 --- a/dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsReceiveRequestInstrumentation.java +++ b/dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsReceiveRequestInstrumentation.java @@ -14,7 +14,7 @@ @AutoService(InstrumenterModule.class) public class SqsReceiveRequestInstrumentation extends AbstractSqsInstrumentation - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { @Override public String instrumentedType() { diff --git a/dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsReceiveResultInstrumentation.java b/dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsReceiveResultInstrumentation.java index 73da662b115..9c56fb8b2fe 100644 --- a/dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsReceiveResultInstrumentation.java +++ b/dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsReceiveResultInstrumentation.java @@ -17,7 +17,7 @@ @AutoService(InstrumenterModule.class) public class SqsReceiveResultInstrumentation extends AbstractSqsInstrumentation - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { @Override public String instrumentedType() { diff --git a/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsClientInstrumentation.java b/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsClientInstrumentation.java index 59267c1733b..4e66a82b429 100644 --- a/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsClientInstrumentation.java +++ b/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsClientInstrumentation.java @@ -14,7 +14,7 @@ /** AWS SDK v2 instrumentation */ @AutoService(InstrumenterModule.class) public final class SqsClientInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { private static final String INSTRUMENTATION_NAME = "aws-sdk"; public SqsClientInstrumentation() { diff --git a/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsJmsMessageInstrumentation.java b/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsJmsMessageInstrumentation.java index 070094b35ba..005700c037c 100644 --- a/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsJmsMessageInstrumentation.java +++ b/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsJmsMessageInstrumentation.java @@ -19,7 +19,7 @@ @AutoService(InstrumenterModule.class) public class SqsJmsMessageInstrumentation extends AbstractSqsInstrumentation - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { @Override public String instrumentedType() { diff --git a/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveRequestInstrumentation.java b/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveRequestInstrumentation.java index 2f2bb3dbac2..3ae286a5320 100644 --- a/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveRequestInstrumentation.java +++ b/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveRequestInstrumentation.java @@ -16,7 +16,9 @@ @AutoService(InstrumenterModule.class) public class SqsReceiveRequestInstrumentation extends AbstractSqsInstrumentation - implements Instrumenter.ForSingleType, Instrumenter.WithTypeStructure { + implements Instrumenter.ForSingleType, + Instrumenter.WithTypeStructure, + Instrumenter.HasMethodAdvice { @Override public String instrumentedType() { diff --git a/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveResultInstrumentation.java b/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveResultInstrumentation.java index 2416787873e..e0e00d33e7b 100644 --- a/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveResultInstrumentation.java +++ b/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveResultInstrumentation.java @@ -17,7 +17,7 @@ @AutoService(InstrumenterModule.class) public class SqsReceiveResultInstrumentation extends AbstractSqsInstrumentation - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { @Override public String instrumentedType() { diff --git a/dd-java-agent/instrumentation/aws-lambda-handler/src/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerInstrumentation.java b/dd-java-agent/instrumentation/aws-lambda-handler/src/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerInstrumentation.java index 8ba82e97760..0282b568c35 100644 --- a/dd-java-agent/instrumentation/aws-lambda-handler/src/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/aws-lambda-handler/src/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerInstrumentation.java @@ -28,7 +28,7 @@ @AutoService(InstrumenterModule.class) public class LambdaHandlerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { // these must remain as String literals so they can be easily be shared (copied) with the nested // advice classes diff --git a/dd-java-agent/instrumentation/axis-2/src/main/java/datadog/trace/instrumentation/axis2/AxisEngineInstrumentation.java b/dd-java-agent/instrumentation/axis-2/src/main/java/datadog/trace/instrumentation/axis2/AxisEngineInstrumentation.java index f71f1dea31d..72f2cbfb7a7 100644 --- a/dd-java-agent/instrumentation/axis-2/src/main/java/datadog/trace/instrumentation/axis2/AxisEngineInstrumentation.java +++ b/dd-java-agent/instrumentation/axis-2/src/main/java/datadog/trace/instrumentation/axis2/AxisEngineInstrumentation.java @@ -23,7 +23,7 @@ @AutoService(InstrumenterModule.class) public final class AxisEngineInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public AxisEngineInstrumentation() { super("axis2"); diff --git a/dd-java-agent/instrumentation/axis-2/src/main/java/datadog/trace/instrumentation/axis2/AxisTransportInstrumentation.java b/dd-java-agent/instrumentation/axis-2/src/main/java/datadog/trace/instrumentation/axis2/AxisTransportInstrumentation.java index 61bebc13398..695e1525860 100644 --- a/dd-java-agent/instrumentation/axis-2/src/main/java/datadog/trace/instrumentation/axis2/AxisTransportInstrumentation.java +++ b/dd-java-agent/instrumentation/axis-2/src/main/java/datadog/trace/instrumentation/axis2/AxisTransportInstrumentation.java @@ -24,7 +24,9 @@ @AutoService(InstrumenterModule.class) public final class AxisTransportInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForKnownTypes, Instrumenter.ForConfiguredType { + implements Instrumenter.ForKnownTypes, + Instrumenter.ForConfiguredType, + Instrumenter.HasMethodAdvice { public AxisTransportInstrumentation() { super("axis2", "axis2-transport"); diff --git a/dd-java-agent/instrumentation/axis-2/src/main/java/datadog/trace/instrumentation/axis2/WebSphereAsyncInstrumentation.java b/dd-java-agent/instrumentation/axis-2/src/main/java/datadog/trace/instrumentation/axis2/WebSphereAsyncInstrumentation.java index b22942e6ea8..d6ee3211b40 100644 --- a/dd-java-agent/instrumentation/axis-2/src/main/java/datadog/trace/instrumentation/axis2/WebSphereAsyncInstrumentation.java +++ b/dd-java-agent/instrumentation/axis-2/src/main/java/datadog/trace/instrumentation/axis2/WebSphereAsyncInstrumentation.java @@ -16,7 +16,7 @@ @AutoService(InstrumenterModule.class) public final class WebSphereAsyncInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public WebSphereAsyncInstrumentation() { super("axis2", "axis2-transport"); diff --git a/dd-java-agent/instrumentation/axway-api/src/main/java/datadog/trace/instrumentation/axway/AxwayHTTPPluginInstrumentation.java b/dd-java-agent/instrumentation/axway-api/src/main/java/datadog/trace/instrumentation/axway/AxwayHTTPPluginInstrumentation.java index 2ce8603d81c..e8d9bb1785d 100644 --- a/dd-java-agent/instrumentation/axway-api/src/main/java/datadog/trace/instrumentation/axway/AxwayHTTPPluginInstrumentation.java +++ b/dd-java-agent/instrumentation/axway-api/src/main/java/datadog/trace/instrumentation/axway/AxwayHTTPPluginInstrumentation.java @@ -12,7 +12,7 @@ @AutoService(InstrumenterModule.class) public final class AxwayHTTPPluginInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public AxwayHTTPPluginInstrumentation() { super("axway-api"); diff --git a/dd-java-agent/instrumentation/caffeine/src/main/java/datadog/trace/instrumentation/caffeine/BoundedLocalCacheInstrumentation.java b/dd-java-agent/instrumentation/caffeine/src/main/java/datadog/trace/instrumentation/caffeine/BoundedLocalCacheInstrumentation.java index 34535d39f8a..7c351cc484a 100644 --- a/dd-java-agent/instrumentation/caffeine/src/main/java/datadog/trace/instrumentation/caffeine/BoundedLocalCacheInstrumentation.java +++ b/dd-java-agent/instrumentation/caffeine/src/main/java/datadog/trace/instrumentation/caffeine/BoundedLocalCacheInstrumentation.java @@ -13,7 +13,7 @@ @AutoService(InstrumenterModule.class) public final class BoundedLocalCacheInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public BoundedLocalCacheInstrumentation() { super("caffeine"); diff --git a/dd-java-agent/instrumentation/classloading/src/main/java/datadog/trace/instrumentation/classloading/ClassloadingInstrumentation.java b/dd-java-agent/instrumentation/classloading/src/main/java/datadog/trace/instrumentation/classloading/ClassloadingInstrumentation.java index 4e54cc8833f..d9073395147 100644 --- a/dd-java-agent/instrumentation/classloading/src/main/java/datadog/trace/instrumentation/classloading/ClassloadingInstrumentation.java +++ b/dd-java-agent/instrumentation/classloading/src/main/java/datadog/trace/instrumentation/classloading/ClassloadingInstrumentation.java @@ -32,7 +32,9 @@ */ @AutoService(InstrumenterModule.class) public final class ClassloadingInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForBootstrap, Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForBootstrap, + Instrumenter.ForTypeHierarchy, + Instrumenter.HasMethodAdvice { public ClassloadingInstrumentation() { super("classloading"); } diff --git a/dd-java-agent/instrumentation/classloading/src/main/java/datadog/trace/instrumentation/classloading/DefineClassInstrumentation.java b/dd-java-agent/instrumentation/classloading/src/main/java/datadog/trace/instrumentation/classloading/DefineClassInstrumentation.java index 9cbf55a28e0..2d028627c11 100644 --- a/dd-java-agent/instrumentation/classloading/src/main/java/datadog/trace/instrumentation/classloading/DefineClassInstrumentation.java +++ b/dd-java-agent/instrumentation/classloading/src/main/java/datadog/trace/instrumentation/classloading/DefineClassInstrumentation.java @@ -16,7 +16,7 @@ /** Updates j.l.ClassLoader to notify the tracer when classes are about to be defined. */ @AutoService(InstrumenterModule.class) public final class DefineClassInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType { + implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public DefineClassInstrumentation() { super("defineclass"); } diff --git a/dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/CommonsFileuploadInstrumenter.java b/dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/CommonsFileuploadInstrumenter.java index 8c5ab41bb30..98786ab6c1c 100644 --- a/dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/CommonsFileuploadInstrumenter.java +++ b/dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/CommonsFileuploadInstrumenter.java @@ -23,7 +23,7 @@ @AutoService(InstrumenterModule.class) public class CommonsFileuploadInstrumenter extends InstrumenterModule.Iast - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public CommonsFileuploadInstrumenter() { super("commons-fileupload"); diff --git a/dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemInstrumenter.java b/dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemInstrumenter.java index 2530351b72b..af1b38899ff 100644 --- a/dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemInstrumenter.java +++ b/dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemInstrumenter.java @@ -23,7 +23,7 @@ @AutoService(InstrumenterModule.class) public class FileItemInstrumenter extends InstrumenterModule.Iast - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public FileItemInstrumenter() { super("commons-fileupload", "fileitem"); diff --git a/dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemIteratorInstrumenter.java b/dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemIteratorInstrumenter.java index 0f27181d735..ebfa36ccfd3 100644 --- a/dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemIteratorInstrumenter.java +++ b/dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemIteratorInstrumenter.java @@ -23,7 +23,7 @@ @AutoService(InstrumenterModule.class) public class FileItemIteratorInstrumenter extends InstrumenterModule.Iast - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public FileItemIteratorInstrumenter() { super("commons-fileupload", "fileitemiterator"); diff --git a/dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemStreamInstrumenter.java b/dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemStreamInstrumenter.java index 8b94da8df92..e7db79e03bb 100644 --- a/dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemStreamInstrumenter.java +++ b/dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemStreamInstrumenter.java @@ -23,7 +23,7 @@ @AutoService(InstrumenterModule.class) public class FileItemStreamInstrumenter extends InstrumenterModule.Iast - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public FileItemStreamInstrumenter() { super("commons-fileupload", "fileitemstream"); diff --git a/dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/ServletFileUploadInstrumenter.java b/dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/ServletFileUploadInstrumenter.java index 8808bf20db0..e88df36bc06 100644 --- a/dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/ServletFileUploadInstrumenter.java +++ b/dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/ServletFileUploadInstrumenter.java @@ -24,7 +24,7 @@ @AutoService(InstrumenterModule.class) public class ServletFileUploadInstrumenter extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ServletFileUploadInstrumenter() { super("commons-fileupload", "servlet"); diff --git a/dd-java-agent/instrumentation/commons-httpclient-2/src/main/java/datadog/trace/instrumentation/commonshttpclient/CommonsHttpClientInstrumentation.java b/dd-java-agent/instrumentation/commons-httpclient-2/src/main/java/datadog/trace/instrumentation/commonshttpclient/CommonsHttpClientInstrumentation.java index 6e3cc1bfe14..7490ca1d39a 100644 --- a/dd-java-agent/instrumentation/commons-httpclient-2/src/main/java/datadog/trace/instrumentation/commonshttpclient/CommonsHttpClientInstrumentation.java +++ b/dd-java-agent/instrumentation/commons-httpclient-2/src/main/java/datadog/trace/instrumentation/commonshttpclient/CommonsHttpClientInstrumentation.java @@ -25,7 +25,7 @@ @AutoService(InstrumenterModule.class) public class CommonsHttpClientInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public CommonsHttpClientInstrumentation() { super("commons-http-client"); diff --git a/dd-java-agent/instrumentation/commons-httpclient-2/src/main/java/datadog/trace/instrumentation/commonshttpclient/IastHttpMethodBaseInstrumentation.java b/dd-java-agent/instrumentation/commons-httpclient-2/src/main/java/datadog/trace/instrumentation/commonshttpclient/IastHttpMethodBaseInstrumentation.java index ecb21bfc025..fc6f09dfb11 100644 --- a/dd-java-agent/instrumentation/commons-httpclient-2/src/main/java/datadog/trace/instrumentation/commonshttpclient/IastHttpMethodBaseInstrumentation.java +++ b/dd-java-agent/instrumentation/commons-httpclient-2/src/main/java/datadog/trace/instrumentation/commonshttpclient/IastHttpMethodBaseInstrumentation.java @@ -15,7 +15,9 @@ @AutoService(InstrumenterModule.class) public class IastHttpMethodBaseInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType, Instrumenter.HasTypeAdvice { + implements Instrumenter.ForSingleType, + Instrumenter.HasTypeAdvice, + Instrumenter.HasMethodAdvice { private final String className = IastHttpMethodBaseInstrumentation.class.getName(); diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-2.0/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseBucketInstrumentation.java b/dd-java-agent/instrumentation/couchbase/couchbase-2.0/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseBucketInstrumentation.java index 4b7bac63d7b..041970a757a 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-2.0/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseBucketInstrumentation.java +++ b/dd-java-agent/instrumentation/couchbase/couchbase-2.0/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseBucketInstrumentation.java @@ -16,7 +16,7 @@ @AutoService(InstrumenterModule.class) public class CouchbaseBucketInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public CouchbaseBucketInstrumentation() { super("couchbase"); diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-2.0/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseClusterInstrumentation.java b/dd-java-agent/instrumentation/couchbase/couchbase-2.0/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseClusterInstrumentation.java index a0c506c1267..7c95dfa971c 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-2.0/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseClusterInstrumentation.java +++ b/dd-java-agent/instrumentation/couchbase/couchbase-2.0/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseClusterInstrumentation.java @@ -17,7 +17,7 @@ @AutoService(InstrumenterModule.class) public class CouchbaseClusterInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public CouchbaseClusterInstrumentation() { super("couchbase"); diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-2.6/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseCoreInstrumentation.java b/dd-java-agent/instrumentation/couchbase/couchbase-2.6/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseCoreInstrumentation.java index af8f51b606f..329c49ac797 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-2.6/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseCoreInstrumentation.java +++ b/dd-java-agent/instrumentation/couchbase/couchbase-2.6/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseCoreInstrumentation.java @@ -20,7 +20,7 @@ @AutoService(InstrumenterModule.class) public class CouchbaseCoreInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public CouchbaseCoreInstrumentation() { super("couchbase"); diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-2.6/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseNetworkInstrumentation.java b/dd-java-agent/instrumentation/couchbase/couchbase-2.6/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseNetworkInstrumentation.java index 780d322ffc3..b708292cabf 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-2.6/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseNetworkInstrumentation.java +++ b/dd-java-agent/instrumentation/couchbase/couchbase-2.6/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseNetworkInstrumentation.java @@ -24,7 +24,7 @@ @AutoService(InstrumenterModule.class) public class CouchbaseNetworkInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public CouchbaseNetworkInstrumentation() { super("couchbase"); } diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/BaseRequestInstrumentation.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/BaseRequestInstrumentation.java index 599896ad533..5717db6a6f5 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/BaseRequestInstrumentation.java +++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/BaseRequestInstrumentation.java @@ -10,7 +10,7 @@ @AutoService(InstrumenterModule.class) public class BaseRequestInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public BaseRequestInstrumentation() { super("couchbase", "couchbase-3"); diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/CoreEnvironmentBuilderInstrumentation.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/CoreEnvironmentBuilderInstrumentation.java index 2d587e5c98c..35dbc6c6830 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/CoreEnvironmentBuilderInstrumentation.java +++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/CoreEnvironmentBuilderInstrumentation.java @@ -11,7 +11,7 @@ @AutoService(InstrumenterModule.class) public class CoreEnvironmentBuilderInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public CoreEnvironmentBuilderInstrumentation() { super("couchbase", "couchbase-3"); diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/CoreInstrumentation.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/CoreInstrumentation.java index 6ae21c973a5..626bd31b9c4 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/CoreInstrumentation.java +++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/CoreInstrumentation.java @@ -18,7 +18,7 @@ @AutoService(InstrumenterModule.class) public class CoreInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { private static final Reference TRACING_IDENTIFIERS_REFERENCE = new Reference.Builder("com.couchbase.client.core.cnc.TracingIdentifiers").build(); diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/DefaultErrorUtilInstrumentation.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/DefaultErrorUtilInstrumentation.java index b1f2ddaf7be..e70ee102936 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/DefaultErrorUtilInstrumentation.java +++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/DefaultErrorUtilInstrumentation.java @@ -11,7 +11,7 @@ @AutoService(InstrumenterModule.class) public class DefaultErrorUtilInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public DefaultErrorUtilInstrumentation() { super("couchbase", "couchbase-3"); diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/BaseRequestInstrumentation.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/BaseRequestInstrumentation.java index df4071e64c8..81d1e5d0475 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/BaseRequestInstrumentation.java +++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/BaseRequestInstrumentation.java @@ -9,7 +9,7 @@ @AutoService(InstrumenterModule.class) public class BaseRequestInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public BaseRequestInstrumentation() { super("couchbase", "couchbase-3"); diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/CoreEnvironmentBuilderInstrumentation.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/CoreEnvironmentBuilderInstrumentation.java index 3a0ea264268..9d73dbd64df 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/CoreEnvironmentBuilderInstrumentation.java +++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/CoreEnvironmentBuilderInstrumentation.java @@ -10,7 +10,7 @@ @AutoService(InstrumenterModule.class) public class CoreEnvironmentBuilderInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public CoreEnvironmentBuilderInstrumentation() { super("couchbase", "couchbase-3"); diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/CoreInstrumentation.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/CoreInstrumentation.java index b4fbd68799c..ff5ff432005 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/CoreInstrumentation.java +++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/CoreInstrumentation.java @@ -19,7 +19,7 @@ @AutoService(InstrumenterModule.class) public class CoreInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public CoreInstrumentation() { super("couchbase"); } diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DefaultErrorUtilInstrumentation.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DefaultErrorUtilInstrumentation.java index 3e06e949811..d034f29afcc 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DefaultErrorUtilInstrumentation.java +++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DefaultErrorUtilInstrumentation.java @@ -10,7 +10,7 @@ @AutoService(InstrumenterModule.class) public class DefaultErrorUtilInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public DefaultErrorUtilInstrumentation() { super("couchbase", "couchbase-3"); diff --git a/dd-java-agent/instrumentation/cucumber/src/main/java/datadog/trace/instrumentation/cucumber/CucumberInstrumentation.java b/dd-java-agent/instrumentation/cucumber/src/main/java/datadog/trace/instrumentation/cucumber/CucumberInstrumentation.java index b82a98573d9..de6abe07396 100644 --- a/dd-java-agent/instrumentation/cucumber/src/main/java/datadog/trace/instrumentation/cucumber/CucumberInstrumentation.java +++ b/dd-java-agent/instrumentation/cucumber/src/main/java/datadog/trace/instrumentation/cucumber/CucumberInstrumentation.java @@ -15,7 +15,7 @@ @AutoService(InstrumenterModule.class) public class CucumberInstrumentation extends InstrumenterModule.CiVisibility - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public CucumberInstrumentation() { super("cucumber", "cucumber-5"); diff --git a/dd-java-agent/instrumentation/cxf-2.1/src/main/java/datadog/trace/instrumentation/cxf/InvokerInstrumentation.java b/dd-java-agent/instrumentation/cxf-2.1/src/main/java/datadog/trace/instrumentation/cxf/InvokerInstrumentation.java index ae5773f6d69..4a5ecbc715d 100644 --- a/dd-java-agent/instrumentation/cxf-2.1/src/main/java/datadog/trace/instrumentation/cxf/InvokerInstrumentation.java +++ b/dd-java-agent/instrumentation/cxf-2.1/src/main/java/datadog/trace/instrumentation/cxf/InvokerInstrumentation.java @@ -18,7 +18,7 @@ @AutoService(InstrumenterModule.class) public class InvokerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public InvokerInstrumentation() { super("cxf", "cxf-invoker"); } diff --git a/dd-java-agent/instrumentation/datanucleus-4/src/main/java/datadog/trace/instrumentation/datanucleus/ExecutionContextInstrumentation.java b/dd-java-agent/instrumentation/datanucleus-4/src/main/java/datadog/trace/instrumentation/datanucleus/ExecutionContextInstrumentation.java index c0955b0433e..22f58fd604c 100644 --- a/dd-java-agent/instrumentation/datanucleus-4/src/main/java/datadog/trace/instrumentation/datanucleus/ExecutionContextInstrumentation.java +++ b/dd-java-agent/instrumentation/datanucleus-4/src/main/java/datadog/trace/instrumentation/datanucleus/ExecutionContextInstrumentation.java @@ -23,7 +23,7 @@ @AutoService(InstrumenterModule.class) public class ExecutionContextInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.CanShortcutTypeMatching { + implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice { public ExecutionContextInstrumentation() { super("datanucleus"); } diff --git a/dd-java-agent/instrumentation/datanucleus-4/src/main/java/datadog/trace/instrumentation/datanucleus/JDOQueryInstrumentation.java b/dd-java-agent/instrumentation/datanucleus-4/src/main/java/datadog/trace/instrumentation/datanucleus/JDOQueryInstrumentation.java index 7f81ecbe010..32284f23656 100644 --- a/dd-java-agent/instrumentation/datanucleus-4/src/main/java/datadog/trace/instrumentation/datanucleus/JDOQueryInstrumentation.java +++ b/dd-java-agent/instrumentation/datanucleus-4/src/main/java/datadog/trace/instrumentation/datanucleus/JDOQueryInstrumentation.java @@ -20,7 +20,7 @@ @AutoService(InstrumenterModule.class) public class JDOQueryInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public JDOQueryInstrumentation() { super("datanucleus"); diff --git a/dd-java-agent/instrumentation/datanucleus-4/src/main/java/datadog/trace/instrumentation/datanucleus/JDOTransactionInstrumentation.java b/dd-java-agent/instrumentation/datanucleus-4/src/main/java/datadog/trace/instrumentation/datanucleus/JDOTransactionInstrumentation.java index d7d88d64ad9..bd358854149 100644 --- a/dd-java-agent/instrumentation/datanucleus-4/src/main/java/datadog/trace/instrumentation/datanucleus/JDOTransactionInstrumentation.java +++ b/dd-java-agent/instrumentation/datanucleus-4/src/main/java/datadog/trace/instrumentation/datanucleus/JDOTransactionInstrumentation.java @@ -15,7 +15,7 @@ @AutoService(InstrumenterModule.class) public class JDOTransactionInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public JDOTransactionInstrumentation() { super("datanucleus"); diff --git a/dd-java-agent/instrumentation/datastax-cassandra-3.8/src/main/java/datadog/trace/instrumentation/datastax/cassandra38/CassandraClusterInstrumentation.java b/dd-java-agent/instrumentation/datastax-cassandra-3.8/src/main/java/datadog/trace/instrumentation/datastax/cassandra38/CassandraClusterInstrumentation.java index 19fece81951..19096714f36 100644 --- a/dd-java-agent/instrumentation/datastax-cassandra-3.8/src/main/java/datadog/trace/instrumentation/datastax/cassandra38/CassandraClusterInstrumentation.java +++ b/dd-java-agent/instrumentation/datastax-cassandra-3.8/src/main/java/datadog/trace/instrumentation/datastax/cassandra38/CassandraClusterInstrumentation.java @@ -19,7 +19,7 @@ @AutoService(InstrumenterModule.class) public class CassandraClusterInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public CassandraClusterInstrumentation() { super("cassandra"); diff --git a/dd-java-agent/instrumentation/datastax-cassandra-3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java b/dd-java-agent/instrumentation/datastax-cassandra-3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java index 29a54967728..f46dc18f3f3 100644 --- a/dd-java-agent/instrumentation/datastax-cassandra-3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java +++ b/dd-java-agent/instrumentation/datastax-cassandra-3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java @@ -17,7 +17,7 @@ @AutoService(InstrumenterModule.class) public class CassandraClientInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public CassandraClientInstrumentation() { super("cassandra"); diff --git a/dd-java-agent/instrumentation/datastax-cassandra-3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClusterInstrumentation.java b/dd-java-agent/instrumentation/datastax-cassandra-3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClusterInstrumentation.java index 88579c46a52..c6c0b8e0c05 100644 --- a/dd-java-agent/instrumentation/datastax-cassandra-3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClusterInstrumentation.java +++ b/dd-java-agent/instrumentation/datastax-cassandra-3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClusterInstrumentation.java @@ -20,7 +20,7 @@ @AutoService(InstrumenterModule.class) public class CassandraClusterInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public CassandraClusterInstrumentation() { super("cassandra"); diff --git a/dd-java-agent/instrumentation/datastax-cassandra-4/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/CassandraClientInstrumentation.java b/dd-java-agent/instrumentation/datastax-cassandra-4/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/CassandraClientInstrumentation.java index b1629745f0c..963ee8c5439 100644 --- a/dd-java-agent/instrumentation/datastax-cassandra-4/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/CassandraClientInstrumentation.java +++ b/dd-java-agent/instrumentation/datastax-cassandra-4/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/CassandraClientInstrumentation.java @@ -13,7 +13,7 @@ @AutoService(InstrumenterModule.class) public class CassandraClientInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public CassandraClientInstrumentation() { super("cassandra"); diff --git a/dd-java-agent/instrumentation/dropwizard/dropwizard-views/src/main/java/datadog/trace/instrumentation/dropwizard/view/DropwizardViewInstrumentation.java b/dd-java-agent/instrumentation/dropwizard/dropwizard-views/src/main/java/datadog/trace/instrumentation/dropwizard/view/DropwizardViewInstrumentation.java index 3ee9dcc5593..5e76a1427af 100644 --- a/dd-java-agent/instrumentation/dropwizard/dropwizard-views/src/main/java/datadog/trace/instrumentation/dropwizard/view/DropwizardViewInstrumentation.java +++ b/dd-java-agent/instrumentation/dropwizard/dropwizard-views/src/main/java/datadog/trace/instrumentation/dropwizard/view/DropwizardViewInstrumentation.java @@ -22,7 +22,7 @@ @AutoService(InstrumenterModule.class) public final class DropwizardViewInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.CanShortcutTypeMatching { + implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice { public DropwizardViewInstrumentation() { super("dropwizard", "dropwizard-view"); diff --git a/dd-java-agent/instrumentation/elasticsearch/rest-5/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5RestClientInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch/rest-5/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5RestClientInstrumentation.java index 32b899b9392..cba605edf38 100644 --- a/dd-java-agent/instrumentation/elasticsearch/rest-5/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5RestClientInstrumentation.java +++ b/dd-java-agent/instrumentation/elasticsearch/rest-5/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5RestClientInstrumentation.java @@ -20,7 +20,7 @@ @AutoService(InstrumenterModule.class) public class Elasticsearch5RestClientInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public Elasticsearch5RestClientInstrumentation() { super("elasticsearch", "elasticsearch-rest", "elasticsearch-rest-5"); diff --git a/dd-java-agent/instrumentation/elasticsearch/rest-6.4/src/main/java/datadog/trace/instrumentation/elasticsearch6_4/Elasticsearch6RestClientInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch/rest-6.4/src/main/java/datadog/trace/instrumentation/elasticsearch6_4/Elasticsearch6RestClientInstrumentation.java index 6b949686870..164280f4d67 100644 --- a/dd-java-agent/instrumentation/elasticsearch/rest-6.4/src/main/java/datadog/trace/instrumentation/elasticsearch6_4/Elasticsearch6RestClientInstrumentation.java +++ b/dd-java-agent/instrumentation/elasticsearch/rest-6.4/src/main/java/datadog/trace/instrumentation/elasticsearch6_4/Elasticsearch6RestClientInstrumentation.java @@ -20,7 +20,7 @@ @AutoService(InstrumenterModule.class) public class Elasticsearch6RestClientInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public Elasticsearch6RestClientInstrumentation() { super("elasticsearch", "elasticsearch-rest", "elasticsearch-rest-6"); diff --git a/dd-java-agent/instrumentation/elasticsearch/rest-7/src/main/java/datadog/trace/instrumentation/elasticsearch7/Elasticsearch7RestClientInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch/rest-7/src/main/java/datadog/trace/instrumentation/elasticsearch7/Elasticsearch7RestClientInstrumentation.java index 0e52a5a9bde..d4c45939916 100644 --- a/dd-java-agent/instrumentation/elasticsearch/rest-7/src/main/java/datadog/trace/instrumentation/elasticsearch7/Elasticsearch7RestClientInstrumentation.java +++ b/dd-java-agent/instrumentation/elasticsearch/rest-7/src/main/java/datadog/trace/instrumentation/elasticsearch7/Elasticsearch7RestClientInstrumentation.java @@ -24,7 +24,7 @@ @AutoService(InstrumenterModule.class) public class Elasticsearch7RestClientInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public Elasticsearch7RestClientInstrumentation() { super("elasticsearch", "elasticsearch-rest", "elasticsearch-rest-7"); diff --git a/dd-java-agent/instrumentation/elasticsearch/transport-2/src/main/java/datadog/trace/instrumentation/elasticsearch2/Elasticsearch2TransportClientInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch/transport-2/src/main/java/datadog/trace/instrumentation/elasticsearch2/Elasticsearch2TransportClientInstrumentation.java index 65da13c5854..80d266df517 100644 --- a/dd-java-agent/instrumentation/elasticsearch/transport-2/src/main/java/datadog/trace/instrumentation/elasticsearch2/Elasticsearch2TransportClientInstrumentation.java +++ b/dd-java-agent/instrumentation/elasticsearch/transport-2/src/main/java/datadog/trace/instrumentation/elasticsearch2/Elasticsearch2TransportClientInstrumentation.java @@ -21,7 +21,7 @@ @AutoService(InstrumenterModule.class) public class Elasticsearch2TransportClientInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public Elasticsearch2TransportClientInstrumentation() { super("elasticsearch", "elasticsearch-transport", "elasticsearch-transport-2"); diff --git a/dd-java-agent/instrumentation/elasticsearch/transport-5.3/src/main/java/datadog/trace/instrumentation/elasticsearch5_3/Elasticsearch53TransportClientInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch/transport-5.3/src/main/java/datadog/trace/instrumentation/elasticsearch5_3/Elasticsearch53TransportClientInstrumentation.java index 2a485d7739f..059c25482e2 100644 --- a/dd-java-agent/instrumentation/elasticsearch/transport-5.3/src/main/java/datadog/trace/instrumentation/elasticsearch5_3/Elasticsearch53TransportClientInstrumentation.java +++ b/dd-java-agent/instrumentation/elasticsearch/transport-5.3/src/main/java/datadog/trace/instrumentation/elasticsearch5_3/Elasticsearch53TransportClientInstrumentation.java @@ -22,7 +22,7 @@ /** Beginning in version 5.3.0, DocumentRequest was renamed to DocWriteRequest. */ @AutoService(InstrumenterModule.class) public class Elasticsearch53TransportClientInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public Elasticsearch53TransportClientInstrumentation() { super("elasticsearch", "elasticsearch-transport", "elasticsearch-transport-5"); diff --git a/dd-java-agent/instrumentation/elasticsearch/transport-5/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5TransportClientInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch/transport-5/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5TransportClientInstrumentation.java index 81a5f06e6e1..266909d9a74 100644 --- a/dd-java-agent/instrumentation/elasticsearch/transport-5/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5TransportClientInstrumentation.java +++ b/dd-java-agent/instrumentation/elasticsearch/transport-5/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5TransportClientInstrumentation.java @@ -21,7 +21,7 @@ @AutoService(InstrumenterModule.class) public class Elasticsearch5TransportClientInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public Elasticsearch5TransportClientInstrumentation() { super("elasticsearch", "elasticsearch-transport", "elasticsearch-transport-5"); diff --git a/dd-java-agent/instrumentation/elasticsearch/transport-6/src/main/java/datadog/trace/instrumentation/elasticsearch6/Elasticsearch6TransportClientInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch/transport-6/src/main/java/datadog/trace/instrumentation/elasticsearch6/Elasticsearch6TransportClientInstrumentation.java index ee222fca3c9..56edd98b28d 100644 --- a/dd-java-agent/instrumentation/elasticsearch/transport-6/src/main/java/datadog/trace/instrumentation/elasticsearch6/Elasticsearch6TransportClientInstrumentation.java +++ b/dd-java-agent/instrumentation/elasticsearch/transport-6/src/main/java/datadog/trace/instrumentation/elasticsearch6/Elasticsearch6TransportClientInstrumentation.java @@ -25,7 +25,7 @@ */ @AutoService(InstrumenterModule.class) public class Elasticsearch6TransportClientInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public Elasticsearch6TransportClientInstrumentation() { super("elasticsearch", "elasticsearch-transport", "elasticsearch-transport-6"); diff --git a/dd-java-agent/instrumentation/elasticsearch/transport-7.3/src/main/java/datadog/trace/instrumentation/elasticsearch7_3/Elasticsearch73TransportClientInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch/transport-7.3/src/main/java/datadog/trace/instrumentation/elasticsearch7_3/Elasticsearch73TransportClientInstrumentation.java index 2c1a194a408..b73ba38195c 100644 --- a/dd-java-agent/instrumentation/elasticsearch/transport-7.3/src/main/java/datadog/trace/instrumentation/elasticsearch7_3/Elasticsearch73TransportClientInstrumentation.java +++ b/dd-java-agent/instrumentation/elasticsearch/transport-7.3/src/main/java/datadog/trace/instrumentation/elasticsearch7_3/Elasticsearch73TransportClientInstrumentation.java @@ -25,7 +25,7 @@ /** This class is identical to version 6's instrumentation, except Action is now ActionType. */ @AutoService(InstrumenterModule.class) public class Elasticsearch73TransportClientInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public Elasticsearch73TransportClientInstrumentation() { super("elasticsearch", "elasticsearch-transport", "elasticsearch-transport-7"); diff --git a/dd-java-agent/instrumentation/elasticsearch/transport/src/main/java/datadog/trace/instrumentation/elasticsearch/ThreadedActionListenerInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch/transport/src/main/java/datadog/trace/instrumentation/elasticsearch/ThreadedActionListenerInstrumentation.java index 7a74a8169fa..bb560931c34 100644 --- a/dd-java-agent/instrumentation/elasticsearch/transport/src/main/java/datadog/trace/instrumentation/elasticsearch/ThreadedActionListenerInstrumentation.java +++ b/dd-java-agent/instrumentation/elasticsearch/transport/src/main/java/datadog/trace/instrumentation/elasticsearch/ThreadedActionListenerInstrumentation.java @@ -24,7 +24,7 @@ */ @AutoService(InstrumenterModule.class) public final class ThreadedActionListenerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ThreadedActionListenerInstrumentation() { super("elasticsearch", "elasticsearch-transport"); diff --git a/dd-java-agent/instrumentation/enable-wallclock-profiling/src/main/java/datadog/trace/instrumentation/wallclock/EnableWallclockProfilingInstrumentation.java b/dd-java-agent/instrumentation/enable-wallclock-profiling/src/main/java/datadog/trace/instrumentation/wallclock/EnableWallclockProfilingInstrumentation.java index 16ce2f4143b..858679520fb 100644 --- a/dd-java-agent/instrumentation/enable-wallclock-profiling/src/main/java/datadog/trace/instrumentation/wallclock/EnableWallclockProfilingInstrumentation.java +++ b/dd-java-agent/instrumentation/enable-wallclock-profiling/src/main/java/datadog/trace/instrumentation/wallclock/EnableWallclockProfilingInstrumentation.java @@ -21,7 +21,7 @@ @AutoService(InstrumenterModule.class) public class EnableWallclockProfilingInstrumentation extends InstrumenterModule.Profiling - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public EnableWallclockProfilingInstrumentation() { super("wallclock"); diff --git a/dd-java-agent/instrumentation/exception-profiling/src/main/java/datadog/exceptions/instrumentation/ThrowableInstrumentation.java b/dd-java-agent/instrumentation/exception-profiling/src/main/java/datadog/exceptions/instrumentation/ThrowableInstrumentation.java index e94cd3d8a6c..eb91b4e1088 100644 --- a/dd-java-agent/instrumentation/exception-profiling/src/main/java/datadog/exceptions/instrumentation/ThrowableInstrumentation.java +++ b/dd-java-agent/instrumentation/exception-profiling/src/main/java/datadog/exceptions/instrumentation/ThrowableInstrumentation.java @@ -10,7 +10,7 @@ /** Provides instrumentation of {@linkplain Exception} and {@linkplain Error} constructors. */ @AutoService(InstrumenterModule.class) public final class ThrowableInstrumentation extends InstrumenterModule.Profiling - implements Instrumenter.ForBootstrap, Instrumenter.ForKnownTypes { + implements Instrumenter.ForBootstrap, Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public ThrowableInstrumentation() { super("throwables"); diff --git a/dd-java-agent/instrumentation/finatra-2.9/src/main/java/datadog/trace/instrumentation/finatra/FinatraInstrumentation.java b/dd-java-agent/instrumentation/finatra-2.9/src/main/java/datadog/trace/instrumentation/finatra/FinatraInstrumentation.java index 7e1ff85b1fd..040423b6183 100644 --- a/dd-java-agent/instrumentation/finatra-2.9/src/main/java/datadog/trace/instrumentation/finatra/FinatraInstrumentation.java +++ b/dd-java-agent/instrumentation/finatra-2.9/src/main/java/datadog/trace/instrumentation/finatra/FinatraInstrumentation.java @@ -29,7 +29,7 @@ @AutoService(InstrumenterModule.class) public class FinatraInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public FinatraInstrumentation() { super("finatra"); } diff --git a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/src/main/java/datadog/trace/instrumentation/freemarker24/DollarVariableInstrumentation.java b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/src/main/java/datadog/trace/instrumentation/freemarker24/DollarVariableInstrumentation.java index 0cd06b61794..f8ed9dc6100 100644 --- a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/src/main/java/datadog/trace/instrumentation/freemarker24/DollarVariableInstrumentation.java +++ b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/src/main/java/datadog/trace/instrumentation/freemarker24/DollarVariableInstrumentation.java @@ -12,7 +12,7 @@ @AutoService(InstrumenterModule.class) public class DollarVariableInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { static final String FREEMARKER_CORE = "freemarker.core"; public DollarVariableInstrumentation() { diff --git a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/src/main/java/datadog/trace/instrumentation/freemarker24/ObjectWrapperInstrumentation.java b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/src/main/java/datadog/trace/instrumentation/freemarker24/ObjectWrapperInstrumentation.java index 0e521c04d7b..7e4c2036ecb 100644 --- a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/src/main/java/datadog/trace/instrumentation/freemarker24/ObjectWrapperInstrumentation.java +++ b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/src/main/java/datadog/trace/instrumentation/freemarker24/ObjectWrapperInstrumentation.java @@ -23,7 +23,7 @@ @AutoService(InstrumenterModule.class) public class ObjectWrapperInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public ObjectWrapperInstrumentation() { super("freemarker"); diff --git a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.9/src/main/java/datadog/trace/instrumentation/freemarker9/DollarVariableInstrumentation.java b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.9/src/main/java/datadog/trace/instrumentation/freemarker9/DollarVariableInstrumentation.java index efaa297a3f0..5f64b19ced9 100644 --- a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.9/src/main/java/datadog/trace/instrumentation/freemarker9/DollarVariableInstrumentation.java +++ b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.9/src/main/java/datadog/trace/instrumentation/freemarker9/DollarVariableInstrumentation.java @@ -20,7 +20,7 @@ @AutoService(InstrumenterModule.class) public class DollarVariableInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { static final String FREEMARKER_CORE = "freemarker.core"; public DollarVariableInstrumentation() { diff --git a/dd-java-agent/instrumentation/glassfish/src/main/java/datadog/trace/instrumentation/glassfish/GlassFishInstrumentation.java b/dd-java-agent/instrumentation/glassfish/src/main/java/datadog/trace/instrumentation/glassfish/GlassFishInstrumentation.java index 0b7746364df..d922aea24c6 100644 --- a/dd-java-agent/instrumentation/glassfish/src/main/java/datadog/trace/instrumentation/glassfish/GlassFishInstrumentation.java +++ b/dd-java-agent/instrumentation/glassfish/src/main/java/datadog/trace/instrumentation/glassfish/GlassFishInstrumentation.java @@ -20,7 +20,7 @@ */ @AutoService(InstrumenterModule.class) public final class GlassFishInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public GlassFishInstrumentation() { super("glassfish"); diff --git a/dd-java-agent/instrumentation/google-http-client/src/main/java/datadog/trace/instrumentation/googlehttpclient/GoogleHttpClientInstrumentation.java b/dd-java-agent/instrumentation/google-http-client/src/main/java/datadog/trace/instrumentation/googlehttpclient/GoogleHttpClientInstrumentation.java index ec59fbab5ad..01ac55f35ad 100644 --- a/dd-java-agent/instrumentation/google-http-client/src/main/java/datadog/trace/instrumentation/googlehttpclient/GoogleHttpClientInstrumentation.java +++ b/dd-java-agent/instrumentation/google-http-client/src/main/java/datadog/trace/instrumentation/googlehttpclient/GoogleHttpClientInstrumentation.java @@ -22,7 +22,7 @@ @AutoService(InstrumenterModule.class) public class GoogleHttpClientInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public GoogleHttpClientInstrumentation() { super("google-http-client"); } diff --git a/dd-java-agent/instrumentation/google-pubsub/src/main/java/datadog/trace/instrumentation/googlepubsub/PublisherInstrumentation.java b/dd-java-agent/instrumentation/google-pubsub/src/main/java/datadog/trace/instrumentation/googlepubsub/PublisherInstrumentation.java index b5ab4fb84e5..88f76e103ce 100644 --- a/dd-java-agent/instrumentation/google-pubsub/src/main/java/datadog/trace/instrumentation/googlepubsub/PublisherInstrumentation.java +++ b/dd-java-agent/instrumentation/google-pubsub/src/main/java/datadog/trace/instrumentation/googlepubsub/PublisherInstrumentation.java @@ -32,7 +32,7 @@ @AutoService(InstrumenterModule.class) public final class PublisherInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType, ExcludeFilterProvider { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, ExcludeFilterProvider { public PublisherInstrumentation() { super("google-pubsub", "google-pubsub-publisher"); diff --git a/dd-java-agent/instrumentation/google-pubsub/src/main/java/datadog/trace/instrumentation/googlepubsub/ReceiverInstrumentation.java b/dd-java-agent/instrumentation/google-pubsub/src/main/java/datadog/trace/instrumentation/googlepubsub/ReceiverInstrumentation.java index bee2e7db140..0de8a259bb4 100644 --- a/dd-java-agent/instrumentation/google-pubsub/src/main/java/datadog/trace/instrumentation/googlepubsub/ReceiverInstrumentation.java +++ b/dd-java-agent/instrumentation/google-pubsub/src/main/java/datadog/trace/instrumentation/googlepubsub/ReceiverInstrumentation.java @@ -12,7 +12,7 @@ @AutoService(InstrumenterModule.class) public class ReceiverInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ReceiverInstrumentation() { super("google-pubsub", "google-pubsub-receiver"); diff --git a/dd-java-agent/instrumentation/google-pubsub/src/main/java/datadog/trace/instrumentation/googlepubsub/ReceiverWithAckInstrumentation.java b/dd-java-agent/instrumentation/google-pubsub/src/main/java/datadog/trace/instrumentation/googlepubsub/ReceiverWithAckInstrumentation.java index f25fa1bad07..d64bac17045 100644 --- a/dd-java-agent/instrumentation/google-pubsub/src/main/java/datadog/trace/instrumentation/googlepubsub/ReceiverWithAckInstrumentation.java +++ b/dd-java-agent/instrumentation/google-pubsub/src/main/java/datadog/trace/instrumentation/googlepubsub/ReceiverWithAckInstrumentation.java @@ -13,7 +13,7 @@ @AutoService(InstrumenterModule.class) public final class ReceiverWithAckInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ReceiverWithAckInstrumentation() { super("google-pubsub", "google-pubsub-receiver"); diff --git a/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/AnnotationSubstitutionProcessorInstrumentation.java b/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/AnnotationSubstitutionProcessorInstrumentation.java index 14e80fb571d..616c2bb6e61 100644 --- a/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/AnnotationSubstitutionProcessorInstrumentation.java +++ b/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/AnnotationSubstitutionProcessorInstrumentation.java @@ -12,7 +12,8 @@ @AutoService(InstrumenterModule.class) public final class AnnotationSubstitutionProcessorInstrumentation - extends AbstractNativeImageInstrumentation implements Instrumenter.ForSingleType { + extends AbstractNativeImageInstrumentation + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { @Override public String instrumentedType() { diff --git a/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/LinkAtBuildTimeInstrumentation.java b/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/LinkAtBuildTimeInstrumentation.java index 0ae61dda6df..5ca3178b273 100644 --- a/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/LinkAtBuildTimeInstrumentation.java +++ b/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/LinkAtBuildTimeInstrumentation.java @@ -11,7 +11,7 @@ @AutoService(InstrumenterModule.class) public final class LinkAtBuildTimeInstrumentation extends AbstractNativeImageInstrumentation - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { @Override public String instrumentedType() { diff --git a/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java b/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java index 030c1c7a34a..85eb9c2d533 100644 --- a/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java +++ b/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java @@ -15,7 +15,8 @@ @AutoService(InstrumenterModule.class) public final class NativeImageGeneratorRunnerInstrumentation - extends AbstractNativeImageInstrumentation implements Instrumenter.ForSingleType { + extends AbstractNativeImageInstrumentation + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { @Override public String instrumentedType() { diff --git a/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/ResourcesFeatureInstrumentation.java b/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/ResourcesFeatureInstrumentation.java index 71e038bec21..8b195962e59 100644 --- a/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/ResourcesFeatureInstrumentation.java +++ b/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/ResourcesFeatureInstrumentation.java @@ -12,7 +12,7 @@ @AutoService(InstrumenterModule.class) public final class ResourcesFeatureInstrumentation extends AbstractNativeImageInstrumentation - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { @Override public String instrumentedType() { diff --git a/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/VMRuntimeInstrumentation.java b/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/VMRuntimeInstrumentation.java index 2da7d5b21c3..96c0ca91b24 100644 --- a/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/VMRuntimeInstrumentation.java +++ b/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/VMRuntimeInstrumentation.java @@ -22,7 +22,7 @@ @AutoService(InstrumenterModule.class) public final class VMRuntimeInstrumentation extends AbstractNativeImageInstrumentation - implements Instrumenter.ForSingleType, ExcludeFilterProvider { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, ExcludeFilterProvider { @Override public String instrumentedType() { diff --git a/dd-java-agent/instrumentation/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleBuildListenerInstrumentation.java b/dd-java-agent/instrumentation/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleBuildListenerInstrumentation.java index 45021efa60f..d9a650f3773 100644 --- a/dd-java-agent/instrumentation/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleBuildListenerInstrumentation.java +++ b/dd-java-agent/instrumentation/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleBuildListenerInstrumentation.java @@ -15,7 +15,7 @@ @AutoService(InstrumenterModule.class) public class GradleBuildListenerInstrumentation extends InstrumenterModule.CiVisibility - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public GradleBuildListenerInstrumentation() { super("gradle", "gradle-build-listener"); diff --git a/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildScopeServices_8_10_Instrumentation.java b/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildScopeServices_8_10_Instrumentation.java index bbc1b33fafc..af6852465a5 100644 --- a/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildScopeServices_8_10_Instrumentation.java +++ b/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildScopeServices_8_10_Instrumentation.java @@ -18,7 +18,7 @@ @AutoService(InstrumenterModule.class) public class GradleBuildScopeServices_8_10_Instrumentation extends InstrumenterModule.CiVisibility - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public GradleBuildScopeServices_8_10_Instrumentation() { super("gradle", "gradle-build-scope-services"); diff --git a/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildScopeServices_8_3_Instrumentation.java b/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildScopeServices_8_3_Instrumentation.java index 77085b6193b..6fd2b89398c 100644 --- a/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildScopeServices_8_3_Instrumentation.java +++ b/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildScopeServices_8_3_Instrumentation.java @@ -16,7 +16,7 @@ @AutoService(InstrumenterModule.class) public class GradleBuildScopeServices_8_3_Instrumentation extends InstrumenterModule.CiVisibility - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public GradleBuildScopeServices_8_3_Instrumentation() { super("gradle", "gradle-build-scope-services"); diff --git a/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleDaemonLoggingInstrumentation.java b/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleDaemonLoggingInstrumentation.java index 21cac171b12..feb81d78935 100644 --- a/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleDaemonLoggingInstrumentation.java +++ b/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleDaemonLoggingInstrumentation.java @@ -10,7 +10,7 @@ @AutoService(InstrumenterModule.class) public class GradleDaemonLoggingInstrumentation extends InstrumenterModule.CiVisibility - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public GradleDaemonLoggingInstrumentation() { super("gradle", "gradle-daemon-logging"); diff --git a/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleLauncherInstrumentation.java b/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleLauncherInstrumentation.java index 631ce6ae7d8..94bbc34fcc4 100644 --- a/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleLauncherInstrumentation.java +++ b/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleLauncherInstrumentation.java @@ -20,7 +20,7 @@ */ @AutoService(InstrumenterModule.class) public class GradleLauncherInstrumentation extends InstrumenterModule.CiVisibility - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public GradleLauncherInstrumentation() { super("gradle", "gradle-daemon-jvm-options"); diff --git a/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradlePluginInjectorInstrumentation.java b/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradlePluginInjectorInstrumentation.java index 9e7833e86d5..6b47977bd62 100644 --- a/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradlePluginInjectorInstrumentation.java +++ b/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradlePluginInjectorInstrumentation.java @@ -63,7 +63,4 @@ public String[] helperClassNames() { public boolean useAgentCodeSource() { return true; } - - @Override - public void methodAdvice(MethodTransformer transformer) {} } diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/src/main/java/datadog/trace/instrumentation/graphqljava14/GraphQLJavaInstrumentation.java b/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/src/main/java/datadog/trace/instrumentation/graphqljava14/GraphQLJavaInstrumentation.java index 30b67345079..6924e791b4c 100644 --- a/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/src/main/java/datadog/trace/instrumentation/graphqljava14/GraphQLJavaInstrumentation.java +++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/src/main/java/datadog/trace/instrumentation/graphqljava14/GraphQLJavaInstrumentation.java @@ -17,7 +17,7 @@ @AutoService(InstrumenterModule.class) public class GraphQLJavaInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public GraphQLJavaInstrumentation() { super("graphql-java"); diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/src/main/java/datadog/trace/instrumentation/graphqljava20/GraphQLJavaInstrumentation.java b/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/src/main/java/datadog/trace/instrumentation/graphqljava20/GraphQLJavaInstrumentation.java index 92169c96e63..7ac49f59feb 100644 --- a/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/src/main/java/datadog/trace/instrumentation/graphqljava20/GraphQLJavaInstrumentation.java +++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/src/main/java/datadog/trace/instrumentation/graphqljava20/GraphQLJavaInstrumentation.java @@ -12,7 +12,7 @@ @AutoService(InstrumenterModule.class) public class GraphQLJavaInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public GraphQLJavaInstrumentation() { super("graphql-java"); diff --git a/dd-java-agent/instrumentation/grizzly-2/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyHttpHandlerInstrumentation.java b/dd-java-agent/instrumentation/grizzly-2/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyHttpHandlerInstrumentation.java index e3a24ba69e9..7177fdae214 100644 --- a/dd-java-agent/instrumentation/grizzly-2/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyHttpHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/grizzly-2/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyHttpHandlerInstrumentation.java @@ -22,7 +22,7 @@ @AutoService(InstrumenterModule.class) public class GrizzlyHttpHandlerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public GrizzlyHttpHandlerInstrumentation() { super("grizzly"); diff --git a/dd-java-agent/instrumentation/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/AsyncHttpClientInstrumentation.java b/dd-java-agent/instrumentation/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/AsyncHttpClientInstrumentation.java index 0a4eb8c1cdc..9ba181b0f4e 100644 --- a/dd-java-agent/instrumentation/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/AsyncHttpClientInstrumentation.java +++ b/dd-java-agent/instrumentation/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/AsyncHttpClientInstrumentation.java @@ -23,7 +23,7 @@ @AutoService(InstrumenterModule.class) public final class AsyncHttpClientInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public AsyncHttpClientInstrumentation() { super("grizzly-client", "ning"); diff --git a/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/DefaultFilterChainInstrumentation.java b/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/DefaultFilterChainInstrumentation.java index 37c5d2123fb..df4773737f5 100644 --- a/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/DefaultFilterChainInstrumentation.java +++ b/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/DefaultFilterChainInstrumentation.java @@ -13,7 +13,7 @@ @AutoService(InstrumenterModule.class) public class DefaultFilterChainInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public DefaultFilterChainInstrumentation() { super("grizzly-filterchain"); diff --git a/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/FilterInstrumentation.java b/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/FilterInstrumentation.java index b3f81a85215..b64dfc01f2f 100644 --- a/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/FilterInstrumentation.java +++ b/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/FilterInstrumentation.java @@ -14,7 +14,7 @@ @AutoService(InstrumenterModule.class) public final class FilterInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public FilterInstrumentation() { super("grizzly-filterchain"); diff --git a/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyByteBodyInstrumentation.java b/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyByteBodyInstrumentation.java index 49d904ece2f..d83a191fd48 100644 --- a/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyByteBodyInstrumentation.java +++ b/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyByteBodyInstrumentation.java @@ -28,7 +28,7 @@ @AutoService(InstrumenterModule.class) public class GrizzlyByteBodyInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public GrizzlyByteBodyInstrumentation() { super("grizzly"); } diff --git a/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyCharBodyInstrumentation.java b/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyCharBodyInstrumentation.java index 86fdbf6b3e7..be89803aeb9 100644 --- a/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyCharBodyInstrumentation.java +++ b/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyCharBodyInstrumentation.java @@ -24,7 +24,7 @@ @AutoService(InstrumenterModule.class) public class GrizzlyCharBodyInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public GrizzlyCharBodyInstrumentation() { super("grizzly"); } diff --git a/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HttpCodecFilterInstrumentation.java b/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HttpCodecFilterInstrumentation.java index bde405ddbe3..8043afc580a 100644 --- a/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HttpCodecFilterInstrumentation.java +++ b/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HttpCodecFilterInstrumentation.java @@ -12,7 +12,7 @@ @AutoService(InstrumenterModule.class) public final class HttpCodecFilterInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public HttpCodecFilterInstrumentation() { super("grizzly-filterchain"); diff --git a/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HttpServerFilterInstrumentation.java b/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HttpServerFilterInstrumentation.java index 583fb166846..96f96be60e5 100644 --- a/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HttpServerFilterInstrumentation.java +++ b/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HttpServerFilterInstrumentation.java @@ -12,7 +12,7 @@ @AutoService(InstrumenterModule.class) public class HttpServerFilterInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public HttpServerFilterInstrumentation() { super("grizzly-filterchain"); diff --git a/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/ParsedBodyParametersInstrumentation.java b/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/ParsedBodyParametersInstrumentation.java index 9b09faf7810..06b644bac91 100644 --- a/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/ParsedBodyParametersInstrumentation.java +++ b/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/ParsedBodyParametersInstrumentation.java @@ -31,7 +31,7 @@ // org.glassfish.grizzly.http.server.HttpHandler @AutoService(InstrumenterModule.class) public class ParsedBodyParametersInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ParsedBodyParametersInstrumentation() { super("grizzly"); diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/QueuedCommandInstrumentation.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/QueuedCommandInstrumentation.java index 23af3e29479..0f0642e0612 100644 --- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/QueuedCommandInstrumentation.java +++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/QueuedCommandInstrumentation.java @@ -24,7 +24,7 @@ @AutoService(InstrumenterModule.class) public final class QueuedCommandInstrumentation extends InstrumenterModule.Profiling - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { private static final String QUEUED_COMMAND = "io.grpc.netty.WriteQueue$QueuedCommand"; private static final String STATE = diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/AbstractClientStreamInstrumentation.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/AbstractClientStreamInstrumentation.java index 869385b1330..3ddd2407e44 100644 --- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/AbstractClientStreamInstrumentation.java +++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/AbstractClientStreamInstrumentation.java @@ -19,7 +19,7 @@ @AutoService(InstrumenterModule.class) public final class AbstractClientStreamInstrumentation extends InstrumenterModule.Profiling - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public AbstractClientStreamInstrumentation() { super("grpc", "grpc-client"); diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/ClientCallImplInstrumentation.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/ClientCallImplInstrumentation.java index f0234c39b95..a2bc91720f1 100644 --- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/ClientCallImplInstrumentation.java +++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/ClientCallImplInstrumentation.java @@ -30,7 +30,7 @@ @AutoService(InstrumenterModule.class) public final class ClientCallImplInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ClientCallImplInstrumentation() { super("grpc", "grpc-client"); diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/ClientStreamListenerImplInstrumentation.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/ClientStreamListenerImplInstrumentation.java index f53d7252d44..ba2c01b6991 100644 --- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/ClientStreamListenerImplInstrumentation.java +++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/ClientStreamListenerImplInstrumentation.java @@ -23,7 +23,7 @@ @AutoService(InstrumenterModule.class) public class ClientStreamListenerImplInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ClientStreamListenerImplInstrumentation() { super("grpc", "grpc-client"); diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/MessagesAvailableInstrumentation.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/MessagesAvailableInstrumentation.java index b06d9c08c51..9303e03f39b 100644 --- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/MessagesAvailableInstrumentation.java +++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/MessagesAvailableInstrumentation.java @@ -24,7 +24,7 @@ @AutoService(InstrumenterModule.class) public final class MessagesAvailableInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public MessagesAvailableInstrumentation() { super("grpc", "grpc-client", "grpc-message"); diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/GrpcServerBuilderInstrumentation.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/GrpcServerBuilderInstrumentation.java index 3b4b0cbff79..2ad3b5c2729 100644 --- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/GrpcServerBuilderInstrumentation.java +++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/GrpcServerBuilderInstrumentation.java @@ -22,7 +22,7 @@ @AutoService(InstrumenterModule.class) public class GrpcServerBuilderInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.CanShortcutTypeMatching { + implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice { public GrpcServerBuilderInstrumentation() { super("grpc", "grpc-server"); diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/MethodHandlersInstrumentation.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/MethodHandlersInstrumentation.java index cf6bae17205..6d1058e01a2 100644 --- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/MethodHandlersInstrumentation.java +++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/MethodHandlersInstrumentation.java @@ -6,7 +6,7 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArguments; import com.google.auto.service.AutoService; -import datadog.trace.agent.tooling.Instrumenter.ForTypeHierarchy; +import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; import datadog.trace.api.Platform; import java.lang.reflect.Method; @@ -16,7 +16,7 @@ @AutoService(InstrumenterModule.class) public class MethodHandlersInstrumentation extends InstrumenterModule.Tracing - implements ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { private static final ElementMatcher METHOD_HANDLERS = nameEndsWith("$MethodHandlers"); diff --git a/dd-java-agent/instrumentation/gson-1.6/src/main/java/datadog/trace/instrumentation/gson/JsonReaderInstrumentation.java b/dd-java-agent/instrumentation/gson-1.6/src/main/java/datadog/trace/instrumentation/gson/JsonReaderInstrumentation.java index a848155602e..1e3b729198c 100644 --- a/dd-java-agent/instrumentation/gson-1.6/src/main/java/datadog/trace/instrumentation/gson/JsonReaderInstrumentation.java +++ b/dd-java-agent/instrumentation/gson-1.6/src/main/java/datadog/trace/instrumentation/gson/JsonReaderInstrumentation.java @@ -22,7 +22,7 @@ @AutoService(InstrumenterModule.class) public class JsonReaderInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public JsonReaderInstrumentation() { super("gson"); diff --git a/dd-java-agent/instrumentation/guava-10/src/main/java/datadog/trace/instrumentation/guava10/ListenableFutureInstrumentation.java b/dd-java-agent/instrumentation/guava-10/src/main/java/datadog/trace/instrumentation/guava10/ListenableFutureInstrumentation.java index fbaa023c599..637cd2b7643 100644 --- a/dd-java-agent/instrumentation/guava-10/src/main/java/datadog/trace/instrumentation/guava10/ListenableFutureInstrumentation.java +++ b/dd-java-agent/instrumentation/guava-10/src/main/java/datadog/trace/instrumentation/guava10/ListenableFutureInstrumentation.java @@ -21,7 +21,7 @@ @AutoService(InstrumenterModule.class) public class ListenableFutureInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ListenableFutureInstrumentation() { super("guava"); diff --git a/dd-java-agent/instrumentation/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/ClientInvocationInstrumentation.java b/dd-java-agent/instrumentation/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/ClientInvocationInstrumentation.java index 3f597d9c60a..c6d628712c2 100644 --- a/dd-java-agent/instrumentation/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/ClientInvocationInstrumentation.java +++ b/dd-java-agent/instrumentation/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/ClientInvocationInstrumentation.java @@ -18,7 +18,7 @@ @AutoService(InstrumenterModule.class) public class ClientInvocationInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ClientInvocationInstrumentation() { super("hazelcast_legacy"); diff --git a/dd-java-agent/instrumentation/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/DistributedObjectInstrumentation.java b/dd-java-agent/instrumentation/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/DistributedObjectInstrumentation.java index 0e1763f9b89..6c8856fe692 100644 --- a/dd-java-agent/instrumentation/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/DistributedObjectInstrumentation.java +++ b/dd-java-agent/instrumentation/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/DistributedObjectInstrumentation.java @@ -25,7 +25,7 @@ @AutoService(InstrumenterModule.class) public class DistributedObjectInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { private static final String PROXY_PACKAGE = "com.hazelcast.client.proxy"; diff --git a/dd-java-agent/instrumentation/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/ClientInvocationInstrumentation.java b/dd-java-agent/instrumentation/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/ClientInvocationInstrumentation.java index 7ee706ab2e1..34c77e18828 100644 --- a/dd-java-agent/instrumentation/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/ClientInvocationInstrumentation.java +++ b/dd-java-agent/instrumentation/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/ClientInvocationInstrumentation.java @@ -32,7 +32,7 @@ @AutoService(InstrumenterModule.class) public class ClientInvocationInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ClientInvocationInstrumentation() { super(INSTRUMENTATION_NAME); diff --git a/dd-java-agent/instrumentation/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/ClientMessageInstrumentation.java b/dd-java-agent/instrumentation/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/ClientMessageInstrumentation.java index 9074cb61fd4..75cddef44c4 100644 --- a/dd-java-agent/instrumentation/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/ClientMessageInstrumentation.java +++ b/dd-java-agent/instrumentation/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/ClientMessageInstrumentation.java @@ -25,7 +25,7 @@ */ @AutoService(InstrumenterModule.class) public class ClientMessageInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ClientMessageInstrumentation() { super(INSTRUMENTATION_NAME); diff --git a/dd-java-agent/instrumentation/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/ClientInvocationInstrumentation.java b/dd-java-agent/instrumentation/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/ClientInvocationInstrumentation.java index 48980085632..91050dae267 100644 --- a/dd-java-agent/instrumentation/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/ClientInvocationInstrumentation.java +++ b/dd-java-agent/instrumentation/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/ClientInvocationInstrumentation.java @@ -20,7 +20,7 @@ @AutoService(InstrumenterModule.class) public class ClientInvocationInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ClientInvocationInstrumentation() { super(INSTRUMENTATION_NAME); diff --git a/dd-java-agent/instrumentation/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/ClientListenerInstrumentation.java b/dd-java-agent/instrumentation/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/ClientListenerInstrumentation.java index 53730626344..78cc9eb435f 100644 --- a/dd-java-agent/instrumentation/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/ClientListenerInstrumentation.java +++ b/dd-java-agent/instrumentation/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/ClientListenerInstrumentation.java @@ -24,7 +24,7 @@ @AutoService(InstrumenterModule.class) public class ClientListenerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ClientListenerInstrumentation() { super(INSTRUMENTATION_NAME); diff --git a/dd-java-agent/instrumentation/hibernate/core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/AbstractHibernateInstrumentation.java b/dd-java-agent/instrumentation/hibernate/core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/AbstractHibernateInstrumentation.java index 8bd3c80b333..ecfcc6ab48c 100644 --- a/dd-java-agent/instrumentation/hibernate/core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/AbstractHibernateInstrumentation.java +++ b/dd-java-agent/instrumentation/hibernate/core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/AbstractHibernateInstrumentation.java @@ -4,7 +4,7 @@ import datadog.trace.agent.tooling.InstrumenterModule; public abstract class AbstractHibernateInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.CanShortcutTypeMatching { + implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice { static final String SESSION_STATE = "datadog.trace.instrumentation.hibernate.SessionState"; diff --git a/dd-java-agent/instrumentation/hibernate/core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/IastQueryInstrumentation.java b/dd-java-agent/instrumentation/hibernate/core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/IastQueryInstrumentation.java index 621b7e5d41c..dea82aac1c6 100644 --- a/dd-java-agent/instrumentation/hibernate/core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/IastQueryInstrumentation.java +++ b/dd-java-agent/instrumentation/hibernate/core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/IastQueryInstrumentation.java @@ -18,7 +18,7 @@ @AutoService(InstrumenterModule.class) public class IastQueryInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public IastQueryInstrumentation() { super("hibernate", "hibernate-core"); diff --git a/dd-java-agent/instrumentation/hibernate/core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/AbstractHibernateInstrumentation.java b/dd-java-agent/instrumentation/hibernate/core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/AbstractHibernateInstrumentation.java index 170fb18e7e3..026a14841f9 100644 --- a/dd-java-agent/instrumentation/hibernate/core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/AbstractHibernateInstrumentation.java +++ b/dd-java-agent/instrumentation/hibernate/core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/AbstractHibernateInstrumentation.java @@ -4,7 +4,7 @@ import datadog.trace.agent.tooling.InstrumenterModule; public abstract class AbstractHibernateInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.CanShortcutTypeMatching { + implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice { static final String SESSION_STATE = "datadog.trace.instrumentation.hibernate.SessionState"; diff --git a/dd-java-agent/instrumentation/hibernate/core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/IastQueryInstrumentation.java b/dd-java-agent/instrumentation/hibernate/core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/IastQueryInstrumentation.java index 7394e19b72b..7af26fc6164 100644 --- a/dd-java-agent/instrumentation/hibernate/core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/IastQueryInstrumentation.java +++ b/dd-java-agent/instrumentation/hibernate/core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/IastQueryInstrumentation.java @@ -17,7 +17,7 @@ @AutoService(InstrumenterModule.class) public class IastQueryInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public IastQueryInstrumentation() { super("hibernate", "hibernate-core"); diff --git a/dd-java-agent/instrumentation/hibernate/core-4.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_3/ProcedureCallInstrumentation.java b/dd-java-agent/instrumentation/hibernate/core-4.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_3/ProcedureCallInstrumentation.java index c90c73ae2d7..93c1f12a5c7 100644 --- a/dd-java-agent/instrumentation/hibernate/core-4.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_3/ProcedureCallInstrumentation.java +++ b/dd-java-agent/instrumentation/hibernate/core-4.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_3/ProcedureCallInstrumentation.java @@ -21,7 +21,7 @@ @AutoService(InstrumenterModule.class) public class ProcedureCallInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.CanShortcutTypeMatching { + implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice { public ProcedureCallInstrumentation() { super("hibernate", "hibernate-core"); diff --git a/dd-java-agent/instrumentation/hibernate/core-4.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_3/SessionInstrumentation.java b/dd-java-agent/instrumentation/hibernate/core-4.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_3/SessionInstrumentation.java index 00de5201b50..474a2da3c20 100644 --- a/dd-java-agent/instrumentation/hibernate/core-4.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_3/SessionInstrumentation.java +++ b/dd-java-agent/instrumentation/hibernate/core-4.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_3/SessionInstrumentation.java @@ -24,7 +24,7 @@ @AutoService(InstrumenterModule.class) public class SessionInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.CanShortcutTypeMatching { + implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice { static final String SESSION_STATE = "datadog.trace.instrumentation.hibernate.SessionState"; diff --git a/dd-java-agent/instrumentation/http-url-connection/src/main/java/datadog/trace/instrumentation/http_url_connection/HttpUrlConnectionInstrumentation.java b/dd-java-agent/instrumentation/http-url-connection/src/main/java/datadog/trace/instrumentation/http_url_connection/HttpUrlConnectionInstrumentation.java index 63cf53d9c3d..3a18e2fd759 100644 --- a/dd-java-agent/instrumentation/http-url-connection/src/main/java/datadog/trace/instrumentation/http_url_connection/HttpUrlConnectionInstrumentation.java +++ b/dd-java-agent/instrumentation/http-url-connection/src/main/java/datadog/trace/instrumentation/http_url_connection/HttpUrlConnectionInstrumentation.java @@ -27,7 +27,8 @@ public class HttpUrlConnectionInstrumentation extends InstrumenterModule.Tracing implements Instrumenter.ForBootstrap, Instrumenter.ForKnownTypes, - Instrumenter.ForConfiguredType { + Instrumenter.ForConfiguredType, + Instrumenter.HasMethodAdvice { public HttpUrlConnectionInstrumentation() { super("httpurlconnection"); diff --git a/dd-java-agent/instrumentation/http-url-connection/src/main/java/datadog/trace/instrumentation/http_url_connection/UrlInstrumentation.java b/dd-java-agent/instrumentation/http-url-connection/src/main/java/datadog/trace/instrumentation/http_url_connection/UrlInstrumentation.java index 9af40e56587..1af5f205005 100644 --- a/dd-java-agent/instrumentation/http-url-connection/src/main/java/datadog/trace/instrumentation/http_url_connection/UrlInstrumentation.java +++ b/dd-java-agent/instrumentation/http-url-connection/src/main/java/datadog/trace/instrumentation/http_url_connection/UrlInstrumentation.java @@ -19,7 +19,7 @@ @AutoService(InstrumenterModule.class) public class UrlInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType { + implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public UrlInstrumentation() { super("urlconnection", "httpurlconnection"); diff --git a/dd-java-agent/instrumentation/hystrix-1.4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixInstrumentation.java b/dd-java-agent/instrumentation/hystrix-1.4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixInstrumentation.java index 9e08c4934af..1026c9754f5 100644 --- a/dd-java-agent/instrumentation/hystrix-1.4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixInstrumentation.java +++ b/dd-java-agent/instrumentation/hystrix-1.4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixInstrumentation.java @@ -16,7 +16,7 @@ @AutoService(InstrumenterModule.class) public class HystrixInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public HystrixInstrumentation() { super("hystrix"); diff --git a/dd-java-agent/instrumentation/hystrix-1.4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixThreadPoolInstrumentation.java b/dd-java-agent/instrumentation/hystrix-1.4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixThreadPoolInstrumentation.java index 14d5814cf44..ecf6a81198f 100644 --- a/dd-java-agent/instrumentation/hystrix-1.4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixThreadPoolInstrumentation.java +++ b/dd-java-agent/instrumentation/hystrix-1.4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixThreadPoolInstrumentation.java @@ -13,7 +13,7 @@ @AutoService(InstrumenterModule.class) public class HystrixThreadPoolInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public HystrixThreadPoolInstrumentation() { super("hystrix"); diff --git a/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/IgniteInstrumentation.java b/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/IgniteInstrumentation.java index 725ad3390d5..49716f2393d 100644 --- a/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/IgniteInstrumentation.java +++ b/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/IgniteInstrumentation.java @@ -23,7 +23,7 @@ @AutoService(InstrumenterModule.class) public class IgniteInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public IgniteInstrumentation() { super("ignite"); diff --git a/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/AbstractIgniteCacheInstrumentation.java b/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/AbstractIgniteCacheInstrumentation.java index 7c900e02428..5fc63d186a4 100644 --- a/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/AbstractIgniteCacheInstrumentation.java +++ b/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/AbstractIgniteCacheInstrumentation.java @@ -6,7 +6,7 @@ import java.util.Map; public abstract class AbstractIgniteCacheInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public AbstractIgniteCacheInstrumentation() { super("ignite"); diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-1/src/main/java/datadog/trace/instrumentation/jackson/codehouse/core/Json1FactoryInstrumentation.java b/dd-java-agent/instrumentation/jackson-core/jackson-core-1/src/main/java/datadog/trace/instrumentation/jackson/codehouse/core/Json1FactoryInstrumentation.java index 34ccea963d0..d8700f2bb66 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-1/src/main/java/datadog/trace/instrumentation/jackson/codehouse/core/Json1FactoryInstrumentation.java +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-1/src/main/java/datadog/trace/instrumentation/jackson/codehouse/core/Json1FactoryInstrumentation.java @@ -22,7 +22,7 @@ @AutoService(InstrumenterModule.class) public class Json1FactoryInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public Json1FactoryInstrumentation() { super("jackson", "jackson-1"); diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-1/src/main/java/datadog/trace/instrumentation/jackson/codehouse/core/Json1ParserInstrumentation.java b/dd-java-agent/instrumentation/jackson-core/jackson-core-1/src/main/java/datadog/trace/instrumentation/jackson/codehouse/core/Json1ParserInstrumentation.java index 3dc5814910c..ea6387c8908 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-1/src/main/java/datadog/trace/instrumentation/jackson/codehouse/core/Json1ParserInstrumentation.java +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-1/src/main/java/datadog/trace/instrumentation/jackson/codehouse/core/Json1ParserInstrumentation.java @@ -27,7 +27,7 @@ /** TODO: keep a stack like structure pointing to the whole path */ @AutoService(InstrumenterModule.class) public class Json1ParserInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { static final String JSON_PARSER = "org.codehaus.jackson.JsonParser"; diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/src/main/java/datadog/trace/instrumentation/jackson_2_12/core/JsonParserInstrumentation.java b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/src/main/java/datadog/trace/instrumentation/jackson_2_12/core/JsonParserInstrumentation.java index 1edb74d59ae..8462fb08862 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/src/main/java/datadog/trace/instrumentation/jackson_2_12/core/JsonParserInstrumentation.java +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/src/main/java/datadog/trace/instrumentation/jackson_2_12/core/JsonParserInstrumentation.java @@ -27,7 +27,7 @@ @AutoService(InstrumenterModule.class) public class JsonParserInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { static final String TARGET_TYPE = "com.fasterxml.jackson.core.JsonParser"; static final ElementMatcher.Junction VERSION_POST_2_8_0_AND_PRE_2_12_0 = diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/src/main/java/datadog/trace/instrumentation/jackson_2_16/core/JsonParserInstrumentation.java b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/src/main/java/datadog/trace/instrumentation/jackson_2_16/core/JsonParserInstrumentation.java index e472c1c6b4c..1973d308892 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/src/main/java/datadog/trace/instrumentation/jackson_2_16/core/JsonParserInstrumentation.java +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/src/main/java/datadog/trace/instrumentation/jackson_2_16/core/JsonParserInstrumentation.java @@ -27,7 +27,7 @@ @AutoService(InstrumenterModule.class) public class JsonParserInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { static final String TARGET_TYPE = "com.fasterxml.jackson.core.JsonParser"; static final ElementMatcher.Junction VERSION_POST_2_16_0 = diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/src/main/java/datadog/trace/instrumentation/jackson_2_6/core/JsonParserInstrumentation.java b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/src/main/java/datadog/trace/instrumentation/jackson_2_6/core/JsonParserInstrumentation.java index 92e2160cbf1..f6f0060734f 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/src/main/java/datadog/trace/instrumentation/jackson_2_6/core/JsonParserInstrumentation.java +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/src/main/java/datadog/trace/instrumentation/jackson_2_6/core/JsonParserInstrumentation.java @@ -27,7 +27,7 @@ @AutoService(InstrumenterModule.class) public class JsonParserInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { static final String TARGET_TYPE = "com.fasterxml.jackson.core.JsonParser"; static final ElementMatcher.Junction VERSION_POST_2_6_0_AND_PRE_2_8_0 = diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/src/main/java/datadog/trace/instrumentation/jackson_2_8/core/JsonParserInstrumentation.java b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/src/main/java/datadog/trace/instrumentation/jackson_2_8/core/JsonParserInstrumentation.java index 6a88cbab97b..b176f3b5df7 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/src/main/java/datadog/trace/instrumentation/jackson_2_8/core/JsonParserInstrumentation.java +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/src/main/java/datadog/trace/instrumentation/jackson_2_8/core/JsonParserInstrumentation.java @@ -27,7 +27,7 @@ @AutoService(InstrumenterModule.class) public class JsonParserInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { static final String TARGET_TYPE = "com.fasterxml.jackson.core.JsonParser"; static final ElementMatcher.Junction VERSION_POST_2_8_0_AND_PRE_2_12_0 = diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2/src/main/java/datadog/trace/instrumentation/jackson_2/core/JsonParserInstrumentation.java b/dd-java-agent/instrumentation/jackson-core/jackson-core-2/src/main/java/datadog/trace/instrumentation/jackson_2/core/JsonParserInstrumentation.java index add5a7a41b3..b2573dcc5df 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2/src/main/java/datadog/trace/instrumentation/jackson_2/core/JsonParserInstrumentation.java +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2/src/main/java/datadog/trace/instrumentation/jackson_2/core/JsonParserInstrumentation.java @@ -27,7 +27,7 @@ @AutoService(InstrumenterModule.class) public class JsonParserInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { static final String TARGET_TYPE = "com.fasterxml.jackson.core.JsonParser"; static final ElementMatcher.Junction VERSION_PRE_2_6_0 = diff --git a/dd-java-agent/instrumentation/jackson-core/src/main/java/datadog/trace/instrumentation/jackson/core/Json2FactoryInstrumentation.java b/dd-java-agent/instrumentation/jackson-core/src/main/java/datadog/trace/instrumentation/jackson/core/Json2FactoryInstrumentation.java index 968f82f03b4..ff0465fec40 100644 --- a/dd-java-agent/instrumentation/jackson-core/src/main/java/datadog/trace/instrumentation/jackson/core/Json2FactoryInstrumentation.java +++ b/dd-java-agent/instrumentation/jackson-core/src/main/java/datadog/trace/instrumentation/jackson/core/Json2FactoryInstrumentation.java @@ -22,7 +22,7 @@ @AutoService(InstrumenterModule.class) public class Json2FactoryInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public Json2FactoryInstrumentation() { super("jackson", "jackson-2"); diff --git a/dd-java-agent/instrumentation/jackson-core/src/main/java/datadog/trace/instrumentation/jackson/core/JsonParserInstrumentation.java b/dd-java-agent/instrumentation/jackson-core/src/main/java/datadog/trace/instrumentation/jackson/core/JsonParserInstrumentation.java index 3c74e8521fe..3f28050c2ef 100644 --- a/dd-java-agent/instrumentation/jackson-core/src/main/java/datadog/trace/instrumentation/jackson/core/JsonParserInstrumentation.java +++ b/dd-java-agent/instrumentation/jackson-core/src/main/java/datadog/trace/instrumentation/jackson/core/JsonParserInstrumentation.java @@ -24,7 +24,7 @@ @AutoService(InstrumenterModule.class) public class JsonParserInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { static final String TARGET_TYPE = "com.fasterxml.jackson.core.JsonParser"; diff --git a/dd-java-agent/instrumentation/jackson-core/src/main/java/datadog/trace/instrumentation/jackson/core/TokenBufferInstrumentation.java b/dd-java-agent/instrumentation/jackson-core/src/main/java/datadog/trace/instrumentation/jackson/core/TokenBufferInstrumentation.java index b696d198684..81223298144 100644 --- a/dd-java-agent/instrumentation/jackson-core/src/main/java/datadog/trace/instrumentation/jackson/core/TokenBufferInstrumentation.java +++ b/dd-java-agent/instrumentation/jackson-core/src/main/java/datadog/trace/instrumentation/jackson/core/TokenBufferInstrumentation.java @@ -23,7 +23,7 @@ */ @AutoService(InstrumenterModule.class) public class TokenBufferInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public TokenBufferInstrumentation() { super("jackson-core"); } diff --git a/dd-java-agent/instrumentation/jacoco/src/main/java/datadog/trace/instrumentation/jacoco/ClassInstrumenterInstrumentation.java b/dd-java-agent/instrumentation/jacoco/src/main/java/datadog/trace/instrumentation/jacoco/ClassInstrumenterInstrumentation.java index ef0093868cd..63378b05bf4 100644 --- a/dd-java-agent/instrumentation/jacoco/src/main/java/datadog/trace/instrumentation/jacoco/ClassInstrumenterInstrumentation.java +++ b/dd-java-agent/instrumentation/jacoco/src/main/java/datadog/trace/instrumentation/jacoco/ClassInstrumenterInstrumentation.java @@ -17,7 +17,7 @@ @AutoService(InstrumenterModule.class) public class ClassInstrumenterInstrumentation extends InstrumenterModule.CiVisibility - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public ClassInstrumenterInstrumentation() { super("jacoco"); } diff --git a/dd-java-agent/instrumentation/jacoco/src/main/java/datadog/trace/instrumentation/jacoco/InstrumenterInstrumentation.java b/dd-java-agent/instrumentation/jacoco/src/main/java/datadog/trace/instrumentation/jacoco/InstrumenterInstrumentation.java index 97549730e2c..37cb8376d80 100644 --- a/dd-java-agent/instrumentation/jacoco/src/main/java/datadog/trace/instrumentation/jacoco/InstrumenterInstrumentation.java +++ b/dd-java-agent/instrumentation/jacoco/src/main/java/datadog/trace/instrumentation/jacoco/InstrumenterInstrumentation.java @@ -16,7 +16,7 @@ @AutoService(InstrumenterModule.class) public class InstrumenterInstrumentation extends InstrumenterModule.CiVisibility - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public InstrumenterInstrumentation() { super("jacoco"); } diff --git a/dd-java-agent/instrumentation/jacoco/src/main/java/datadog/trace/instrumentation/jacoco/ProbeInserterInstrumentation.java b/dd-java-agent/instrumentation/jacoco/src/main/java/datadog/trace/instrumentation/jacoco/ProbeInserterInstrumentation.java index 819a87c057d..4cf58f32ddb 100644 --- a/dd-java-agent/instrumentation/jacoco/src/main/java/datadog/trace/instrumentation/jacoco/ProbeInserterInstrumentation.java +++ b/dd-java-agent/instrumentation/jacoco/src/main/java/datadog/trace/instrumentation/jacoco/ProbeInserterInstrumentation.java @@ -27,7 +27,9 @@ @AutoService(InstrumenterModule.class) public class ProbeInserterInstrumentation extends InstrumenterModule.CiVisibility - implements Instrumenter.ForTypeHierarchy, Instrumenter.WithTypeStructure { + implements Instrumenter.ForTypeHierarchy, + Instrumenter.WithTypeStructure, + Instrumenter.HasMethodAdvice { public ProbeInserterInstrumentation() { super("jacoco"); } diff --git a/dd-java-agent/instrumentation/jakarta-jms/src/main/java/datadog/trace/instrumentation/jakarta/jms/JMSMessageConsumerInstrumentation.java b/dd-java-agent/instrumentation/jakarta-jms/src/main/java/datadog/trace/instrumentation/jakarta/jms/JMSMessageConsumerInstrumentation.java index 7d70f6424ce..f1008a36607 100644 --- a/dd-java-agent/instrumentation/jakarta-jms/src/main/java/datadog/trace/instrumentation/jakarta/jms/JMSMessageConsumerInstrumentation.java +++ b/dd-java-agent/instrumentation/jakarta-jms/src/main/java/datadog/trace/instrumentation/jakarta/jms/JMSMessageConsumerInstrumentation.java @@ -38,7 +38,7 @@ @AutoService(InstrumenterModule.class) public final class JMSMessageConsumerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public JMSMessageConsumerInstrumentation() { super("jakarta-jms"); diff --git a/dd-java-agent/instrumentation/jakarta-jms/src/main/java/datadog/trace/instrumentation/jakarta/jms/JMSMessageProducerInstrumentation.java b/dd-java-agent/instrumentation/jakarta-jms/src/main/java/datadog/trace/instrumentation/jakarta/jms/JMSMessageProducerInstrumentation.java index d302a2e7b07..bfaa0141f73 100644 --- a/dd-java-agent/instrumentation/jakarta-jms/src/main/java/datadog/trace/instrumentation/jakarta/jms/JMSMessageProducerInstrumentation.java +++ b/dd-java-agent/instrumentation/jakarta-jms/src/main/java/datadog/trace/instrumentation/jakarta/jms/JMSMessageProducerInstrumentation.java @@ -33,7 +33,7 @@ @AutoService(InstrumenterModule.class) public final class JMSMessageProducerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public JMSMessageProducerInstrumentation() { super("jakarta-jms"); diff --git a/dd-java-agent/instrumentation/jakarta-jms/src/main/java/datadog/trace/instrumentation/jakarta/jms/MDBMessageConsumerInstrumentation.java b/dd-java-agent/instrumentation/jakarta-jms/src/main/java/datadog/trace/instrumentation/jakarta/jms/MDBMessageConsumerInstrumentation.java index b9b651110bf..da82334e3d4 100644 --- a/dd-java-agent/instrumentation/jakarta-jms/src/main/java/datadog/trace/instrumentation/jakarta/jms/MDBMessageConsumerInstrumentation.java +++ b/dd-java-agent/instrumentation/jakarta-jms/src/main/java/datadog/trace/instrumentation/jakarta/jms/MDBMessageConsumerInstrumentation.java @@ -32,7 +32,7 @@ @AutoService(InstrumenterModule.class) public final class MDBMessageConsumerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public MDBMessageConsumerInstrumentation() { super("jakarta-jms", "jakarta-mdb"); diff --git a/dd-java-agent/instrumentation/jakarta-jms/src/main/java/datadog/trace/instrumentation/jakarta/jms/MessageInstrumentation.java b/dd-java-agent/instrumentation/jakarta-jms/src/main/java/datadog/trace/instrumentation/jakarta/jms/MessageInstrumentation.java index bc81e682fb1..9576a5cfc0e 100644 --- a/dd-java-agent/instrumentation/jakarta-jms/src/main/java/datadog/trace/instrumentation/jakarta/jms/MessageInstrumentation.java +++ b/dd-java-agent/instrumentation/jakarta-jms/src/main/java/datadog/trace/instrumentation/jakarta/jms/MessageInstrumentation.java @@ -21,7 +21,7 @@ @AutoService(InstrumenterModule.class) public class MessageInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public MessageInstrumentation() { super("jakarta-jms"); } diff --git a/dd-java-agent/instrumentation/jakarta-jms/src/main/java/datadog/trace/instrumentation/jakarta/jms/SessionInstrumentation.java b/dd-java-agent/instrumentation/jakarta-jms/src/main/java/datadog/trace/instrumentation/jakarta/jms/SessionInstrumentation.java index 7d0cdb88361..875ba7a4cbb 100644 --- a/dd-java-agent/instrumentation/jakarta-jms/src/main/java/datadog/trace/instrumentation/jakarta/jms/SessionInstrumentation.java +++ b/dd-java-agent/instrumentation/jakarta-jms/src/main/java/datadog/trace/instrumentation/jakarta/jms/SessionInstrumentation.java @@ -34,7 +34,7 @@ @AutoService(InstrumenterModule.class) public class SessionInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public SessionInstrumentation() { super("jakarta-jms"); } diff --git a/dd-java-agent/instrumentation/jakarta-rs-annotations-3/src/main/java/datadog/trace/instrumentation/jakarta3/AbstractRequestContextInstrumentation.java b/dd-java-agent/instrumentation/jakarta-rs-annotations-3/src/main/java/datadog/trace/instrumentation/jakarta3/AbstractRequestContextInstrumentation.java index 5f66f4e8101..04b3961128b 100644 --- a/dd-java-agent/instrumentation/jakarta-rs-annotations-3/src/main/java/datadog/trace/instrumentation/jakarta3/AbstractRequestContextInstrumentation.java +++ b/dd-java-agent/instrumentation/jakarta-rs-annotations-3/src/main/java/datadog/trace/instrumentation/jakarta3/AbstractRequestContextInstrumentation.java @@ -12,7 +12,7 @@ import net.bytebuddy.matcher.ElementMatcher; public abstract class AbstractRequestContextInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public AbstractRequestContextInstrumentation() { super("jakarta-rs", "jakartars", "jakarta-rs-filter"); } diff --git a/dd-java-agent/instrumentation/jakarta-rs-annotations-3/src/main/java/datadog/trace/instrumentation/jakarta3/ContainerRequestFilterInstrumentation.java b/dd-java-agent/instrumentation/jakarta-rs-annotations-3/src/main/java/datadog/trace/instrumentation/jakarta3/ContainerRequestFilterInstrumentation.java index 411c05f66ff..4e3d1166f51 100644 --- a/dd-java-agent/instrumentation/jakarta-rs-annotations-3/src/main/java/datadog/trace/instrumentation/jakarta3/ContainerRequestFilterInstrumentation.java +++ b/dd-java-agent/instrumentation/jakarta-rs-annotations-3/src/main/java/datadog/trace/instrumentation/jakarta3/ContainerRequestFilterInstrumentation.java @@ -21,7 +21,7 @@ */ @AutoService(InstrumenterModule.class) public class ContainerRequestFilterInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public ContainerRequestFilterInstrumentation() { super("jakarta-rs", "jakartars", "jakarta-rs-filter"); diff --git a/dd-java-agent/instrumentation/jakarta-rs-annotations-3/src/main/java/datadog/trace/instrumentation/jakarta3/JakartaRsAnnotationsInstrumentation.java b/dd-java-agent/instrumentation/jakarta-rs-annotations-3/src/main/java/datadog/trace/instrumentation/jakarta3/JakartaRsAnnotationsInstrumentation.java index 7e7d2fb3a0c..1ea184ede74 100644 --- a/dd-java-agent/instrumentation/jakarta-rs-annotations-3/src/main/java/datadog/trace/instrumentation/jakarta3/JakartaRsAnnotationsInstrumentation.java +++ b/dd-java-agent/instrumentation/jakarta-rs-annotations-3/src/main/java/datadog/trace/instrumentation/jakarta3/JakartaRsAnnotationsInstrumentation.java @@ -34,7 +34,7 @@ @AutoService(InstrumenterModule.class) public final class JakartaRsAnnotationsInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { private static final String JAKARTA_ENDPOINT_OPERATION_NAME = "jakarta-rs.request"; diff --git a/dd-java-agent/instrumentation/jakarta-rs-annotations-3/src/main/java/datadog/trace/instrumentation/jakarta3/JakartaRsAsyncResponseInstrumentation.java b/dd-java-agent/instrumentation/jakarta-rs-annotations-3/src/main/java/datadog/trace/instrumentation/jakarta3/JakartaRsAsyncResponseInstrumentation.java index 39df5951162..fd918d7950e 100644 --- a/dd-java-agent/instrumentation/jakarta-rs-annotations-3/src/main/java/datadog/trace/instrumentation/jakarta3/JakartaRsAsyncResponseInstrumentation.java +++ b/dd-java-agent/instrumentation/jakarta-rs-annotations-3/src/main/java/datadog/trace/instrumentation/jakarta3/JakartaRsAsyncResponseInstrumentation.java @@ -21,7 +21,7 @@ @AutoService(InstrumenterModule.class) public final class JakartaRsAsyncResponseInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public JakartaRsAsyncResponseInstrumentation() { super("jakarta-rs", "jakartars", "jakarta-rs-annotations"); diff --git a/dd-java-agent/instrumentation/jakarta-ws-annotations/src/main/java/datadog/trace/instrumentation/jakartaws/WebServiceInstrumentation.java b/dd-java-agent/instrumentation/jakarta-ws-annotations/src/main/java/datadog/trace/instrumentation/jakartaws/WebServiceInstrumentation.java index ff5f9de2e6d..ad82d0001da 100644 --- a/dd-java-agent/instrumentation/jakarta-ws-annotations/src/main/java/datadog/trace/instrumentation/jakartaws/WebServiceInstrumentation.java +++ b/dd-java-agent/instrumentation/jakarta-ws-annotations/src/main/java/datadog/trace/instrumentation/jakartaws/WebServiceInstrumentation.java @@ -27,7 +27,9 @@ @AutoService(InstrumenterModule.class) public final class WebServiceInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForBootstrap, Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForBootstrap, + Instrumenter.ForTypeHierarchy, + Instrumenter.HasMethodAdvice { private static final String WEB_SERVICE_ANNOTATION_NAME = "jakarta.jws.WebService"; public WebServiceInstrumentation() { diff --git a/dd-java-agent/instrumentation/java-concurrent/java-completablefuture/src/main/java/datadog/trace/instrumentation/java/completablefuture/AsyncTaskInstrumentation.java b/dd-java-agent/instrumentation/java-concurrent/java-completablefuture/src/main/java/datadog/trace/instrumentation/java/completablefuture/AsyncTaskInstrumentation.java index c5dbb770876..59a2c50ef26 100644 --- a/dd-java-agent/instrumentation/java-concurrent/java-completablefuture/src/main/java/datadog/trace/instrumentation/java/completablefuture/AsyncTaskInstrumentation.java +++ b/dd-java-agent/instrumentation/java-concurrent/java-completablefuture/src/main/java/datadog/trace/instrumentation/java/completablefuture/AsyncTaskInstrumentation.java @@ -32,7 +32,10 @@ */ @AutoService(InstrumenterModule.class) public final class AsyncTaskInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForBootstrap, Instrumenter.ForKnownTypes, ExcludeFilterProvider { + implements Instrumenter.ForBootstrap, + Instrumenter.ForKnownTypes, + Instrumenter.HasMethodAdvice, + ExcludeFilterProvider { private static final String[] CLASS_NAMES = { "java.util.concurrent.CompletableFuture$AsyncSupply", diff --git a/dd-java-agent/instrumentation/java-concurrent/java-completablefuture/src/main/java/datadog/trace/instrumentation/java/completablefuture/CompletableFutureUniCompletionInstrumentation.java b/dd-java-agent/instrumentation/java-concurrent/java-completablefuture/src/main/java/datadog/trace/instrumentation/java/completablefuture/CompletableFutureUniCompletionInstrumentation.java index cf8d237d864..659a0e53706 100644 --- a/dd-java-agent/instrumentation/java-concurrent/java-completablefuture/src/main/java/datadog/trace/instrumentation/java/completablefuture/CompletableFutureUniCompletionInstrumentation.java +++ b/dd-java-agent/instrumentation/java-concurrent/java-completablefuture/src/main/java/datadog/trace/instrumentation/java/completablefuture/CompletableFutureUniCompletionInstrumentation.java @@ -47,7 +47,10 @@ */ @AutoService(InstrumenterModule.class) public class CompletableFutureUniCompletionInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType, ExcludeFilterProvider { + implements Instrumenter.ForBootstrap, + Instrumenter.ForSingleType, + Instrumenter.HasMethodAdvice, + ExcludeFilterProvider { static final String JAVA_UTIL_CONCURRENT = "java.util.concurrent"; static final String COMPLETABLE_FUTURE = JAVA_UTIL_CONCURRENT + ".CompletableFuture"; static final String UNI_COMPLETION = COMPLETABLE_FUTURE + "$UniCompletion"; diff --git a/dd-java-agent/instrumentation/java-concurrent/java-completablefuture/src/main/java/datadog/trace/instrumentation/java/completablefuture/CompletableFutureUniCompletionSubclassInstrumentation.java b/dd-java-agent/instrumentation/java-concurrent/java-completablefuture/src/main/java/datadog/trace/instrumentation/java/completablefuture/CompletableFutureUniCompletionSubclassInstrumentation.java index 2313aa2b406..8cb121852fe 100644 --- a/dd-java-agent/instrumentation/java-concurrent/java-completablefuture/src/main/java/datadog/trace/instrumentation/java/completablefuture/CompletableFutureUniCompletionSubclassInstrumentation.java +++ b/dd-java-agent/instrumentation/java-concurrent/java-completablefuture/src/main/java/datadog/trace/instrumentation/java/completablefuture/CompletableFutureUniCompletionSubclassInstrumentation.java @@ -19,7 +19,9 @@ @AutoService(InstrumenterModule.class) public class CompletableFutureUniCompletionSubclassInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForBootstrap, Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForBootstrap, + Instrumenter.ForTypeHierarchy, + Instrumenter.HasMethodAdvice { public CompletableFutureUniCompletionSubclassInstrumentation() { super("java_completablefuture", "java_concurrent"); diff --git a/dd-java-agent/instrumentation/java-concurrent/java-concurrent-21/src/main/java/datadog/trace/instrumentation/java/concurrent/structuredconcurrency/StructuredTaskScopeInstrumentation.java b/dd-java-agent/instrumentation/java-concurrent/java-concurrent-21/src/main/java/datadog/trace/instrumentation/java/concurrent/structuredconcurrency/StructuredTaskScopeInstrumentation.java index 0d41ab5868b..4bb5c8f4bf9 100644 --- a/dd-java-agent/instrumentation/java-concurrent/java-concurrent-21/src/main/java/datadog/trace/instrumentation/java/concurrent/structuredconcurrency/StructuredTaskScopeInstrumentation.java +++ b/dd-java-agent/instrumentation/java-concurrent/java-concurrent-21/src/main/java/datadog/trace/instrumentation/java/concurrent/structuredconcurrency/StructuredTaskScopeInstrumentation.java @@ -27,7 +27,10 @@ @SuppressWarnings("unused") @AutoService(InstrumenterModule.class) public class StructuredTaskScopeInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType, ExcludeFilterProvider { + implements Instrumenter.ForBootstrap, + Instrumenter.ForSingleType, + Instrumenter.HasMethodAdvice, + ExcludeFilterProvider { public StructuredTaskScopeInstrumentation() { super("java_concurrent", "structured_task_scope"); diff --git a/dd-java-agent/instrumentation/java-concurrent/java-concurrent-21/src/main/java/datadog/trace/instrumentation/java/concurrent/virtualthread/TaskRunnerInstrumentation.java b/dd-java-agent/instrumentation/java-concurrent/java-concurrent-21/src/main/java/datadog/trace/instrumentation/java/concurrent/virtualthread/TaskRunnerInstrumentation.java index 23b4aa6899d..b54146a4b2e 100644 --- a/dd-java-agent/instrumentation/java-concurrent/java-concurrent-21/src/main/java/datadog/trace/instrumentation/java/concurrent/virtualthread/TaskRunnerInstrumentation.java +++ b/dd-java-agent/instrumentation/java-concurrent/java-concurrent-21/src/main/java/datadog/trace/instrumentation/java/concurrent/virtualthread/TaskRunnerInstrumentation.java @@ -24,7 +24,7 @@ */ @AutoService(InstrumenterModule.class) public final class TaskRunnerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType { + implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public TaskRunnerInstrumentation() { super("java_concurrent", "task-runner"); } diff --git a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java b/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java index 4f54449e45d..51d732d40a9 100644 --- a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java +++ b/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java @@ -25,7 +25,7 @@ */ @AutoService(InstrumenterModule.class) public final class AsyncPropagatingDisableInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.CanShortcutTypeMatching { + implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice { public AsyncPropagatingDisableInstrumentation() { super(EXECUTOR_INSTRUMENTATION_NAME); diff --git a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/TaskUnwrappingInstrumentation.java b/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/TaskUnwrappingInstrumentation.java index b075ab82eee..01e810a9875 100644 --- a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/TaskUnwrappingInstrumentation.java +++ b/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/TaskUnwrappingInstrumentation.java @@ -77,9 +77,6 @@ public void typeAdvice(TypeTransformer transformer) { transformer.applyAdvice(new UnwrappingVisitor(TYPES_WITH_FIELDS)); } - @Override - public void methodAdvice(MethodTransformer transformer) {} - @Override public String[] knownMatchingTypes() { String[] types = new String[TYPES_WITH_FIELDS.length / 2]; diff --git a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/WrapRunnableAsNewTaskInstrumentation.java b/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/WrapRunnableAsNewTaskInstrumentation.java index 9e13b502c6d..d15e999ad22 100644 --- a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/WrapRunnableAsNewTaskInstrumentation.java +++ b/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/WrapRunnableAsNewTaskInstrumentation.java @@ -24,7 +24,7 @@ @AutoService(InstrumenterModule.class) public final class WrapRunnableAsNewTaskInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForBootstrap, Instrumenter.ForKnownTypes { + implements Instrumenter.ForBootstrap, Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public WrapRunnableAsNewTaskInstrumentation() { super(EXECUTOR_INSTRUMENTATION_NAME, "new-task-for"); } diff --git a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/AbstractExecutorInstrumentation.java b/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/AbstractExecutorInstrumentation.java index 12acf657a5e..096055f2658 100644 --- a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/AbstractExecutorInstrumentation.java +++ b/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/AbstractExecutorInstrumentation.java @@ -17,7 +17,8 @@ public abstract class AbstractExecutorInstrumentation extends InstrumenterModule.Tracing implements Instrumenter.ForBootstrap, Instrumenter.CanShortcutTypeMatching, - Instrumenter.ForConfiguredTypes { + Instrumenter.ForConfiguredTypes, + Instrumenter.HasMethodAdvice { private static final Logger log = LoggerFactory.getLogger(AbstractExecutorInstrumentation.class); diff --git a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/RejectedExecutionHandlerInstrumentation.java b/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/RejectedExecutionHandlerInstrumentation.java index 6dec821c142..32329ca62d1 100644 --- a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/RejectedExecutionHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/RejectedExecutionHandlerInstrumentation.java @@ -27,7 +27,9 @@ @AutoService(InstrumenterModule.class) public class RejectedExecutionHandlerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForBootstrap, Instrumenter.CanShortcutTypeMatching { + implements Instrumenter.ForBootstrap, + Instrumenter.CanShortcutTypeMatching, + Instrumenter.HasMethodAdvice { public RejectedExecutionHandlerInstrumentation() { super(EXECUTOR_INSTRUMENTATION_NAME, "rejected-execution-handler"); diff --git a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/ThreadPoolExecutorInstrumentation.java b/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/ThreadPoolExecutorInstrumentation.java index 8375a3d9294..6209990b6a1 100644 --- a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/ThreadPoolExecutorInstrumentation.java +++ b/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/ThreadPoolExecutorInstrumentation.java @@ -63,7 +63,10 @@ */ @AutoService(InstrumenterModule.class) public final class ThreadPoolExecutorInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForBootstrap, Instrumenter.ForTypeHierarchy, ExcludeFilterProvider { + implements Instrumenter.ForBootstrap, + Instrumenter.ForTypeHierarchy, + Instrumenter.HasMethodAdvice, + ExcludeFilterProvider { private static final String TPE = "java.util.concurrent.ThreadPoolExecutor"; diff --git a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinPoolInstrumentation.java b/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinPoolInstrumentation.java index 5ecd52eb92b..16da6df78f3 100644 --- a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinPoolInstrumentation.java +++ b/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinPoolInstrumentation.java @@ -25,7 +25,7 @@ @AutoService(InstrumenterModule.class) public class JavaForkJoinPoolInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType { + implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public JavaForkJoinPoolInstrumentation() { super(EXECUTOR_INSTRUMENTATION_NAME, FORK_JOIN_POOL_INSTRUMENTATION_NAME); diff --git a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinTaskInstrumentation.java b/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinTaskInstrumentation.java index 49b530c04c7..447584019a6 100644 --- a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinTaskInstrumentation.java +++ b/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinTaskInstrumentation.java @@ -40,7 +40,10 @@ */ @AutoService(InstrumenterModule.class) public final class JavaForkJoinTaskInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForBootstrap, Instrumenter.ForTypeHierarchy, ExcludeFilterProvider { + implements Instrumenter.ForBootstrap, + Instrumenter.ForTypeHierarchy, + Instrumenter.HasMethodAdvice, + ExcludeFilterProvider { public JavaForkJoinTaskInstrumentation() { super(EXECUTOR_INSTRUMENTATION_NAME, FORK_JOIN_POOL_INSTRUMENTATION_NAME); diff --git a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/ConsumerTaskInstrumentation.java b/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/ConsumerTaskInstrumentation.java index c39f3dcc865..7679b7ca2cb 100644 --- a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/ConsumerTaskInstrumentation.java +++ b/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/ConsumerTaskInstrumentation.java @@ -25,7 +25,7 @@ */ @AutoService(InstrumenterModule.class) public class ConsumerTaskInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType { + implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ConsumerTaskInstrumentation() { super(EXECUTOR_INSTRUMENTATION_NAME, "consumer-task"); } diff --git a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/RunnableFutureInstrumentation.java b/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/RunnableFutureInstrumentation.java index 7bc5b77fc08..a28711a9fdb 100644 --- a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/RunnableFutureInstrumentation.java +++ b/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/RunnableFutureInstrumentation.java @@ -37,7 +37,10 @@ @AutoService(InstrumenterModule.class) public final class RunnableFutureInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForBootstrap, Instrumenter.ForTypeHierarchy, ExcludeFilterProvider { + implements Instrumenter.ForBootstrap, + Instrumenter.ForTypeHierarchy, + Instrumenter.HasMethodAdvice, + ExcludeFilterProvider { public RunnableFutureInstrumentation() { super(EXECUTOR_INSTRUMENTATION_NAME, "runnable-future"); } diff --git a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/RunnableInstrumentation.java b/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/RunnableInstrumentation.java index ff29ef2b02b..d334d5ef2d6 100644 --- a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/RunnableInstrumentation.java +++ b/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/RunnableInstrumentation.java @@ -28,7 +28,9 @@ /** Instrument {@link Runnable} */ @AutoService(InstrumenterModule.class) public final class RunnableInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForBootstrap, Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForBootstrap, + Instrumenter.ForTypeHierarchy, + Instrumenter.HasMethodAdvice { public RunnableInstrumentation() { super(EXECUTOR_INSTRUMENTATION_NAME, RUNNABLE_INSTRUMENTATION_NAME); diff --git a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/timer/JavaTimerInstrumentation.java b/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/timer/JavaTimerInstrumentation.java index 540e4949a00..9f5da393811 100644 --- a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/timer/JavaTimerInstrumentation.java +++ b/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/timer/JavaTimerInstrumentation.java @@ -27,7 +27,7 @@ @AutoService(InstrumenterModule.class) public class JavaTimerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType { + implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public JavaTimerInstrumentation() { super("java_timer", EXECUTOR_INSTRUMENTATION_NAME, RUNNABLE_INSTRUMENTATION_NAME); } diff --git a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/timer/TimerTaskInstrumentation.java b/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/timer/TimerTaskInstrumentation.java index 40cb8fc2b93..7ec39f4586c 100644 --- a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/timer/TimerTaskInstrumentation.java +++ b/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/timer/TimerTaskInstrumentation.java @@ -29,7 +29,9 @@ */ @AutoService(InstrumenterModule.class) public final class TimerTaskInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForBootstrap, Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForBootstrap, + Instrumenter.ForTypeHierarchy, + Instrumenter.HasMethodAdvice { public TimerTaskInstrumentation() { super("java_timer", EXECUTOR_INSTRUMENTATION_NAME, RUNNABLE_INSTRUMENTATION_NAME); diff --git a/dd-java-agent/instrumentation/java-directbytebuffer/src/main/java/datadog/trace/instrumentation/directbytebuffer/ByteBufferInstrumentation.java b/dd-java-agent/instrumentation/java-directbytebuffer/src/main/java/datadog/trace/instrumentation/directbytebuffer/ByteBufferInstrumentation.java index 34be4b7e1ec..29b6a963987 100644 --- a/dd-java-agent/instrumentation/java-directbytebuffer/src/main/java/datadog/trace/instrumentation/directbytebuffer/ByteBufferInstrumentation.java +++ b/dd-java-agent/instrumentation/java-directbytebuffer/src/main/java/datadog/trace/instrumentation/directbytebuffer/ByteBufferInstrumentation.java @@ -16,7 +16,7 @@ @AutoService(InstrumenterModule.class) public final class ByteBufferInstrumentation extends InstrumenterModule.Profiling - implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType { + implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ByteBufferInstrumentation() { super("allocatedirect", "directallocation"); diff --git a/dd-java-agent/instrumentation/java-directbytebuffer/src/main/java/datadog/trace/instrumentation/directbytebuffer/DirectByteBufferInstrumentation.java b/dd-java-agent/instrumentation/java-directbytebuffer/src/main/java/datadog/trace/instrumentation/directbytebuffer/DirectByteBufferInstrumentation.java index e9e0893400b..76da219c253 100644 --- a/dd-java-agent/instrumentation/java-directbytebuffer/src/main/java/datadog/trace/instrumentation/directbytebuffer/DirectByteBufferInstrumentation.java +++ b/dd-java-agent/instrumentation/java-directbytebuffer/src/main/java/datadog/trace/instrumentation/directbytebuffer/DirectByteBufferInstrumentation.java @@ -14,7 +14,7 @@ @AutoService(InstrumenterModule.class) public final class DirectByteBufferInstrumentation extends InstrumenterModule.Profiling - implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType { + implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public DirectByteBufferInstrumentation() { super("jni", "directallocation"); diff --git a/dd-java-agent/instrumentation/java-directbytebuffer/src/main/java/datadog/trace/instrumentation/directbytebuffer/FileChannelImplInstrumentation.java b/dd-java-agent/instrumentation/java-directbytebuffer/src/main/java/datadog/trace/instrumentation/directbytebuffer/FileChannelImplInstrumentation.java index f1e08a0385a..fc5b2506a79 100644 --- a/dd-java-agent/instrumentation/java-directbytebuffer/src/main/java/datadog/trace/instrumentation/directbytebuffer/FileChannelImplInstrumentation.java +++ b/dd-java-agent/instrumentation/java-directbytebuffer/src/main/java/datadog/trace/instrumentation/directbytebuffer/FileChannelImplInstrumentation.java @@ -15,7 +15,7 @@ @AutoService(InstrumenterModule.class) public final class FileChannelImplInstrumentation extends InstrumenterModule.Profiling - implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType { + implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public FileChannelImplInstrumentation() { super("mmap", "directallocation"); diff --git a/dd-java-agent/instrumentation/java-http-client/src/main/java/datadog/trace/instrumentation/httpclient/HttpClientInstrumentation.java b/dd-java-agent/instrumentation/java-http-client/src/main/java/datadog/trace/instrumentation/httpclient/HttpClientInstrumentation.java index 5d187a1d0ab..b8c8b393afd 100644 --- a/dd-java-agent/instrumentation/java-http-client/src/main/java/datadog/trace/instrumentation/httpclient/HttpClientInstrumentation.java +++ b/dd-java-agent/instrumentation/java-http-client/src/main/java/datadog/trace/instrumentation/httpclient/HttpClientInstrumentation.java @@ -19,7 +19,9 @@ @AutoService(InstrumenterModule.class) public class HttpClientInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForBootstrap, Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForBootstrap, + Instrumenter.ForTypeHierarchy, + Instrumenter.HasMethodAdvice { public HttpClientInstrumentation() { super("java-http-client"); diff --git a/dd-java-agent/instrumentation/java-http-client/src/main/java/datadog/trace/instrumentation/httpclient/HttpHeadersInstrumentation.java b/dd-java-agent/instrumentation/java-http-client/src/main/java/datadog/trace/instrumentation/httpclient/HttpHeadersInstrumentation.java index 4b49abe1655..0acf655c856 100644 --- a/dd-java-agent/instrumentation/java-http-client/src/main/java/datadog/trace/instrumentation/httpclient/HttpHeadersInstrumentation.java +++ b/dd-java-agent/instrumentation/java-http-client/src/main/java/datadog/trace/instrumentation/httpclient/HttpHeadersInstrumentation.java @@ -15,7 +15,9 @@ @AutoService(InstrumenterModule.class) public class HttpHeadersInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForBootstrap, Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForBootstrap, + Instrumenter.ForTypeHierarchy, + Instrumenter.HasMethodAdvice { public HttpHeadersInstrumentation() { super("java-http-client"); diff --git a/dd-java-agent/instrumentation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/InputStreamInstrumentation.java b/dd-java-agent/instrumentation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/InputStreamInstrumentation.java index 32e7054fc69..b3802a33c4e 100644 --- a/dd-java-agent/instrumentation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/InputStreamInstrumentation.java +++ b/dd-java-agent/instrumentation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/InputStreamInstrumentation.java @@ -18,7 +18,7 @@ @AutoService(InstrumenterModule.class) public class InputStreamInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { private static final String[] FORCE_LOADING = {"java.io.PushbackInputStream"}; diff --git a/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplInstrumentation.java b/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplInstrumentation.java index 9856e1aa4b2..9aa9d8c19da 100644 --- a/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplInstrumentation.java +++ b/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplInstrumentation.java @@ -11,7 +11,7 @@ @AutoService(InstrumenterModule.class) public class ProcessImplInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType, Instrumenter.ForBootstrap { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, Instrumenter.ForBootstrap { public ProcessImplInstrumentation() { super("java-lang-appsec"); diff --git a/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeInstrumentation.java b/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeInstrumentation.java index 00824a1c003..7474929504e 100644 --- a/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeInstrumentation.java +++ b/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeInstrumentation.java @@ -11,7 +11,7 @@ @AutoService(InstrumenterModule.class) public class RuntimeInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType, Instrumenter.ForBootstrap { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, Instrumenter.ForBootstrap { public RuntimeInstrumentation() { super("java-lang-appsec"); diff --git a/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/management/CustomMBeanBuilderInstrumentation.java b/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/management/CustomMBeanBuilderInstrumentation.java index 87fbc94a1ac..df5dbbfaa8b 100644 --- a/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/management/CustomMBeanBuilderInstrumentation.java +++ b/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/management/CustomMBeanBuilderInstrumentation.java @@ -13,7 +13,7 @@ @AutoService(InstrumenterModule.class) public class CustomMBeanBuilderInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForConfiguredType { + implements Instrumenter.ForConfiguredType, Instrumenter.HasMethodAdvice { private final String customBuilder; diff --git a/dd-java-agent/instrumentation/jax-rs-annotations-1/src/main/java/datadog/trace/instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java b/dd-java-agent/instrumentation/jax-rs-annotations-1/src/main/java/datadog/trace/instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java index a0780800097..3c1b22631d3 100644 --- a/dd-java-agent/instrumentation/jax-rs-annotations-1/src/main/java/datadog/trace/instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java +++ b/dd-java-agent/instrumentation/jax-rs-annotations-1/src/main/java/datadog/trace/instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java @@ -31,7 +31,7 @@ @AutoService(InstrumenterModule.class) public final class JaxRsAnnotationsInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { private static final String JAX_ENDPOINT_OPERATION_NAME = "jax-rs.request"; diff --git a/dd-java-agent/instrumentation/jax-rs-annotations-2/src/main/java/datadog/trace/instrumentation/jaxrs2/AbstractRequestContextInstrumentation.java b/dd-java-agent/instrumentation/jax-rs-annotations-2/src/main/java/datadog/trace/instrumentation/jaxrs2/AbstractRequestContextInstrumentation.java index 5dade36a00d..123c37d6c18 100644 --- a/dd-java-agent/instrumentation/jax-rs-annotations-2/src/main/java/datadog/trace/instrumentation/jaxrs2/AbstractRequestContextInstrumentation.java +++ b/dd-java-agent/instrumentation/jax-rs-annotations-2/src/main/java/datadog/trace/instrumentation/jaxrs2/AbstractRequestContextInstrumentation.java @@ -12,7 +12,7 @@ import net.bytebuddy.matcher.ElementMatcher; public abstract class AbstractRequestContextInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public AbstractRequestContextInstrumentation() { super("jax-rs", "jaxrs", "jax-rs-filter"); } diff --git a/dd-java-agent/instrumentation/jax-rs-annotations-2/src/main/java/datadog/trace/instrumentation/jaxrs2/ContainerRequestFilterInstrumentation.java b/dd-java-agent/instrumentation/jax-rs-annotations-2/src/main/java/datadog/trace/instrumentation/jaxrs2/ContainerRequestFilterInstrumentation.java index a6faaed263a..05977801733 100644 --- a/dd-java-agent/instrumentation/jax-rs-annotations-2/src/main/java/datadog/trace/instrumentation/jaxrs2/ContainerRequestFilterInstrumentation.java +++ b/dd-java-agent/instrumentation/jax-rs-annotations-2/src/main/java/datadog/trace/instrumentation/jaxrs2/ContainerRequestFilterInstrumentation.java @@ -21,7 +21,7 @@ */ @AutoService(InstrumenterModule.class) public class ContainerRequestFilterInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public ContainerRequestFilterInstrumentation() { super("jax-rs", "jaxrs", "jax-rs-filter"); diff --git a/dd-java-agent/instrumentation/jax-rs-annotations-2/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAnnotationsInstrumentation.java b/dd-java-agent/instrumentation/jax-rs-annotations-2/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAnnotationsInstrumentation.java index 9a9bfb74ce3..b425776c73c 100644 --- a/dd-java-agent/instrumentation/jax-rs-annotations-2/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAnnotationsInstrumentation.java +++ b/dd-java-agent/instrumentation/jax-rs-annotations-2/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAnnotationsInstrumentation.java @@ -35,7 +35,7 @@ @AutoService(InstrumenterModule.class) public final class JaxRsAnnotationsInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { private static final String JAX_ENDPOINT_OPERATION_NAME = "jax-rs.request"; diff --git a/dd-java-agent/instrumentation/jax-rs-annotations-2/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAsyncResponseInstrumentation.java b/dd-java-agent/instrumentation/jax-rs-annotations-2/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAsyncResponseInstrumentation.java index 3980e2f8d7e..ee5bc5ce721 100644 --- a/dd-java-agent/instrumentation/jax-rs-annotations-2/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAsyncResponseInstrumentation.java +++ b/dd-java-agent/instrumentation/jax-rs-annotations-2/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAsyncResponseInstrumentation.java @@ -21,7 +21,7 @@ @AutoService(InstrumenterModule.class) public final class JaxRsAsyncResponseInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public JaxRsAsyncResponseInstrumentation() { super("jax-rs", "jaxrs", "jax-rs-annotations"); diff --git a/dd-java-agent/instrumentation/jax-rs-client-1.1/src/main/java/datadog/trace/instrumentation/jaxrs/v1/JaxRsClientV1Instrumentation.java b/dd-java-agent/instrumentation/jax-rs-client-1.1/src/main/java/datadog/trace/instrumentation/jaxrs/v1/JaxRsClientV1Instrumentation.java index d148b0e627b..b90cbf3bf27 100644 --- a/dd-java-agent/instrumentation/jax-rs-client-1.1/src/main/java/datadog/trace/instrumentation/jaxrs/v1/JaxRsClientV1Instrumentation.java +++ b/dd-java-agent/instrumentation/jax-rs-client-1.1/src/main/java/datadog/trace/instrumentation/jaxrs/v1/JaxRsClientV1Instrumentation.java @@ -28,7 +28,7 @@ @AutoService(InstrumenterModule.class) public final class JaxRsClientV1Instrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public JaxRsClientV1Instrumentation() { super("jax-rs", "jaxrs", "jax-rs-client"); diff --git a/dd-java-agent/instrumentation/jax-rs-client-2.0/connection-error-handling-jersey/src/main/java/datadog/trace/instrumentation/connection_error/jersey/ClientRuntimeInstrumentation.java b/dd-java-agent/instrumentation/jax-rs-client-2.0/connection-error-handling-jersey/src/main/java/datadog/trace/instrumentation/connection_error/jersey/ClientRuntimeInstrumentation.java index 5f6c3e55be7..96025bc3081 100644 --- a/dd-java-agent/instrumentation/jax-rs-client-2.0/connection-error-handling-jersey/src/main/java/datadog/trace/instrumentation/connection_error/jersey/ClientRuntimeInstrumentation.java +++ b/dd-java-agent/instrumentation/jax-rs-client-2.0/connection-error-handling-jersey/src/main/java/datadog/trace/instrumentation/connection_error/jersey/ClientRuntimeInstrumentation.java @@ -15,7 +15,7 @@ @AutoService(InstrumenterModule.class) public class ClientRuntimeInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ClientRuntimeInstrumentation() { super("jax-rs", "jaxrs", "jax-rs-client"); } diff --git a/dd-java-agent/instrumentation/jax-rs-client-2.0/connection-error-handling-resteasy/src/main/java/datadog/trace/instrumentation/connection_error/resteasy/ResteasyClientConnectionErrorInstrumentation.java b/dd-java-agent/instrumentation/jax-rs-client-2.0/connection-error-handling-resteasy/src/main/java/datadog/trace/instrumentation/connection_error/resteasy/ResteasyClientConnectionErrorInstrumentation.java index 65608a4cb84..c07a2c1e171 100644 --- a/dd-java-agent/instrumentation/jax-rs-client-2.0/connection-error-handling-resteasy/src/main/java/datadog/trace/instrumentation/connection_error/resteasy/ResteasyClientConnectionErrorInstrumentation.java +++ b/dd-java-agent/instrumentation/jax-rs-client-2.0/connection-error-handling-resteasy/src/main/java/datadog/trace/instrumentation/connection_error/resteasy/ResteasyClientConnectionErrorInstrumentation.java @@ -21,7 +21,7 @@ */ @AutoService(InstrumenterModule.class) public final class ResteasyClientConnectionErrorInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ResteasyClientConnectionErrorInstrumentation() { super("jax-rs", "jaxrs", "jax-rs-client"); diff --git a/dd-java-agent/instrumentation/jax-rs-client-2.0/src/main/java/datadog/trace/instrumentation/jaxrs/JaxRsClientInstrumentation.java b/dd-java-agent/instrumentation/jax-rs-client-2.0/src/main/java/datadog/trace/instrumentation/jaxrs/JaxRsClientInstrumentation.java index c1560e51d02..bf0de6b5c6f 100644 --- a/dd-java-agent/instrumentation/jax-rs-client-2.0/src/main/java/datadog/trace/instrumentation/jaxrs/JaxRsClientInstrumentation.java +++ b/dd-java-agent/instrumentation/jax-rs-client-2.0/src/main/java/datadog/trace/instrumentation/jaxrs/JaxRsClientInstrumentation.java @@ -16,7 +16,7 @@ @AutoService(InstrumenterModule.class) public final class JaxRsClientInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public JaxRsClientInstrumentation() { super("jax-rs", "jaxrs", "jax-rs-client"); diff --git a/dd-java-agent/instrumentation/jax-ws-annotations-1/src/main/java/datadog/trace/instrumentation/jaxws1/WebServiceInstrumentation.java b/dd-java-agent/instrumentation/jax-ws-annotations-1/src/main/java/datadog/trace/instrumentation/jaxws1/WebServiceInstrumentation.java index af728d2cda7..04be0f2fca3 100644 --- a/dd-java-agent/instrumentation/jax-ws-annotations-1/src/main/java/datadog/trace/instrumentation/jaxws1/WebServiceInstrumentation.java +++ b/dd-java-agent/instrumentation/jax-ws-annotations-1/src/main/java/datadog/trace/instrumentation/jaxws1/WebServiceInstrumentation.java @@ -27,7 +27,9 @@ @AutoService(InstrumenterModule.class) public final class WebServiceInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForBootstrap, Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForBootstrap, + Instrumenter.ForTypeHierarchy, + Instrumenter.HasMethodAdvice { private static final String WEB_SERVICE_ANNOTATION_NAME = "javax.jws.WebService"; public WebServiceInstrumentation() { diff --git a/dd-java-agent/instrumentation/jax-ws-annotations-2/src/main/java/datadog/trace/instrumentation/jaxws2/WebServiceProviderInstrumentation.java b/dd-java-agent/instrumentation/jax-ws-annotations-2/src/main/java/datadog/trace/instrumentation/jaxws2/WebServiceProviderInstrumentation.java index 8820ff1f866..6be0c4ece26 100644 --- a/dd-java-agent/instrumentation/jax-ws-annotations-2/src/main/java/datadog/trace/instrumentation/jaxws2/WebServiceProviderInstrumentation.java +++ b/dd-java-agent/instrumentation/jax-ws-annotations-2/src/main/java/datadog/trace/instrumentation/jaxws2/WebServiceProviderInstrumentation.java @@ -23,7 +23,9 @@ @AutoService(InstrumenterModule.class) public final class WebServiceProviderInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForBootstrap, Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForBootstrap, + Instrumenter.ForTypeHierarchy, + Instrumenter.HasMethodAdvice { private static final String WEB_SERVICE_PROVIDER_INTERFACE_NAME = "javax.xml.ws.Provider"; private static final String WEB_SERVICE_PROVIDER_ANNOTATION_NAME = "javax.xml.ws.WebServiceProvider"; diff --git a/dd-java-agent/instrumentation/jboss-logmanager/src/main/java/datadog/trace/instrumentation/jbosslogmanager/ExtLogRecordInstrumentation.java b/dd-java-agent/instrumentation/jboss-logmanager/src/main/java/datadog/trace/instrumentation/jbosslogmanager/ExtLogRecordInstrumentation.java index 2f0060f8d39..009e513ca46 100644 --- a/dd-java-agent/instrumentation/jboss-logmanager/src/main/java/datadog/trace/instrumentation/jbosslogmanager/ExtLogRecordInstrumentation.java +++ b/dd-java-agent/instrumentation/jboss-logmanager/src/main/java/datadog/trace/instrumentation/jbosslogmanager/ExtLogRecordInstrumentation.java @@ -30,7 +30,7 @@ @AutoService(InstrumenterModule.class) public class ExtLogRecordInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public ExtLogRecordInstrumentation() { super("jboss-logmanager"); } diff --git a/dd-java-agent/instrumentation/jboss-logmanager/src/main/java/datadog/trace/instrumentation/jbosslogmanager/LoggerNodeInstrumentation.java b/dd-java-agent/instrumentation/jboss-logmanager/src/main/java/datadog/trace/instrumentation/jbosslogmanager/LoggerNodeInstrumentation.java index 885249fe763..1190823b508 100644 --- a/dd-java-agent/instrumentation/jboss-logmanager/src/main/java/datadog/trace/instrumentation/jbosslogmanager/LoggerNodeInstrumentation.java +++ b/dd-java-agent/instrumentation/jboss-logmanager/src/main/java/datadog/trace/instrumentation/jbosslogmanager/LoggerNodeInstrumentation.java @@ -19,7 +19,7 @@ @AutoService(InstrumenterModule.class) public class LoggerNodeInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public LoggerNodeInstrumentation() { super("jboss-logmanager"); } diff --git a/dd-java-agent/instrumentation/jboss-modules/src/main/java/datadog/trace/instrumentation/jbossmodules/ModuleInstrumentation.java b/dd-java-agent/instrumentation/jboss-modules/src/main/java/datadog/trace/instrumentation/jbossmodules/ModuleInstrumentation.java index 235675a90f6..39c07bebdb0 100644 --- a/dd-java-agent/instrumentation/jboss-modules/src/main/java/datadog/trace/instrumentation/jbossmodules/ModuleInstrumentation.java +++ b/dd-java-agent/instrumentation/jboss-modules/src/main/java/datadog/trace/instrumentation/jbossmodules/ModuleInstrumentation.java @@ -20,7 +20,7 @@ @AutoService(InstrumenterModule.class) public final class ModuleInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ModuleInstrumentation() { super("classloading", "jboss-modules"); } diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractConnectionInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractConnectionInstrumentation.java index 57a42c20eea..a19e2cd345d 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractConnectionInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractConnectionInstrumentation.java @@ -20,7 +20,7 @@ import net.bytebuddy.asm.Advice; public abstract class AbstractConnectionInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForBootstrap { + implements Instrumenter.ForBootstrap, Instrumenter.HasMethodAdvice { public AbstractConnectionInstrumentation(String instrumentationName, String... additionalNames) { super(instrumentationName, additionalNames); } diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractPreparedStatementInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractPreparedStatementInstrumentation.java index 29e8e2d6ff2..133e66cfc5a 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractPreparedStatementInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractPreparedStatementInstrumentation.java @@ -30,7 +30,7 @@ import net.bytebuddy.asm.Advice; public abstract class AbstractPreparedStatementInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForBootstrap { + implements Instrumenter.ForBootstrap, Instrumenter.HasMethodAdvice { public AbstractPreparedStatementInstrumentation( String instrumentationName, String... additionalNames) { diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DB2ConnectionInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DB2ConnectionInstrumentation.java index 6cb04f8c098..7fc1086a53f 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DB2ConnectionInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DB2ConnectionInstrumentation.java @@ -11,7 +11,7 @@ @AutoService(InstrumenterModule.class) public class DB2ConnectionInstrumentation extends AbstractConnectionInstrumentation - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public DB2ConnectionInstrumentation() { super("jdbc", "db2"); } diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DB2PreparedStatementInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DB2PreparedStatementInstrumentation.java index bb173667cd3..2f4a82b227b 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DB2PreparedStatementInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DB2PreparedStatementInstrumentation.java @@ -11,7 +11,7 @@ @AutoService(InstrumenterModule.class) public class DB2PreparedStatementInstrumentation extends AbstractPreparedStatementInstrumentation - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public DB2PreparedStatementInstrumentation() { super("jdbc", "db2"); } diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DBMCompatibleConnectionInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DBMCompatibleConnectionInstrumentation.java index 8041f2037ff..1c628afe152 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DBMCompatibleConnectionInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DBMCompatibleConnectionInstrumentation.java @@ -27,7 +27,7 @@ @AutoService(InstrumenterModule.class) public class DBMCompatibleConnectionInstrumentation extends AbstractConnectionInstrumentation - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { /** Instrumentation class for connections for Database Monitoring supported DBs * */ public DBMCompatibleConnectionInstrumentation() { diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DataSourceInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DataSourceInstrumentation.java index d5d85cb395f..1ce5bc20c40 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DataSourceInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DataSourceInstrumentation.java @@ -20,7 +20,9 @@ @AutoService(InstrumenterModule.class) public final class DataSourceInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForBootstrap, Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForBootstrap, + Instrumenter.ForTypeHierarchy, + Instrumenter.HasMethodAdvice { public DataSourceInstrumentation() { super("jdbc-datasource"); } diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DefaultConnectionInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DefaultConnectionInstrumentation.java index 525fde5d7f9..a798240a03b 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DefaultConnectionInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DefaultConnectionInstrumentation.java @@ -7,7 +7,9 @@ @AutoService(InstrumenterModule.class) public class DefaultConnectionInstrumentation extends AbstractConnectionInstrumentation - implements Instrumenter.ForKnownTypes, Instrumenter.ForConfiguredType { + implements Instrumenter.ForKnownTypes, + Instrumenter.ForConfiguredType, + Instrumenter.HasMethodAdvice { static final String[] CONCRETE_TYPES = { // redshift diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DriverInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DriverInstrumentation.java index c5d47cbb9be..17ac8d7629a 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DriverInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DriverInstrumentation.java @@ -23,7 +23,9 @@ @AutoService(InstrumenterModule.class) public final class DriverInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForBootstrap, Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForBootstrap, + Instrumenter.ForTypeHierarchy, + Instrumenter.HasMethodAdvice { public DriverInstrumentation() { super("jdbc"); diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariDataSourceInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariDataSourceInstrumentation.java index 1ba6dedddf8..05517b28c1e 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariDataSourceInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariDataSourceInstrumentation.java @@ -17,7 +17,7 @@ @AutoService(InstrumenterModule.class) public final class HikariDataSourceInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { private static final Logger log = LoggerFactory.getLogger(HikariDataSourceInstrumentation.class); diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/PreparedStatementInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/PreparedStatementInstrumentation.java index 86d94fa3255..45668424aba 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/PreparedStatementInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/PreparedStatementInstrumentation.java @@ -7,7 +7,9 @@ @AutoService(InstrumenterModule.class) public final class PreparedStatementInstrumentation extends AbstractPreparedStatementInstrumentation - implements Instrumenter.ForKnownTypes, Instrumenter.ForConfiguredType { + implements Instrumenter.ForKnownTypes, + Instrumenter.ForConfiguredType, + Instrumenter.HasMethodAdvice { private static final String[] CONCRETE_TYPES = { // redshift diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java index 5aec7efed4a..33b4ff4af31 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java @@ -33,7 +33,9 @@ @AutoService(InstrumenterModule.class) public final class StatementInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForBootstrap, Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForBootstrap, + Instrumenter.ForTypeHierarchy, + Instrumenter.HasMethodAdvice { public StatementInstrumentation() { super("jdbc"); diff --git a/dd-java-agent/instrumentation/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java b/dd-java-agent/instrumentation/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java index 9b6bdd7aa3d..c82e3a9c60c 100644 --- a/dd-java-agent/instrumentation/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java +++ b/dd-java-agent/instrumentation/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java @@ -22,7 +22,7 @@ @AutoService(InstrumenterModule.class) public final class JedisInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public JedisInstrumentation() { super("jedis", "redis"); diff --git a/dd-java-agent/instrumentation/jedis-3.0/src/main/java/datadog/trace/instrumentation/jedis30/JedisInstrumentation.java b/dd-java-agent/instrumentation/jedis-3.0/src/main/java/datadog/trace/instrumentation/jedis30/JedisInstrumentation.java index 4488fea1c09..d9ff072c6a2 100644 --- a/dd-java-agent/instrumentation/jedis-3.0/src/main/java/datadog/trace/instrumentation/jedis30/JedisInstrumentation.java +++ b/dd-java-agent/instrumentation/jedis-3.0/src/main/java/datadog/trace/instrumentation/jedis30/JedisInstrumentation.java @@ -20,7 +20,7 @@ @AutoService(InstrumenterModule.class) public final class JedisInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public JedisInstrumentation() { super("jedis", "redis"); diff --git a/dd-java-agent/instrumentation/jedis-4.0/src/main/java/datadog/trace/instrumentation/jedis40/JedisInstrumentation.java b/dd-java-agent/instrumentation/jedis-4.0/src/main/java/datadog/trace/instrumentation/jedis40/JedisInstrumentation.java index 6f50947d7e7..a40bc392c00 100644 --- a/dd-java-agent/instrumentation/jedis-4.0/src/main/java/datadog/trace/instrumentation/jedis40/JedisInstrumentation.java +++ b/dd-java-agent/instrumentation/jedis-4.0/src/main/java/datadog/trace/instrumentation/jedis40/JedisInstrumentation.java @@ -22,7 +22,7 @@ @AutoService(InstrumenterModule.class) public final class JedisInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public JedisInstrumentation() { super("jedis", "redis"); diff --git a/dd-java-agent/instrumentation/jersey-2-appsec/src/main/java/datadog/trace/instrumentation/jersey2/MessageBodyReaderInstrumentation.java b/dd-java-agent/instrumentation/jersey-2-appsec/src/main/java/datadog/trace/instrumentation/jersey2/MessageBodyReaderInstrumentation.java index f1bfb2ee5fc..a0b27cc6b2c 100644 --- a/dd-java-agent/instrumentation/jersey-2-appsec/src/main/java/datadog/trace/instrumentation/jersey2/MessageBodyReaderInstrumentation.java +++ b/dd-java-agent/instrumentation/jersey-2-appsec/src/main/java/datadog/trace/instrumentation/jersey2/MessageBodyReaderInstrumentation.java @@ -23,7 +23,7 @@ // keep in sync with jersey3 (jakarta packages) @AutoService(InstrumenterModule.class) public class MessageBodyReaderInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public MessageBodyReaderInstrumentation() { super("jersey"); diff --git a/dd-java-agent/instrumentation/jersey-2-appsec/src/main/java/datadog/trace/instrumentation/jersey2/MultiPartReaderServerSideInstrumentation.java b/dd-java-agent/instrumentation/jersey-2-appsec/src/main/java/datadog/trace/instrumentation/jersey2/MultiPartReaderServerSideInstrumentation.java index 84c56972b10..06d351c11c2 100644 --- a/dd-java-agent/instrumentation/jersey-2-appsec/src/main/java/datadog/trace/instrumentation/jersey2/MultiPartReaderServerSideInstrumentation.java +++ b/dd-java-agent/instrumentation/jersey-2-appsec/src/main/java/datadog/trace/instrumentation/jersey2/MultiPartReaderServerSideInstrumentation.java @@ -32,7 +32,7 @@ @AutoService(InstrumenterModule.class) public class MultiPartReaderServerSideInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public MultiPartReaderServerSideInstrumentation() { super("jersey"); diff --git a/dd-java-agent/instrumentation/jersey-2-appsec/src/main/java/datadog/trace/instrumentation/jersey2/ServerRuntimeResponderInstrumentation.java b/dd-java-agent/instrumentation/jersey-2-appsec/src/main/java/datadog/trace/instrumentation/jersey2/ServerRuntimeResponderInstrumentation.java index ab85a370606..f7d734fa559 100644 --- a/dd-java-agent/instrumentation/jersey-2-appsec/src/main/java/datadog/trace/instrumentation/jersey2/ServerRuntimeResponderInstrumentation.java +++ b/dd-java-agent/instrumentation/jersey-2-appsec/src/main/java/datadog/trace/instrumentation/jersey2/ServerRuntimeResponderInstrumentation.java @@ -18,7 +18,7 @@ // tested in GrizzlyTest (grizzly-http) @AutoService(InstrumenterModule.class) public class ServerRuntimeResponderInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ServerRuntimeResponderInstrumentation() { super("jersey"); } diff --git a/dd-java-agent/instrumentation/jersey-2-appsec/src/main/java/datadog/trace/instrumentation/jersey2/UriRoutingContextGetPathSegmentsInstrumentation.java b/dd-java-agent/instrumentation/jersey-2-appsec/src/main/java/datadog/trace/instrumentation/jersey2/UriRoutingContextGetPathSegmentsInstrumentation.java index 26180f20abe..4aee0839a07 100644 --- a/dd-java-agent/instrumentation/jersey-2-appsec/src/main/java/datadog/trace/instrumentation/jersey2/UriRoutingContextGetPathSegmentsInstrumentation.java +++ b/dd-java-agent/instrumentation/jersey-2-appsec/src/main/java/datadog/trace/instrumentation/jersey2/UriRoutingContextGetPathSegmentsInstrumentation.java @@ -14,7 +14,7 @@ @AutoService(InstrumenterModule.class) public class UriRoutingContextGetPathSegmentsInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public UriRoutingContextGetPathSegmentsInstrumentation() { super("jersey"); } diff --git a/dd-java-agent/instrumentation/jersey-2-appsec/src/main/java/datadog/trace/instrumentation/jersey2/UriRoutingContextInstrumentation.java b/dd-java-agent/instrumentation/jersey-2-appsec/src/main/java/datadog/trace/instrumentation/jersey2/UriRoutingContextInstrumentation.java index a54818d01e1..e5ded3ad109 100644 --- a/dd-java-agent/instrumentation/jersey-2-appsec/src/main/java/datadog/trace/instrumentation/jersey2/UriRoutingContextInstrumentation.java +++ b/dd-java-agent/instrumentation/jersey-2-appsec/src/main/java/datadog/trace/instrumentation/jersey2/UriRoutingContextInstrumentation.java @@ -24,7 +24,7 @@ @AutoService(InstrumenterModule.class) public class UriRoutingContextInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public UriRoutingContextInstrumentation() { super("jersey"); } diff --git a/dd-java-agent/instrumentation/jersey-3-appsec/src/main/java/datadog/trace/instrumentation/jersey3/MessageBodyReaderInstrumentation.java b/dd-java-agent/instrumentation/jersey-3-appsec/src/main/java/datadog/trace/instrumentation/jersey3/MessageBodyReaderInstrumentation.java index 96e79df700e..4403dc8538c 100644 --- a/dd-java-agent/instrumentation/jersey-3-appsec/src/main/java/datadog/trace/instrumentation/jersey3/MessageBodyReaderInstrumentation.java +++ b/dd-java-agent/instrumentation/jersey-3-appsec/src/main/java/datadog/trace/instrumentation/jersey3/MessageBodyReaderInstrumentation.java @@ -23,7 +23,7 @@ // keep in sync with jersey2 (javax packages) @AutoService(InstrumenterModule.class) public class MessageBodyReaderInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public MessageBodyReaderInstrumentation() { super("jersey"); } diff --git a/dd-java-agent/instrumentation/jersey-3-appsec/src/main/java/datadog/trace/instrumentation/jersey3/MultiPartReaderServerSideInstrumentation.java b/dd-java-agent/instrumentation/jersey-3-appsec/src/main/java/datadog/trace/instrumentation/jersey3/MultiPartReaderServerSideInstrumentation.java index 85e6d98eaef..48658ec7c13 100644 --- a/dd-java-agent/instrumentation/jersey-3-appsec/src/main/java/datadog/trace/instrumentation/jersey3/MultiPartReaderServerSideInstrumentation.java +++ b/dd-java-agent/instrumentation/jersey-3-appsec/src/main/java/datadog/trace/instrumentation/jersey3/MultiPartReaderServerSideInstrumentation.java @@ -32,7 +32,7 @@ @AutoService(InstrumenterModule.class) public class MultiPartReaderServerSideInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public MultiPartReaderServerSideInstrumentation() { super("jersey"); diff --git a/dd-java-agent/instrumentation/jersey-3-appsec/src/main/java/datadog/trace/instrumentation/jersey3/UriRoutingContextGetPathSegmentsInstrumentation.java b/dd-java-agent/instrumentation/jersey-3-appsec/src/main/java/datadog/trace/instrumentation/jersey3/UriRoutingContextGetPathSegmentsInstrumentation.java index 25c8d7363e4..ec013052658 100644 --- a/dd-java-agent/instrumentation/jersey-3-appsec/src/main/java/datadog/trace/instrumentation/jersey3/UriRoutingContextGetPathSegmentsInstrumentation.java +++ b/dd-java-agent/instrumentation/jersey-3-appsec/src/main/java/datadog/trace/instrumentation/jersey3/UriRoutingContextGetPathSegmentsInstrumentation.java @@ -14,7 +14,7 @@ @AutoService(InstrumenterModule.class) public class UriRoutingContextGetPathSegmentsInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public UriRoutingContextGetPathSegmentsInstrumentation() { super("jersey"); } diff --git a/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/AbstractStringReaderInstrumentation.java b/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/AbstractStringReaderInstrumentation.java index 8c71bf95455..f4ee9455d0b 100644 --- a/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/AbstractStringReaderInstrumentation.java +++ b/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/AbstractStringReaderInstrumentation.java @@ -20,7 +20,7 @@ @AutoService(InstrumenterModule.class) public class AbstractStringReaderInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public AbstractStringReaderInstrumentation() { super("jersey"); diff --git a/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/ContainerRequestInstrumentation.java b/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/ContainerRequestInstrumentation.java index 0c84b867020..74813cf1b61 100644 --- a/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/ContainerRequestInstrumentation.java +++ b/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/ContainerRequestInstrumentation.java @@ -20,7 +20,7 @@ @AutoService(InstrumenterModule.class) public class ContainerRequestInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ContainerRequestInstrumentation() { super("jersey"); diff --git a/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/CookieInstrumentation.java b/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/CookieInstrumentation.java index 5e95ec601a3..941447506a1 100644 --- a/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/CookieInstrumentation.java +++ b/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/CookieInstrumentation.java @@ -21,7 +21,7 @@ @AutoService(InstrumenterModule.class) public class CookieInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public CookieInstrumentation() { super("jersey"); diff --git a/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/FormInstrumentation.java b/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/FormInstrumentation.java index 291d0cb364d..c128a194b77 100644 --- a/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/FormInstrumentation.java +++ b/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/FormInstrumentation.java @@ -23,7 +23,7 @@ @AutoService(InstrumenterModule.class) public class FormInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public FormInstrumentation() { super("jersey"); diff --git a/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/InboundMessageContextInstrumentation.java b/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/InboundMessageContextInstrumentation.java index 56b346d36d3..753b5af65a9 100644 --- a/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/InboundMessageContextInstrumentation.java +++ b/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/InboundMessageContextInstrumentation.java @@ -28,7 +28,7 @@ @AutoService(InstrumenterModule.class) public class InboundMessageContextInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public InboundMessageContextInstrumentation() { super("jersey"); diff --git a/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/JakartaWSResponseInstrumentation.java b/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/JakartaWSResponseInstrumentation.java index f07fee198a5..4a0e6e8f57e 100644 --- a/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/JakartaWSResponseInstrumentation.java +++ b/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/JakartaWSResponseInstrumentation.java @@ -20,7 +20,7 @@ @AutoService(InstrumenterModule.class) public class JakartaWSResponseInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public JakartaWSResponseInstrumentation() { super("jersey"); diff --git a/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/JavaxWSResponseInstrumentation.java b/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/JavaxWSResponseInstrumentation.java index 78f9ddecfe7..2720ff63f14 100644 --- a/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/JavaxWSResponseInstrumentation.java +++ b/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/JavaxWSResponseInstrumentation.java @@ -20,7 +20,7 @@ @AutoService(InstrumenterModule.class) public class JavaxWSResponseInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public JavaxWSResponseInstrumentation() { super("jersey"); diff --git a/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/ReaderInterceptorExecutorInstrumentation.java b/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/ReaderInterceptorExecutorInstrumentation.java index 76509b9a85c..4fdf2bc6d21 100644 --- a/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/ReaderInterceptorExecutorInstrumentation.java +++ b/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/ReaderInterceptorExecutorInstrumentation.java @@ -20,7 +20,7 @@ // keep in sync with jersey2 (javax packages) @AutoService(InstrumenterModule.class) public class ReaderInterceptorExecutorInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ReaderInterceptorExecutorInstrumentation() { super("jersey"); } diff --git a/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/UriRoutingContextInstrumentation.java b/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/UriRoutingContextInstrumentation.java index 1924d3e5e32..43d20243130 100644 --- a/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/UriRoutingContextInstrumentation.java +++ b/dd-java-agent/instrumentation/jersey/src/main/java/datadog/trace/instrumentation/jersey/UriRoutingContextInstrumentation.java @@ -23,7 +23,7 @@ @AutoService(InstrumenterModule.class) public class UriRoutingContextInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public UriRoutingContextInstrumentation() { super("jersey"); diff --git a/dd-java-agent/instrumentation/jetty-11/src/main/java/datadog/trace/instrumentation/jetty11/JettyServerInstrumentation.java b/dd-java-agent/instrumentation/jetty-11/src/main/java/datadog/trace/instrumentation/jetty11/JettyServerInstrumentation.java index cbce9c4cb69..37145845bbd 100644 --- a/dd-java-agent/instrumentation/jetty-11/src/main/java/datadog/trace/instrumentation/jetty11/JettyServerInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-11/src/main/java/datadog/trace/instrumentation/jetty11/JettyServerInstrumentation.java @@ -29,7 +29,10 @@ @AutoService(InstrumenterModule.class) public final class JettyServerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType, ExcludeFilterProvider, Instrumenter.HasTypeAdvice { + implements Instrumenter.ForSingleType, + Instrumenter.HasTypeAdvice, + Instrumenter.HasMethodAdvice, + ExcludeFilterProvider { public JettyServerInstrumentation() { super("jetty"); diff --git a/dd-java-agent/instrumentation/jetty-11/src/main/java/datadog/trace/instrumentation/jetty11/RequestInstrumentation.java b/dd-java-agent/instrumentation/jetty-11/src/main/java/datadog/trace/instrumentation/jetty11/RequestInstrumentation.java index 99a39d79ac4..215ea920aff 100644 --- a/dd-java-agent/instrumentation/jetty-11/src/main/java/datadog/trace/instrumentation/jetty11/RequestInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-11/src/main/java/datadog/trace/instrumentation/jetty11/RequestInstrumentation.java @@ -9,7 +9,7 @@ @AutoService(InstrumenterModule.class) public final class RequestInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public RequestInstrumentation() { super("jetty"); diff --git a/dd-java-agent/instrumentation/jetty-12/src/main/java/datadog/trace/instrumentation/jetty12/AbstractSessionManagerInstrumentation.java b/dd-java-agent/instrumentation/jetty-12/src/main/java/datadog/trace/instrumentation/jetty12/AbstractSessionManagerInstrumentation.java index 3a1db8a5f6e..653014f1d82 100644 --- a/dd-java-agent/instrumentation/jetty-12/src/main/java/datadog/trace/instrumentation/jetty12/AbstractSessionManagerInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-12/src/main/java/datadog/trace/instrumentation/jetty12/AbstractSessionManagerInstrumentation.java @@ -11,7 +11,7 @@ @AutoService(InstrumenterModule.class) public final class AbstractSessionManagerInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public AbstractSessionManagerInstrumentation() { super("jetty"); diff --git a/dd-java-agent/instrumentation/jetty-12/src/main/java/datadog/trace/instrumentation/jetty12/ContextHandlerInstrumentation.java b/dd-java-agent/instrumentation/jetty-12/src/main/java/datadog/trace/instrumentation/jetty12/ContextHandlerInstrumentation.java index 5162a46db69..c1ef8ff2722 100644 --- a/dd-java-agent/instrumentation/jetty-12/src/main/java/datadog/trace/instrumentation/jetty12/ContextHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-12/src/main/java/datadog/trace/instrumentation/jetty12/ContextHandlerInstrumentation.java @@ -13,7 +13,7 @@ @AutoService(InstrumenterModule.class) public final class ContextHandlerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public ContextHandlerInstrumentation() { super("jetty"); diff --git a/dd-java-agent/instrumentation/jetty-12/src/main/java/datadog/trace/instrumentation/jetty12/JettyServerInstrumentation.java b/dd-java-agent/instrumentation/jetty-12/src/main/java/datadog/trace/instrumentation/jetty12/JettyServerInstrumentation.java index a4a5ba842c7..7692aaa19a4 100644 --- a/dd-java-agent/instrumentation/jetty-12/src/main/java/datadog/trace/instrumentation/jetty12/JettyServerInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-12/src/main/java/datadog/trace/instrumentation/jetty12/JettyServerInstrumentation.java @@ -17,7 +17,7 @@ @AutoService(InstrumenterModule.class) public final class JettyServerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType, ExcludeFilterProvider { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, ExcludeFilterProvider { public JettyServerInstrumentation() { super("jetty"); diff --git a/dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyCommitResponseInstrumentation.java b/dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyCommitResponseInstrumentation.java index 118ac83c31d..4728c725ca0 100644 --- a/dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyCommitResponseInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyCommitResponseInstrumentation.java @@ -22,7 +22,7 @@ @AutoService(InstrumenterModule.class) public final class JettyCommitResponseInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public JettyCommitResponseInstrumentation() { super("jetty"); diff --git a/dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyGeneratorInstrumentation.java b/dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyGeneratorInstrumentation.java index eee64485573..3b4d9ee49e7 100644 --- a/dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyGeneratorInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyGeneratorInstrumentation.java @@ -17,7 +17,7 @@ @AutoService(InstrumenterModule.class) public final class JettyGeneratorInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public JettyGeneratorInstrumentation() { super("jetty"); diff --git a/dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyServerInstrumentation.java b/dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyServerInstrumentation.java index f65d25d2f86..d9315332101 100644 --- a/dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyServerInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyServerInstrumentation.java @@ -39,7 +39,9 @@ @AutoService(InstrumenterModule.class) public final class JettyServerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType, Instrumenter.HasTypeAdvice { + implements Instrumenter.ForSingleType, + Instrumenter.HasTypeAdvice, + Instrumenter.HasMethodAdvice { public JettyServerInstrumentation() { super("jetty"); diff --git a/dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/RequestInstrumentation.java b/dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/RequestInstrumentation.java index a4751eec3ae..9cfd9c992b1 100644 --- a/dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/RequestInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/RequestInstrumentation.java @@ -29,7 +29,7 @@ @AutoService(InstrumenterModule.class) public final class RequestInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public RequestInstrumentation() { super("jetty"); diff --git a/dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/ServerHandleInstrumentation.java b/dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/ServerHandleInstrumentation.java index 92cdd88a0d5..58ddd318ab4 100644 --- a/dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/ServerHandleInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/ServerHandleInstrumentation.java @@ -18,7 +18,7 @@ @AutoService(InstrumenterModule.class) public class ServerHandleInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ServerHandleInstrumentation() { super("jetty"); } diff --git a/dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyCommitResponseInstrumentation.java b/dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyCommitResponseInstrumentation.java index 596dca38013..380bf5a30d1 100644 --- a/dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyCommitResponseInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyCommitResponseInstrumentation.java @@ -23,7 +23,7 @@ @AutoService(InstrumenterModule.class) public final class JettyCommitResponseInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public JettyCommitResponseInstrumentation() { super("jetty"); diff --git a/dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyGeneratorInstrumentation.java b/dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyGeneratorInstrumentation.java index 1520d63735c..63214189b67 100644 --- a/dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyGeneratorInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyGeneratorInstrumentation.java @@ -17,7 +17,7 @@ @AutoService(InstrumenterModule.class) public final class JettyGeneratorInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public JettyGeneratorInstrumentation() { super("jetty"); diff --git a/dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyServerInstrumentation.java b/dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyServerInstrumentation.java index 1961ff9e671..30359485db9 100644 --- a/dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyServerInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyServerInstrumentation.java @@ -39,7 +39,9 @@ @AutoService(InstrumenterModule.class) public final class JettyServerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType, Instrumenter.HasTypeAdvice { + implements Instrumenter.ForSingleType, + Instrumenter.HasTypeAdvice, + Instrumenter.HasMethodAdvice { public JettyServerInstrumentation() { super("jetty"); diff --git a/dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/RequestInstrumentation.java b/dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/RequestInstrumentation.java index cee10cd945b..be74a281258 100644 --- a/dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/RequestInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/RequestInstrumentation.java @@ -29,7 +29,7 @@ @AutoService(InstrumenterModule.class) public final class RequestInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public RequestInstrumentation() { super("jetty"); diff --git a/dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/ServerHandleInstrumentation.java b/dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/ServerHandleInstrumentation.java index a406679203f..86f239b9e69 100644 --- a/dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/ServerHandleInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/ServerHandleInstrumentation.java @@ -18,7 +18,7 @@ @AutoService(InstrumenterModule.class) public class ServerHandleInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ServerHandleInstrumentation() { super("jetty"); } diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty10/DispatchableInstrumentation.java b/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty10/DispatchableInstrumentation.java index 879e7a9b57b..557104f5215 100644 --- a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty10/DispatchableInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty10/DispatchableInstrumentation.java @@ -12,7 +12,7 @@ @AutoService(InstrumenterModule.class) public class DispatchableInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public DispatchableInstrumentation() { super("jetty"); } diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty10/JettyCommitResponseInstrumentation.java b/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty10/JettyCommitResponseInstrumentation.java index f7aaa1ddd87..57bdb56474d 100644 --- a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty10/JettyCommitResponseInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty10/JettyCommitResponseInstrumentation.java @@ -11,7 +11,7 @@ @AutoService(InstrumenterModule.class) public final class JettyCommitResponseInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public JettyCommitResponseInstrumentation() { super("jetty"); diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty10/JettyServerInstrumentation.java b/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty10/JettyServerInstrumentation.java index 3dc45a388c5..874a618c0db 100644 --- a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty10/JettyServerInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty10/JettyServerInstrumentation.java @@ -33,7 +33,10 @@ @AutoService(InstrumenterModule.class) public final class JettyServerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType, ExcludeFilterProvider, Instrumenter.HasTypeAdvice { + implements Instrumenter.ForSingleType, + Instrumenter.HasTypeAdvice, + Instrumenter.HasMethodAdvice, + ExcludeFilterProvider { private boolean appSecNotFullyDisabled; diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty10/RequestInstrumentation.java b/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty10/RequestInstrumentation.java index a47c2b7efe0..d2a487f37e7 100644 --- a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty10/RequestInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty10/RequestInstrumentation.java @@ -9,7 +9,7 @@ @AutoService(InstrumenterModule.class) public final class RequestInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public RequestInstrumentation() { super("jetty"); diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty10/ServerHandleInstrumentation.java b/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty10/ServerHandleInstrumentation.java index 531966a35d2..de756bb60a4 100644 --- a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty10/ServerHandleInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty10/ServerHandleInstrumentation.java @@ -10,7 +10,7 @@ @AutoService(InstrumenterModule.class) public class ServerHandleInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ServerHandleInstrumentation() { super("jetty"); } diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/JettyCommitResponseInstrumentation.java b/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/JettyCommitResponseInstrumentation.java index 3cf0f426c89..fb92469eaa7 100644 --- a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/JettyCommitResponseInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/JettyCommitResponseInstrumentation.java @@ -24,7 +24,7 @@ @AutoService(InstrumenterModule.class) public final class JettyCommitResponseInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public JettyCommitResponseInstrumentation() { super("jetty"); diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/JettyServerInstrumentation.java b/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/JettyServerInstrumentation.java index f4cd564861d..e3f0115ca85 100644 --- a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/JettyServerInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/JettyServerInstrumentation.java @@ -47,7 +47,10 @@ @AutoService(InstrumenterModule.class) public final class JettyServerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType, ExcludeFilterProvider, Instrumenter.HasTypeAdvice { + implements Instrumenter.ForSingleType, + Instrumenter.HasTypeAdvice, + Instrumenter.HasMethodAdvice, + ExcludeFilterProvider { private boolean appSecNotFullyDisabled; diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/RequestInstrumentation.java b/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/RequestInstrumentation.java index d06e238f496..ce06bf0ef21 100644 --- a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/RequestInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/RequestInstrumentation.java @@ -31,7 +31,7 @@ @AutoService(InstrumenterModule.class) public final class RequestInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public RequestInstrumentation() { super("jetty"); diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/ServerHandleInstrumentation.java b/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/ServerHandleInstrumentation.java index 041a13a874d..477e60d80b5 100644 --- a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/ServerHandleInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/ServerHandleInstrumentation.java @@ -29,7 +29,7 @@ */ @AutoService(InstrumenterModule.class) public class ServerHandleInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ServerHandleInstrumentation() { super("jetty"); } diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty904/JettyCommitResponseInstrumentation.java b/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty904/JettyCommitResponseInstrumentation.java index 404af82b9fd..4c6e9189333 100644 --- a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty904/JettyCommitResponseInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty904/JettyCommitResponseInstrumentation.java @@ -11,7 +11,7 @@ @AutoService(InstrumenterModule.class) public final class JettyCommitResponseInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public JettyCommitResponseInstrumentation() { super("jetty"); diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty93/JettyCommitResponseInstrumentation.java b/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty93/JettyCommitResponseInstrumentation.java index 89c79ecb91c..f9490ab5b83 100644 --- a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty93/JettyCommitResponseInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty93/JettyCommitResponseInstrumentation.java @@ -11,7 +11,7 @@ @AutoService(InstrumenterModule.class) public final class JettyCommitResponseInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public JettyCommitResponseInstrumentation() { super("jetty"); diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9421/JettyCommitResponseInstrumentation.java b/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9421/JettyCommitResponseInstrumentation.java index 1a1f2577d6f..94d503250ac 100644 --- a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9421/JettyCommitResponseInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9421/JettyCommitResponseInstrumentation.java @@ -11,7 +11,7 @@ @AutoService(InstrumenterModule.class) public final class JettyCommitResponseInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public JettyCommitResponseInstrumentation() { super("jetty"); diff --git a/dd-java-agent/instrumentation/jetty-appsec-7/src/main/java/datadog/trace/instrumentation/jetty70/RequestExtractParametersInstrumentation.java b/dd-java-agent/instrumentation/jetty-appsec-7/src/main/java/datadog/trace/instrumentation/jetty70/RequestExtractParametersInstrumentation.java index 72f8b451c5d..e2405b77a29 100644 --- a/dd-java-agent/instrumentation/jetty-appsec-7/src/main/java/datadog/trace/instrumentation/jetty70/RequestExtractParametersInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-appsec-7/src/main/java/datadog/trace/instrumentation/jetty70/RequestExtractParametersInstrumentation.java @@ -13,7 +13,7 @@ @AutoService(InstrumenterModule.class) public class RequestExtractParametersInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public RequestExtractParametersInstrumentation() { super("jetty"); } diff --git a/dd-java-agent/instrumentation/jetty-appsec-7/src/main/java/datadog/trace/instrumentation/jetty70/UrlEncodedInstrumentation.java b/dd-java-agent/instrumentation/jetty-appsec-7/src/main/java/datadog/trace/instrumentation/jetty70/UrlEncodedInstrumentation.java index 53bd036ff92..3d6e113ed42 100644 --- a/dd-java-agent/instrumentation/jetty-appsec-7/src/main/java/datadog/trace/instrumentation/jetty70/UrlEncodedInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-appsec-7/src/main/java/datadog/trace/instrumentation/jetty70/UrlEncodedInstrumentation.java @@ -28,7 +28,7 @@ @AutoService(InstrumenterModule.class) public class UrlEncodedInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public UrlEncodedInstrumentation() { super("jetty"); } diff --git a/dd-java-agent/instrumentation/jetty-appsec-8.1.3/src/main/java/datadog/trace/instrumentation/jetty8/RequestGetPartsInstrumentation.java b/dd-java-agent/instrumentation/jetty-appsec-8.1.3/src/main/java/datadog/trace/instrumentation/jetty8/RequestGetPartsInstrumentation.java index 2bdb26563a5..e0185600be4 100644 --- a/dd-java-agent/instrumentation/jetty-appsec-8.1.3/src/main/java/datadog/trace/instrumentation/jetty8/RequestGetPartsInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-appsec-8.1.3/src/main/java/datadog/trace/instrumentation/jetty8/RequestGetPartsInstrumentation.java @@ -40,7 +40,9 @@ @AutoService(InstrumenterModule.class) public class RequestGetPartsInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType, Instrumenter.HasTypeAdvice { + implements Instrumenter.ForSingleType, + Instrumenter.HasTypeAdvice, + Instrumenter.HasMethodAdvice { public RequestGetPartsInstrumentation() { super("jetty"); } diff --git a/dd-java-agent/instrumentation/jetty-appsec-9.2/src/main/java/datadog/trace/instrumentation/jetty92/RequestExtractContentParametersInstrumentation.java b/dd-java-agent/instrumentation/jetty-appsec-9.2/src/main/java/datadog/trace/instrumentation/jetty92/RequestExtractContentParametersInstrumentation.java index 0c49dc48f7a..fb99e0953ac 100644 --- a/dd-java-agent/instrumentation/jetty-appsec-9.2/src/main/java/datadog/trace/instrumentation/jetty92/RequestExtractContentParametersInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-appsec-9.2/src/main/java/datadog/trace/instrumentation/jetty92/RequestExtractContentParametersInstrumentation.java @@ -26,7 +26,7 @@ @AutoService(InstrumenterModule.class) public class RequestExtractContentParametersInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { private static final String MULTI_MAP_INTERNAL_NAME = "Lorg/eclipse/jetty/util/MultiMap;"; public RequestExtractContentParametersInstrumentation() { diff --git a/dd-java-agent/instrumentation/jetty-appsec-9.3/src/main/java/datadog/trace/instrumentation/jetty93/RequestExtractContentParametersInstrumentation.java b/dd-java-agent/instrumentation/jetty-appsec-9.3/src/main/java/datadog/trace/instrumentation/jetty93/RequestExtractContentParametersInstrumentation.java index faaaf4e901d..914552be205 100644 --- a/dd-java-agent/instrumentation/jetty-appsec-9.3/src/main/java/datadog/trace/instrumentation/jetty93/RequestExtractContentParametersInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-appsec-9.3/src/main/java/datadog/trace/instrumentation/jetty93/RequestExtractContentParametersInstrumentation.java @@ -25,7 +25,7 @@ @AutoService(InstrumenterModule.class) public class RequestExtractContentParametersInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { private static final String MULTI_MAP_INTERNAL_NAME = "Lorg/eclipse/jetty/util/MultiMap;"; public RequestExtractContentParametersInstrumentation() { diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-10.0/src/main/java/datadog/trace/instrumentation/jetty_client10/JettyClientInstrumentation.java b/dd-java-agent/instrumentation/jetty-client/jetty-client-10.0/src/main/java/datadog/trace/instrumentation/jetty_client10/JettyClientInstrumentation.java index 838a84d32eb..1ddf6eb654a 100644 --- a/dd-java-agent/instrumentation/jetty-client/jetty-client-10.0/src/main/java/datadog/trace/instrumentation/jetty_client10/JettyClientInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-client/jetty-client-10.0/src/main/java/datadog/trace/instrumentation/jetty_client10/JettyClientInstrumentation.java @@ -20,7 +20,7 @@ @AutoService(InstrumenterModule.class) public class JettyClientInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType, ExcludeFilterProvider { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, ExcludeFilterProvider { public JettyClientInstrumentation() { super("jetty-client"); } diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/src/main/java/datadog/trace/instrumentation/jetty_client12/FutureResponseListenerInstrumentation.java b/dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/src/main/java/datadog/trace/instrumentation/jetty_client12/FutureResponseListenerInstrumentation.java index 7b664ee29be..9e48141c43b 100644 --- a/dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/src/main/java/datadog/trace/instrumentation/jetty_client12/FutureResponseListenerInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/src/main/java/datadog/trace/instrumentation/jetty_client12/FutureResponseListenerInstrumentation.java @@ -14,7 +14,7 @@ @AutoService(InstrumenterModule.class) public final class FutureResponseListenerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public FutureResponseListenerInstrumentation() { super("jetty-client"); diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/src/main/java/datadog/trace/instrumentation/jetty_client12/JettyHttpClientInstrumentation.java b/dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/src/main/java/datadog/trace/instrumentation/jetty_client12/JettyHttpClientInstrumentation.java index e305ff71965..d8d78fb9c01 100644 --- a/dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/src/main/java/datadog/trace/instrumentation/jetty_client12/JettyHttpClientInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/src/main/java/datadog/trace/instrumentation/jetty_client12/JettyHttpClientInstrumentation.java @@ -22,7 +22,7 @@ @AutoService(InstrumenterModule.class) public class JettyHttpClientInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType, ExcludeFilterProvider { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, ExcludeFilterProvider { public JettyHttpClientInstrumentation() { super("jetty-client"); } diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/FutureResponseListenerInstrumentation.java b/dd-java-agent/instrumentation/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/FutureResponseListenerInstrumentation.java index 891c09af123..901ea526d65 100644 --- a/dd-java-agent/instrumentation/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/FutureResponseListenerInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/FutureResponseListenerInstrumentation.java @@ -18,7 +18,7 @@ @AutoService(InstrumenterModule.class) public final class FutureResponseListenerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public FutureResponseListenerInstrumentation() { super("jetty-client"); diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/JettyAddListenerInstrumentation.java b/dd-java-agent/instrumentation/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/JettyAddListenerInstrumentation.java index 522d35ffb69..1e9c9ed2307 100644 --- a/dd-java-agent/instrumentation/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/JettyAddListenerInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/JettyAddListenerInstrumentation.java @@ -20,7 +20,7 @@ @AutoService(InstrumenterModule.class) public class JettyAddListenerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public JettyAddListenerInstrumentation() { super("jetty-client"); } diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/JettyClientInstrumentation.java b/dd-java-agent/instrumentation/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/JettyClientInstrumentation.java index 89e038f5b98..5d0349002e6 100644 --- a/dd-java-agent/instrumentation/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/JettyClientInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/JettyClientInstrumentation.java @@ -30,7 +30,7 @@ @AutoService(InstrumenterModule.class) public class JettyClientInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType, ExcludeFilterProvider { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, ExcludeFilterProvider { public JettyClientInstrumentation() { super("jetty-client"); } diff --git a/dd-java-agent/instrumentation/jetty-util/src/main/java/datadog/trace/instrumentation/jetty_util/QueuedThreadPoolInstrumentation.java b/dd-java-agent/instrumentation/jetty-util/src/main/java/datadog/trace/instrumentation/jetty_util/QueuedThreadPoolInstrumentation.java index c8198516c56..d6aa363430a 100644 --- a/dd-java-agent/instrumentation/jetty-util/src/main/java/datadog/trace/instrumentation/jetty_util/QueuedThreadPoolInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-util/src/main/java/datadog/trace/instrumentation/jetty_util/QueuedThreadPoolInstrumentation.java @@ -10,7 +10,7 @@ @AutoService(InstrumenterModule.class) public class QueuedThreadPoolInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public QueuedThreadPoolInstrumentation() { super("jetty-concurrent"); } diff --git a/dd-java-agent/instrumentation/jms/src/main/java/datadog/trace/instrumentation/jms/JMSMessageConsumerInstrumentation.java b/dd-java-agent/instrumentation/jms/src/main/java/datadog/trace/instrumentation/jms/JMSMessageConsumerInstrumentation.java index cc8d597f367..db455c87571 100644 --- a/dd-java-agent/instrumentation/jms/src/main/java/datadog/trace/instrumentation/jms/JMSMessageConsumerInstrumentation.java +++ b/dd-java-agent/instrumentation/jms/src/main/java/datadog/trace/instrumentation/jms/JMSMessageConsumerInstrumentation.java @@ -38,7 +38,7 @@ @AutoService(InstrumenterModule.class) public final class JMSMessageConsumerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public JMSMessageConsumerInstrumentation() { super("jms", "jms-1", "jms-2"); diff --git a/dd-java-agent/instrumentation/jms/src/main/java/datadog/trace/instrumentation/jms/JMSMessageProducerInstrumentation.java b/dd-java-agent/instrumentation/jms/src/main/java/datadog/trace/instrumentation/jms/JMSMessageProducerInstrumentation.java index fb5107f52e6..c060307e339 100644 --- a/dd-java-agent/instrumentation/jms/src/main/java/datadog/trace/instrumentation/jms/JMSMessageProducerInstrumentation.java +++ b/dd-java-agent/instrumentation/jms/src/main/java/datadog/trace/instrumentation/jms/JMSMessageProducerInstrumentation.java @@ -33,7 +33,7 @@ @AutoService(InstrumenterModule.class) public final class JMSMessageProducerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public JMSMessageProducerInstrumentation() { super("jms", "jms-1", "jms-2"); diff --git a/dd-java-agent/instrumentation/jms/src/main/java/datadog/trace/instrumentation/jms/MDBMessageConsumerInstrumentation.java b/dd-java-agent/instrumentation/jms/src/main/java/datadog/trace/instrumentation/jms/MDBMessageConsumerInstrumentation.java index c5f2233cabb..714e470cebc 100644 --- a/dd-java-agent/instrumentation/jms/src/main/java/datadog/trace/instrumentation/jms/MDBMessageConsumerInstrumentation.java +++ b/dd-java-agent/instrumentation/jms/src/main/java/datadog/trace/instrumentation/jms/MDBMessageConsumerInstrumentation.java @@ -32,7 +32,7 @@ @AutoService(InstrumenterModule.class) public final class MDBMessageConsumerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public MDBMessageConsumerInstrumentation() { super("jms", "javax-mdb"); diff --git a/dd-java-agent/instrumentation/jms/src/main/java/datadog/trace/instrumentation/jms/MessageInstrumentation.java b/dd-java-agent/instrumentation/jms/src/main/java/datadog/trace/instrumentation/jms/MessageInstrumentation.java index 9534fa39e00..a795746c826 100644 --- a/dd-java-agent/instrumentation/jms/src/main/java/datadog/trace/instrumentation/jms/MessageInstrumentation.java +++ b/dd-java-agent/instrumentation/jms/src/main/java/datadog/trace/instrumentation/jms/MessageInstrumentation.java @@ -21,7 +21,7 @@ @AutoService(InstrumenterModule.class) public class MessageInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public MessageInstrumentation() { super("jms", "jms-1", "jms-2"); } diff --git a/dd-java-agent/instrumentation/jms/src/main/java/datadog/trace/instrumentation/jms/SessionInstrumentation.java b/dd-java-agent/instrumentation/jms/src/main/java/datadog/trace/instrumentation/jms/SessionInstrumentation.java index 1bd7fcab8a5..0798de0c0f6 100644 --- a/dd-java-agent/instrumentation/jms/src/main/java/datadog/trace/instrumentation/jms/SessionInstrumentation.java +++ b/dd-java-agent/instrumentation/jms/src/main/java/datadog/trace/instrumentation/jms/SessionInstrumentation.java @@ -34,7 +34,7 @@ @AutoService(InstrumenterModule.class) public class SessionInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public SessionInstrumentation() { super("jms", "jms-1", "jms-2"); } diff --git a/dd-java-agent/instrumentation/jose-jwt/src/main/java/datadog/trace/instrumentation/josejwt/JSONObjectUtilsInstrumentation.java b/dd-java-agent/instrumentation/jose-jwt/src/main/java/datadog/trace/instrumentation/josejwt/JSONObjectUtilsInstrumentation.java index 4c2ea64527f..4d5a895bec3 100644 --- a/dd-java-agent/instrumentation/jose-jwt/src/main/java/datadog/trace/instrumentation/josejwt/JSONObjectUtilsInstrumentation.java +++ b/dd-java-agent/instrumentation/jose-jwt/src/main/java/datadog/trace/instrumentation/josejwt/JSONObjectUtilsInstrumentation.java @@ -21,7 +21,7 @@ @AutoService(InstrumenterModule.class) public class JSONObjectUtilsInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public JSONObjectUtilsInstrumentation() { super("jwt", "jose-jwt"); diff --git a/dd-java-agent/instrumentation/jose-jwt/src/main/java/datadog/trace/instrumentation/josejwt/JWTParserInstrumentation.java b/dd-java-agent/instrumentation/jose-jwt/src/main/java/datadog/trace/instrumentation/josejwt/JWTParserInstrumentation.java index 5fcd4340c09..0ac9db1b102 100644 --- a/dd-java-agent/instrumentation/jose-jwt/src/main/java/datadog/trace/instrumentation/josejwt/JWTParserInstrumentation.java +++ b/dd-java-agent/instrumentation/jose-jwt/src/main/java/datadog/trace/instrumentation/josejwt/JWTParserInstrumentation.java @@ -20,7 +20,7 @@ @AutoService(InstrumenterModule.class) public class JWTParserInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public JWTParserInstrumentation() { super("jwt", "auth0-jwt"); diff --git a/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JSPInstrumentation.java b/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JSPInstrumentation.java index 240940a43c1..f8e59bee44b 100644 --- a/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JSPInstrumentation.java +++ b/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JSPInstrumentation.java @@ -21,7 +21,7 @@ @AutoService(InstrumenterModule.class) public final class JSPInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public JSPInstrumentation() { super("jsp", "jsp-render"); diff --git a/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JasperJSPCompilationContextInstrumentation.java b/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JasperJSPCompilationContextInstrumentation.java index 6028a3d468d..47c7309c354 100644 --- a/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JasperJSPCompilationContextInstrumentation.java +++ b/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JasperJSPCompilationContextInstrumentation.java @@ -18,7 +18,7 @@ @AutoService(InstrumenterModule.class) public final class JasperJSPCompilationContextInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public JasperJSPCompilationContextInstrumentation() { super("jsp", "jsp-compile"); diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberInstrumentation.java b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberInstrumentation.java index b681f16e257..60d63bba1c8 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberInstrumentation.java @@ -20,7 +20,7 @@ @AutoService(InstrumenterModule.class) public class JUnit4CucumberInstrumentation extends InstrumenterModule.CiVisibility - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public JUnit4CucumberInstrumentation() { super("ci-visibility", "junit-4", "junit-4-cucumber"); diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberItrInstrumentation.java b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberItrInstrumentation.java index a93d2751830..507ba3df32b 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberItrInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberItrInstrumentation.java @@ -25,7 +25,7 @@ @AutoService(InstrumenterModule.class) public class JUnit4CucumberItrInstrumentation extends InstrumenterModule.CiVisibility - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public JUnit4CucumberItrInstrumentation() { super("ci-visibility", "junit-4", "junit-4-cucumber"); diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/retry/Cucumber4RetryInstrumentation.java b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/retry/Cucumber4RetryInstrumentation.java index 52e959e5e84..c8e7e925489 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/retry/Cucumber4RetryInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/retry/Cucumber4RetryInstrumentation.java @@ -27,7 +27,7 @@ @AutoService(InstrumenterModule.class) public class Cucumber4RetryInstrumentation extends InstrumenterModule.CiVisibility - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { private final String parentPackageName = Strings.getPackageName(JUnit4Utils.class.getName()); diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/JUnit4BeforeAfterInstrumentation.java b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/JUnit4BeforeAfterInstrumentation.java index 64fa95ca93c..bd2405bab66 100644 --- a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/JUnit4BeforeAfterInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/JUnit4BeforeAfterInstrumentation.java @@ -14,7 +14,7 @@ @AutoService(InstrumenterModule.class) public class JUnit4BeforeAfterInstrumentation extends InstrumenterModule.CiVisibility - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public JUnit4BeforeAfterInstrumentation() { super("ci-visibility", "junit-4", "setup-teardown"); diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitInstrumentation.java b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitInstrumentation.java index 61594ba3746..1414a51bf60 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitInstrumentation.java @@ -18,7 +18,7 @@ @AutoService(InstrumenterModule.class) public class MUnitInstrumentation extends InstrumenterModule.CiVisibility - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public MUnitInstrumentation() { super("ci-visibility", "junit-4", "junit-4-munit"); diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/retry/MUnitRetryInstrumentation.java b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/retry/MUnitRetryInstrumentation.java index 6516f034c7f..775fbc609c3 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/retry/MUnitRetryInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/retry/MUnitRetryInstrumentation.java @@ -27,7 +27,7 @@ @AutoService(InstrumenterModule.class) public class MUnitRetryInstrumentation extends InstrumenterModule.CiVisibility - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { private final String parentPackageName = Strings.getPackageName(JUnit4Utils.class.getName()); diff --git a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Instrumentation.java b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Instrumentation.java index 561a7f0f176..8b1b4f1d294 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Instrumentation.java +++ b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Instrumentation.java @@ -25,7 +25,7 @@ @AutoService(InstrumenterModule.class) public class JUnit4Instrumentation extends InstrumenterModule.CiVisibility - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { static final int ORDER = 0; diff --git a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4ItrInstrumentation.java b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4ItrInstrumentation.java index d3f32d8f526..78a7e575477 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4ItrInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4ItrInstrumentation.java @@ -27,7 +27,7 @@ @AutoService(InstrumenterModule.class) public class JUnit4ItrInstrumentation extends InstrumenterModule.CiVisibility - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public JUnit4ItrInstrumentation() { super("ci-visibility", "junit-4"); diff --git a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4SuiteEventsInstrumentation.java b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4SuiteEventsInstrumentation.java index 135d7f3b4b5..cd9269780da 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4SuiteEventsInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4SuiteEventsInstrumentation.java @@ -20,7 +20,7 @@ @AutoService(InstrumenterModule.class) public class JUnit4SuiteEventsInstrumentation extends InstrumenterModule.CiVisibility - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public JUnit4SuiteEventsInstrumentation() { super("ci-visibility", "junit-4"); diff --git a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnitLegacySuiteEventsInstrumentation.java b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnitLegacySuiteEventsInstrumentation.java index 458e3180964..2e80a36d130 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnitLegacySuiteEventsInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnitLegacySuiteEventsInstrumentation.java @@ -20,7 +20,7 @@ */ @AutoService(InstrumenterModule.class) public class JUnitLegacySuiteEventsInstrumentation extends InstrumenterModule.CiVisibility - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public JUnitLegacySuiteEventsInstrumentation() { super("ci-visibility", "junit-4", "junit-38", "powermock"); diff --git a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/retry/JUnit4RetryInstrumentation.java b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/retry/JUnit4RetryInstrumentation.java index 92e526b324a..35d5749e201 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/retry/JUnit4RetryInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/retry/JUnit4RetryInstrumentation.java @@ -30,7 +30,7 @@ @AutoService(InstrumenterModule.class) public class JUnit4RetryInstrumentation extends InstrumenterModule.CiVisibility - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { private final String parentPackageName = Strings.getPackageName(JUnit4Utils.class.getName()); diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberInstrumentation.java b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberInstrumentation.java index 01939287fed..7366f38bbdf 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberInstrumentation.java @@ -18,7 +18,7 @@ @AutoService(InstrumenterModule.class) public class JUnit5CucumberInstrumentation extends InstrumenterModule.CiVisibility - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public JUnit5CucumberInstrumentation() { super("ci-visibility", "junit-5", "junit-5-cucumber"); diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberItrInstrumentation.java b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberItrInstrumentation.java index e2b344f37ab..a2bd1bc899b 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberItrInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberItrInstrumentation.java @@ -24,7 +24,7 @@ @AutoService(InstrumenterModule.class) public class JUnit5CucumberItrInstrumentation extends InstrumenterModule.CiVisibility - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public JUnit5CucumberItrInstrumentation() { super("ci-visibility", "junit-5", "junit-5-cucumber"); diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/JUnit5BeforeAfterInstrumentation.java b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/JUnit5BeforeAfterInstrumentation.java index 31647a4632e..9dec3950560 100644 --- a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/JUnit5BeforeAfterInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/JUnit5BeforeAfterInstrumentation.java @@ -14,7 +14,7 @@ @AutoService(InstrumenterModule.class) public class JUnit5BeforeAfterInstrumentation extends InstrumenterModule.CiVisibility - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public JUnit5BeforeAfterInstrumentation() { super("ci-visibility", "junit-5", "setup-teardown"); diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/JUnit5TestOrderInstrumentation.java b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/JUnit5TestOrderInstrumentation.java index fb58e56327b..ee566f61c45 100644 --- a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/JUnit5TestOrderInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/JUnit5TestOrderInstrumentation.java @@ -24,7 +24,7 @@ @AutoService(InstrumenterModule.class) public class JUnit5TestOrderInstrumentation extends InstrumenterModule.CiVisibility - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { private final String parentPackageName = Strings.getPackageName(JUnitPlatformUtils.class.getName()); diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SpockInstrumentation.java b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SpockInstrumentation.java index b82dae34334..74319ce2353 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SpockInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SpockInstrumentation.java @@ -18,7 +18,7 @@ @AutoService(InstrumenterModule.class) public class JUnit5SpockInstrumentation extends InstrumenterModule.CiVisibility - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public JUnit5SpockInstrumentation() { super("ci-visibility", "junit-5", "junit-5-spock"); diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SpockItrInstrumentation.java b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SpockItrInstrumentation.java index cd6fa5e2f09..52adeb14940 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SpockItrInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SpockItrInstrumentation.java @@ -25,7 +25,7 @@ @AutoService(InstrumenterModule.class) public class JUnit5SpockItrInstrumentation extends InstrumenterModule.CiVisibility - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public JUnit5SpockItrInstrumentation() { super("ci-visibility", "junit-5", "junit-5-spock"); diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/retry/JUnit5SpockParameterizedRetryInstrumentation.java b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/retry/JUnit5SpockParameterizedRetryInstrumentation.java index f96a178e152..1a3f54851df 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/retry/JUnit5SpockParameterizedRetryInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/retry/JUnit5SpockParameterizedRetryInstrumentation.java @@ -22,7 +22,7 @@ */ @AutoService(InstrumenterModule.class) public class JUnit5SpockParameterizedRetryInstrumentation extends InstrumenterModule.CiVisibility - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { private final String parentPackageName = Strings.getPackageName(JUnitPlatformUtils.class.getName()); diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5Instrumentation.java b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5Instrumentation.java index 33049b4975f..216dead8d10 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5Instrumentation.java +++ b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5Instrumentation.java @@ -24,7 +24,7 @@ @AutoService(InstrumenterModule.class) public class JUnit5Instrumentation extends InstrumenterModule.CiVisibility - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public JUnit5Instrumentation() { super("ci-visibility", "junit-5"); diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5ItrInstrumentation.java b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5ItrInstrumentation.java index d36b72d359b..b3211c22883 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5ItrInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5ItrInstrumentation.java @@ -25,7 +25,7 @@ @AutoService(InstrumenterModule.class) public class JUnit5ItrInstrumentation extends InstrumenterModule.CiVisibility - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public JUnit5ItrInstrumentation() { super("ci-visibility", "junit-5"); diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/retry/JUnit5NodeTestTaskContextInstrumentation.java b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/retry/JUnit5NodeTestTaskContextInstrumentation.java index 81c7cec8715..3a46fec2031 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/retry/JUnit5NodeTestTaskContextInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/retry/JUnit5NodeTestTaskContextInstrumentation.java @@ -15,7 +15,7 @@ @AutoService(InstrumenterModule.class) public class JUnit5NodeTestTaskContextInstrumentation extends InstrumenterModule.CiVisibility - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { private final String parentPackageName = Strings.getPackageName(JUnitPlatformUtils.class.getName()); diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/retry/JUnit5RetryInstrumentation.java b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/retry/JUnit5RetryInstrumentation.java index 6baaffa06de..d591f5b8e40 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/retry/JUnit5RetryInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/retry/JUnit5RetryInstrumentation.java @@ -34,7 +34,7 @@ @AutoService(InstrumenterModule.class) public class JUnit5RetryInstrumentation extends InstrumenterModule.CiVisibility - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { private final String parentPackageName = Strings.getPackageName(JUnitPlatformUtils.class.getName()); diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/ConsumerCoordinatorInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/ConsumerCoordinatorInstrumentation.java index 0f76d75745e..2479889d88c 100644 --- a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/ConsumerCoordinatorInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/ConsumerCoordinatorInstrumentation.java @@ -28,7 +28,7 @@ @AutoService(InstrumenterModule.class) public final class ConsumerCoordinatorInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ConsumerCoordinatorInstrumentation() { super("kafka", "kafka-0.11"); diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInfoInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInfoInstrumentation.java index e8b25c01277..aa84e5b48ee 100644 --- a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInfoInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInfoInstrumentation.java @@ -40,7 +40,7 @@ */ @AutoService(InstrumenterModule.class) public final class KafkaConsumerInfoInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public KafkaConsumerInfoInstrumentation() { super("kafka", "kafka-0.11"); diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInstrumentation.java index 3028c03de9c..6e33247a333 100644 --- a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInstrumentation.java @@ -27,7 +27,7 @@ @AutoService(InstrumenterModule.class) public final class KafkaConsumerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public KafkaConsumerInstrumentation() { super("kafka", "kafka-0.11"); diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaDeserializerInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaDeserializerInstrumentation.java index 269a5118f16..2f180b7a3e2 100644 --- a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaDeserializerInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaDeserializerInstrumentation.java @@ -24,7 +24,7 @@ @AutoService(InstrumenterModule.class) public class KafkaDeserializerInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { private static final String DESERIALIZER_CLASS = "org.apache.kafka.common.serialization.Deserializer"; diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java index 3e5e42119f3..db90d8cae1a 100644 --- a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java @@ -46,7 +46,7 @@ @AutoService(InstrumenterModule.class) public final class KafkaProducerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public KafkaProducerInstrumentation() { super("kafka", "kafka-0.11"); diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/MetadataInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/MetadataInstrumentation.java index be39d61dd96..308a9610f37 100644 --- a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/MetadataInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/MetadataInstrumentation.java @@ -23,7 +23,7 @@ @AutoService(InstrumenterModule.class) public class MetadataInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public MetadataInstrumentation() { super("kafka", "kafka-0.11"); diff --git a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/ConsumerCoordinatorInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/ConsumerCoordinatorInstrumentation.java index 05fd44cd273..2fd786dcb09 100644 --- a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/ConsumerCoordinatorInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/ConsumerCoordinatorInstrumentation.java @@ -13,7 +13,7 @@ @AutoService(InstrumenterModule.class) public final class ConsumerCoordinatorInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ConsumerCoordinatorInstrumentation() { super("kafka", "kafka-3.8"); diff --git a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInfoInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInfoInstrumentation.java index 832389b03a0..576982b9da4 100644 --- a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInfoInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInfoInstrumentation.java @@ -25,7 +25,7 @@ */ @AutoService(InstrumenterModule.class) public final class KafkaConsumerInfoInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public KafkaConsumerInfoInstrumentation() { super("kafka", "kafka-3.8"); diff --git a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInstrumentation.java index 53d7bf6c989..071032f1e5b 100644 --- a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInstrumentation.java @@ -20,7 +20,7 @@ @AutoService(InstrumenterModule.class) public final class KafkaConsumerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public KafkaConsumerInstrumentation() { super("kafka", "kafka-3.8"); diff --git a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaProducerInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaProducerInstrumentation.java index 120c08ce19c..bb0af11f3db 100644 --- a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaProducerInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaProducerInstrumentation.java @@ -16,7 +16,7 @@ @AutoService(InstrumenterModule.class) public final class KafkaProducerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public KafkaProducerInstrumentation() { super("kafka", "kafka-3.8"); diff --git a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/LegacyKafkaConsumerInfoInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/LegacyKafkaConsumerInfoInstrumentation.java index e430f3d6207..73aa4534816 100644 --- a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/LegacyKafkaConsumerInfoInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/LegacyKafkaConsumerInfoInstrumentation.java @@ -25,7 +25,7 @@ */ @AutoService(InstrumenterModule.class) public final class LegacyKafkaConsumerInfoInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public LegacyKafkaConsumerInfoInstrumentation() { super("kafka", "kafka-3.8"); diff --git a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/MetadataInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/MetadataInstrumentation.java index b8757e50752..0e5a9bf2fc5 100644 --- a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/MetadataInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/MetadataInstrumentation.java @@ -16,7 +16,7 @@ @AutoService(InstrumenterModule.class) public class MetadataInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public MetadataInstrumentation() { super("kafka", "kafka-3.8"); diff --git a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/OffsetCommitCallbackInvokerInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/OffsetCommitCallbackInvokerInstrumentation.java index 83631de92b7..e64beeb1ebd 100644 --- a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/OffsetCommitCallbackInvokerInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/OffsetCommitCallbackInvokerInstrumentation.java @@ -11,7 +11,7 @@ // new - this instrumentation is completely new. // the purpose of this class is to provide us with information on consumer group and cluster ID public class OffsetCommitCallbackInvokerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public OffsetCommitCallbackInvokerInstrumentation() { super("kafka", "kafka-3.8"); } diff --git a/dd-java-agent/instrumentation/kafka-connect-0.11/src/main/java/datadog/trace/instrumentation/kafka_connect/ConnectWorkerInstrumentation.java b/dd-java-agent/instrumentation/kafka-connect-0.11/src/main/java/datadog/trace/instrumentation/kafka_connect/ConnectWorkerInstrumentation.java index e4ae35bfed4..8983fd46fc8 100644 --- a/dd-java-agent/instrumentation/kafka-connect-0.11/src/main/java/datadog/trace/instrumentation/kafka_connect/ConnectWorkerInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-connect-0.11/src/main/java/datadog/trace/instrumentation/kafka_connect/ConnectWorkerInstrumentation.java @@ -16,7 +16,7 @@ @AutoService(InstrumenterModule.class) public final class ConnectWorkerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { static final String TARGET_TYPE = "org.apache.kafka.connect.runtime.WorkerTask"; diff --git a/dd-java-agent/instrumentation/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamTaskInstrumentation.java b/dd-java-agent/instrumentation/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamTaskInstrumentation.java index 5f51750af5b..de6d392b200 100644 --- a/dd-java-agent/instrumentation/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamTaskInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamTaskInstrumentation.java @@ -50,7 +50,7 @@ @AutoService(InstrumenterModule.class) public class KafkaStreamTaskInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public KafkaStreamTaskInstrumentation() { super("kafka", "kafka-streams"); diff --git a/dd-java-agent/instrumentation/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamsSourceNodeRecordDeserializerInstrumentation.java b/dd-java-agent/instrumentation/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamsSourceNodeRecordDeserializerInstrumentation.java index dbf4549f958..81348490676 100644 --- a/dd-java-agent/instrumentation/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamsSourceNodeRecordDeserializerInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamsSourceNodeRecordDeserializerInstrumentation.java @@ -16,7 +16,8 @@ // This is necessary because SourceNodeRecordDeserializer drops the headers. :-( @AutoService(InstrumenterModule.class) public class KafkaStreamsSourceNodeRecordDeserializerInstrumentation - extends InstrumenterModule.Tracing implements Instrumenter.ForSingleType { + extends InstrumenterModule.Tracing + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public KafkaStreamsSourceNodeRecordDeserializerInstrumentation() { super("kafka", "kafka-streams"); diff --git a/dd-java-agent/instrumentation/kafka-streams-1.0/src/main/java/datadog/trace/instrumentation/kafka_streams10/InternalTopologyBuilderInstrumentation.java b/dd-java-agent/instrumentation/kafka-streams-1.0/src/main/java/datadog/trace/instrumentation/kafka_streams10/InternalTopologyBuilderInstrumentation.java index b75a08b040d..07271bb7904 100644 --- a/dd-java-agent/instrumentation/kafka-streams-1.0/src/main/java/datadog/trace/instrumentation/kafka_streams10/InternalTopologyBuilderInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-streams-1.0/src/main/java/datadog/trace/instrumentation/kafka_streams10/InternalTopologyBuilderInstrumentation.java @@ -13,7 +13,7 @@ @AutoService(InstrumenterModule.class) public class InternalTopologyBuilderInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public InternalTopologyBuilderInstrumentation() { super("kafka", "kafka-streams"); diff --git a/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateInstrumentation.java b/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateInstrumentation.java index ce2f16de1d6..e1bead7a500 100644 --- a/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateInstrumentation.java +++ b/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateInstrumentation.java @@ -16,7 +16,7 @@ @AutoService(InstrumenterModule.class) public class KarateInstrumentation extends InstrumenterModule.CiVisibility - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public KarateInstrumentation() { super("ci-visibility", "karate"); diff --git a/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateRetryInstrumentation.java b/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateRetryInstrumentation.java index 4b3ecebeb91..b67302e72c8 100644 --- a/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateRetryInstrumentation.java +++ b/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateRetryInstrumentation.java @@ -23,7 +23,7 @@ @AutoService(InstrumenterModule.class) public class KarateRetryInstrumentation extends InstrumenterModule.CiVisibility - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public KarateRetryInstrumentation() { super("ci-visibility", "karate", "test-retry"); diff --git a/dd-java-agent/instrumentation/kotlin-coroutines/src/main/java/datadog/trace/instrumentation/kotlin/coroutines/AbstractCoroutinesInstrumentation.java b/dd-java-agent/instrumentation/kotlin-coroutines/src/main/java/datadog/trace/instrumentation/kotlin/coroutines/AbstractCoroutinesInstrumentation.java index 87a128c7394..897e85079f7 100644 --- a/dd-java-agent/instrumentation/kotlin-coroutines/src/main/java/datadog/trace/instrumentation/kotlin/coroutines/AbstractCoroutinesInstrumentation.java +++ b/dd-java-agent/instrumentation/kotlin-coroutines/src/main/java/datadog/trace/instrumentation/kotlin/coroutines/AbstractCoroutinesInstrumentation.java @@ -20,7 +20,9 @@ import net.bytebuddy.matcher.ElementMatcher; public abstract class AbstractCoroutinesInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy, Instrumenter.WithTypeStructure { + implements Instrumenter.ForTypeHierarchy, + Instrumenter.WithTypeStructure, + Instrumenter.HasMethodAdvice { protected static final String ABSTRACT_COROUTINE_CLASS_NAME = "kotlinx.coroutines.AbstractCoroutine"; diff --git a/dd-java-agent/instrumentation/lettuce-4/src/main/java/datadog/trace/instrumentation/lettuce4/LettuceAsyncCommandsInstrumentation.java b/dd-java-agent/instrumentation/lettuce-4/src/main/java/datadog/trace/instrumentation/lettuce4/LettuceAsyncCommandsInstrumentation.java index d644273ec94..5f102b9406c 100644 --- a/dd-java-agent/instrumentation/lettuce-4/src/main/java/datadog/trace/instrumentation/lettuce4/LettuceAsyncCommandsInstrumentation.java +++ b/dd-java-agent/instrumentation/lettuce-4/src/main/java/datadog/trace/instrumentation/lettuce4/LettuceAsyncCommandsInstrumentation.java @@ -12,7 +12,7 @@ @AutoService(InstrumenterModule.class) public class LettuceAsyncCommandsInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public LettuceAsyncCommandsInstrumentation() { super("lettuce", "lettuce-4", "lettuce-4-async"); diff --git a/dd-java-agent/instrumentation/lettuce-4/src/main/java/datadog/trace/instrumentation/lettuce4/LettuceClientInstrumentation.java b/dd-java-agent/instrumentation/lettuce-4/src/main/java/datadog/trace/instrumentation/lettuce4/LettuceClientInstrumentation.java index fe84abd262e..6cef3cd808d 100644 --- a/dd-java-agent/instrumentation/lettuce-4/src/main/java/datadog/trace/instrumentation/lettuce4/LettuceClientInstrumentation.java +++ b/dd-java-agent/instrumentation/lettuce-4/src/main/java/datadog/trace/instrumentation/lettuce4/LettuceClientInstrumentation.java @@ -11,7 +11,7 @@ @AutoService(InstrumenterModule.class) public final class LettuceClientInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public LettuceClientInstrumentation() { super("lettuce", "lettuce-4"); diff --git a/dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/lettuce5/AsyncCommandInstrumentation.java b/dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/lettuce5/AsyncCommandInstrumentation.java index 76bce301ede..342636d6bb2 100644 --- a/dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/lettuce5/AsyncCommandInstrumentation.java +++ b/dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/lettuce5/AsyncCommandInstrumentation.java @@ -29,7 +29,7 @@ */ @AutoService(InstrumenterModule.class) public class AsyncCommandInstrumentation extends InstrumenterModule.Profiling - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public AsyncCommandInstrumentation() { super("lettuce", "lettuce-5", "lettuce-5-async"); } diff --git a/dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/lettuce5/CommandHandlerInstrumentation.java b/dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/lettuce5/CommandHandlerInstrumentation.java index 7af28a0f87d..a0f94c42ccd 100644 --- a/dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/lettuce5/CommandHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/lettuce5/CommandHandlerInstrumentation.java @@ -24,7 +24,7 @@ */ @AutoService(InstrumenterModule.class) public class CommandHandlerInstrumentation extends InstrumenterModule.Profiling - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public CommandHandlerInstrumentation() { super("lettuce", "lettuce-5", "lettuce-5-async"); diff --git a/dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceAsyncCommandsInstrumentation.java b/dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceAsyncCommandsInstrumentation.java index e9b10080bdb..c8771f73466 100644 --- a/dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceAsyncCommandsInstrumentation.java +++ b/dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceAsyncCommandsInstrumentation.java @@ -12,7 +12,7 @@ @AutoService(InstrumenterModule.class) public class LettuceAsyncCommandsInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public LettuceAsyncCommandsInstrumentation() { super("lettuce", "lettuce-5", "lettuce-5-async"); diff --git a/dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceClientInstrumentation.java b/dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceClientInstrumentation.java index 9678882cd19..0fb1ddb9039 100644 --- a/dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceClientInstrumentation.java +++ b/dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceClientInstrumentation.java @@ -16,7 +16,7 @@ @AutoService(InstrumenterModule.class) public final class LettuceClientInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public LettuceClientInstrumentation() { super("lettuce", "lettuce-5"); diff --git a/dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceReactiveClientInstrumentation.java b/dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceReactiveClientInstrumentation.java index e083768c46e..005d3b8bb6f 100644 --- a/dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceReactiveClientInstrumentation.java +++ b/dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceReactiveClientInstrumentation.java @@ -46,7 +46,7 @@ */ @AutoService(InstrumenterModule.class) public class LettuceReactiveClientInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public LettuceReactiveClientInstrumentation() { super("lettuce", "lettuce-5", "lettuce-5-rx"); diff --git a/dd-java-agent/instrumentation/liberty-20/src/main/java/datadog/trace/instrumentation/liberty20/HttpInboundServiceContextImplInstrumentation.java b/dd-java-agent/instrumentation/liberty-20/src/main/java/datadog/trace/instrumentation/liberty20/HttpInboundServiceContextImplInstrumentation.java index 1406ab894e2..e9966d18216 100644 --- a/dd-java-agent/instrumentation/liberty-20/src/main/java/datadog/trace/instrumentation/liberty20/HttpInboundServiceContextImplInstrumentation.java +++ b/dd-java-agent/instrumentation/liberty-20/src/main/java/datadog/trace/instrumentation/liberty20/HttpInboundServiceContextImplInstrumentation.java @@ -22,7 +22,7 @@ @AutoService(InstrumenterModule.class) public class HttpInboundServiceContextImplInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public static final String REQUEST_MSG_TYPE = "com.ibm.ws.http.channel.internal.HttpRequestMessageImpl"; diff --git a/dd-java-agent/instrumentation/liberty-20/src/main/java/datadog/trace/instrumentation/liberty20/LibertyServerInstrumentation.java b/dd-java-agent/instrumentation/liberty-20/src/main/java/datadog/trace/instrumentation/liberty20/LibertyServerInstrumentation.java index 02e4d1e797b..8624d67bf56 100644 --- a/dd-java-agent/instrumentation/liberty-20/src/main/java/datadog/trace/instrumentation/liberty20/LibertyServerInstrumentation.java +++ b/dd-java-agent/instrumentation/liberty-20/src/main/java/datadog/trace/instrumentation/liberty20/LibertyServerInstrumentation.java @@ -37,7 +37,7 @@ @AutoService(InstrumenterModule.class) public final class LibertyServerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public LibertyServerInstrumentation() { super("liberty"); diff --git a/dd-java-agent/instrumentation/liberty-20/src/main/java/datadog/trace/instrumentation/liberty20/ParseParametersInstrumentation.java b/dd-java-agent/instrumentation/liberty-20/src/main/java/datadog/trace/instrumentation/liberty20/ParseParametersInstrumentation.java index d29e224ca2b..8d8f8b53d19 100644 --- a/dd-java-agent/instrumentation/liberty-20/src/main/java/datadog/trace/instrumentation/liberty20/ParseParametersInstrumentation.java +++ b/dd-java-agent/instrumentation/liberty-20/src/main/java/datadog/trace/instrumentation/liberty20/ParseParametersInstrumentation.java @@ -36,7 +36,9 @@ @AutoService(InstrumenterModule.class) public class ParseParametersInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType, Instrumenter.HasTypeAdvice { + implements Instrumenter.ForSingleType, + Instrumenter.HasTypeAdvice, + Instrumenter.HasMethodAdvice { public ParseParametersInstrumentation() { super("liberty"); } diff --git a/dd-java-agent/instrumentation/liberty-20/src/main/java/datadog/trace/instrumentation/liberty20/ParsePostDataInstrumentation.java b/dd-java-agent/instrumentation/liberty-20/src/main/java/datadog/trace/instrumentation/liberty20/ParsePostDataInstrumentation.java index dfea74f52d6..1528f2edbfc 100644 --- a/dd-java-agent/instrumentation/liberty-20/src/main/java/datadog/trace/instrumentation/liberty20/ParsePostDataInstrumentation.java +++ b/dd-java-agent/instrumentation/liberty-20/src/main/java/datadog/trace/instrumentation/liberty20/ParsePostDataInstrumentation.java @@ -26,7 +26,7 @@ @AutoService(InstrumenterModule.class) public class ParsePostDataInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public ParsePostDataInstrumentation() { super("liberty"); } diff --git a/dd-java-agent/instrumentation/liberty-20/src/main/java/datadog/trace/instrumentation/liberty20/RequestFinishInstrumentation.java b/dd-java-agent/instrumentation/liberty-20/src/main/java/datadog/trace/instrumentation/liberty20/RequestFinishInstrumentation.java index e197e0847ce..fa50b98f53b 100644 --- a/dd-java-agent/instrumentation/liberty-20/src/main/java/datadog/trace/instrumentation/liberty20/RequestFinishInstrumentation.java +++ b/dd-java-agent/instrumentation/liberty-20/src/main/java/datadog/trace/instrumentation/liberty20/RequestFinishInstrumentation.java @@ -17,7 +17,7 @@ @AutoService(InstrumenterModule.class) public class RequestFinishInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public RequestFinishInstrumentation() { super("liberty"); diff --git a/dd-java-agent/instrumentation/liberty-20/src/main/java/datadog/trace/instrumentation/liberty20/ResponseFinishInstrumentation.java b/dd-java-agent/instrumentation/liberty-20/src/main/java/datadog/trace/instrumentation/liberty20/ResponseFinishInstrumentation.java index 0288045a8f1..3bd85a7f2d1 100644 --- a/dd-java-agent/instrumentation/liberty-20/src/main/java/datadog/trace/instrumentation/liberty20/ResponseFinishInstrumentation.java +++ b/dd-java-agent/instrumentation/liberty-20/src/main/java/datadog/trace/instrumentation/liberty20/ResponseFinishInstrumentation.java @@ -26,7 +26,7 @@ */ @AutoService(InstrumenterModule.class) public class ResponseFinishInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ResponseFinishInstrumentation() { super("liberty"); diff --git a/dd-java-agent/instrumentation/liberty-20/src/main/java/datadog/trace/instrumentation/liberty20/ThreadContextClassloaderInstrumentation.java b/dd-java-agent/instrumentation/liberty-20/src/main/java/datadog/trace/instrumentation/liberty20/ThreadContextClassloaderInstrumentation.java index 3275e2abd45..bac66e2ef5a 100644 --- a/dd-java-agent/instrumentation/liberty-20/src/main/java/datadog/trace/instrumentation/liberty20/ThreadContextClassloaderInstrumentation.java +++ b/dd-java-agent/instrumentation/liberty-20/src/main/java/datadog/trace/instrumentation/liberty20/ThreadContextClassloaderInstrumentation.java @@ -11,7 +11,7 @@ @AutoService(InstrumenterModule.class) public class ThreadContextClassloaderInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ThreadContextClassloaderInstrumentation() { super("liberty", "liberty-classloading"); diff --git a/dd-java-agent/instrumentation/liberty-20/src/main/java/datadog/trace/instrumentation/liberty20/WebAppHandleExceptionInstrumentation.java b/dd-java-agent/instrumentation/liberty-20/src/main/java/datadog/trace/instrumentation/liberty20/WebAppHandleExceptionInstrumentation.java index 5a8ed3144a7..1f6a73e9511 100644 --- a/dd-java-agent/instrumentation/liberty-20/src/main/java/datadog/trace/instrumentation/liberty20/WebAppHandleExceptionInstrumentation.java +++ b/dd-java-agent/instrumentation/liberty-20/src/main/java/datadog/trace/instrumentation/liberty20/WebAppHandleExceptionInstrumentation.java @@ -20,7 +20,7 @@ */ @AutoService(InstrumenterModule.class) public class WebAppHandleExceptionInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public WebAppHandleExceptionInstrumentation() { super("liberty"); } diff --git a/dd-java-agent/instrumentation/liberty-23/src/main/java/datadog/trace/instrumentation/liberty23/HttpInboundServiceContextImplInstrumentation.java b/dd-java-agent/instrumentation/liberty-23/src/main/java/datadog/trace/instrumentation/liberty23/HttpInboundServiceContextImplInstrumentation.java index 6383d9ca22f..b6de023363e 100644 --- a/dd-java-agent/instrumentation/liberty-23/src/main/java/datadog/trace/instrumentation/liberty23/HttpInboundServiceContextImplInstrumentation.java +++ b/dd-java-agent/instrumentation/liberty-23/src/main/java/datadog/trace/instrumentation/liberty23/HttpInboundServiceContextImplInstrumentation.java @@ -22,7 +22,7 @@ @AutoService(InstrumenterModule.class) public class HttpInboundServiceContextImplInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public static final String REQUEST_MSG_TYPE = "com.ibm.ws.http.channel.internal.HttpRequestMessageImpl"; diff --git a/dd-java-agent/instrumentation/liberty-23/src/main/java/datadog/trace/instrumentation/liberty23/LibertyServerInstrumentation.java b/dd-java-agent/instrumentation/liberty-23/src/main/java/datadog/trace/instrumentation/liberty23/LibertyServerInstrumentation.java index 8d0440eef3b..2d8a25b9a8f 100644 --- a/dd-java-agent/instrumentation/liberty-23/src/main/java/datadog/trace/instrumentation/liberty23/LibertyServerInstrumentation.java +++ b/dd-java-agent/instrumentation/liberty-23/src/main/java/datadog/trace/instrumentation/liberty23/LibertyServerInstrumentation.java @@ -37,7 +37,7 @@ @AutoService(InstrumenterModule.class) public final class LibertyServerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public LibertyServerInstrumentation() { super("liberty"); diff --git a/dd-java-agent/instrumentation/liberty-23/src/main/java/datadog/trace/instrumentation/liberty23/ParseParametersInstrumentation.java b/dd-java-agent/instrumentation/liberty-23/src/main/java/datadog/trace/instrumentation/liberty23/ParseParametersInstrumentation.java index 5512fd2d87d..2addef260c7 100644 --- a/dd-java-agent/instrumentation/liberty-23/src/main/java/datadog/trace/instrumentation/liberty23/ParseParametersInstrumentation.java +++ b/dd-java-agent/instrumentation/liberty-23/src/main/java/datadog/trace/instrumentation/liberty23/ParseParametersInstrumentation.java @@ -36,7 +36,9 @@ @AutoService(InstrumenterModule.class) public class ParseParametersInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType, Instrumenter.HasTypeAdvice { + implements Instrumenter.ForSingleType, + Instrumenter.HasTypeAdvice, + Instrumenter.HasMethodAdvice { public ParseParametersInstrumentation() { super("liberty"); } diff --git a/dd-java-agent/instrumentation/liberty-23/src/main/java/datadog/trace/instrumentation/liberty23/ParsePostDataInstrumentation.java b/dd-java-agent/instrumentation/liberty-23/src/main/java/datadog/trace/instrumentation/liberty23/ParsePostDataInstrumentation.java index 4cf04cfd807..84dd2976c5c 100644 --- a/dd-java-agent/instrumentation/liberty-23/src/main/java/datadog/trace/instrumentation/liberty23/ParsePostDataInstrumentation.java +++ b/dd-java-agent/instrumentation/liberty-23/src/main/java/datadog/trace/instrumentation/liberty23/ParsePostDataInstrumentation.java @@ -26,7 +26,7 @@ @AutoService(InstrumenterModule.class) public class ParsePostDataInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public ParsePostDataInstrumentation() { super("liberty"); } diff --git a/dd-java-agent/instrumentation/liberty-23/src/main/java/datadog/trace/instrumentation/liberty23/RequestFinishInstrumentation.java b/dd-java-agent/instrumentation/liberty-23/src/main/java/datadog/trace/instrumentation/liberty23/RequestFinishInstrumentation.java index ded64fc4de6..a2b2172dde4 100644 --- a/dd-java-agent/instrumentation/liberty-23/src/main/java/datadog/trace/instrumentation/liberty23/RequestFinishInstrumentation.java +++ b/dd-java-agent/instrumentation/liberty-23/src/main/java/datadog/trace/instrumentation/liberty23/RequestFinishInstrumentation.java @@ -17,7 +17,7 @@ @AutoService(InstrumenterModule.class) public class RequestFinishInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public RequestFinishInstrumentation() { super("liberty"); diff --git a/dd-java-agent/instrumentation/liberty-23/src/main/java/datadog/trace/instrumentation/liberty23/ResponseFinishInstrumentation.java b/dd-java-agent/instrumentation/liberty-23/src/main/java/datadog/trace/instrumentation/liberty23/ResponseFinishInstrumentation.java index 88efd3eb608..96ebcc7252e 100644 --- a/dd-java-agent/instrumentation/liberty-23/src/main/java/datadog/trace/instrumentation/liberty23/ResponseFinishInstrumentation.java +++ b/dd-java-agent/instrumentation/liberty-23/src/main/java/datadog/trace/instrumentation/liberty23/ResponseFinishInstrumentation.java @@ -26,7 +26,7 @@ */ @AutoService(InstrumenterModule.class) public class ResponseFinishInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ResponseFinishInstrumentation() { super("liberty"); diff --git a/dd-java-agent/instrumentation/liberty-23/src/main/java/datadog/trace/instrumentation/liberty23/WebAppHandleExceptionInstrumentation.java b/dd-java-agent/instrumentation/liberty-23/src/main/java/datadog/trace/instrumentation/liberty23/WebAppHandleExceptionInstrumentation.java index f3c5204b0cd..87ce505313c 100644 --- a/dd-java-agent/instrumentation/liberty-23/src/main/java/datadog/trace/instrumentation/liberty23/WebAppHandleExceptionInstrumentation.java +++ b/dd-java-agent/instrumentation/liberty-23/src/main/java/datadog/trace/instrumentation/liberty23/WebAppHandleExceptionInstrumentation.java @@ -20,7 +20,7 @@ */ @AutoService(InstrumenterModule.class) public class WebAppHandleExceptionInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public WebAppHandleExceptionInstrumentation() { super("liberty"); } diff --git a/dd-java-agent/instrumentation/log4j-2.7/src/main/java/datadog/trace/instrumentation/log4j27/ContextDataInjectorFactoryInstrumentation.java b/dd-java-agent/instrumentation/log4j-2.7/src/main/java/datadog/trace/instrumentation/log4j27/ContextDataInjectorFactoryInstrumentation.java index 48fde15309c..fad0c7d62e2 100644 --- a/dd-java-agent/instrumentation/log4j-2.7/src/main/java/datadog/trace/instrumentation/log4j27/ContextDataInjectorFactoryInstrumentation.java +++ b/dd-java-agent/instrumentation/log4j-2.7/src/main/java/datadog/trace/instrumentation/log4j27/ContextDataInjectorFactoryInstrumentation.java @@ -20,7 +20,7 @@ @AutoService(InstrumenterModule.class) public class ContextDataInjectorFactoryInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ContextDataInjectorFactoryInstrumentation() { super("log4j", "log4j-2"); } diff --git a/dd-java-agent/instrumentation/log4j1/src/main/java/datadog/trace/instrumentation/log4j1/CategoryInstrumentation.java b/dd-java-agent/instrumentation/log4j1/src/main/java/datadog/trace/instrumentation/log4j1/CategoryInstrumentation.java index 4a39302d252..529afbcbca9 100644 --- a/dd-java-agent/instrumentation/log4j1/src/main/java/datadog/trace/instrumentation/log4j1/CategoryInstrumentation.java +++ b/dd-java-agent/instrumentation/log4j1/src/main/java/datadog/trace/instrumentation/log4j1/CategoryInstrumentation.java @@ -25,7 +25,7 @@ @AutoService(InstrumenterModule.class) public class CategoryInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public CategoryInstrumentation() { super("log4j", "log4j-1"); } diff --git a/dd-java-agent/instrumentation/log4j1/src/main/java/datadog/trace/instrumentation/log4j1/LoggingEventInstrumentation.java b/dd-java-agent/instrumentation/log4j1/src/main/java/datadog/trace/instrumentation/log4j1/LoggingEventInstrumentation.java index a4f4d0614f3..e9e37411010 100644 --- a/dd-java-agent/instrumentation/log4j1/src/main/java/datadog/trace/instrumentation/log4j1/LoggingEventInstrumentation.java +++ b/dd-java-agent/instrumentation/log4j1/src/main/java/datadog/trace/instrumentation/log4j1/LoggingEventInstrumentation.java @@ -25,7 +25,7 @@ @AutoService(InstrumenterModule.class) public class LoggingEventInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public LoggingEventInstrumentation() { super("log4j", "log4j-1"); } diff --git a/dd-java-agent/instrumentation/log4j2/logs-intake/src/main/java/datadog/trace/instrumentation/log4j2/LoggerConfigInstrumentation.java b/dd-java-agent/instrumentation/log4j2/logs-intake/src/main/java/datadog/trace/instrumentation/log4j2/LoggerConfigInstrumentation.java index c5aad27353f..87e89808111 100644 --- a/dd-java-agent/instrumentation/log4j2/logs-intake/src/main/java/datadog/trace/instrumentation/log4j2/LoggerConfigInstrumentation.java +++ b/dd-java-agent/instrumentation/log4j2/logs-intake/src/main/java/datadog/trace/instrumentation/log4j2/LoggerConfigInstrumentation.java @@ -15,7 +15,7 @@ @AutoService(InstrumenterModule.class) public class LoggerConfigInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public LoggerConfigInstrumentation() { super("log4j", "log4j-2", "logs-intake", "logs-intake-log4j-2"); diff --git a/dd-java-agent/instrumentation/log4j2/src/main/java/datadog/trace/instrumentation/log4j2/ThreadContextInstrumentation.java b/dd-java-agent/instrumentation/log4j2/src/main/java/datadog/trace/instrumentation/log4j2/ThreadContextInstrumentation.java index 396131e04a4..9da6481cd24 100644 --- a/dd-java-agent/instrumentation/log4j2/src/main/java/datadog/trace/instrumentation/log4j2/ThreadContextInstrumentation.java +++ b/dd-java-agent/instrumentation/log4j2/src/main/java/datadog/trace/instrumentation/log4j2/ThreadContextInstrumentation.java @@ -13,7 +13,7 @@ @AutoService(InstrumenterModule.class) public class ThreadContextInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { private static final String TYPE_NAME = "org.apache.logging.log4j.ThreadContext"; public ThreadContextInstrumentation() { diff --git a/dd-java-agent/instrumentation/logback-1/src/main/java/datadog/trace/instrumentation/logback/LogbackLoggerInstrumentation.java b/dd-java-agent/instrumentation/logback-1/src/main/java/datadog/trace/instrumentation/logback/LogbackLoggerInstrumentation.java index 71468d0f05e..c3ad66247bd 100644 --- a/dd-java-agent/instrumentation/logback-1/src/main/java/datadog/trace/instrumentation/logback/LogbackLoggerInstrumentation.java +++ b/dd-java-agent/instrumentation/logback-1/src/main/java/datadog/trace/instrumentation/logback/LogbackLoggerInstrumentation.java @@ -25,7 +25,7 @@ @AutoService(InstrumenterModule.class) public class LogbackLoggerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public LogbackLoggerInstrumentation() { super("logback"); diff --git a/dd-java-agent/instrumentation/logback-1/src/main/java/datadog/trace/instrumentation/logback/LoggingEventInstrumentation.java b/dd-java-agent/instrumentation/logback-1/src/main/java/datadog/trace/instrumentation/logback/LoggingEventInstrumentation.java index 6de90eb28d3..34888eaaa3b 100644 --- a/dd-java-agent/instrumentation/logback-1/src/main/java/datadog/trace/instrumentation/logback/LoggingEventInstrumentation.java +++ b/dd-java-agent/instrumentation/logback-1/src/main/java/datadog/trace/instrumentation/logback/LoggingEventInstrumentation.java @@ -29,7 +29,7 @@ @AutoService(InstrumenterModule.class) public class LoggingEventInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public LoggingEventInstrumentation() { super("logback"); } diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenInstrumentation.java b/dd-java-agent/instrumentation/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenInstrumentation.java index bad9cfd6025..47965ade30a 100644 --- a/dd-java-agent/instrumentation/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenInstrumentation.java +++ b/dd-java-agent/instrumentation/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenInstrumentation.java @@ -17,7 +17,7 @@ @AutoService(InstrumenterModule.class) public class MavenInstrumentation extends InstrumenterModule.CiVisibility - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public MavenInstrumentation() { super("maven"); diff --git a/dd-java-agent/instrumentation/micronaut/http-server-netty-2.0/src/main/java/datadog/trace/instrumentation/micronaut/v2_0/MicronautInstrumentation.java b/dd-java-agent/instrumentation/micronaut/http-server-netty-2.0/src/main/java/datadog/trace/instrumentation/micronaut/v2_0/MicronautInstrumentation.java index 4300fd66be8..335ef4749aa 100644 --- a/dd-java-agent/instrumentation/micronaut/http-server-netty-2.0/src/main/java/datadog/trace/instrumentation/micronaut/v2_0/MicronautInstrumentation.java +++ b/dd-java-agent/instrumentation/micronaut/http-server-netty-2.0/src/main/java/datadog/trace/instrumentation/micronaut/v2_0/MicronautInstrumentation.java @@ -10,7 +10,7 @@ @AutoService(InstrumenterModule.class) public final class MicronautInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public MicronautInstrumentation() { super("micronaut", "micronaut-http-server-netty", "micronaut-http-server-netty-2"); diff --git a/dd-java-agent/instrumentation/micronaut/http-server-netty-3.0/src/main/java/datadog/trace/instrumentation/micronaut/v3_0/MicronautInstrumentation.java b/dd-java-agent/instrumentation/micronaut/http-server-netty-3.0/src/main/java/datadog/trace/instrumentation/micronaut/v3_0/MicronautInstrumentation.java index e6756ec0faf..b0fa733d433 100644 --- a/dd-java-agent/instrumentation/micronaut/http-server-netty-3.0/src/main/java/datadog/trace/instrumentation/micronaut/v3_0/MicronautInstrumentation.java +++ b/dd-java-agent/instrumentation/micronaut/http-server-netty-3.0/src/main/java/datadog/trace/instrumentation/micronaut/v3_0/MicronautInstrumentation.java @@ -10,7 +10,7 @@ @AutoService(InstrumenterModule.class) public final class MicronautInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public MicronautInstrumentation() { super("micronaut", "micronaut-http-server-netty", "micronaut-http-server-netty-3"); diff --git a/dd-java-agent/instrumentation/micronaut/http-server-netty-4.0/src/main/java/datadog/trace/instrumentation/micronaut/v4_0/MicronautInstrumentation.java b/dd-java-agent/instrumentation/micronaut/http-server-netty-4.0/src/main/java/datadog/trace/instrumentation/micronaut/v4_0/MicronautInstrumentation.java index 5c0a334cfb0..053523521a4 100644 --- a/dd-java-agent/instrumentation/micronaut/http-server-netty-4.0/src/main/java/datadog/trace/instrumentation/micronaut/v4_0/MicronautInstrumentation.java +++ b/dd-java-agent/instrumentation/micronaut/http-server-netty-4.0/src/main/java/datadog/trace/instrumentation/micronaut/v4_0/MicronautInstrumentation.java @@ -13,7 +13,7 @@ @AutoService(InstrumenterModule.class) public final class MicronautInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public MicronautInstrumentation() { super("micronaut", "micronaut-http-server-netty", "micronaut-http-server-netty-4"); diff --git a/dd-java-agent/instrumentation/mongo/bson-document/src/main/java/datadog/trace/instrumentation/mongo/ByteBufBsonDocumentInstrumentation.java b/dd-java-agent/instrumentation/mongo/bson-document/src/main/java/datadog/trace/instrumentation/mongo/ByteBufBsonDocumentInstrumentation.java index 1225edf847d..5765055676e 100644 --- a/dd-java-agent/instrumentation/mongo/bson-document/src/main/java/datadog/trace/instrumentation/mongo/ByteBufBsonDocumentInstrumentation.java +++ b/dd-java-agent/instrumentation/mongo/bson-document/src/main/java/datadog/trace/instrumentation/mongo/ByteBufBsonDocumentInstrumentation.java @@ -19,7 +19,9 @@ @AutoService(InstrumenterModule.class) public class ByteBufBsonDocumentInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType, Instrumenter.WithTypeStructure { + implements Instrumenter.ForSingleType, + Instrumenter.WithTypeStructure, + Instrumenter.HasMethodAdvice { public ByteBufBsonDocumentInstrumentation() { super("mongo"); diff --git a/dd-java-agent/instrumentation/mongo/driver-3.1/src/main/java/datadog/trace/instrumentation/mongo/MongoClient31Instrumentation.java b/dd-java-agent/instrumentation/mongo/driver-3.1/src/main/java/datadog/trace/instrumentation/mongo/MongoClient31Instrumentation.java index cfb36fbbf5c..52386319458 100644 --- a/dd-java-agent/instrumentation/mongo/driver-3.1/src/main/java/datadog/trace/instrumentation/mongo/MongoClient31Instrumentation.java +++ b/dd-java-agent/instrumentation/mongo/driver-3.1/src/main/java/datadog/trace/instrumentation/mongo/MongoClient31Instrumentation.java @@ -25,7 +25,9 @@ @AutoService(InstrumenterModule.class) public final class MongoClient31Instrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForKnownTypes, Instrumenter.WithTypeStructure { + implements Instrumenter.ForKnownTypes, + Instrumenter.WithTypeStructure, + Instrumenter.HasMethodAdvice { public MongoClient31Instrumentation() { super("mongo", "mongo-3.1"); diff --git a/dd-java-agent/instrumentation/mongo/driver-3.4/src/main/java/datadog/trace/instrumentation/mongo/MongoClient34Instrumentation.java b/dd-java-agent/instrumentation/mongo/driver-3.4/src/main/java/datadog/trace/instrumentation/mongo/MongoClient34Instrumentation.java index 43e1e018e87..7a52308bed4 100644 --- a/dd-java-agent/instrumentation/mongo/driver-3.4/src/main/java/datadog/trace/instrumentation/mongo/MongoClient34Instrumentation.java +++ b/dd-java-agent/instrumentation/mongo/driver-3.4/src/main/java/datadog/trace/instrumentation/mongo/MongoClient34Instrumentation.java @@ -37,7 +37,9 @@ */ @AutoService(InstrumenterModule.class) public final class MongoClient34Instrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForKnownTypes, Instrumenter.WithTypeStructure { + implements Instrumenter.ForKnownTypes, + Instrumenter.WithTypeStructure, + Instrumenter.HasMethodAdvice { public MongoClient34Instrumentation() { super("mongo", "mongo-3.4"); diff --git a/dd-java-agent/instrumentation/mongo/driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/BaseClusterInstrumentation410.java b/dd-java-agent/instrumentation/mongo/driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/BaseCluster410Instrumentation.java similarity index 85% rename from dd-java-agent/instrumentation/mongo/driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/BaseClusterInstrumentation410.java rename to dd-java-agent/instrumentation/mongo/driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/BaseCluster410Instrumentation.java index 6d7863f879a..a77604803ed 100644 --- a/dd-java-agent/instrumentation/mongo/driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/BaseClusterInstrumentation410.java +++ b/dd-java-agent/instrumentation/mongo/driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/BaseCluster410Instrumentation.java @@ -9,9 +9,9 @@ import datadog.trace.agent.tooling.InstrumenterModule; @AutoService(InstrumenterModule.class) -public class BaseClusterInstrumentation410 extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { - public BaseClusterInstrumentation410() { +public class BaseCluster410Instrumentation extends InstrumenterModule.Tracing + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { + public BaseCluster410Instrumentation() { super("mongo", "mongo-reactivestreams"); } diff --git a/dd-java-agent/instrumentation/mongo/driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/BaseClusterInstrumentation.java b/dd-java-agent/instrumentation/mongo/driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/BaseClusterInstrumentation.java index cc542393c97..dd32744dabe 100644 --- a/dd-java-agent/instrumentation/mongo/driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/BaseClusterInstrumentation.java +++ b/dd-java-agent/instrumentation/mongo/driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/BaseClusterInstrumentation.java @@ -10,7 +10,7 @@ @AutoService(InstrumenterModule.class) public class BaseClusterInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public BaseClusterInstrumentation() { super("mongo", "mongo-reactivestreams"); } diff --git a/dd-java-agent/instrumentation/mongo/driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/DefaultConnectionPoolInstrumentation410.java b/dd-java-agent/instrumentation/mongo/driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/DefaultConnectionPool410Instrumentation.java similarity index 84% rename from dd-java-agent/instrumentation/mongo/driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/DefaultConnectionPoolInstrumentation410.java rename to dd-java-agent/instrumentation/mongo/driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/DefaultConnectionPool410Instrumentation.java index c23dc94b576..2580d0c567c 100644 --- a/dd-java-agent/instrumentation/mongo/driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/DefaultConnectionPoolInstrumentation410.java +++ b/dd-java-agent/instrumentation/mongo/driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/DefaultConnectionPool410Instrumentation.java @@ -9,9 +9,9 @@ import datadog.trace.agent.tooling.InstrumenterModule; @AutoService(InstrumenterModule.class) -public class DefaultConnectionPoolInstrumentation410 extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { - public DefaultConnectionPoolInstrumentation410() { +public class DefaultConnectionPool410Instrumentation extends InstrumenterModule.Tracing + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { + public DefaultConnectionPool410Instrumentation() { super("mongo", "mongo-reactivestreams"); } diff --git a/dd-java-agent/instrumentation/mongo/driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/DefaultConnectionPoolInstrumentation.java b/dd-java-agent/instrumentation/mongo/driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/DefaultConnectionPoolInstrumentation.java index d404b7a6c10..3da72d9142c 100644 --- a/dd-java-agent/instrumentation/mongo/driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/DefaultConnectionPoolInstrumentation.java +++ b/dd-java-agent/instrumentation/mongo/driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/DefaultConnectionPoolInstrumentation.java @@ -10,7 +10,7 @@ @AutoService(InstrumenterModule.class) public class DefaultConnectionPoolInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public DefaultConnectionPoolInstrumentation() { super("mongo", "mongo-reactivestreams"); } diff --git a/dd-java-agent/instrumentation/mongo/driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/InternalStreamConnectionInstrumentation.java b/dd-java-agent/instrumentation/mongo/driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/InternalStreamConnectionInstrumentation.java index 411bca0efea..b8aa8f0caaf 100644 --- a/dd-java-agent/instrumentation/mongo/driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/InternalStreamConnectionInstrumentation.java +++ b/dd-java-agent/instrumentation/mongo/driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/InternalStreamConnectionInstrumentation.java @@ -12,7 +12,7 @@ @AutoService(InstrumenterModule.class) public class InternalStreamConnectionInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public InternalStreamConnectionInstrumentation() { super("mongo", "mongo-reactivestreams"); } diff --git a/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/ComponentMessageProcessorInstrumentation.java b/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/ComponentMessageProcessorInstrumentation.java index 91e45d89c70..8db6c628d01 100644 --- a/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/ComponentMessageProcessorInstrumentation.java +++ b/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/ComponentMessageProcessorInstrumentation.java @@ -22,7 +22,7 @@ */ @AutoService(InstrumenterModule.class) public class ComponentMessageProcessorInstrumentation extends AbstractMuleInstrumentation - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { @Override public String instrumentedType() { diff --git a/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/EventContextInstrumentation.java b/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/EventContextInstrumentation.java index bcc465d19cc..a3be24b149b 100644 --- a/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/EventContextInstrumentation.java +++ b/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/EventContextInstrumentation.java @@ -13,7 +13,7 @@ */ @AutoService(InstrumenterModule.class) public final class EventContextInstrumentation extends AbstractMuleInstrumentation - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { @Override public String[] knownMatchingTypes() { diff --git a/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/EventTracerInstrumentation.java b/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/EventTracerInstrumentation.java index 82069ff2d74..f149881d438 100644 --- a/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/EventTracerInstrumentation.java +++ b/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/EventTracerInstrumentation.java @@ -14,7 +14,7 @@ @AutoService(InstrumenterModule.class) public class EventTracerInstrumentation extends AbstractMuleInstrumentation - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { @Override public String instrumentedType() { diff --git a/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/ExecutionInitialSpanInfoInstrumentation.java b/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/ExecutionInitialSpanInfoInstrumentation.java index 80083de1848..445789b4fb1 100644 --- a/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/ExecutionInitialSpanInfoInstrumentation.java +++ b/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/ExecutionInitialSpanInfoInstrumentation.java @@ -15,7 +15,7 @@ @AutoService(InstrumenterModule.class) public class ExecutionInitialSpanInfoInstrumentation extends AbstractMuleInstrumentation - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { @Override public String instrumentedType() { diff --git a/dd-java-agent/instrumentation/mule-4/src/test/java/mule4/HttpServerTestHandlerInstrumentation.java b/dd-java-agent/instrumentation/mule-4/src/test/java/mule4/HttpServerTestHandlerInstrumentation.java index ebfdf151b03..4b907abc0e8 100644 --- a/dd-java-agent/instrumentation/mule-4/src/test/java/mule4/HttpServerTestHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/mule-4/src/test/java/mule4/HttpServerTestHandlerInstrumentation.java @@ -14,7 +14,7 @@ */ @AutoService(InstrumenterModule.class) public class HttpServerTestHandlerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public HttpServerTestHandlerInstrumentation() { super("mule4-http-server-test-handler"); diff --git a/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelFutureListenerInstrumentation.java b/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelFutureListenerInstrumentation.java index 107cd9f5f22..83d8be8db3e 100644 --- a/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelFutureListenerInstrumentation.java +++ b/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelFutureListenerInstrumentation.java @@ -27,7 +27,7 @@ @AutoService(InstrumenterModule.class) public class ChannelFutureListenerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public ChannelFutureListenerInstrumentation() { super( diff --git a/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/NettyChannelInstrumentation.java b/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/NettyChannelInstrumentation.java index c0bc01f31ab..7436526fc7e 100644 --- a/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/NettyChannelInstrumentation.java +++ b/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/NettyChannelInstrumentation.java @@ -23,7 +23,7 @@ @AutoService(InstrumenterModule.class) public class NettyChannelInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public NettyChannelInstrumentation() { super(INSTRUMENTATION_NAME, ADDITIONAL_INSTRUMENTATION_NAMES); } diff --git a/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/NettyChannelPipelineInstrumentation.java b/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/NettyChannelPipelineInstrumentation.java index fb7400ddd3c..30c38f089fb 100644 --- a/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/NettyChannelPipelineInstrumentation.java +++ b/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/NettyChannelPipelineInstrumentation.java @@ -23,7 +23,7 @@ @AutoService(InstrumenterModule.class) public class NettyChannelPipelineInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { static final String INSTRUMENTATION_NAME = "netty"; static final String[] ADDITIONAL_INSTRUMENTATION_NAMES = {"netty-3.8"}; diff --git a/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/ChannelFutureListenerInstrumentation.java b/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/ChannelFutureListenerInstrumentation.java index 3e41a2b0a6e..daa684df187 100644 --- a/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/ChannelFutureListenerInstrumentation.java +++ b/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/ChannelFutureListenerInstrumentation.java @@ -23,7 +23,7 @@ @AutoService(InstrumenterModule.class) public class ChannelFutureListenerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public ChannelFutureListenerInstrumentation() { super( diff --git a/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelHandlerContextInstrumentation.java b/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelHandlerContextInstrumentation.java index e72c5f40d0d..0e310e9fe2a 100644 --- a/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelHandlerContextInstrumentation.java +++ b/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelHandlerContextInstrumentation.java @@ -26,7 +26,7 @@ @AutoService(InstrumenterModule.class) public class NettyChannelHandlerContextInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public NettyChannelHandlerContextInstrumentation() { super(INSTRUMENTATION_NAME, ADDITIONAL_INSTRUMENTATION_NAMES); diff --git a/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelPipelineInstrumentation.java b/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelPipelineInstrumentation.java index c9c55d62043..5eabcdea12e 100644 --- a/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelPipelineInstrumentation.java +++ b/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelPipelineInstrumentation.java @@ -37,7 +37,7 @@ @AutoService(InstrumenterModule.class) public class NettyChannelPipelineInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { static final String INSTRUMENTATION_NAME = "netty"; static final String[] ADDITIONAL_INSTRUMENTATION_NAMES = {"netty-4.0"}; diff --git a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/ChannelFutureListenerInstrumentation.java b/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/ChannelFutureListenerInstrumentation.java index 7e0b0ebde6a..df528d3cf44 100644 --- a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/ChannelFutureListenerInstrumentation.java +++ b/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/ChannelFutureListenerInstrumentation.java @@ -23,7 +23,7 @@ @AutoService(InstrumenterModule.class) public class ChannelFutureListenerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public ChannelFutureListenerInstrumentation() { super( diff --git a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/Http2MultiplexHandlerStreamChannelInstrumentation.java b/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/Http2MultiplexHandlerStreamChannelInstrumentation.java index 4996bafbe14..d532a5e1606 100644 --- a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/Http2MultiplexHandlerStreamChannelInstrumentation.java +++ b/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/Http2MultiplexHandlerStreamChannelInstrumentation.java @@ -9,7 +9,7 @@ @AutoService(InstrumenterModule.class) public class Http2MultiplexHandlerStreamChannelInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public Http2MultiplexHandlerStreamChannelInstrumentation() { super("netty", "netty-4.1", "netty-4.1-http2"); diff --git a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/HttpPostRequestDecoderInstrumentation.java b/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/HttpPostRequestDecoderInstrumentation.java index 2a460f79155..0966c7e87ff 100644 --- a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/HttpPostRequestDecoderInstrumentation.java +++ b/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/HttpPostRequestDecoderInstrumentation.java @@ -33,7 +33,7 @@ @AutoService(InstrumenterModule.class) public class HttpPostRequestDecoderInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public HttpPostRequestDecoderInstrumentation() { super( NettyChannelPipelineInstrumentation.INSTRUMENTATION_NAME, diff --git a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyChannelHandlerContextInstrumentation.java b/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyChannelHandlerContextInstrumentation.java index af4836a3a06..4589bc34a46 100644 --- a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyChannelHandlerContextInstrumentation.java +++ b/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyChannelHandlerContextInstrumentation.java @@ -26,7 +26,7 @@ @AutoService(InstrumenterModule.class) public class NettyChannelHandlerContextInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public NettyChannelHandlerContextInstrumentation() { super(INSTRUMENTATION_NAME, ADDITIONAL_INSTRUMENTATION_NAMES); diff --git a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyChannelPipelineInstrumentation.java b/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyChannelPipelineInstrumentation.java index ccb00b87bb5..f93bba3b0ad 100644 --- a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyChannelPipelineInstrumentation.java +++ b/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyChannelPipelineInstrumentation.java @@ -37,7 +37,7 @@ @AutoService(InstrumenterModule.class) public class NettyChannelPipelineInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { static final String INSTRUMENTATION_NAME = "netty"; static final String[] ADDITIONAL_INSTRUMENTATION_NAMES = {"netty-4.1"}; diff --git a/dd-java-agent/instrumentation/netty-buffer-4/src/main/java/datadog/trace/instrumentation/netty40/buffer/ByteBufInputStreamInstrumentation.java b/dd-java-agent/instrumentation/netty-buffer-4/src/main/java/datadog/trace/instrumentation/netty40/buffer/ByteBufInputStreamInstrumentation.java index 74e71c0895e..596dd5f5523 100644 --- a/dd-java-agent/instrumentation/netty-buffer-4/src/main/java/datadog/trace/instrumentation/netty40/buffer/ByteBufInputStreamInstrumentation.java +++ b/dd-java-agent/instrumentation/netty-buffer-4/src/main/java/datadog/trace/instrumentation/netty40/buffer/ByteBufInputStreamInstrumentation.java @@ -17,7 +17,9 @@ @AutoService(InstrumenterModule.class) public class ByteBufInputStreamInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType, Instrumenter.HasTypeAdvice { + implements Instrumenter.ForSingleType, + Instrumenter.HasTypeAdvice, + Instrumenter.HasMethodAdvice { public ByteBufInputStreamInstrumentation() { super("netty", "netty-4.0"); diff --git a/dd-java-agent/instrumentation/netty-buffer-4/src/main/java/datadog/trace/instrumentation/netty40/buffer/ByteBufInstrumentation.java b/dd-java-agent/instrumentation/netty-buffer-4/src/main/java/datadog/trace/instrumentation/netty40/buffer/ByteBufInstrumentation.java index b3fc9a17900..266e9c633db 100644 --- a/dd-java-agent/instrumentation/netty-buffer-4/src/main/java/datadog/trace/instrumentation/netty40/buffer/ByteBufInstrumentation.java +++ b/dd-java-agent/instrumentation/netty-buffer-4/src/main/java/datadog/trace/instrumentation/netty40/buffer/ByteBufInstrumentation.java @@ -7,7 +7,9 @@ @AutoService(InstrumenterModule.class) public class ByteBufInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType, Instrumenter.HasTypeAdvice { + implements Instrumenter.ForSingleType, + Instrumenter.HasTypeAdvice, + Instrumenter.HasMethodAdvice { private final String className = ByteBufInstrumentation.class.getName(); diff --git a/dd-java-agent/instrumentation/netty-concurrent-4/src/main/java/datadog/trace/instrumentation/netty40/concurrent/SingleThreadEventExecutorInstrumentation.java b/dd-java-agent/instrumentation/netty-concurrent-4/src/main/java/datadog/trace/instrumentation/netty40/concurrent/SingleThreadEventExecutorInstrumentation.java index ccaa83ce384..0fa3505b4cb 100644 --- a/dd-java-agent/instrumentation/netty-concurrent-4/src/main/java/datadog/trace/instrumentation/netty40/concurrent/SingleThreadEventExecutorInstrumentation.java +++ b/dd-java-agent/instrumentation/netty-concurrent-4/src/main/java/datadog/trace/instrumentation/netty40/concurrent/SingleThreadEventExecutorInstrumentation.java @@ -24,7 +24,7 @@ @AutoService(InstrumenterModule.class) public class SingleThreadEventExecutorInstrumentation extends InstrumenterModule.Profiling - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public SingleThreadEventExecutorInstrumentation() { super("netty-concurrent", "netty-event-executor"); } diff --git a/dd-java-agent/instrumentation/netty-promise-4/src/main/java/datadog/trace/instrumentation/netty4/promise/NettyPromiseInstrumentation.java b/dd-java-agent/instrumentation/netty-promise-4/src/main/java/datadog/trace/instrumentation/netty4/promise/NettyPromiseInstrumentation.java index d045edd4495..57cc2fa9aca 100644 --- a/dd-java-agent/instrumentation/netty-promise-4/src/main/java/datadog/trace/instrumentation/netty4/promise/NettyPromiseInstrumentation.java +++ b/dd-java-agent/instrumentation/netty-promise-4/src/main/java/datadog/trace/instrumentation/netty4/promise/NettyPromiseInstrumentation.java @@ -12,7 +12,7 @@ @AutoService(InstrumenterModule.class) public class NettyPromiseInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public NettyPromiseInstrumentation() { super("netty-promise"); diff --git a/dd-java-agent/instrumentation/ognl-appsec/src/main/java/datadog/trace/instrumentation/ognl/OgnlInstrumentation.java b/dd-java-agent/instrumentation/ognl-appsec/src/main/java/datadog/trace/instrumentation/ognl/OgnlInstrumentation.java index 1334d8e78de..fd7134ef842 100644 --- a/dd-java-agent/instrumentation/ognl-appsec/src/main/java/datadog/trace/instrumentation/ognl/OgnlInstrumentation.java +++ b/dd-java-agent/instrumentation/ognl-appsec/src/main/java/datadog/trace/instrumentation/ognl/OgnlInstrumentation.java @@ -15,7 +15,7 @@ @AutoService(InstrumenterModule.class) public class OgnlInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public OgnlInstrumentation() { super("ognl"); diff --git a/dd-java-agent/instrumentation/okhttp-2/src/main/java/datadog/trace/instrumentation/okhttp2/IastHttpUrlInstrumentation.java b/dd-java-agent/instrumentation/okhttp-2/src/main/java/datadog/trace/instrumentation/okhttp2/IastHttpUrlInstrumentation.java index cba9a7f35de..96fbcb373f8 100644 --- a/dd-java-agent/instrumentation/okhttp-2/src/main/java/datadog/trace/instrumentation/okhttp2/IastHttpUrlInstrumentation.java +++ b/dd-java-agent/instrumentation/okhttp-2/src/main/java/datadog/trace/instrumentation/okhttp2/IastHttpUrlInstrumentation.java @@ -18,7 +18,9 @@ @AutoService(InstrumenterModule.class) public class IastHttpUrlInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType, Instrumenter.HasTypeAdvice { + implements Instrumenter.ForSingleType, + Instrumenter.HasTypeAdvice, + Instrumenter.HasMethodAdvice { /** * Adding fields to an already loaded class is not possible, during testing diff --git a/dd-java-agent/instrumentation/okhttp-2/src/main/java/datadog/trace/instrumentation/okhttp2/OkHttp2Instrumentation.java b/dd-java-agent/instrumentation/okhttp-2/src/main/java/datadog/trace/instrumentation/okhttp2/OkHttp2Instrumentation.java index fe0bf556cba..fb357b594f4 100644 --- a/dd-java-agent/instrumentation/okhttp-2/src/main/java/datadog/trace/instrumentation/okhttp2/OkHttp2Instrumentation.java +++ b/dd-java-agent/instrumentation/okhttp-2/src/main/java/datadog/trace/instrumentation/okhttp2/OkHttp2Instrumentation.java @@ -11,7 +11,7 @@ @AutoService(InstrumenterModule.class) public class OkHttp2Instrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public OkHttp2Instrumentation() { super("okhttp", "okhttp-2"); } diff --git a/dd-java-agent/instrumentation/okhttp-3/src/main/java/datadog/trace/instrumentation/okhttp3/IastHttpUrlInstrumentation.java b/dd-java-agent/instrumentation/okhttp-3/src/main/java/datadog/trace/instrumentation/okhttp3/IastHttpUrlInstrumentation.java index de896c73133..a718db91704 100644 --- a/dd-java-agent/instrumentation/okhttp-3/src/main/java/datadog/trace/instrumentation/okhttp3/IastHttpUrlInstrumentation.java +++ b/dd-java-agent/instrumentation/okhttp-3/src/main/java/datadog/trace/instrumentation/okhttp3/IastHttpUrlInstrumentation.java @@ -18,7 +18,9 @@ @AutoService(InstrumenterModule.class) public class IastHttpUrlInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType, Instrumenter.HasTypeAdvice { + implements Instrumenter.ForSingleType, + Instrumenter.HasTypeAdvice, + Instrumenter.HasMethodAdvice { /** * Adding fields to a loaded class is not possible, during testing okhttp3.HttpUrl gets loaded diff --git a/dd-java-agent/instrumentation/okhttp-3/src/main/java/datadog/trace/instrumentation/okhttp3/OkHttp3Instrumentation.java b/dd-java-agent/instrumentation/okhttp-3/src/main/java/datadog/trace/instrumentation/okhttp3/OkHttp3Instrumentation.java index 18f4b0ecd67..a1e25d85819 100644 --- a/dd-java-agent/instrumentation/okhttp-3/src/main/java/datadog/trace/instrumentation/okhttp3/OkHttp3Instrumentation.java +++ b/dd-java-agent/instrumentation/okhttp-3/src/main/java/datadog/trace/instrumentation/okhttp3/OkHttp3Instrumentation.java @@ -13,7 +13,7 @@ @AutoService(InstrumenterModule.class) public class OkHttp3Instrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public OkHttp3Instrumentation() { super("okhttp", "okhttp-3"); diff --git a/dd-java-agent/instrumentation/opensearch/rest/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchRestClientInstrumentation.java b/dd-java-agent/instrumentation/opensearch/rest/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchRestClientInstrumentation.java index cba0cb6298d..ea833363ffe 100644 --- a/dd-java-agent/instrumentation/opensearch/rest/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchRestClientInstrumentation.java +++ b/dd-java-agent/instrumentation/opensearch/rest/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchRestClientInstrumentation.java @@ -22,7 +22,7 @@ @AutoService(InstrumenterModule.class) public class OpensearchRestClientInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public OpensearchRestClientInstrumentation() { super("opensearch", "opensearch-rest"); diff --git a/dd-java-agent/instrumentation/opensearch/transport/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchTransportClientInstrumentation.java b/dd-java-agent/instrumentation/opensearch/transport/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchTransportClientInstrumentation.java index da40d47c41d..913ac8431e0 100644 --- a/dd-java-agent/instrumentation/opensearch/transport/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchTransportClientInstrumentation.java +++ b/dd-java-agent/instrumentation/opensearch/transport/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchTransportClientInstrumentation.java @@ -24,7 +24,7 @@ @AutoService(InstrumenterModule.class) public class OpensearchTransportClientInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public OpensearchTransportClientInstrumentation() { super("opensearch", "opensearch-transport"); diff --git a/dd-java-agent/instrumentation/opensearch/transport/src/main/java/datadog/trace/instrumentation/opensearch/ThreadedActionListenerInstrumentation.java b/dd-java-agent/instrumentation/opensearch/transport/src/main/java/datadog/trace/instrumentation/opensearch/ThreadedActionListenerInstrumentation.java index 57919653f4f..5fa2c048d1a 100644 --- a/dd-java-agent/instrumentation/opensearch/transport/src/main/java/datadog/trace/instrumentation/opensearch/ThreadedActionListenerInstrumentation.java +++ b/dd-java-agent/instrumentation/opensearch/transport/src/main/java/datadog/trace/instrumentation/opensearch/ThreadedActionListenerInstrumentation.java @@ -24,7 +24,7 @@ */ @AutoService(InstrumenterModule.class) public final class ThreadedActionListenerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ThreadedActionListenerInstrumentation() { super("opensearch", "opensearch-transport"); diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OpenTelemetryInstrumentation.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OpenTelemetryInstrumentation.java index 1485cd1a239..8372add61d9 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OpenTelemetryInstrumentation.java +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OpenTelemetryInstrumentation.java @@ -15,7 +15,7 @@ */ @AutoService(InstrumenterModule.class) public class OpenTelemetryInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public OpenTelemetryInstrumentation() { super("opentelemetry-beta"); } diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/OpenTelemetryInstrumentation.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/OpenTelemetryInstrumentation.java index 5c28057fe09..75c8ca47391 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/OpenTelemetryInstrumentation.java +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/OpenTelemetryInstrumentation.java @@ -20,7 +20,7 @@ @AutoService(InstrumenterModule.class) public class OpenTelemetryInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.CanShortcutTypeMatching { + implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice { public OpenTelemetryInstrumentation() { super("opentelemetry.experimental", "opentelemetry-1"); diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/context/OpenTelemetryContextInstrumentation.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/context/OpenTelemetryContextInstrumentation.java index 1aa555993e7..c1ef0a476d7 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/context/OpenTelemetryContextInstrumentation.java +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/context/OpenTelemetryContextInstrumentation.java @@ -18,7 +18,7 @@ @AutoService(InstrumenterModule.class) public class OpenTelemetryContextInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.CanShortcutTypeMatching { + implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice { public OpenTelemetryContextInstrumentation() { super("opentelemetry.experimental", "opentelemetry-1"); diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/context/OpenTelemetryContextStorageInstrumentation.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/context/OpenTelemetryContextStorageInstrumentation.java index 345563d73bb..2f3f5c04017 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/context/OpenTelemetryContextStorageInstrumentation.java +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/context/OpenTelemetryContextStorageInstrumentation.java @@ -18,7 +18,7 @@ @AutoService(InstrumenterModule.class) public class OpenTelemetryContextStorageInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.CanShortcutTypeMatching { + implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice { public OpenTelemetryContextStorageInstrumentation() { super("opentelemetry.experimental", "opentelemetry-1"); diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/WithSpanAnnotationInstrumentation.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/WithSpanAnnotationInstrumentation.java index 7ae31878209..8d73d56a9cf 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/WithSpanAnnotationInstrumentation.java +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/WithSpanAnnotationInstrumentation.java @@ -17,7 +17,7 @@ @AutoService(InstrumenterModule.class) public final class WithSpanAnnotationInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public WithSpanAnnotationInstrumentation() { super("opentelemetry-annotations", "opentelemetry-annotations-1.20"); diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.26/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/AddingSpanAttributesInstrumentation.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.26/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/AddingSpanAttributesInstrumentation.java index 8eea15ddafd..1da7e6a04dc 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.26/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/AddingSpanAttributesInstrumentation.java +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.26/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/AddingSpanAttributesInstrumentation.java @@ -16,7 +16,7 @@ @AutoService(InstrumenterModule.class) public class AddingSpanAttributesInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public AddingSpanAttributesInstrumentation() { super("opentelemetry-annotations", "opentelemetry-annotations-1.26"); diff --git a/dd-java-agent/instrumentation/opentracing/api-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/GlobalTracerInstrumentation.java b/dd-java-agent/instrumentation/opentracing/api-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/GlobalTracerInstrumentation.java index 7a2e1dff243..027cb5bbb69 100644 --- a/dd-java-agent/instrumentation/opentracing/api-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/GlobalTracerInstrumentation.java +++ b/dd-java-agent/instrumentation/opentracing/api-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/GlobalTracerInstrumentation.java @@ -20,7 +20,7 @@ */ @AutoService(InstrumenterModule.class) public class GlobalTracerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public GlobalTracerInstrumentation() { super("opentracing", "opentracing-globaltracer"); } diff --git a/dd-java-agent/instrumentation/opentracing/api-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/GlobalTracerInstrumentation.java b/dd-java-agent/instrumentation/opentracing/api-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/GlobalTracerInstrumentation.java index 0fa215cbafb..a12f689860d 100644 --- a/dd-java-agent/instrumentation/opentracing/api-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/GlobalTracerInstrumentation.java +++ b/dd-java-agent/instrumentation/opentracing/api-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/GlobalTracerInstrumentation.java @@ -17,7 +17,7 @@ */ @AutoService(InstrumenterModule.class) public class GlobalTracerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public GlobalTracerInstrumentation() { super("opentracing", "opentracing-globaltracer"); } diff --git a/dd-java-agent/instrumentation/org-json/src/main/java/datadog/trace/instrumentation/json/JSONArrayInstrumentation.java b/dd-java-agent/instrumentation/org-json/src/main/java/datadog/trace/instrumentation/json/JSONArrayInstrumentation.java index dcbe22da820..942a3905592 100644 --- a/dd-java-agent/instrumentation/org-json/src/main/java/datadog/trace/instrumentation/json/JSONArrayInstrumentation.java +++ b/dd-java-agent/instrumentation/org-json/src/main/java/datadog/trace/instrumentation/json/JSONArrayInstrumentation.java @@ -19,7 +19,7 @@ @AutoService(InstrumenterModule.class) public class JSONArrayInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public JSONArrayInstrumentation() { super("org-json"); diff --git a/dd-java-agent/instrumentation/org-json/src/main/java/datadog/trace/instrumentation/json/JSONCookieInstrumentation.java b/dd-java-agent/instrumentation/org-json/src/main/java/datadog/trace/instrumentation/json/JSONCookieInstrumentation.java index 4946459c8bf..f9a25abb04d 100644 --- a/dd-java-agent/instrumentation/org-json/src/main/java/datadog/trace/instrumentation/json/JSONCookieInstrumentation.java +++ b/dd-java-agent/instrumentation/org-json/src/main/java/datadog/trace/instrumentation/json/JSONCookieInstrumentation.java @@ -13,7 +13,7 @@ @AutoService(InstrumenterModule.class) public class JSONCookieInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public JSONCookieInstrumentation() { super("org-json"); diff --git a/dd-java-agent/instrumentation/org-json/src/main/java/datadog/trace/instrumentation/json/JSONObjectInstrumentation.java b/dd-java-agent/instrumentation/org-json/src/main/java/datadog/trace/instrumentation/json/JSONObjectInstrumentation.java index b7261b6a9b7..c260d5390ad 100644 --- a/dd-java-agent/instrumentation/org-json/src/main/java/datadog/trace/instrumentation/json/JSONObjectInstrumentation.java +++ b/dd-java-agent/instrumentation/org-json/src/main/java/datadog/trace/instrumentation/json/JSONObjectInstrumentation.java @@ -19,7 +19,7 @@ @AutoService(InstrumenterModule.class) public class JSONObjectInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public JSONObjectInstrumentation() { super("org-json"); } diff --git a/dd-java-agent/instrumentation/org-json/src/main/java/datadog/trace/instrumentation/json/JSONTokenerInstrumentation.java b/dd-java-agent/instrumentation/org-json/src/main/java/datadog/trace/instrumentation/json/JSONTokenerInstrumentation.java index 09539795ab6..eb51d248770 100644 --- a/dd-java-agent/instrumentation/org-json/src/main/java/datadog/trace/instrumentation/json/JSONTokenerInstrumentation.java +++ b/dd-java-agent/instrumentation/org-json/src/main/java/datadog/trace/instrumentation/json/JSONTokenerInstrumentation.java @@ -13,7 +13,7 @@ @AutoService(InstrumenterModule.class) public class JSONTokenerInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public JSONTokenerInstrumentation() { super("org-json"); diff --git a/dd-java-agent/instrumentation/osgi-4.3/src/main/java/datadog/trace/instrumentation/osgi43/BundleReferenceInstrumentation.java b/dd-java-agent/instrumentation/osgi-4.3/src/main/java/datadog/trace/instrumentation/osgi43/BundleReferenceInstrumentation.java index 983cf56380d..583ed367801 100644 --- a/dd-java-agent/instrumentation/osgi-4.3/src/main/java/datadog/trace/instrumentation/osgi43/BundleReferenceInstrumentation.java +++ b/dd-java-agent/instrumentation/osgi-4.3/src/main/java/datadog/trace/instrumentation/osgi43/BundleReferenceInstrumentation.java @@ -23,7 +23,7 @@ @AutoService(InstrumenterModule.class) public final class BundleReferenceInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public BundleReferenceInstrumentation() { super("classloading", "osgi"); } diff --git a/dd-java-agent/instrumentation/pekko-concurrent/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoActorCellInstrumentation.java b/dd-java-agent/instrumentation/pekko-concurrent/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoActorCellInstrumentation.java index ad489b4cc91..aa40a6b87ec 100644 --- a/dd-java-agent/instrumentation/pekko-concurrent/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoActorCellInstrumentation.java +++ b/dd-java-agent/instrumentation/pekko-concurrent/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoActorCellInstrumentation.java @@ -21,7 +21,7 @@ @AutoService(InstrumenterModule.class) public class PekkoActorCellInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public PekkoActorCellInstrumentation() { super("pekko_actor_receive", "pekko_actor", "pekko_concurrent", "java_concurrent"); diff --git a/dd-java-agent/instrumentation/pekko-concurrent/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoEnvelopeInstrumentation.java b/dd-java-agent/instrumentation/pekko-concurrent/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoEnvelopeInstrumentation.java index 120ff6e497a..5687f209cb8 100644 --- a/dd-java-agent/instrumentation/pekko-concurrent/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoEnvelopeInstrumentation.java +++ b/dd-java-agent/instrumentation/pekko-concurrent/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoEnvelopeInstrumentation.java @@ -15,7 +15,7 @@ @AutoService(InstrumenterModule.class) public class PekkoEnvelopeInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public PekkoEnvelopeInstrumentation() { super("pekko_actor_send", "pekko_actor", "pekko_concurrent", "java_concurrent"); diff --git a/dd-java-agent/instrumentation/pekko-concurrent/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoForkJoinExecutorTaskInstrumentation.java b/dd-java-agent/instrumentation/pekko-concurrent/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoForkJoinExecutorTaskInstrumentation.java index 3e15f468327..14fa1200c07 100644 --- a/dd-java-agent/instrumentation/pekko-concurrent/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoForkJoinExecutorTaskInstrumentation.java +++ b/dd-java-agent/instrumentation/pekko-concurrent/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoForkJoinExecutorTaskInstrumentation.java @@ -25,7 +25,7 @@ */ @AutoService(InstrumenterModule.class) public final class PekkoForkJoinExecutorTaskInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public PekkoForkJoinExecutorTaskInstrumentation() { super("java_concurrent", "pekko_concurrent"); } diff --git a/dd-java-agent/instrumentation/pekko-concurrent/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoMailboxInstrumentation.java b/dd-java-agent/instrumentation/pekko-concurrent/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoMailboxInstrumentation.java index 3773389eb80..c052b4b1ff8 100644 --- a/dd-java-agent/instrumentation/pekko-concurrent/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoMailboxInstrumentation.java +++ b/dd-java-agent/instrumentation/pekko-concurrent/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoMailboxInstrumentation.java @@ -22,7 +22,7 @@ @AutoService(InstrumenterModule.class) public class PekkoMailboxInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType, ExcludeFilterProvider { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, ExcludeFilterProvider { public PekkoMailboxInstrumentation() { super("pekko_actor_mailbox", "pekko_actor", "pekko_concurrent", "java_concurrent"); diff --git a/dd-java-agent/instrumentation/pekko-concurrent/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoRoutedActorCellInstrumentation.java b/dd-java-agent/instrumentation/pekko-concurrent/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoRoutedActorCellInstrumentation.java index 9697e410e8a..6cba978d81f 100644 --- a/dd-java-agent/instrumentation/pekko-concurrent/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoRoutedActorCellInstrumentation.java +++ b/dd-java-agent/instrumentation/pekko-concurrent/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoRoutedActorCellInstrumentation.java @@ -19,7 +19,7 @@ @AutoService(InstrumenterModule.class) public class PekkoRoutedActorCellInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public PekkoRoutedActorCellInstrumentation() { super("pekko_actor_send", "pekko_actor", "pekko_concurrent", "java_concurrent"); diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttp2ServerInstrumentation.java b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttp2ServerInstrumentation.java index 026106eac45..0145577a6c2 100644 --- a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttp2ServerInstrumentation.java +++ b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttp2ServerInstrumentation.java @@ -20,7 +20,7 @@ */ @AutoService(InstrumenterModule.class) public final class PekkoHttp2ServerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public PekkoHttp2ServerInstrumentation() { super("pekko-http2", "pekko-http", "pekko-http-server"); } diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpServerInstrumentation.java b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpServerInstrumentation.java index 823a20effae..06f420e8f25 100644 --- a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpServerInstrumentation.java +++ b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpServerInstrumentation.java @@ -49,7 +49,7 @@ */ @AutoService(InstrumenterModule.class) public final class PekkoHttpServerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public PekkoHttpServerInstrumentation() { super("pekko-http", "pekko-http-server"); } diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpSingleRequestInstrumentation.java b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpSingleRequestInstrumentation.java index 5f1f324c334..2dc9e4c9bd6 100644 --- a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpSingleRequestInstrumentation.java +++ b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpSingleRequestInstrumentation.java @@ -24,7 +24,7 @@ @AutoService(InstrumenterModule.class) public final class PekkoHttpSingleRequestInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public PekkoHttpSingleRequestInstrumentation() { super("pekko-http", "pekko-http-client"); } diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoPoolMasterActorInstrumentation.java b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoPoolMasterActorInstrumentation.java index b5925bde8e8..e4088a59f29 100644 --- a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoPoolMasterActorInstrumentation.java +++ b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoPoolMasterActorInstrumentation.java @@ -12,7 +12,7 @@ @AutoService(InstrumenterModule.class) public final class PekkoPoolMasterActorInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public PekkoPoolMasterActorInstrumentation() { super("pekko-http", "pekko-http-client"); } diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/CookieDirectivesInstrumentation.java b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/CookieDirectivesInstrumentation.java index a1a73de6c11..77b2d1c8c67 100644 --- a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/CookieDirectivesInstrumentation.java +++ b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/CookieDirectivesInstrumentation.java @@ -22,7 +22,7 @@ */ @AutoService(InstrumenterModule.class) public class CookieDirectivesInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public CookieDirectivesInstrumentation() { super("pekko-http"); } diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/CookieHeaderInstrumentation.java b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/CookieHeaderInstrumentation.java index a3103aa58f4..8c020da2ffe 100644 --- a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/CookieHeaderInstrumentation.java +++ b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/CookieHeaderInstrumentation.java @@ -33,7 +33,7 @@ */ @AutoService(InstrumenterModule.class) public class CookieHeaderInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public CookieHeaderInstrumentation() { super("pekko-http"); } diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/ExtractDirectivesInstrumentation.java b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/ExtractDirectivesInstrumentation.java index 9becb9ceab3..460553c08d8 100644 --- a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/ExtractDirectivesInstrumentation.java +++ b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/ExtractDirectivesInstrumentation.java @@ -34,7 +34,7 @@ */ @AutoService(InstrumenterModule.class) public class ExtractDirectivesInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public ExtractDirectivesInstrumentation() { super("pekko-http"); } diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/FormDataInstrumentation.java b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/FormDataInstrumentation.java index 3ee12c800ea..63545c59350 100644 --- a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/FormDataInstrumentation.java +++ b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/FormDataInstrumentation.java @@ -20,7 +20,7 @@ */ @AutoService(InstrumenterModule.class) public class FormDataInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public FormDataInstrumentation() { super("pekko-http"); } diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/FormFieldDirectivesInstrumentation.java b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/FormFieldDirectivesInstrumentation.java index d801926f21f..6940bfa918a 100644 --- a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/FormFieldDirectivesInstrumentation.java +++ b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/FormFieldDirectivesInstrumentation.java @@ -30,7 +30,7 @@ */ @AutoService(InstrumenterModule.class) public class FormFieldDirectivesInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { private static final String TRAIT_CLASS = "org.apache.pekko.http.scaladsl.server.directives.FormFieldDirectives"; diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/HttpHeaderSubclassesInstrumentation.java b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/HttpHeaderSubclassesInstrumentation.java index 1e7c9d2a72e..fa84d2ee2ad 100644 --- a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/HttpHeaderSubclassesInstrumentation.java +++ b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/HttpHeaderSubclassesInstrumentation.java @@ -34,7 +34,7 @@ */ @AutoService(InstrumenterModule.class) public class HttpHeaderSubclassesInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public HttpHeaderSubclassesInstrumentation() { super("pekko-http"); } diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/HttpRequestInstrumentation.java b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/HttpRequestInstrumentation.java index db02dc8a6c3..fb10785e46b 100644 --- a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/HttpRequestInstrumentation.java +++ b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/HttpRequestInstrumentation.java @@ -36,7 +36,7 @@ */ @AutoService(InstrumenterModule.class) public class HttpRequestInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public HttpRequestInstrumentation() { super("pekko-http"); } diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/MakeTaintableInstrumentation.java b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/MakeTaintableInstrumentation.java index 3e020f927ba..fca33f5c437 100644 --- a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/MakeTaintableInstrumentation.java +++ b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/MakeTaintableInstrumentation.java @@ -37,7 +37,4 @@ public String[] knownMatchingTypes() { public void typeAdvice(TypeTransformer transformer) { transformer.applyAdvice(new TaintableVisitor(knownMatchingTypes())); } - - @Override - public void methodAdvice(MethodTransformer transformer) {} } diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/MarshallingDirectivesInstrumentation.java b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/MarshallingDirectivesInstrumentation.java index 6c72c4e76a4..e50e16b3bce 100644 --- a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/MarshallingDirectivesInstrumentation.java +++ b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/MarshallingDirectivesInstrumentation.java @@ -28,7 +28,7 @@ */ @AutoService(InstrumenterModule.class) public class MarshallingDirectivesInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public MarshallingDirectivesInstrumentation() { super("pekko-http"); diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/ParameterDirectivesImplInstrumentation.java b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/ParameterDirectivesImplInstrumentation.java index e87ddb5d774..97008705072 100644 --- a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/ParameterDirectivesImplInstrumentation.java +++ b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/ParameterDirectivesImplInstrumentation.java @@ -21,7 +21,7 @@ @AutoService(InstrumenterModule.class) public class ParameterDirectivesImplInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ParameterDirectivesImplInstrumentation() { super("pekko-http"); } diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/ParameterDirectivesInstrumentation.java b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/ParameterDirectivesInstrumentation.java index d0413313ed3..ab4b1e3a18b 100644 --- a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/ParameterDirectivesInstrumentation.java +++ b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/ParameterDirectivesInstrumentation.java @@ -30,7 +30,7 @@ */ @AutoService(InstrumenterModule.class) public class ParameterDirectivesInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { private static final String TRAIT_NAME = "org.apache.pekko.http.scaladsl.server.directives.ParameterDirectives"; diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/PathMatcherInstrumentation.java b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/PathMatcherInstrumentation.java index 299b3bed118..3fd5586ed8d 100644 --- a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/PathMatcherInstrumentation.java +++ b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/PathMatcherInstrumentation.java @@ -25,7 +25,7 @@ */ @AutoService(InstrumenterModule.class) public class PathMatcherInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public PathMatcherInstrumentation() { super("pekko-http"); } diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/RequestContextInstrumentation.java b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/RequestContextInstrumentation.java index 25a3c5b44c5..0f302d0f6b9 100644 --- a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/RequestContextInstrumentation.java +++ b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/RequestContextInstrumentation.java @@ -25,7 +25,7 @@ /** Propagates taint when fetching the {@link HttpRequest} from the {@link RequestContext}. */ @AutoService(InstrumenterModule.class) public class RequestContextInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public RequestContextInstrumentation() { super("pekko-http"); } diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/UnmarshallerInstrumentation.java b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/UnmarshallerInstrumentation.java index e9045aed00b..c1ea5e51810 100644 --- a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/UnmarshallerInstrumentation.java +++ b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/UnmarshallerInstrumentation.java @@ -34,7 +34,7 @@ */ @AutoService(InstrumenterModule.class) public class UnmarshallerInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public UnmarshallerInstrumentation() { super("pekko-http"); } diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/UriInstrumentation.java b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/UriInstrumentation.java index 663daebf2f3..4a7e23f08ca 100644 --- a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/UriInstrumentation.java +++ b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/UriInstrumentation.java @@ -29,7 +29,7 @@ /** Propagates taint from a {@link Uri} to query strings fetched from it. */ @AutoService(InstrumenterModule.class) public class UriInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public UriInstrumentation() { super("pekko-http"); } diff --git a/dd-java-agent/instrumentation/play-2.3/src/main/java/datadog/trace/instrumentation/play23/PlayInstrumentation.java b/dd-java-agent/instrumentation/play-2.3/src/main/java/datadog/trace/instrumentation/play23/PlayInstrumentation.java index 9ff29482253..8b1680964de 100644 --- a/dd-java-agent/instrumentation/play-2.3/src/main/java/datadog/trace/instrumentation/play23/PlayInstrumentation.java +++ b/dd-java-agent/instrumentation/play-2.3/src/main/java/datadog/trace/instrumentation/play23/PlayInstrumentation.java @@ -13,7 +13,7 @@ @AutoService(InstrumenterModule.class) public final class PlayInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public PlayInstrumentation() { super("play", "play-action"); diff --git a/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play24/PlayInstrumentation.java b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play24/PlayInstrumentation.java index 7e53451f349..0a3515ed3bd 100644 --- a/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play24/PlayInstrumentation.java +++ b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play24/PlayInstrumentation.java @@ -13,7 +13,7 @@ @AutoService(InstrumenterModule.class) public final class PlayInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public PlayInstrumentation() { super("play"); diff --git a/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/DelegatingBodyParserInstrumentation.java b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/DelegatingBodyParserInstrumentation.java index 83ea280f70b..850d38b12da 100644 --- a/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/DelegatingBodyParserInstrumentation.java +++ b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/DelegatingBodyParserInstrumentation.java @@ -12,7 +12,7 @@ @AutoService(InstrumenterModule.class) public class DelegatingBodyParserInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public DelegatingBodyParserInstrumentation() { super("play"); } diff --git a/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/FormUrlEncodedInstrumentation.java b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/FormUrlEncodedInstrumentation.java index d98c659449a..cb4bd2b8e9c 100644 --- a/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/FormUrlEncodedInstrumentation.java +++ b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/FormUrlEncodedInstrumentation.java @@ -13,7 +13,7 @@ @AutoService(InstrumenterModule.class) public class FormUrlEncodedInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public FormUrlEncodedInstrumentation() { super("play"); } diff --git a/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/HttpErrorHandlerInstrumentation.java b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/HttpErrorHandlerInstrumentation.java index ef190144c74..398778e3b3f 100644 --- a/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/HttpErrorHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/HttpErrorHandlerInstrumentation.java @@ -24,7 +24,7 @@ /** @see HttpErrorHandler#onServerError(RequestHeader, Throwable) */ @AutoService(InstrumenterModule.class) public class HttpErrorHandlerInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public HttpErrorHandlerInstrumentation() { super("play"); } diff --git a/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/PathPatternInstrumentation.java b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/PathPatternInstrumentation.java index 2e434ff96d4..cce17b342ec 100644 --- a/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/PathPatternInstrumentation.java +++ b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/PathPatternInstrumentation.java @@ -15,7 +15,7 @@ /** @see play.core.routing.PathPattern#apply(String) */ @AutoService(InstrumenterModule.class) public class PathPatternInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public PathPatternInstrumentation() { super("play"); } diff --git a/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersInstrumentation.java b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersInstrumentation.java index 7fae26640b1..da48a0aa606 100644 --- a/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersInstrumentation.java +++ b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersInstrumentation.java @@ -15,7 +15,7 @@ /** @see play.api.mvc.BodyParsers.parse$#tolerantText(long) */ @AutoService(InstrumenterModule.class) public class PlayBodyParsersInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public PlayBodyParsersInstrumentation() { super("play"); diff --git a/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/RoutingDslInstrumentation.java b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/RoutingDslInstrumentation.java index 46ca3c29b99..6b8aebcb01f 100644 --- a/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/RoutingDslInstrumentation.java +++ b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/RoutingDslInstrumentation.java @@ -12,7 +12,7 @@ /** @see play.routing.RoutingDsl.Route */ @AutoService(InstrumenterModule.class) public class RoutingDslInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public RoutingDslInstrumentation() { super("play"); } diff --git a/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorInstrumentation.java b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorInstrumentation.java index a26f502ef03..a11dc743f49 100644 --- a/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorInstrumentation.java +++ b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorInstrumentation.java @@ -14,7 +14,7 @@ /** @see play.api.routing.sird.PathExtractor */ @AutoService(InstrumenterModule.class) public class SirdPathExtractorInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public SirdPathExtractorInstrumentation() { super("play"); } diff --git a/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantJsonInstrumentation.java b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantJsonInstrumentation.java index e92086c1e81..e94cfc0bc81 100644 --- a/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantJsonInstrumentation.java +++ b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantJsonInstrumentation.java @@ -15,7 +15,7 @@ /** @see play.mvc.BodyParser.TolerantJson#parse(Http.RequestHeader, ByteString) */ @AutoService(InstrumenterModule.class) public class TolerantJsonInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public TolerantJsonInstrumentation() { super("play"); } diff --git a/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantTextInstrumentation.java b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantTextInstrumentation.java index 211eed327e9..d4589b28e67 100644 --- a/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantTextInstrumentation.java +++ b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantTextInstrumentation.java @@ -12,7 +12,7 @@ @AutoService(InstrumenterModule.class) public class TolerantTextInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public TolerantTextInstrumentation() { super("play"); } diff --git a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayInstrumentation.java b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayInstrumentation.java index 6d0a81bf7be..0b707d3b3a0 100644 --- a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayInstrumentation.java +++ b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayInstrumentation.java @@ -13,7 +13,7 @@ @AutoService(InstrumenterModule.class) public final class PlayInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public PlayInstrumentation() { super("play"); diff --git a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/SaveRawRemoteConnectionInstrumentation.java b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/SaveRawRemoteConnectionInstrumentation.java index 29924d53e25..6e9ac44537b 100644 --- a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/SaveRawRemoteConnectionInstrumentation.java +++ b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/SaveRawRemoteConnectionInstrumentation.java @@ -15,7 +15,7 @@ @AutoService(InstrumenterModule.class) public class SaveRawRemoteConnectionInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public SaveRawRemoteConnectionInstrumentation() { super("play"); } diff --git a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/DelegatingBodyParserInstrumentation.java b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/DelegatingBodyParserInstrumentation.java index e288c862e6e..07d4ebf571d 100644 --- a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/DelegatingBodyParserInstrumentation.java +++ b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/DelegatingBodyParserInstrumentation.java @@ -18,7 +18,7 @@ /** @see play.mvc.BodyParser.DelegatingBodyParser */ @AutoService(InstrumenterModule.class) public class DelegatingBodyParserInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public DelegatingBodyParserInstrumentation() { super("play"); } diff --git a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/FormUrlEncodedInstrumentation.java b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/FormUrlEncodedInstrumentation.java index bafcedf779f..a4f6c197ae9 100644 --- a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/FormUrlEncodedInstrumentation.java +++ b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/FormUrlEncodedInstrumentation.java @@ -17,7 +17,7 @@ /** @see play.mvc.BodyParser.FormUrlEncoded#parse(Http.RequestHeader, ByteString) */ @AutoService(InstrumenterModule.class) public class FormUrlEncodedInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public FormUrlEncodedInstrumentation() { super("play"); } diff --git a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/HttpErrorHandlerInstrumentation.java b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/HttpErrorHandlerInstrumentation.java index ce4254dd36a..5bb87c9e7ac 100644 --- a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/HttpErrorHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/HttpErrorHandlerInstrumentation.java @@ -25,7 +25,7 @@ /** @see HttpErrorHandler#onServerError(RequestHeader, Throwable) */ @AutoService(InstrumenterModule.class) public class HttpErrorHandlerInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public HttpErrorHandlerInstrumentation() { super("play"); } diff --git a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/PathPatternInstrumentation.java b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/PathPatternInstrumentation.java index 4d297c40205..66253f4b29e 100644 --- a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/PathPatternInstrumentation.java +++ b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/PathPatternInstrumentation.java @@ -25,7 +25,7 @@ /** @see play.core.routing.PathPattern#apply(String) */ @AutoService(InstrumenterModule.class) public class PathPatternInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public PathPatternInstrumentation() { super("play"); } diff --git a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/PlayBodyParsersInstrumentation.java b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/PlayBodyParsersInstrumentation.java index 3e745c15815..07fa55a46fa 100644 --- a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/PlayBodyParsersInstrumentation.java +++ b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/PlayBodyParsersInstrumentation.java @@ -23,7 +23,7 @@ /** @see play.api.mvc.PlayBodyParsers$class#tolerantFormUrlEncoded(PlayBodyParsers, int) */ @AutoService(InstrumenterModule.class) public class PlayBodyParsersInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { private static final String TRAIT_NAME = "play.api.mvc.PlayBodyParsers"; public PlayBodyParsersInstrumentation() { diff --git a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/RoutingDslInstrumentation.java b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/RoutingDslInstrumentation.java index 8bb40645167..3a748eb17e1 100644 --- a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/RoutingDslInstrumentation.java +++ b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/RoutingDslInstrumentation.java @@ -18,7 +18,7 @@ /** @see RoutingDsl.Route */ @AutoService(InstrumenterModule.class) public class RoutingDslInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public RoutingDslInstrumentation() { super("play"); } diff --git a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/SirdPathExtractorInstrumentation.java b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/SirdPathExtractorInstrumentation.java index a89139194a5..f361a39e699 100644 --- a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/SirdPathExtractorInstrumentation.java +++ b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/SirdPathExtractorInstrumentation.java @@ -22,7 +22,7 @@ /** @see play.api.routing.sird.PathExtractor */ @AutoService(InstrumenterModule.class) public class SirdPathExtractorInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public SirdPathExtractorInstrumentation() { super("play"); } diff --git a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantJsonInstrumentation.java b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantJsonInstrumentation.java index adeeb8f397e..a5fc8e4e2ce 100644 --- a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantJsonInstrumentation.java +++ b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantJsonInstrumentation.java @@ -21,7 +21,7 @@ /** @see play.mvc.BodyParser.TolerantJson#parse(Http.RequestHeader, ByteString) */ @AutoService(InstrumenterModule.class) public class TolerantJsonInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public TolerantJsonInstrumentation() { super("play"); } diff --git a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantTextInstrumentation.java b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantTextInstrumentation.java index 10b378b199b..32a52810237 100644 --- a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantTextInstrumentation.java +++ b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantTextInstrumentation.java @@ -18,7 +18,7 @@ /** @see play.mvc.BodyParser.TolerantText#parse(Http.RequestHeader, ByteString) */ @AutoService(InstrumenterModule.class) public class TolerantTextInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public TolerantTextInstrumentation() { super("play"); } diff --git a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantXmlInstrumentation.java b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantXmlInstrumentation.java index cb6d1338440..f0e24fcf284 100644 --- a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantXmlInstrumentation.java +++ b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantXmlInstrumentation.java @@ -18,7 +18,7 @@ /** @see play.mvc.BodyParser.TolerantXml#parse(Http.RequestHeader, ByteString) */ @AutoService(InstrumenterModule.class) public class TolerantXmlInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public TolerantXmlInstrumentation() { super("play"); } diff --git a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play27/appsec/RoutingDsl27Instrumentation.java b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play27/appsec/RoutingDsl27Instrumentation.java index 50f7be494be..e8f5da07dc7 100644 --- a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play27/appsec/RoutingDsl27Instrumentation.java +++ b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play27/appsec/RoutingDsl27Instrumentation.java @@ -13,7 +13,7 @@ /** @see RoutingDsl.Route */ @AutoService(InstrumenterModule.class) public class RoutingDsl27Instrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public RoutingDsl27Instrumentation() { super("play"); } diff --git a/dd-java-agent/instrumentation/play-ws/src/main/java/datadog/trace/instrumentation/playws/BasePlayWSClientInstrumentation.java b/dd-java-agent/instrumentation/play-ws/src/main/java/datadog/trace/instrumentation/playws/BasePlayWSClientInstrumentation.java index 46baa922d15..29770b841c3 100644 --- a/dd-java-agent/instrumentation/play-ws/src/main/java/datadog/trace/instrumentation/playws/BasePlayWSClientInstrumentation.java +++ b/dd-java-agent/instrumentation/play-ws/src/main/java/datadog/trace/instrumentation/playws/BasePlayWSClientInstrumentation.java @@ -14,7 +14,7 @@ import net.bytebuddy.matcher.ElementMatcher; public abstract class BasePlayWSClientInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public BasePlayWSClientInstrumentation() { super("play-ws"); } diff --git a/dd-java-agent/instrumentation/protobuf/src/main/java/datadog/trace/instrumentation/protobuf_java/AbstractMessageInstrumentation.java b/dd-java-agent/instrumentation/protobuf/src/main/java/datadog/trace/instrumentation/protobuf_java/AbstractMessageInstrumentation.java index 0aee173f7c4..11e664d5d00 100644 --- a/dd-java-agent/instrumentation/protobuf/src/main/java/datadog/trace/instrumentation/protobuf_java/AbstractMessageInstrumentation.java +++ b/dd-java-agent/instrumentation/protobuf/src/main/java/datadog/trace/instrumentation/protobuf_java/AbstractMessageInstrumentation.java @@ -19,7 +19,7 @@ @AutoService(InstrumenterModule.class) public final class AbstractMessageInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { static final String instrumentationName = "protobuf"; static final String TARGET_TYPE = "com.google.protobuf.AbstractMessage"; diff --git a/dd-java-agent/instrumentation/protobuf/src/main/java/datadog/trace/instrumentation/protobuf_java/AbstractParserInstrumentation.java b/dd-java-agent/instrumentation/protobuf/src/main/java/datadog/trace/instrumentation/protobuf_java/AbstractParserInstrumentation.java index d926af59379..efe1a7f3273 100644 --- a/dd-java-agent/instrumentation/protobuf/src/main/java/datadog/trace/instrumentation/protobuf_java/AbstractParserInstrumentation.java +++ b/dd-java-agent/instrumentation/protobuf/src/main/java/datadog/trace/instrumentation/protobuf_java/AbstractParserInstrumentation.java @@ -22,7 +22,7 @@ @AutoService(InstrumenterModule.class) public final class AbstractParserInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { static final String instrumentationName = "protobuf"; static final String TARGET_TYPE = "com.google.protobuf.AbstractParser"; diff --git a/dd-java-agent/instrumentation/protobuf/src/main/java/datadog/trace/instrumentation/protobuf_java/DynamicMessageInstrumentation.java b/dd-java-agent/instrumentation/protobuf/src/main/java/datadog/trace/instrumentation/protobuf_java/DynamicMessageInstrumentation.java index fccaf12734e..358a0b7df4b 100644 --- a/dd-java-agent/instrumentation/protobuf/src/main/java/datadog/trace/instrumentation/protobuf_java/DynamicMessageInstrumentation.java +++ b/dd-java-agent/instrumentation/protobuf/src/main/java/datadog/trace/instrumentation/protobuf_java/DynamicMessageInstrumentation.java @@ -17,7 +17,7 @@ @AutoService(InstrumenterModule.class) public final class DynamicMessageInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { static final String instrumentationName = "protobuf"; static final String TARGET_TYPE = "com.google.protobuf.DynamicMessage"; diff --git a/dd-java-agent/instrumentation/quartz-2/src/main/java/datadog/trace/instrumentation/quartz/QuartzSchedulingInstrumentation.java b/dd-java-agent/instrumentation/quartz-2/src/main/java/datadog/trace/instrumentation/quartz/QuartzSchedulingInstrumentation.java index 6bf512336c3..7e8894cff13 100644 --- a/dd-java-agent/instrumentation/quartz-2/src/main/java/datadog/trace/instrumentation/quartz/QuartzSchedulingInstrumentation.java +++ b/dd-java-agent/instrumentation/quartz-2/src/main/java/datadog/trace/instrumentation/quartz/QuartzSchedulingInstrumentation.java @@ -22,7 +22,7 @@ @AutoService(InstrumenterModule.class) public final class QuartzSchedulingInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public QuartzSchedulingInstrumentation() { super("quartz"); diff --git a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitChannelInstrumentation.java b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitChannelInstrumentation.java index ef1f0e5c77d..c25d332a150 100644 --- a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitChannelInstrumentation.java +++ b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitChannelInstrumentation.java @@ -53,7 +53,7 @@ @AutoService(InstrumenterModule.class) public class RabbitChannelInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public RabbitChannelInstrumentation() { super("amqp", "rabbitmq"); diff --git a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitCommandInstrumentation.java b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitCommandInstrumentation.java index 3544b6d5f1c..527fc391f0f 100644 --- a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitCommandInstrumentation.java +++ b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitCommandInstrumentation.java @@ -21,7 +21,7 @@ @AutoService(InstrumenterModule.class) public class RabbitCommandInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public RabbitCommandInstrumentation() { super("amqp", "rabbitmq"); diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ContextParseInstrumentation.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ContextParseInstrumentation.java index a21c579da06..c455360454e 100644 --- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ContextParseInstrumentation.java +++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ContextParseInstrumentation.java @@ -11,7 +11,7 @@ @AutoService(InstrumenterModule.class) public class ContextParseInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ContextParseInstrumentation() { super("ratpack"); diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ContinuationInstrumentation.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ContinuationInstrumentation.java index 96d0899e8e6..834b184d075 100644 --- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ContinuationInstrumentation.java +++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ContinuationInstrumentation.java @@ -18,7 +18,7 @@ @AutoService(InstrumenterModule.class) public final class ContinuationInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public ContinuationInstrumentation() { super("ratpack"); diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/DefaultExecutionInstrumentation.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/DefaultExecutionInstrumentation.java index 4e25cd76818..5dd2c43c5b3 100644 --- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/DefaultExecutionInstrumentation.java +++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/DefaultExecutionInstrumentation.java @@ -17,7 +17,7 @@ @AutoService(InstrumenterModule.class) public final class DefaultExecutionInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public DefaultExecutionInstrumentation() { super("ratpack"); diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/PathHandlerInstrumentation.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/PathHandlerInstrumentation.java index e5941b93eb1..e712e5e0601 100644 --- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/PathHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/PathHandlerInstrumentation.java @@ -12,7 +12,7 @@ @AutoService(InstrumenterModule.class) public class PathHandlerInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public PathHandlerInstrumentation() { super("ratpack"); diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RatpackRequestBodyInstrumentation.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RatpackRequestBodyInstrumentation.java index f580ea7e86b..b4b18a91ec8 100644 --- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RatpackRequestBodyInstrumentation.java +++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RatpackRequestBodyInstrumentation.java @@ -11,7 +11,7 @@ /** @see RequestBody#readStream() the instrumented method */ @AutoService(InstrumenterModule.class) public class RatpackRequestBodyInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public RatpackRequestBodyInstrumentation() { super("ratpack-request-body"); } diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RatpackTypedDataInstrumentation.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RatpackTypedDataInstrumentation.java index 235977b7000..62f24396759 100644 --- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RatpackTypedDataInstrumentation.java +++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RatpackTypedDataInstrumentation.java @@ -13,7 +13,7 @@ @AutoService(InstrumenterModule.class) public class RatpackTypedDataInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public RatpackTypedDataInstrumentation() { super("ratpack-request-body"); } diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ServerErrorHandlerInstrumentation.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ServerErrorHandlerInstrumentation.java index 00741079ed6..94c18f90a93 100644 --- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ServerErrorHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ServerErrorHandlerInstrumentation.java @@ -13,7 +13,7 @@ @AutoService(InstrumenterModule.class) public class ServerErrorHandlerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public ServerErrorHandlerInstrumentation() { super("ratpack"); diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ServerRegistryInstrumentation.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ServerRegistryInstrumentation.java index 0b793b8de1f..c1963c57e5a 100644 --- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ServerRegistryInstrumentation.java +++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ServerRegistryInstrumentation.java @@ -10,7 +10,7 @@ @AutoService(InstrumenterModule.class) public class ServerRegistryInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ServerRegistryInstrumentation() { super("ratpack"); diff --git a/dd-java-agent/instrumentation/reactive-streams/src/main/java/datadog/trace/instrumentation/reactivestreams/PublisherInstrumentation.java b/dd-java-agent/instrumentation/reactive-streams/src/main/java/datadog/trace/instrumentation/reactivestreams/PublisherInstrumentation.java index 879cafe5ae1..eb6eaa99caf 100644 --- a/dd-java-agent/instrumentation/reactive-streams/src/main/java/datadog/trace/instrumentation/reactivestreams/PublisherInstrumentation.java +++ b/dd-java-agent/instrumentation/reactive-streams/src/main/java/datadog/trace/instrumentation/reactivestreams/PublisherInstrumentation.java @@ -32,7 +32,7 @@ */ @AutoService(InstrumenterModule.class) public class PublisherInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public PublisherInstrumentation() { super("reactive-streams", "reactive-streams-1"); diff --git a/dd-java-agent/instrumentation/reactive-streams/src/main/java/datadog/trace/instrumentation/reactivestreams/SubscriberInstrumentation.java b/dd-java-agent/instrumentation/reactive-streams/src/main/java/datadog/trace/instrumentation/reactivestreams/SubscriberInstrumentation.java index 6da5577618d..cb27f314393 100644 --- a/dd-java-agent/instrumentation/reactive-streams/src/main/java/datadog/trace/instrumentation/reactivestreams/SubscriberInstrumentation.java +++ b/dd-java-agent/instrumentation/reactive-streams/src/main/java/datadog/trace/instrumentation/reactivestreams/SubscriberInstrumentation.java @@ -27,7 +27,7 @@ */ @AutoService(InstrumenterModule.class) public class SubscriberInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public SubscriberInstrumentation() { super("reactive-streams", "reactive-streams-1"); } diff --git a/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/BlockScopePropagationInstrumentation.java b/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/BlockScopePropagationInstrumentation.java index 2437c08cdc6..67fb0d1abf2 100644 --- a/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/BlockScopePropagationInstrumentation.java +++ b/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/BlockScopePropagationInstrumentation.java @@ -28,7 +28,4 @@ public BlockScopePropagationInstrumentation() { "reactor.core.publisher.WorkQueueProcessor$WorkQueueInner", "reactor.core.publisher.WorkQueueProcessor$WorkQueueInner$1")); } - - @Override - public void methodAdvice(MethodTransformer transformer) {} } diff --git a/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/BlockingPublisherInstrumentation.java b/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/BlockingPublisherInstrumentation.java index 891beb517fc..a64f1310995 100644 --- a/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/BlockingPublisherInstrumentation.java +++ b/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/BlockingPublisherInstrumentation.java @@ -27,7 +27,7 @@ */ @AutoService(InstrumenterModule.class) public class BlockingPublisherInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public BlockingPublisherInstrumentation() { super("reactor-core"); } diff --git a/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/CoreSubscriberInstrumentation.java b/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/CoreSubscriberInstrumentation.java index 7b9a03a2669..6782d269ec0 100644 --- a/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/CoreSubscriberInstrumentation.java +++ b/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/CoreSubscriberInstrumentation.java @@ -19,7 +19,7 @@ @AutoService(InstrumenterModule.class) public class CoreSubscriberInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public CoreSubscriberInstrumentation() { super("reactor-core"); } diff --git a/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/OptimizableOperatorInstrumentation.java b/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/OptimizableOperatorInstrumentation.java index 698d52c1081..c25724bf4ae 100644 --- a/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/OptimizableOperatorInstrumentation.java +++ b/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/OptimizableOperatorInstrumentation.java @@ -27,7 +27,7 @@ */ @AutoService(InstrumenterModule.class) public class OptimizableOperatorInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public OptimizableOperatorInstrumentation() { super("reactor-core"); diff --git a/dd-java-agent/instrumentation/reactor-netty-1/src/main/java/datadog/trace/instrumentation/reactor/netty/HttpClientInstrumentation.java b/dd-java-agent/instrumentation/reactor-netty-1/src/main/java/datadog/trace/instrumentation/reactor/netty/HttpClientInstrumentation.java index b94c44381f4..532b7503009 100644 --- a/dd-java-agent/instrumentation/reactor-netty-1/src/main/java/datadog/trace/instrumentation/reactor/netty/HttpClientInstrumentation.java +++ b/dd-java-agent/instrumentation/reactor-netty-1/src/main/java/datadog/trace/instrumentation/reactor/netty/HttpClientInstrumentation.java @@ -19,7 +19,7 @@ */ @AutoService(InstrumenterModule.class) public class HttpClientInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public HttpClientInstrumentation() { super("reactor-netty", "reactor-netty-1"); diff --git a/dd-java-agent/instrumentation/rediscala-1.8.0/src/main/java/datadog/trace/instrumentation/rediscala/RedisClientActorInstrumentation.java b/dd-java-agent/instrumentation/rediscala-1.8.0/src/main/java/datadog/trace/instrumentation/rediscala/RedisClientActorInstrumentation.java index 4e936f70837..f68119922c6 100644 --- a/dd-java-agent/instrumentation/rediscala-1.8.0/src/main/java/datadog/trace/instrumentation/rediscala/RedisClientActorInstrumentation.java +++ b/dd-java-agent/instrumentation/rediscala-1.8.0/src/main/java/datadog/trace/instrumentation/rediscala/RedisClientActorInstrumentation.java @@ -18,7 +18,7 @@ @AutoService(InstrumenterModule.class) public class RedisClientActorInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public RedisClientActorInstrumentation() { super("rediscala", "redis", "rediscala-connection"); } diff --git a/dd-java-agent/instrumentation/rediscala-1.8.0/src/main/java/datadog/trace/instrumentation/rediscala/RediscalaInstrumentation.java b/dd-java-agent/instrumentation/rediscala-1.8.0/src/main/java/datadog/trace/instrumentation/rediscala/RediscalaInstrumentation.java index 3332d5b8c8b..97ea2ae91fd 100644 --- a/dd-java-agent/instrumentation/rediscala-1.8.0/src/main/java/datadog/trace/instrumentation/rediscala/RediscalaInstrumentation.java +++ b/dd-java-agent/instrumentation/rediscala-1.8.0/src/main/java/datadog/trace/instrumentation/rediscala/RediscalaInstrumentation.java @@ -32,7 +32,7 @@ @AutoService(InstrumenterModule.class) public final class RediscalaInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public RediscalaInstrumentation() { super("rediscala", "redis"); diff --git a/dd-java-agent/instrumentation/redisson/redisson-2.0.0/src/main/java/datadog/trace/instrumentation/redisson/RedissonInstrumentation.java b/dd-java-agent/instrumentation/redisson/redisson-2.0.0/src/main/java/datadog/trace/instrumentation/redisson/RedissonInstrumentation.java index ebc202baac2..48659664bb3 100644 --- a/dd-java-agent/instrumentation/redisson/redisson-2.0.0/src/main/java/datadog/trace/instrumentation/redisson/RedissonInstrumentation.java +++ b/dd-java-agent/instrumentation/redisson/redisson-2.0.0/src/main/java/datadog/trace/instrumentation/redisson/RedissonInstrumentation.java @@ -23,7 +23,7 @@ @AutoService(InstrumenterModule.class) public final class RedissonInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public RedissonInstrumentation() { super("redisson", "redis"); diff --git a/dd-java-agent/instrumentation/redisson/redisson-2.3.0/src/main/java/datadog/trace/instrumentation/redisson23/RedissonInstrumentation.java b/dd-java-agent/instrumentation/redisson/redisson-2.3.0/src/main/java/datadog/trace/instrumentation/redisson23/RedissonInstrumentation.java index e66a8ca480f..604e505d0fe 100644 --- a/dd-java-agent/instrumentation/redisson/redisson-2.3.0/src/main/java/datadog/trace/instrumentation/redisson23/RedissonInstrumentation.java +++ b/dd-java-agent/instrumentation/redisson/redisson-2.3.0/src/main/java/datadog/trace/instrumentation/redisson23/RedissonInstrumentation.java @@ -23,7 +23,7 @@ @AutoService(InstrumenterModule.class) public final class RedissonInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public RedissonInstrumentation() { super("redisson", "redis"); diff --git a/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/main/java/datadog/trace/instrumentation/redisson30/RedissonInstrumentation.java b/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/main/java/datadog/trace/instrumentation/redisson30/RedissonInstrumentation.java index da41ed813c3..2d7ab63969e 100644 --- a/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/main/java/datadog/trace/instrumentation/redisson30/RedissonInstrumentation.java +++ b/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/main/java/datadog/trace/instrumentation/redisson30/RedissonInstrumentation.java @@ -24,7 +24,7 @@ @AutoService(InstrumenterModule.class) public final class RedissonInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public RedissonInstrumentation() { super("redisson", "redis"); diff --git a/dd-java-agent/instrumentation/renaissance/src/main/java/datadog/trace/instrumentation/renaissance/RenaissanceInstrumentation.java b/dd-java-agent/instrumentation/renaissance/src/main/java/datadog/trace/instrumentation/renaissance/RenaissanceInstrumentation.java index a9153003af3..c114c46b607 100644 --- a/dd-java-agent/instrumentation/renaissance/src/main/java/datadog/trace/instrumentation/renaissance/RenaissanceInstrumentation.java +++ b/dd-java-agent/instrumentation/renaissance/src/main/java/datadog/trace/instrumentation/renaissance/RenaissanceInstrumentation.java @@ -17,7 +17,7 @@ @AutoService(InstrumenterModule.class) public class RenaissanceInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { private static final Logger log = LoggerFactory.getLogger(RenaissanceInstrumentation.class); public RenaissanceInstrumentation() { diff --git a/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/CookieParamInjectorInstrumentation.java b/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/CookieParamInjectorInstrumentation.java index d7a63344c71..5858c1fdf29 100644 --- a/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/CookieParamInjectorInstrumentation.java +++ b/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/CookieParamInjectorInstrumentation.java @@ -10,7 +10,7 @@ @AutoService(InstrumenterModule.class) public class CookieParamInjectorInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public CookieParamInjectorInstrumentation() { super("resteasy"); diff --git a/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/DecodedFormParametersInstrumentation.java b/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/DecodedFormParametersInstrumentation.java index aaf2e121a28..2f20ecf2bea 100644 --- a/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/DecodedFormParametersInstrumentation.java +++ b/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/DecodedFormParametersInstrumentation.java @@ -29,7 +29,7 @@ @AutoService(InstrumenterModule.class) public class DecodedFormParametersInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public DecodedFormParametersInstrumentation() { super("resteasy"); diff --git a/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/FormParamInjectorInstrumentation.java b/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/FormParamInjectorInstrumentation.java index ef4322b9299..27ff8714740 100644 --- a/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/FormParamInjectorInstrumentation.java +++ b/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/FormParamInjectorInstrumentation.java @@ -10,7 +10,7 @@ @AutoService(InstrumenterModule.class) public class FormParamInjectorInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public FormParamInjectorInstrumentation() { super("resteasy"); diff --git a/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/HeaderParamInjectorInstrumentation.java b/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/HeaderParamInjectorInstrumentation.java index b3dbfee93f2..9a5e97c08c9 100644 --- a/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/HeaderParamInjectorInstrumentation.java +++ b/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/HeaderParamInjectorInstrumentation.java @@ -10,7 +10,7 @@ @AutoService(InstrumenterModule.class) public class HeaderParamInjectorInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public HeaderParamInjectorInstrumentation() { super("resteasy"); diff --git a/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/JavaxWSResponseInstrumentation.java b/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/JavaxWSResponseInstrumentation.java index c2a5974f87c..957bcc23801 100644 --- a/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/JavaxWSResponseInstrumentation.java +++ b/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/JavaxWSResponseInstrumentation.java @@ -20,7 +20,7 @@ @AutoService(InstrumenterModule.class) public class JavaxWSResponseInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public JavaxWSResponseInstrumentation() { super("resteasy"); diff --git a/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/MessageBodyReaderInvocationInstrumentation.java b/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/MessageBodyReaderInvocationInstrumentation.java index a7000567acf..72058ed58e8 100644 --- a/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/MessageBodyReaderInvocationInstrumentation.java +++ b/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/MessageBodyReaderInvocationInstrumentation.java @@ -23,7 +23,7 @@ @AutoService(InstrumenterModule.class) public class MessageBodyReaderInvocationInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public MessageBodyReaderInvocationInstrumentation() { super("resteasy"); diff --git a/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/MethodExpressionInstrumentation.java b/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/MethodExpressionInstrumentation.java index a99a3221c2c..54bd7d7a5f6 100644 --- a/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/MethodExpressionInstrumentation.java +++ b/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/MethodExpressionInstrumentation.java @@ -25,7 +25,7 @@ @AutoService(InstrumenterModule.class) public class MethodExpressionInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public MethodExpressionInstrumentation() { super("resteasy"); diff --git a/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/MultipartFormDataReaderInstrumentation.java b/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/MultipartFormDataReaderInstrumentation.java index f4a7dd50a72..eee7e09d95e 100644 --- a/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/MultipartFormDataReaderInstrumentation.java +++ b/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/MultipartFormDataReaderInstrumentation.java @@ -29,7 +29,7 @@ @AutoService(InstrumenterModule.class) public class MultipartFormDataReaderInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public MultipartFormDataReaderInstrumentation() { super("resteasy"); diff --git a/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/PathParamInjectorInstrumentation.java b/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/PathParamInjectorInstrumentation.java index 26097204e9f..9bb763d36ca 100644 --- a/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/PathParamInjectorInstrumentation.java +++ b/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/PathParamInjectorInstrumentation.java @@ -10,7 +10,7 @@ @AutoService(InstrumenterModule.class) public class PathParamInjectorInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public PathParamInjectorInstrumentation() { super("resteasy"); diff --git a/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/QueryParamInjectorInstrumentation.java b/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/QueryParamInjectorInstrumentation.java index 9b12f7909fe..0055ac5244e 100644 --- a/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/QueryParamInjectorInstrumentation.java +++ b/dd-java-agent/instrumentation/resteasy-appsec/src/main/java/datadog/trace/instrumentation/resteasy/QueryParamInjectorInstrumentation.java @@ -10,7 +10,7 @@ @AutoService(InstrumenterModule.class) public class QueryParamInjectorInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public QueryParamInjectorInstrumentation() { super("resteasy"); diff --git a/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/ResourceInstrumentation.java b/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/ResourceInstrumentation.java index ea9d60ce7f0..088d8ce3fab 100644 --- a/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/ResourceInstrumentation.java +++ b/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/ResourceInstrumentation.java @@ -21,7 +21,7 @@ @AutoService(InstrumenterModule.class) public final class ResourceInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { private static final String RESTLET_HTTP_OPERATION_NAME = "restlet.request"; diff --git a/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/RestletInstrumentation.java b/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/RestletInstrumentation.java index 2fb2b895bd0..223e9e9b937 100644 --- a/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/RestletInstrumentation.java +++ b/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/RestletInstrumentation.java @@ -16,7 +16,7 @@ @AutoService(InstrumenterModule.class) public final class RestletInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public RestletInstrumentation() { super("restlet-http", "restlet-http-server"); diff --git a/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/RouteInstrumentation.java b/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/RouteInstrumentation.java index 2373ec7c022..0b468b596cf 100644 --- a/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/RouteInstrumentation.java +++ b/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/RouteInstrumentation.java @@ -16,7 +16,7 @@ @AutoService(InstrumenterModule.class) public final class RouteInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public RouteInstrumentation() { super("restlet-http"); diff --git a/dd-java-agent/instrumentation/rmi/src/main/java/datadog/trace/instrumentation/rmi/client/RmiClientInstrumentation.java b/dd-java-agent/instrumentation/rmi/src/main/java/datadog/trace/instrumentation/rmi/client/RmiClientInstrumentation.java index 5f2b40ac505..299f9189089 100644 --- a/dd-java-agent/instrumentation/rmi/src/main/java/datadog/trace/instrumentation/rmi/client/RmiClientInstrumentation.java +++ b/dd-java-agent/instrumentation/rmi/src/main/java/datadog/trace/instrumentation/rmi/client/RmiClientInstrumentation.java @@ -22,7 +22,9 @@ @AutoService(InstrumenterModule.class) public final class RmiClientInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForBootstrap, Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForBootstrap, + Instrumenter.ForTypeHierarchy, + Instrumenter.HasMethodAdvice { public RmiClientInstrumentation() { super("rmi", "rmi-client"); diff --git a/dd-java-agent/instrumentation/rmi/src/main/java/datadog/trace/instrumentation/rmi/context/client/RmiClientContextInstrumentation.java b/dd-java-agent/instrumentation/rmi/src/main/java/datadog/trace/instrumentation/rmi/context/client/RmiClientContextInstrumentation.java index ae90cec74df..2baea7bb86e 100644 --- a/dd-java-agent/instrumentation/rmi/src/main/java/datadog/trace/instrumentation/rmi/context/client/RmiClientContextInstrumentation.java +++ b/dd-java-agent/instrumentation/rmi/src/main/java/datadog/trace/instrumentation/rmi/context/client/RmiClientContextInstrumentation.java @@ -45,7 +45,9 @@ */ @AutoService(InstrumenterModule.class) public class RmiClientContextInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForBootstrap, Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForBootstrap, + Instrumenter.ForTypeHierarchy, + Instrumenter.HasMethodAdvice { public RmiClientContextInstrumentation() { super("rmi", "rmi-context-propagator", "rmi-client-context-propagator"); diff --git a/dd-java-agent/instrumentation/rmi/src/main/java/datadog/trace/instrumentation/rmi/context/server/RmiServerContextInstrumentation.java b/dd-java-agent/instrumentation/rmi/src/main/java/datadog/trace/instrumentation/rmi/context/server/RmiServerContextInstrumentation.java index 2db3ca61f70..bb479566719 100644 --- a/dd-java-agent/instrumentation/rmi/src/main/java/datadog/trace/instrumentation/rmi/context/server/RmiServerContextInstrumentation.java +++ b/dd-java-agent/instrumentation/rmi/src/main/java/datadog/trace/instrumentation/rmi/context/server/RmiServerContextInstrumentation.java @@ -19,7 +19,9 @@ @AutoService(InstrumenterModule.class) public class RmiServerContextInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForBootstrap, Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForBootstrap, + Instrumenter.ForTypeHierarchy, + Instrumenter.HasMethodAdvice { public RmiServerContextInstrumentation() { super("rmi", "rmi-context-propagator", "rmi-server-context-propagator"); diff --git a/dd-java-agent/instrumentation/rmi/src/main/java/datadog/trace/instrumentation/rmi/server/RmiServerInstrumentation.java b/dd-java-agent/instrumentation/rmi/src/main/java/datadog/trace/instrumentation/rmi/server/RmiServerInstrumentation.java index 823d225c88d..c1678242280 100644 --- a/dd-java-agent/instrumentation/rmi/src/main/java/datadog/trace/instrumentation/rmi/server/RmiServerInstrumentation.java +++ b/dd-java-agent/instrumentation/rmi/src/main/java/datadog/trace/instrumentation/rmi/server/RmiServerInstrumentation.java @@ -24,7 +24,9 @@ @AutoService(InstrumenterModule.class) public final class RmiServerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForBootstrap, Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForBootstrap, + Instrumenter.ForTypeHierarchy, + Instrumenter.HasMethodAdvice { public RmiServerInstrumentation() { super("rmi", "rmi-server"); diff --git a/dd-java-agent/instrumentation/rxjava-2/src/main/java/datadog/trace/instrumentation/rxjava2/CompletableInstrumentation.java b/dd-java-agent/instrumentation/rxjava-2/src/main/java/datadog/trace/instrumentation/rxjava2/CompletableInstrumentation.java index faefe8bd00b..814d887a3ac 100644 --- a/dd-java-agent/instrumentation/rxjava-2/src/main/java/datadog/trace/instrumentation/rxjava2/CompletableInstrumentation.java +++ b/dd-java-agent/instrumentation/rxjava-2/src/main/java/datadog/trace/instrumentation/rxjava2/CompletableInstrumentation.java @@ -22,7 +22,7 @@ @AutoService(InstrumenterModule.class) public final class CompletableInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public CompletableInstrumentation() { super("rxjava"); } diff --git a/dd-java-agent/instrumentation/rxjava-2/src/main/java/datadog/trace/instrumentation/rxjava2/FlowableInstrumentation.java b/dd-java-agent/instrumentation/rxjava-2/src/main/java/datadog/trace/instrumentation/rxjava2/FlowableInstrumentation.java index b543d8e2b80..3c74972a00d 100644 --- a/dd-java-agent/instrumentation/rxjava-2/src/main/java/datadog/trace/instrumentation/rxjava2/FlowableInstrumentation.java +++ b/dd-java-agent/instrumentation/rxjava-2/src/main/java/datadog/trace/instrumentation/rxjava2/FlowableInstrumentation.java @@ -22,7 +22,7 @@ @AutoService(InstrumenterModule.class) public final class FlowableInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public FlowableInstrumentation() { super("rxjava"); } diff --git a/dd-java-agent/instrumentation/rxjava-2/src/main/java/datadog/trace/instrumentation/rxjava2/MaybeInstrumentation.java b/dd-java-agent/instrumentation/rxjava-2/src/main/java/datadog/trace/instrumentation/rxjava2/MaybeInstrumentation.java index 248dac35aac..23e1620736c 100644 --- a/dd-java-agent/instrumentation/rxjava-2/src/main/java/datadog/trace/instrumentation/rxjava2/MaybeInstrumentation.java +++ b/dd-java-agent/instrumentation/rxjava-2/src/main/java/datadog/trace/instrumentation/rxjava2/MaybeInstrumentation.java @@ -22,7 +22,7 @@ @AutoService(InstrumenterModule.class) public final class MaybeInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public MaybeInstrumentation() { super("rxjava"); } diff --git a/dd-java-agent/instrumentation/rxjava-2/src/main/java/datadog/trace/instrumentation/rxjava2/ObservableInstrumentation.java b/dd-java-agent/instrumentation/rxjava-2/src/main/java/datadog/trace/instrumentation/rxjava2/ObservableInstrumentation.java index 81257034d83..5b030eaba53 100644 --- a/dd-java-agent/instrumentation/rxjava-2/src/main/java/datadog/trace/instrumentation/rxjava2/ObservableInstrumentation.java +++ b/dd-java-agent/instrumentation/rxjava-2/src/main/java/datadog/trace/instrumentation/rxjava2/ObservableInstrumentation.java @@ -22,7 +22,7 @@ @AutoService(InstrumenterModule.class) public final class ObservableInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ObservableInstrumentation() { super("rxjava"); } diff --git a/dd-java-agent/instrumentation/rxjava-2/src/main/java/datadog/trace/instrumentation/rxjava2/RxJavaPluginsInstrumentation.java b/dd-java-agent/instrumentation/rxjava-2/src/main/java/datadog/trace/instrumentation/rxjava2/RxJavaPluginsInstrumentation.java index 57ba844a257..0f88b5246f3 100644 --- a/dd-java-agent/instrumentation/rxjava-2/src/main/java/datadog/trace/instrumentation/rxjava2/RxJavaPluginsInstrumentation.java +++ b/dd-java-agent/instrumentation/rxjava-2/src/main/java/datadog/trace/instrumentation/rxjava2/RxJavaPluginsInstrumentation.java @@ -30,9 +30,4 @@ public String[] helperClassNames() { packageName + ".RxJavaAsyncResultExtension", }; } - - @Override - public void methodAdvice(MethodTransformer transformer) { - // no-op - } } diff --git a/dd-java-agent/instrumentation/rxjava-2/src/main/java/datadog/trace/instrumentation/rxjava2/SingleInstrumentation.java b/dd-java-agent/instrumentation/rxjava-2/src/main/java/datadog/trace/instrumentation/rxjava2/SingleInstrumentation.java index 71779d1f2b1..f465a4c9866 100644 --- a/dd-java-agent/instrumentation/rxjava-2/src/main/java/datadog/trace/instrumentation/rxjava2/SingleInstrumentation.java +++ b/dd-java-agent/instrumentation/rxjava-2/src/main/java/datadog/trace/instrumentation/rxjava2/SingleInstrumentation.java @@ -22,7 +22,7 @@ @AutoService(InstrumenterModule.class) public final class SingleInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public SingleInstrumentation() { super("rxjava"); } diff --git a/dd-java-agent/instrumentation/scala-concurrent/src/main/java/datadog/trace/instrumentation/scala/concurrent/ScalaForkJoinPoolInstrumentation.java b/dd-java-agent/instrumentation/scala-concurrent/src/main/java/datadog/trace/instrumentation/scala/concurrent/ScalaForkJoinPoolInstrumentation.java index 8f836a12cce..3db034ee3b2 100644 --- a/dd-java-agent/instrumentation/scala-concurrent/src/main/java/datadog/trace/instrumentation/scala/concurrent/ScalaForkJoinPoolInstrumentation.java +++ b/dd-java-agent/instrumentation/scala-concurrent/src/main/java/datadog/trace/instrumentation/scala/concurrent/ScalaForkJoinPoolInstrumentation.java @@ -21,7 +21,7 @@ @AutoService(InstrumenterModule.class) public final class ScalaForkJoinPoolInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ScalaForkJoinPoolInstrumentation() { super("java_concurrent", "scala_concurrent"); diff --git a/dd-java-agent/instrumentation/scala-concurrent/src/main/java/datadog/trace/instrumentation/scala/concurrent/ScalaForkJoinTaskInstrumentation.java b/dd-java-agent/instrumentation/scala-concurrent/src/main/java/datadog/trace/instrumentation/scala/concurrent/ScalaForkJoinTaskInstrumentation.java index 6349ae7722a..f9de370105d 100644 --- a/dd-java-agent/instrumentation/scala-concurrent/src/main/java/datadog/trace/instrumentation/scala/concurrent/ScalaForkJoinTaskInstrumentation.java +++ b/dd-java-agent/instrumentation/scala-concurrent/src/main/java/datadog/trace/instrumentation/scala/concurrent/ScalaForkJoinTaskInstrumentation.java @@ -39,7 +39,7 @@ */ @AutoService(InstrumenterModule.class) public final class ScalaForkJoinTaskInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy, ExcludeFilterProvider { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice, ExcludeFilterProvider { public ScalaForkJoinTaskInstrumentation() { super("java_concurrent", "scala_concurrent"); diff --git a/dd-java-agent/instrumentation/scala-promise/scala-promise-2.10/src/main/java/datadog/trace/instrumentation/scala210/concurrent/CallbackRunnableInstrumentation.java b/dd-java-agent/instrumentation/scala-promise/scala-promise-2.10/src/main/java/datadog/trace/instrumentation/scala210/concurrent/CallbackRunnableInstrumentation.java index fce495e57e7..58e89e80443 100644 --- a/dd-java-agent/instrumentation/scala-promise/scala-promise-2.10/src/main/java/datadog/trace/instrumentation/scala210/concurrent/CallbackRunnableInstrumentation.java +++ b/dd-java-agent/instrumentation/scala-promise/scala-promise-2.10/src/main/java/datadog/trace/instrumentation/scala210/concurrent/CallbackRunnableInstrumentation.java @@ -29,7 +29,7 @@ @AutoService(InstrumenterModule.class) public class CallbackRunnableInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType, ExcludeFilterProvider { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, ExcludeFilterProvider { public CallbackRunnableInstrumentation() { super("scala_concurrent"); diff --git a/dd-java-agent/instrumentation/scala-promise/scala-promise-2.10/src/main/java/datadog/trace/instrumentation/scala210/concurrent/FutureObjectInstrumentation.java b/dd-java-agent/instrumentation/scala-promise/scala-promise-2.10/src/main/java/datadog/trace/instrumentation/scala210/concurrent/FutureObjectInstrumentation.java index afc110db690..1d1595685c8 100644 --- a/dd-java-agent/instrumentation/scala-promise/scala-promise-2.10/src/main/java/datadog/trace/instrumentation/scala210/concurrent/FutureObjectInstrumentation.java +++ b/dd-java-agent/instrumentation/scala-promise/scala-promise-2.10/src/main/java/datadog/trace/instrumentation/scala210/concurrent/FutureObjectInstrumentation.java @@ -26,7 +26,7 @@ */ @AutoService(InstrumenterModule.class) public class FutureObjectInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public FutureObjectInstrumentation() { super("scala_future_object", "scala_concurrent"); diff --git a/dd-java-agent/instrumentation/scala-promise/scala-promise-2.10/src/main/java/datadog/trace/instrumentation/scala210/concurrent/PromiseObjectInstrumentation.java b/dd-java-agent/instrumentation/scala-promise/scala-promise-2.10/src/main/java/datadog/trace/instrumentation/scala210/concurrent/PromiseObjectInstrumentation.java index f4ea201fe35..521cf157526 100644 --- a/dd-java-agent/instrumentation/scala-promise/scala-promise-2.10/src/main/java/datadog/trace/instrumentation/scala210/concurrent/PromiseObjectInstrumentation.java +++ b/dd-java-agent/instrumentation/scala-promise/scala-promise-2.10/src/main/java/datadog/trace/instrumentation/scala210/concurrent/PromiseObjectInstrumentation.java @@ -25,7 +25,7 @@ */ @AutoService(InstrumenterModule.class) public class PromiseObjectInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public PromiseObjectInstrumentation() { super("scala_promise_resolve", "scala_concurrent"); diff --git a/dd-java-agent/instrumentation/scala-promise/scala-promise-2.13/src/main/java/datadog/trace/instrumentation/scala213/concurrent/DefaultPromiseInstrumentation.java b/dd-java-agent/instrumentation/scala-promise/scala-promise-2.13/src/main/java/datadog/trace/instrumentation/scala213/concurrent/DefaultPromiseInstrumentation.java index defa460208e..710c60716b0 100644 --- a/dd-java-agent/instrumentation/scala-promise/scala-promise-2.13/src/main/java/datadog/trace/instrumentation/scala213/concurrent/DefaultPromiseInstrumentation.java +++ b/dd-java-agent/instrumentation/scala-promise/scala-promise-2.13/src/main/java/datadog/trace/instrumentation/scala213/concurrent/DefaultPromiseInstrumentation.java @@ -26,7 +26,7 @@ */ @AutoService(InstrumenterModule.class) public class DefaultPromiseInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public DefaultPromiseInstrumentation() { super("scala_promise_complete", "scala_concurrent"); diff --git a/dd-java-agent/instrumentation/scala-promise/scala-promise-2.13/src/main/java/datadog/trace/instrumentation/scala213/concurrent/FutureObjectInstrumentation.java b/dd-java-agent/instrumentation/scala-promise/scala-promise-2.13/src/main/java/datadog/trace/instrumentation/scala213/concurrent/FutureObjectInstrumentation.java index 794529d0f42..44cd2757430 100644 --- a/dd-java-agent/instrumentation/scala-promise/scala-promise-2.13/src/main/java/datadog/trace/instrumentation/scala213/concurrent/FutureObjectInstrumentation.java +++ b/dd-java-agent/instrumentation/scala-promise/scala-promise-2.13/src/main/java/datadog/trace/instrumentation/scala213/concurrent/FutureObjectInstrumentation.java @@ -22,7 +22,7 @@ */ @AutoService(InstrumenterModule.class) public class FutureObjectInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public FutureObjectInstrumentation() { super("scala_future_object", "scala_concurrent"); diff --git a/dd-java-agent/instrumentation/scala-promise/scala-promise-2.13/src/main/java/datadog/trace/instrumentation/scala213/concurrent/PromiseObjectInstrumentation.java b/dd-java-agent/instrumentation/scala-promise/scala-promise-2.13/src/main/java/datadog/trace/instrumentation/scala213/concurrent/PromiseObjectInstrumentation.java index f92dc030855..cb6cc15d8a5 100644 --- a/dd-java-agent/instrumentation/scala-promise/scala-promise-2.13/src/main/java/datadog/trace/instrumentation/scala213/concurrent/PromiseObjectInstrumentation.java +++ b/dd-java-agent/instrumentation/scala-promise/scala-promise-2.13/src/main/java/datadog/trace/instrumentation/scala213/concurrent/PromiseObjectInstrumentation.java @@ -25,7 +25,7 @@ */ @AutoService(InstrumenterModule.class) public class PromiseObjectInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public PromiseObjectInstrumentation() { super("scala_promise_resolve", "scala_concurrent"); diff --git a/dd-java-agent/instrumentation/scala-promise/scala-promise-2.13/src/main/java/datadog/trace/instrumentation/scala213/concurrent/PromiseTransformationInstrumentation.java b/dd-java-agent/instrumentation/scala-promise/scala-promise-2.13/src/main/java/datadog/trace/instrumentation/scala213/concurrent/PromiseTransformationInstrumentation.java index 8b6058bf082..ff272de2c76 100644 --- a/dd-java-agent/instrumentation/scala-promise/scala-promise-2.13/src/main/java/datadog/trace/instrumentation/scala213/concurrent/PromiseTransformationInstrumentation.java +++ b/dd-java-agent/instrumentation/scala-promise/scala-promise-2.13/src/main/java/datadog/trace/instrumentation/scala213/concurrent/PromiseTransformationInstrumentation.java @@ -30,7 +30,7 @@ @AutoService(InstrumenterModule.class) public final class PromiseTransformationInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType, ExcludeFilterProvider { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, ExcludeFilterProvider { public PromiseTransformationInstrumentation() { super("scala_concurrent"); diff --git a/dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestInstrumentation.java b/dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestInstrumentation.java index 9d1791f8ec6..1a8eff402fc 100644 --- a/dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestInstrumentation.java +++ b/dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestInstrumentation.java @@ -13,7 +13,7 @@ @AutoService(InstrumenterModule.class) public class ScalatestInstrumentation extends InstrumenterModule.CiVisibility - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ScalatestInstrumentation() { super("ci-visibility", "scalatest"); diff --git a/dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestItrInstrumentation.java b/dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestItrInstrumentation.java index 7a8ba1606db..1952dffe4ea 100644 --- a/dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestItrInstrumentation.java +++ b/dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestItrInstrumentation.java @@ -22,7 +22,7 @@ @AutoService(InstrumenterModule.class) public class ScalatestItrInstrumentation extends InstrumenterModule.CiVisibility - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public ScalatestItrInstrumentation() { super("ci-visibility", "scalatest"); diff --git a/dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/retry/ScalatestRetryInstrumentation.java b/dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/retry/ScalatestRetryInstrumentation.java index b37988165f7..ed2c9e24db3 100644 --- a/dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/retry/ScalatestRetryInstrumentation.java +++ b/dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/retry/ScalatestRetryInstrumentation.java @@ -26,7 +26,7 @@ @AutoService(InstrumenterModule.class) public class ScalatestRetryInstrumentation extends InstrumenterModule.CiVisibility - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { private final String parentPackageName = Strings.getPackageName(ScalatestUtils.class.getName()); diff --git a/dd-java-agent/instrumentation/selenium/src/main/java/datadog/trace/instrumentation/selenium/SeleniumInstrumentation.java b/dd-java-agent/instrumentation/selenium/src/main/java/datadog/trace/instrumentation/selenium/SeleniumInstrumentation.java index d5b2d583a2f..eea1396519c 100644 --- a/dd-java-agent/instrumentation/selenium/src/main/java/datadog/trace/instrumentation/selenium/SeleniumInstrumentation.java +++ b/dd-java-agent/instrumentation/selenium/src/main/java/datadog/trace/instrumentation/selenium/SeleniumInstrumentation.java @@ -19,7 +19,7 @@ @AutoService(InstrumenterModule.class) public class SeleniumInstrumentation extends InstrumenterModule.CiVisibility - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public SeleniumInstrumentation() { super("ci-visibility", "selenium"); diff --git a/dd-java-agent/instrumentation/servicetalk/src/main/java/datadog/trace/instrumentation/servicetalk/ContextMapInstrumentation.java b/dd-java-agent/instrumentation/servicetalk/src/main/java/datadog/trace/instrumentation/servicetalk/ContextMapInstrumentation.java index f0c986f3116..656f3e40c4a 100644 --- a/dd-java-agent/instrumentation/servicetalk/src/main/java/datadog/trace/instrumentation/servicetalk/ContextMapInstrumentation.java +++ b/dd-java-agent/instrumentation/servicetalk/src/main/java/datadog/trace/instrumentation/servicetalk/ContextMapInstrumentation.java @@ -17,7 +17,7 @@ @AutoService(InstrumenterModule.class) public class ContextMapInstrumentation extends AbstractAsyncContextInstrumentation - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { @Override public String instrumentedType() { diff --git a/dd-java-agent/instrumentation/servicetalk/src/main/java/datadog/trace/instrumentation/servicetalk/ContextPreservingInstrumentation.java b/dd-java-agent/instrumentation/servicetalk/src/main/java/datadog/trace/instrumentation/servicetalk/ContextPreservingInstrumentation.java index 0ae956c4eba..afa5836b7ad 100644 --- a/dd-java-agent/instrumentation/servicetalk/src/main/java/datadog/trace/instrumentation/servicetalk/ContextPreservingInstrumentation.java +++ b/dd-java-agent/instrumentation/servicetalk/src/main/java/datadog/trace/instrumentation/servicetalk/ContextPreservingInstrumentation.java @@ -14,7 +14,7 @@ @AutoService(InstrumenterModule.class) public class ContextPreservingInstrumentation extends AbstractAsyncContextInstrumentation - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { @Override public String[] knownMatchingTypes() { diff --git a/dd-java-agent/instrumentation/servlet-common/src/main/java/datadog/trace/instrumentation/servlet/HttpServletResponseInstrumentation.java b/dd-java-agent/instrumentation/servlet-common/src/main/java/datadog/trace/instrumentation/servlet/HttpServletResponseInstrumentation.java index 5140c386ade..4ddeefa013e 100644 --- a/dd-java-agent/instrumentation/servlet-common/src/main/java/datadog/trace/instrumentation/servlet/HttpServletResponseInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet-common/src/main/java/datadog/trace/instrumentation/servlet/HttpServletResponseInstrumentation.java @@ -26,7 +26,7 @@ @AutoService(InstrumenterModule.class) public final class HttpServletResponseInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public HttpServletResponseInstrumentation() { super("servlet", "servelet-response"); } diff --git a/dd-java-agent/instrumentation/servlet-common/src/main/java/datadog/trace/instrumentation/servlet/HttpSessionInstrumentation.java b/dd-java-agent/instrumentation/servlet-common/src/main/java/datadog/trace/instrumentation/servlet/HttpSessionInstrumentation.java index 96b4deb23bb..dea9c24bfa9 100644 --- a/dd-java-agent/instrumentation/servlet-common/src/main/java/datadog/trace/instrumentation/servlet/HttpSessionInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet-common/src/main/java/datadog/trace/instrumentation/servlet/HttpSessionInstrumentation.java @@ -20,7 +20,7 @@ @AutoService(InstrumenterModule.class) public class HttpSessionInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public HttpSessionInstrumentation() { super("servlet", "servlet-session"); } diff --git a/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/IastServlet2Instrumentation.java b/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/IastServlet2Instrumentation.java index 9995c2107f0..dffdb34f158 100644 --- a/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/IastServlet2Instrumentation.java +++ b/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/IastServlet2Instrumentation.java @@ -19,7 +19,7 @@ @AutoService(InstrumenterModule.class) public final class IastServlet2Instrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public IastServlet2Instrumentation() { super("servlet", "servlet-2"); diff --git a/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2Instrumentation.java b/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2Instrumentation.java index 0042ad2b4ed..3d090c95f51 100644 --- a/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2Instrumentation.java +++ b/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2Instrumentation.java @@ -19,7 +19,7 @@ @AutoService(InstrumenterModule.class) public final class Servlet2Instrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public Servlet2Instrumentation() { super("servlet", "servlet-2"); diff --git a/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2ResponseStatusInstrumentation.java b/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2ResponseStatusInstrumentation.java index 71029d6d365..86dc200aefa 100644 --- a/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2ResponseStatusInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2ResponseStatusInstrumentation.java @@ -15,7 +15,7 @@ @AutoService(InstrumenterModule.class) public final class Servlet2ResponseStatusInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public Servlet2ResponseStatusInstrumentation() { super("servlet", "servlet-2"); } diff --git a/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/ServletRequestBodyInstrumentation.java b/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/ServletRequestBodyInstrumentation.java index a17d469d7fc..69b0f2d1e78 100644 --- a/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/ServletRequestBodyInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/ServletRequestBodyInstrumentation.java @@ -42,7 +42,7 @@ */ @AutoService(InstrumenterModule.class) public class ServletRequestBodyInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public ServletRequestBodyInstrumentation() { super("servlet-request-body"); } diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/AsyncContextInstrumentation.java b/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/AsyncContextInstrumentation.java index 008e8e1ffb3..39ddb3734aa 100644 --- a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/AsyncContextInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/AsyncContextInstrumentation.java @@ -27,7 +27,7 @@ @AutoService(InstrumenterModule.class) public final class AsyncContextInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public AsyncContextInstrumentation() { super("servlet", "servlet-3"); diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/IastOptOutHttpServletRequest3Instrumentation.java b/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/IastOptOutHttpServletRequest3Instrumentation.java index a05cb1a8b35..96daf911f50 100644 --- a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/IastOptOutHttpServletRequest3Instrumentation.java +++ b/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/IastOptOutHttpServletRequest3Instrumentation.java @@ -29,7 +29,7 @@ @AutoService(InstrumenterModule.class) public class IastOptOutHttpServletRequest3Instrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public IastOptOutHttpServletRequest3Instrumentation() { super("servlet", "servlet-3"); diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/IastServlet3Instrumentation.java b/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/IastServlet3Instrumentation.java index 2dcbb943aa0..cf6feeb9b5a 100644 --- a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/IastServlet3Instrumentation.java +++ b/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/IastServlet3Instrumentation.java @@ -18,7 +18,7 @@ @AutoService(InstrumenterModule.class) public final class IastServlet3Instrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public IastServlet3Instrumentation() { super("servlet", "servlet-3"); } diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/MultipartInstrumentation.java b/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/MultipartInstrumentation.java index a27ffdc9329..de8ddb29ff7 100644 --- a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/MultipartInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/MultipartInstrumentation.java @@ -25,7 +25,7 @@ @AutoService(InstrumenterModule.class) public class MultipartInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public MultipartInstrumentation() { super("servlet", "multipart"); diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/Servlet31RequestBodyInstrumentation.java b/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/Servlet31RequestBodyInstrumentation.java index d2e4fdc0984..76509673a04 100644 --- a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/Servlet31RequestBodyInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/Servlet31RequestBodyInstrumentation.java @@ -22,7 +22,7 @@ */ @AutoService(InstrumenterModule.class) public class Servlet31RequestBodyInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public Servlet31RequestBodyInstrumentation() { super("servlet-request-body"); } diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/Servlet3Instrumentation.java b/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/Servlet3Instrumentation.java index bf30f67818a..a7dc4f28368 100644 --- a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/Servlet3Instrumentation.java +++ b/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/Servlet3Instrumentation.java @@ -16,7 +16,7 @@ @AutoService(InstrumenterModule.class) public final class Servlet3Instrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public Servlet3Instrumentation() { super("servlet", "servlet-3"); } diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/IastJakartaServletInstrumentation.java b/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/IastJakartaServletInstrumentation.java index 948723b62f1..076bcc1583f 100644 --- a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/IastJakartaServletInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/IastJakartaServletInstrumentation.java @@ -23,7 +23,7 @@ @AutoService(InstrumenterModule.class) public class IastJakartaServletInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public IastJakartaServletInstrumentation() { super("servlet", "servlet-5"); } diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/IastOptOutJakartaHttpServletRequestInstrumentation.java b/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/IastOptOutJakartaHttpServletRequestInstrumentation.java index 74f9ed88b77..5e2b79f70e7 100644 --- a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/IastOptOutJakartaHttpServletRequestInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/IastOptOutJakartaHttpServletRequestInstrumentation.java @@ -23,7 +23,7 @@ @SuppressWarnings("unused") @AutoService(InstrumenterModule.class) public class IastOptOutJakartaHttpServletRequestInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { private static final String CLASS_NAME = IastOptOutJakartaHttpServletRequestInstrumentation.class.getName(); diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletRequestInstrumentation.java b/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletRequestInstrumentation.java index f487a5ed35e..b9f2eef01dc 100644 --- a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletRequestInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletRequestInstrumentation.java @@ -34,7 +34,7 @@ @SuppressWarnings("unused") @AutoService(InstrumenterModule.class) public class JakartaHttpServletRequestInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { private static final String CLASS_NAME = JakartaHttpServletRequestInstrumentation.class.getName(); private static final ElementMatcher.Junction WRAPPER_CLASS = diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletResponseInstrumentation.java b/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletResponseInstrumentation.java index 5c4d4052003..13f6ca9ccd3 100644 --- a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletResponseInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletResponseInstrumentation.java @@ -26,7 +26,7 @@ @AutoService(InstrumenterModule.class) public final class JakartaHttpServletResponseInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public JakartaHttpServletResponseInstrumentation() { super("servlet", "servlet-5", "servlet-response"); } diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpSessionInstrumentation.java b/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpSessionInstrumentation.java index df466b4cb5e..6d24fb32313 100644 --- a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpSessionInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpSessionInstrumentation.java @@ -18,7 +18,7 @@ import net.bytebuddy.matcher.ElementMatcher; public class JakartaHttpSessionInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public JakartaHttpSessionInstrumentation() { super("servlet", "servlet-5", "servlet-session"); } diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaMultipartInstrumentation.java b/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaMultipartInstrumentation.java index 4d94db217d8..ef35ef3e992 100644 --- a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaMultipartInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaMultipartInstrumentation.java @@ -25,7 +25,7 @@ @AutoService(InstrumenterModule.class) public class JakartaMultipartInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public JakartaMultipartInstrumentation() { super("servlet", "servlet-5", "multipart"); diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaServletInstrumentation.java b/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaServletInstrumentation.java index 01dc7225427..b038d43c78f 100644 --- a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaServletInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaServletInstrumentation.java @@ -24,7 +24,7 @@ @AutoService(InstrumenterModule.class) public class JakartaServletInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public JakartaServletInstrumentation() { super("servlet", "servlet-5"); } diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/Servlet5RequestBodyInstrumentation.java b/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/Servlet5RequestBodyInstrumentation.java index a5f1be83924..22ad21ff835 100644 --- a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/Servlet5RequestBodyInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/Servlet5RequestBodyInstrumentation.java @@ -17,7 +17,7 @@ @AutoService(InstrumenterModule.class) public class Servlet5RequestBodyInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public Servlet5RequestBodyInstrumentation() { super("servlet-request-body"); } diff --git a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherInstrumentation.java b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherInstrumentation.java index 4aab49bada7..10025a3fa3a 100644 --- a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherInstrumentation.java @@ -39,7 +39,7 @@ @AutoService(InstrumenterModule.class) public final class RequestDispatcherInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public RequestDispatcherInstrumentation() { super("servlet", "servlet-dispatcher"); } diff --git a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/ServletContextInstrumentation.java b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/ServletContextInstrumentation.java index bdc44db60a4..b732436003a 100644 --- a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/ServletContextInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/ServletContextInstrumentation.java @@ -19,7 +19,7 @@ @AutoService(InstrumenterModule.class) public final class ServletContextInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public ServletContextInstrumentation() { super("servlet", "servlet-dispatcher"); } diff --git a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterInstrumentation.java b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterInstrumentation.java index 3d29a99e8bf..2d68b579169 100644 --- a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterInstrumentation.java @@ -22,7 +22,7 @@ @AutoService(InstrumenterModule.class) public final class FilterInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public FilterInstrumentation() { super("servlet-filter"); } diff --git a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/CookieInstrumentation.java b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/CookieInstrumentation.java index 5f2d997ccff..0fd197c7af4 100644 --- a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/CookieInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/CookieInstrumentation.java @@ -21,7 +21,9 @@ @AutoService(InstrumenterModule.class) public class CookieInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType, Instrumenter.HasTypeAdvice { + implements Instrumenter.ForSingleType, + Instrumenter.HasTypeAdvice, + Instrumenter.HasMethodAdvice { public CookieInstrumentation() { super("servlet", "servlet-cookie"); diff --git a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletInstrumentation.java b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletInstrumentation.java index 858cc725e44..74e33a5be4b 100644 --- a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletInstrumentation.java @@ -25,7 +25,7 @@ @AutoService(InstrumenterModule.class) public final class HttpServletInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public HttpServletInstrumentation() { super("servlet-service"); } diff --git a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletRequestInstrumentation.java b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletRequestInstrumentation.java index 5ae518435d5..2a378ee33cb 100644 --- a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletRequestInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletRequestInstrumentation.java @@ -34,7 +34,7 @@ @SuppressWarnings("unused") @AutoService(InstrumenterModule.class) public class HttpServletRequestInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { private static final String CLASS_NAME = HttpServletRequestInstrumentation.class.getName(); private static final ElementMatcher.Junction WRAPPER_CLASS = diff --git a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseInstrumentation.java b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseInstrumentation.java index 82289210e5f..45e8b15c340 100644 --- a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseInstrumentation.java @@ -22,7 +22,7 @@ @AutoService(InstrumenterModule.class) public final class HttpServletResponseInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public HttpServletResponseInstrumentation() { super("servlet", "servlet-response"); } diff --git a/dd-java-agent/instrumentation/shutdown/src/main/java/datadog/trace/instrumentation/shutdown/ShutdownInstrumentation.java b/dd-java-agent/instrumentation/shutdown/src/main/java/datadog/trace/instrumentation/shutdown/ShutdownInstrumentation.java index 7e8ce29fc30..feb12c44cef 100644 --- a/dd-java-agent/instrumentation/shutdown/src/main/java/datadog/trace/instrumentation/shutdown/ShutdownInstrumentation.java +++ b/dd-java-agent/instrumentation/shutdown/src/main/java/datadog/trace/instrumentation/shutdown/ShutdownInstrumentation.java @@ -16,7 +16,7 @@ */ @AutoService(InstrumenterModule.class) public class ShutdownInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType { + implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ShutdownInstrumentation() { super("shutdown"); diff --git a/dd-java-agent/instrumentation/slick/src/main/java/datadog/trace/instrumentation/slick/SlickRunnableInstrumentation.java b/dd-java-agent/instrumentation/slick/src/main/java/datadog/trace/instrumentation/slick/SlickRunnableInstrumentation.java index a59f22ed8ca..7cc9adb13b5 100644 --- a/dd-java-agent/instrumentation/slick/src/main/java/datadog/trace/instrumentation/slick/SlickRunnableInstrumentation.java +++ b/dd-java-agent/instrumentation/slick/src/main/java/datadog/trace/instrumentation/slick/SlickRunnableInstrumentation.java @@ -23,7 +23,7 @@ /** Instruments runnables from the slick framework, which are excluded elsewhere. */ @AutoService(InstrumenterModule.class) public final class SlickRunnableInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public SlickRunnableInstrumentation() { super("slick"); } diff --git a/dd-java-agent/instrumentation/snakeyaml/src/main/java/datadog/trace/instrumentation/snakeyaml/SnakeYamlInstrumenter.java b/dd-java-agent/instrumentation/snakeyaml/src/main/java/datadog/trace/instrumentation/snakeyaml/SnakeYamlInstrumentation.java similarity index 91% rename from dd-java-agent/instrumentation/snakeyaml/src/main/java/datadog/trace/instrumentation/snakeyaml/SnakeYamlInstrumenter.java rename to dd-java-agent/instrumentation/snakeyaml/src/main/java/datadog/trace/instrumentation/snakeyaml/SnakeYamlInstrumentation.java index a7526123395..83c43bf92bb 100644 --- a/dd-java-agent/instrumentation/snakeyaml/src/main/java/datadog/trace/instrumentation/snakeyaml/SnakeYamlInstrumenter.java +++ b/dd-java-agent/instrumentation/snakeyaml/src/main/java/datadog/trace/instrumentation/snakeyaml/SnakeYamlInstrumentation.java @@ -22,10 +22,10 @@ import org.yaml.snakeyaml.constructor.Constructor; @AutoService(InstrumenterModule.class) -public class SnakeYamlInstrumenter extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { +public class SnakeYamlInstrumentation extends InstrumenterModule.Iast + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { - public SnakeYamlInstrumenter() { + public SnakeYamlInstrumentation() { super("snakeyaml", "snakeyaml"); } @@ -63,7 +63,7 @@ public void methodAdvice(MethodTransformer transformer) { takesArguments(String.class) .or(takesArguments(InputStream.class)) .or(takesArguments(Reader.class))), - SnakeYamlInstrumenter.class.getName() + "$LoadAdvice"); + SnakeYamlInstrumentation.class.getName() + "$LoadAdvice"); } public static class LoadAdvice { diff --git a/dd-java-agent/instrumentation/snakeyaml/src/test/groovy/SnakeYamlInstrumenterTest.groovy b/dd-java-agent/instrumentation/snakeyaml/src/test/groovy/SnakeYamlInstrumentationTest.groovy similarity index 95% rename from dd-java-agent/instrumentation/snakeyaml/src/test/groovy/SnakeYamlInstrumenterTest.groovy rename to dd-java-agent/instrumentation/snakeyaml/src/test/groovy/SnakeYamlInstrumentationTest.groovy index 1b0b5f907bc..813e051c4e8 100644 --- a/dd-java-agent/instrumentation/snakeyaml/src/test/groovy/SnakeYamlInstrumenterTest.groovy +++ b/dd-java-agent/instrumentation/snakeyaml/src/test/groovy/SnakeYamlInstrumentationTest.groovy @@ -3,7 +3,7 @@ import datadog.trace.api.iast.InstrumentationBridge import datadog.trace.api.iast.sink.UntrustedDeserializationModule import org.yaml.snakeyaml.Yaml -class SnakeYamlInstrumenterTest extends AgentTestRunner { +class SnakeYamlInstrumentationTest extends AgentTestRunner { @Override protected void configurePreAgent() { diff --git a/dd-java-agent/instrumentation/span-origin/src/main/java/datadog/trace/instrumentation/codeorigin/CodeOriginInstrumentation.java b/dd-java-agent/instrumentation/span-origin/src/main/java/datadog/trace/instrumentation/codeorigin/CodeOriginInstrumentation.java index f299114706e..bad0bc6ebd9 100644 --- a/dd-java-agent/instrumentation/span-origin/src/main/java/datadog/trace/instrumentation/codeorigin/CodeOriginInstrumentation.java +++ b/dd-java-agent/instrumentation/span-origin/src/main/java/datadog/trace/instrumentation/codeorigin/CodeOriginInstrumentation.java @@ -1,6 +1,6 @@ package datadog.trace.instrumentation.codeorigin; -import datadog.trace.agent.tooling.Instrumenter.ForTypeHierarchy; +import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule.Tracing; import datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers; import datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers; @@ -12,7 +12,8 @@ import net.bytebuddy.description.type.TypeDescription; import net.bytebuddy.matcher.ElementMatcher; -public abstract class CodeOriginInstrumentation extends Tracing implements ForTypeHierarchy { +public abstract class CodeOriginInstrumentation extends Tracing + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { private final OneOf matcher; diff --git a/dd-java-agent/instrumentation/spark-executor/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorInstrumentation.java b/dd-java-agent/instrumentation/spark-executor/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorInstrumentation.java index 0a8a6532326..013eee8cb04 100644 --- a/dd-java-agent/instrumentation/spark-executor/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorInstrumentation.java +++ b/dd-java-agent/instrumentation/spark-executor/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorInstrumentation.java @@ -18,7 +18,7 @@ @AutoService(InstrumenterModule.class) public class SparkExecutorInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public SparkExecutorInstrumentation() { super("spark-executor"); diff --git a/dd-java-agent/instrumentation/spark/src/main/java/datadog/trace/instrumentation/spark/AbstractSparkInstrumentation.java b/dd-java-agent/instrumentation/spark/src/main/java/datadog/trace/instrumentation/spark/AbstractSparkInstrumentation.java index 79b0d4a3ec8..8bfe1ae8000 100644 --- a/dd-java-agent/instrumentation/spark/src/main/java/datadog/trace/instrumentation/spark/AbstractSparkInstrumentation.java +++ b/dd-java-agent/instrumentation/spark/src/main/java/datadog/trace/instrumentation/spark/AbstractSparkInstrumentation.java @@ -12,7 +12,7 @@ import org.apache.spark.deploy.SparkSubmitArguments; public abstract class AbstractSparkInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public AbstractSparkInstrumentation() { super("spark", "apache-spark"); diff --git a/dd-java-agent/instrumentation/sparkjava-2.3/src/main/java/datadog/trace/instrumentation/sparkjava/RoutesInstrumentation.java b/dd-java-agent/instrumentation/sparkjava-2.3/src/main/java/datadog/trace/instrumentation/sparkjava/RoutesInstrumentation.java index 9bc75bd9e82..b4dbe6e5c02 100644 --- a/dd-java-agent/instrumentation/sparkjava-2.3/src/main/java/datadog/trace/instrumentation/sparkjava/RoutesInstrumentation.java +++ b/dd-java-agent/instrumentation/sparkjava-2.3/src/main/java/datadog/trace/instrumentation/sparkjava/RoutesInstrumentation.java @@ -17,7 +17,7 @@ @AutoService(InstrumenterModule.class) public class RoutesInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public RoutesInstrumentation() { super("sparkjava", "sparkjava-2.4"); diff --git a/dd-java-agent/instrumentation/spray-1.3/src/main/scala/datadog/trace/instrumentation/spray/SprayHttpServerInstrumentation.java b/dd-java-agent/instrumentation/spray-1.3/src/main/scala/datadog/trace/instrumentation/spray/SprayHttpServerInstrumentation.java index 57300c20de7..b65c76f10ea 100644 --- a/dd-java-agent/instrumentation/spray-1.3/src/main/scala/datadog/trace/instrumentation/spray/SprayHttpServerInstrumentation.java +++ b/dd-java-agent/instrumentation/spray-1.3/src/main/scala/datadog/trace/instrumentation/spray/SprayHttpServerInstrumentation.java @@ -9,7 +9,7 @@ @AutoService(InstrumenterModule.class) public final class SprayHttpServerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public SprayHttpServerInstrumentation() { super("spray-http", "spray-http-server"); } diff --git a/dd-java-agent/instrumentation/spring-beans/src/main/java/datadog/trace/instrumentation/springbeans/BeanFactoryInstrumentation.java b/dd-java-agent/instrumentation/spring-beans/src/main/java/datadog/trace/instrumentation/springbeans/BeanFactoryInstrumentation.java index 7e4f19d5c30..07f708e78e1 100644 --- a/dd-java-agent/instrumentation/spring-beans/src/main/java/datadog/trace/instrumentation/springbeans/BeanFactoryInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-beans/src/main/java/datadog/trace/instrumentation/springbeans/BeanFactoryInstrumentation.java @@ -27,7 +27,7 @@ */ @AutoService(InstrumenterModule.class) public class BeanFactoryInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public BeanFactoryInstrumentation() { super("spring-beans"); } diff --git a/dd-java-agent/instrumentation/spring-boot/src/main/java/datadog/trace/instrumentation/springboot/SpringApplicationInstrumentation.java b/dd-java-agent/instrumentation/spring-boot/src/main/java/datadog/trace/instrumentation/springboot/SpringApplicationInstrumentation.java index 4742f707114..dfddac80de1 100644 --- a/dd-java-agent/instrumentation/spring-boot/src/main/java/datadog/trace/instrumentation/springboot/SpringApplicationInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-boot/src/main/java/datadog/trace/instrumentation/springboot/SpringApplicationInstrumentation.java @@ -17,7 +17,7 @@ */ @AutoService(InstrumenterModule.class) public class SpringApplicationInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public SpringApplicationInstrumentation() { super("spring-boot"); } diff --git a/dd-java-agent/instrumentation/spring-boot/src/main/java/datadog/trace/instrumentation/springboot/SpringServletInitializerInstrumentation.java b/dd-java-agent/instrumentation/spring-boot/src/main/java/datadog/trace/instrumentation/springboot/SpringServletInitializerInstrumentation.java index 4980893a631..5dad5aeda34 100644 --- a/dd-java-agent/instrumentation/spring-boot/src/main/java/datadog/trace/instrumentation/springboot/SpringServletInitializerInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-boot/src/main/java/datadog/trace/instrumentation/springboot/SpringServletInitializerInstrumentation.java @@ -15,7 +15,7 @@ */ @AutoService(InstrumenterModule.class) public class SpringServletInitializerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public SpringServletInitializerInstrumentation() { super("spring-boot"); } diff --git a/dd-java-agent/instrumentation/spring-cloud-zuul-2/src/main/java/datadog/trace/instrumentation/springcloudzuul2/ZuulProxyRequestHelperInstrumentation.java b/dd-java-agent/instrumentation/spring-cloud-zuul-2/src/main/java/datadog/trace/instrumentation/springcloudzuul2/ZuulProxyRequestHelperInstrumentation.java index 978963f4180..e1ee077cb52 100644 --- a/dd-java-agent/instrumentation/spring-cloud-zuul-2/src/main/java/datadog/trace/instrumentation/springcloudzuul2/ZuulProxyRequestHelperInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-cloud-zuul-2/src/main/java/datadog/trace/instrumentation/springcloudzuul2/ZuulProxyRequestHelperInstrumentation.java @@ -15,7 +15,7 @@ @AutoService(InstrumenterModule.class) public class ZuulProxyRequestHelperInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ZuulProxyRequestHelperInstrumentation() { super("spring-cloud-zuul"); } diff --git a/dd-java-agent/instrumentation/spring-cloud-zuul-2/src/main/java/datadog/trace/instrumentation/springcloudzuul2/ZuulSendForwardFilterInstrumentation.java b/dd-java-agent/instrumentation/spring-cloud-zuul-2/src/main/java/datadog/trace/instrumentation/springcloudzuul2/ZuulSendForwardFilterInstrumentation.java index aa10f17d8a4..77714dabea7 100644 --- a/dd-java-agent/instrumentation/spring-cloud-zuul-2/src/main/java/datadog/trace/instrumentation/springcloudzuul2/ZuulSendForwardFilterInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-cloud-zuul-2/src/main/java/datadog/trace/instrumentation/springcloudzuul2/ZuulSendForwardFilterInstrumentation.java @@ -16,7 +16,7 @@ @AutoService(InstrumenterModule.class) public class ZuulSendForwardFilterInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ZuulSendForwardFilterInstrumentation() { super("spring-cloud-zuul"); } diff --git a/dd-java-agent/instrumentation/spring-core/src/main/java/datadog/trace/instrumentation/springcore/StreamUtilsInstrumentation.java b/dd-java-agent/instrumentation/spring-core/src/main/java/datadog/trace/instrumentation/springcore/StreamUtilsInstrumentation.java index da7a6f9a23d..68a081bf54d 100644 --- a/dd-java-agent/instrumentation/spring-core/src/main/java/datadog/trace/instrumentation/springcore/StreamUtilsInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-core/src/main/java/datadog/trace/instrumentation/springcore/StreamUtilsInstrumentation.java @@ -20,7 +20,7 @@ @AutoService(InstrumenterModule.class) public final class StreamUtilsInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public StreamUtilsInstrumentation() { super("spring-core"); diff --git a/dd-java-agent/instrumentation/spring-data-1.8/src/main/java/datadog/trace/instrumentation/springdata/SpringRepositoryInstrumentation.java b/dd-java-agent/instrumentation/spring-data-1.8/src/main/java/datadog/trace/instrumentation/springdata/SpringRepositoryInstrumentation.java index 12d03627a41..2c254f0286c 100644 --- a/dd-java-agent/instrumentation/spring-data-1.8/src/main/java/datadog/trace/instrumentation/springdata/SpringRepositoryInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-data-1.8/src/main/java/datadog/trace/instrumentation/springdata/SpringRepositoryInstrumentation.java @@ -13,7 +13,7 @@ @AutoService(InstrumenterModule.class) public final class SpringRepositoryInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public SpringRepositoryInstrumentation() { super("spring-data"); diff --git a/dd-java-agent/instrumentation/spring-jms-3.1/src/main/java/datadog/trace/instrumentation/springjms/AbstractPollingMessageListenerContainerInstrumentation.java b/dd-java-agent/instrumentation/spring-jms-3.1/src/main/java/datadog/trace/instrumentation/springjms/AbstractPollingMessageListenerContainerInstrumentation.java index 8c70786931b..cda0ab24d1b 100644 --- a/dd-java-agent/instrumentation/spring-jms-3.1/src/main/java/datadog/trace/instrumentation/springjms/AbstractPollingMessageListenerContainerInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-jms-3.1/src/main/java/datadog/trace/instrumentation/springjms/AbstractPollingMessageListenerContainerInstrumentation.java @@ -16,7 +16,8 @@ @AutoService(InstrumenterModule.class) public class AbstractPollingMessageListenerContainerInstrumentation - extends InstrumenterModule.Tracing implements Instrumenter.ForSingleType { + extends InstrumenterModule.Tracing + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public AbstractPollingMessageListenerContainerInstrumentation() { super("spring-jms", "jms"); diff --git a/dd-java-agent/instrumentation/spring-messaging-4/src/main/java/datadog/trace/instrumentation/springmessaging/SpringMessageHandlerInstrumentation.java b/dd-java-agent/instrumentation/spring-messaging-4/src/main/java/datadog/trace/instrumentation/springmessaging/SpringMessageHandlerInstrumentation.java index f8a06e54b77..d392b453910 100644 --- a/dd-java-agent/instrumentation/spring-messaging-4/src/main/java/datadog/trace/instrumentation/springmessaging/SpringMessageHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-messaging-4/src/main/java/datadog/trace/instrumentation/springmessaging/SpringMessageHandlerInstrumentation.java @@ -22,7 +22,7 @@ @AutoService(InstrumenterModule.class) public final class SpringMessageHandlerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public SpringMessageHandlerInstrumentation() { super("spring-messaging", "spring-messaging-4"); diff --git a/dd-java-agent/instrumentation/spring-rabbit/src/main/java/datadog/trace/instrumentation/springamqp/AbstractMessageListenerContainerInstrumentation.java b/dd-java-agent/instrumentation/spring-rabbit/src/main/java/datadog/trace/instrumentation/springamqp/AbstractMessageListenerContainerInstrumentation.java index ddda27884d0..aff08a34f24 100644 --- a/dd-java-agent/instrumentation/spring-rabbit/src/main/java/datadog/trace/instrumentation/springamqp/AbstractMessageListenerContainerInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-rabbit/src/main/java/datadog/trace/instrumentation/springamqp/AbstractMessageListenerContainerInstrumentation.java @@ -26,7 +26,7 @@ @AutoService(InstrumenterModule.class) public class AbstractMessageListenerContainerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType, ExcludeFilterProvider { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, ExcludeFilterProvider { public AbstractMessageListenerContainerInstrumentation() { super("spring-rabbit"); diff --git a/dd-java-agent/instrumentation/spring-rabbit/src/main/java/datadog/trace/instrumentation/springamqp/BlockingQueueConsumerInstrumentation.java b/dd-java-agent/instrumentation/spring-rabbit/src/main/java/datadog/trace/instrumentation/springamqp/BlockingQueueConsumerInstrumentation.java index 6d9b52141ea..dc0ba998427 100644 --- a/dd-java-agent/instrumentation/spring-rabbit/src/main/java/datadog/trace/instrumentation/springamqp/BlockingQueueConsumerInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-rabbit/src/main/java/datadog/trace/instrumentation/springamqp/BlockingQueueConsumerInstrumentation.java @@ -17,7 +17,7 @@ @AutoService(InstrumenterModule.class) public class BlockingQueueConsumerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public BlockingQueueConsumerInstrumentation() { super("spring-rabbit"); } diff --git a/dd-java-agent/instrumentation/spring-rabbit/src/main/java/datadog/trace/instrumentation/springamqp/DeliveryInstrumentation.java b/dd-java-agent/instrumentation/spring-rabbit/src/main/java/datadog/trace/instrumentation/springamqp/DeliveryInstrumentation.java index 31ca868ec41..de14c3fd910 100644 --- a/dd-java-agent/instrumentation/spring-rabbit/src/main/java/datadog/trace/instrumentation/springamqp/DeliveryInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-rabbit/src/main/java/datadog/trace/instrumentation/springamqp/DeliveryInstrumentation.java @@ -16,7 +16,7 @@ @AutoService(InstrumenterModule.class) public class DeliveryInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public DeliveryInstrumentation() { super("spring-rabbit"); } diff --git a/dd-java-agent/instrumentation/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringAsyncInstrumentation.java b/dd-java-agent/instrumentation/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringAsyncInstrumentation.java index d08aa666b73..ad0c2dde831 100644 --- a/dd-java-agent/instrumentation/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringAsyncInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringAsyncInstrumentation.java @@ -10,7 +10,7 @@ @AutoService(InstrumenterModule.class) public class SpringAsyncInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public SpringAsyncInstrumentation() { super("spring-async"); diff --git a/dd-java-agent/instrumentation/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingInstrumentation.java b/dd-java-agent/instrumentation/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingInstrumentation.java index f77251982fe..48ca492e65c 100644 --- a/dd-java-agent/instrumentation/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingInstrumentation.java @@ -16,7 +16,7 @@ @AutoService(InstrumenterModule.class) public final class SpringSchedulingInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType, ExcludeFilterProvider { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, ExcludeFilterProvider { public SpringSchedulingInstrumentation() { super("spring-scheduling"); diff --git a/dd-java-agent/instrumentation/spring-security-5/src/main/java/datadog/trace/instrumentation/springsecurity5/AuthenticationManagerInstrumentation.java b/dd-java-agent/instrumentation/spring-security-5/src/main/java/datadog/trace/instrumentation/springsecurity5/AuthenticationManagerInstrumentation.java index 7339498d003..29fc6607b3a 100644 --- a/dd-java-agent/instrumentation/spring-security-5/src/main/java/datadog/trace/instrumentation/springsecurity5/AuthenticationManagerInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-security-5/src/main/java/datadog/trace/instrumentation/springsecurity5/AuthenticationManagerInstrumentation.java @@ -19,7 +19,7 @@ @AutoService(InstrumenterModule.class) public class AuthenticationManagerInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public AuthenticationManagerInstrumentation() { super("spring-security"); diff --git a/dd-java-agent/instrumentation/spring-security-5/src/main/java/datadog/trace/instrumentation/springsecurity5/SecurityContextHolderInstrumentation.java b/dd-java-agent/instrumentation/spring-security-5/src/main/java/datadog/trace/instrumentation/springsecurity5/SecurityContextHolderInstrumentation.java index 31cc383c28a..64d4718d5b6 100644 --- a/dd-java-agent/instrumentation/spring-security-5/src/main/java/datadog/trace/instrumentation/springsecurity5/SecurityContextHolderInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-security-5/src/main/java/datadog/trace/instrumentation/springsecurity5/SecurityContextHolderInstrumentation.java @@ -19,7 +19,7 @@ @AutoService(InstrumenterModule.class) public class SecurityContextHolderInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public SecurityContextHolderInstrumentation() { super("spring-security"); diff --git a/dd-java-agent/instrumentation/spring-security-5/src/main/java/datadog/trace/instrumentation/springsecurity5/UserDetailsManagerInstrumentation.java b/dd-java-agent/instrumentation/spring-security-5/src/main/java/datadog/trace/instrumentation/springsecurity5/UserDetailsManagerInstrumentation.java index cdbefae8760..ad1dfe06454 100644 --- a/dd-java-agent/instrumentation/spring-security-5/src/main/java/datadog/trace/instrumentation/springsecurity5/UserDetailsManagerInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-security-5/src/main/java/datadog/trace/instrumentation/springsecurity5/UserDetailsManagerInstrumentation.java @@ -17,7 +17,7 @@ @AutoService(InstrumenterModule.class) public class UserDetailsManagerInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public UserDetailsManagerInstrumentation() { super("spring-security"); diff --git a/dd-java-agent/instrumentation/spring-security-5/src/main/java/datadog/trace/instrumentation/springsecurity5/UsernameNotFoundExceptionInstrumentation.java b/dd-java-agent/instrumentation/spring-security-5/src/main/java/datadog/trace/instrumentation/springsecurity5/UsernameNotFoundExceptionInstrumentation.java index 38cd80fc061..38191e0c06f 100644 --- a/dd-java-agent/instrumentation/spring-security-5/src/main/java/datadog/trace/instrumentation/springsecurity5/UsernameNotFoundExceptionInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-security-5/src/main/java/datadog/trace/instrumentation/springsecurity5/UsernameNotFoundExceptionInstrumentation.java @@ -15,7 +15,7 @@ @AutoService(InstrumenterModule.class) public class UsernameNotFoundExceptionInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public UsernameNotFoundExceptionInstrumentation() { super("spring-security"); diff --git a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/client/WebClientFilterInstrumentation.java b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/client/WebClientFilterInstrumentation.java index 332e48aebf7..381d454aed4 100644 --- a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/client/WebClientFilterInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/client/WebClientFilterInstrumentation.java @@ -11,7 +11,7 @@ @AutoService(InstrumenterModule.class) public class WebClientFilterInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public WebClientFilterInstrumentation() { super("spring-webflux", "spring-webflux-client"); diff --git a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/DispatcherHandlerInstrumentation.java b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/DispatcherHandlerInstrumentation.java index 3522afea92e..0cdd73e7287 100644 --- a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/DispatcherHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/DispatcherHandlerInstrumentation.java @@ -15,7 +15,7 @@ @AutoService(InstrumenterModule.class) public final class DispatcherHandlerInstrumentation extends AbstractWebfluxInstrumentation - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { @Override public String instrumentedType() { diff --git a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/HandlerAdapterInstrumentation.java b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/HandlerAdapterInstrumentation.java index 3b31cb9c7b7..432b8fead16 100644 --- a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/HandlerAdapterInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/HandlerAdapterInstrumentation.java @@ -19,7 +19,7 @@ @AutoService(InstrumenterModule.class) public final class HandlerAdapterInstrumentation extends AbstractWebfluxInstrumentation - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { @Override public String hierarchyMarkerType() { diff --git a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/RouterFunctionInstrumentation.java b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/RouterFunctionInstrumentation.java index 223d67d8e27..f9d20554057 100644 --- a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/RouterFunctionInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/RouterFunctionInstrumentation.java @@ -16,7 +16,7 @@ @AutoService(InstrumenterModule.class) public final class RouterFunctionInstrumentation extends AbstractWebfluxInstrumentation - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public RouterFunctionInstrumentation() { super("spring-webflux-functional"); diff --git a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/AbstractServerHttpRequestInstrumentation.java b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/AbstractServerHttpRequestInstrumentation.java index 80e63208d02..bc19cfae1e0 100644 --- a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/AbstractServerHttpRequestInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/AbstractServerHttpRequestInstrumentation.java @@ -21,7 +21,7 @@ @AutoService(InstrumenterModule.class) public class AbstractServerHttpRequestInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public AbstractServerHttpRequestInstrumentation() { super("spring-webflux"); diff --git a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/DataBufferInstrumentation.java b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/DataBufferInstrumentation.java index 46d8f9009f0..80c36ff191d 100644 --- a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/DataBufferInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/DataBufferInstrumentation.java @@ -12,7 +12,7 @@ /** @see DataBuffer#asInputStream() */ @AutoService(InstrumenterModule.class) public class DataBufferInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public DataBufferInstrumentation() { super("spring-webflux"); } diff --git a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/HttpHeadersInstrumentation.java b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/HttpHeadersInstrumentation.java index 6bc03b08e42..abfa303e104 100644 --- a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/HttpHeadersInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/HttpHeadersInstrumentation.java @@ -11,7 +11,7 @@ /** @see org.springframework.http.HttpHeaders */ @AutoService(InstrumenterModule.class) public class HttpHeadersInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public HttpHeadersInstrumentation() { super("spring-webflux"); } diff --git a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/HttpMessageInstrumentation.java b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/HttpMessageInstrumentation.java index 6d800b29445..01b7cc193bb 100644 --- a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/HttpMessageInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/HttpMessageInstrumentation.java @@ -24,7 +24,7 @@ @AutoService(InstrumenterModule.class) public class HttpMessageInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public HttpMessageInstrumentation() { super("spring-webflux"); diff --git a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/Json2TokenizerInstrumentation.java b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/Json2TokenizerInstrumentation.java index df4a5aceeda..8244fe15f15 100644 --- a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/Json2TokenizerInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/Json2TokenizerInstrumentation.java @@ -13,7 +13,7 @@ /** @see org.springframework.http.codec.json.Jackson2Tokenizer */ @AutoService(InstrumenterModule.class) public class Json2TokenizerInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public Json2TokenizerInstrumentation() { super("spring-webflux"); } diff --git a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/ReactorServerHttpRequestInstrumentation.java b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/ReactorServerHttpRequestInstrumentation.java index 4d4a73a8a72..e65a365f593 100644 --- a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/ReactorServerHttpRequestInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/ReactorServerHttpRequestInstrumentation.java @@ -20,7 +20,7 @@ @AutoService(InstrumenterModule.class) public class ReactorServerHttpRequestInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ReactorServerHttpRequestInstrumentation() { super("spring-webflux"); diff --git a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/ReadOnlyHttpHeadersInstrumentation.java b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/ReadOnlyHttpHeadersInstrumentation.java index fbc3c874b4d..c10c355203a 100644 --- a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/ReadOnlyHttpHeadersInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/ReadOnlyHttpHeadersInstrumentation.java @@ -10,7 +10,7 @@ @AutoService(InstrumenterModule.class) public class ReadOnlyHttpHeadersInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ReadOnlyHttpHeadersInstrumentation() { super("spring-webflux"); } diff --git a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/RequestHeaderMapResolverInstrumentation.java b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/RequestHeaderMapResolverInstrumentation.java index d8100c47494..bc2c7a43e51 100644 --- a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/RequestHeaderMapResolverInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/RequestHeaderMapResolverInstrumentation.java @@ -19,7 +19,7 @@ */ @AutoService(InstrumenterModule.class) public class RequestHeaderMapResolverInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public RequestHeaderMapResolverInstrumentation() { super("spring-webflux"); } diff --git a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/ServerHttpRequestInstrumentation.java b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/ServerHttpRequestInstrumentation.java index ebc1fd8b60d..b04fd93c7fa 100644 --- a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/ServerHttpRequestInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/ServerHttpRequestInstrumentation.java @@ -15,7 +15,7 @@ /** @see org.springframework.http.server.reactive.ServerHttpRequest */ @AutoService(InstrumenterModule.class) public class ServerHttpRequestInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public ServerHttpRequestInstrumentation() { super("spring-webflux"); } diff --git a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/ServerServletHttpRequestInstrumentation.java b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/ServerServletHttpRequestInstrumentation.java index 0755022ab42..d1953760b0c 100644 --- a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/ServerServletHttpRequestInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/ServerServletHttpRequestInstrumentation.java @@ -20,7 +20,7 @@ @AutoService(InstrumenterModule.class) public class ServerServletHttpRequestInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ServerServletHttpRequestInstrumentation() { super("spring-webflux"); diff --git a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TemplateAndMatrixVariablesInstrumentation.java b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TemplateAndMatrixVariablesInstrumentation.java index 17a40d6f29e..1f96fb0e994 100644 --- a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TemplateAndMatrixVariablesInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TemplateAndMatrixVariablesInstrumentation.java @@ -13,7 +13,7 @@ /** Obtain template and matrix variables for RequestMappingInfoHandlerMapping. */ @AutoService(InstrumenterModule.class) public class TemplateAndMatrixVariablesInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public TemplateAndMatrixVariablesInstrumentation() { super("spring-webflux"); } diff --git a/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/DispatcherServletInstrumentation.java b/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/DispatcherServletInstrumentation.java index 2a28e42709e..82a310fe133 100644 --- a/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/DispatcherServletInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/DispatcherServletInstrumentation.java @@ -27,7 +27,7 @@ @AutoService(InstrumenterModule.class) public final class DispatcherServletInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public DispatcherServletInstrumentation() { super("spring-web"); diff --git a/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HandlerAdapterInstrumentation.java b/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HandlerAdapterInstrumentation.java index 14194e6621c..c0a37adfabe 100644 --- a/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HandlerAdapterInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HandlerAdapterInstrumentation.java @@ -25,7 +25,7 @@ @AutoService(InstrumenterModule.class) public final class HandlerAdapterInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public HandlerAdapterInstrumentation() { super("spring-web"); diff --git a/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HandlerMethodReturnValueHandlerCompositeInstrumentation.java b/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HandlerMethodReturnValueHandlerCompositeInstrumentation.java index 3e6581f76ce..78151935997 100644 --- a/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HandlerMethodReturnValueHandlerCompositeInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HandlerMethodReturnValueHandlerCompositeInstrumentation.java @@ -20,7 +20,8 @@ @AutoService(InstrumenterModule.class) public final class HandlerMethodReturnValueHandlerCompositeInstrumentation - extends InstrumenterModule.Iast implements Instrumenter.ForSingleType { + extends InstrumenterModule.Iast + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public HandlerMethodReturnValueHandlerCompositeInstrumentation() { super("spring-web"); diff --git a/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HttpMessageConverterInstrumentation.java b/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HttpMessageConverterInstrumentation.java index ae36b91b53d..e2684d5473e 100644 --- a/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HttpMessageConverterInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HttpMessageConverterInstrumentation.java @@ -29,7 +29,7 @@ @AutoService(InstrumenterModule.class) public class HttpMessageConverterInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public HttpMessageConverterInstrumentation() { super("spring-web"); diff --git a/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/SpringBeanProcessorInstrumentation.java b/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/SpringBeanProcessorInstrumentation.java index 8c892f52dd7..cb604d00bd0 100644 --- a/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/SpringBeanProcessorInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/SpringBeanProcessorInstrumentation.java @@ -18,7 +18,7 @@ */ @AutoService(InstrumenterModule.class) public class SpringBeanProcessorInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public SpringBeanProcessorInstrumentation() { super("spring-web"); } diff --git a/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/TemplateAndMatrixVariablesInstrumentation.java b/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/TemplateAndMatrixVariablesInstrumentation.java index f82ef331165..1b67cabc27f 100644 --- a/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/TemplateAndMatrixVariablesInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/TemplateAndMatrixVariablesInstrumentation.java @@ -36,9 +36,7 @@ /** Obtain template and matrix variables for RequestMappingInfoHandlerMapping. */ @AutoService(InstrumenterModule.class) public class TemplateAndMatrixVariablesInstrumentation extends InstrumenterModule - implements Instrumenter.ForSingleType, - Instrumenter.HasMethodAdvice, - Instrumenter.WithPostProcessor { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { private Advice.PostProcessor.Factory postProcessorFactory; diff --git a/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/TemplateVariablesUrlHandlerInstrumentation.java b/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/TemplateVariablesUrlHandlerInstrumentation.java index 41c4c77a798..4a1df54f150 100644 --- a/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/TemplateVariablesUrlHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/TemplateVariablesUrlHandlerInstrumentation.java @@ -35,9 +35,7 @@ /** Obtain template and matrix variables for AbstractUrlHandlerMapping */ @AutoService(InstrumenterModule.class) public class TemplateVariablesUrlHandlerInstrumentation extends InstrumenterModule - implements Instrumenter.ForSingleType, - Instrumenter.HasMethodAdvice, - Instrumenter.WithPostProcessor { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { private Advice.PostProcessor.Factory postProcessorFactory; diff --git a/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/WebApplicationContextInstrumentation.java b/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/WebApplicationContextInstrumentation.java index 7b3bb9e373f..408f4cb72fb 100644 --- a/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/WebApplicationContextInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/WebApplicationContextInstrumentation.java @@ -21,7 +21,7 @@ */ @AutoService(InstrumenterModule.class) public class WebApplicationContextInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public WebApplicationContextInstrumentation() { super("spring-web", "spring-path-filter"); } diff --git a/dd-java-agent/instrumentation/spring-webmvc-5.3/src/main/java/datadog/trace/instrumentation/springweb/ServletPathRequestFilterInstrumentation.java b/dd-java-agent/instrumentation/spring-webmvc-5.3/src/main/java/datadog/trace/instrumentation/springweb/ServletPathRequestFilterInstrumentation.java index c9914fcefca..ee5744396ba 100644 --- a/dd-java-agent/instrumentation/spring-webmvc-5.3/src/main/java/datadog/trace/instrumentation/springweb/ServletPathRequestFilterInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-webmvc-5.3/src/main/java/datadog/trace/instrumentation/springweb/ServletPathRequestFilterInstrumentation.java @@ -22,7 +22,7 @@ */ @AutoService(InstrumenterModule.class) public class ServletPathRequestFilterInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public ServletPathRequestFilterInstrumentation() { super("spring-web", "spring-path-filter"); } diff --git a/dd-java-agent/instrumentation/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/DispatcherServletInstrumentation.java b/dd-java-agent/instrumentation/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/DispatcherServletInstrumentation.java index 7a6cd8899d4..2c2874bee35 100644 --- a/dd-java-agent/instrumentation/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/DispatcherServletInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/DispatcherServletInstrumentation.java @@ -13,7 +13,7 @@ @AutoService(InstrumenterModule.class) public final class DispatcherServletInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public DispatcherServletInstrumentation() { super("spring-web"); diff --git a/dd-java-agent/instrumentation/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/HandlerAdapterInstrumentation.java b/dd-java-agent/instrumentation/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/HandlerAdapterInstrumentation.java index fab51e7c8bb..e0446917176 100644 --- a/dd-java-agent/instrumentation/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/HandlerAdapterInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/HandlerAdapterInstrumentation.java @@ -16,7 +16,7 @@ @AutoService(InstrumenterModule.class) public final class HandlerAdapterInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public HandlerAdapterInstrumentation() { super("spring-web"); diff --git a/dd-java-agent/instrumentation/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/ServletPathRequestFilterInstrumentation.java b/dd-java-agent/instrumentation/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/ServletPathRequestFilterInstrumentation.java index 11fb0a53aeb..5c2db70ba85 100644 --- a/dd-java-agent/instrumentation/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/ServletPathRequestFilterInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/ServletPathRequestFilterInstrumentation.java @@ -19,7 +19,7 @@ */ @AutoService(InstrumenterModule.class) public class ServletPathRequestFilterInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public ServletPathRequestFilterInstrumentation() { super("spring-web", "spring-path-filter"); } diff --git a/dd-java-agent/instrumentation/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/TemplateAndMatrixVariablesInstrumentation.java b/dd-java-agent/instrumentation/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/TemplateAndMatrixVariablesInstrumentation.java index d42dd144cfa..912c9d78a4a 100644 --- a/dd-java-agent/instrumentation/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/TemplateAndMatrixVariablesInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/TemplateAndMatrixVariablesInstrumentation.java @@ -18,9 +18,7 @@ /** Obtain template and matrix variables for RequestMappingInfoHandlerMapping. */ @AutoService(InstrumenterModule.class) public class TemplateAndMatrixVariablesInstrumentation extends InstrumenterModule - implements Instrumenter.ForSingleType, - Instrumenter.HasMethodAdvice, - Instrumenter.WithPostProcessor { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { private Advice.PostProcessor.Factory postProcessorFactory; diff --git a/dd-java-agent/instrumentation/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/TemplateVariablesUrlHandlerInstrumentation.java b/dd-java-agent/instrumentation/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/TemplateVariablesUrlHandlerInstrumentation.java index 9afbc5ea151..6d99f64cf09 100644 --- a/dd-java-agent/instrumentation/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/TemplateVariablesUrlHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/TemplateVariablesUrlHandlerInstrumentation.java @@ -18,9 +18,7 @@ /** Obtain template and matrix variables for AbstractUrlHandlerMapping */ @AutoService(InstrumenterModule.class) public class TemplateVariablesUrlHandlerInstrumentation extends InstrumenterModule - implements Instrumenter.ForSingleType, - Instrumenter.HasMethodAdvice, - Instrumenter.WithPostProcessor { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { private Advice.PostProcessor.Factory postProcessorFactory; diff --git a/dd-java-agent/instrumentation/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/WebApplicationContextInstrumentation.java b/dd-java-agent/instrumentation/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/WebApplicationContextInstrumentation.java index c2c063f8719..672570f94bf 100644 --- a/dd-java-agent/instrumentation/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/WebApplicationContextInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/WebApplicationContextInstrumentation.java @@ -18,7 +18,7 @@ */ @AutoService(InstrumenterModule.class) public class WebApplicationContextInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public WebApplicationContextInstrumentation() { super("spring-web", "spring-path-filter"); } diff --git a/dd-java-agent/instrumentation/spring-ws-2/src/main/java/datadog/trace/instrumentation/springws2/MethodEndpointInstrumentation.java b/dd-java-agent/instrumentation/spring-ws-2/src/main/java/datadog/trace/instrumentation/springws2/MethodEndpointInstrumentation.java index 7baebbac84c..ed354a97bcb 100644 --- a/dd-java-agent/instrumentation/spring-ws-2/src/main/java/datadog/trace/instrumentation/springws2/MethodEndpointInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-ws-2/src/main/java/datadog/trace/instrumentation/springws2/MethodEndpointInstrumentation.java @@ -13,7 +13,7 @@ @AutoService(InstrumenterModule.class) public class MethodEndpointInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public MethodEndpointInstrumentation() { super("spring-ws", "spring-ws-2"); } diff --git a/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/MemcachedClientInstrumentation.java b/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/MemcachedClientInstrumentation.java index 80c7c8f5dca..779c172c38c 100644 --- a/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/MemcachedClientInstrumentation.java +++ b/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/MemcachedClientInstrumentation.java @@ -23,7 +23,7 @@ @AutoService(InstrumenterModule.class) public final class MemcachedClientInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { private static final String MEMCACHED_PACKAGE = "net.spy.memcached"; diff --git a/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/MemcachedConnectionInstrumentation.java b/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/MemcachedConnectionInstrumentation.java index 157d11a49de..984be28a16b 100644 --- a/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/MemcachedConnectionInstrumentation.java +++ b/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/MemcachedConnectionInstrumentation.java @@ -17,7 +17,7 @@ @AutoService(InstrumenterModule.class) public class MemcachedConnectionInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public MemcachedConnectionInstrumentation() { super("spymemcached"); diff --git a/dd-java-agent/instrumentation/sslsocket/src/main/java/datadog/trace/instrumentation/sslsocket/SocketConnectInstrumentation.java b/dd-java-agent/instrumentation/sslsocket/src/main/java/datadog/trace/instrumentation/sslsocket/SocketConnectInstrumentation.java index 115f91d95e9..d9af65727f1 100644 --- a/dd-java-agent/instrumentation/sslsocket/src/main/java/datadog/trace/instrumentation/sslsocket/SocketConnectInstrumentation.java +++ b/dd-java-agent/instrumentation/sslsocket/src/main/java/datadog/trace/instrumentation/sslsocket/SocketConnectInstrumentation.java @@ -17,7 +17,7 @@ @AutoService(InstrumenterModule.class) public class SocketConnectInstrumentation extends InstrumenterModule.Profiling - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public SocketConnectInstrumentation() { super("socket"); diff --git a/dd-java-agent/instrumentation/sslsocket/src/main/java/datadog/trace/instrumentation/sslsocket/SslSocketInstrumentation.java b/dd-java-agent/instrumentation/sslsocket/src/main/java/datadog/trace/instrumentation/sslsocket/SslSocketInstrumentation.java index 1f5be39cc7d..f1892646d6c 100644 --- a/dd-java-agent/instrumentation/sslsocket/src/main/java/datadog/trace/instrumentation/sslsocket/SslSocketInstrumentation.java +++ b/dd-java-agent/instrumentation/sslsocket/src/main/java/datadog/trace/instrumentation/sslsocket/SslSocketInstrumentation.java @@ -25,7 +25,9 @@ @AutoService(InstrumenterModule.class) public final class SslSocketInstrumentation extends InstrumenterModule.Usm - implements Instrumenter.ForBootstrap, Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForBootstrap, + Instrumenter.ForTypeHierarchy, + Instrumenter.HasMethodAdvice { public SslSocketInstrumentation() { super("sslsocket"); diff --git a/dd-java-agent/instrumentation/synapse-3/src/main/java/datadog/trace/instrumentation/synapse3/SynapseClientInstrumentation.java b/dd-java-agent/instrumentation/synapse-3/src/main/java/datadog/trace/instrumentation/synapse3/SynapseClientInstrumentation.java index 73447c8226c..14a6376b974 100644 --- a/dd-java-agent/instrumentation/synapse-3/src/main/java/datadog/trace/instrumentation/synapse3/SynapseClientInstrumentation.java +++ b/dd-java-agent/instrumentation/synapse-3/src/main/java/datadog/trace/instrumentation/synapse3/SynapseClientInstrumentation.java @@ -24,7 +24,7 @@ @AutoService(InstrumenterModule.class) public final class SynapseClientInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public SynapseClientInstrumentation() { super("synapse3-client", "synapse3"); diff --git a/dd-java-agent/instrumentation/synapse-3/src/main/java/datadog/trace/instrumentation/synapse3/SynapseClientWorkerInstrumentation.java b/dd-java-agent/instrumentation/synapse-3/src/main/java/datadog/trace/instrumentation/synapse3/SynapseClientWorkerInstrumentation.java index 54a5c3cbed8..15a09647790 100644 --- a/dd-java-agent/instrumentation/synapse-3/src/main/java/datadog/trace/instrumentation/synapse3/SynapseClientWorkerInstrumentation.java +++ b/dd-java-agent/instrumentation/synapse-3/src/main/java/datadog/trace/instrumentation/synapse3/SynapseClientWorkerInstrumentation.java @@ -19,7 +19,7 @@ @AutoService(InstrumenterModule.class) public final class SynapseClientWorkerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public SynapseClientWorkerInstrumentation() { super("synapse3-client", "synapse3"); diff --git a/dd-java-agent/instrumentation/synapse-3/src/main/java/datadog/trace/instrumentation/synapse3/SynapsePassthruInstrumentation.java b/dd-java-agent/instrumentation/synapse-3/src/main/java/datadog/trace/instrumentation/synapse3/SynapsePassthruInstrumentation.java index 71dbe65f386..c4203348ab6 100644 --- a/dd-java-agent/instrumentation/synapse-3/src/main/java/datadog/trace/instrumentation/synapse3/SynapsePassthruInstrumentation.java +++ b/dd-java-agent/instrumentation/synapse-3/src/main/java/datadog/trace/instrumentation/synapse3/SynapsePassthruInstrumentation.java @@ -18,7 +18,7 @@ /** Helps propagate parent spans over 'passthru' mechanism to synapse-client instrumentation. */ @AutoService(InstrumenterModule.class) public final class SynapsePassthruInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public SynapsePassthruInstrumentation() { super("synapse3-client", "synapse3"); diff --git a/dd-java-agent/instrumentation/synapse-3/src/main/java/datadog/trace/instrumentation/synapse3/SynapseServerInstrumentation.java b/dd-java-agent/instrumentation/synapse-3/src/main/java/datadog/trace/instrumentation/synapse3/SynapseServerInstrumentation.java index 4485bdad433..6c8418a3113 100644 --- a/dd-java-agent/instrumentation/synapse-3/src/main/java/datadog/trace/instrumentation/synapse3/SynapseServerInstrumentation.java +++ b/dd-java-agent/instrumentation/synapse-3/src/main/java/datadog/trace/instrumentation/synapse3/SynapseServerInstrumentation.java @@ -20,7 +20,7 @@ @AutoService(InstrumenterModule.class) public final class SynapseServerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public SynapseServerInstrumentation() { super("synapse3-server", "synapse3"); diff --git a/dd-java-agent/instrumentation/synapse-3/src/main/java/datadog/trace/instrumentation/synapse3/SynapseServerWorkerInstrumentation.java b/dd-java-agent/instrumentation/synapse-3/src/main/java/datadog/trace/instrumentation/synapse3/SynapseServerWorkerInstrumentation.java index e738a9afc6a..97f82075804 100644 --- a/dd-java-agent/instrumentation/synapse-3/src/main/java/datadog/trace/instrumentation/synapse3/SynapseServerWorkerInstrumentation.java +++ b/dd-java-agent/instrumentation/synapse-3/src/main/java/datadog/trace/instrumentation/synapse3/SynapseServerWorkerInstrumentation.java @@ -21,7 +21,7 @@ @AutoService(InstrumenterModule.class) public final class SynapseServerWorkerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public SynapseServerWorkerInstrumentation() { super("synapse3-server", "synapse3"); diff --git a/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestNGInstrumentation.java b/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestNGInstrumentation.java index e8c611151af..c831e370e6b 100644 --- a/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestNGInstrumentation.java +++ b/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestNGInstrumentation.java @@ -20,7 +20,7 @@ @AutoService(InstrumenterModule.class) public class TestNGInstrumentation extends InstrumenterModule.CiVisibility - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public TestNGInstrumentation() { super("testng"); } diff --git a/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestNGItrInstrumentation.java b/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestNGItrInstrumentation.java index 74e61f1fd32..df33279256e 100644 --- a/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestNGItrInstrumentation.java +++ b/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestNGItrInstrumentation.java @@ -19,7 +19,7 @@ @AutoService(InstrumenterModule.class) public class TestNGItrInstrumentation extends InstrumenterModule.CiVisibility - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public TestNGItrInstrumentation() { super("testng", "testng-itr"); } diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/main/java/datadog/trace/instrumentation/testng6/TestNGClassListenerInstrumentation.java b/dd-java-agent/instrumentation/testng/testng-6/src/main/java/datadog/trace/instrumentation/testng6/TestNGClassListenerInstrumentation.java index 307fcf30f32..c2bdc0cd3c0 100644 --- a/dd-java-agent/instrumentation/testng/testng-6/src/main/java/datadog/trace/instrumentation/testng6/TestNGClassListenerInstrumentation.java +++ b/dd-java-agent/instrumentation/testng/testng-6/src/main/java/datadog/trace/instrumentation/testng6/TestNGClassListenerInstrumentation.java @@ -20,7 +20,7 @@ @AutoService(InstrumenterModule.class) public class TestNGClassListenerInstrumentation extends InstrumenterModule.CiVisibility - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { private final String commonPackageName = Strings.getPackageName(TestNGUtils.class.getName()); diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/main/java/datadog/trace/instrumentation/testng7/TestNGClassListenerInstrumentation.java b/dd-java-agent/instrumentation/testng/testng-7/src/main/java/datadog/trace/instrumentation/testng7/TestNGClassListenerInstrumentation.java index f2d96895663..e95d34a12e2 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/main/java/datadog/trace/instrumentation/testng7/TestNGClassListenerInstrumentation.java +++ b/dd-java-agent/instrumentation/testng/testng-7/src/main/java/datadog/trace/instrumentation/testng7/TestNGClassListenerInstrumentation.java @@ -19,7 +19,7 @@ @AutoService(InstrumenterModule.class) public class TestNGClassListenerInstrumentation extends InstrumenterModule.CiVisibility - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { private final String commonPackageName = Strings.getPackageName(TestNGUtils.class.getName()); diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/main/java/datadog/trace/instrumentation/testng7/TestNGRetryInstrumentation.java b/dd-java-agent/instrumentation/testng/testng-7/src/main/java/datadog/trace/instrumentation/testng7/TestNGRetryInstrumentation.java index fe454dadd3e..87eb2021729 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/main/java/datadog/trace/instrumentation/testng7/TestNGRetryInstrumentation.java +++ b/dd-java-agent/instrumentation/testng/testng-7/src/main/java/datadog/trace/instrumentation/testng7/TestNGRetryInstrumentation.java @@ -19,7 +19,7 @@ @AutoService(InstrumenterModule.class) public class TestNGRetryInstrumentation extends InstrumenterModule.CiVisibility - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { private final String commonPackageName = Strings.getPackageName(TestNGUtils.class.getName()); diff --git a/dd-java-agent/instrumentation/thymeleaf/src/main/java/datadog/trace/instrumentation/thymeleaf/ElementTagStructureHandlerInstrumentation.java b/dd-java-agent/instrumentation/thymeleaf/src/main/java/datadog/trace/instrumentation/thymeleaf/ElementTagStructureHandlerInstrumentation.java index 6c346d75a35..1d2858580c1 100644 --- a/dd-java-agent/instrumentation/thymeleaf/src/main/java/datadog/trace/instrumentation/thymeleaf/ElementTagStructureHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/thymeleaf/src/main/java/datadog/trace/instrumentation/thymeleaf/ElementTagStructureHandlerInstrumentation.java @@ -12,7 +12,7 @@ @AutoService(InstrumenterModule.class) public class ElementTagStructureHandlerInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ElementTagStructureHandlerInstrumentation() { super("thymeleaf"); } diff --git a/dd-java-agent/instrumentation/thymeleaf/src/main/java/datadog/trace/instrumentation/thymeleaf/StandardUtextTagProcessorInstrumentation.java b/dd-java-agent/instrumentation/thymeleaf/src/main/java/datadog/trace/instrumentation/thymeleaf/StandardUtextTagProcessorInstrumentation.java index 207c092cb98..38994d223d0 100644 --- a/dd-java-agent/instrumentation/thymeleaf/src/main/java/datadog/trace/instrumentation/thymeleaf/StandardUtextTagProcessorInstrumentation.java +++ b/dd-java-agent/instrumentation/thymeleaf/src/main/java/datadog/trace/instrumentation/thymeleaf/StandardUtextTagProcessorInstrumentation.java @@ -11,7 +11,7 @@ @AutoService(InstrumenterModule.class) public class StandardUtextTagProcessorInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public StandardUtextTagProcessorInstrumentation() { super("thymeleaf"); diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-5/src/main/java/datadog/trace/instrumentation/tibcobw5/JobInstrumentation.java b/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-5/src/main/java/datadog/trace/instrumentation/tibcobw5/JobInstrumentation.java index d1cb007f46c..4334f3beb58 100644 --- a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-5/src/main/java/datadog/trace/instrumentation/tibcobw5/JobInstrumentation.java +++ b/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-5/src/main/java/datadog/trace/instrumentation/tibcobw5/JobInstrumentation.java @@ -17,7 +17,7 @@ @AutoService(InstrumenterModule.class) public class JobInstrumentation extends AbstractTibcoInstrumentation - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { @Override public String instrumentedType() { return "com.tibco.pe.core.Job"; diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-5/src/main/java/datadog/trace/instrumentation/tibcobw5/JobPoolInstrumentation.java b/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-5/src/main/java/datadog/trace/instrumentation/tibcobw5/JobPoolInstrumentation.java index 1411381d1de..fc3d771f792 100644 --- a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-5/src/main/java/datadog/trace/instrumentation/tibcobw5/JobPoolInstrumentation.java +++ b/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-5/src/main/java/datadog/trace/instrumentation/tibcobw5/JobPoolInstrumentation.java @@ -21,7 +21,7 @@ @AutoService(InstrumenterModule.class) public class JobPoolInstrumentation extends AbstractTibcoInstrumentation - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { @Override public String instrumentedType() { return "com.tibco.pe.core.JobPool"; diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-5/src/main/java/datadog/trace/instrumentation/tibcobw5/TaskInstrumentation.java b/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-5/src/main/java/datadog/trace/instrumentation/tibcobw5/TaskInstrumentation.java index 2c8fdc3fb72..295c13d7d79 100644 --- a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-5/src/main/java/datadog/trace/instrumentation/tibcobw5/TaskInstrumentation.java +++ b/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-5/src/main/java/datadog/trace/instrumentation/tibcobw5/TaskInstrumentation.java @@ -24,7 +24,7 @@ @AutoService(InstrumenterModule.class) public class TaskInstrumentation extends AbstractTibcoInstrumentation - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { @Override public String instrumentedType() { return "com.tibco.pe.core.TaskImpl"; diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-5/src/main/java/datadog/trace/instrumentation/tibcobw5/ThreadPoolInstrumentation.java b/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-5/src/main/java/datadog/trace/instrumentation/tibcobw5/ThreadPoolInstrumentation.java index cb6af0d9a22..6dd402b3e21 100644 --- a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-5/src/main/java/datadog/trace/instrumentation/tibcobw5/ThreadPoolInstrumentation.java +++ b/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-5/src/main/java/datadog/trace/instrumentation/tibcobw5/ThreadPoolInstrumentation.java @@ -11,7 +11,7 @@ @AutoService(InstrumenterModule.class) public class ThreadPoolInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ThreadPoolInstrumentation() { super("tibco"); diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-6/src/main/java/datadog/trace/instrumentation/tibcobw6/BehaviorInstrumentation.java b/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-6/src/main/java/datadog/trace/instrumentation/tibcobw6/BehaviorInstrumentation.java index a908850b0f3..cee20f895a8 100644 --- a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-6/src/main/java/datadog/trace/instrumentation/tibcobw6/BehaviorInstrumentation.java +++ b/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-6/src/main/java/datadog/trace/instrumentation/tibcobw6/BehaviorInstrumentation.java @@ -28,7 +28,7 @@ @AutoService(InstrumenterModule.class) public class BehaviorInstrumentation extends AbstractTibcoInstrumentation - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { @Override public String hierarchyMarkerType() { diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-6/src/main/java/datadog/trace/instrumentation/tibcobw6/CallbackHandlerInstrumentation.java b/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-6/src/main/java/datadog/trace/instrumentation/tibcobw6/CallbackHandlerInstrumentation.java index ccc10f11e7c..f5e13347db4 100644 --- a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-6/src/main/java/datadog/trace/instrumentation/tibcobw6/CallbackHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-6/src/main/java/datadog/trace/instrumentation/tibcobw6/CallbackHandlerInstrumentation.java @@ -17,7 +17,7 @@ @AutoService(InstrumenterModule.class) public class CallbackHandlerInstrumentation extends AbstractTibcoInstrumentation - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { @Override public String hierarchyMarkerType() { diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-6/src/main/java/datadog/trace/instrumentation/tibcobw6/JmsMessageGetterInstrumentation.java b/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-6/src/main/java/datadog/trace/instrumentation/tibcobw6/JmsMessageGetterInstrumentation.java index 1b1c8499ec4..dd447d9f86f 100644 --- a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-6/src/main/java/datadog/trace/instrumentation/tibcobw6/JmsMessageGetterInstrumentation.java +++ b/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-6/src/main/java/datadog/trace/instrumentation/tibcobw6/JmsMessageGetterInstrumentation.java @@ -14,7 +14,7 @@ @AutoService(InstrumenterModule.class) public class JmsMessageGetterInstrumentation extends AbstractTibcoInstrumentation - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { @Override public String instrumentedType() { diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-6/src/main/java/datadog/trace/instrumentation/tibcobw6/ProcessInstrumentation.java b/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-6/src/main/java/datadog/trace/instrumentation/tibcobw6/ProcessInstrumentation.java index 35dbb3d818b..7c4c4e9b043 100644 --- a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-6/src/main/java/datadog/trace/instrumentation/tibcobw6/ProcessInstrumentation.java +++ b/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-6/src/main/java/datadog/trace/instrumentation/tibcobw6/ProcessInstrumentation.java @@ -23,7 +23,7 @@ @AutoService(InstrumenterModule.class) public class ProcessInstrumentation extends AbstractTibcoInstrumentation - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { @Override public String hierarchyMarkerType() { diff --git a/dd-java-agent/instrumentation/tinylog-2/src/main/java/datadog/trace/instrumentation/tinylog2/LogEntryInstrumentation.java b/dd-java-agent/instrumentation/tinylog-2/src/main/java/datadog/trace/instrumentation/tinylog2/LogEntryInstrumentation.java index 25cfccf02c3..4e78a6283f1 100644 --- a/dd-java-agent/instrumentation/tinylog-2/src/main/java/datadog/trace/instrumentation/tinylog2/LogEntryInstrumentation.java +++ b/dd-java-agent/instrumentation/tinylog-2/src/main/java/datadog/trace/instrumentation/tinylog2/LogEntryInstrumentation.java @@ -26,7 +26,7 @@ @AutoService(InstrumenterModule.class) public class LogEntryInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public LogEntryInstrumentation() { super("tinylog"); } diff --git a/dd-java-agent/instrumentation/tinylog-2/src/main/java/datadog/trace/instrumentation/tinylog2/TinylogLoggingProviderInstrumentation.java b/dd-java-agent/instrumentation/tinylog-2/src/main/java/datadog/trace/instrumentation/tinylog2/TinylogLoggingProviderInstrumentation.java index c0f81c25d39..76ae2de6d93 100644 --- a/dd-java-agent/instrumentation/tinylog-2/src/main/java/datadog/trace/instrumentation/tinylog2/TinylogLoggingProviderInstrumentation.java +++ b/dd-java-agent/instrumentation/tinylog-2/src/main/java/datadog/trace/instrumentation/tinylog2/TinylogLoggingProviderInstrumentation.java @@ -20,7 +20,7 @@ @AutoService(InstrumenterModule.class) public class TinylogLoggingProviderInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public TinylogLoggingProviderInstrumentation() { super("tinylog"); } diff --git a/dd-java-agent/instrumentation/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/RequestInstrumentation.java b/dd-java-agent/instrumentation/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/RequestInstrumentation.java index 4635992e001..9c292ae4e1d 100644 --- a/dd-java-agent/instrumentation/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/RequestInstrumentation.java +++ b/dd-java-agent/instrumentation/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/RequestInstrumentation.java @@ -30,7 +30,9 @@ @AutoService(InstrumenterModule.class) public final class RequestInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType, Instrumenter.HasTypeAdvice { + implements Instrumenter.ForSingleType, + Instrumenter.HasTypeAdvice, + Instrumenter.HasMethodAdvice { public RequestInstrumentation() { super("tomcat"); diff --git a/dd-java-agent/instrumentation/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/ResponseInstrumentation.java b/dd-java-agent/instrumentation/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/ResponseInstrumentation.java index 9a5714665b8..e17ad93f3c0 100644 --- a/dd-java-agent/instrumentation/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/ResponseInstrumentation.java +++ b/dd-java-agent/instrumentation/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/ResponseInstrumentation.java @@ -16,7 +16,7 @@ @AutoService(InstrumenterModule.class) public final class ResponseInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ResponseInstrumentation() { super("tomcat"); diff --git a/dd-java-agent/instrumentation/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/TomcatServerInstrumentation.java b/dd-java-agent/instrumentation/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/TomcatServerInstrumentation.java index f2e77a3f966..28acc4ec6de 100644 --- a/dd-java-agent/instrumentation/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/TomcatServerInstrumentation.java +++ b/dd-java-agent/instrumentation/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/TomcatServerInstrumentation.java @@ -33,7 +33,7 @@ @AutoService(InstrumenterModule.class) public final class TomcatServerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType, ExcludeFilterProvider { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, ExcludeFilterProvider { public TomcatServerInstrumentation() { super("tomcat"); diff --git a/dd-java-agent/instrumentation/tomcat-appsec-5.5/src/main/java/datadog/trace/instrumentation/tomcat55/CommitActionInstrumentation.java b/dd-java-agent/instrumentation/tomcat-appsec-5.5/src/main/java/datadog/trace/instrumentation/tomcat55/CommitActionInstrumentation.java index 3e3271f7970..d15a19f09dd 100644 --- a/dd-java-agent/instrumentation/tomcat-appsec-5.5/src/main/java/datadog/trace/instrumentation/tomcat55/CommitActionInstrumentation.java +++ b/dd-java-agent/instrumentation/tomcat-appsec-5.5/src/main/java/datadog/trace/instrumentation/tomcat55/CommitActionInstrumentation.java @@ -25,7 +25,7 @@ /** @see org.apache.coyote.ActionHook */ @AutoService(InstrumenterModule.class) public class CommitActionInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public CommitActionInstrumentation() { super("tomcat"); diff --git a/dd-java-agent/instrumentation/tomcat-appsec-5.5/src/main/java/datadog/trace/instrumentation/tomcat55/ParsedBodyParametersInstrumentation.java b/dd-java-agent/instrumentation/tomcat-appsec-5.5/src/main/java/datadog/trace/instrumentation/tomcat55/ParsedBodyParametersInstrumentation.java index 15c39db073e..f60b1ea524e 100644 --- a/dd-java-agent/instrumentation/tomcat-appsec-5.5/src/main/java/datadog/trace/instrumentation/tomcat55/ParsedBodyParametersInstrumentation.java +++ b/dd-java-agent/instrumentation/tomcat-appsec-5.5/src/main/java/datadog/trace/instrumentation/tomcat55/ParsedBodyParametersInstrumentation.java @@ -28,7 +28,7 @@ @AutoService(InstrumenterModule.class) public class ParsedBodyParametersInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ParsedBodyParametersInstrumentation() { super("tomcat"); diff --git a/dd-java-agent/instrumentation/tomcat-appsec-6/src/main/java/datadog/trace/instrumentation/tomcat6/ParsedBodyParametersInstrumentation.java b/dd-java-agent/instrumentation/tomcat-appsec-6/src/main/java/datadog/trace/instrumentation/tomcat6/ParsedBodyParametersInstrumentation.java index 8e0ed5db0d3..9d73b4b7a99 100644 --- a/dd-java-agent/instrumentation/tomcat-appsec-6/src/main/java/datadog/trace/instrumentation/tomcat6/ParsedBodyParametersInstrumentation.java +++ b/dd-java-agent/instrumentation/tomcat-appsec-6/src/main/java/datadog/trace/instrumentation/tomcat6/ParsedBodyParametersInstrumentation.java @@ -28,7 +28,7 @@ @AutoService(InstrumenterModule.class) public class ParsedBodyParametersInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ParsedBodyParametersInstrumentation() { super("tomcat"); diff --git a/dd-java-agent/instrumentation/tomcat-appsec-7/src/main/java/datadog/trace/instrumentation/tomcat7/CommitActionInstrumentation.java b/dd-java-agent/instrumentation/tomcat-appsec-7/src/main/java/datadog/trace/instrumentation/tomcat7/CommitActionInstrumentation.java index 808b1d98c1d..670c877ffad 100644 --- a/dd-java-agent/instrumentation/tomcat-appsec-7/src/main/java/datadog/trace/instrumentation/tomcat7/CommitActionInstrumentation.java +++ b/dd-java-agent/instrumentation/tomcat-appsec-7/src/main/java/datadog/trace/instrumentation/tomcat7/CommitActionInstrumentation.java @@ -24,7 +24,7 @@ /** @see org.apache.coyote.ActionHook */ @AutoService(InstrumenterModule.class) public class CommitActionInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public CommitActionInstrumentation() { super("tomcat"); diff --git a/dd-java-agent/instrumentation/tomcat-appsec-7/src/main/java/datadog/trace/instrumentation/tomcat7/ErrorReportValueInstrumentation.java b/dd-java-agent/instrumentation/tomcat-appsec-7/src/main/java/datadog/trace/instrumentation/tomcat7/ErrorReportValueInstrumentation.java index 40924147a1f..664121a9bea 100644 --- a/dd-java-agent/instrumentation/tomcat-appsec-7/src/main/java/datadog/trace/instrumentation/tomcat7/ErrorReportValueInstrumentation.java +++ b/dd-java-agent/instrumentation/tomcat-appsec-7/src/main/java/datadog/trace/instrumentation/tomcat7/ErrorReportValueInstrumentation.java @@ -11,7 +11,7 @@ @AutoService(InstrumenterModule.class) public class ErrorReportValueInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ErrorReportValueInstrumentation() { super("tomcat"); diff --git a/dd-java-agent/instrumentation/tomcat-appsec-7/src/main/java/datadog/trace/instrumentation/tomcat7/ParsePartsInstrumentation.java b/dd-java-agent/instrumentation/tomcat-appsec-7/src/main/java/datadog/trace/instrumentation/tomcat7/ParsePartsInstrumentation.java index bcc0376c57a..822d780a336 100644 --- a/dd-java-agent/instrumentation/tomcat-appsec-7/src/main/java/datadog/trace/instrumentation/tomcat7/ParsePartsInstrumentation.java +++ b/dd-java-agent/instrumentation/tomcat-appsec-7/src/main/java/datadog/trace/instrumentation/tomcat7/ParsePartsInstrumentation.java @@ -34,7 +34,9 @@ @AutoService(InstrumenterModule.class) public class ParsePartsInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType, Instrumenter.HasTypeAdvice { + implements Instrumenter.ForSingleType, + Instrumenter.HasTypeAdvice, + Instrumenter.HasMethodAdvice { public ParsePartsInstrumentation() { super("tomcat"); diff --git a/dd-java-agent/instrumentation/tomcat-classloading-9/src/main/java/datadog/trace/instrumentation/tomcat9/WebappClassLoaderInstrumentation.java b/dd-java-agent/instrumentation/tomcat-classloading-9/src/main/java/datadog/trace/instrumentation/tomcat9/WebappClassLoaderInstrumentation.java index 17199ce08fc..2980565bec8 100644 --- a/dd-java-agent/instrumentation/tomcat-classloading-9/src/main/java/datadog/trace/instrumentation/tomcat9/WebappClassLoaderInstrumentation.java +++ b/dd-java-agent/instrumentation/tomcat-classloading-9/src/main/java/datadog/trace/instrumentation/tomcat9/WebappClassLoaderInstrumentation.java @@ -14,7 +14,7 @@ @AutoService(InstrumenterModule.class) public class WebappClassLoaderInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public WebappClassLoaderInstrumentation() { super("tomcat", "tomcat-classloading"); } diff --git a/dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/DoNotTraceAnnotationInstrumentation.java b/dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/DoNotTraceAnnotationInstrumentation.java index 6f617872006..35ebea05e81 100644 --- a/dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/DoNotTraceAnnotationInstrumentation.java +++ b/dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/DoNotTraceAnnotationInstrumentation.java @@ -13,7 +13,7 @@ @AutoService(InstrumenterModule.class) public final class DoNotTraceAnnotationInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { @SuppressForbidden public DoNotTraceAnnotationInstrumentation() { diff --git a/dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAnnotationsInstrumentation.java b/dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAnnotationsInstrumentation.java index 98dda89e791..56b2c6dcacd 100644 --- a/dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAnnotationsInstrumentation.java +++ b/dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAnnotationsInstrumentation.java @@ -20,7 +20,7 @@ @AutoService(InstrumenterModule.class) public final class TraceAnnotationsInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { static final String CONFIG_FORMAT = "(?:\\s*[\\w.$]+\\s*;)*\\s*[\\w.$]+\\s*;?\\s*"; diff --git a/dd-java-agent/instrumentation/twilio/src/main/java/datadog/trace/instrumentation/twilio/TwilioAsyncInstrumentation.java b/dd-java-agent/instrumentation/twilio/src/main/java/datadog/trace/instrumentation/twilio/TwilioAsyncInstrumentation.java index e5e59bbc4c4..4450a976959 100644 --- a/dd-java-agent/instrumentation/twilio/src/main/java/datadog/trace/instrumentation/twilio/TwilioAsyncInstrumentation.java +++ b/dd-java-agent/instrumentation/twilio/src/main/java/datadog/trace/instrumentation/twilio/TwilioAsyncInstrumentation.java @@ -28,7 +28,7 @@ /** Instrument the Twilio SDK to identify calls as a seperate service. */ @AutoService(InstrumenterModule.class) public class TwilioAsyncInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public TwilioAsyncInstrumentation() { super("twilio-sdk"); diff --git a/dd-java-agent/instrumentation/twilio/src/main/java/datadog/trace/instrumentation/twilio/TwilioSyncInstrumentation.java b/dd-java-agent/instrumentation/twilio/src/main/java/datadog/trace/instrumentation/twilio/TwilioSyncInstrumentation.java index f600807e2a4..e4dbe7190b0 100644 --- a/dd-java-agent/instrumentation/twilio/src/main/java/datadog/trace/instrumentation/twilio/TwilioSyncInstrumentation.java +++ b/dd-java-agent/instrumentation/twilio/src/main/java/datadog/trace/instrumentation/twilio/TwilioSyncInstrumentation.java @@ -23,7 +23,7 @@ /** Instrument the Twilio SDK to identify calls as a seperate service. */ @AutoService(InstrumenterModule.class) public class TwilioSyncInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public TwilioSyncInstrumentation() { super("twilio-sdk"); diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/FormDataParserInstrumentation.java b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/FormDataParserInstrumentation.java index bbcaebaeb4b..8c837d019cf 100644 --- a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/FormDataParserInstrumentation.java +++ b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/FormDataParserInstrumentation.java @@ -27,7 +27,7 @@ @AutoService(InstrumenterModule.class) public class FormDataParserInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public FormDataParserInstrumentation() { super("undertow", "undertow-2.0"); diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/HandlerInstrumentation.java b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/HandlerInstrumentation.java index d7a959d5b72..fe8b96034a4 100644 --- a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/HandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/HandlerInstrumentation.java @@ -25,7 +25,7 @@ @AutoService(InstrumenterModule.class) public final class HandlerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public HandlerInstrumentation() { super("undertow", "undertow-2.0"); diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/HttpRequestParserInstrumentation.java b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/HttpRequestParserInstrumentation.java index d6ba6397753..b13730331ff 100644 --- a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/HttpRequestParserInstrumentation.java +++ b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/HttpRequestParserInstrumentation.java @@ -9,6 +9,7 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import com.google.auto.service.AutoService; +import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; @@ -19,7 +20,7 @@ @AutoService(InstrumenterModule.class) public class HttpRequestParserInstrumentation extends InstrumenterModule.Tracing - implements InstrumenterModule.Tracing.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public HttpRequestParserInstrumentation() { super("undertow", "undertow-2.2", "undertow-request-parse"); } diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/HttpServerExchangeSenderInstrumentation.java b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/HttpServerExchangeSenderInstrumentation.java index b34fdb39237..548b06a4767 100644 --- a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/HttpServerExchangeSenderInstrumentation.java +++ b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/HttpServerExchangeSenderInstrumentation.java @@ -19,7 +19,7 @@ @AutoService(InstrumenterModule.class) public class HttpServerExchangeSenderInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public HttpServerExchangeSenderInstrumentation() { super("undertow", "undertow-2.0"); } diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/MultiPartUploadHandlerInstrumentation.java b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/MultiPartUploadHandlerInstrumentation.java index 7990441dc2f..e405a92aa30 100644 --- a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/MultiPartUploadHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/MultiPartUploadHandlerInstrumentation.java @@ -27,7 +27,7 @@ @AutoService(InstrumenterModule.class) public class MultiPartUploadHandlerInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public MultiPartUploadHandlerInstrumentation() { super("undertow", "undertow-2.0"); diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/ServletInstrumentation.java b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/ServletInstrumentation.java index fad32d68ba6..099579db8b3 100644 --- a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/ServletInstrumentation.java +++ b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/ServletInstrumentation.java @@ -23,7 +23,7 @@ @AutoService(InstrumenterModule.class) public final class ServletInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ServletInstrumentation() { super("undertow", "undertow-2.0"); diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/UndertowInstrumentation.java b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/UndertowInstrumentation.java index 7d20cf5abb3..ea50d58230e 100644 --- a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/UndertowInstrumentation.java +++ b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/UndertowInstrumentation.java @@ -12,7 +12,7 @@ @AutoService(InstrumenterModule.class) public final class UndertowInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public UndertowInstrumentation() { super("undertow", "undertow-2.0"); diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.2/src/main/java/datadog/trace/instrumentation/undertow/JakartaServletInstrumentation.java b/dd-java-agent/instrumentation/undertow/undertow-2.2/src/main/java/datadog/trace/instrumentation/undertow/JakartaServletInstrumentation.java index b9a6d05daf5..217f6dae118 100644 --- a/dd-java-agent/instrumentation/undertow/undertow-2.2/src/main/java/datadog/trace/instrumentation/undertow/JakartaServletInstrumentation.java +++ b/dd-java-agent/instrumentation/undertow/undertow-2.2/src/main/java/datadog/trace/instrumentation/undertow/JakartaServletInstrumentation.java @@ -20,7 +20,7 @@ @AutoService(InstrumenterModule.class) public final class JakartaServletInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public JakartaServletInstrumentation() { super("undertow", "undertow-2.2"); diff --git a/dd-java-agent/instrumentation/velocity/src/main/java/datadog/trace/instrumentation/velocity/ASTReferenceInstrumentation.java b/dd-java-agent/instrumentation/velocity/src/main/java/datadog/trace/instrumentation/velocity/ASTReferenceInstrumentation.java index 74c7814ccd9..2e0b6fa98b5 100644 --- a/dd-java-agent/instrumentation/velocity/src/main/java/datadog/trace/instrumentation/velocity/ASTReferenceInstrumentation.java +++ b/dd-java-agent/instrumentation/velocity/src/main/java/datadog/trace/instrumentation/velocity/ASTReferenceInstrumentation.java @@ -17,7 +17,7 @@ @AutoService(InstrumenterModule.class) public class ASTReferenceInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public ASTReferenceInstrumentation() { super("velocity"); } diff --git a/dd-java-agent/instrumentation/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/CursorImplInstrumentation.java b/dd-java-agent/instrumentation/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/CursorImplInstrumentation.java index 397ff88818d..6afeb290963 100644 --- a/dd-java-agent/instrumentation/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/CursorImplInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/CursorImplInstrumentation.java @@ -13,7 +13,7 @@ @AutoService(InstrumenterModule.class) public class CursorImplInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public CursorImplInstrumentation() { super("vertx", "vertx-sql-client"); } diff --git a/dd-java-agent/instrumentation/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/MySQLConnectionFactoryInstrumentation.java b/dd-java-agent/instrumentation/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/MySQLConnectionFactoryInstrumentation.java index f03913825f5..1beb8e20863 100644 --- a/dd-java-agent/instrumentation/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/MySQLConnectionFactoryInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/MySQLConnectionFactoryInstrumentation.java @@ -13,7 +13,7 @@ @AutoService(InstrumenterModule.class) public class MySQLConnectionFactoryInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public MySQLConnectionFactoryInstrumentation() { super("vertx", "vertx-sql-client"); } diff --git a/dd-java-agent/instrumentation/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/MySQLConnectionImplInstrumentation.java b/dd-java-agent/instrumentation/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/MySQLConnectionImplInstrumentation.java index 2d9cc2c0454..97c95c755bb 100644 --- a/dd-java-agent/instrumentation/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/MySQLConnectionImplInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/MySQLConnectionImplInstrumentation.java @@ -13,7 +13,7 @@ @AutoService(InstrumenterModule.class) public class MySQLConnectionImplInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public MySQLConnectionImplInstrumentation() { super("vertx", "vertx-sql-client"); } diff --git a/dd-java-agent/instrumentation/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/MySQLPoolImplInstrumentation.java b/dd-java-agent/instrumentation/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/MySQLPoolImplInstrumentation.java index 3c927284852..9488ecb09c5 100644 --- a/dd-java-agent/instrumentation/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/MySQLPoolImplInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/MySQLPoolImplInstrumentation.java @@ -13,7 +13,7 @@ @AutoService(InstrumenterModule.class) public class MySQLPoolImplInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public MySQLPoolImplInstrumentation() { super("vertx", "vertx-sql-client"); } diff --git a/dd-java-agent/instrumentation/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/PreparedQueryInstrumentation.java b/dd-java-agent/instrumentation/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/PreparedQueryInstrumentation.java index ae50e938c69..ca678b659d2 100644 --- a/dd-java-agent/instrumentation/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/PreparedQueryInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/PreparedQueryInstrumentation.java @@ -19,7 +19,7 @@ @AutoService(InstrumenterModule.class) public class PreparedQueryInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public PreparedQueryInstrumentation() { super("vertx", "vertx-sql-client"); } diff --git a/dd-java-agent/instrumentation/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/PreparedStatementImplInstrumentation.java b/dd-java-agent/instrumentation/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/PreparedStatementImplInstrumentation.java index c5dee6d7b36..9da40354495 100644 --- a/dd-java-agent/instrumentation/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/PreparedStatementImplInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/PreparedStatementImplInstrumentation.java @@ -13,7 +13,7 @@ @AutoService(InstrumenterModule.class) public class PreparedStatementImplInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public PreparedStatementImplInstrumentation() { super("vertx", "vertx-sql-client"); } diff --git a/dd-java-agent/instrumentation/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/QueryImplInstrumentation.java b/dd-java-agent/instrumentation/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/QueryImplInstrumentation.java index 270a89dc8a3..d04c2afbda2 100644 --- a/dd-java-agent/instrumentation/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/QueryImplInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/QueryImplInstrumentation.java @@ -16,7 +16,7 @@ @AutoService(InstrumenterModule.class) public class QueryImplInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public QueryImplInstrumentation() { super("vertx", "vertx-sql-client"); } diff --git a/dd-java-agent/instrumentation/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/SqlClientBaseInstrumentation.java b/dd-java-agent/instrumentation/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/SqlClientBaseInstrumentation.java index ead17a9b0f9..b60abb64a93 100644 --- a/dd-java-agent/instrumentation/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/SqlClientBaseInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/SqlClientBaseInstrumentation.java @@ -15,7 +15,7 @@ @AutoService(InstrumenterModule.class) public class SqlClientBaseInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public SqlClientBaseInstrumentation() { super("vertx", "vertx-sql-client"); } diff --git a/dd-java-agent/instrumentation/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/SqlConnectionBaseInstrumentation.java b/dd-java-agent/instrumentation/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/SqlConnectionBaseInstrumentation.java index 2a369e742b3..1704d06b688 100644 --- a/dd-java-agent/instrumentation/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/SqlConnectionBaseInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/SqlConnectionBaseInstrumentation.java @@ -15,7 +15,7 @@ @AutoService(InstrumenterModule.class) public class SqlConnectionBaseInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public SqlConnectionBaseInstrumentation() { super("vertx", "vertx-sql-client"); } diff --git a/dd-java-agent/instrumentation/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/CursorImplInstrumentation.java b/dd-java-agent/instrumentation/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/CursorImplInstrumentation.java index 3a1fec8e3ad..9348c80989b 100644 --- a/dd-java-agent/instrumentation/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/CursorImplInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/CursorImplInstrumentation.java @@ -13,7 +13,7 @@ @AutoService(InstrumenterModule.class) public class CursorImplInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public CursorImplInstrumentation() { super("vertx", "vertx-sql-client"); } diff --git a/dd-java-agent/instrumentation/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/MySQLConnectionFactoryInstrumentation.java b/dd-java-agent/instrumentation/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/MySQLConnectionFactoryInstrumentation.java index dae7e897101..ade985eac0f 100644 --- a/dd-java-agent/instrumentation/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/MySQLConnectionFactoryInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/MySQLConnectionFactoryInstrumentation.java @@ -14,7 +14,7 @@ @AutoService(InstrumenterModule.class) public class MySQLConnectionFactoryInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public MySQLConnectionFactoryInstrumentation() { super("vertx", "vertx-sql-client"); } diff --git a/dd-java-agent/instrumentation/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/MySQLConnectionImplInstrumentation.java b/dd-java-agent/instrumentation/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/MySQLConnectionImplInstrumentation.java index 697d833f291..c964deed6b9 100644 --- a/dd-java-agent/instrumentation/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/MySQLConnectionImplInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/MySQLConnectionImplInstrumentation.java @@ -13,7 +13,7 @@ @AutoService(InstrumenterModule.class) public class MySQLConnectionImplInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public MySQLConnectionImplInstrumentation() { super("vertx", "vertx-sql-client"); } diff --git a/dd-java-agent/instrumentation/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/MySQLPoolImplInstrumentation.java b/dd-java-agent/instrumentation/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/MySQLPoolImplInstrumentation.java index ef28e242e6d..539778dc188 100644 --- a/dd-java-agent/instrumentation/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/MySQLPoolImplInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/MySQLPoolImplInstrumentation.java @@ -16,7 +16,7 @@ @AutoService(InstrumenterModule.class) public class MySQLPoolImplInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public MySQLPoolImplInstrumentation() { super("vertx", "vertx-sql-client"); } diff --git a/dd-java-agent/instrumentation/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/PreparedQueryInstrumentation.java b/dd-java-agent/instrumentation/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/PreparedQueryInstrumentation.java index 3f1b205da14..b7843ccdf89 100644 --- a/dd-java-agent/instrumentation/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/PreparedQueryInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/PreparedQueryInstrumentation.java @@ -19,7 +19,7 @@ @AutoService(InstrumenterModule.class) public class PreparedQueryInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public PreparedQueryInstrumentation() { super("vertx", "vertx-sql-client"); } diff --git a/dd-java-agent/instrumentation/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/PreparedStatementImplInstrumentation.java b/dd-java-agent/instrumentation/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/PreparedStatementImplInstrumentation.java index 7eb5b8e857f..5baad44c748 100644 --- a/dd-java-agent/instrumentation/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/PreparedStatementImplInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/PreparedStatementImplInstrumentation.java @@ -13,7 +13,7 @@ @AutoService(InstrumenterModule.class) public class PreparedStatementImplInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public PreparedStatementImplInstrumentation() { super("vertx", "vertx-sql-client"); } diff --git a/dd-java-agent/instrumentation/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/QueryImplInstrumentation.java b/dd-java-agent/instrumentation/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/QueryImplInstrumentation.java index f6d19ad2a68..b911e24d68d 100644 --- a/dd-java-agent/instrumentation/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/QueryImplInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/QueryImplInstrumentation.java @@ -16,7 +16,7 @@ @AutoService(InstrumenterModule.class) public class QueryImplInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public QueryImplInstrumentation() { super("vertx", "vertx-sql-client"); } diff --git a/dd-java-agent/instrumentation/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/SqlClientBaseInstrumentation.java b/dd-java-agent/instrumentation/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/SqlClientBaseInstrumentation.java index 22bba9ce244..920a8bfe375 100644 --- a/dd-java-agent/instrumentation/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/SqlClientBaseInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/SqlClientBaseInstrumentation.java @@ -15,7 +15,7 @@ @AutoService(InstrumenterModule.class) public class SqlClientBaseInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public SqlClientBaseInstrumentation() { super("vertx", "vertx-sql-client"); } diff --git a/dd-java-agent/instrumentation/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/SqlConnectionBaseInstrumentation.java b/dd-java-agent/instrumentation/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/SqlConnectionBaseInstrumentation.java index 0f8b94491bc..86b4f7a4bab 100644 --- a/dd-java-agent/instrumentation/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/SqlConnectionBaseInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/SqlConnectionBaseInstrumentation.java @@ -15,7 +15,7 @@ @AutoService(InstrumenterModule.class) public class SqlConnectionBaseInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public SqlConnectionBaseInstrumentation() { super("vertx", "vertx-sql-client"); } diff --git a/dd-java-agent/instrumentation/vertx-mysql-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4_4_2/MySQLConnectionFactoryInstrumentation.java b/dd-java-agent/instrumentation/vertx-mysql-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4_4_2/MySQLConnectionFactoryInstrumentation.java index f0efc15b0d1..b664d8274c7 100644 --- a/dd-java-agent/instrumentation/vertx-mysql-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4_4_2/MySQLConnectionFactoryInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-mysql-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4_4_2/MySQLConnectionFactoryInstrumentation.java @@ -14,7 +14,7 @@ @AutoService(InstrumenterModule.class) public class MySQLConnectionFactoryInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public MySQLConnectionFactoryInstrumentation() { super("vertx", "vertx-sql-client"); } diff --git a/dd-java-agent/instrumentation/vertx-mysql-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4_4_2/MySQLDriverInstrumentation.java b/dd-java-agent/instrumentation/vertx-mysql-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4_4_2/MySQLDriverInstrumentation.java index 68641f90ca5..3c2c971a37a 100644 --- a/dd-java-agent/instrumentation/vertx-mysql-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4_4_2/MySQLDriverInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-mysql-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4_4_2/MySQLDriverInstrumentation.java @@ -14,7 +14,7 @@ @AutoService(InstrumenterModule.class) public class MySQLDriverInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public MySQLDriverInstrumentation() { super("vertx", "vertx-sql-client"); diff --git a/dd-java-agent/instrumentation/vertx-mysql-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4_4_2/SqlConnectionBaseInstrumentation.java b/dd-java-agent/instrumentation/vertx-mysql-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4_4_2/SqlConnectionBaseInstrumentation.java index d9933dc829f..bbb60580c56 100644 --- a/dd-java-agent/instrumentation/vertx-mysql-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4_4_2/SqlConnectionBaseInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-mysql-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4_4_2/SqlConnectionBaseInstrumentation.java @@ -14,7 +14,7 @@ @AutoService(InstrumenterModule.class) public class SqlConnectionBaseInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public SqlConnectionBaseInstrumentation() { super("vertx", "vertx-sql-client"); } diff --git a/dd-java-agent/instrumentation/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/CommandImplInstrumentation.java b/dd-java-agent/instrumentation/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/CommandImplInstrumentation.java index 64c69648b7e..5db97a4250f 100644 --- a/dd-java-agent/instrumentation/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/CommandImplInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/CommandImplInstrumentation.java @@ -13,7 +13,7 @@ @AutoService(InstrumenterModule.class) public class CommandImplInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public CommandImplInstrumentation() { super("vertx", "vertx-redis-client"); } diff --git a/dd-java-agent/instrumentation/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisAPIInstrumentation.java b/dd-java-agent/instrumentation/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisAPIInstrumentation.java index 82c55436a5c..f1833dabfc5 100644 --- a/dd-java-agent/instrumentation/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisAPIInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisAPIInstrumentation.java @@ -14,7 +14,7 @@ @AutoService(InstrumenterModule.class) public class RedisAPIInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public RedisAPIInstrumentation() { super("vertx", "vertx-redis-client"); } diff --git a/dd-java-agent/instrumentation/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisInstrumentation.java b/dd-java-agent/instrumentation/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisInstrumentation.java index c63f6051ac0..fef6e1da6c0 100644 --- a/dd-java-agent/instrumentation/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisInstrumentation.java @@ -19,7 +19,7 @@ @AutoService(InstrumenterModule.class) public class RedisInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public RedisInstrumentation() { super("vertx", "vertx-redis-client"); } diff --git a/dd-java-agent/instrumentation/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RequestImplInstrumentation.java b/dd-java-agent/instrumentation/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RequestImplInstrumentation.java index 05fc99e4c1e..8ef3502d257 100644 --- a/dd-java-agent/instrumentation/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RequestImplInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RequestImplInstrumentation.java @@ -20,7 +20,9 @@ @AutoService(InstrumenterModule.class) public class RequestImplInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType, Instrumenter.HasTypeAdvice { + implements Instrumenter.ForSingleType, + Instrumenter.HasTypeAdvice, + Instrumenter.HasMethodAdvice { public RequestImplInstrumentation() { super("vertx", "vertx-redis-client"); } diff --git a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/AbstractHttpServerRequestInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/AbstractHttpServerRequestInstrumentation.java index c647a4e1020..38b205ab955 100644 --- a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/AbstractHttpServerRequestInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/AbstractHttpServerRequestInstrumentation.java @@ -26,7 +26,7 @@ import net.bytebuddy.matcher.ElementMatcher; public abstract class AbstractHttpServerRequestInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { private final String className = AbstractHttpServerRequestInstrumentation.class.getName(); diff --git a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/BufferInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/BufferInstrumentation.java index 1d757db9a54..ae7ef68c05d 100644 --- a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/BufferInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/BufferInstrumentation.java @@ -21,7 +21,9 @@ /** Propagation is way easier in io.vertx.core.buffer.impl.BufferImpl than in io.netty.Buffer */ @AutoService(InstrumenterModule.class) public class BufferInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType, Instrumenter.HasTypeAdvice { + implements Instrumenter.ForSingleType, + Instrumenter.HasTypeAdvice, + Instrumenter.HasMethodAdvice { private final String className = BufferInstrumentation.class.getName(); diff --git a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/CaseInsensitiveHeadersInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/CaseInsensitiveHeadersInstrumentation.java index 814985fcec0..c663a957d3e 100644 --- a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/CaseInsensitiveHeadersInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/CaseInsensitiveHeadersInstrumentation.java @@ -32,7 +32,9 @@ @AutoService(InstrumenterModule.class) public class CaseInsensitiveHeadersInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType, Instrumenter.HasTypeAdvice { + implements Instrumenter.ForSingleType, + Instrumenter.HasTypeAdvice, + Instrumenter.HasMethodAdvice { private final String className = CaseInsensitiveHeadersInstrumentation.class.getName(); diff --git a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/HeadersAdaptorInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/HeadersAdaptorInstrumentation.java index 7ede6c65d4a..90aae45ae86 100644 --- a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/HeadersAdaptorInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/HeadersAdaptorInstrumentation.java @@ -30,7 +30,9 @@ @AutoService(InstrumenterModule.class) public class HeadersAdaptorInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForKnownTypes, Instrumenter.HasTypeAdvice { + implements Instrumenter.ForKnownTypes, + Instrumenter.HasTypeAdvice, + Instrumenter.HasMethodAdvice { private final String className = HeadersAdaptorInstrumentation.class.getName(); diff --git a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/CookieImplInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/CookieImplInstrumentation.java index 805d5b3f049..04f46384a4a 100644 --- a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/CookieImplInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/CookieImplInstrumentation.java @@ -25,7 +25,9 @@ @AutoService(InstrumenterModule.class) public class CookieImplInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType, Instrumenter.HasTypeAdvice { + implements Instrumenter.ForSingleType, + Instrumenter.HasTypeAdvice, + Instrumenter.HasMethodAdvice { private final String className = CookieImplInstrumentation.class.getName(); diff --git a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/HttpServerRequestInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/HttpServerRequestInstrumentation.java index 4e45b66c5d0..ecc25db441f 100644 --- a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/HttpServerRequestInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/HttpServerRequestInstrumentation.java @@ -18,7 +18,7 @@ @AutoService(InstrumenterModule.class) public class HttpServerRequestInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public HttpServerRequestInstrumentation() { super("vertx", "vertx-3.4"); } diff --git a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/HttpServerResponseEndHandlerInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/HttpServerResponseEndHandlerInstrumentation.java index dde45df396e..28aa02442ff 100644 --- a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/HttpServerResponseEndHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/HttpServerResponseEndHandlerInstrumentation.java @@ -11,7 +11,7 @@ @AutoService(InstrumenterModule.class) public class HttpServerResponseEndHandlerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public HttpServerResponseEndHandlerInstrumentation() { super("vertx", "vertx-3.4"); } diff --git a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/HttpServerResponseInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/HttpServerResponseInstrumentation.java index 3c7a67a58c2..cdfcb9e583b 100644 --- a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/HttpServerResponseInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/HttpServerResponseInstrumentation.java @@ -20,7 +20,7 @@ @AutoService(InstrumenterModule.class) public class HttpServerResponseInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { @Override public Reference[] additionalMuzzleReferences() { return new Reference[] {PARSABLE_HEADER_VALUE, VIRTUAL_HOST_HANDLER}; diff --git a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/IastRoutingContextImplInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/IastRoutingContextImplInstrumentation.java index a7228fb20c8..d159408d56a 100644 --- a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/IastRoutingContextImplInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/IastRoutingContextImplInstrumentation.java @@ -27,7 +27,7 @@ @AutoService(InstrumenterModule.class) public class IastRoutingContextImplInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { private final String className = IastRoutingContextImplInstrumentation.class.getName(); diff --git a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteHandlerInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteHandlerInstrumentation.java index 220e9701077..6e4c5445d7d 100644 --- a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteHandlerInstrumentation.java @@ -12,7 +12,7 @@ @AutoService(InstrumenterModule.class) public class RouteHandlerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public RouteHandlerInstrumentation() { super("vertx", "vertx-3.4"); } diff --git a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteImplInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteImplInstrumentation.java index 8a8b22c7f93..4de2a5d6995 100644 --- a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteImplInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteImplInstrumentation.java @@ -18,9 +18,7 @@ @AutoService(InstrumenterModule.class) public class RouteImplInstrumentation extends InstrumenterModule - implements Instrumenter.ForKnownTypes, - Instrumenter.HasMethodAdvice, - Instrumenter.WithPostProcessor { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { private Advice.PostProcessor.Factory postProcessorFactory; diff --git a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RoutingContextImplInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RoutingContextImplInstrumentation.java index c25647aed74..4c9b1d1a6fc 100644 --- a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RoutingContextImplInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RoutingContextImplInstrumentation.java @@ -12,7 +12,7 @@ @AutoService(InstrumenterModule.class) public class RoutingContextImplInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public RoutingContextImplInstrumentation() { super("vertx", "vertx-3.4"); diff --git a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/VertxImplInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/VertxImplInstrumentation.java index 0556e800b8e..58a0c4da90c 100644 --- a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/VertxImplInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/VertxImplInstrumentation.java @@ -15,7 +15,7 @@ @AutoService(InstrumenterModule.class) public class VertxImplInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public VertxImplInstrumentation() { super("vertx", "vertx-3.4"); } diff --git a/dd-java-agent/instrumentation/vertx-web-3.5/src/main/java/datadog/trace/instrumentation/vertx_3_5/core/VertxHttpHeadersInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-3.5/src/main/java/datadog/trace/instrumentation/vertx_3_5/core/VertxHttpHeadersInstrumentation.java index d5c3c4c957d..c6dfcc37c37 100644 --- a/dd-java-agent/instrumentation/vertx-web-3.5/src/main/java/datadog/trace/instrumentation/vertx_3_5/core/VertxHttpHeadersInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-web-3.5/src/main/java/datadog/trace/instrumentation/vertx_3_5/core/VertxHttpHeadersInstrumentation.java @@ -29,7 +29,9 @@ @AutoService(InstrumenterModule.class) public class VertxHttpHeadersInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType, Instrumenter.HasTypeAdvice { + implements Instrumenter.ForSingleType, + Instrumenter.HasTypeAdvice, + Instrumenter.HasMethodAdvice { public static final Reference VERTX_HTTP_HEADERS = new Reference.Builder("io.vertx.core.http.impl.headers.VertxHttpHeaders").build(); diff --git a/dd-java-agent/instrumentation/vertx-web-3.9/src/main/java/datadog/trace/instrumentation/vertx_3_9/Vertx39HttpServertResponseInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-3.9/src/main/java/datadog/trace/instrumentation/vertx_3_9/Vertx39HttpServertResponseInstrumentation.java index ba7ff61a07a..251f46d4123 100644 --- a/dd-java-agent/instrumentation/vertx-web-3.9/src/main/java/datadog/trace/instrumentation/vertx_3_9/Vertx39HttpServertResponseInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-web-3.9/src/main/java/datadog/trace/instrumentation/vertx_3_9/Vertx39HttpServertResponseInstrumentation.java @@ -19,7 +19,7 @@ @AutoService(InstrumenterModule.class) public class Vertx39HttpServertResponseInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public Vertx39HttpServertResponseInstrumentation() { super("vertx", "vertx-3.9", "response"); } diff --git a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/client/HttpClientRequestBaseInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/client/HttpClientRequestBaseInstrumentation.java index 4fec246e113..527702d4e6b 100644 --- a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/client/HttpClientRequestBaseInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/client/HttpClientRequestBaseInstrumentation.java @@ -18,7 +18,7 @@ @AutoService(InstrumenterModule.class) public class HttpClientRequestBaseInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { static final String[] CONCRETE_TYPES = { "io.vertx.core.http.impl.HttpClientRequestImpl", "io.vertx.core.http.impl.HttpClientRequestPushPromise" diff --git a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/AbstractHttpServerRequestInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/AbstractHttpServerRequestInstrumentation.java index 0aea98c6435..5621d3a7412 100644 --- a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/AbstractHttpServerRequestInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/AbstractHttpServerRequestInstrumentation.java @@ -11,6 +11,7 @@ import datadog.trace.advice.ActiveRequestContext; import datadog.trace.advice.RequiresRequestContext; +import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; import datadog.trace.agent.tooling.muzzle.Reference; import datadog.trace.api.gateway.RequestContext; @@ -25,7 +26,8 @@ import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; -public abstract class AbstractHttpServerRequestInstrumentation extends InstrumenterModule.Iast { +public abstract class AbstractHttpServerRequestInstrumentation extends InstrumenterModule.Iast + implements Instrumenter.HasMethodAdvice { private final String className = AbstractHttpServerRequestInstrumentation.class.getName(); diff --git a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/BufferInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/BufferInstrumentation.java index 8bb3ab4b142..1f0bbe17613 100644 --- a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/BufferInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/BufferInstrumentation.java @@ -20,7 +20,9 @@ /** Propagation is way easier in io.vertx.core.buffer.impl.BufferImpl than in io.netty.Buffer */ @AutoService(InstrumenterModule.class) public class BufferInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType, Instrumenter.HasTypeAdvice { + implements Instrumenter.ForSingleType, + Instrumenter.HasTypeAdvice, + Instrumenter.HasMethodAdvice { private final String className = BufferInstrumentation.class.getName(); diff --git a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/Http1xServerRequestInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/Http1xServerRequestInstrumentation.java index 7601c167aff..088d209781b 100644 --- a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/Http1xServerRequestInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/Http1xServerRequestInstrumentation.java @@ -11,7 +11,7 @@ @AutoService(InstrumenterModule.class) public class Http1xServerRequestInstrumentation extends AbstractHttpServerRequestInstrumentation - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { @Override protected ElementMatcher.Junction attributesFilter() { diff --git a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/Http2ServerRequestInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/Http2ServerRequestInstrumentation.java index b1f96e3c2b7..4d1fbb9ad82 100644 --- a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/Http2ServerRequestInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/Http2ServerRequestInstrumentation.java @@ -11,7 +11,7 @@ @AutoService(InstrumenterModule.class) public class Http2ServerRequestInstrumentation extends AbstractHttpServerRequestInstrumentation - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { @Override protected ElementMatcher.Junction attributesFilter() { diff --git a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/HttpServerResponseInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/HttpServerResponseInstrumentation.java index 74af680d244..6f974350d96 100644 --- a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/HttpServerResponseInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/HttpServerResponseInstrumentation.java @@ -17,7 +17,7 @@ @AutoService(InstrumenterModule.class) public class HttpServerResponseInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { @Override public Reference[] additionalMuzzleReferences() { return new Reference[] {HTTP_1X_SERVER_RESPONSE}; diff --git a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/MultiMapInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/MultiMapInstrumentation.java index 44e780298ea..75cf8e1e83c 100644 --- a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/MultiMapInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/MultiMapInstrumentation.java @@ -30,7 +30,7 @@ import net.bytebuddy.matcher.ElementMatcher; public abstract class MultiMapInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.HasTypeAdvice { + implements Instrumenter.HasTypeAdvice, Instrumenter.HasMethodAdvice { private final String className = MultiMapInstrumentation.class.getName(); diff --git a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/CookieImplInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/CookieImplInstrumentation.java index b391d49ad7a..9fd9d4540d5 100644 --- a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/CookieImplInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/CookieImplInstrumentation.java @@ -24,7 +24,9 @@ @AutoService(InstrumenterModule.class) public class CookieImplInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType, Instrumenter.HasTypeAdvice { + implements Instrumenter.ForSingleType, + Instrumenter.HasTypeAdvice, + Instrumenter.HasMethodAdvice { private final String className = CookieImplInstrumentation.class.getName(); diff --git a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/HttpServerRequestInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/HttpServerRequestInstrumentation.java index 005f36ce518..c3be94a8492 100644 --- a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/HttpServerRequestInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/HttpServerRequestInstrumentation.java @@ -16,7 +16,7 @@ @AutoService(InstrumenterModule.class) public class HttpServerRequestInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public HttpServerRequestInstrumentation() { super("vertx", "vertx-4.0"); } diff --git a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/HttpServerResponseEndHandlerInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/HttpServerResponseEndHandlerInstrumentation.java index 8ebb60c407d..a9860531a15 100644 --- a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/HttpServerResponseEndHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/HttpServerResponseEndHandlerInstrumentation.java @@ -12,7 +12,7 @@ @AutoService(InstrumenterModule.class) public class HttpServerResponseEndHandlerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForKnownTypes { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { public HttpServerResponseEndHandlerInstrumentation() { super("vertx", "vertx-4.0"); } diff --git a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/IastRoutingContextImplInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/IastRoutingContextImplInstrumentation.java index 47261cd1e52..7bbc0f393c6 100644 --- a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/IastRoutingContextImplInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/IastRoutingContextImplInstrumentation.java @@ -19,7 +19,7 @@ */ @AutoService(InstrumenterModule.class) public class IastRoutingContextImplInstrumentation extends InstrumenterModule.Iast - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public IastRoutingContextImplInstrumentation() { super("vertx", "vertx-4.0"); diff --git a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteHandlerInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteHandlerInstrumentation.java index 4f7903c0a92..6d31efd5fe2 100644 --- a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteHandlerInstrumentation.java @@ -13,7 +13,7 @@ @AutoService(InstrumenterModule.class) public class RouteHandlerInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public RouteHandlerInstrumentation() { super("vertx", "vertx-4.0"); } diff --git a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteImplInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteImplInstrumentation.java index c0289bdb665..a2041f43264 100644 --- a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteImplInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteImplInstrumentation.java @@ -16,9 +16,7 @@ @AutoService(InstrumenterModule.class) public class RouteImplInstrumentation extends InstrumenterModule - implements Instrumenter.ForKnownTypes, - Instrumenter.HasMethodAdvice, - Instrumenter.WithPostProcessor { + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { private Advice.PostProcessor.Factory postProcessorFactory; diff --git a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RoutingContextImplInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RoutingContextImplInstrumentation.java index ffaa0bf10bb..5306e71bf85 100644 --- a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RoutingContextImplInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RoutingContextImplInstrumentation.java @@ -16,7 +16,7 @@ */ @AutoService(InstrumenterModule.class) public class RoutingContextImplInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public RoutingContextImplInstrumentation() { super("vertx", "vertx-4.0"); diff --git a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/VertxHandlerInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/VertxHandlerInstrumentation.java index d3580d6e0b0..0f562ae3b51 100644 --- a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/VertxHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/VertxHandlerInstrumentation.java @@ -19,7 +19,7 @@ // HttpServerRequestInstrumentation/BlockingExceptionHandler @AutoService(InstrumenterModule.class) public class VertxHandlerInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public VertxHandlerInstrumentation() { super("vertx", "vertx-4.0"); } diff --git a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/VertxImplInstrumentation.java b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/VertxImplInstrumentation.java index 6c9e18e2392..eaac9c36086 100644 --- a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/VertxImplInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/VertxImplInstrumentation.java @@ -16,7 +16,7 @@ @AutoService(InstrumenterModule.class) public class VertxImplInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public VertxImplInstrumentation() { super("vertx", "vertx-4.0"); } diff --git a/dd-java-agent/instrumentation/websphere-jmx/src/main/java/datadog/trace/instrumentation/websphere_jmx/WebsphereSecurityInstrumentation.java b/dd-java-agent/instrumentation/websphere-jmx/src/main/java/datadog/trace/instrumentation/websphere_jmx/WebsphereSecurityInstrumentation.java index 0bc0c40d393..d7c6088122e 100644 --- a/dd-java-agent/instrumentation/websphere-jmx/src/main/java/datadog/trace/instrumentation/websphere_jmx/WebsphereSecurityInstrumentation.java +++ b/dd-java-agent/instrumentation/websphere-jmx/src/main/java/datadog/trace/instrumentation/websphere_jmx/WebsphereSecurityInstrumentation.java @@ -17,7 +17,7 @@ */ @AutoService(InstrumenterModule.class) public class WebsphereSecurityInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { private final String customBuilder; diff --git a/dd-java-agent/instrumentation/zio/zio-2.0/src/main/java/datadog/trace/instrumentation/zio/v2_0/ZioRuntimeInstrumentation.java b/dd-java-agent/instrumentation/zio/zio-2.0/src/main/java/datadog/trace/instrumentation/zio/v2_0/ZioRuntimeInstrumentation.java index 2850036f3f4..77766c62295 100644 --- a/dd-java-agent/instrumentation/zio/zio-2.0/src/main/java/datadog/trace/instrumentation/zio/v2_0/ZioRuntimeInstrumentation.java +++ b/dd-java-agent/instrumentation/zio/zio-2.0/src/main/java/datadog/trace/instrumentation/zio/v2_0/ZioRuntimeInstrumentation.java @@ -20,7 +20,7 @@ @AutoService(InstrumenterModule.class) public class ZioRuntimeInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType, ExcludeFilterProvider { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, ExcludeFilterProvider { public ZioRuntimeInstrumentation() { super("zio.experimental"); diff --git a/dd-java-agent/testing/src/test/java/IBMResourceLevelInstrumentation.java b/dd-java-agent/testing/src/test/java/IBMResourceLevelInstrumentation.java index 6f0634688c2..6d8fe483c01 100644 --- a/dd-java-agent/testing/src/test/java/IBMResourceLevelInstrumentation.java +++ b/dd-java-agent/testing/src/test/java/IBMResourceLevelInstrumentation.java @@ -7,7 +7,7 @@ @AutoService(InstrumenterModule.class) public class IBMResourceLevelInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public IBMResourceLevelInstrumentation() { super(IBMResourceLevelInstrumentation.class.getName()); } diff --git a/dd-java-agent/testing/src/test/java/context/FieldInjectionTestInstrumentation.java b/dd-java-agent/testing/src/test/java/context/FieldInjectionTestInstrumentation.java index da86f364474..192ac18e374 100644 --- a/dd-java-agent/testing/src/test/java/context/FieldInjectionTestInstrumentation.java +++ b/dd-java-agent/testing/src/test/java/context/FieldInjectionTestInstrumentation.java @@ -17,7 +17,7 @@ @AutoService(InstrumenterModule.class) public class FieldInjectionTestInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForTypeHierarchy { + implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { public FieldInjectionTestInstrumentation() { super("fieldinjection-test"); } diff --git a/dd-java-agent/testing/src/test/java/excludefilter/ExcludeFilterTestInstrumentation.java b/dd-java-agent/testing/src/test/java/excludefilter/ExcludeFilterTestInstrumentation.java index e8905a70739..f4e02247616 100644 --- a/dd-java-agent/testing/src/test/java/excludefilter/ExcludeFilterTestInstrumentation.java +++ b/dd-java-agent/testing/src/test/java/excludefilter/ExcludeFilterTestInstrumentation.java @@ -22,9 +22,6 @@ public ExcludeFilterTestInstrumentation() { super("excludefilter-test"); } - @Override - public void methodAdvice(MethodTransformer transformer) {} - @Override public Map contextStore() { Map contextStores = new HashMap<>(); diff --git a/dd-java-agent/testing/src/test/java/synthetic/SyntheticTestInstrumentation.java b/dd-java-agent/testing/src/test/java/synthetic/SyntheticTestInstrumentation.java index 903149c1c83..201ab59be68 100644 --- a/dd-java-agent/testing/src/test/java/synthetic/SyntheticTestInstrumentation.java +++ b/dd-java-agent/testing/src/test/java/synthetic/SyntheticTestInstrumentation.java @@ -12,7 +12,7 @@ @AutoService(InstrumenterModule.class) public class SyntheticTestInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public SyntheticTestInstrumentation() { super("synthetic-test");