diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/ByteBuddyElementMatchers.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/ByteBuddyElementMatchers.java index 6dbaa8e594..b94a19e4ab 100644 --- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/ByteBuddyElementMatchers.java +++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/ByteBuddyElementMatchers.java @@ -328,9 +328,8 @@ public class ByteBuddyElementMatchers { final Set checkedInterfaces = new HashSet<>(); while (declaringType != null) { - for (final MethodDescription methodDescription : - declaringType.getDeclaredMethods().filter(signatureMatcher)) { - if (matcher.matches(methodDescription)) { + for (final MethodDescription methodDescription : declaringType.getDeclaredMethods()) { + if (signatureMatcher.matches(methodDescription) && matcher.matches(methodDescription)) { return true; } } @@ -349,9 +348,8 @@ public class ByteBuddyElementMatchers { for (final TypeDefinition type : interfaces) { if (!checkedInterfaces.contains(type)) { checkedInterfaces.add(type); - for (final MethodDescription methodDescription : - type.getDeclaredMethods().filter(signatureMatcher)) { - if (matcher.matches(methodDescription)) { + for (final MethodDescription methodDescription : type.getDeclaredMethods()) { + if (signatureMatcher.matches(methodDescription) && matcher.matches(methodDescription)) { return true; } }