Convert Spring Webflux client tests to Java; add library instrumentat… (#7566)

…ion tests

Author: Mateusz Rzeszutek

instrumentation/spring/spring-webflux-5.0/javaagent/build.gradle.kts

@@ -51,10 +51,7 @@ dependencies {
   testInstrumentation(project(":instrumentation:reactor:reactor-3.1:javaagent"))
   testInstrumentation(project(":instrumentation:reactor:reactor-netty:reactor-netty-1.0:javaagent"))
 
-  // Compile with both old and new netty packages since our test references both for old and
-  // latest dep tests.
-  testCompileOnly("io.projectreactor.ipc:reactor-netty:0.7.0.RELEASE")
-  testCompileOnly("io.projectreactor.netty:reactor-netty-http:1.0.7")
+  testImplementation(project(":instrumentation:spring:spring-webflux-5.0:testing"))
 
   testLibrary("org.springframework.boot:spring-boot-starter-webflux:2.0.0.RELEASE")
   testLibrary("org.springframework.boot:spring-boot-starter-test:2.0.0.RELEASE")

instrumentation/spring/spring-webflux-5.0/javaagent/src/test/groovy/client/SpringWebFluxSingleConnection.groovy

@@ -0,0 +1,24 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.spring.webflux.client;
+
+import io.opentelemetry.instrumentation.spring.webflux.client.AbstractSpringWebfluxClientInstrumentationTest;
+import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
+import io.opentelemetry.instrumentation.testing.junit.http.HttpClientInstrumentationExtension;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.springframework.web.reactive.function.client.WebClient;
+
+class SpringWebfluxClientInstrumentationTest
+    extends AbstractSpringWebfluxClientInstrumentationTest {
+
+  @RegisterExtension
+  static final InstrumentationExtension testing = HttpClientInstrumentationExtension.forAgent();
+
+  @Override
+  protected WebClient.Builder instrument(WebClient.Builder builder) {
+    return builder;
+  }
+}

instrumentation/spring/spring-webflux-5.0/javaagent/src/test/groovy/client/SpringWebfluxHttpClientTest.groovy

@@ -3,6 +3,22 @@ plugins {
 }
 
 dependencies {
-  compileOnly("org.springframework:spring-webflux:5.0.0.RELEASE")
+  library("org.springframework:spring-webflux:5.0.0.RELEASE")
+
   compileOnly("io.projectreactor.ipc:reactor-netty:0.7.0.RELEASE")
+
+  testImplementation(project(":instrumentation:spring:spring-webflux-5.0:testing"))
+
+  testLibrary("org.springframework.boot:spring-boot-starter-webflux:2.0.0.RELEASE")
+  testLibrary("org.springframework.boot:spring-boot-starter-test:2.0.0.RELEASE")
+  testLibrary("org.springframework.boot:spring-boot-starter-reactor-netty:2.0.0.RELEASE")
+}
+
+val latestDepTest = findProperty("testLatestDeps") as Boolean
+
+// spring 6 (which spring-kafka 3.+ uses) requires java 17
+if (latestDepTest) {
+  otelJava {
+    minJavaVersionSupported.set(JavaVersion.VERSION_17)
+  }
 }

instrumentation/spring/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/client/SpringWebfluxClientInstrumentationTest.java

@@ -23,18 +23,21 @@ final class TraceWebClientSubscriber implements CoreSubscriber<ClientResponse> {
   private final ClientRequest request;
   private final CoreSubscriber<? super ClientResponse> actual;
   private final reactor.util.context.Context reactorContext;
-  private final io.opentelemetry.context.Context otelContext;
+  private final io.opentelemetry.context.Context otelClientContext;
+  private final io.opentelemetry.context.Context otelParentContext;
 
   TraceWebClientSubscriber(
       Instrumenter<ClientRequest, ClientResponse> instrumenter,
       ClientRequest request,
       CoreSubscriber<? super ClientResponse> actual,
-      Context otelContext) {
+      Context otelClientContext,
+      Context otelParentContext) {
     this.instrumenter = instrumenter;
     this.request = request;
     this.actual = actual;
-    this.otelContext = otelContext;
     this.reactorContext = actual.currentContext();
+    this.otelClientContext = otelClientContext;
+    this.otelParentContext = otelParentContext;
   }
 
   @Override
@@ -44,25 +47,23 @@ public void onSubscribe(Subscription subscription) {
 
   @Override
   public void onNext(ClientResponse response) {
-    try (Scope ignored = otelContext.makeCurrent()) {
+    instrumenter.end(otelClientContext, request, response, null);
+    try (Scope ignored = otelParentContext.makeCurrent()) {
       this.actual.onNext(response);
-    } finally {
-      instrumenter.end(otelContext, request, response, null);
     }
   }
 
   @Override
   public void onError(Throwable t) {
-    try (Scope ignored = otelContext.makeCurrent()) {
+    instrumenter.end(otelClientContext, request, null, t);
+    try (Scope ignored = otelParentContext.makeCurrent()) {
       this.actual.onError(t);
-    } finally {
-      instrumenter.end(otelContext, request, null, t);
     }
   }
 
   @Override
   public void onComplete() {
-    try (Scope ignored = otelContext.makeCurrent()) {
+    try (Scope ignored = otelParentContext.makeCurrent()) {
       this.actual.onComplete();
     }
   }

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

@@ -65,7 +65,9 @@ public void subscribe(CoreSubscriber<? super ClientResponse> subscriber) {
             .doOnCancel(
                 // no response and no error means that the request has been cancelled
                 () -> instrumenter.end(context, request, null, null))
-            .subscribe(new TraceWebClientSubscriber(instrumenter, request, subscriber, context));
+            .subscribe(
+                new TraceWebClientSubscriber(
+                    instrumenter, request, subscriber, context, parentContext));
       }
     }
   }

instrumentation/spring/spring-webflux-5.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/TraceWebClientSubscriber.java

@@ -0,0 +1,25 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.instrumentation.spring.webflux.client;
+
+import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
+import io.opentelemetry.instrumentation.testing.junit.http.HttpClientInstrumentationExtension;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.springframework.web.reactive.function.client.WebClient;
+
+class SpringWebfluxClientInstrumentationTest
+    extends AbstractSpringWebfluxClientInstrumentationTest {
+
+  @RegisterExtension
+  static final InstrumentationExtension testing = HttpClientInstrumentationExtension.forLibrary();
+
+  @Override
+  protected WebClient.Builder instrument(WebClient.Builder builder) {
+    SpringWebfluxTelemetry instrumentation =
+        SpringWebfluxTelemetry.create(testing.getOpenTelemetry());
+    return builder.filters(instrumentation::addClientTracingFilter);
+  }
+}

instrumentation/spring/spring-webflux-5.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/WebClientTracingFilter.java

@@ -0,0 +1,14 @@
+plugins {
+  id("otel.java-conventions")
+}
+
+dependencies {
+  implementation(project(":testing-common"))
+
+  compileOnly("org.springframework:spring-webflux:5.0.0.RELEASE")
+
+  // Compile with both old and new netty packages since our test references both for old and
+  // latest dep tests.
+  compileOnly("io.projectreactor.ipc:reactor-netty:0.7.0.RELEASE")
+  compileOnly("io.projectreactor.netty:reactor-netty-http:1.0.7")
+}