Skip to content

Commit 542304a

Browse files
committed
fix jetty11 test
1 parent 34eb26d commit 542304a

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

dd-java-agent/instrumentation/jetty-11/src/test/groovy/JettyAsyncHandlerTest.groovy

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ class JettyAsyncHandlerTest extends Jetty11Test implements TestingGenericHttpNam
2020
false // continuation test handler not working with sessions
2121
}
2222

23+
@Override
24+
boolean testWebsockets() {
25+
false
26+
}
27+
2328
static class ContinuationTestHandler implements Handler {
2429
@Delegate
2530
private final Handler delegate

dd-java-agent/instrumentation/jetty-11/src/testFixtures/groovy/JettyServer.groovy

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import jakarta.websocket.EndpointConfig
1313
import jakarta.websocket.MessageHandler
1414
import jakarta.websocket.Session
1515
import jakarta.websocket.server.ServerEndpointConfig
16+
import org.eclipse.jetty.server.Handler
1617
import org.eclipse.jetty.server.Server
1718
import org.eclipse.jetty.server.handler.ErrorHandler
1819
import org.eclipse.jetty.server.session.SessionHandler
@@ -28,14 +29,16 @@ class JettyServer implements WebsocketServer {
2829
def port = 0
2930
final server = new Server(0) // select random open port
3031

31-
JettyServer(ServletContextHandler handler) {
32+
JettyServer(Handler handler) {
3233
server.handler = handler
3334
server.addBean(errorHandler)
34-
try {
35-
JakartaWebSocketServletContainerInitializer.configure(handler, (servletContext, container) -> {
36-
container.addEndpoint(ServerEndpointConfig.Builder.create(WsEndpoint.class, "/websocket").build())
37-
})
38-
} catch (Throwable ignored) {
35+
if (handler instanceof ServletContextHandler) {
36+
try {
37+
JakartaWebSocketServletContainerInitializer.configure(handler, (servletContext, container) -> {
38+
container.addEndpoint(ServerEndpointConfig.Builder.create(WsEndpoint.class, "/websocket").build())
39+
})
40+
} catch (Throwable ignored) {
41+
}
3942
}
4043
}
4144

0 commit comments

Comments
 (0)