From 81a2cdd434e9973ce7192ca3ae3b17a912e6287f Mon Sep 17 00:00:00 2001
From: Artem Bilan <artem.bilan@broadcom.com>
Date: Fri, 16 Aug 2024 12:09:02 -0400
Subject: [PATCH] Downgrade to Micrometer `1.10.13`

This is for compatibility with the Spring Framework `6.0.x` version we rely on so far
---
 pom.xml                                                  | 2 +-
 .../retry/support/MetricsRetryListener.java              | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 985f33e6..c5a9c7de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
 		<log4j.version>2.23.1</log4j.version>
 		<mockito.version>5.11.0</mockito.version>
 		<spring.framework.version>6.0.23</spring.framework.version>
-		<micrometer.version>1.13.2</micrometer.version>
+		<micrometer.version>1.10.13</micrometer.version>
 	</properties>
 
 	<scm>
diff --git a/src/main/java/org/springframework/retry/support/MetricsRetryListener.java b/src/main/java/org/springframework/retry/support/MetricsRetryListener.java
index 0ff1a367..957b9f1d 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.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<RetryContext, Timer.Sample> retryContextToSample = new IdentityHashMap<>();
 
-	private final Meter.MeterProvider<Timer> 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 <T, E extends Throwable> void close(RetryContext context, RetryCallback<T
 			.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));
 	}
 
 }