From 43487fcfb5377e1ad89a871deea224d207ff760b Mon Sep 17 00:00:00 2001
From: Laplie Anderson <laplie.anderson@datadoghq.com>
Date: Wed, 19 Feb 2020 21:21:29 -0500
Subject: [PATCH] Fix the logic

---
 .../datadog/trace/agent/tooling/ByteBuddyElementMatchers.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 d08ed046c0..847975681b 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
@@ -119,7 +119,8 @@ public class ByteBuddyElementMatchers {
       // in {@code getSuperClass} calls
       TypeDefinition typeDefinition = target;
       while (typeDefinition != null) {
-        if ((!interfacesOnly && matcher.matches(typeDefinition.asGenericType()))
+        if (((!interfacesOnly || typeDefinition.isInterface())
+                && matcher.matches(typeDefinition.asGenericType()))
             || hasInterface(typeDefinition, checkedInterfaces)) {
           return true;
         }