Skip to content

Commit f5ff84a

Browse files
bclozelbclozel
committed
Merge branch '6.2.x'
2 parents 50061da + 1910d32 commit f5ff84a

File tree

9 files changed

+20
-36
lines changed

9 files changed

+20
-36
lines changed

‎spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorObservabilityTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,7 @@ private void runScheduledTaskAndAwait() throws InterruptedException {
175175
}
176176

177177
private TestObservationRegistryAssert.TestObservationRegistryAssertReturningObservationContextAssert assertThatTaskObservation() {
178-
return TestObservationRegistryAssert.assertThat(this.observationRegistry)
179-
.hasObservationWithNameEqualTo("tasks.scheduled.execution").that();
178+
return assertThat(this.observationRegistry).hasObservationWithNameEqualTo("tasks.scheduled.execution").that();
180179
}
181180

182181

‎spring-web/src/test/java/org/springframework/web/client/RestClientObservationTests.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,7 @@ void shouldUseCustomConvention() throws Exception {
190190

191191
restClient.get().uri("https://example.org").retrieve().toBodilessEntity();
192192

193-
TestObservationRegistryAssert.assertThat(this.observationRegistry)
194-
.hasObservationWithNameEqualTo("custom.requests");
193+
assertThat(this.observationRegistry).hasObservationWithNameEqualTo("custom.requests");
195194
}
196195

197196
@Test
@@ -301,9 +300,8 @@ private void mockResponseBody(String expectedBody, MediaType mediaType) throws E
301300

302301

303302
private TestObservationRegistryAssert.TestObservationRegistryAssertReturningObservationContextAssert assertThatHttpObservation() {
304-
TestObservationRegistryAssert.assertThat(this.observationRegistry).hasNumberOfObservationsWithNameEqualTo("http.client.requests",1);
305-
return TestObservationRegistryAssert.assertThat(this.observationRegistry)
306-
.hasObservationWithNameEqualTo("http.client.requests").that();
303+
assertThat(this.observationRegistry).hasNumberOfObservationsWithNameEqualTo("http.client.requests",1);
304+
return assertThat(this.observationRegistry).hasObservationWithNameEqualTo("http.client.requests").that();
307305
}
308306

