Polish (#6715)

Signed-off-by: Johnny Lim <[email protected]>

Author: izeye

benchmarks/benchmarks-core/src/jmh/java/io/micrometer/benchmark/core/instrument/config/filter/MeterFilterRenameTagBenchmark.java

@@ -109,7 +109,6 @@ public void setUp() {
         instanceMask = instances.length - 1;
     }
 
-    @SuppressWarnings("java:S1117")
     @Benchmark
     public Meter.Id baseline() {
         int index = sample += SAMPLE_STEP;

docs/modules/ROOT/pages/concepts/meter-filters.adoc

@@ -151,7 +151,7 @@ Spring Boot offers property-based filters for configuring SLOs, percentiles, and
 
 == Apply MeterFilters conditionally
 
-It is a common use-case to apply MeterFilters only for a selection of Meters (for example for ones that has a certain name or starts with a given prefix).
+It is a common use-case to apply MeterFilters only for a selection of Meters (for example, for ones that have a certain name or start with a given prefix).
 In order to do this, Micrometer provides a convenience method `forMeters(Predicate<Meter.Id> predicate, MeterFilter delegate)` that enables the provided (delegate) filter for the Meters selected by the predicate.
 
 See the following example:

micrometer-core/src/main/java/io/micrometer/core/instrument/AbstractTimerBuilder.java

@@ -32,13 +32,17 @@
 @SuppressWarnings("unchecked")
 public abstract class AbstractTimerBuilder<B extends AbstractTimerBuilder<B>> {
 
+    private static final Duration DEFAULT_MINIMUM_EXPECTED_DURATION = Duration.ofMillis(1);
+
+    private static final Duration DEFAULT_MAXIMUM_EXPECTED_DURATION = Duration.ofSeconds(30);
+
     /**
      * Default {@link DistributionStatisticConfig} used with {@link Timer} if not
      * overridden.
      */
     static final DistributionStatisticConfig DEFAULT_DISTRIBUTION_CONFIG = DistributionStatisticConfig.builder()
-        .minimumExpectedValue((double) Duration.ofMillis(1).toNanos())
-        .maximumExpectedValue((double) Duration.ofSeconds(30).toNanos())
+        .minimumExpectedValue((double) DEFAULT_MINIMUM_EXPECTED_DURATION.toNanos())
+        .maximumExpectedValue((double) DEFAULT_MAXIMUM_EXPECTED_DURATION.toNanos())
         .build();
 
     protected final String name;
@@ -54,8 +58,8 @@ public abstract class AbstractTimerBuilder<B extends AbstractTimerBuilder<B>> {
     protected AbstractTimerBuilder(String name) {
         this.name = name;
         this.distributionConfigBuilder = new DistributionStatisticConfig.Builder();
-        minimumExpectedValue(Duration.ofMillis(1));
-        maximumExpectedValue(Duration.ofSeconds(30));
+        minimumExpectedValue(DEFAULT_MINIMUM_EXPECTED_DURATION);
+        maximumExpectedValue(DEFAULT_MAXIMUM_EXPECTED_DURATION);
     }
 
     /**

micrometer-core/src/main/java/io/micrometer/core/instrument/LongTaskTimer.java

@@ -287,9 +287,13 @@ abstract class Sample {
      */
     class Builder {
 
+        private static final Duration DEFAULT_MINIMUM_EXPECTED_DURATION = Duration.ofMinutes(2);
+
+        private static final Duration DEFAULT_MAXIMUM_EXPECTED_DURATION = Duration.ofHours(2);
+
         static final DistributionStatisticConfig DEFAULT_DISTRIBUTION_CONFIG = DistributionStatisticConfig.builder()
-            .minimumExpectedValue((double) Duration.ofMinutes(2).toNanos())
-            .maximumExpectedValue((double) Duration.ofHours(2).toNanos())
+            .minimumExpectedValue((double) DEFAULT_MINIMUM_EXPECTED_DURATION.toNanos())
+            .maximumExpectedValue((double) DEFAULT_MAXIMUM_EXPECTED_DURATION.toNanos())
             .build();
 
         private final String name;
@@ -302,8 +306,8 @@ class Builder {
 
         private Builder(String name) {
             this.name = name;
-            minimumExpectedValue(Duration.ofMinutes(2));
-            maximumExpectedValue(Duration.ofHours(2));
+            minimumExpectedValue(DEFAULT_MINIMUM_EXPECTED_DURATION);
+            maximumExpectedValue(DEFAULT_MAXIMUM_EXPECTED_DURATION);
         }
 
         /**

micrometer-core/src/main/java/io/micrometer/core/instrument/MeterRegistry.java

@@ -509,7 +509,7 @@ public DistributionSummary summary(String name, String... tags) {
      * @return A new or existing timer.
      */
     public Timer timer(String name, Iterable<Tag> tags) {
-        return this.timer(name, Tags.of(tags));
+        return timer(name, Tags.of(tags));
     }
 
     /**
@@ -531,7 +531,7 @@ public Timer timer(String name, String... tags) {
      * @since 1.16.0
      */
     public Timer timer(String name, Tags tags) {
-        return this.timer(new Meter.Id(name, tags, null, null, Meter.Type.TIMER),
+        return timer(new Meter.Id(name, tags, null, null, Meter.Type.TIMER),
                 AbstractTimerBuilder.DEFAULT_DISTRIBUTION_CONFIG, pauseDetector);
     }
 

micrometer-core/src/test/java/io/micrometer/core/instrument/MeterFilterTest.java

@@ -268,7 +268,7 @@ public Meter.Id map(Meter.Id id) {
     }
 
     @Test
-    void forPrefix() {
+    void forMeters() {
         Meter.Id primary = new Meter.Id("primary.gauge", Tags.of("ignored", "true", "other", "value"), null, null,
                 Meter.Type.GAUGE);
         Meter.Id secondary = new Meter.Id("secondary.gauge", Tags.of("ignored", "false"), null, null, Meter.Type.GAUGE);