Skip to content

Commit 7da405d

Browse files
committed
Add protocol name and version tags on deliver operation
References #952 (cherry picked from commit 014dc65)
1 parent 468bb51 commit 7da405d

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

src/main/java/com/rabbitmq/client/observation/micrometer/DefaultDeliverObservationConvention.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@ private String source(String destination) {
5050
public KeyValues getLowCardinalityKeyValues(DeliverContext context) {
5151
return KeyValues.of(
5252
LowCardinalityTags.MESSAGING_OPERATION.withValue(this.operation),
53-
LowCardinalityTags.MESSAGING_SYSTEM.withValue("rabbitmq"));
53+
LowCardinalityTags.MESSAGING_SYSTEM.withValue("rabbitmq"),
54+
LowCardinalityTags.NET_PROTOCOL_NAME.withValue("amqp"),
55+
LowCardinalityTags.NET_PROTOCOL_VERSION.withValue("0.9.1"));
5456
}
5557

5658
@Override

src/test/java/com/rabbitmq/client/test/functional/MicrometerObservationCollectorMetrics.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,9 @@ public SampleTestRunnerConsumer yourCode() {
166166
.hasTag("messaging.rabbitmq.destination.routing_key", "metrics.queue")
167167
.hasTag("messaging.destination.name", "amq.default")
168168
.hasTag("messaging.source.name", "metrics.queue")
169-
.hasTag("messaging.message.payload_size_bytes", String.valueOf(PAYLOAD.length));
169+
.hasTag("messaging.message.payload_size_bytes", String.valueOf(PAYLOAD.length))
170+
.hasTag("net.protocol.name", "amqp")
171+
.hasTag("net.protocol.version", "0.9.1");
170172
waitAtMost(
171173
() ->
172174
getMeterRegistry().find("rabbitmq.publish").timer() != null
@@ -239,7 +241,9 @@ public SampleTestRunnerConsumer yourCode() {
239241
.hasTag("messaging.rabbitmq.destination.routing_key", "metrics.queue")
240242
.hasTag("messaging.destination.name", "amq.default")
241243
.hasTag("messaging.source.name", "metrics.queue")
242-
.hasTag("messaging.message.payload_size_bytes", String.valueOf(PAYLOAD.length));
244+
.hasTag("messaging.message.payload_size_bytes", String.valueOf(PAYLOAD.length))
245+
.hasTag("net.protocol.name", "amqp")
246+
.hasTag("net.protocol.version", "0.9.1");
243247
List<FinishedSpan> pollingSpans =
244248
spans.stream()
245249
.filter(f -> f.size() == 1)
@@ -323,7 +327,9 @@ public SampleTestRunnerConsumer yourCode() {
323327
.hasTag("messaging.rabbitmq.destination.routing_key", "metrics.queue")
324328
.hasTag("messaging.destination.name", "amq.default")
325329
.hasTag("messaging.source.name", "metrics.queue")
326-
.hasTag("messaging.message.payload_size_bytes", String.valueOf(PAYLOAD.length));
330+
.hasTag("messaging.message.payload_size_bytes", String.valueOf(PAYLOAD.length))
331+
.hasTag("net.protocol.name", "amqp")
332+
.hasTag("net.protocol.version", "0.9.1");
327333
List<FinishedSpan> pollingSpans =
328334
spans.stream()
329335
.filter(f -> f.size() == 1)

0 commit comments

Comments
 (0)