309307
static class ContextAssertionObservationHandler implements ObservationHandler<ClientRequestObservationContext> {

‎spring-web/src/test/java/org/springframework/web/client/RestTemplateObservationTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,7 @@ private void mockResponseBody(String expectedBody, MediaType mediaType) throws E
214214

215215

216216
private TestObservationRegistryAssert.TestObservationRegistryAssertReturningObservationContextAssert assertThatHttpObservation() {
217-
return TestObservationRegistryAssert.assertThat(this.observationRegistry)
218-
.hasObservationWithNameEqualTo("http.client.requests").that();
217+
return assertThat(this.observationRegistry).hasObservationWithNameEqualTo("http.client.requests").that();
219218
}
220219

221220
static class ContextAssertionObservationHandler implements ObservationHandler<ClientRequestObservationContext> {

‎spring-web/src/test/java/org/springframework/web/client/support/RestClientAdapterTests.java

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import java.util.stream.Stream;
2828

2929
import io.micrometer.observation.tck.TestObservationRegistry;
30-
import io.micrometer.observation.tck.TestObservationRegistryAssert;
3130
import okhttp3.mockwebserver.MockResponse;
3231
import okhttp3.mockwebserver.MockWebServer;
3332
import okhttp3.mockwebserver.RecordedRequest;
@@ -131,9 +130,8 @@ void greeting(
131130
assertThat(response).isEqualTo("Hello Spring!");
132131
assertThat(request.getMethod()).isEqualTo("GET");
133132
assertThat(request.getPath()).isEqualTo("/greeting");
134-
TestObservationRegistryAssert.assertThat(observationRegistry)
135-
.hasObservationWithNameEqualTo("http.client.requests")
136-
.that().hasLowCardinalityKeyValue("uri", "/greeting");
133+
assertThat(observationRegistry).hasObservationWithNameEqualTo("http.client.requests").that()
134+
.hasLowCardinalityKeyValue("uri", "/greeting");
137135
}
138136

139137
@ParameterizedAdapterTest
@@ -147,9 +145,8 @@ void greetingById(
147145
assertThat(response.getBody()).isEqualTo("Hello Spring!");
148146
assertThat(request.getMethod()).isEqualTo("GET");
149147
assertThat(request.getPath()).isEqualTo("/greeting/456");
150-
TestObservationRegistryAssert.assertThat(observationRegistry)
151-
.hasObservationWithNameEqualTo("http.client.requests")
152-
.that().hasLowCardinalityKeyValue("uri", "/greeting/{id}");
148+
assertThat(observationRegistry).hasObservationWithNameEqualTo("http.client.requests").that()
149+
.hasLowCardinalityKeyValue("uri", "/greeting/{id}");
153150
}
154151

155152
@ParameterizedAdapterTest
@@ -163,9 +160,8 @@ void greetingWithDynamicUri(
163160
assertThat(response.orElse("empty")).isEqualTo("Hello Spring!");
164161
assertThat(request.getMethod()).isEqualTo("GET");
165162
assertThat(request.getRequestUrl().uri()).isEqualTo(dynamicUri);
166-
TestObservationRegistryAssert.assertThat(observationRegistry)
167-
.hasObservationWithNameEqualTo("http.client.requests")
168-
.that().hasLowCardinalityKeyValue("uri", "none");
163+
assertThat(observationRegistry).hasObservationWithNameEqualTo("http.client.requests").that()
164+
.hasLowCardinalityKeyValue("uri", "none");
169165
}
170166

171167
@ParameterizedAdapterTest

‎spring-web/src/test/java/org/springframework/web/filter/ServerHttpObservationFilterTests.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -187,18 +187,14 @@ void shouldNotCloseObservationDuringAsyncDispatch() throws Exception {
187187
this.mockFilterChain = new MockFilterChain(new ScopeCheckingServlet(this.observationRegistry));
188188
this.request.setDispatcherType(DispatcherType.ASYNC);
189189
this.filter.doFilter(this.request, this.response, this.mockFilterChain);
190-
TestObservationRegistryAssert.assertThat(this.observationRegistry)
191-
.hasObservationWithNameEqualTo("http.server.requests")
192-
.that().isNotStopped();
190+
assertThat(this.observationRegistry).hasObservationWithNameEqualTo("http.server.requests").that()
191+
.isNotStopped();
193192
}
194193

195194
private TestObservationRegistryAssert.TestObservationRegistryAssertReturningObservationContextAssert assertThatHttpObservation() {
196-
TestObservationRegistryAssert.assertThat(this.observationRegistry)
197-
.hasNumberOfObservationsWithNameEqualTo("http.server.requests", 1);
195+
assertThat(this.observationRegistry).hasNumberOfObservationsWithNameEqualTo("http.server.requests", 1);
198196

199-
return TestObservationRegistryAssert.assertThat(this.observationRegistry)
200-
.hasObservationWithNameEqualTo("http.server.requests")
201-
.that()
197+
return assertThat(this.observationRegistry).hasObservationWithNameEqualTo("http.server.requests").that()
202198
.hasBeenStopped();
203199
}
204200

‎spring-web/src/test/java/org/springframework/web/filter/reactive/ServerHttpObservationFilterTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ private WebFilterChain createFilterChain(ThrowingConsumer<ServerWebExchange> exc
137137
}
138138

139139
private TestObservationRegistryAssert.TestObservationRegistryAssertReturningObservationContextAssert assertThatHttpObservation() {
140-
return TestObservationRegistryAssert.assertThat(this.observationRegistry)
141-
.hasObservationWithNameEqualTo("http.server.requests").that();
140+
return assertThat(this.observationRegistry).hasObservationWithNameEqualTo("http.server.requests").that();
142141
}
143142
}

‎spring-web/src/test/java/org/springframework/web/server/adapter/HttpWebHandlerAdapterObservabilityTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,7 @@ private HttpWebHandlerAdapter createWebHandler(WebHandler targetHandler) {
9595
}
9696

9797
private TestObservationRegistryAssert.TestObservationRegistryAssertReturningObservationContextAssert assertThatHttpObservation() {
98-
return TestObservationRegistryAssert.assertThat(this.observationRegistry)
99-
.hasObservationWithNameEqualTo("http.server.requests").that();
98+
return assertThat(this.observationRegistry).hasObservationWithNameEqualTo("http.server.requests").that();
10099
}
101100

102101

‎spring-web/src/test/java/org/springframework/web/server/adapter/WebHttpHandlerBuilderTests.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import java.util.function.Function;
2424

2525
import io.micrometer.observation.tck.TestObservationRegistry;
26-
import io.micrometer.observation.tck.TestObservationRegistryAssert;
2726
import org.junit.jupiter.api.Test;
2827
import reactor.core.publisher.Flux;
2928
import reactor.core.publisher.Mono;
@@ -171,8 +170,8 @@ void observationRegistry() {
171170
handler.handle(MockServerHttpRequest.get("/").build(), response).block();
172171

173172
TestObservationRegistry observationRegistry = applicationContext.getBean(TestObservationRegistry.class);
174-
TestObservationRegistryAssert.assertThat(observationRegistry).hasObservationWithNameEqualTo("http.server.requests")
175-
.that().hasLowCardinalityKeyValue("uri", "UNKNOWN");
173+
assertThat(observationRegistry).hasObservationWithNameEqualTo("http.server.requests").that()
174+
.hasLowCardinalityKeyValue("uri", "UNKNOWN");
176175
}
177176

178177
@Test

‎spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientObservationTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,7 @@ void recordsObservationWithResponseDetailsWhenFilterFunctionErrors() {
183183
}
184184

185185
private TestObservationRegistryAssert.TestObservationRegistryAssertReturningObservationContextAssert assertThatHttpObservation() {
186-
return TestObservationRegistryAssert.assertThat(this.observationRegistry)
187-
.hasObservationWithNameEqualTo("http.client.requests").that();
186+
return assertThat(this.observationRegistry).hasObservationWithNameEqualTo("http.client.requests").that();
188187
}
189188

190189
private ClientRequest verifyAndGetRequest() {

0 commit comments

Comments
 (0)