Skip to content

Add support for dead letter exchange and queue arguments in AMQP #691

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

Open
dewidyabagus wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add support for dead letter exchange and queue arguments in AMQP #691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion amqp/src/main/java/com/netflix/conductor/contribs/queue/amqp/util/AMQPConfigurations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@ public enum AMQPConfigurations {
PARAM_DURABLE("durable"),
PARAM_EXCLUSIVE("exclusive"),
PARAM_AUTO_DELETE("autoDelete"),
PARAM_MAX_PRIORITY("maxPriority");
PARAM_MAX_PRIORITY("maxPriority"),
PARAM_DEAD_LETTER_EXCHANGE("deadLetterExchange"),
PARAM_DEAD_LETTER_ROUTING_KEY("deadLetterRoutingKey"),
PARAM_MESSAGE_TTL("messageTtl"),
PARAM_MAX_LENGTH("maxLength");

String propertyName;

Expand Down
39 changes: 39 additions & 0 deletions amqp/src/main/java/com/netflix/conductor/contribs/queue/amqp/util/AMQPSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,12 +154,35 @@ public String getContentType() {
* amqp_queue:myQueue?deliveryMode=1&autoDelete=true&exclusive=true
* </pre>
*
* <u>Example for queue with dead letter exchange:</u>
*
* <pre>
* amqp_queue:myQueue?durable=true&deadLetterExchange=myDLX&deadLetterRoutingKey=failed&messageTtl=60000&maxLength=1000
* </pre>
*
* <u>Example for exchange:</u>
*
* <pre>
* amqp_exchange:myExchange?bindQueueName=myQueue&exchangeType=topic&routingKey=myRoutingKey&exclusive=true
* </pre>
*
* <p>Supported parameters:
*
* <ul>
* <li>deliveryMode - Message delivery mode (1=non-persistent, 2=persistent)
* <li>durable - Queue/Exchange durability (true/false)
* <li>exclusive - Exclusive queue (true/false)
* <li>autoDelete - Auto-delete queue/exchange (true/false)
* <li>maxPriority - Maximum priority for messages (integer)
* <li>deadLetterExchange - Dead letter exchange name for failed messages
* <li>deadLetterRoutingKey - Routing key for dead lettered messages
* <li>messageTtl - Message time-to-live in milliseconds (integer)
* <li>maxLength - Maximum queue length (integer)
* <li>exchangeType - Exchange type (topic, direct, fanout, headers)
* <li>bindQueueName - Queue name to bind to exchange
* <li>routingKey - Routing key for exchange binding
* </ul>
*
* @param queueURI
* @return
*/
Expand Down Expand Up @@ -227,6 +250,22 @@ public final AMQPSettings fromURI(final String queueURI) {
(String.valueOf(PARAM_MAX_PRIORITY)))) {
arguments.put("x-max-priority", Integer.valueOf(kv[1]));
}
if (kv[0].equalsIgnoreCase(
(String.valueOf(PARAM_DEAD_LETTER_EXCHANGE)))) {
arguments.put("x-dead-letter-exchange", kv[1]);
}
if (kv[0].equalsIgnoreCase(
(String.valueOf(PARAM_DEAD_LETTER_ROUTING_KEY)))) {
arguments.put("x-dead-letter-routing-key", kv[1]);
}
if (kv[0].equalsIgnoreCase(
(String.valueOf(PARAM_MESSAGE_TTL)))) {
arguments.put("x-message-ttl", Integer.valueOf(kv[1]));
}
if (kv[0].equalsIgnoreCase(
(String.valueOf(PARAM_MAX_LENGTH)))) {
arguments.put("x-max-length", Integer.valueOf(kv[1]));
}
}
});
}
Expand Down
44 changes: 44 additions & 0 deletions amqp/src/test/java/com/netflix/conductor/contribs/queue/amqp/AMQPSettingsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,4 +156,48 @@ public void testAMQPSettings_exchange_fromuri_wrongdeliverymode() {
AMQPSettings settings = new AMQPSettings(properties);
settings.fromURI(exchangestring);
}

@Test
public void testAMQPSettings_queue_with_dead_letter_exchange() {
String queuestring =
"amqp_queue:myQueueName?deadLetterExchange=myDLX&deadLetterRoutingKey=failed";
AMQPSettings settings = new AMQPSettings(properties);
settings.fromURI(queuestring);
assertEquals("myQueueName", settings.getQueueOrExchangeName());
assertEquals("myDLX", settings.getArguments().get("x-dead-letter-exchange"));
assertEquals("failed", settings.getArguments().get("x-dead-letter-routing-key"));
}

@Test
public void testAMQPSettings_queue_with_message_ttl() {
String queuestring = "amqp_queue:myQueueName?messageTtl=60000";
AMQPSettings settings = new AMQPSettings(properties);
settings.fromURI(queuestring);
assertEquals("myQueueName", settings.getQueueOrExchangeName());
assertEquals(60000, settings.getArguments().get("x-message-ttl"));
}

@Test
public void testAMQPSettings_queue_with_max_length() {
String queuestring = "amqp_queue:myQueueName?maxLength=1000";
AMQPSettings settings = new AMQPSettings(properties);
settings.fromURI(queuestring);
assertEquals("myQueueName", settings.getQueueOrExchangeName());
assertEquals(1000, settings.getArguments().get("x-max-length"));
}

@Test
public void testAMQPSettings_queue_with_all_arguments() {
String queuestring =
"amqp_queue:myQueueName?durable=true&deadLetterExchange=myDLX&deadLetterRoutingKey=failed&messageTtl=60000&maxLength=1000&maxPriority=10";
AMQPSettings settings = new AMQPSettings(properties);
settings.fromURI(queuestring);
assertEquals("myQueueName", settings.getQueueOrExchangeName());
assertTrue(settings.isDurable());
assertEquals("myDLX", settings.getArguments().get("x-dead-letter-exchange"));
assertEquals("failed", settings.getArguments().get("x-dead-letter-routing-key"));
assertEquals(60000, settings.getArguments().get("x-message-ttl"));
assertEquals(1000, settings.getArguments().get("x-max-length"));
assertEquals(10, settings.getArguments().get("x-max-priority"));
}
}