root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.7.x' into 3.0.x

This commit is contained in:
Stephane Nicoll 2023-05-05 11:57:51 +02:00
parent 8a14f6d017 eeefb2a1de
commit be29ab389a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,33 +175,33 @@ class PropertiesMeterFilterTests {
@Test @Test
void configureWhenHasPercentilesShouldSetPercentilesToValue() { void configureWhenHasPercentilesShouldSetPercentilesToValue() {
PropertiesMeterFilter filter = new PropertiesMeterFilter( PropertiesMeterFilter filter = new PropertiesMeterFilter(
createProperties("distribution.percentiles.spring.boot=1,1.5,2")); createProperties("distribution.percentiles.spring.boot=0.2,0.4,0.8"));
assertThat(filter.configure(createMeterId("spring.boot"), DistributionStatisticConfig.DEFAULT).getPercentiles()) assertThat(filter.configure(createMeterId("spring.boot"), DistributionStatisticConfig.DEFAULT).getPercentiles())
.containsExactly(1, 1.5, 2); .containsExactly(0.2, 0.4, 0.8);
} }
@Test @Test
void configureWhenHasHigherPercentilesShouldSetPercentilesToValue() { void configureWhenHasHigherPercentilesShouldSetPercentilesToValue() {
PropertiesMeterFilter filter = new PropertiesMeterFilter( PropertiesMeterFilter filter = new PropertiesMeterFilter(
createProperties("distribution.percentiles.spring=1,1.5,2")); createProperties("distribution.percentiles.spring=0.2,0.4,0.8"));
assertThat(filter.configure(createMeterId("spring.boot"), DistributionStatisticConfig.DEFAULT).getPercentiles()) assertThat(filter.configure(createMeterId("spring.boot"), DistributionStatisticConfig.DEFAULT).getPercentiles())
.containsExactly(1, 1.5, 2); .containsExactly(0.2, 0.4, 0.8);
} }
@Test @Test
void configureWhenHasHigherPercentilesAndLowerShouldSetPercentilesToLower() { void configureWhenHasHigherPercentilesAndLowerShouldSetPercentilesToLower() {
PropertiesMeterFilter filter = new PropertiesMeterFilter(createProperties( PropertiesMeterFilter filter = new PropertiesMeterFilter(createProperties(
"distribution.percentiles.spring=1,1.5,2", "distribution.percentiles.spring.boot=3,3.5,4")); "distribution.percentiles.spring=0.2,0.4,0.8", "distribution.percentiles.spring.boot=0.85,0.9,0.95"));
assertThat(filter.configure(createMeterId("spring.boot"), DistributionStatisticConfig.DEFAULT).getPercentiles()) assertThat(filter.configure(createMeterId("spring.boot"), DistributionStatisticConfig.DEFAULT).getPercentiles())
.containsExactly(3, 3.5, 4); .containsExactly(0.85, 0.9, 0.95);
} }
@Test @Test
void configureWhenAllPercentilesSetShouldSetPercentilesToValue() { void configureWhenAllPercentilesSetShouldSetPercentilesToValue() {
PropertiesMeterFilter filter = new PropertiesMeterFilter( PropertiesMeterFilter filter = new PropertiesMeterFilter(
createProperties("distribution.percentiles.all=1,1.5,2")); createProperties("distribution.percentiles.all=0.2,0.4,0.8"));
assertThat(filter.configure(createMeterId("spring.boot"), DistributionStatisticConfig.DEFAULT).getPercentiles()) assertThat(filter.configure(createMeterId("spring.boot"), DistributionStatisticConfig.DEFAULT).getPercentiles())
.containsExactly(1, 1.5, 2); .containsExactly(0.2, 0.4, 0.8);
} }
@Test @Test