Vertx: avoid doulbe wrapping exception handler (#3848)

open-telemetry · Aug 17, 2021 · c54d192 · c54d192
1 parent 430f1cb
commit c54d192
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/...opentelemetry/javaagent/instrumentation/vertx/v3_0/client/HttpRequestInstrumentation.java b/...opentelemetry/javaagent/instrumentation/vertx/v3_0/client/HttpRequestInstrumentation.java
@@ -207,7 +207,7 @@ public static void wrapExceptionHandler(
       if (handler != null) {
         ContextStore<HttpClientRequest, Contexts> contextStore =
             InstrumentationContext.get(HttpClientRequest.class, Contexts.class);
-        handler = new ExceptionHandlerWrapper(tracer(), request, contextStore, handler);
+        handler = ExceptionHandlerWrapper.wrap(tracer(), request, contextStore, handler);
       }
     }
   }

diff --git a/...opentelemetry/javaagent/instrumentation/vertx/v4_0/client/HttpRequestInstrumentation.java b/...opentelemetry/javaagent/instrumentation/vertx/v4_0/client/HttpRequestInstrumentation.java
@@ -209,7 +209,7 @@ public static void wrapExceptionHandler(
       if (handler != null) {
         ContextStore<HttpClientRequest, Contexts> contextStore =
             InstrumentationContext.get(HttpClientRequest.class, Contexts.class);
-        handler = new ExceptionHandlerWrapper(tracer(), request, contextStore, handler);
+        handler = ExceptionHandlerWrapper.wrap(tracer(), request, contextStore, handler);
       }
     }
   }

diff --git a/...java/io/opentelemetry/javaagent/instrumentation/vertx/client/ExceptionHandlerWrapper.java b/...java/io/opentelemetry/javaagent/instrumentation/vertx/client/ExceptionHandlerWrapper.java
@@ -16,7 +16,7 @@ public class ExceptionHandlerWrapper implements Handler<Throwable> {
   private final ContextStore<HttpClientRequest, Contexts> contextStore;
   private final Handler<Throwable> handler;
 
-  public ExceptionHandlerWrapper(
+  private ExceptionHandlerWrapper(
       AbstractVertxClientTracer tracer,
       HttpClientRequest request,
       ContextStore<HttpClientRequest, Contexts> contextStore,
@@ -27,6 +27,18 @@ public ExceptionHandlerWrapper(
     this.handler = handler;
   }
 
+  public static Handler<Throwable> wrap(
+      AbstractVertxClientTracer tracer,
+      HttpClientRequest request,
+      ContextStore<HttpClientRequest, Contexts> contextStore,
+      Handler<Throwable> handler) {
+    if (handler instanceof ExceptionHandlerWrapper) {
+      return handler;
+    }
+
+    return new ExceptionHandlerWrapper(tracer, request, contextStore, handler);
+  }
+
   @Override
   public void handle(Throwable throwable) {
     Contexts contexts = contextStore.get(request);