Revert spring advice exception handling

newrelic · Oct 11, 2023 · f9f6132 · f9f6132
1 parent 350a4be
commit f9f6132
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/...-10/src/main/java/com/nr/agent/instrumentation/tomcat10/TomcatServletRequestListener.java b/...-10/src/main/java/com/nr/agent/instrumentation/tomcat10/TomcatServletRequestListener.java
@@ -22,7 +22,6 @@
 public final class TomcatServletRequestListener implements ServletRequestListener {
 
     private static final String SERVLET_EXCEPTION_ATTRIBUTE_NAME = "jakarta.servlet.error.exception";
-    private static final String SPRING6_SERVLET_EXCEPTION_ATTRIBUTE_NAME = "org.springframework.web.servlet.DispatcherServlet.EXCEPTION";
     private static final String REQUEST_FIELD = "request";
 
     private final Field requestField;
@@ -45,7 +44,7 @@ private Field getRequestField() {
     @CatchAndLog
     @Override
     public void requestDestroyed(ServletRequestEvent sre) {
-        Throwable exception = retrieveExceptionFromServlet(sre);
+        Throwable exception =(Throwable) sre.getServletRequest().getAttribute(SERVLET_EXCEPTION_ATTRIBUTE_NAME);
         if (exception != null) {
             AgentBridge.privateApi.reportException(exception);
         }
@@ -98,12 +97,4 @@ private Request_Weaved getRequest(HttpServletRequest httpServletRequest) {
         }
         return null;
     }
-
-    private Throwable retrieveExceptionFromServlet(ServletRequestEvent sre) {
-        //As of Spring 6, when controller advice is used for controller exception handling, the caught exception is
-        //now stored in the servlet attribute map with the "org.springframework.web.servlet.DispatcherServlet.EXCEPTION" key.
-        return (Throwable) (sre.getServletRequest().getAttribute(SERVLET_EXCEPTION_ATTRIBUTE_NAME) != null ?
-                sre.getServletRequest().getAttribute(SERVLET_EXCEPTION_ATTRIBUTE_NAME) :
-                sre.getServletRequest().getAttribute(SPRING6_SERVLET_EXCEPTION_ATTRIBUTE_NAME));
-    }
 }
diff --git a/.../newrelic/agent/instrumentation/pointcuts/frameworks/spring/SpringDispatcherPointCut.java b/.../newrelic/agent/instrumentation/pointcuts/frameworks/spring/SpringDispatcherPointCut.java
@@ -50,7 +50,7 @@ public SpringDispatcherPointCut(PointCutClassTransformer classTransformer) {
 
     @Override
     public Tracer doGetTracer(Transaction transaction, ClassMethodSignature sig, Object dispatcher, Object[] args) {
-        if (RENDER_METHOD_NAME == sig.getMethodName()) {
+        if (RENDER_METHOD_NAME.equals(sig.getMethodName())) {
             StringBuilder metricName = new StringBuilder("SpringView");
             if (canSetTransactionName(transaction)) {
                 try {