Changes requeted from review

Author: roisinlh

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

@@ -115,6 +115,10 @@ public static void logJMSException(JMSException ex) {
   }
 
   public static String messageTechnology(Message m) {
+    if (null == m) {
+      return "null";
+    }
+
     String messageClass = m.getClass().getName();
 
     if (messageClass.startsWith("com.amazon.sqs")) {

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

@@ -153,7 +153,7 @@ public static void afterReceive(
 
       if (Config.get().isDataStreamsEnabled()) {
         final String tech = messageTechnology(message);
-        if (tech == "ibmmq") { // Initial release only supports DSM in JMS for IBM MQ
+        if ("ibmmq".equals(tech)) { // Initial release only supports DSM in JMS for IBM MQ
           DataStreamsTags tags =
               create(tech, INBOUND, consumerState.getConsumerBaseResourceName().toString());
           DataStreamsContext dsmContext = DataStreamsContext.fromTags(tags);

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

@@ -82,12 +82,14 @@ public static AgentScope beforeSend(
       String destinationName;
       try {
         // fall-back when producer wasn't created via standard Session.createProducer API
-        Destination destination = producer.getDestination();
-        boolean isQueue = PRODUCER_DECORATE.isQueue(destination);
-        destinationName = PRODUCER_DECORATE.getDestinationName(destination);
         if (null != producerState) {
           resourceName = producerState.getResourceName();
+          Destination destination = producer.getDestination();
+          destinationName = PRODUCER_DECORATE.getDestinationName(destination);
         } else {
+          Destination destination = producer.getDestination();
+          destinationName = PRODUCER_DECORATE.getDestinationName(destination);
+          boolean isQueue = PRODUCER_DECORATE.isQueue(destination);
           resourceName = PRODUCER_DECORATE.toResourceName(destinationName, isQueue);
         }
       } catch (Exception ignored) {
@@ -99,11 +101,11 @@ public static AgentScope beforeSend(
       PRODUCER_DECORATE.afterStart(span);
       PRODUCER_DECORATE.onProduce(span, resourceName);
 
-      if (destinationName != null
+      if (null != destinationName
           && !destinationName.isEmpty()
           && Config.get().isDataStreamsEnabled()) {
         final String tech = messageTechnology(message);
-        if (tech == "ibmmq") { // Initial release only supports DSM in JMS for IBM MQ
+        if ("ibmmq".equals(tech)) { // Initial release only supports DSM in JMS for IBM MQ
           DataStreamsTags tags = create(tech, OUTBOUND, destinationName);
           DataStreamsContext dsmContext = DataStreamsContext.fromTags(tags);
           AgentTracer.get().getDataStreamsMonitoring().setCheckpoint(span, dsmContext);
@@ -158,11 +160,11 @@ public static AgentScope beforeSend(
       PRODUCER_DECORATE.afterStart(span);
       PRODUCER_DECORATE.onProduce(span, resourceName);
 
-      if (destinationName != null
+      if (null != destinationName
           && !destinationName.isEmpty()
           && Config.get().isDataStreamsEnabled()) {
         final String tech = messageTechnology(message);
-        if (tech == "ibmmq") { // Initial release only supports DSM in JMS for IBM MQ
+        if ("ibmmq".equals(tech)) { // Initial release only supports DSM in JMS for IBM MQ
           DataStreamsTags tags = create(tech, OUTBOUND, destinationName);
           DataStreamsContext dsmContext = DataStreamsContext.fromTags(tags);
           AgentTracer.get().getDataStreamsMonitoring().setCheckpoint(span, dsmContext);