Spring/spring-retry
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Downgrade to Micrometer 1.10.13

Browse Source 
This is for compatibility with the Spring Framework `6.0.x` version we rely on so far
This commit is contained in:
Artem Bilan
2024-08-16 12:09:02 -04:00
parent 8b8c3887ce
commit 81a2cdd434
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -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>

9
src/main/java/org/springframework/retry/support/MetricsRetryListener.java
View File

@@ -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<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 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));
}
}