Skip to content

Commit 05a5ec4

Browse files
committed
Use @ignore to skip multipart test on Jetty 9.0.x where jetty-appsec-8.1.3 causes HTTP 500
Replace assumeTrue(false) with Spock's @ignore annotation — more reliable for overriding void feature methods without Spock block labels. 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.
1 parent fd725f2 commit 05a5ec4

2 files changed

Lines changed: 14 additions & 12 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: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,22 @@ package datadog.trace.instrumentation.jetty9
22

33
import com.datadog.appsec.AppSecInactiveHttpServerTest
44
import datadog.trace.agent.test.base.HttpServer
5+
import spock.lang.Ignore
56
import test.JettyServer
67
import test.TestHandler
78

8-
import static org.junit.jupiter.api.Assumptions.assumeTrue
9-
109
class Jetty9InactiveAppSecTest extends AppSecInactiveHttpServerTest {
1110
HttpServer server() {
1211
new JettyServer(TestHandler.INSTANCE)
1312
}
1413

14+
// jetty-appsec-8.1.3 covers [8.1.3, 9.2.0.RC0) which includes Jetty 9.0.x.
15+
// It instruments extractContentParameters() but calls ParameterCollector.put(String, String)
16+
// which does not exist in Jetty 9.0.x → HTTP 500 on multipart requests.
17+
@Ignore('multipart not supported on Jetty 9.0.x due to jetty-appsec-8.1.3 range conflict')
1518
@Override
1619
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')
20+
setup:
21+
true
2122
}
2223
}

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,22 @@ package datadog.trace.instrumentation.jetty9
22

33
import com.datadog.appsec.AppSecInactiveHttpServerTest
44
import datadog.trace.agent.test.base.HttpServer
5+
import spock.lang.Ignore
56
import test.JettyServer
67
import test.TestHandler
78

8-
import static org.junit.jupiter.api.Assumptions.assumeTrue
9-
109
class Jetty9InactiveAppSecTest extends AppSecInactiveHttpServerTest {
1110
HttpServer server() {
1211
new JettyServer(TestHandler.INSTANCE)
1312
}
1413

14+
// jetty-appsec-8.1.3 covers [8.1.3, 9.2.0.RC0) which includes Jetty 9.0.x.
15+
// It instruments extractContentParameters() but calls ParameterCollector.put(String, String)
16+
// which does not exist in Jetty 9.0.x → HTTP 500 on multipart requests.
17+
@Ignore('multipart not supported on Jetty 9.0.x due to jetty-appsec-8.1.3 range conflict')
1518
@Override
1619
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')
20+
setup:
21+
true
2122
}
2223
}

0 commit comments

Comments
 (0)