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

Merge branch '6.2.x'

This commit is contained in:
Brian Clozel 2024-11-21 14:35:52 +01:00
parent 50061dae35 1910d32405
commit f5ff84ab7b
9 changed files with 20 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorObservabilityTests.java
View File

@ -175,8 +175,7 @@ class ScheduledAnnotationBeanPostProcessorObservabilityTests {
} }
private TestObservationRegistryAssert.TestObservationRegistryAssertReturningObservationContextAssert assertThatTaskObservation() { private TestObservationRegistryAssert.TestObservationRegistryAssertReturningObservationContextAssert assertThatTaskObservation() {
return TestObservationRegistryAssert.assertThat(this.observationRegistry) return assertThat(this.observationRegistry).hasObservationWithNameEqualTo("tasks.scheduled.execution").that();
.hasObservationWithNameEqualTo("tasks.scheduled.execution").that();
} }

8
spring-web/src/test/java/org/springframework/web/client/RestClientObservationTests.java
View File

@ -190,8 +190,7 @@ class RestClientObservationTests {
restClient.get().uri("https://example.org").retrieve().toBodilessEntity(); restClient.get().uri("https://example.org").retrieve().toBodilessEntity();
TestObservationRegistryAssert.assertThat(this.observationRegistry) assertThat(this.observationRegistry).hasObservationWithNameEqualTo("custom.requests");
.hasObservationWithNameEqualTo("custom.requests");
} }
@Test @Test
@ -301,9 +300,8 @@ class RestClientObservationTests {
private TestObservationRegistryAssert.TestObservationRegistryAssertReturningObservationContextAssert assertThatHttpObservation() { private TestObservationRegistryAssert.TestObservationRegistryAssertReturningObservationContextAssert assertThatHttpObservation() {
TestObservationRegistryAssert.assertThat(this.observationRegistry).hasNumberOfObservationsWithNameEqualTo("http.client.requests",1); assertThat(this.observationRegistry).hasNumberOfObservationsWithNameEqualTo("http.client.requests",1);
return TestObservationRegistryAssert.assertThat(this.observationRegistry) return assertThat(this.observationRegistry).hasObservationWithNameEqualTo("http.client.requests").that();
.hasObservationWithNameEqualTo("http.client.requests").that();
} }
static class ContextAssertionObservationHandler implements ObservationHandler<ClientRequestObservationContext> { static class ContextAssertionObservationHandler implements ObservationHandler<ClientRequestObservationContext> {

3
spring-web/src/test/java/org/springframework/web/client/RestTemplateObservationTests.java
View File

@ -214,8 +214,7 @@ class RestTemplateObservationTests {
private TestObservationRegistryAssert.TestObservationRegistryAssertReturningObservationContextAssert assertThatHttpObservation() { private TestObservationRegistryAssert.TestObservationRegistryAssertReturningObservationContextAssert assertThatHttpObservation() {
return TestObservationRegistryAssert.assertThat(this.observationRegistry) return assertThat(this.observationRegistry).hasObservationWithNameEqualTo("http.client.requests").that();
.hasObservationWithNameEqualTo("http.client.requests").that();
} }
static class ContextAssertionObservationHandler implements ObservationHandler<ClientRequestObservationContext> { static class ContextAssertionObservationHandler implements ObservationHandler<ClientRequestObservationContext> {

16
spring-web/src/test/java/org/springframework/web/client/support/RestClientAdapterTests.java
View File

@ -27,7 +27,6 @@ import java.util.function.BiFunction;
import java.util.stream.Stream; import java.util.stream.Stream;
import io.micrometer.observation.tck.TestObservationRegistry; import io.micrometer.observation.tck.TestObservationRegistry;
import io.micrometer.observation.tck.TestObservationRegistryAssert;
import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer; import okhttp3.mockwebserver.MockWebServer;
import okhttp3.mockwebserver.RecordedRequest; import okhttp3.mockwebserver.RecordedRequest;
@ -131,9 +130,8 @@ class RestClientAdapterTests {
assertThat(response).isEqualTo("Hello Spring!"); assertThat(response).isEqualTo("Hello Spring!");
assertThat(request.getMethod()).isEqualTo("GET"); assertThat(request.getMethod()).isEqualTo("GET");
assertThat(request.getPath()).isEqualTo("/greeting"); assertThat(request.getPath()).isEqualTo("/greeting");
TestObservationRegistryAssert.assertThat(observationRegistry) assertThat(observationRegistry).hasObservationWithNameEqualTo("http.client.requests").that()
.hasObservationWithNameEqualTo("http.client.requests") .hasLowCardinalityKeyValue("uri", "/greeting");
.that().hasLowCardinalityKeyValue("uri", "/greeting");
} }
@ParameterizedAdapterTest @ParameterizedAdapterTest
@ -147,9 +145,8 @@ class RestClientAdapterTests {
assertThat(response.getBody()).isEqualTo("Hello Spring!"); assertThat(response.getBody()).isEqualTo("Hello Spring!");
assertThat(request.getMethod()).isEqualTo("GET"); assertThat(request.getMethod()).isEqualTo("GET");
assertThat(request.getPath()).isEqualTo("/greeting/456"); assertThat(request.getPath()).isEqualTo("/greeting/456");
TestObservationRegistryAssert.assertThat(observationRegistry) assertThat(observationRegistry).hasObservationWithNameEqualTo("http.client.requests").that()
.hasObservationWithNameEqualTo("http.client.requests") .hasLowCardinalityKeyValue("uri", "/greeting/{id}");
.that().hasLowCardinalityKeyValue("uri", "/greeting/{id}");
} }
@ParameterizedAdapterTest @ParameterizedAdapterTest
@ -163,9 +160,8 @@ class RestClientAdapterTests {
assertThat(response.orElse("empty")).isEqualTo("Hello Spring!"); assertThat(response.orElse("empty")).isEqualTo("Hello Spring!");
assertThat(request.getMethod()).isEqualTo("GET"); assertThat(request.getMethod()).isEqualTo("GET");
assertThat(request.getRequestUrl().uri()).isEqualTo(dynamicUri); assertThat(request.getRequestUrl().uri()).isEqualTo(dynamicUri);
TestObservationRegistryAssert.assertThat(observationRegistry) assertThat(observationRegistry).hasObservationWithNameEqualTo("http.client.requests").that()
.hasObservationWithNameEqualTo("http.client.requests") .hasLowCardinalityKeyValue("uri", "none");
.that().hasLowCardinalityKeyValue("uri", "none");
} }
@ParameterizedAdapterTest @ParameterizedAdapterTest

12
spring-web/src/test/java/org/springframework/web/filter/ServerHttpObservationFilterTests.java
View File

@ -187,18 +187,14 @@ class ServerHttpObservationFilterTests {
this.mockFilterChain = new MockFilterChain(new ScopeCheckingServlet(this.observationRegistry)); this.mockFilterChain = new MockFilterChain(new ScopeCheckingServlet(this.observationRegistry));
this.request.setDispatcherType(DispatcherType.ASYNC); this.request.setDispatcherType(DispatcherType.ASYNC);
this.filter.doFilter(this.request, this.response, this.mockFilterChain); this.filter.doFilter(this.request, this.response, this.mockFilterChain);
TestObservationRegistryAssert.assertThat(this.observationRegistry) assertThat(this.observationRegistry).hasObservationWithNameEqualTo("http.server.requests").that()
.hasObservationWithNameEqualTo("http.server.requests") .isNotStopped();
.that().isNotStopped();
} }
private TestObservationRegistryAssert.TestObservationRegistryAssertReturningObservationContextAssert assertThatHttpObservation() { private TestObservationRegistryAssert.TestObservationRegistryAssertReturningObservationContextAssert assertThatHttpObservation() {
TestObservationRegistryAssert.assertThat(this.observationRegistry) assertThat(this.observationRegistry).hasNumberOfObservationsWithNameEqualTo("http.server.requests", 1);
.hasNumberOfObservationsWithNameEqualTo("http.server.requests", 1);
return TestObservationRegistryAssert.assertThat(this.observationRegistry) return assertThat(this.observationRegistry).hasObservationWithNameEqualTo("http.server.requests").that()
.hasObservationWithNameEqualTo("http.server.requests")
.that()
.hasBeenStopped(); .hasBeenStopped();
} }

3
spring-web/src/test/java/org/springframework/web/filter/reactive/ServerHttpObservationFilterTests.java
View File

@ -137,7 +137,6 @@ class ServerHttpObservationFilterTests {
} }
private TestObservationRegistryAssert.TestObservationRegistryAssertReturningObservationContextAssert assertThatHttpObservation() { private TestObservationRegistryAssert.TestObservationRegistryAssertReturningObservationContextAssert assertThatHttpObservation() {
return TestObservationRegistryAssert.assertThat(this.observationRegistry) return assertThat(this.observationRegistry).hasObservationWithNameEqualTo("http.server.requests").that();
.hasObservationWithNameEqualTo("http.server.requests").that();
} }
} }

