Skip to content

Disable JMS receiveNoWait test for ActiveMQ #755

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 28, 2019
Merged

Disable JMS receiveNoWait test for ActiveMQ #755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66417b4
Disabling receiveNoWait for ActiveMQ test
eyalkoren Jul 21, 2019
88257ef
Merge remote-tracking branch 'upstream/master' into disable-jms-recei…
eyalkoren Jul 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ...-plugins/apm-jms-plugin/src/test/java/co/elastic/apm/agent/jms/ActiveMqArtemisFacade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,11 @@ public Message receive(Destination destination, long timeout) {
return context.createConsumer(destination).receive(timeout);
}

@Override
public boolean shouldTestReceiveNoWait() {
return true;
}

@Override
public Message receiveNoWait(Destination destination) {
return context.createConsumer(destination).receiveNoWait();
Expand Down
5 changes: 5 additions & 0 deletions apm-agent-plugins/apm-jms-plugin/src/test/java/co/elastic/apm/agent/jms/ActiveMqFacade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,11 @@ public Message receive(Destination destination, long timeout) throws JMSExceptio
return session.createConsumer(destination).receive(timeout);
}

@Override
public boolean shouldTestReceiveNoWait() {
return false;
}

@Override
public Message receiveNoWait(Destination destination) throws JMSException {
return session.createConsumer(destination).receiveNoWait();
Expand Down
2 changes: 2 additions & 0 deletions apm-agent-plugins/apm-jms-plugin/src/test/java/co/elastic/apm/agent/jms/BrokerFacade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,7 @@ interface BrokerFacade {

Message receive(Destination destination, long timeout) throws Exception;

boolean shouldTestReceiveNoWait();

Message receiveNoWait(Destination destination) throws Exception;
}
6 changes: 6 additions & 0 deletions ...t-plugins/apm-jms-plugin/src/test/java/co/elastic/apm/agent/jms/JmsInstrumentationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,9 @@ public void testQueueSendReceiveOnTracedThread() throws Exception {

@Test
public void testQueueSendReceiveNoWaitOnTracedThread() throws Exception {
if (!brokerFacade.shouldTestReceiveNoWait()) {
return;
}
final Queue queue = createQueue();
testQueueSendReceiveOnTracedThread(() -> brokerFacade.receiveNoWait(queue), queue, true);
}
Expand All @@ -130,6 +133,9 @@ public void testQueueSendReceiveOnNonTracedThread() throws Exception {

@Test
public void testQueueSendReceiveNoWaitOnNonTracedThread() throws Exception {
if (!brokerFacade.shouldTestReceiveNoWait()) {
return;
}
final Queue queue = createQueue();
testQueueSendReceiveOnNonTracedThread(() -> brokerFacade.receiveNoWait(queue), queue, true);
}
Expand Down