Skip to content

Commit ce9ca6a

Browse files
committed
Polish "Apply MeterRegistryCustomizer to composites"
Closes gh-12762
1 parent 1fce462 commit ce9ca6a

File tree

2 files changed

+18
-13
lines changed

2 files changed

+18
-13
lines changed

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MeterRegistryConfigurerIntegrationTests.java

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,26 @@
2525
import org.springframework.boot.actuate.autoconfigure.metrics.test.MetricsRun;
2626
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
2727

28+
/**
29+
* Integration tests for {@link MeterRegistryConfigurer}.
30+
*
31+
* @author Jon Schneider
32+
*/
2833
public class MeterRegistryConfigurerIntegrationTests {
34+
2935
private ApplicationContextRunner contextRunner = new ApplicationContextRunner()
3036
.with(MetricsRun.limitedTo(AtlasMetricsExportAutoConfiguration.class,
3137
PrometheusMetricsExportAutoConfiguration.class));
3238

3339
@Test
3440
public void binderMetricsAreSearchableFromTheComposite() {
35-
this.contextRunner
36-
.run((context) -> {
37-
CompositeMeterRegistry composite = context.getBean(CompositeMeterRegistry.class);
38-
composite.get("jvm.memory.used").gauge();
39-
40-
for (MeterRegistry registry : context.getBeansOfType(MeterRegistry.class).values()) {
41-
registry.get("jvm.memory.used").gauge();
42-
}
43-
});
41+
this.contextRunner.run((context) -> {
42+
CompositeMeterRegistry composite = context
43+
.getBean(CompositeMeterRegistry.class);
44+
composite.get("jvm.memory.used").gauge();
45+
context.getBeansOfType(MeterRegistry.class)
46+
.forEach((name, registry) -> registry.get("jvm.memory.used").gauge());
47+
});
4448
}
49+
4550
}

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MeterRegistryCustomizerTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,12 @@ public void customizersCanBeAppliedToSpecificRegistryTypes() {
6767
this.contextRunner
6868
.withUserConfiguration(MeterRegistryCustomizerConfiguration.class)
6969
.run((context) -> {
70-
MeterRegistry prometheus = context.getBean(PrometheusMeterRegistry.class);
70+
MeterRegistry prometheus = context
71+
.getBean(PrometheusMeterRegistry.class);
7172
prometheus.get("jvm.memory.used").tags("job", "myjob").gauge();
72-
7373
MeterRegistry atlas = context.getBean(AtlasMeterRegistry.class);
74-
assertThat(atlas.find("jvm.memory.used").tags("job", "myjob")
75-
.gauge()).isNull();
74+
assertThat(atlas.find("jvm.memory.used").tags("job", "myjob").gauge())
75+
.isNull();
7676
});
7777
}
7878

0 commit comments

Comments
 (0)