diff --git a/pom.xml b/pom.xml index 985f33e..c5a9c7d 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ 2.23.1 5.11.0 6.0.23 - 1.13.2 + 1.10.13 diff --git a/src/main/java/org/springframework/retry/support/MetricsRetryListener.java b/src/main/java/org/springframework/retry/support/MetricsRetryListener.java index 0ff1a36..957b9f1 100644 --- a/src/main/java/org/springframework/retry/support/MetricsRetryListener.java +++ b/src/main/java/org/springframework/retry/support/MetricsRetryListener.java @@ -20,7 +20,6 @@ import java.util.IdentityHashMap; import java.util.Map; import java.util.function.Function; -import io.micrometer.core.instrument.Meter; import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.Tag; import io.micrometer.core.instrument.Tags; @@ -64,7 +63,7 @@ public class MetricsRetryListener implements RetryListener { private final Map retryContextToSample = new IdentityHashMap<>(); - private final Meter.MeterProvider retryMeterProvider; + private final Timer.Builder retryMeterProvider; private Tags customTags = Tags.empty(); @@ -77,9 +76,7 @@ public class MetricsRetryListener implements RetryListener { public MetricsRetryListener(MeterRegistry meterRegistry) { Assert.notNull(meterRegistry, "'meterRegistry' must not be null"); this.meterRegistry = meterRegistry; - this.retryMeterProvider = Timer.builder(TIMER_NAME) - .description("Metrics for Spring RetryTemplate") - .withRegistry(this.meterRegistry); + this.retryMeterProvider = Timer.builder(TIMER_NAME).description("Metrics for Spring RetryTemplate"); } /** @@ -122,7 +119,7 @@ public class MetricsRetryListener implements RetryListener { .and(this.customTagsProvider.apply(context)) .and("exception", throwable != null ? throwable.getClass().getSimpleName() : "none"); - sample.stop(this.retryMeterProvider.withTags(retryTags)); + sample.stop(this.retryMeterProvider.tags(retryTags).register(this.meterRegistry)); } }