From e4560ba50f234e2369e1bbf9b7a7e6a42717adf5 Mon Sep 17 00:00:00 2001
From: Johan Vandeweerd <johan.v@sparkcentral.com>
Date: Wed, 15 May 2019 09:47:57 +0200
Subject: [PATCH] Instrument all subtypes of ExchangeFunction instead of only
 ExchangeFunctions$DefaultExchangeFunction

---
 .../springwebflux/client/DefaultWebClientInstrumentation.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dd-java-agent/instrumentation/spring-webflux/src/main/java/datadog/trace/instrumentation/springwebflux/client/DefaultWebClientInstrumentation.java b/dd-java-agent/instrumentation/spring-webflux/src/main/java/datadog/trace/instrumentation/springwebflux/client/DefaultWebClientInstrumentation.java
index 8220598a1c..194191b937 100644
--- a/dd-java-agent/instrumentation/spring-webflux/src/main/java/datadog/trace/instrumentation/springwebflux/client/DefaultWebClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring-webflux/src/main/java/datadog/trace/instrumentation/springwebflux/client/DefaultWebClientInstrumentation.java
@@ -1,6 +1,7 @@
 package datadog.trace.instrumentation.springwebflux.client;
 
 import static java.util.Collections.singletonMap;
+import static net.bytebuddy.matcher.ElementMatchers.hasSuperType;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;
 import static net.bytebuddy.matcher.ElementMatchers.named;
@@ -37,8 +38,7 @@ public class DefaultWebClientInstrumentation extends Instrumenter.Default {
 
   @Override
   public ElementMatcher<? super TypeDescription> typeMatcher() {
-    return named(
-        "org.springframework.web.reactive.function.client.ExchangeFunctions$DefaultExchangeFunction");
+    return hasSuperType(named("org.springframework.web.reactive.function.client.ExchangeFunction"));
   }
 
   @Override