Preserve original exception in jetty http client wrappers (#7455)

Same issue as in #7452
open-telemetry · Dec 21, 2022 · e683fd9 · e683fd9
1 parent d38bc4d
commit e683fd9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/.../io/opentelemetry/instrumentation/jetty/httpclient/v9_2/internal/JettyClientWrapUtil.java b/.../io/opentelemetry/instrumentation/jetty/httpclient/v9_2/internal/JettyClientWrapUtil.java
@@ -9,6 +9,7 @@
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Proxy;
 import java.util.ArrayList;
 import java.util.List;
@@ -71,6 +72,8 @@ private static Response.ResponseListener wrapTheListener(
             (proxy, method, args) -> {
               try (Scope ignored = context.makeCurrent()) {
                 return method.invoke(listener, args);
+              } catch (InvocationTargetException exception) {
+                throw exception.getCause();
               }
             });
   }

diff --git a/...ry/instrumentation/jetty/httpclient/v9_2/internal/JettyHttpClient9TracingInterceptor.java b/...ry/instrumentation/jetty/httpclient/v9_2/internal/JettyHttpClient9TracingInterceptor.java
@@ -10,6 +10,7 @@
 import io.opentelemetry.context.Scope;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Proxy;
 import java.util.ArrayList;
 import java.util.List;
@@ -118,6 +119,8 @@ private void wrapRequestListeners(List<Request.RequestListener> requestListeners
                   (proxy, method, args) -> {
                     try (Scope ignored = context.makeCurrent()) {
                       return method.invoke(listener, args);
+                    } catch (InvocationTargetException exception) {
+                      throw exception.getCause();
                     }
                   });