Backport publishing metrics to 5.x

Fixes #374

Author: acogoluegnes

src/main/java/com/rabbitmq/client/MetricsCollector.java

@@ -36,13 +36,21 @@ public interface MetricsCollector {
 
     void basicPublish(Channel channel);
 
-    void basicPublishFailure(Channel channel, Throwable cause);
+    default void basicPublishFailure(Channel channel, Throwable cause) {
 
-    void basicPublishAck(Channel channel, long deliveryTag, boolean multiple);
+    }
 
-    void basicPublishNack(Channel channel, long deliveryTag, boolean multiple);
+    default void basicPublishAck(Channel channel, long deliveryTag, boolean multiple) {
 
-    void basicPublishUnrouted(Channel channel);
+    }
+
+    default void basicPublishNack(Channel channel, long deliveryTag, boolean multiple) {
+
+    }
+
+    default void basicPublishUnrouted(Channel channel) {
+
+    }
 
     void consumedMessage(Channel channel, long deliveryTag, boolean autoAck);
 

src/main/java/com/rabbitmq/client/impl/AbstractMetricsCollector.java

@@ -140,9 +140,9 @@ public void basicPublishNack(Channel channel, long deliveryTag, boolean multiple
     @Override
     public void basicPublishUnrouted(Channel channel) {
         try {
-            markPublishedMessageNotRouted();
+            markPublishedMessageUnrouted();
         } catch(Exception e) {
-            LOGGER.info("Error while computing metrics in markPublishedMessageNotRouted: " + e.getMessage());
+            LOGGER.info("Error while computing metrics in markPublishedMessageUnrouted: " + e.getMessage());
         }
     }
 
@@ -407,5 +407,5 @@ private ChannelState(Channel channel) {
     /**
      * Marks the event of a published message not being routed.
      */
-    protected abstract void markPublishedMessageNotRouted();
+    protected abstract void markPublishedMessageUnrouted();
 }

src/main/java/com/rabbitmq/client/impl/MicrometerMetricsCollector.java

@@ -148,7 +148,7 @@ protected void markMessagePublishNotAcknowledged() {
     }
 
     @Override
-    protected void markPublishedMessageNotRouted() {
+    protected void markPublishedMessageUnrouted() {
         unroutedPublishedMessages.increment();
     }
 

src/main/java/com/rabbitmq/client/impl/StandardMetricsCollector.java

@@ -125,7 +125,7 @@ protected void markMessagePublishNotAcknowledged() {
     }
 
     @Override
-    protected void markPublishedMessageNotRouted() {
+    protected void markPublishedMessageUnrouted() {
         publishUnroutedMessages.mark();
     }