Avoid duplicate instrumentation in jdk http client sendAsyncMethod (#…

…8127) There are 2 `sendAsync` methods https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpClient.html#sendAsync(java.net.http.HttpRequest,java.net.http.HttpResponse.BodyHandler) and one of them calls the other.
open-telemetry · Mar 25, 2023 · 8deaaae · 8deaaae
1 parent b33cadd
commit 8deaaae
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/...java/io/opentelemetry/javaagent/instrumentation/httpclient/HttpClientInstrumentation.java b/...java/io/opentelemetry/javaagent/instrumentation/httpclient/HttpClientInstrumentation.java
@@ -19,8 +19,10 @@
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
+import io.opentelemetry.javaagent.bootstrap.CallDepth;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
+import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.util.concurrent.CompletableFuture;
@@ -102,9 +104,15 @@ public static class SendAsyncAdvice {
     public static void methodEnter(
         @Advice.Argument(value = 0) HttpRequest httpRequest,
         @Advice.Argument(value = 1, readOnly = false) HttpResponse.BodyHandler<?> bodyHandler,
+        @Advice.Local("otelCallDepth") CallDepth callDepth,
         @Advice.Local("otelContext") Context context,
         @Advice.Local("otelParentContext") Context parentContext,
         @Advice.Local("otelScope") Scope scope) {
+      callDepth = CallDepth.forClass(HttpClient.class);
+      if (callDepth.getAndIncrement() > 0) {
+        return;
+      }
+
       parentContext = currentContext();
       if (bodyHandler != null) {
         bodyHandler = new BodyHandlerWrapper<>(bodyHandler, parentContext);
@@ -122,9 +130,14 @@ public static void methodExit(
         @Advice.Argument(value = 0) HttpRequest httpRequest,
         @Advice.Return(readOnly = false) CompletableFuture<HttpResponse<?>> future,
         @Advice.Thrown Throwable throwable,
+        @Advice.Local("otelCallDepth") CallDepth callDepth,
         @Advice.Local("otelContext") Context context,
         @Advice.Local("otelParentContext") Context parentContext,
         @Advice.Local("otelScope") Scope scope) {
+      if (callDepth.decrementAndGet() > 0) {
+        return;
+      }
+
       if (scope == null) {
         return;
       }