Merge branch '1.7.x' into 1.8.x

micrometer-metrics · Mar 17, 2022 · f3b707f · f3b707f
2 parents 15fe824 + 5262c0f
commit f3b707f
Show file tree

Hide file tree

Showing 24 changed files with 85 additions and 217 deletions.
diff --git a/...tations/micrometer-registry-atlas/src/main/java/io/micrometer/atlas/SpectatorCounter.java b/...tations/micrometer-registry-atlas/src/main/java/io/micrometer/atlas/SpectatorCounter.java
@@ -18,7 +18,6 @@
 import io.micrometer.core.instrument.AbstractMeter;
 import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.Meter;
-import io.micrometer.core.instrument.util.MeterEquivalence;
 
 public class SpectatorCounter extends AbstractMeter implements Counter {
     private com.netflix.spectator.api.Counter counter;
@@ -37,15 +36,4 @@ public void increment(double amount) {
     public double count() {
         return counter.count();
     }
-
-    @SuppressWarnings("EqualsWhichDoesntCheckParameterClass")
-    @Override
-    public boolean equals(Object o) {
-        return MeterEquivalence.equals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return MeterEquivalence.hashCode(this);
-    }
 }
diff --git a/...ometer-registry-atlas/src/main/java/io/micrometer/atlas/SpectatorDistributionSummary.java b/...ometer-registry-atlas/src/main/java/io/micrometer/atlas/SpectatorDistributionSummary.java
@@ -20,8 +20,6 @@
 import io.micrometer.core.instrument.AbstractDistributionSummary;
 import io.micrometer.core.instrument.Clock;
 import io.micrometer.core.instrument.distribution.DistributionStatisticConfig;
-import io.micrometer.core.instrument.util.MeterEquivalence;
-import io.micrometer.core.lang.Nullable;
 
 import static java.util.stream.StreamSupport.stream;
 
@@ -68,15 +66,4 @@ public double max() {
 
         return Double.NaN;
     }
-
-    @SuppressWarnings("EqualsWhichDoesntCheckParameterClass")
-    @Override
-    public boolean equals(@Nullable Object o) {
-        return MeterEquivalence.equals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return MeterEquivalence.hashCode(this);
-    }
 }
diff --git a/...entations/micrometer-registry-atlas/src/main/java/io/micrometer/atlas/SpectatorGauge.java b/...entations/micrometer-registry-atlas/src/main/java/io/micrometer/atlas/SpectatorGauge.java
@@ -17,7 +17,6 @@
 
 import io.micrometer.core.instrument.AbstractMeter;
 import io.micrometer.core.instrument.Gauge;
