Support configuring a different namespace in JMS module

Author: mcculls

dd-java-agent/instrumentation/jms/src/main/java/datadog/trace/instrumentation/jms/JMSDecorator.java

@@ -116,7 +116,7 @@ public static void logJMSException(JMSException ex) {
 
   @Override
   protected String[] instrumentationNames() {
-    return new String[] {"jms", "jms-1", "jms-2"};
+    return new String[] {"jms"};
   }
 
   @Override

dd-java-agent/instrumentation/jms/src/main/java/datadog/trace/instrumentation/jms/JMSMessageConsumerInstrumentation.java

@@ -34,10 +34,15 @@
 
 public final class JMSMessageConsumerInstrumentation
     implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+  private final String namespace;
+
+  public JMSMessageConsumerInstrumentation(String namespace) {
+    this.namespace = namespace;
+  }
 
   @Override
   public String hierarchyMarkerType() {
-    return "javax.jms.MessageConsumer";
+    return namespace + ".jms.MessageConsumer";
   }
 
   @Override
@@ -59,7 +64,7 @@ public void methodAdvice(MethodTransformer transformer) {
     transformer.applyAdvice(
         isMethod()
             .and(named("setMessageListener"))
-            .and(takesArgument(0, hasInterface(named("javax.jms.MessageListener")))),
+            .and(takesArgument(0, hasInterface(named(namespace + ".jms.MessageListener")))),
         getClass().getName() + "$DecorateMessageListener");
   }
 

dd-java-agent/instrumentation/jms/src/main/java/datadog/trace/instrumentation/jms/JMSMessageProducerInstrumentation.java

@@ -29,10 +29,15 @@
 
 public final class JMSMessageProducerInstrumentation
     implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+  private final String namespace;
+
+  public JMSMessageProducerInstrumentation(String namespace) {
+    this.namespace = namespace;
+  }
 
   @Override
   public String hierarchyMarkerType() {
-    return "javax.jms.MessageProducer";
+    return namespace + ".jms.MessageProducer";
   }
 
   @Override
@@ -43,12 +48,12 @@ public ElementMatcher<TypeDescription> hierarchyMatcher() {
   @Override
   public void methodAdvice(MethodTransformer transformer) {
     transformer.applyAdvice(
-        named("send").and(takesArgument(0, named("javax.jms.Message"))).and(isPublic()),
+        named("send").and(takesArgument(0, named(namespace + ".jms.Message"))).and(isPublic()),
         JMSMessageProducerInstrumentation.class.getName() + "$ProducerAdvice");
     transformer.applyAdvice(
         named("send")
-            .and(takesArgument(0, hasInterface(named("javax.jms.Destination"))))
-            .and(takesArgument(1, named("javax.jms.Message")))
+            .and(takesArgument(0, hasInterface(named(namespace + ".jms.Destination"))))
+            .and(takesArgument(1, named(namespace + ".jms.Message")))
             .and(isPublic()),
         JMSMessageProducerInstrumentation.class.getName() + "$ProducerWithDestinationAdvice");
   }

dd-java-agent/instrumentation/jms/src/main/java/datadog/trace/instrumentation/jms/JavaxJmsModule.java

@@ -13,8 +13,15 @@
 
 @AutoService(InstrumenterModule.class)
 public class JavaxJmsModule extends InstrumenterModule.Tracing {
+  private final String namespace;
+
   public JavaxJmsModule() {
-    super("jms", "jms-1", "jms-2");
+    this("javax", "jms", "jms-1", "jms-2");
+  }
+
+  public JavaxJmsModule(String namespace, String instrumentationName, String... additionalNames) {
+    super(instrumentationName, additionalNames);
+    this.namespace = namespace;
   }
 
   @Override
@@ -31,20 +38,20 @@ public String[] helperClassNames() {
   @Override
   public Map<String, String> contextStore() {
     Map<String, String> contextStore = new HashMap<>(4);
-    contextStore.put("javax.jms.MessageConsumer", MessageConsumerState.class.getName());
-    contextStore.put("javax.jms.MessageProducer", MessageProducerState.class.getName());
-    contextStore.put("javax.jms.Message", SessionState.class.getName());
-    contextStore.put("javax.jms.Session", SessionState.class.getName());
+    contextStore.put(namespace + ".jms.MessageConsumer", MessageConsumerState.class.getName());
+    contextStore.put(namespace + ".jms.MessageProducer", MessageProducerState.class.getName());
+    contextStore.put(namespace + ".jms.Message", SessionState.class.getName());
+    contextStore.put(namespace + ".jms.Session", SessionState.class.getName());
     return contextStore;
   }
 
   @Override
   public List<Instrumenter> typeInstrumentations() {
     return Arrays.asList(
-        new JMSMessageConsumerInstrumentation(),
-        new JMSMessageProducerInstrumentation(),
-        new MDBMessageConsumerInstrumentation(),
-        new MessageInstrumentation(),
-        new SessionInstrumentation());
+        new JMSMessageConsumerInstrumentation(namespace),
+        new JMSMessageProducerInstrumentation(namespace),
+        new MDBMessageConsumerInstrumentation(namespace),
+        new MessageInstrumentation(namespace),
+        new SessionInstrumentation(namespace));
   }
 }

dd-java-agent/instrumentation/jms/src/main/java/datadog/trace/instrumentation/jms/MDBMessageConsumerInstrumentation.java

@@ -30,18 +30,23 @@
 
 public final class MDBMessageConsumerInstrumentation
     implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+  private final String namespace;
+
+  public MDBMessageConsumerInstrumentation(String namespace) {
+    this.namespace = namespace;
+  }
 
   @Override
   public String hierarchyMarkerType() {
-    return "javax.jms.MessageListener";
+    return namespace + ".jms.MessageListener";
   }
 
   @Override
   public ElementMatcher<TypeDescription> hierarchyMatcher() {
     return implementsInterface(named(hierarchyMarkerType()))
         .and(
-            hasSuperType(declaresAnnotation(named("javax.ejb.MessageDriven")))
-                .or(implementsInterface(named("javax.ejb.MessageDrivenBean"))));
+            hasSuperType(declaresAnnotation(named(namespace + ".ejb.MessageDriven")))
+                .or(implementsInterface(named(namespace + ".ejb.MessageDrivenBean"))));
   }
 
   @Override
@@ -51,7 +56,7 @@ public void methodAdvice(MethodTransformer transformer) {
             .and(isPublic())
             .and(named("onMessage"))
             .and(takesArguments(1))
-            .and(takesArgument(0, (named("javax.jms.Message")))),
+            .and(takesArgument(0, (named(namespace + ".jms.Message")))),
         getClass().getName() + "$MDBAdvice");
   }
 

