From a1699d34f069c99ef45615f37edbe56c25082c1d Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 26 Oct 2020 18:14:28 +0100 Subject: [PATCH 1/6] Upgrade to Reactor Californium-SR22 Closes gh-23792 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index b6034de29e..fd77096327 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -151,7 +151,7 @@ 2.3.2 4.2.2 5.4.3 - Californium-BUILD-SNAPSHOT + Californium-SR22 3.1.1 1.0.3 1.3.8 From 7fa5ff46f7cc389bc06ce016b5b70e34bbfd21cd Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 26 Oct 2020 18:15:58 +0100 Subject: [PATCH 2/6] Upgrade to Reactor Dysprosium-SR13 Closes gh-23769 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 12b115b2cd..93e579dc2a 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -173,7 +173,7 @@ 2.3.2 4.2.2 5.7.3 - Dysprosium-BUILD-SNAPSHOT + Dysprosium-SR13 3.3.0 1.0.3 1.0.2 From d5cb6c1a4ff5e51da7bdfede919c366e33f249ce Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 27 Oct 2020 03:25:59 +0100 Subject: [PATCH 3/6] Upgrade to RSocket 1.0.3 Closes gh-23910 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 93e579dc2a..b41ee6873e 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -176,7 +176,7 @@ Dysprosium-SR13 3.3.0 1.0.3 - 1.0.2 + 1.0.3 1.3.8 1.2.1 2.2.20 From 12f0709f9f82d5498909feef3232438798f58bf8 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 27 Oct 2020 15:45:34 +0100 Subject: [PATCH 4/6] Upgrade to Spring Framework 5.1.19 Closes gh-23772 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index fd77096327..41fc7155af 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -165,7 +165,7 @@ 1.23 7.7.3 - 5.1.19.BUILD-SNAPSHOT + 5.1.19.RELEASE 2.1.18.BUILD-SNAPSHOT 4.1.4.RELEASE 2.0.7.RELEASE From 8b49f792cb320785947bb4e44f8c570222066100 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 27 Oct 2020 15:48:17 +0100 Subject: [PATCH 5/6] Upgrade to Spring Framework 5.2.10 Closes gh-23773 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index b41ee6873e..3611d99415 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -191,7 +191,7 @@ 4.2.4.RELEASE 2.0.7.RELEASE Moore-BUILD-SNAPSHOT - 5.2.10.BUILD-SNAPSHOT + 5.2.10.RELEASE 1.0.5.RELEASE 5.2.8.RELEASE 2.3.12.BUILD-SNAPSHOT From b9516bc77c9de326c90658fd6d903032182db72c Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 26 Oct 2020 14:41:58 +0000 Subject: [PATCH 6/6] Await registration of http.server.requests meter Previously, the test would make an HTTP request and, as soon as the response was received, it would check the presence and value of the http.server.requests meter. This create a race condition between the meter being registered once the response had been flushed and the meter's presence being checked. If the check won the race, the test would fail. This commit updates the test to wait for up to 5 seconds for the meter to be present and have a count of 1, matching the single request that has been made. Fixes gh-23919 --- .../spring-boot-actuator-autoconfigure/pom.xml | 5 +++++ .../metrics/test/MetricsIntegrationTests.java | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/pom.xml b/spring-boot-project/spring-boot-actuator-autoconfigure/pom.xml index 35964f09d2..c82ddca840 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/pom.xml +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/pom.xml @@ -546,6 +546,11 @@ aspectjrt test + + org.awaitility + awaitility + test + org.eclipse.jetty jetty-webapp diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/test/MetricsIntegrationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/test/MetricsIntegrationTests.java index 921ee3215c..842c7a0f99 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/test/MetricsIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/test/MetricsIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2020 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,6 +16,7 @@ package org.springframework.boot.actuate.autoconfigure.metrics.test; +import java.time.Duration; import java.util.Collections; import java.util.Map; import java.util.Set; @@ -71,6 +72,7 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.RestTemplate; import static org.assertj.core.api.Assertions.assertThat; +import static org.awaitility.Awaitility.waitAtMost; import static org.springframework.test.web.client.ExpectedCount.once; import static org.springframework.test.web.client.match.MockRestRequestMatchers.method; import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo; @@ -110,7 +112,9 @@ class MetricsIntegrationTests { @Test void requestMappingIsInstrumented() { this.loopback.getForObject("/api/people", Set.class); - assertThat(this.registry.get("http.server.requests").timer().count()).isEqualTo(1); + waitAtMost(Duration.ofSeconds(5)).untilAsserted( + () -> assertThat(this.registry.get("http.server.requests").timer().count()).isEqualTo(1)); + } @Test