apply diff

Author: zeitlinger

instrumentation/servlet/servlet-5.0/jetty12-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty12/Jetty12ServletHandlerTest.java

@@ -18,15 +18,15 @@
 import java.nio.charset.StandardCharsets;
 import java.util.HashSet;
 import java.util.Set;
-import org.eclipse.jetty.ee10.servlet.ServletHandler;
+import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.handler.ErrorHandler;
 import org.eclipse.jetty.util.Callback;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
-public class Jetty12ServletHandlerTest extends AbstractServlet5Test<Server, ServletHandler> {
+public class Jetty12ServletHandlerTest extends AbstractServlet5Test<Server, ServletContextHandler> {
 
   @RegisterExtension
   protected static final InstrumentationExtension testing =
@@ -50,10 +50,8 @@ protected void configure(HttpServerTestOptions options) {
   @Override
   protected Server setupServer() throws Exception {
     Server server = new Server(port);
-    ServletHandler handler = new ServletHandler();
-    server.setHandler(handler);
-    setupServlets(handler);
-    server.addBean(
+    ServletContextHandler servletContext = new ServletContextHandler(getContextPath());
+    servletContext.setErrorHandler(
         new ErrorHandler() {
           @Override
           public boolean handle(Request request, Response response, Callback callback) {
@@ -66,15 +64,17 @@ public boolean handle(Request request, Response response, Callback callback) {
             return true;
           }
         });
+    setupServlets(servletContext);
+    server.setHandler(servletContext);
     server.start();
+
     return server;
   }
 
   @Override
   public void addServlet(
-      ServletHandler servletHandler, String path, Class<? extends Servlet> servlet)
-      throws Exception {
-    servletHandler.addServletWithMapping(servlet, path);
+      ServletContextHandler servletHandler, String path, Class<? extends Servlet> servlet) {
+    servletHandler.addServlet(servlet, path);
   }
 
   @Override

instrumentation/servlet/servlet-5.0/testing/build.gradle.kts

@@ -13,6 +13,7 @@ dependencies {
 
   testImplementation(project(":instrumentation:servlet:servlet-5.0:testing"))
 
+  // Jetty 11 requires Java 11
   testLibrary("org.eclipse.jetty:jetty-server:11.0.0")
   testLibrary("org.eclipse.jetty:jetty-servlet:11.0.0")
   testLibrary("org.apache.tomcat.embed:tomcat-embed-core:10.0.0")