Skip to content

Commit f8c95c8

Browse files
authored
Don't shadow javax.servlet on test boostrap (#8380)
1 parent ddbd69a commit f8c95c8

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/SpockRunner.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,18 +48,18 @@ public class SpockRunner extends JUnitPlatform {
4848
"datadog.trace.util",
4949
};
5050

51+
private static final String[] TEST_EXCLUDED_BOOTSTRAP_PACKAGE_PREFIXES = {
52+
"ch.qos.logback.classic.servlet", // this draws javax.servlet deps that are not needed
53+
};
54+
5155
private static final String[] TEST_BOOTSTRAP_PREFIXES;
5256

5357
static {
5458
ByteBuddyAgent.install();
5559
final String[] testBS = {
56-
"org.slf4j",
57-
"ch.qos.logback",
58-
// Tomcat's servlet classes must be on boostrap
59-
// when running tomcat test
60-
"javax.servlet.ServletContainerInitializer",
61-
"javax.servlet.ServletContext"
60+
"org.slf4j", "ch.qos.logback",
6261
};
62+
6363
TEST_BOOTSTRAP_PREFIXES =
6464
Arrays.copyOf(
6565
BOOTSTRAP_PACKAGE_PREFIXES_COPY,
@@ -114,7 +114,8 @@ private static void assertNotBootstrapClass(final Class<?> testClass, final Clas
114114
private static boolean isBootstrapClass(final String className) {
115115
for (int i = 0; i < TEST_BOOTSTRAP_PREFIXES.length; ++i) {
116116
if (className.startsWith(TEST_BOOTSTRAP_PREFIXES[i])) {
117-
return true;
117+
return Arrays.stream(TEST_EXCLUDED_BOOTSTRAP_PACKAGE_PREFIXES)
118+
.noneMatch(className::startsWith);
118119
}
119120
}
120121
return false;

0 commit comments

Comments
 (0)