From 8971040a4545b43865e2f9f9f78478558291a35c Mon Sep 17 00:00:00 2001
From: Laplie Anderson <laplie.anderson@datadoghq.com>
Date: Thu, 17 Oct 2019 13:42:38 -0400
Subject: [PATCH] Supertypes are not always available.  Only check the current
 class for decorator

---
 .../java/datadog/trace/agent/tooling/AgentInstaller.java     | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java
index cb9d890882..036f8acc6c 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java
@@ -1,9 +1,8 @@
 package datadog.trace.agent.tooling;
 
 import static datadog.trace.agent.tooling.ClassLoaderMatcher.skipClassLoader;
-import static net.bytebuddy.matcher.ElementMatchers.annotationType;
 import static net.bytebuddy.matcher.ElementMatchers.any;
-import static net.bytebuddy.matcher.ElementMatchers.hasAnnotation;
+import static net.bytebuddy.matcher.ElementMatchers.isAnnotatedWith;
 import static net.bytebuddy.matcher.ElementMatchers.nameContains;
 import static net.bytebuddy.matcher.ElementMatchers.nameMatches;
 import static net.bytebuddy.matcher.ElementMatchers.nameStartsWith;
@@ -132,7 +131,7 @@ public class AgentInstaller {
             .or(nameContains("javassist"))
             .or(nameContains(".asm."))
             .or(nameMatches("com\\.mchange\\.v2\\.c3p0\\..*Proxy"))
-            .or(hasAnnotation(annotationType(named("javax.decorator.Decorator"))))
+            .or(isAnnotatedWith(named("javax.decorator.Decorator")))
             .or(matchesConfiguredExcludes());
 
     for (final AgentBuilder.Listener listener : listeners) {