rebase

open-telemetry · Mar 8, 2021 · 14f4777 · 14f4777
1 parent 399a1bd
commit 14f4777
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 22 deletions.
diff --git a/...vaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grails/GrailsTracer.java b/...vaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grails/GrailsTracer.java
@@ -9,7 +9,6 @@
 import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.api.servlet.ServletContextPath;
 import io.opentelemetry.instrumentation.api.tracer.BaseTracer;
-import java.lang.reflect.InvocationTargetException;
 import org.grails.web.mapping.mvc.GrailsControllerUrlMappingInfo;
 
 public class GrailsTracer extends BaseTracer {
@@ -34,14 +33,6 @@ public void nameServerSpan(
         ServletContextPath.prepend(context, "/" + info.getControllerName() + "/" + action));
   }
 
-  @Override
-  protected Throwable unwrapThrowable(Throwable throwable) {
-    if (throwable instanceof InvocationTargetException) {
-      return throwable.getCause();
-    }
-    return super.unwrapThrowable(throwable);
-  }
-
   @Override
   protected String getInstrumentationName() {
     return "io.opentelemetry.javaagent.grails-3.0";

diff --git a/...main/java/io/opentelemetry/javaagent/instrumentation/springwebmvc/SpringWebMvcTracer.java b/...main/java/io/opentelemetry/javaagent/instrumentation/springwebmvc/SpringWebMvcTracer.java
@@ -13,7 +13,6 @@
 import io.opentelemetry.instrumentation.api.config.Config;
 import io.opentelemetry.instrumentation.api.servlet.ServletContextPath;
 import io.opentelemetry.instrumentation.api.tracer.BaseTracer;
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import javax.servlet.Servlet;
 import javax.servlet.http.HttpServletRequest;
@@ -119,18 +118,6 @@ private void onRender(SpanBuilder span, ModelAndView mv) {
     }
   }
 
-  @Override
-  protected Throwable unwrapThrowable(Throwable throwable) {
-    if (throwable instanceof InvocationTargetException) {
-      return throwable.getCause();
-    }
-    return super.unwrapThrowable(throwable);
-  }
-
-  public void addUnwrappedThrowable(Span span, Throwable throwable) {
-    addThrowable(span, unwrapThrowable(throwable));
-  }
-
   @Override
   protected String getInstrumentationName() {
     return "io.opentelemetry.javaagent.spring-webmvc-3.1";