open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Small improvement for jms tests to hopefully make them more stable

This commit is contained in:
Nikolay Martynov 2018-12-07 09:40:29 -05:00
parent 44aadf36ce
commit c1e21e328b
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,6 @@ class SpringTemplateJMS1Test extends AgentTestRunner {
def setupSpec() { def setupSpec() {
broker.start() broker.start()
final ActiveMQConnectionFactory connectionFactory = broker.createConnectionFactory() final ActiveMQConnectionFactory connectionFactory = broker.createConnectionFactory()
final Connection connection = connectionFactory.createConnection() final Connection connection = connectionFactory.createConnection()
connection.start() connection.start()
session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE) session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE)
@ -59,11 +58,12 @@ class SpringTemplateJMS1Test extends AgentTestRunner {
def "send and receive message generates spans"() { def "send and receive message generates spans"() {
setup: setup:
Thread.start { Thread.start {
TEST_WRITER.waitForTraces(1)
TextMessage msg = template.receive(destination) TextMessage msg = template.receive(destination)
assert msg.text == messageText assert msg.text == messageText
// There's a chance this might be reported last, messing up the assertion. // Make sure that first pair of send/receive traces has landed to simplify assertions
TEST_WRITER.waitForTraces(2)
template.send(msg.getJMSReplyTo()) { template.send(msg.getJMSReplyTo()) {
session -> template.getMessageConverter().toMessage("responded!", session) session -> template.getMessageConverter().toMessage("responded!", session)
} }
@ -74,6 +74,11 @@ class SpringTemplateJMS1Test extends AgentTestRunner {
TEST_WRITER.waitForTraces(4) TEST_WRITER.waitForTraces(4)
// Manually reorder if reported in the wrong order. // Manually reorder if reported in the wrong order.
if (TEST_WRITER[1][0].operationName == "jms.produce") {
def producerTrace = TEST_WRITER[1]
TEST_WRITER[1] = TEST_WRITER[0]
TEST_WRITER[0] = producerTrace
}
if (TEST_WRITER[3][0].operationName == "jms.produce") { if (TEST_WRITER[3][0].operationName == "jms.produce") {
def producerTrace = TEST_WRITER[3] def producerTrace = TEST_WRITER[3]
TEST_WRITER[3] = TEST_WRITER[2] TEST_WRITER[3] = TEST_WRITER[2]