Skip to content

Commit 7c28d47

Browse files
zeitlingerzeitlinger
committed
jetty12
1 parent e6ef016 commit 7c28d47

27 files changed

+47
-44
lines changed

‎instrumentation/servlet/servlet-5.0/jetty12-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty12/JettyServlet5AsyncTest.java‎ renamed to ‎instrumentation/servlet/servlet-5.0/jetty12-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty12/Jetty12Servlet5AsyncTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.tomcat.TestServlet5;
99
import jakarta.servlet.Servlet;
1010

11-
public class JettyServlet5AsyncTest extends JettyServlet5Test {
11+
public class Jetty12Servlet5AsyncTest extends Jetty12Servlet5Test {
1212

1313
@Override
1414
public Class<? extends Servlet> servlet() {

‎instrumentation/servlet/servlet-5.0/jetty12-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty12/JettyServlet5FakeAsyncTest.java‎ renamed to ‎instrumentation/servlet/servlet-5.0/jetty12-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty12/Jetty12Servlet5FakeAsyncTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.tomcat.TestServlet5;
99
import jakarta.servlet.Servlet;
1010

11-
public class JettyServlet5FakeAsyncTest extends JettyServlet5Test {
11+
public class Jetty12Servlet5FakeAsyncTest extends Jetty12Servlet5Test {
1212
@Override
1313
public Class<? extends Servlet> servlet() {
1414
return TestServlet5.FakeAsync.class;

‎instrumentation/servlet/servlet-5.0/jetty12-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty12/JettyServlet5SyncTest.java‎ renamed to ‎instrumentation/servlet/servlet-5.0/jetty12-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty12/Jetty12Servlet5SyncTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.tomcat.TestServlet5;
99
import jakarta.servlet.Servlet;
1010

11-
public class JettyServlet5SyncTest extends JettyServlet5Test {
11+
public class Jetty12Servlet5SyncTest extends Jetty12Servlet5Test {
1212
@Override
1313
public Class<? extends Servlet> servlet() {
1414
return TestServlet5.Sync.class;

‎instrumentation/servlet/servlet-5.0/jetty12-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty12/JettyServlet5Test.java‎ renamed to ‎instrumentation/servlet/servlet-5.0/jetty12-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty12/Jetty12Servlet5Test.java‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,15 @@
1919
import java.io.IOException;
2020
import java.io.Writer;
2121
import java.net.InetSocketAddress;
22+
import java.nio.charset.StandardCharsets;
2223
import jakarta.servlet.Servlet;
2324
import jakarta.servlet.http.HttpServletRequest;
2425
import org.eclipse.jetty.server.Server;
2526
import org.eclipse.jetty.server.handler.ErrorHandler;
26-
import org.eclipse.jetty.servlet.ServletContextHandler;
27+
import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
2728
import org.junit.jupiter.api.extension.RegisterExtension;
2829

29-
public abstract class JettyServlet5Test
30+
public abstract class Jetty12Servlet5Test
3031
extends AbstractServlet5Test<Server, ServletContextHandler> {
3132

3233
@RegisterExtension
@@ -81,15 +82,17 @@ protected SpanDataAssert assertResponseSpan(
8182
protected Server setupServer() throws Exception {
8283
Server jettyServer = new Server(new InetSocketAddress("localhost", port));
8384

84-
ServletContextHandler servletContext = new ServletContextHandler(null, getContextPath());
85-
servletContext.setErrorHandler(
86-
new ErrorHandler() {
87-
@Override
88-
protected void handleErrorPage(
89-
HttpServletRequest request, Writer writer, int code, String message)
90-
throws IOException {
91-
Throwable th = (Throwable) request.getAttribute("jakarta.servlet.error.exception");
92-
writer.write(th != null ? th.getMessage() : message);
85+
ServletContextHandler servletContext = new ServletContextHandler(contextPath);
86+
servletContext.errorHandler = new Request.Handler() {
87+
88+
@Override
89+
boolean handle(Request request, Response response, Callback callback) throws Exception {
90+
String message = (String) request.getAttribute("org.eclipse.jetty.server.error_message")
91+
if (message != null) {
92+
response.write(true, StandardCharsets.UTF_8.encode(message), Callback.NOOP)
93+
}
94+
callback.succeeded()
95+
return true
9396
}
9497
});
9598
setupServlets(servletContext);

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions;
1616
import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint;
1717
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.AbstractServlet5Test;
18-
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.tomcat.TestServlet5;
18+
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.TestServlet5;
1919
import io.opentelemetry.sdk.testing.assertj.SpanDataAssert;
2020
import io.opentelemetry.sdk.trace.data.SpanData;
2121
import io.opentelemetry.semconv.HttpAttributes;
@@ -27,10 +27,10 @@
2727
import jakarta.servlet.http.HttpServletRequest;
2828
import org.eclipse.jetty.server.Server;
2929
import org.eclipse.jetty.server.handler.ErrorHandler;
30-
import org.eclipse.jetty.servlet.ServletHandler;
30+
import org.eclipse.jetty.ee10.servlet.ServletHandler;
3131
import org.junit.jupiter.api.extension.RegisterExtension;
3232

33-
public class JettyServletHandlerTest extends AbstractServlet5Test<Server, ServletHandler> {
33+
public class Jetty12ServletHandlerTest extends AbstractServlet5Test<Server, ServletHandler> {
3434

3535
@RegisterExtension
3636
protected static final InstrumentationExtension testing =
@@ -53,7 +53,7 @@ protected void configure(HttpServerTestOptions options) {
5353

5454
@Override
5555
public boolean hasResponseSpan(ServerEndpoint endpoint) {
56-
return (JettyServlet5Test.IS_BEFORE_94 && endpoint.equals(EXCEPTION))
56+
return (Jetty12Servlet5Test.IS_BEFORE_94 && endpoint.equals(EXCEPTION))
5757
|| super.hasResponseSpan(endpoint);
5858
}
5959

@@ -65,7 +65,7 @@ protected SpanDataAssert assertResponseSpan(
6565
String method,
6666
ServerEndpoint endpoint) {
6767

68-
if (JettyServlet5Test.IS_BEFORE_94 && endpoint.equals(EXCEPTION)) {
68+
if (Jetty12Servlet5Test.IS_BEFORE_94 && endpoint.equals(EXCEPTION)) {
6969
span.satisfies(it -> assertThat(it.getName()).matches(".*\\.sendError"))
7070
.hasKind(SpanKind.INTERNAL)
7171
.hasParent(handlerSpan);

‎instrumentation/servlet/servlet-5.0/jetty12-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty12/dispatch/JettyDispatchTest.java‎ renamed to ‎instrumentation/servlet/servlet-5.0/jetty12-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty12/dispatch/Jetty12DispatchTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions;
99
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.jetty.JettyServlet5Test;
1010

11-
public abstract class JettyDispatchTest extends JettyServlet5Test {
11+
public abstract class Jetty12DispatchTest extends JettyServlet5Test {
1212

1313
@Override
1414
protected void configure(HttpServerTestOptions options) {

‎instrumentation/servlet/servlet-5.0/jetty12-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty12/dispatch/JettyServlet5DispatchAsyncTest.java‎ renamed to ‎instrumentation/servlet/servlet-5.0/jetty12-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty12/dispatch/Jetty12Servlet5DispatchAsyncTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.jetty.dispatch.JettyDispatchTest;
1919
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.tomcat.TestServlet5;
2020
import jakarta.servlet.Servlet;
21-
import org.eclipse.jetty.servlet.ServletContextHandler;
21+
import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
2222

23-
public class JettyServlet5DispatchAsyncTest extends JettyDispatchTest {
23+
public class Jetty12Servlet5DispatchAsyncTest extends JettyDispatchTest {
2424
@Override
2525
public Class<? extends Servlet> servlet() {
2626
return TestServlet5.Async.class;

‎instrumentation/servlet/servlet-5.0/jetty12-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty12/dispatch/JettyServlet5DispatchImmediateTest.java‎ renamed to ‎instrumentation/servlet/servlet-5.0/jetty12-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty12/dispatch/Jetty12Servlet5DispatchImmediateTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.jetty.dispatch.JettyDispatchTest;
1919
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.tomcat.TestServlet5;
2020
import jakarta.servlet.Servlet;
21-
import org.eclipse.jetty.servlet.ServletContextHandler;
21+
import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
2222

23-
public class JettyServlet5DispatchImmediateTest extends JettyDispatchTest {
23+
public class Jetty12Servlet5DispatchImmediateTest extends JettyDispatchTest {
2424
@Override
2525
public Class<? extends Servlet> servlet() {
2626
return TestServlet5.Async.class;

‎instrumentation/servlet/servlet-5.0/jetty12-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty12/dispatch/JettyServlet5ForwardTest.java‎ renamed to ‎instrumentation/servlet/servlet-5.0/jetty12-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty12/dispatch/Jetty12Servlet5ForwardTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.tomcat.RequestDispatcherServlet;
1919
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.tomcat.TestServlet5;
2020
import jakarta.servlet.Servlet;
21-
import org.eclipse.jetty.servlet.ServletContextHandler;
21+
import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
2222

23-
public class JettyServlet5ForwardTest extends JettyDispatchTest {
23+
public class Jetty12Servlet5ForwardTest extends Jetty12DispatchTest {
2424
@Override
2525
public Class<? extends Servlet> servlet() {
2626
return TestServlet5.Sync.class; // dispatch to sync servlet

‎instrumentation/servlet/servlet-5.0/jetty12-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty12/dispatch/JettyServlet5IncludeTest.java‎ renamed to ‎instrumentation/servlet/servlet-5.0/jetty12-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty12/dispatch/Jetty12Servlet5IncludeTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.tomcat.RequestDispatcherServlet;
1919
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.tomcat.TestServlet5;
2020
import jakarta.servlet.Servlet;
21-
import org.eclipse.jetty.servlet.ServletContextHandler;
21+
import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
2222

23-
public class JettyServlet5IncludeTest extends JettyDispatchTest {
23+
public class Jetty12Servlet5IncludeTest extends Jetty12DispatchTest {
2424
@Override
2525
public Class<? extends Servlet> servlet() {
2626
return TestServlet5.Sync.class; // dispatch to sync servlet

0 commit comments

Comments
 (0)