JMS: trace Queue and Topic producers when destination is explicit

DataDog · Jul 2, 2024 · 7d53edb · 7d53edb
1 parent a9dde4f
commit 7d53edb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/...ain/java/datadog/trace/instrumentation/jakarta/jms/JMSMessageProducerInstrumentation.java b/...ain/java/datadog/trace/instrumentation/jakarta/jms/JMSMessageProducerInstrumentation.java
@@ -1,5 +1,6 @@
 package datadog.trace.instrumentation.jakarta.jms;
 
+import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.hasInterface;
 import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.implementsInterface;
 import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
@@ -65,7 +66,7 @@ public void methodAdvice(MethodTransformer transformer) {
         JMSMessageProducerInstrumentation.class.getName() + "$ProducerAdvice");
     transformer.applyAdvice(
         named("send")
-            .and(takesArgument(0, named("jakarta.jms.Destination")))
+            .and(takesArgument(0, hasInterface(named("jakarta.jms.Destination"))))
             .and(takesArgument(1, named("jakarta.jms.Message")))
             .and(isPublic()),
         JMSMessageProducerInstrumentation.class.getName() + "$ProducerWithDestinationAdvice");

diff --git a/dd-java-agent/instrumentation/jakarta-jms/src/test/groovy/JMS2Test.groovy b/dd-java-agent/instrumentation/jakarta-jms/src/test/groovy/JMS2Test.groovy
@@ -83,7 +83,7 @@ class JMS2Test extends AgentTestRunner {
     def producer = session.createProducer(destination)
     def consumer = session.createConsumer(destination)
 
-    producer.send(message)
+    producer.send(destination, message)
 
     Message receivedMessage = consumer.receive()
     // required to finish auto-acknowledged spans

diff --git a/...ms/src/main/java/datadog/trace/instrumentation/jms/JMSMessageProducerInstrumentation.java b/...ms/src/main/java/datadog/trace/instrumentation/jms/JMSMessageProducerInstrumentation.java
@@ -1,5 +1,6 @@
 package datadog.trace.instrumentation.jms;
 
+import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.hasInterface;
 import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.implementsInterface;
 import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
@@ -65,7 +66,7 @@ public void methodAdvice(MethodTransformer transformer) {
         JMSMessageProducerInstrumentation.class.getName() + "$ProducerAdvice");
     transformer.applyAdvice(
         named("send")
-            .and(takesArgument(0, named("javax.jms.Destination")))
+            .and(takesArgument(0, hasInterface(named("javax.jms.Destination"))))
             .and(takesArgument(1, named("javax.jms.Message")))
             .and(isPublic()),
         JMSMessageProducerInstrumentation.class.getName() + "$ProducerWithDestinationAdvice");

diff --git a/dd-java-agent/instrumentation/jms/src/test/groovy/JMS1Test.groovy b/dd-java-agent/instrumentation/jms/src/test/groovy/JMS1Test.groovy
@@ -737,7 +737,7 @@ abstract class JMS1Test extends VersionedNamingTestBase {
 
     when:
     sender.send(message1)
-    sender.send(message2)
+    sender.send(destination, message2)
     sender.send(message3)
 
     TextMessage receivedMessage1 = receiver.receive()