3
spring-web/src/test/java/org/springframework/web/server/adapter/HttpWebHandlerAdapterObservabilityTests.java
View File

@ -95,8 +95,7 @@ class HttpWebHandlerAdapterObservabilityTests {
} }
private TestObservationRegistryAssert.TestObservationRegistryAssertReturningObservationContextAssert assertThatHttpObservation() { private TestObservationRegistryAssert.TestObservationRegistryAssertReturningObservationContextAssert assertThatHttpObservation() {
return TestObservationRegistryAssert.assertThat(this.observationRegistry) return assertThat(this.observationRegistry).hasObservationWithNameEqualTo("http.server.requests").that();
.hasObservationWithNameEqualTo("http.server.requests").that();
} }

5
spring-web/src/test/java/org/springframework/web/server/adapter/WebHttpHandlerBuilderTests.java
View File

@ -23,7 +23,6 @@ import java.util.function.BiFunction;
import java.util.function.Function; import java.util.function.Function;
import io.micrometer.observation.tck.TestObservationRegistry; import io.micrometer.observation.tck.TestObservationRegistry;
import io.micrometer.observation.tck.TestObservationRegistryAssert;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
@ -171,8 +170,8 @@ class WebHttpHandlerBuilderTests {
handler.handle(MockServerHttpRequest.get("/").build(), response).block(); handler.handle(MockServerHttpRequest.get("/").build(), response).block();
TestObservationRegistry observationRegistry = applicationContext.getBean(TestObservationRegistry.class); TestObservationRegistry observationRegistry = applicationContext.getBean(TestObservationRegistry.class);
TestObservationRegistryAssert.assertThat(observationRegistry).hasObservationWithNameEqualTo("http.server.requests") assertThat(observationRegistry).hasObservationWithNameEqualTo("http.server.requests").that()
.that().hasLowCardinalityKeyValue("uri", "UNKNOWN"); .hasLowCardinalityKeyValue("uri", "UNKNOWN");
} }
@Test @Test

3
spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientObservationTests.java
View File

@ -183,8 +183,7 @@ class WebClientObservationTests {
} }
private TestObservationRegistryAssert.TestObservationRegistryAssertReturningObservationContextAssert assertThatHttpObservation() { private TestObservationRegistryAssert.TestObservationRegistryAssertReturningObservationContextAssert assertThatHttpObservation() {
return TestObservationRegistryAssert.assertThat(this.observationRegistry) return assertThat(this.observationRegistry).hasObservationWithNameEqualTo("http.client.requests").that();
.hasObservationWithNameEqualTo("http.client.requests").that();
} }
private ClientRequest verifyAndGetRequest() { private ClientRequest verifyAndGetRequest() {