Skip to content

Commit 81a2cdd

Browse files
committed
Downgrade to Micrometer 1.10.13
This is for compatibility with the Spring Framework `6.0.x` version we rely on so far
1 parent 8b8c388 commit 81a2cdd

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<log4j.version>2.23.1</log4j.version>
3939
<mockito.version>5.11.0</mockito.version>
4040
<spring.framework.version>6.0.23</spring.framework.version>
41-
<micrometer.version>1.13.2</micrometer.version>
41+
<micrometer.version>1.10.13</micrometer.version>
4242
</properties>
4343

4444
<scm>

src/main/java/org/springframework/retry/support/MetricsRetryListener.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.util.Map;
2121
import java.util.function.Function;
2222

23-
import io.micrometer.core.instrument.Meter;
2423
import io.micrometer.core.instrument.MeterRegistry;
2524
import io.micrometer.core.instrument.Tag;
2625
import io.micrometer.core.instrument.Tags;
@@ -64,7 +63,7 @@ public class MetricsRetryListener implements RetryListener {
6463

6564
private final Map<RetryContext, Timer.Sample> retryContextToSample = new IdentityHashMap<>();
6665

67-
private final Meter.MeterProvider<Timer> retryMeterProvider;
66+
private final Timer.Builder retryMeterProvider;
6867

6968
private Tags customTags = Tags.empty();
7069

@@ -77,9 +76,7 @@ public class MetricsRetryListener implements RetryListener {
7776
public MetricsRetryListener(MeterRegistry meterRegistry) {
7877
Assert.notNull(meterRegistry, "'meterRegistry' must not be null");
7978
this.meterRegistry = meterRegistry;
80-
this.retryMeterProvider = Timer.builder(TIMER_NAME)
81-
.description("Metrics for Spring RetryTemplate")
82-
.withRegistry(this.meterRegistry);
79+
this.retryMeterProvider = Timer.builder(TIMER_NAME).description("Metrics for Spring RetryTemplate");
8380
}
8481

8582
/**
@@ -122,7 +119,7 @@ public <T, E extends Throwable> void close(RetryContext context, RetryCallback<T
122119
.and(this.customTagsProvider.apply(context))
123120
.and("exception", throwable != null ? throwable.getClass().getSimpleName() : "none");
124121

125-
sample.stop(this.retryMeterProvider.withTags(retryTags));
122+
sample.stop(this.retryMeterProvider.tags(retryTags).register(this.meterRegistry));
126123
}
127124

128125
}

0 commit comments

Comments
 (0)