Merge branch '4.x.x-stable' into 5.1.x-stable

Conflicts:
	pom.xml
	src/main/java/com/rabbitmq/client/impl/MicrometerMetricsCollector.java

Author: acogoluegnes

pom.xml

@@ -57,7 +57,7 @@
     <slf4j.version>1.7.25</slf4j.version>
     <metrics.version>3.2.4</metrics.version>
     <logback.version>1.2.3</logback.version>
-    <micrometer.version>1.0.0-rc.2</micrometer.version>
+    <micrometer.version>1.0.0-rc.6</micrometer.version>
     <commons-cli.version>1.1</commons-cli.version>
     <junit.version>4.12</junit.version>
     <awaitility.version>3.0.0</awaitility.version>

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

@@ -20,7 +20,11 @@
 import com.rabbitmq.client.MetricsCollector;
 import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.Tag;
+import io.micrometer.core.instrument.Tags;
 
+import java.util.Collection;
+import java.util.Collections;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Function;
 
@@ -62,7 +66,11 @@ public MicrometerMetricsCollector(MeterRegistry registry) {
     }
 
     public MicrometerMetricsCollector(final MeterRegistry registry, final String prefix) {
-        this(metric -> metric.create(registry, prefix));
+        this(metric -> metric.create(registry, prefix, new String[] {}));
+    }
+
+    public MicrometerMetricsCollector(final MeterRegistry registry, final String prefix, final String... tags) {
+        this(metric -> metric.create(registry, prefix, tags));
     }
 
     public MicrometerMetricsCollector(Function<Metrics, Object> metricsCreator) {
@@ -141,42 +149,56 @@ public Counter getRejectedMessages() {
     public enum Metrics {
         CONNECTIONS {
             @Override
-            Object create(MeterRegistry registry, String prefix) {
-                return registry.gauge(prefix + ".connections", new AtomicLong(0));
+            Object create(MeterRegistry registry, String prefix, String... tags) {
+                return registry.gauge(prefix + ".connections", tags(tags), new AtomicLong(0));
             }
         },
         CHANNELS {
             @Override
-            Object create(MeterRegistry registry, String prefix) {
-                return registry.gauge(prefix + ".channels", new AtomicLong(0));
+            Object create(MeterRegistry registry, String prefix, String... tags) {
+                return registry.gauge(prefix + ".channels", tags(tags), new AtomicLong(0));
             }
         },
         PUBLISHED_MESSAGES {
             @Override
-            Object create(MeterRegistry registry, String prefix) {
-                return registry.counter(prefix + ".published");
+            Object create(MeterRegistry registry, String prefix, String... tags) {
+                return registry.counter(prefix + ".published", tags);
             }
         },
         CONSUMED_MESSAGES {
             @Override
-            Object create(MeterRegistry registry, String prefix) {
-                return registry.counter(prefix + ".consumed");
+            Object create(MeterRegistry registry, String prefix, String... tags) {
+                return registry.counter(prefix + ".consumed", tags);
             }
         },
         ACKNOWLEDGED_MESSAGES {
             @Override
-            Object create(MeterRegistry registry, String prefix) {
-                return registry.counter(prefix + ".acknowledged");
+            Object create(MeterRegistry registry, String prefix, String... tags) {
+                return registry.counter(prefix + ".acknowledged", tags);
             }
         },
         REJECTED_MESSAGES {
             @Override
-            Object create(MeterRegistry registry, String prefix) {
-                return registry.counter(prefix + ".rejected");
+            Object create(MeterRegistry registry, String prefix, String... tags) {
+                return registry.counter(prefix + ".rejected", tags);
             }
         };
 
-        abstract Object create(MeterRegistry registry, String prefix);
+        Object create(MeterRegistry registry, String prefix) {
+            return this.create(registry, prefix, new String[] {});
+        }
+
+        abstract Object create(MeterRegistry registry, String prefix, String... tags);
+
+        private static Iterable<Tag> tags(String... tagStrings) {
+            Collection<Tag> tags;
+            if (tagStrings != null && tagStrings.length > 0) {
+                tags = Tags.zip(tagStrings);
+            } else {
+                tags = Collections.emptyList();
+            }
+            return tags;
+        }
     }
 
 }

src/test/java/com/rabbitmq/client/test/ClientTests.java

@@ -44,6 +44,7 @@
     SharedThreadPoolTest.class,
     DnsRecordIpAddressResolverTests.class,
     MetricsCollectorTest.class,
+    MicrometerMetricsCollectorTest.class,
     DnsSrvRecordAddressResolverTest.class,
     JavaNioTest.class,
     ConnectionFactoryTest.class,

src/test/java/com/rabbitmq/client/test/MicrometerMetricsCollectorTest.java

@@ -0,0 +1,71 @@
+// Copyright (c) 2018-Present Pivotal Software, Inc.  All rights reserved.
+//
+// This software, the RabbitMQ Java client library, is triple-licensed under the
+// Mozilla Public License 1.1 ("MPL"), the GNU General Public License version 2
+// ("GPL") and the Apache License version 2 ("ASL"). For the MPL, please see
+// LICENSE-MPL-RabbitMQ. For the GPL, please see LICENSE-GPL2.  For the ASL,
+// please see LICENSE-APACHE2.
+//
+// This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND,
+// either express or implied. See the LICENSE file for specific language governing
+// rights and limitations of this software.
+//
+// If you have any questions regarding licensing, please contact us at
+// info@rabbitmq.com.
+
+package com.rabbitmq.client.test;
+
+import com.rabbitmq.client.impl.MicrometerMetricsCollector;
+import io.micrometer.core.instrument.Meter;
+import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Iterator;
+
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
+/**
+ *
+ */
+public class MicrometerMetricsCollectorTest {
+
+    SimpleMeterRegistry registry;
+
+    MicrometerMetricsCollector collector;
+
+    @Before
+    public void init() {
+        registry = new SimpleMeterRegistry();
+    }
+
+    @Test
+    public void noTag() {
+        collector = new MicrometerMetricsCollector(registry, "rabbitmq");
+        for (Meter meter : registry.getMeters()) {
+            assertThat(size(meter.getId().getTags()), is(0));
+        }
+    }
+
+    @Test
+    public void tags() {
+        collector = new MicrometerMetricsCollector(registry, "rabbitmq", "uri", "/api/users");
+        for (Meter meter : registry.getMeters()) {
+            assertThat(size(meter.getId().getTags()), is(1));
+        }
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void tagsMustBeKeyValuePairs() {
+        collector = new MicrometerMetricsCollector(registry, "rabbitmq", "uri");
+    }
+
+    static int size(Iterable<?> iterable) {
+        Iterator<?> iterator = iterable.iterator();
+        int i = 0;
+        for ( ; iterator.hasNext() ; ++i ) iterator.next();
+        return i;
+    }
+
+}