Skip to content

Commit ca01199

Browse files
committed
Align with new fail-fast behaviour in Micrometer 1.1.4
Closes gh-16425
1 parent 3c05858 commit ca01199

File tree

1 file changed

+15
-5
lines changed

1 file changed

+15
-5
lines changed

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsMetricsExportAutoConfigurationTests.java

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ public void backsOffWithoutAClock() {
4848

4949
@Test
5050
public void autoConfiguresItsConfigAndMeterRegistry() {
51-
this.contextRunner.withUserConfiguration(BaseConfiguration.class)
51+
this.contextRunner
52+
.withPropertyValues("management.metrics.export.appoptics.api-token=abcde")
53+
.withUserConfiguration(BaseConfiguration.class)
5254
.run((context) -> assertThat(context)
5355
.hasSingleBean(AppOpticsMeterRegistry.class)
5456
.hasSingleBean(AppOpticsConfig.class));
@@ -73,16 +75,19 @@ public void allowsCustomConfigToBeUsed() {
7375

7476
@Test
7577
public void allowsCustomRegistryToBeUsed() {
76-
this.contextRunner.withUserConfiguration(CustomRegistryConfiguration.class)
78+
this.contextRunner
79+
.withPropertyValues("management.metrics.export.appoptics.api-token=abcde")
80+
.withUserConfiguration(CustomRegistryConfiguration.class)
7781
.run((context) -> assertThat(context)
7882
.hasSingleBean(AppOpticsMeterRegistry.class)
7983
.hasBean("customRegistry").hasSingleBean(AppOpticsConfig.class));
8084
}
8185

8286
@Test
8387
public void stopsMeterRegistryWhenContextIsClosed() {
84-
this.contextRunner.withUserConfiguration(BaseConfiguration.class)
85-
.run((context) -> {
88+
this.contextRunner
89+
.withPropertyValues("management.metrics.export.appoptics.api-token=abcde")
90+
.withUserConfiguration(BaseConfiguration.class).run((context) -> {
8691
AppOpticsMeterRegistry registry = context
8792
.getBean(AppOpticsMeterRegistry.class);
8893
assertThat(registry.isClosed()).isFalse();
@@ -107,7 +112,12 @@ static class CustomConfigConfiguration {
107112

108113
@Bean
109114
public AppOpticsConfig customConfig() {
110-
return (key) -> null;
115+
return (key) -> {
116+
if ("appoptics.apiToken".equals(key)) {
117+
return "abcde";
118+
}
119+
return null;
120+
};
111121
}
112122

113123
}

0 commit comments

Comments
 (0)