Apache/activemq-artemis
1
0
Fork 0
mirror of https://github.com/apache/activemq-artemis.git synced 2025-02-20 17:05:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-4098 AMQP messages missing correlation ID in console

Browse Source
This commit is contained in:
Justin Bertram 2022-11-23 13:54:47 -06:00 committed by clebertsuconic
parent ef04cec95d
commit 76b9c62311
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
View File

@ -919,6 +919,9 @@ public abstract class AMQPMessage extends RefCountMessage implements org.apache.
if (properties.getReplyTo() != null) {
map.put(propertiesPrefix + "replyTo", properties.getReplyTo());
}
if (properties.getCorrelationId() != null) {
map.put(propertiesPrefix + "correlationId", properties.getCorrelationId());
}
}
return map;

5
artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessageTest.java
View File

@ -2251,6 +2251,7 @@ public class AMQPMessageTest {
long testExpiryTime = testCreationTime + 5000;
String testSubject = "testSubject";
String testMessageId = "testMessageId";
String testCorrelationId = "testCorrelationId";
Properties protonProperties = new Properties();
protonProperties.setContentType(Symbol.valueOf(AMQPMessageSupport.OCTET_STREAM_CONTENT_TYPE));
@ -2263,6 +2264,7 @@ public class AMQPMessageTest {
protonProperties.setSubject(testSubject);
protonProperties.setTo(TEST_TO_ADDRESS);
protonProperties.setMessageId(testMessageId);
protonProperties.setCorrelationId(testCorrelationId);
protonMessage.setProperties(protonProperties);
@ -2284,13 +2286,12 @@ public class AMQPMessageTest {
assertTrue(properties.contains(PROPERTY_MAP_PROPERTIES_PREFIX + "absoluteExpiryTime" + "=" + testExpiryTime));
assertTrue(properties.contains(PROPERTY_MAP_PROPERTIES_PREFIX + "to" + "=" + TEST_TO_ADDRESS));
assertTrue(properties.contains(PROPERTY_MAP_PROPERTIES_PREFIX + "subject" + "=" + testSubject));
assertTrue(properties.contains(PROPERTY_MAP_PROPERTIES_PREFIX + "correlationId" + "=" + testCorrelationId));
// TODO: should these fields be included in the 'properties' string and tested above?
// Some are shown elsewhere in a way, others missing entirely. Eg:
//
// correlation-id: not included.
// message-id: included'ish, with an ID: prefix added, as the CompositeDataConstants.USER_ID.
// reply-to: not included, though the replyToGroupId is given as shown above.
// user-id: not included.
// Some fields of the properties section already align with fields given