exclude spring-kafka runnables from spring scheduling wrapping (#6388)

amarziali · web-flow · commit df9ada3ba10d · 2023-12-18T18:49:52.000+01:00
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/ExcludeFilter.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/ExcludeFilter.java
@@ -110,6 +110,9 @@ private static EnumSet<ExcludeType> exclude(Class<?> clazz) {
     SKIP_TYPE_PREFIXES
         .get(ExcludeType.RUNNABLE)
         .add("com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap");
+    SKIP_TYPE_PREFIXES
+        .get(ExcludeType.RUNNABLE)
+        .add("org.springframework.kafka.listener.KafkaMessageListenerContainer$ListenerConsumer$");
   }
 
   /**
diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/build.gradle b/dd-java-agent/instrumentation/kafka-clients-0.11/build.gradle
@@ -21,6 +21,7 @@ dependencies {
   testImplementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3'
   testImplementation group: 'org.assertj', name: 'assertj-core', version: '2.9.+'
   testImplementation group: 'org.mockito', name: 'mockito-core', version: '2.19.0'
+  testRuntimeOnly project(':dd-java-agent:instrumentation:spring-scheduling-3.1')
 
   // Include latest version of kafka itself along with latest version of client libs.
   // This seems to help with jar compatibility hell.

Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,9 @@ private static EnumSet<ExcludeType> exclude(Class<?> clazz) {`
`110`	`110`	`SKIP_TYPE_PREFIXES`
`111`	`111`	`.get(ExcludeType.RUNNABLE)`
`112`	`112`	`.add("com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap");`
	`113`	`+ SKIP_TYPE_PREFIXES`
	`114`	`+ .get(ExcludeType.RUNNABLE)`
	`115`	`+ .add("org.springframework.kafka.listener.KafkaMessageListenerContainer$ListenerConsumer$");`
`113`	`116`	`}`
`114`	`117`
`115`	`118`	`/**`