Skip to content

Commit fd725f2

Browse files
committed
Skip multipart test on Jetty 9.0.x where jetty-appsec-8.1.3 causes HTTP 500
jetty-appsec-8.1.3 muzzle range [8.1.3, 9.2.0.RC0) includes Jetty 9.0.x. When applied, it calls ParameterCollector.put(String, String) which does not exist in Jetty 9.0.x → HTTP 500 on multipart requests. Override multipart() with assumeTrue(false) in jetty-server-9.0 and jetty-server-9.0.4 test classes until the muzzle range is corrected.
1 parent 2b2f46d commit fd725f2

2 files changed

Lines changed: 20 additions & 0 deletions

File tree

dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty9InactiveAppSecTest.groovy

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,18 @@ import datadog.trace.agent.test.base.HttpServer
55
import test.JettyServer
66
import test.TestHandler
77

8+
import static org.junit.jupiter.api.Assumptions.assumeTrue
9+
810
class Jetty9InactiveAppSecTest extends AppSecInactiveHttpServerTest {
911
HttpServer server() {
1012
new JettyServer(TestHandler.INSTANCE)
1113
}
14+
15+
@Override
16+
void multipart() {
17+
// jetty-appsec-8.1.3 covers [8.1.3, 9.2.0.RC0) which includes Jetty 9.0.x.
18+
// It instruments extractContentParameters() but calls ParameterCollector.put(String, String)
19+
// which does not exist in Jetty 9.0.x → HTTP 500 on multipart requests.
20+
assumeTrue(false, 'multipart not supported on Jetty 9.0.x due to jetty-appsec-8.1.3 range conflict')
21+
}
1222
}

dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty9InactiveAppSecTest.groovy

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,18 @@ import datadog.trace.agent.test.base.HttpServer
55
import test.JettyServer
66
import test.TestHandler
77

8+
import static org.junit.jupiter.api.Assumptions.assumeTrue
9+
810
class Jetty9InactiveAppSecTest extends AppSecInactiveHttpServerTest {
911
HttpServer server() {
1012
new JettyServer(TestHandler.INSTANCE)
1113
}
14+
15+
@Override
16+
void multipart() {
17+
// jetty-appsec-8.1.3 covers [8.1.3, 9.2.0.RC0) which includes Jetty 9.0.x.
18+
// It instruments extractContentParameters() but calls ParameterCollector.put(String, String)
19+
// which does not exist in Jetty 9.0.x → HTTP 500 on multipart requests.
20+
assumeTrue(false, 'multipart not supported on Jetty 9.0.x due to jetty-appsec-8.1.3 range conflict')
21+
}
1222
}

0 commit comments

Comments
 (0)