From f00393260cf6e679ceed595c5f228d2135ad5983 Mon Sep 17 00:00:00 2001
From: Lauri Tulmin <ltulmin@splunk.com>
Date: Thu, 18 May 2023 03:03:22 +0300
Subject: [PATCH] Use jakarta.servlet.error.exception request attribute on
 jetty11 (#8503)

---
 .../javaagent/instrumentation/jetty/common/JettyHelper.java     | 1 +
 .../javaagent/src/test/groovy/JettyServlet5Test.groovy          | 2 +-
 .../javaagent/src/test/groovy/JettyServletHandlerTest.groovy    | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/instrumentation/jetty/jetty-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/common/JettyHelper.java b/instrumentation/jetty/jetty-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/common/JettyHelper.java
index aef567e3f9..ebbd5ad93b 100644
--- a/instrumentation/jetty/jetty-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/common/JettyHelper.java
+++ b/instrumentation/jetty/jetty-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/common/JettyHelper.java
@@ -57,6 +57,7 @@ public class JettyHelper<REQUEST, RESPONSE> extends ServletHelper<REQUEST, RESPO
   }
 
   private static String errorExceptionAttributeName() {
+    // this method is only used on jetty versions before 9.4
     return "javax.servlet.error.exception";
   }
 }
diff --git a/instrumentation/servlet/servlet-5.0/javaagent/src/test/groovy/JettyServlet5Test.groovy b/instrumentation/servlet/servlet-5.0/javaagent/src/test/groovy/JettyServlet5Test.groovy
index 66f597e574..050884806c 100644
--- a/instrumentation/servlet/servlet-5.0/javaagent/src/test/groovy/JettyServlet5Test.groovy
+++ b/instrumentation/servlet/servlet-5.0/javaagent/src/test/groovy/JettyServlet5Test.groovy
@@ -43,7 +43,7 @@ abstract class JettyServlet5Test extends AbstractServlet5Test<Object, Object> {
     ServletContextHandler servletContext = new ServletContextHandler(null, contextPath)
     servletContext.errorHandler = new ErrorHandler() {
       protected void handleErrorPage(HttpServletRequest request, Writer writer, int code, String message) throws IOException {
-        Throwable th = (Throwable) request.getAttribute("javax.servlet.error.exception")
+        Throwable th = (Throwable) request.getAttribute("jakarta.servlet.error.exception")
         writer.write(th ? th.message : message)
       }
     }
diff --git a/instrumentation/servlet/servlet-5.0/javaagent/src/test/groovy/JettyServletHandlerTest.groovy b/instrumentation/servlet/servlet-5.0/javaagent/src/test/groovy/JettyServletHandlerTest.groovy
index c1b47a2ba7..034b2eafe0 100644
--- a/instrumentation/servlet/servlet-5.0/javaagent/src/test/groovy/JettyServletHandlerTest.groovy
+++ b/instrumentation/servlet/servlet-5.0/javaagent/src/test/groovy/JettyServletHandlerTest.groovy
@@ -34,7 +34,7 @@ class JettyServletHandlerTest extends AbstractServlet5Test<Object, Object> {
     setupServlets(handler)
     server.addBean(new ErrorHandler() {
       protected void handleErrorPage(HttpServletRequest request, Writer writer, int code, String message) throws IOException {
-        Throwable th = (Throwable) request.getAttribute("javax.servlet.error.exception")
+        Throwable th = (Throwable) request.getAttribute("jakarta.servlet.error.exception")
         writer.write(th ? th.message : message)
       }
     })