Move HasMethodAdvice aspect to instrumentations, away from modules

DataDog · Dec 31, 2024 · 61fb7f5 · 61fb7f5
1 parent c99c2c2
commit 61fb7f5
Show file tree

Hide file tree

Showing 751 changed files with 902 additions and 782 deletions.
diff --git a/...ava-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterModule.java b/...ava-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterModule.java
@@ -191,7 +191,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 +203,7 @@ public boolean isApplicable(Set<TargetSystem> 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 +222,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 +235,7 @@ public boolean isApplicable(Set<TargetSystem> 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 implements WithPostProcessor {
     public Iast(String instrumentationName, String... additionalNames) {
       super(instrumentationName, additionalNames);
     }
@@ -291,7 +290,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 +302,7 @@ public boolean isApplicable(Set<TargetSystem> 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/...rc/main/java/datadog/trace/instrumentation/aerospike4/AerospikeClientInstrumentation.java b/...rc/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/...pike-4/src/main/java/datadog/trace/instrumentation/aerospike4/CommandInstrumentation.java b/...pike-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/...4/src/main/java/datadog/trace/instrumentation/aerospike4/NioEventLoopInstrumentation.java b/...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/...ke-4/src/main/java/datadog/trace/instrumentation/aerospike4/PartitionInstrumentation.java b/...ke-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/...main/java/datadog/trace/instrumentation/akka/concurrent/AkkaActorCellInstrumentation.java b/...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/.../main/java/datadog/trace/instrumentation/akka/concurrent/AkkaEnvelopeInstrumentation.java b/.../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/...atadog/trace/instrumentation/akka/concurrent/AkkaForkJoinExecutorTaskInstrumentation.java b/...atadog/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/...n/java/datadog/trace/instrumentation/akka/concurrent/AkkaForkJoinPoolInstrumentation.java b/...n/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/...n/java/datadog/trace/instrumentation/akka/concurrent/AkkaForkJoinTaskInstrumentation.java b/...n/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/...c/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaMailboxInstrumentation.java b/...c/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/...ava/datadog/trace/instrumentation/akka/concurrent/AkkaRoutedActorCellInstrumentation.java b/...ava/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/.../src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttp2ServerInstrumentation.java b/.../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/...0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpServerInstrumentation.java b/...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/...ain/java/datadog/trace/instrumentation/akkahttp/AkkaHttpSingleRequestInstrumentation.java b/...ain/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/.../main/java/datadog/trace/instrumentation/akkahttp/AkkaPoolMasterActorInstrumentation.java b/.../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/...n/java/datadog/trace/instrumentation/akkahttp/DefaultExceptionHandlerInstrumentation.java b/...n/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/...0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/Bug4304Instrumentation.java b/...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/...race/instrumentation/akkahttp/appsec/ConfigProvideRemoteAddressHeaderInstrumentation.java b/...race/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/...n/java/datadog/trace/instrumentation/akkahttp/appsec/FormDataToStrictInstrumentation.java b/...n/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/...ava/datadog/trace/instrumentation/akkahttp/appsec/JacksonUnmarshallerInstrumentation.java b/...ava/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/.../datadog/trace/instrumentation/akkahttp/appsec/MultipartUnmarshallersInstrumentation.java b/.../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/...ace/instrumentation/akkahttp/appsec/PredefinedFromEntityUnmarshallersInstrumentation.java b/...ace/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/.../java/datadog/trace/instrumentation/akkahttp/appsec/SprayUnmarshallerInstrumentation.java b/.../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/...ava/datadog/trace/instrumentation/akkahttp/appsec/StrictFormCompanionInstrumentation.java b/...ava/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/...ain/java/datadog/trace/instrumentation/akkahttp/iast/CookieDirectivesInstrumentation.java b/...ain/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/...rc/main/java/datadog/trace/instrumentation/akkahttp/iast/CookieHeaderInstrumentation.java b/...rc/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/...in/java/datadog/trace/instrumentation/akkahttp/iast/ExtractDirectivesInstrumentation.java b/...in/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/....0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/FormDataInstrumentation.java b/....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/.../java/datadog/trace/instrumentation/akkahttp/iast/FormFieldDirectivesInstrumentation.java b/.../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/...java/datadog/trace/instrumentation/akkahttp/iast/HttpHeaderSubclassesInstrumentation.java b/...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/...src/main/java/datadog/trace/instrumentation/akkahttp/iast/HttpRequestInstrumentation.java b/...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/...c/main/java/datadog/trace/instrumentation/akkahttp/iast/MakeTaintableInstrumentation.java b/...c/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/...ava/datadog/trace/instrumentation/akkahttp/iast/MarshallingDirectivesInstrumentation.java b/...ava/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/.../java/datadog/trace/instrumentation/akkahttp/iast/ParameterDirectivesInstrumentation.java b/.../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/...src/main/java/datadog/trace/instrumentation/akkahttp/iast/PathMatcherInstrumentation.java b/...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/.../main/java/datadog/trace/instrumentation/akkahttp/iast/RequestContextInstrumentation.java b/.../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/...rc/main/java/datadog/trace/instrumentation/akkahttp/iast/UnmarshallerInstrumentation.java b/...rc/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/...tp-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/UriInstrumentation.java b/...tp-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");
   }