Skip to content

Commit 76bf2d7

Browse files
Fix failing tests in CI
1 parent e71c496 commit 76bf2d7

File tree

6 files changed

+18
-7
lines changed

6 files changed

+18
-7
lines changed

dd-java-agent/instrumentation/armeria-jetty/src/test/jetty11/groovy/ArmeriaJetty11ServerTest.groovy

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,4 +114,9 @@ class ArmeriaJetty11ServerTest extends HttpServerTest<ArmeriaServer> {
114114
boolean testEncodedPath() {
115115
return false
116116
}
117+
118+
@Override
119+
boolean testSessionId() {
120+
true
121+
}
117122
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ abstract class Jetty11Test extends HttpServerTest<Server> {
9191
}
9292
}
9393

94-
class Jetty11V0ForkedTest extends Jetty11Test implements TestingGenericHttpNamingConventions.ServerV0 {
94+
class Jetty11V0ForkedTest extends Jetty11Test implements TestingGenericHttpNamingConventions.ServerV0 {
9595
}
9696

9797
class Jetty11V1ForkedTest extends Jetty11Test implements TestingGenericHttpNamingConventions.ServerV1 {

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
@@ -15,6 +15,11 @@ class JettyAsyncHandlerTest extends Jetty11Test implements TestingGenericHttpNam
1515
new ContinuationTestHandler(super.handler())
1616
}
1717

18+
@Override
19+
boolean testSessionId() {
20+
false // continuation test handler not working with sessions
21+
}
22+
1823
static class ContinuationTestHandler implements Handler {
1924
@Delegate
2025
private final Handler delegate

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ class JettyServer implements HttpServer {
2020
final server = new Server(0) // select random open port
2121

2222
JettyServer(Handler handler) {
23-
sessionHandler.handler = handler
24-
server.handler = sessionHandler
23+
server.handler = handler
2524
server.addBean(errorHandler)
2625
}
2726

@@ -49,6 +48,7 @@ class JettyServer implements HttpServer {
4948

5049
static AbstractHandler servletHandler(Class<? extends Servlet> servlet) {
5150
ServletContextHandler handler = new ServletContextHandler(null, "/context-path")
51+
final sessionHandler = new SessionHandler()
5252
handler.sessionHandler = sessionHandler
5353
handler.errorHandler = errorHandler
5454
handler.servletHandler.addFilterWithMapping(EnableMultipartFilter, '/*', FilterMapping.ALL)
@@ -75,6 +75,4 @@ class JettyServer implements HttpServer {
7575
}
7676
}
7777
}
78-
79-
static sessionHandler = new SessionHandler()
8078
}

dd-java-agent/instrumentation/jetty-12/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,14 @@ addTestSuiteExtendingForDir('ee10LatestDepTest', 'latestDepTest', 'test/ee10')
3232
}
3333
}
3434

35+
forbiddenApisMain_java17 {
36+
failOnMissingClasses = false
37+
}
38+
3539
compileTestGroovy {
3640
javaLauncher = getJavaLauncherFor(17)
3741
}
42+
3843
dependencies {
3944
main_java17CompileOnly ("org.eclipse.jetty:jetty-server:12.0.0") {
4045
exclude group: 'org.slf4j', module: 'slf4j-api'

dd-java-agent/instrumentation/jetty-12/src/test/ee8/groovy/JettyServer.groovy

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import org.eclipse.jetty.session.DefaultSessionIdManager
2-
31
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.NOT_FOUND
42
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.UNKNOWN
53

0 commit comments

Comments
 (0)