-import io.micrometer.core.instrument.util.MeterEquivalence;
 
 public class SpectatorGauge extends AbstractMeter implements Gauge {
     private com.netflix.spectator.api.Gauge gauge;
@@ -31,15 +30,4 @@ public class SpectatorGauge extends AbstractMeter implements Gauge {
     public double value() {
         return gauge.value();
     }
-
-    @SuppressWarnings("EqualsWhichDoesntCheckParameterClass")
-    @Override
-    public boolean equals(Object o) {
-        return MeterEquivalence.equals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return MeterEquivalence.hashCode(this);
-    }
 }
diff --git a/...s/micrometer-registry-atlas/src/main/java/io/micrometer/atlas/SpectatorLongTaskTimer.java b/...s/micrometer-registry-atlas/src/main/java/io/micrometer/atlas/SpectatorLongTaskTimer.java
@@ -20,7 +20,6 @@
 import io.micrometer.core.instrument.Meter;
 import io.micrometer.core.instrument.distribution.DistributionStatisticConfig;
 import io.micrometer.core.instrument.internal.DefaultLongTaskTimer;
-import io.micrometer.core.instrument.util.MeterEquivalence;
 import io.micrometer.core.instrument.util.TimeUtils;
 
 import java.util.concurrent.TimeUnit;
@@ -49,17 +48,6 @@ public int activeTasks() {
         return timer.activeTasks();
     }
 
-    @SuppressWarnings("EqualsWhichDoesntCheckParameterClass")
-    @Override
-    public boolean equals(Object o) {
-        return MeterEquivalence.equals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return MeterEquivalence.hashCode(this);
-    }
-
     class SpectatorSample extends Sample {
         private final Sample delegate;
         private final long taskId;

diff --git a/...r-registry-opentsdb/src/main/java/io/micrometer/opentsdb/OpenTSDBDistributionSummary.java b/...r-registry-opentsdb/src/main/java/io/micrometer/opentsdb/OpenTSDBDistributionSummary.java
@@ -18,7 +18,6 @@
 import io.micrometer.core.instrument.AbstractDistributionSummary;
 import io.micrometer.core.instrument.Clock;
 import io.micrometer.core.instrument.distribution.*;
-import io.micrometer.core.instrument.util.MeterEquivalence;
 import io.micrometer.core.lang.Nullable;
 
 import java.time.Duration;
@@ -96,17 +95,6 @@ public double max() {
         return max.poll();
     }
 
-    @SuppressWarnings("EqualsWhichDoesntCheckParameterClass")
-    @Override
-    public boolean equals(@Nullable Object o) {
-        return MeterEquivalence.equals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return MeterEquivalence.hashCode(this);
-    }
-
     /**
      * For Prometheus we cannot use the histogram counts from HistogramSnapshot, as it is based on a
      * rolling histogram. Prometheus requires a histogram that accumulates values over the lifetime of the app.

diff --git a/...rometer-registry-prometheus/src/main/java/io/micrometer/prometheus/PrometheusCounter.java b/...rometer-registry-prometheus/src/main/java/io/micrometer/prometheus/PrometheusCounter.java
@@ -18,7 +18,6 @@
 import io.micrometer.core.instrument.AbstractMeter;
 import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.Meter;
-import io.micrometer.core.instrument.util.MeterEquivalence;
 
 import java.util.concurrent.atomic.DoubleAdder;
 
@@ -39,15 +38,4 @@ public void increment(double amount) {
     public double count() {
         return count.doubleValue();
     }
-
-    @SuppressWarnings("EqualsWhichDoesntCheckParameterClass")
-    @Override
-    public boolean equals(Object o) {
-        return MeterEquivalence.equals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return MeterEquivalence.hashCode(this);
-    }
 }
diff --git a/...stry-prometheus/src/main/java/io/micrometer/prometheus/PrometheusDistributionSummary.java b/...stry-prometheus/src/main/java/io/micrometer/prometheus/PrometheusDistributionSummary.java
@@ -18,7 +18,6 @@
 import io.micrometer.core.instrument.AbstractDistributionSummary;
 import io.micrometer.core.instrument.Clock;
 import io.micrometer.core.instrument.distribution.*;
-import io.micrometer.core.instrument.util.MeterEquivalence;
 import io.micrometer.core.lang.Nullable;
 
 import java.time.Duration;
@@ -97,17 +96,6 @@ public HistogramFlavor histogramFlavor() {
         return histogramFlavor;
     }
 
-    @SuppressWarnings("EqualsWhichDoesntCheckParameterClass")
-    @Override
-    public boolean equals(@Nullable Object o) {
-        return MeterEquivalence.equals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return MeterEquivalence.hashCode(this);
-    }
-
     /**
      * For Prometheus we cannot use the histogram counts from HistogramSnapshot, as it is based on a
      * rolling histogram. Prometheus requires a histogram that accumulates values over the lifetime of the app.

diff --git a/...ntations/micrometer-registry-statsd/src/main/java/io/micrometer/statsd/StatsdCounter.java b/...ntations/micrometer-registry-statsd/src/main/java/io/micrometer/statsd/StatsdCounter.java
@@ -17,7 +17,6 @@
 
 import io.micrometer.core.instrument.AbstractMeter;
 import io.micrometer.core.instrument.Counter;
-import io.micrometer.core.instrument.util.MeterEquivalence;
 import reactor.core.publisher.FluxSink;
 
 import java.util.concurrent.atomic.DoubleAdder;
@@ -50,17 +49,6 @@ public double count() {
         return count.doubleValue();
     }
 
-    @SuppressWarnings("EqualsWhichDoesntCheckParameterClass")
-    @Override
-    public boolean equals(Object o) {
-        return MeterEquivalence.equals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return MeterEquivalence.hashCode(this);
-    }
-
     void shutdown() {
         this.shutdown = true;
     }

diff --git a/...rometer-registry-statsd/src/main/java/io/micrometer/statsd/StatsdDistributionSummary.java b/...rometer-registry-statsd/src/main/java/io/micrometer/statsd/StatsdDistributionSummary.java
@@ -19,8 +19,6 @@
 import io.micrometer.core.instrument.Clock;
 import io.micrometer.core.instrument.distribution.DistributionStatisticConfig;
 import io.micrometer.core.instrument.distribution.TimeWindowMax;
-import io.micrometer.core.instrument.util.MeterEquivalence;
-import io.micrometer.core.lang.Nullable;
 import reactor.core.publisher.FluxSink;
 
 import java.util.concurrent.atomic.DoubleAdder;
@@ -71,17 +69,6 @@ public double max() {
         return max.poll();
     }
 
-    @SuppressWarnings("EqualsWhichDoesntCheckParameterClass")
-    @Override
-    public boolean equals(@Nullable Object o) {
-        return MeterEquivalence.equals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return MeterEquivalence.hashCode(this);
-    }
-
     void shutdown() {
         this.shutdown = true;
     }

diff --git a/...mentations/micrometer-registry-statsd/src/main/java/io/micrometer/statsd/StatsdGauge.java b/...mentations/micrometer-registry-statsd/src/main/java/io/micrometer/statsd/StatsdGauge.java
@@ -17,7 +17,6 @@
 
 import io.micrometer.core.instrument.AbstractMeter;
 import io.micrometer.core.instrument.Gauge;
-import io.micrometer.core.instrument.util.MeterEquivalence;
 import io.micrometer.core.lang.Nullable;
 import reactor.core.publisher.FluxSink;
 
@@ -57,15 +56,4 @@ public void poll() {
         }
     }
 
-    @SuppressWarnings("EqualsWhichDoesntCheckParameterClass")
-    @Override
-    public boolean equals(Object o) {
-        return MeterEquivalence.equals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return MeterEquivalence.hashCode(this);
-    }
-
 }
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/AbstractDistributionSummary.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/AbstractDistributionSummary.java
@@ -16,8 +16,6 @@
 package io.micrometer.core.instrument;
 
 import io.micrometer.core.instrument.distribution.*;
-import io.micrometer.core.instrument.util.MeterEquivalence;
-import io.micrometer.core.lang.Nullable;
 
 public abstract class AbstractDistributionSummary extends AbstractMeter implements DistributionSummary {
     protected final Histogram histogram;
@@ -56,15 +54,4 @@ public final void record(double amount) {
     public HistogramSnapshot takeSnapshot() {
         return histogram.takeSnapshot(count(), totalAmount(), max());
     }
-
-    @SuppressWarnings("EqualsWhichDoesntCheckParameterClass")
-    @Override
-    public boolean equals(@Nullable Object o) {
-        return MeterEquivalence.equals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return MeterEquivalence.hashCode(this);
-    }
 }
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/AbstractMeter.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/AbstractMeter.java
@@ -15,6 +15,15 @@
  */
 package io.micrometer.core.instrument;
 
+import io.micrometer.core.instrument.util.MeterEquivalence;
+import io.micrometer.core.lang.Nullable;
+
+/**
+ * Base class for {@link Meter} implementations.
+ *
+ * @author Jon Schneider
+ * @author Johnny Lim
+ */
 public abstract class AbstractMeter implements Meter {
     private final Meter.Id id;
 
@@ -26,4 +35,15 @@ public AbstractMeter(Id id) {
     public Id getId() {
         return id;
     }
+
+    @SuppressWarnings("EqualsWhichDoesntCheckParameterClass")
+    @Override
+    public boolean equals(@Nullable Object o) {
+        return MeterEquivalence.equals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return MeterEquivalence.hashCode(this);
+    }
 }
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/AbstractTimer.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/AbstractTimer.java
@@ -18,7 +18,6 @@
 import io.micrometer.core.instrument.distribution.*;
 import io.micrometer.core.instrument.distribution.pause.ClockDriftPauseDetector;
 import io.micrometer.core.instrument.distribution.pause.PauseDetector;
-import io.micrometer.core.instrument.util.MeterEquivalence;
 import io.micrometer.core.lang.Nullable;
 import org.LatencyUtils.IntervalEstimator;
 import org.LatencyUtils.SimplePauseDetector;
@@ -188,17 +187,6 @@ public TimeUnit baseTimeUnit() {
         return baseTimeUnit;
     }
 
-    @SuppressWarnings("EqualsWhichDoesntCheckParameterClass")
-    @Override
-    public boolean equals(@Nullable Object o) {
-        return MeterEquivalence.equals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return MeterEquivalence.hashCode(this);
-    }
-
     @Override
     public void close() {
         histogram.close();

diff --git a/...er-core/src/main/java/io/micrometer/core/instrument/composite/AbstractCompositeMeter.java b/...er-core/src/main/java/io/micrometer/core/instrument/composite/AbstractCompositeMeter.java
@@ -25,10 +25,9 @@
 import java.util.Iterator;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.Consumer;
 
 abstract class AbstractCompositeMeter<T extends Meter> extends AbstractMeter implements CompositeMeter {
-    private AtomicBoolean childrenGuard = new AtomicBoolean();
+    private final AtomicBoolean childrenGuard = new AtomicBoolean();
     private Map<MeterRegistry, T> children = Collections.emptyMap();
 
     @Nullable
@@ -43,8 +42,8 @@ abstract class AbstractCompositeMeter<T extends Meter> extends AbstractMeter imp
     @Nullable
     abstract T registerNewMeter(MeterRegistry registry);
 
-    final void forEachChild(Consumer<T> task) {
-        children.values().forEach(task);
+    final Iterable<T> getChildren() {
+        return children.values();
     }
 
     T firstChild() {

diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeCounter.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeCounter.java
@@ -28,7 +28,9 @@ class CompositeCounter extends AbstractCompositeMeter<Counter> implements Counte
 
     @Override
     public void increment(double amount) {
-        forEachChild(c -> c.increment(amount));
+        for (Counter c : getChildren()) {
+            c.increment(amount);
+        }
     }
 
     @Override

diff --git a/...e/src/main/java/io/micrometer/core/instrument/composite/CompositeDistributionSummary.java b/...e/src/main/java/io/micrometer/core/instrument/composite/CompositeDistributionSummary.java
@@ -35,7 +35,9 @@ class CompositeDistributionSummary extends AbstractCompositeMeter<DistributionSu
 
     @Override
     public void record(double amount) {
-        forEachChild(ds -> ds.record(amount));
+        for (DistributionSummary ds : getChildren()) {
+            ds.record(amount);
+        }
     }
 
     @Override

diff --git a/...er-core/src/main/java/io/micrometer/core/instrument/composite/CompositeLongTaskTimer.java b/...er-core/src/main/java/io/micrometer/core/instrument/composite/CompositeLongTaskTimer.java
@@ -38,7 +38,9 @@ class CompositeLongTaskTimer extends AbstractCompositeMeter<LongTaskTimer> imple
     @Override
     public Sample start() {
         List<Sample> samples = new ArrayList<>();
-        forEachChild(ltt -> samples.add(ltt.start()));
+        for (LongTaskTimer ltt : getChildren()) {
+            samples.add(ltt.start());
+        }
         return new CompositeSample(samples);
     }