Merge pull request #12767 from jkschneider

* pr/12767:
  Upgrade to Micrometer 1.0.3
pull/12680/merge
Phillip Webb 7 years ago
commit f76c574f8e

@ -276,9 +276,9 @@ public class PropertiesMeterFilterTests {
assertThat(filter.configure(timer, DistributionStatisticConfig.DEFAULT) assertThat(filter.configure(timer, DistributionStatisticConfig.DEFAULT)
.getSlaBoundaries()).containsExactly(1000000, 2000000, 3000000); .getSlaBoundaries()).containsExactly(1000000, 2000000, 3000000);
assertThat(filter.configure(summary, DistributionStatisticConfig.DEFAULT) assertThat(filter.configure(summary, DistributionStatisticConfig.DEFAULT)
.getSlaBoundaries()).isEmpty(); .getSlaBoundaries()).isNullOrEmpty();
assertThat(filter.configure(counter, DistributionStatisticConfig.DEFAULT) assertThat(filter.configure(counter, DistributionStatisticConfig.DEFAULT)
.getSlaBoundaries()).isEmpty(); .getSlaBoundaries()).isNullOrEmpty();
} }
@Test @Test
@ -293,7 +293,7 @@ public class PropertiesMeterFilterTests {
assertThat(filter.configure(summary, DistributionStatisticConfig.DEFAULT) assertThat(filter.configure(summary, DistributionStatisticConfig.DEFAULT)
.getSlaBoundaries()).containsExactly(1, 2, 3); .getSlaBoundaries()).containsExactly(1, 2, 3);
assertThat(filter.configure(counter, DistributionStatisticConfig.DEFAULT) assertThat(filter.configure(counter, DistributionStatisticConfig.DEFAULT)
.getSlaBoundaries()).isEmpty(); .getSlaBoundaries()).isNullOrEmpty();
} }
private Id createMeterId(String name) { private Id createMeterId(String name) {

@ -120,7 +120,7 @@
<logback.version>1.2.3</logback.version> <logback.version>1.2.3</logback.version>
<lombok.version>1.16.20</lombok.version> <lombok.version>1.16.20</lombok.version>
<mariadb.version>2.2.3</mariadb.version> <mariadb.version>2.2.3</mariadb.version>
<micrometer.version>1.0.2</micrometer.version> <micrometer.version>1.0.3</micrometer.version>
<mockito.version>2.15.0</mockito.version> <mockito.version>2.15.0</mockito.version>
<mongo-driver-reactivestreams.version>1.7.1</mongo-driver-reactivestreams.version> <mongo-driver-reactivestreams.version>1.7.1</mongo-driver-reactivestreams.version>
<mongodb.version>3.6.3</mongodb.version> <mongodb.version>3.6.3</mongodb.version>

Loading…
Cancel
Save