Skip to content

Commit f76c574

Browse files
committed
Merge pull request #12767 from jkschneider
* pr/12767: Upgrade to Micrometer 1.0.3
2 parents 236b1bc + 03158e2 commit f76c574

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -276,9 +276,9 @@ public void configureWhenSlaDurationShouldOnlyApplyToTimer() {
276276
assertThat(filter.configure(timer, DistributionStatisticConfig.DEFAULT)
277277
.getSlaBoundaries()).containsExactly(1000000, 2000000, 3000000);
278278
assertThat(filter.configure(summary, DistributionStatisticConfig.DEFAULT)
279-
.getSlaBoundaries()).isEmpty();
279+
.getSlaBoundaries()).isNullOrEmpty();
280280
assertThat(filter.configure(counter, DistributionStatisticConfig.DEFAULT)
281-
.getSlaBoundaries()).isEmpty();
281+
.getSlaBoundaries()).isNullOrEmpty();
282282
}
283283

284284
@Test
@@ -293,7 +293,7 @@ public void configureWhenSlaLongShouldOnlyApplyToTimerAndDistributionSummary() {
293293
assertThat(filter.configure(summary, DistributionStatisticConfig.DEFAULT)
294294
.getSlaBoundaries()).containsExactly(1, 2, 3);
295295
assertThat(filter.configure(counter, DistributionStatisticConfig.DEFAULT)
296-
.getSlaBoundaries()).isEmpty();
296+
.getSlaBoundaries()).isNullOrEmpty();
297297
}
298298

299299
private Id createMeterId(String name) {

spring-boot-project/spring-boot-dependencies/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
<logback.version>1.2.3</logback.version>
121121
<lombok.version>1.16.20</lombok.version>
122122
<mariadb.version>2.2.3</mariadb.version>
123-
<micrometer.version>1.0.2</micrometer.version>
123+
<micrometer.version>1.0.3</micrometer.version>
124124
<mockito.version>2.15.0</mockito.version>
125125
<mongo-driver-reactivestreams.version>1.7.1</mongo-driver-reactivestreams.version>
126126
<mongodb.version>3.6.3</mongodb.version>

0 commit comments

Comments
 (0)