Merge branch '1.13.x'

Author: shakuzen

benchmarks/benchmarks-core/src/jmh/java/io/micrometer/benchmark/core/CounterBenchmark.java

@@ -42,10 +42,6 @@ public static void main(String[] args) throws RunnerException {
         new Runner(opt).run();
     }
 
-    private int x = 923;
-
-    private int y = 123;
-
     private MeterRegistry registry;
 
     private Counter counter;
@@ -57,20 +53,9 @@ public void setup() {
     }
 
     @Benchmark
-    public int countSum() {
+    public double countSum() {
         counter.increment();
-        return sum();
-    }
-
-    @Benchmark
-    public int countSumWithRegistryLookup() {
-        registry.counter("counter").increment();
-        return sum();
-    }
-
-    @Benchmark
-    public int sum() {
-        return x + y;
+        return counter.count();
     }
 
 }

benchmarks/benchmarks-core/src/jmh/java/io/micrometer/benchmark/core/TagsBenchmark.java

@@ -81,13 +81,13 @@ public Tags tagsOfUnorderedTagsSet2() {
     }
 
     @Benchmark
-    public void of() {
-        Tags.of("key", "value", "key2", "value2", "key3", "value3", "key4", "value4", "key5", "value5");
+    public Tags of() {
+        return Tags.of("key", "value", "key2", "value2", "key3", "value3", "key4", "value4", "key5", "value5");
     }
 
     @Benchmark
-    public void dotAnd() {
-        Tags.of("key", "value").and("key2", "value2", "key3", "value3", "key4", "value4", "key5", "value5");
+    public Tags dotAnd() {
+        return Tags.of("key", "value").and("key2", "value2", "key3", "value3", "key4", "value4", "key5", "value5");
     }
 
     public static void main(String[] args) throws RunnerException {

benchmarks/benchmarks-core/src/jmh/java/io/micrometer/benchmark/core/TimerBenchmark.java

@@ -46,10 +46,6 @@ public static void main(String[] args) throws RunnerException {
 
     private Timer timer;
 
-    int x = 923;
-
-    int y = 123;
-
     @Setup
     public void setup() {
         registry = new PrometheusMeterRegistry(PrometheusConfig.DEFAULT);
@@ -58,25 +54,23 @@ public void setup() {
 
     @Benchmark
     public int sumTimedWithSupplier() {
-        return timer.record(this::sum);
+        return timer.record(this::doSomething);
     }
 
     @Benchmark
-    public int sumTimedWithSample() {
+    public long sumTimedWithSample() {
         Timer.Sample sample = Timer.start(registry);
-        int sum = sum();
-        sample.stop(timer);
-        return sum;
+        doSomething();
+        return sample.stop(timer);
     }
 
     @Benchmark
     public int sumTimedWithRegistryLookup() {
-        return registry.timer("timer").record(this::sum);
+        return registry.timer("timer").record(this::doSomething);
     }
 
-    @Benchmark
-    public int sum() {
-        return x + y;
+    int doSomething() {
+        return 923 + 123;
     }
 
 }