Make regular test less flaky too

dd-java-agent/instrumentation/jms/src/test/groovy/SpringListenerJMS1Test.groovy

@@ -35,7 +35,7 @@ class SpringListenerJMS1Test extends AgentTestRunner {
     def context = new AnnotationConfigApplicationContext(Config)
     def factory = context.getBean(ConnectionFactory)
     def template = new JmsTemplate(factory)
-    template.convertAndSend("someSpringQueue", "a message")
+    template.convertAndSend("SpringListenerJMS1", "a message")
 
     TEST_WRITER.waitForTraces(3)
     // Manually reorder if reported in the wrong order.
@@ -47,9 +47,9 @@ class SpringListenerJMS1Test extends AgentTestRunner {
 
     expect:
     assertTraces(3) {
-      producerTrace(it, 0, "Queue someSpringQueue")
-      consumerTrace(it, 1, "Queue someSpringQueue", false, ActiveMQMessageConsumer)
-      consumerTrace(it, 2, "Queue someSpringQueue", true, MessagingMessageListenerAdapter)
+      producerTrace(it, 0, "Queue SpringListenerJMS1")
+      consumerTrace(it, 1, "Queue SpringListenerJMS1", false, ActiveMQMessageConsumer)
+      consumerTrace(it, 2, "Queue SpringListenerJMS1", true, MessagingMessageListenerAdapter)
     }
 
     cleanup:

dd-java-agent/instrumentation/jms/src/test/groovy/SpringTemplateJMS1Test.groovy

@@ -55,8 +55,8 @@ class SpringTemplateJMS1Test extends AgentTestRunner {
     }
 
     where:
-    destination                            | jmsResourceName
-    session.createQueue("someSpringQueue") | "Queue someSpringQueue"
+    destination                               | jmsResourceName
+    session.createQueue("SpringTemplateJMS1") | "Queue SpringTemplateJMS1"
   }
 
   def "send and receive message generates spans"() {
@@ -99,7 +99,7 @@ class SpringTemplateJMS1Test extends AgentTestRunner {
     }
 
     where:
-    destination                            | jmsResourceName
-    session.createQueue("someSpringQueue") | "Queue someSpringQueue"
+    destination                               | jmsResourceName
+    session.createQueue("SpringTemplateJMS1") | "Queue SpringTemplateJMS1"
   }
 }

dd-java-agent/instrumentation/jms/src/test/groovy/listener/Config.groovy

@@ -23,6 +23,7 @@ import org.springframework.jms.annotation.EnableJms
 import org.springframework.jms.config.DefaultJmsListenerContainerFactory
 import org.springframework.jms.config.JmsListenerContainerFactory
 
+import javax.annotation.PreDestroy
 import javax.jms.ConnectionFactory
 
 @Configuration
@@ -48,4 +49,9 @@ class Config {
     factory.setConnectionFactory(connectionFactory)
     return factory
   }
+
+  @PreDestroy
+  void destroy() {
+    broker().stop()
+  }
 }

dd-java-agent/instrumentation/jms/src/test/groovy/listener/TestListener.groovy

@@ -21,7 +21,7 @@ import org.springframework.stereotype.Component
 @Component
 class TestListener {
 
-  @JmsListener(destination = "someSpringQueue", containerFactory = "containerFactory")
+  @JmsListener(destination = "SpringListenerJMS1", containerFactory = "containerFactory")
   void receiveMessage(String message) {
     println "received: " + message
   }