Skip to content

Commit 30bb769

Browse files
committed
Extend testBodyFilenamesCalledOnce coverage to Jetty 9.x and 10.x
- Add BODY_MULTIPART_REPEATED case to TestServlet3 (javax) so Jetty 9.x/10.x test modules can exercise the repeated getParts() scenario - Enable testBodyFilenamesCalledOnce() for Jetty 9.0, 9.0.4, 9.3, 9.4.21, and 10.0
1 parent 4d8ca56 commit 30bb769

6 files changed

Lines changed: 34 additions & 0 deletions

File tree

  • dd-java-agent/instrumentation
    • jetty/jetty-server
      • jetty-server-10.0/src/test/groovy/datadog/trace/instrumentation/jetty10
      • jetty-server-9.0.4/src/test/groovy/datadog/trace/instrumentation/jetty9
      • jetty-server-9.0/src/test/groovy/datadog/trace/instrumentation/jetty9
      • jetty-server-9.3/src/test/groovy/datadog/trace/instrumentation/jetty9
      • jetty-server-9.4.21/src/test/groovy/datadog/trace/instrumentation/jetty9
    • servlet/javax-servlet/javax-servlet-3.0/src/testFixtures/groovy/datadog/trace/instrumentation/servlet3

dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/test/groovy/datadog/trace/instrumentation/jetty10/Jetty10Test.groovy

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,11 @@ abstract class Jetty10Test extends HttpServerTest<Server> {
9090
true
9191
}
9292

93+
@Override
94+
boolean testBodyFilenamesCalledOnce() {
95+
true
96+
}
97+
9398
@Override
9499
boolean testSessionId() {
95100
true

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,11 @@ abstract class Jetty9Test extends HttpServerTest<Server> {
9090
true
9191
}
9292

93+
@Override
94+
boolean testBodyFilenamesCalledOnce() {
95+
true
96+
}
97+
9398
@Override
9499
boolean testSessionId() {
95100
true

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,11 @@ abstract class Jetty9Test extends HttpServerTest<Server> {
8989
true
9090
}
9191

92+
@Override
93+
boolean testBodyFilenamesCalledOnce() {
94+
true
95+
}
96+
9297
@Override
9398
boolean testSessionId() {
9499
true

dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty9Test.groovy

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,11 @@ abstract class Jetty9Test extends HttpServerTest<Server> {
8989
true
9090
}
9191

92+
@Override
93+
boolean testBodyFilenamesCalledOnce() {
94+
true
95+
}
96+
9297
@Override
9398
boolean testSessionId() {
9499
true

dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty9Test.groovy

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,11 @@ abstract class Jetty9Test extends HttpServerTest<Server> {
9090
true
9191
}
9292

93+
@Override
94+
boolean testBodyFilenamesCalledOnce() {
95+
true
96+
}
97+
9398
@Override
9499
boolean testSessionId() {
95100
true

dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/testFixtures/groovy/datadog/trace/instrumentation/servlet3/TestServlet3.groovy

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import java.lang.reflect.Modifier
1515

1616
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_URLENCODED
1717
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_MULTIPART
18+
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_MULTIPART_REPEATED
1819
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.CREATED
1920
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.CREATED_IS
2021
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.CUSTOM_EXCEPTION
@@ -95,6 +96,14 @@ class TestServlet3 {
9596
resp.status = endpoint.status
9697
resp.writer.print(endpoint.bodyForQuery(req.queryString))
9798
break
99+
case BODY_MULTIPART_REPEATED:
100+
resp.status = endpoint.status
101+
// Call getParts() 3 times to verify the filenames callback fires only once
102+
req.getParts()
103+
req.getParts()
104+
req.getParts()
105+
resp.writer.print(endpoint.body)
106+
break
98107
case BODY_URLENCODED:
99108
case BODY_MULTIPART:
100109
resp.status = endpoint.status

0 commit comments

Comments
 (0)