Merge branch '5.1.x-stable'

acogoluegnes · acogoluegnes · commit 021bf5dc3775 · 2018-02-27T14:11:30.000+01:00
diff --git a/pom.xml b/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.6</micrometer.version>
+    <micrometer.version>1.0.0</micrometer.version>
     <commons-cli.version>1.1</commons-cli.version>
     <junit.version>4.12</junit.version>
     <awaitility.version>3.0.0</awaitility.version>
diff --git a/src/main/java/com/rabbitmq/client/impl/MicrometerMetricsCollector.java b/src/main/java/com/rabbitmq/client/impl/MicrometerMetricsCollector.java
@@ -69,7 +69,7 @@ public MicrometerMetricsCollector(final MeterRegistry registry, final String pre
     }
 
     public MicrometerMetricsCollector(final MeterRegistry registry, final String prefix, final String ... tags) {
-        this(registry, prefix, Tags.zip(tags));
+        this(registry, prefix, Tags.of(tags));
     }
 
     public MicrometerMetricsCollector(final MeterRegistry registry, final String prefix, final Iterable<Tag> tags) {

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public MicrometerMetricsCollector(final MeterRegistry registry, final String pre`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`public MicrometerMetricsCollector(final MeterRegistry registry, final String prefix, final String ... tags) {`
`72`		`- this(registry, prefix, Tags.zip(tags));`
	`72`	`+ this(registry, prefix, Tags.of(tags));`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`public MicrometerMetricsCollector(final MeterRegistry registry, final String prefix, final Iterable<Tag> tags) {`