diff --git a/implementations/micrometer-registry-elastic/src/main/java/io/micrometer/elastic/ElasticConfig.java b/implementations/micrometer-registry-elastic/src/main/java/io/micrometer/elastic/ElasticConfig.java index e5c5eb015e..8f1d12317c 100644 --- a/implementations/micrometer-registry-elastic/src/main/java/io/micrometer/elastic/ElasticConfig.java +++ b/implementations/micrometer-registry-elastic/src/main/java/io/micrometer/elastic/ElasticConfig.java @@ -44,6 +44,7 @@ public interface ElasticConfig extends StepRegistryConfig { * @param key Key to look up in the config. * @return Value for the key or null if no key is present. */ + @Override @Nullable String get(String key); @@ -51,6 +52,7 @@ public interface ElasticConfig extends StepRegistryConfig { * Property prefix to prepend to configuration names. * @return property prefix */ + @Override default String prefix() { return "elastic"; } diff --git a/implementations/micrometer-registry-ganglia/src/main/java/io/micrometer/ganglia/GangliaConfig.java b/implementations/micrometer-registry-ganglia/src/main/java/io/micrometer/ganglia/GangliaConfig.java index e4f51b27ec..cd32b0005c 100644 --- a/implementations/micrometer-registry-ganglia/src/main/java/io/micrometer/ganglia/GangliaConfig.java +++ b/implementations/micrometer-registry-ganglia/src/main/java/io/micrometer/ganglia/GangliaConfig.java @@ -42,12 +42,14 @@ public interface GangliaConfig extends StepRegistryConfig { * @param key Key to lookup in the config. * @return Value for the key or null if no key is present. */ + @Override @Nullable String get(String key); /** * @return Property prefix to prepend to configuration names. */ + @Override default String prefix() { return "ganglia"; } @@ -98,6 +100,7 @@ default int port() { /** * @return {@code true} if publishing is enabled. Default is {@code true}. */ + @Override default boolean enabled() { return getBoolean(this, "enabled").orElse(true); } diff --git a/implementations/micrometer-registry-graphite/src/main/java/io/micrometer/graphite/GraphiteConfig.java b/implementations/micrometer-registry-graphite/src/main/java/io/micrometer/graphite/GraphiteConfig.java index 6c9eed768e..fa4c649d45 100644 --- a/implementations/micrometer-registry-graphite/src/main/java/io/micrometer/graphite/GraphiteConfig.java +++ b/implementations/micrometer-registry-graphite/src/main/java/io/micrometer/graphite/GraphiteConfig.java @@ -41,12 +41,14 @@ public interface GraphiteConfig extends DropwizardConfig { * @param key Key to lookup in the config. * @return Value for the key or null if no key is present. */ + @Override @Nullable String get(String key); /** * @return Property prefix to prepend to configuration names. */ + @Override default String prefix() { return "graphite"; } diff --git a/implementations/micrometer-registry-health/src/main/java/io/micrometer/health/ServiceLevelObjective.java b/implementations/micrometer-registry-health/src/main/java/io/micrometer/health/ServiceLevelObjective.java index 623db026e6..4047fb0dac 100644 --- a/implementations/micrometer-registry-health/src/main/java/io/micrometer/health/ServiceLevelObjective.java +++ b/implementations/micrometer-registry-health/src/main/java/io/micrometer/health/ServiceLevelObjective.java @@ -481,6 +481,7 @@ static class Instant extends NumericQuery { this.toValue = toValue; } + @Override protected Double getValue(MeterRegistry registry) { return toValue.apply(search.apply(Search.in(registry))); } diff --git a/implementations/micrometer-registry-kairos/src/main/java/io/micrometer/kairos/KairosConfig.java b/implementations/micrometer-registry-kairos/src/main/java/io/micrometer/kairos/KairosConfig.java index 0a36fa7133..95bf4aae71 100644 --- a/implementations/micrometer-registry-kairos/src/main/java/io/micrometer/kairos/KairosConfig.java +++ b/implementations/micrometer-registry-kairos/src/main/java/io/micrometer/kairos/KairosConfig.java @@ -41,6 +41,7 @@ public interface KairosConfig extends StepRegistryConfig { * Property prefix to prepend to configuration names. * @return property prefix */ + @Override default String prefix() { return "kairos"; } diff --git a/implementations/micrometer-registry-opentsdb/src/main/java/io/micrometer/opentsdb/OpenTSDBConfig.java b/implementations/micrometer-registry-opentsdb/src/main/java/io/micrometer/opentsdb/OpenTSDBConfig.java index b838f6a75f..1de4208cfd 100644 --- a/implementations/micrometer-registry-opentsdb/src/main/java/io/micrometer/opentsdb/OpenTSDBConfig.java +++ b/implementations/micrometer-registry-opentsdb/src/main/java/io/micrometer/opentsdb/OpenTSDBConfig.java @@ -39,6 +39,7 @@ public interface OpenTSDBConfig extends PushRegistryConfig { * Property prefix to prepend to configuration names. * @return property prefix */ + @Override default String prefix() { return "opentsdb"; } diff --git a/implementations/micrometer-registry-otlp/src/test/java/io/micrometer/registry/otlp/OtlpCumulativeMeterRegistryTest.java b/implementations/micrometer-registry-otlp/src/test/java/io/micrometer/registry/otlp/OtlpCumulativeMeterRegistryTest.java index 04d5c71626..cb3065c362 100644 --- a/implementations/micrometer-registry-otlp/src/test/java/io/micrometer/registry/otlp/OtlpCumulativeMeterRegistryTest.java +++ b/implementations/micrometer-registry-otlp/src/test/java/io/micrometer/registry/otlp/OtlpCumulativeMeterRegistryTest.java @@ -45,6 +45,7 @@ void gauge() { + " time_unix_nano: 1000000\n" + " as_double: \\d+\\.0\n" + " }\n" + "}\n"); } + @Override @Test void timeGauge() { TimeGauge timeGauge = TimeGauge.builder("gauge.time", this, TimeUnit.MICROSECONDS, o -> 24).register(registry); diff --git a/implementations/micrometer-registry-otlp/src/test/java/io/micrometer/registry/otlp/OtlpDeltaMeterRegistryTest.java b/implementations/micrometer-registry-otlp/src/test/java/io/micrometer/registry/otlp/OtlpDeltaMeterRegistryTest.java index 93cc1b19a8..a30e7ba399 100644 --- a/implementations/micrometer-registry-otlp/src/test/java/io/micrometer/registry/otlp/OtlpDeltaMeterRegistryTest.java +++ b/implementations/micrometer-registry-otlp/src/test/java/io/micrometer/registry/otlp/OtlpDeltaMeterRegistryTest.java @@ -86,6 +86,7 @@ void gauge() { .isEqualTo(otlpConfig().step().plus(Duration.ofMillis(1)).toNanos()); } + @Override @Test void timeGauge() { TimeGauge timeGauge = TimeGauge.builder("gauge.time", this, TimeUnit.MICROSECONDS, o -> 24).register(registry); @@ -356,6 +357,7 @@ void longTaskTimer() { UNIT_MILLISECONDS, 0, 0, 0); } + @Override @Test void testMetricsStartAndEndTime() { Counter counter = Counter.builder("test_publish_time").register(registry); diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/AbstractCompositeMeter.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/AbstractCompositeMeter.java index 92ebc857cd..21db4299f8 100644 --- a/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/AbstractCompositeMeter.java +++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/AbstractCompositeMeter.java @@ -64,6 +64,7 @@ T firstChild() { } } + @Override public final void add(MeterRegistry registry) { final T newMeter = registerNewMeter(registry); if (newMeter == null) { @@ -90,6 +91,7 @@ public final void add(MeterRegistry registry) { * each meter belonging to the composite. * @param registry The registry to remove. */ + @Override @Deprecated public final void remove(MeterRegistry registry) { for (;;) { diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/cumulative/CumulativeFunctionTimer.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/cumulative/CumulativeFunctionTimer.java index 803019f22f..51f07d4160 100644 --- a/micrometer-core/src/main/java/io/micrometer/core/instrument/cumulative/CumulativeFunctionTimer.java +++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/cumulative/CumulativeFunctionTimer.java @@ -59,6 +59,7 @@ public CumulativeFunctionTimer(Id id, T obj, ToLongFunction countFunction, To /** * The total number of occurrences of the timed event. */ + @Override public double count() { T obj2 = ref.get(); return obj2 != null ? (lastCount = Math.max(countFunction.applyAsLong(obj2), 0)) : lastCount; @@ -67,6 +68,7 @@ public double count() { /** * The total time of all occurrences of the timed event. */ + @Override public double totalTime(TimeUnit unit) { T obj2 = ref.get(); if (obj2 != null) { diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/distribution/AbstractTimeWindowHistogram.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/distribution/AbstractTimeWindowHistogram.java index 86f7837986..f32a59843f 100644 --- a/micrometer-core/src/main/java/io/micrometer/core/instrument/distribution/AbstractTimeWindowHistogram.java +++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/distribution/AbstractTimeWindowHistogram.java @@ -165,6 +165,7 @@ private ValueAtPercentile[] takeValueSnapshot() { return values; } + @Override public void recordLong(long value) { rotate(); try { @@ -181,6 +182,7 @@ public void recordLong(long value) { } } + @Override public void recordDouble(double value) { rotate(); try { diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/step/StepFunctionTimer.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/step/StepFunctionTimer.java index f89558c877..69e049edfb 100644 --- a/micrometer-core/src/main/java/io/micrometer/core/instrument/step/StepFunctionTimer.java +++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/step/StepFunctionTimer.java @@ -75,6 +75,7 @@ public StepFunctionTimer(Id id, Clock clock, long stepMillis, T obj, ToLongFunct /** * The total number of occurrences of the timed event. */ + @Override public double count() { accumulateCountAndTotal(); return countTotal.poll1(); @@ -83,6 +84,7 @@ public double count() { /** * The total time of all occurrences of the timed event. */ + @Override public double totalTime(TimeUnit unit) { accumulateCountAndTotal(); return TimeUtils.convert(countTotal.poll2(), baseTimeUnit(), unit); diff --git a/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/cache/GuavaCacheMetricsTest.java b/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/cache/GuavaCacheMetricsTest.java index df2b66c908..5c0863a6a8 100644 --- a/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/cache/GuavaCacheMetricsTest.java +++ b/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/cache/GuavaCacheMetricsTest.java @@ -36,6 +36,7 @@ class GuavaCacheMetricsTest extends AbstractCacheMetricsTest { // tag::setup[] LoadingCache cache = CacheBuilder.newBuilder().recordStats().build(new CacheLoader<>() { + @Override public String load(String key) { return ""; } @@ -114,6 +115,7 @@ void returnHitCount() throws ExecutionException { @Test void returnHitCountWithoutRecordStats() throws ExecutionException { LoadingCache cache = CacheBuilder.newBuilder().build(new CacheLoader<>() { + @Override public String load(String key) { return ""; } diff --git a/micrometer-observation/src/main/java/io/micrometer/observation/Observation.java b/micrometer-observation/src/main/java/io/micrometer/observation/Observation.java index d3801305d3..7a76477d0c 100644 --- a/micrometer-observation/src/main/java/io/micrometer/observation/Observation.java +++ b/micrometer-observation/src/main/java/io/micrometer/observation/Observation.java @@ -968,6 +968,7 @@ public void setContextualName(@Nullable String contextualName) { * Returns the parent {@link ObservationView}. * @return parent observation or {@code null} if there was no parent */ + @Override @Nullable public ObservationView getParentObservation() { return parentObservation;