Review fixes for spring-webflux-5.3:library (open-telemetry#17747)

Author: otelbot[bot]

instrumentation/spring/spring-webflux/spring-webflux-5.3/library/build.gradle.kts

@@ -34,7 +34,7 @@ if (!otelProps.testLatestDeps) {
 }
 
 tasks {
-  test {
+  withType<Test>().configureEach {
     systemProperty("collectMetadata", otelProps.collectMetadata)
   }
 

instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/test/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/SpringWebfluxServerInstrumentationTest.java

@@ -9,6 +9,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpServerTest;
 import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension;
@@ -26,21 +27,23 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.springframework.context.ConfigurableApplicationContext;
 
-public class SpringWebfluxServerInstrumentationTest
+class SpringWebfluxServerInstrumentationTest
     extends AbstractHttpServerTest<ConfigurableApplicationContext> {
 
   private static final String CONTEXT_PATH = "/test";
 
   @RegisterExtension
   static final InstrumentationExtension testing = HttpServerInstrumentationExtension.forLibrary();
 
+  @RegisterExtension static final AutoCleanupExtension cleanup = AutoCleanupExtension.create();
+
   @Override
   protected ConfigurableApplicationContext setupServer() {
     return TestWebfluxSpringBootApp.start(port, CONTEXT_PATH);
   }
 
   @Override
-  public void stopServer(ConfigurableApplicationContext applicationContext) {
+  protected void stopServer(ConfigurableApplicationContext applicationContext) {
     applicationContext.close();
   }
 
@@ -79,16 +82,16 @@ void cancelRequest() throws InterruptedException {
     String method = "GET";
     AggregatedHttpRequest request = request(endpoint, method);
 
-    try (ClientRequestContextCaptor captor = Clients.newContextCaptor()) {
-      CompletableFuture<AggregatedHttpResponse> future =
-          client.execute(request).aggregate().toCompletableFuture();
-      ClientRequestContext clientRequestContext = captor.get();
-      Thread.sleep(1_000);
-      clientRequestContext.cancel();
-      assertThatThrownBy(future::join)
-          .isInstanceOf(CompletionException.class)
-          .hasMessage(ResponseCancellationException.class.getName());
-    }
+    ClientRequestContextCaptor captor = Clients.newContextCaptor();
+    cleanup.deferCleanup(captor);
+    CompletableFuture<AggregatedHttpResponse> future =
+        client.execute(request).aggregate().toCompletableFuture();
+    ClientRequestContext clientRequestContext = captor.get();
+    Thread.sleep(1_000);
+    clientRequestContext.cancel();
+    assertThatThrownBy(future::join)
+        .isInstanceOf(CompletionException.class)
+        .hasMessage(ResponseCancellationException.class.getName());
 
     assertTheTraces(1, null, null, null, method, endpoint);
   }

instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/test/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/TestWebfluxSpringBootApp.java

@@ -138,7 +138,7 @@ Mono<String> indexed_child(@RequestParam("id") String id) {
     }
 
     @GetMapping("/cancel")
-    public Mono<String> cancel() {
+    Mono<String> cancel() {
       return controller(SUCCESS, () -> Mono.never());
     }
   }