Skip to content

Commit 1ff7205

Browse files
ttddyyfmbenhassine
authored andcommitted
Adapt SampleTestRunner change in micrometer tracing
Accommodate the breaking change in `SampleTestRunner` introduced by micrometer-metrics/tracing#57
1 parent 7c8fb17 commit 1ff7205

File tree

1 file changed

+15
-2
lines changed

1 file changed

+15
-2
lines changed

spring-batch-test/src/test/java/org/springframework/batch/test/observability/ObservabilitySampleStepTests.java

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@
1515
*/
1616
package org.springframework.batch.test.observability;
1717

18+
import io.micrometer.core.instrument.MeterRegistry;
1819
import io.micrometer.core.instrument.Metrics;
1920
import io.micrometer.core.tck.MeterRegistryAssert;
21+
import io.micrometer.observation.ObservationRegistry;
2022
import io.micrometer.tracing.test.SampleTestRunner;
2123
import org.assertj.core.api.Assertions;
2224
import org.junit.jupiter.api.AfterEach;
@@ -43,7 +45,17 @@ class ObservabilitySampleStepTests extends SampleTestRunner {
4345
private JobLauncherTestUtils jobLauncherTestUtils;
4446

4547
ObservabilitySampleStepTests() {
46-
super(SampleRunnerConfig.builder().build(), BatchMetrics.observationRegistry, Metrics.globalRegistry);
48+
super(SampleRunnerConfig.builder().build());
49+
}
50+
51+
@Override
52+
protected MeterRegistry createMeterRegistry() {
53+
return Metrics.globalRegistry;
54+
}
55+
56+
@Override
57+
protected ObservationRegistry createObservationRegistry() {
58+
return BatchMetrics.observationRegistry;
4759
}
4860

4961
@BeforeEach
@@ -52,7 +64,8 @@ void setup(@Autowired Job job) {
5264
}
5365

5466
@AfterEach
55-
void clean() {
67+
@Override
68+
protected void closeMeterRegistry() {
5669
Metrics.globalRegistry.clear();
5770
}
5871

0 commit comments

Comments
 (0)