Commit d684fcb
committed
Fix
The `reply-to` property from request messages is parsed to the
`org.springframework.amqp.core.Address` object.
This one removes the first `/` leaving `routingKey`, based on the mentioned `reply-to`,
with a `queues/` prefix.
The value in the `reply-to` is already encoded, so we don't need to go extra parsing logic
in the `RabbitAmqpTemplate.toAmqpMessage()` in regards
`com.rabbitmq.client.amqp.Message.MessageAddressBuilder`
* Fix `RabbitAmqpTemplate.toAmqpMessage()` to check for `queues/` prefix before going down to
the `com.rabbitmq.client.amqp.Message.MessageAddressBuilder` logic.
Instead, use the `queue` value as is in the `com.rabbitmq.client.amqp.Message.to()` property
adding required `/` at the beginning of the value
* Revert `RabbitAmqpMessageListenerAdapter.sendResponse()` logic to `this.rabbitAmqpTemplate.send()`
without modifying `replyToRoutingKey` value
* Fix typos in the `Address` Javadocs
* Move `log4j-slf4j-impl` to common dependencies
* Fix `ObservationIntegrationTests` sorting spans by they create time to avoid race condition on assertionsreply-to handling logic for AMQP 1.01 parent b4e97f9 commit d684fcb
File tree
3 files changed
+7
-6
lines changed- spring-rabbit/src/test
- java/org/springframework/amqp/rabbit/support/micrometer
- resources
3 files changed
+7
-6
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
199 | 199 | | |
200 | 200 | | |
201 | 201 | | |
| 202 | + | |
202 | 203 | | |
203 | 204 | | |
204 | 205 | | |
| |||
426 | 427 | | |
427 | 428 | | |
428 | 429 | | |
429 | | - | |
430 | 430 | | |
431 | 431 | | |
432 | 432 | | |
| |||
451 | 451 | | |
452 | 452 | | |
453 | 453 | | |
454 | | - | |
455 | 454 | | |
456 | 455 | | |
457 | 456 | | |
| |||
Lines changed: 3 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
| 19 | + | |
19 | 20 | | |
20 | 21 | | |
21 | 22 | | |
| |||
50 | 51 | | |
51 | 52 | | |
52 | 53 | | |
53 | | - | |
| 54 | + | |
54 | 55 | | |
55 | 56 | | |
56 | 57 | | |
| |||
67 | 68 | | |
68 | 69 | | |
69 | 70 | | |
| 71 | + | |
70 | 72 | | |
71 | 73 | | |
72 | 74 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
10 | | - | |
11 | | - | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
| |||
0 commit comments