diff --git a/src/main/java/com/rabbitmq/client/observation/micrometer/DefaultDeliverObservationConvention.java b/src/main/java/com/rabbitmq/client/observation/micrometer/DefaultDeliverObservationConvention.java index 55a17e5d8..1bfa512b8 100644 --- a/src/main/java/com/rabbitmq/client/observation/micrometer/DefaultDeliverObservationConvention.java +++ b/src/main/java/com/rabbitmq/client/observation/micrometer/DefaultDeliverObservationConvention.java @@ -50,7 +50,9 @@ private String source(String destination) { public KeyValues getLowCardinalityKeyValues(DeliverContext context) { return KeyValues.of( LowCardinalityTags.MESSAGING_OPERATION.withValue(this.operation), - LowCardinalityTags.MESSAGING_SYSTEM.withValue("rabbitmq")); + LowCardinalityTags.MESSAGING_SYSTEM.withValue("rabbitmq"), + LowCardinalityTags.NET_PROTOCOL_NAME.withValue("amqp"), + LowCardinalityTags.NET_PROTOCOL_VERSION.withValue("0.9.1")); } @Override diff --git a/src/test/java/com/rabbitmq/client/test/functional/MicrometerObservationCollectorMetrics.java b/src/test/java/com/rabbitmq/client/test/functional/MicrometerObservationCollectorMetrics.java index 40dde8609..36de057b9 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/MicrometerObservationCollectorMetrics.java +++ b/src/test/java/com/rabbitmq/client/test/functional/MicrometerObservationCollectorMetrics.java @@ -166,7 +166,9 @@ public SampleTestRunnerConsumer yourCode() { .hasTag("messaging.rabbitmq.destination.routing_key", "metrics.queue") .hasTag("messaging.destination.name", "amq.default") .hasTag("messaging.source.name", "metrics.queue") - .hasTag("messaging.message.payload_size_bytes", String.valueOf(PAYLOAD.length)); + .hasTag("messaging.message.payload_size_bytes", String.valueOf(PAYLOAD.length)) + .hasTag("net.protocol.name", "amqp") + .hasTag("net.protocol.version", "0.9.1"); waitAtMost( () -> getMeterRegistry().find("rabbitmq.publish").timer() != null @@ -239,7 +241,9 @@ public SampleTestRunnerConsumer yourCode() { .hasTag("messaging.rabbitmq.destination.routing_key", "metrics.queue") .hasTag("messaging.destination.name", "amq.default") .hasTag("messaging.source.name", "metrics.queue") - .hasTag("messaging.message.payload_size_bytes", String.valueOf(PAYLOAD.length)); + .hasTag("messaging.message.payload_size_bytes", String.valueOf(PAYLOAD.length)) + .hasTag("net.protocol.name", "amqp") + .hasTag("net.protocol.version", "0.9.1"); List pollingSpans = spans.stream() .filter(f -> f.size() == 1) @@ -323,7 +327,9 @@ public SampleTestRunnerConsumer yourCode() { .hasTag("messaging.rabbitmq.destination.routing_key", "metrics.queue") .hasTag("messaging.destination.name", "amq.default") .hasTag("messaging.source.name", "metrics.queue") - .hasTag("messaging.message.payload_size_bytes", String.valueOf(PAYLOAD.length)); + .hasTag("messaging.message.payload_size_bytes", String.valueOf(PAYLOAD.length)) + .hasTag("net.protocol.name", "amqp") + .hasTag("net.protocol.version", "0.9.1"); List pollingSpans = spans.stream() .filter(f -> f.size() == 1)