Skip to content

Commit 90e04a7

Browse files
committed
Prefix message annotation with x-opt- in observation support
1 parent 6c645c9 commit 90e04a7

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

src/main/java/com/rabbitmq/client/amqp/observation/micrometer/DeliverContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class DeliverContext extends ReceiverContext<Message> {
3333
DeliverContext(String exchange, String routingKey, String queue, Message message) {
3434
super(
3535
(carrier, key) -> {
36-
Object result = carrier.annotation(key);
36+
Object result = carrier.annotation(Utils.annotationKey(key));
3737
if (result == null) {
3838
result = carrier.property(key);
3939
}

src/main/java/com/rabbitmq/client/amqp/observation/micrometer/PublishContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class PublishContext extends SenderContext<Message> {
3737
String routingKey,
3838
Message message,
3939
ObservationCollector.ConnectionInfo connectionInfo) {
40-
super((carrier, key, value) -> carrier.annotation(key, value));
40+
super((carrier, key, value) -> carrier.annotation(Utils.annotationKey(key), value));
4141
if (exchange == null && routingKey == null) {
4242
String to = message.to();
4343
String[] exRk = Utils.exchangeRoutingKeyFromTo(to);

src/main/java/com/rabbitmq/client/amqp/observation/micrometer/Utils.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@ static String[] exchangeRoutingKeyFromTo(String to) {
5656
return exRk;
5757
}
5858

59+
static String annotationKey(String key) {
60+
return "x-opt-" + key;
61+
}
62+
5963
// from Apache HttpComponents PercentCodec
6064
private static final int RADIX = 16;
6165

0 commit comments

Comments
 (0)