Merge branch '1.8.x' into 1.9.x

micrometer-metrics · Jun 10, 2022 · efbd6cf · efbd6cf
2 parents dc22cca + 5dd6ef6
commit efbd6cf
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 39 deletions.
diff --git a/...er-registry-statsd/src/test/java/io/micrometer/statsd/StatsdMeterRegistryPublishTest.java b/...er-registry-statsd/src/test/java/io/micrometer/statsd/StatsdMeterRegistryPublishTest.java
@@ -279,18 +279,18 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise)
     @ParameterizedTest
     @EnumSource(StatsdProtocol.class)
     void receiveParallelMetricsSuccessfully(StatsdProtocol protocol) throws InterruptedException {
-        final int N = 10;
+        final int n = 10;
 
         skipUdsTestOnWindows(protocol);
-        serverLatch = new CountDownLatch(N);
+        serverLatch = new CountDownLatch(n);
         server = startServer(protocol, 0);
         final int port = getPort(protocol);
 
         meterRegistry = new StatsdMeterRegistry(getUnbufferedConfig(protocol, port), Clock.SYSTEM);
         startRegistryAndWaitForClient();
         Counter counter = Counter.builder("my.counter").register(meterRegistry);
 
-        IntStream.range(0, N).parallel().forEach(ignored -> counter.increment());
+        IntStream.range(0, n).parallel().forEach(ignored -> counter.increment());
 
         assertThat(serverLatch.await(3, TimeUnit.SECONDS)).isTrue();
     }

diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeTimer.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeTimer.java
@@ -46,15 +46,15 @@ class CompositeTimer extends AbstractCompositeMeter<Timer> implements Timer {
 
     @Override
     public void record(long amount, TimeUnit unit) {
-        for (Timer ds : getChildren()) {
-            ds.record(amount, unit);
+        for (Timer timer : getChildren()) {
+            timer.record(amount, unit);
         }
     }
 
     @Override
     public void record(Duration duration) {
-        for (Timer ds : getChildren()) {
-            ds.record(duration);
+        for (Timer timer : getChildren()) {
+            timer.record(duration);
         }
     }
 

diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/distribution/TimeWindowMax.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/distribution/TimeWindowMax.java
@@ -38,7 +38,7 @@ public class TimeWindowMax {
 
     private final long durationBetweenRotatesMillis;
 
-    private AtomicLong[] ringBuffer;
+    private final AtomicLong[] ringBuffer;
 
     private int currentBucket;
 

diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/distribution/TimeWindowSum.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/distribution/TimeWindowSum.java
@@ -32,7 +32,7 @@ public class TimeWindowSum {
 
     private final long durationBetweenRotatesMillis;
 
-    private AtomicLong[] ringBuffer;
+    private final AtomicLong[] ringBuffer;
 
     private int currentBucket;
 

diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/push/PushMeterRegistry.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/push/PushMeterRegistry.java
@@ -54,8 +54,7 @@ private void publishSafely() {
             publish();
         }
         catch (Throwable e) {
-            logger.warn("Unexpected exception thrown while publishing metrics for " + this.getClass().getSimpleName(),
-                    e);
+            logger.warn("Unexpected exception thrown while publishing metrics for " + getClass().getSimpleName(), e);
         }
     }
 
@@ -72,7 +71,7 @@ public void start(ThreadFactory threadFactory) {
             stop();
 
         if (config.enabled()) {
-            logger.info("publishing metrics for " + this.getClass().getSimpleName() + " every "
+            logger.info("publishing metrics for " + getClass().getSimpleName() + " every "
                     + TimeUtils.format(config.step()));
 
             scheduledExecutorService = Executors.newSingleThreadScheduledExecutor(threadFactory);

diff --git a/micrometer-core/src/test/java/io/micrometer/core/aop/CountedAspectTest.java b/micrometer-core/src/test/java/io/micrometer/core/aop/CountedAspectTest.java
@@ -56,8 +56,8 @@ void countedWithSuccessfulMetrics() {
         countedService.succeedWithMetrics();
 
         Counter counter = meterRegistry.get("metric.success").tag("method", "succeedWithMetrics")
-                .tag("class", this.getClass().getName() + "$CountedService").tag("extra", "tag")
-                .tag("result", "success").counter();
+                .tag("class", getClass().getName() + "$CountedService").tag("extra", "tag").tag("result", "success")
+                .counter();
 
         assertThat(counter.count()).isOne();
         assertThat(counter.getId().getDescription()).isNull();
@@ -82,7 +82,7 @@ void countedWithFailure() {
         }
 
         Counter counter = meterRegistry.get("metric.failing").tag("method", "fail")
-                .tag("class", this.getClass().getName() + "$CountedService").tag("exception", "RuntimeException")
+                .tag("class", getClass().getName() + "$CountedService").tag("exception", "RuntimeException")
                 .tag("result", "failure").counter();
 
         assertThat(counter.count()).isOne();
@@ -119,14 +119,14 @@ void countedWithSuccessfulMetricsWhenCompleted() {
         CompletableFuture<?> completableFuture = asyncCountedService.succeedWithMetrics(guardedResult);
 
         assertThat(meterRegistry.find("metric.success").tag("method", "succeedWithMetrics")
-                .tag("class", this.getClass().getName() + "$AsyncCountedService").tag("extra", "tag")
+                .tag("class", getClass().getName() + "$AsyncCountedService").tag("extra", "tag")
                 .tag("exception", "none").tag("result", "success").counter()).isNull();
 
         guardedResult.complete();
         completableFuture.join();
 
         Counter counterAfterCompletion = meterRegistry.get("metric.success").tag("method", "succeedWithMetrics")
-                .tag("class", this.getClass().getName() + "$AsyncCountedService").tag("extra", "tag")
+                .tag("class", getClass().getName() + "$AsyncCountedService").tag("extra", "tag")
                 .tag("exception", "none").tag("result", "success").counter();
 
         assertThat(counterAfterCompletion.count()).isOne();
@@ -139,14 +139,14 @@ void countedWithFailureWhenCompleted() {
         CompletableFuture<?> completableFuture = asyncCountedService.fail(guardedResult);
 
         assertThat(meterRegistry.find("metric.failing").tag("method", "fail")
-                .tag("class", this.getClass().getName() + "$AsyncCountedService").tag("exception", "RuntimeException")
+                .tag("class", getClass().getName() + "$AsyncCountedService").tag("exception", "RuntimeException")
                 .tag("result", "failure").counter()).isNull();
 
         guardedResult.complete(new RuntimeException());
         assertThatThrownBy(completableFuture::join).isInstanceOf(RuntimeException.class);
 
         Counter counter = meterRegistry.get("metric.failing").tag("method", "fail")
-                .tag("class", this.getClass().getName() + "$AsyncCountedService").tag("exception", "RuntimeException")
+                .tag("class", getClass().getName() + "$AsyncCountedService").tag("exception", "RuntimeException")
                 .tag("result", "failure").counter();
 
         assertThat(counter.count()).isOne();

diff --git a/micrometer-core/src/test/java/io/micrometer/core/aop/TimedAspectTest.java b/micrometer-core/src/test/java/io/micrometer/core/aop/TimedAspectTest.java
@@ -50,7 +50,7 @@ void timeMethod() {
 
         service.call();
 
-        assertThat(registry.get("call").tag("class", this.getClass().getName() + "$TimedService").tag("method", "call")
+        assertThat(registry.get("call").tag("class", getClass().getName() + "$TimedService").tag("method", "call")
                 .tag("extra", "tag").timer().count()).isEqualTo(1);
     }
 
@@ -79,7 +79,7 @@ void timeMethodWithLongTaskTimer() {
 
         service.longCall();
 
-        assertThat(registry.get("longCall").tag("class", this.getClass().getName() + "$TimedService")
+        assertThat(registry.get("longCall").tag("class", getClass().getName() + "$TimedService")
                 .tag("method", "longCall").tag("extra", "tag").longTaskTimers().size()).isEqualTo(1);
     }
 
@@ -95,7 +95,7 @@ void timeMethodFailure() {
         service.call();
 
         assertThatExceptionOfType(MeterNotFoundException.class).isThrownBy(() -> {
-            failingRegistry.get("call").tag("class", this.getClass().getName() + "$TimedService").tag("method", "call")
+            failingRegistry.get("call").tag("class", getClass().getName() + "$TimedService").tag("method", "call")
                     .tag("extra", "tag").timer();
         });
     }
@@ -112,7 +112,7 @@ void timeMethodFailureWithLongTaskTimer() {
         service.longCall();
 
         assertThatExceptionOfType(MeterNotFoundException.class).isThrownBy(() -> {
-            failingRegistry.get("longCall").tag("class", this.getClass().getName() + "$TimedService")
+            failingRegistry.get("longCall").tag("class", getClass().getName() + "$TimedService")
                     .tag("method", "longCall").tag("extra", "tag").longTaskTimer();
         });
     }
@@ -129,14 +129,14 @@ void timeMethodWhenCompleted() {
         GuardedResult guardedResult = new GuardedResult();
         CompletableFuture<?> completableFuture = service.call(guardedResult);
 
-        assertThat(registry.find("call").tag("class", this.getClass().getName() + "$AsyncTimedService")
-                .tag("method", "call").tag("extra", "tag").tag("exception", "none").timer()).isNull();
+        assertThat(registry.find("call").tag("class", getClass().getName() + "$AsyncTimedService").tag("method", "call")
+                .tag("extra", "tag").tag("exception", "none").timer()).isNull();
 
         guardedResult.complete();
         completableFuture.join();
 
-        assertThat(registry.get("call").tag("class", this.getClass().getName() + "$AsyncTimedService")
-                .tag("method", "call").tag("extra", "tag").tag("exception", "none").timer().count()).isEqualTo(1);
+        assertThat(registry.get("call").tag("class", getClass().getName() + "$AsyncTimedService").tag("method", "call")
+                .tag("extra", "tag").tag("exception", "none").timer().count()).isEqualTo(1);
     }
 
     @Test
@@ -151,15 +151,14 @@ void timeMethodWhenCompletedExceptionally() {
         GuardedResult guardedResult = new GuardedResult();
         CompletableFuture<?> completableFuture = service.call(guardedResult);
 
-        assertThat(registry.find("call").tag("class", this.getClass().getName() + "$AsyncTimedService")
-                .tag("method", "call").tag("extra", "tag").tag("exception", "NullPointerException").timer()).isNull();
+        assertThat(registry.find("call").tag("class", getClass().getName() + "$AsyncTimedService").tag("method", "call")
+                .tag("extra", "tag").tag("exception", "NullPointerException").timer()).isNull();
 
         guardedResult.complete(new NullPointerException());
         catchThrowableOfType(completableFuture::join, CompletionException.class);
 
-        assertThat(registry.get("call").tag("class", this.getClass().getName() + "$AsyncTimedService")
-                .tag("method", "call").tag("extra", "tag").tag("exception", "NullPointerException").timer().count())
-                        .isEqualTo(1);
+        assertThat(registry.get("call").tag("class", getClass().getName() + "$AsyncTimedService").tag("method", "call")
+                .tag("extra", "tag").tag("exception", "NullPointerException").timer().count()).isEqualTo(1);
     }
 
     @Test
@@ -174,13 +173,13 @@ void timeMethodWithLongTaskTimerWhenCompleted() {
         GuardedResult guardedResult = new GuardedResult();
         CompletableFuture<?> completableFuture = service.longCall(guardedResult);
 
-        assertThat(registry.find("longCall").tag("class", this.getClass().getName() + "$AsyncTimedService")
+        assertThat(registry.find("longCall").tag("class", getClass().getName() + "$AsyncTimedService")
                 .tag("method", "longCall").tag("extra", "tag").longTaskTimer().activeTasks()).isEqualTo(1);
 
         guardedResult.complete();
         completableFuture.join();
 
-        assertThat(registry.get("longCall").tag("class", this.getClass().getName() + "$AsyncTimedService")
+        assertThat(registry.get("longCall").tag("class", getClass().getName() + "$AsyncTimedService")
                 .tag("method", "longCall").tag("extra", "tag").longTaskTimer().activeTasks()).isEqualTo(0);
     }
 
@@ -196,13 +195,13 @@ void timeMethodWithLongTaskTimerWhenCompletedExceptionally() {
         GuardedResult guardedResult = new GuardedResult();
         CompletableFuture<?> completableFuture = service.longCall(guardedResult);
 
-        assertThat(registry.find("longCall").tag("class", this.getClass().getName() + "$AsyncTimedService")
+        assertThat(registry.find("longCall").tag("class", getClass().getName() + "$AsyncTimedService")
                 .tag("method", "longCall").tag("extra", "tag").longTaskTimer().activeTasks()).isEqualTo(1);
 
         guardedResult.complete(new NullPointerException());
         catchThrowableOfType(completableFuture::join, CompletionException.class);
 
-        assertThat(registry.get("longCall").tag("class", this.getClass().getName() + "$AsyncTimedService")
+        assertThat(registry.get("longCall").tag("class", getClass().getName() + "$AsyncTimedService")
                 .tag("method", "longCall").tag("extra", "tag").longTaskTimer().activeTasks()).isEqualTo(0);
     }
 
@@ -220,8 +219,8 @@ void timeMethodFailureWhenCompletedExceptionally() {
         guardedResult.complete();
         completableFuture.join();
 
-        assertThatExceptionOfType(MeterNotFoundException.class).isThrownBy(
-                () -> failingRegistry.get("call").tag("class", this.getClass().getName() + "$AsyncTimedService")
+        assertThatExceptionOfType(MeterNotFoundException.class)
+                .isThrownBy(() -> failingRegistry.get("call").tag("class", getClass().getName() + "$AsyncTimedService")
                         .tag("method", "call").tag("extra", "tag").tag("exception", "none").timer());
     }
 
@@ -240,7 +239,7 @@ void timeMethodFailureWithLongTaskTimerWhenCompleted() {
         completableFuture.join();
 
         assertThatExceptionOfType(MeterNotFoundException.class).isThrownBy(() -> {
-            failingRegistry.get("longCall").tag("class", this.getClass().getName() + "$AsyncTimedService")
+            failingRegistry.get("longCall").tag("class", getClass().getName() + "$AsyncTimedService")
                     .tag("method", "longCall").tag("extra", "tag").longTaskTimer();
         });
     }