Support reactor netty HttpClient.from construction (#2650)

open-telemetry · Mar 29, 2021 · 202e038 · 202e038
1 parent dcd316d
commit 202e038
Show file tree

Hide file tree

Showing 8 changed files with 138 additions and 79 deletions.
diff --git a/...emetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyInstrumentationModule.java b/...emetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyInstrumentationModule.java
@@ -10,6 +10,7 @@
 import static java.util.Collections.singletonMap;
 import static net.bytebuddy.matcher.ElementMatchers.isStatic;
 import static net.bytebuddy.matcher.ElementMatchers.named;
+import static net.bytebuddy.matcher.ElementMatchers.namedOneOf;
 
 import com.google.auto.service.AutoService;
 import io.netty.bootstrap.Bootstrap;
@@ -64,7 +65,7 @@ public ElementMatcher<TypeDescription> typeMatcher() {
     @Override
     public Map<? extends ElementMatcher<? super MethodDescription>, String> transformers() {
       return singletonMap(
-          isStatic().and(named("create").or(named("newConnection"))),
+          isStatic().and(namedOneOf("create", "newConnection", "from")),
           ReactorNettyInstrumentationModule.class.getName() + "$CreateAdvice");
     }
   }

diff --git a/...ion/reactor-netty-0.9/javaagent/src/test/groovy/AbstractReactorNettyHttpClientTest.groovy b/...ion/reactor-netty-0.9/javaagent/src/test/groovy/AbstractReactorNettyHttpClientTest.groovy
@@ -0,0 +1,50 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import io.opentelemetry.instrumentation.test.AgentTestTrait
+import io.opentelemetry.instrumentation.test.base.HttpClientTest
+import reactor.netty.http.client.HttpClient
+import reactor.netty.http.client.HttpClientResponse
+
+abstract class AbstractReactorNettyHttpClientTest extends HttpClientTest implements AgentTestTrait {
+
+  @Override
+  boolean testRedirects() {
+    false
+  }
+
+  @Override
+  boolean testConnectionFailure() {
+    false
+  }
+
+  @Override
+  boolean testRemoteConnection() {
+    false
+  }
+
+  @Override
+  String userAgent() {
+    return "ReactorNetty"
+  }
+
+  @Override
+  int doRequest(String method, URI uri, Map<String, String> headers = [:], Closure callback = null) {
+    HttpClientResponse resp = createHttpClient()
+      .followRedirect(true)
+      .headers({ h -> headers.each { k, v -> h.add(k, v) } })
+      .baseUrl(server.address.toString())
+      ."${method.toLowerCase()}"()
+      .uri(uri.toString())
+      .response()
+      .block()
+    if (callback != null) {
+      callback.call()
+    }
+    return resp.status().code()
+  }
+
+  abstract HttpClient createHttpClient()
+}
diff --git a/...rumentation/reactor-netty-0.9/javaagent/src/test/groovy/ReactorNettyHttpClientTest.groovy b/...rumentation/reactor-netty-0.9/javaagent/src/test/groovy/ReactorNettyHttpClientTest.groovy
@@ -3,50 +3,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import io.opentelemetry.instrumentation.test.AgentTestTrait
-import io.opentelemetry.instrumentation.test.base.HttpClientTest
 import io.opentelemetry.instrumentation.test.base.SingleConnection
 import java.util.concurrent.ExecutionException
 import java.util.concurrent.TimeoutException
 import reactor.netty.http.client.HttpClient
-import reactor.netty.http.client.HttpClientResponse
 
-class ReactorNettyHttpClientTest extends HttpClientTest implements AgentTestTrait {
+class ReactorNettyHttpClientTest extends AbstractReactorNettyHttpClientTest {
 
-  @Override
-  boolean testRedirects() {
-    false
-  }
-
-  @Override
-  boolean testConnectionFailure() {
-    false
-  }
-
-  @Override
-  boolean testRemoteConnection() {
-    false
-  }
-
-  @Override
-  String userAgent() {
-    return "ReactorNetty"
-  }
-
-  @Override
-  int doRequest(String method, URI uri, Map<String, String> headers = [:], Closure callback = null) {
-    HttpClientResponse resp = HttpClient.create()
-      .followRedirect(true)
-      .headers({ h -> headers.each { k, v -> h.add(k, v) } })
-      .baseUrl(server.address.toString())
-      ."${method.toLowerCase()}"()
-      .uri(uri.toString())
-      .response()
-      .block()
-    if (callback != null) {
-      callback.call()
-    }
-    return resp.status().code()
+  HttpClient createHttpClient() {
+    return HttpClient.create()
   }
 
   @Override
@@ -76,5 +41,4 @@ class ReactorNettyHttpClientTest extends HttpClientTest implements AgentTestTrai
       }
     }
   }
-
 }
