Skip to content

Commit

Permalink
Downgrade to Micrometer 1.10.13
Browse files Browse the repository at this point in the history
This is for compatibility with the Spring Framework `6.0.x` version we rely on so far
  • Loading branch information
artembilan committed Aug 16, 2024
1 parent 8b8c388 commit 81a2cdd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();

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

/**
Expand Down Expand Up @@ -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));
}

}

0 comments on commit 81a2cdd

Please sign in to comment.