dd-java-agent/instrumentation/jms/src/main/java/datadog/trace/instrumentation/jms/MessageInstrumentation.java

@@ -17,10 +17,15 @@
 
 public class MessageInstrumentation
     implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+  private final String namespace;
+
+  public MessageInstrumentation(String namespace) {
+    this.namespace = namespace;
+  }
 
   @Override
   public String hierarchyMarkerType() {
-    return "javax.jms.Message";
+    return namespace + ".jms.Message";
   }
 
   @Override

dd-java-agent/instrumentation/jms/src/main/java/datadog/trace/instrumentation/jms/SessionInstrumentation.java

@@ -30,10 +30,15 @@
 
 public class SessionInstrumentation
     implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+  private final String namespace;
+
+  public SessionInstrumentation(String namespace) {
+    this.namespace = namespace;
+  }
 
   @Override
   public String hierarchyMarkerType() {
-    return "javax.jms.Session";
+    return namespace + ".jms.Session";
   }
 
   @Override
@@ -47,38 +52,38 @@ public void methodAdvice(MethodTransformer transformer) {
         isMethod()
             .and(named("createProducer"))
             .and(isPublic())
-            .and(takesArgument(0, named("javax.jms.Destination"))),
+            .and(takesArgument(0, named(namespace + ".jms.Destination"))),
         getClass().getName() + "$CreateProducer");
     transformer.applyAdvice(
         isMethod()
             .and(named("createSender"))
             .and(isPublic())
-            .and(takesArgument(0, named("javax.jms.Queue"))),
+            .and(takesArgument(0, named(namespace + ".jms.Queue"))),
         getClass().getName() + "$CreateProducer");
     transformer.applyAdvice(
         isMethod()
             .and(named("createPublisher"))
             .and(isPublic())
-            .and(takesArgument(0, named("javax.jms.Topic"))),
+            .and(takesArgument(0, named(namespace + ".jms.Topic"))),
         getClass().getName() + "$CreateProducer");
 
     transformer.applyAdvice(
         isMethod()
             .and(named("createConsumer"))
             .and(isPublic())
-            .and(takesArgument(0, named("javax.jms.Destination"))),
+            .and(takesArgument(0, named(namespace + ".jms.Destination"))),
         getClass().getName() + "$CreateConsumer");
     transformer.applyAdvice(
         isMethod()
             .and(named("createReceiver"))
             .and(isPublic())
-            .and(takesArgument(0, named("javax.jms.Queue"))),
+            .and(takesArgument(0, named(namespace + ".jms.Queue"))),
         getClass().getName() + "$CreateConsumer");
     transformer.applyAdvice(
         isMethod()
             .and(namedOneOf("createSubscriber", "createDurableSubscriber"))
             .and(isPublic())
-            .and(takesArgument(0, named("javax.jms.Topic"))),
+            .and(takesArgument(0, named(namespace + ".jms.Topic"))),
         getClass().getName() + "$CreateConsumer");
 
     transformer.applyAdvice(