diff --git a/...on/reactor-netty-0.9/javaagent/src/test/groovy/ReactorNettyHttpClientUsingFromTest.groovy b/...on/reactor-netty-0.9/javaagent/src/test/groovy/ReactorNettyHttpClientUsingFromTest.groovy
@@ -0,0 +1,14 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import reactor.netty.http.client.HttpClient
+import reactor.netty.tcp.TcpClient
+
+class ReactorNettyHttpClientUsingFromTest extends AbstractReactorNettyHttpClientTest {
+
+  HttpClient createHttpClient() {
+    return HttpClient.from(TcpClient.create())
+  }
+}
diff --git a/...emetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyInstrumentationModule.java b/...emetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyInstrumentationModule.java
@@ -10,6 +10,7 @@
 import static java.util.Collections.singletonMap;
 import static net.bytebuddy.matcher.ElementMatchers.isStatic;
 import static net.bytebuddy.matcher.ElementMatchers.named;
+import static net.bytebuddy.matcher.ElementMatchers.namedOneOf;
 
 import com.google.auto.service.AutoService;
 import io.opentelemetry.context.Context;
@@ -63,7 +64,7 @@ public ElementMatcher<TypeDescription> typeMatcher() {
     @Override
     public Map<? extends ElementMatcher<? super MethodDescription>, String> transformers() {
       return singletonMap(
-          isStatic().and(named("create").or(named("newConnection"))),
+          isStatic().and(namedOneOf("create", "newConnection", "from")),
           ReactorNettyInstrumentationModule.class.getName() + "$CreateAdvice");
     }
   }

diff --git a/...ion/reactor-netty-1.0/javaagent/src/test/groovy/AbstractReactorNettyHttpClientTest.groovy b/...ion/reactor-netty-1.0/javaagent/src/test/groovy/AbstractReactorNettyHttpClientTest.groovy
@@ -0,0 +1,50 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import io.opentelemetry.instrumentation.test.AgentTestTrait
+import io.opentelemetry.instrumentation.test.base.HttpClientTest
+import reactor.netty.http.client.HttpClient
+import reactor.netty.http.client.HttpClientResponse
+
+abstract class AbstractReactorNettyHttpClientTest extends HttpClientTest implements AgentTestTrait {
+
+  @Override
+  boolean testRedirects() {
+    false
+  }
+
+  @Override
+  boolean testConnectionFailure() {
+    false
+  }
+
+  @Override
+  boolean testRemoteConnection() {
+    false
+  }
+
+  @Override
+  String userAgent() {
+    return "ReactorNetty"
+  }
+
+  @Override
+  int doRequest(String method, URI uri, Map<String, String> headers = [:], Closure callback = null) {
+    HttpClientResponse resp = createHttpClient()
+      .followRedirect(true)
+      .headers({ h -> headers.each { k, v -> h.add(k, v) } })
+      .baseUrl(server.address.toString())
+      ."${method.toLowerCase()}"()
+      .uri(uri.toString())
+      .response()
+      .block()
+    if (callback != null) {
+      callback.call()
+    }
+    return resp.status().code()
+  }
+
+  abstract HttpClient createHttpClient()
+}
diff --git a/...rumentation/reactor-netty-1.0/javaagent/src/test/groovy/ReactorNettyHttpClientTest.groovy b/...rumentation/reactor-netty-1.0/javaagent/src/test/groovy/ReactorNettyHttpClientTest.groovy
@@ -3,50 +3,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import io.opentelemetry.instrumentation.test.AgentTestTrait
-import io.opentelemetry.instrumentation.test.base.HttpClientTest
 import io.opentelemetry.instrumentation.test.base.SingleConnection
 import java.util.concurrent.ExecutionException
 import java.util.concurrent.TimeoutException
 import reactor.netty.http.client.HttpClient
-import reactor.netty.http.client.HttpClientResponse
 
-class ReactorNettyHttpClientTest extends HttpClientTest implements AgentTestTrait {
+class ReactorNettyHttpClientTest extends AbstractReactorNettyHttpClientTest {
 
-  @Override
-  boolean testRedirects() {
-    false
-  }
-
-  @Override
-  boolean testConnectionFailure() {
-    false
-  }
-
-  @Override
-  boolean testRemoteConnection() {
-    false
-  }
-
-  @Override
-  String userAgent() {
-    return "ReactorNetty"
-  }
-
-  @Override
-  int doRequest(String method, URI uri, Map<String, String> headers = [:], Closure callback = null) {
-    HttpClientResponse resp = HttpClient.create()
-      .followRedirect(true)
-      .headers({ h -> headers.each { k, v -> h.add(k, v) } })
-      .baseUrl(server.address.toString())
-      ."${method.toLowerCase()}"()
-      .uri(uri.toString())
-      .response()
-      .block()
-    if (callback != null) {
-      callback.call()
-    }
-    return resp.status().code()
+  HttpClient createHttpClient() {
+    return HttpClient.create()
   }
 
   @Override

diff --git a/...on/reactor-netty-1.0/javaagent/src/test/groovy/ReactorNettyHttpClientUsingFromTest.groovy b/...on/reactor-netty-1.0/javaagent/src/test/groovy/ReactorNettyHttpClientUsingFromTest.groovy
@@ -0,0 +1,14 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import reactor.netty.http.client.HttpClient
+import reactor.netty.tcp.TcpClient
+
+class ReactorNettyHttpClientUsingFromTest extends AbstractReactorNettyHttpClientTest {
+
+  HttpClient createHttpClient() {
+    return HttpClient.from(TcpClient.create())
+  }
+}