Update tests to run with JUnit 5 #9445
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
🎯 Code Coverage 🔗 Commit SHA: 36f5715 | Docs | Was this helpful? Give us feedback! |
BenchmarksStartupParameters
See matching parameters
SummaryFound 1 performance improvements and 0 performance regressions! Performance is the same for 44 metrics, 14 unstable metrics.
Startup time reports for petclinicgantt
title petclinic - global startup overhead: candidate=1.53.0-SNAPSHOT~36f5715401, baseline=1.54.0-SNAPSHOT~f284153719
dateFormat X
axisFormat %s
section tracing
Agent [baseline] (1.045 s) : 0, 1045312
Total [baseline] (10.748 s) : 0, 10748374
Agent [candidate] (1.047 s) : 0, 1046645
Total [candidate] (10.694 s) : 0, 10694264
section appsec
Agent [baseline] (1.225 s) : 0, 1224740
Total [baseline] (10.788 s) : 0, 10788375
Agent [candidate] (1.222 s) : 0, 1221830
Total [candidate] (10.808 s) : 0, 10807532
section iast
Agent [baseline] (1.2 s) : 0, 1199539
Total [baseline] (11.031 s) : 0, 11030838
Agent [candidate] (1.181 s) : 0, 1180677
Total [candidate] (10.949 s) : 0, 10949265
section profiling
Agent [baseline] (1.205 s) : 0, 1205474
Total [baseline] (11.069 s) : 0, 11069208
Agent [candidate] (1.22 s) : 0, 1219816
Total [candidate] (10.944 s) : 0, 10943854
gantt
title petclinic - break down per module: candidate=1.53.0-SNAPSHOT~36f5715401, baseline=1.54.0-SNAPSHOT~f284153719
dateFormat X
axisFormat %s
section tracing
crashtracking [baseline] (1.45 ms) : 0, 1450
crashtracking [candidate] (1.449 ms) : 0, 1449
BytebuddyAgent [baseline] (730.704 ms) : 0, 730704
BytebuddyAgent [candidate] (732.178 ms) : 0, 732178
GlobalTracer [baseline] (242.532 ms) : 0, 242532
GlobalTracer [candidate] (242.583 ms) : 0, 242583
AppSec [baseline] (30.026 ms) : 0, 30026
AppSec [candidate] (29.992 ms) : 0, 29992
Debugger [baseline] (6.423 ms) : 0, 6423
Debugger [candidate] (6.38 ms) : 0, 6380
Remote Config [baseline] (667.263 µs) : 0, 667
Remote Config [candidate] (665.638 µs) : 0, 666
Telemetry [baseline] (12.382 ms) : 0, 12382
Telemetry [candidate] (12.226 ms) : 0, 12226
section appsec
crashtracking [baseline] (1.457 ms) : 0, 1457
crashtracking [candidate] (1.447 ms) : 0, 1447
BytebuddyAgent [baseline] (755.997 ms) : 0, 755997
BytebuddyAgent [candidate] (754.335 ms) : 0, 754335
GlobalTracer [baseline] (235.935 ms) : 0, 235935
GlobalTracer [candidate] (234.803 ms) : 0, 234803
AppSec [baseline] (169.287 ms) : 0, 169287
AppSec [candidate] (170.038 ms) : 0, 170038
Debugger [baseline] (7.501 ms) : 0, 7501
Debugger [candidate] (7.554 ms) : 0, 7554
Remote Config [baseline] (623.903 µs) : 0, 624
Remote Config [candidate] (617.879 µs) : 0, 618
Telemetry [baseline] (9.341 ms) : 0, 9341
Telemetry [candidate] (8.5 ms) : 0, 8500
IAST [baseline] (23.479 ms) : 0, 23479
IAST [candidate] (23.481 ms) : 0, 23481
section iast
crashtracking [baseline] (1.488 ms) : 0, 1488
crashtracking [candidate] (1.457 ms) : 0, 1457
BytebuddyAgent [baseline] (866.936 ms) : 0, 866936
BytebuddyAgent [candidate] (852.015 ms) : 0, 852015
GlobalTracer [baseline] (235.755 ms) : 0, 235755
GlobalTracer [candidate] (233.238 ms) : 0, 233238
AppSec [baseline] (28.023 ms) : 0, 28023
AppSec [candidate] (26.796 ms) : 0, 26796
Debugger [baseline] (7.101 ms) : 0, 7101
Debugger [candidate] (6.979 ms) : 0, 6979
Remote Config [baseline] (631.584 µs) : 0, 632
Remote Config [candidate] (599.63 µs) : 0, 600
Telemetry [baseline] (8.543 ms) : 0, 8543
Telemetry [candidate] (8.303 ms) : 0, 8303
IAST [baseline] (29.713 ms) : 0, 29713
IAST [candidate] (30.124 ms) : 0, 30124
section profiling
ProfilingAgent [baseline] (109.65 ms) : 0, 109650
ProfilingAgent [candidate] (110.996 ms) : 0, 110996
crashtracking [baseline] (1.423 ms) : 0, 1423
crashtracking [candidate] (1.461 ms) : 0, 1461
BytebuddyAgent [baseline] (763.716 ms) : 0, 763716
BytebuddyAgent [candidate] (775.236 ms) : 0, 775236
GlobalTracer [baseline] (225.356 ms) : 0, 225356
GlobalTracer [candidate] (225.403 ms) : 0, 225403
AppSec [baseline] (30.893 ms) : 0, 30893
AppSec [candidate] (31.174 ms) : 0, 31174
Debugger [baseline] (7.465 ms) : 0, 7465
Debugger [candidate] (6.869 ms) : 0, 6869
Remote Config [baseline] (744.075 µs) : 0, 744
Remote Config [candidate] (702.379 µs) : 0, 702
Telemetry [baseline] (15.676 ms) : 0, 15676
Telemetry [candidate] (16.551 ms) : 0, 16551
Profiling [baseline] (110.339 ms) : 0, 110339
Profiling [candidate] (111.698 ms) : 0, 111698
Startup time reports for insecure-bankgantt
title insecure-bank - global startup overhead: candidate=1.53.0-SNAPSHOT~36f5715401, baseline=1.54.0-SNAPSHOT~f284153719
dateFormat X
axisFormat %s
section tracing
Agent [baseline] (1.046 s) : 0, 1046471
Total [baseline] (8.64 s) : 0, 8640311
Agent [candidate] (1.048 s) : 0, 1048035
Total [candidate] (8.632 s) : 0, 8631900
section iast
Agent [baseline] (1.177 s) : 0, 1177439
Total [baseline] (9.375 s) : 0, 9374510
Agent [candidate] (1.18 s) : 0, 1179955
Total [candidate] (9.377 s) : 0, 9377311
gantt
title insecure-bank - break down per module: candidate=1.53.0-SNAPSHOT~36f5715401, baseline=1.54.0-SNAPSHOT~f284153719
dateFormat X
axisFormat %s
section tracing
crashtracking [baseline] (1.455 ms) : 0, 1455
crashtracking [candidate] (1.458 ms) : 0, 1458
BytebuddyAgent [baseline] (733.322 ms) : 0, 733322
BytebuddyAgent [candidate] (733.05 ms) : 0, 733050
GlobalTracer [baseline] (242.44 ms) : 0, 242440
GlobalTracer [candidate] (242.14 ms) : 0, 242140
AppSec [baseline] (30.153 ms) : 0, 30153
AppSec [candidate] (30.065 ms) : 0, 30065
Debugger [baseline] (6.401 ms) : 0, 6401
Debugger [candidate] (6.414 ms) : 0, 6414
Remote Config [baseline] (672.594 µs) : 0, 673
Remote Config [candidate] (674.611 µs) : 0, 675
Telemetry [baseline] (10.83 ms) : 0, 10830
Telemetry [candidate] (13.124 ms) : 0, 13124
section iast
crashtracking [baseline] (1.449 ms) : 0, 1449
crashtracking [candidate] (1.45 ms) : 0, 1450
BytebuddyAgent [baseline] (849.765 ms) : 0, 849765
BytebuddyAgent [candidate] (851.526 ms) : 0, 851526
GlobalTracer [baseline] (232.204 ms) : 0, 232204
GlobalTracer [candidate] (232.798 ms) : 0, 232798
AppSec [baseline] (28.578 ms) : 0, 28578
AppSec [candidate] (26.118 ms) : 0, 26118
Debugger [baseline] (7.01 ms) : 0, 7010
Debugger [candidate] (7.837 ms) : 0, 7837
Remote Config [baseline] (606.656 µs) : 0, 607
Remote Config [candidate] (673.609 µs) : 0, 674
Telemetry [baseline] (8.261 ms) : 0, 8261
Telemetry [candidate] (8.324 ms) : 0, 8324
IAST [baseline] (28.538 ms) : 0, 28538
IAST [candidate] (30.237 ms) : 0, 30237
LoadParameters
See matching parameters
SummaryFound 2 performance improvements and 1 performance regressions! Performance is the same for 9 metrics, 12 unstable metrics.
Request duration reports for petclinicgantt
title petclinic - request duration [CI 0.99] : candidate=1.53.0-SNAPSHOT~36f5715401, baseline=1.54.0-SNAPSHOT~f284153719
dateFormat X
axisFormat %s
section baseline
no_agent (37.476 ms) : 37186, 37766
. : milestone, 37476,
appsec (47.513 ms) : 47082, 47945
. : milestone, 47513,
code_origins (44.513 ms) : 44131, 44895
. : milestone, 44513,
iast (46.181 ms) : 45771, 46591
. : milestone, 46181,
profiling (50.32 ms) : 49865, 50775
. : milestone, 50320,
tracing (43.262 ms) : 42888, 43636
. : milestone, 43262,
section candidate
no_agent (37.215 ms) : 36908, 37522
. : milestone, 37215,
appsec (48.284 ms) : 47849, 48719
. : milestone, 48284,
code_origins (44.729 ms) : 44343, 45115
. : milestone, 44729,
iast (43.81 ms) : 43428, 44192
. : milestone, 43810,
profiling (51.014 ms) : 50494, 51534
. : milestone, 51014,
tracing (43.856 ms) : 43488, 44224
. : milestone, 43856,
Request duration reports for insecure-bankgantt
title insecure-bank - request duration [CI 0.99] : candidate=1.53.0-SNAPSHOT~36f5715401, baseline=1.54.0-SNAPSHOT~f284153719
dateFormat X
axisFormat %s
section baseline
no_agent (4.339 ms) : 4291, 4387
. : milestone, 4339,
iast (9.224 ms) : 9073, 9374
. : milestone, 9224,
iast_FULL (14.338 ms) : 14055, 14622
. : milestone, 14338,
iast_GLOBAL (10.544 ms) : 10356, 10732
. : milestone, 10544,
profiling (8.884 ms) : 8733, 9034
. : milestone, 8884,
tracing (7.821 ms) : 7709, 7934
. : milestone, 7821,
section candidate
no_agent (4.571 ms) : 4520, 4622
. : milestone, 4571,
iast (9.411 ms) : 9256, 9566
. : milestone, 9411,
iast_FULL (13.63 ms) : 13364, 13896
. : milestone, 13630,
iast_GLOBAL (10.577 ms) : 10388, 10765
. : milestone, 10577,
profiling (8.628 ms) : 8493, 8763
. : milestone, 8628,
tracing (7.767 ms) : 7648, 7885
. : milestone, 7767,
DacapoParameters
See matching parameters
SummaryFound 0 performance improvements and 0 performance regressions! Performance is the same for 11 metrics, 1 unstable metrics. Execution time for biojavagantt
title biojava - execution time [CI 0.99] : candidate=1.53.0-SNAPSHOT~36f5715401, baseline=1.54.0-SNAPSHOT~f284153719
dateFormat X
axisFormat %s
section baseline
no_agent (14.869 s) : 14869000, 14869000
. : milestone, 14869000,
appsec (14.783 s) : 14783000, 14783000
. : milestone, 14783000,
iast (18.564 s) : 18564000, 18564000
. : milestone, 18564000,
iast_GLOBAL (17.457 s) : 17457000, 17457000
. : milestone, 17457000,
profiling (15.511 s) : 15511000, 15511000
. : milestone, 15511000,
tracing (14.851 s) : 14851000, 14851000
. : milestone, 14851000,
section candidate
no_agent (15.437 s) : 15437000, 15437000
. : milestone, 15437000,
appsec (14.988 s) : 14988000, 14988000
. : milestone, 14988000,
iast (18.964 s) : 18964000, 18964000
. : milestone, 18964000,
iast_GLOBAL (18.306 s) : 18306000, 18306000
. : milestone, 18306000,
profiling (15.835 s) : 15835000, 15835000
. : milestone, 15835000,
tracing (15.134 s) : 15134000, 15134000
. : milestone, 15134000,
Execution time for tomcatgantt
title tomcat - execution time [CI 0.99] : candidate=1.53.0-SNAPSHOT~36f5715401, baseline=1.54.0-SNAPSHOT~f284153719
dateFormat X
axisFormat %s
section baseline
no_agent (1.474 ms) : 1462, 1485
. : milestone, 1474,
appsec (3.589 ms) : 3377, 3801
. : milestone, 3589,
iast (2.196 ms) : 2134, 2259
. : milestone, 2196,
iast_GLOBAL (2.241 ms) : 2178, 2304
. : milestone, 2241,
profiling (2.054 ms) : 2003, 2106
. : milestone, 2054,
tracing (2.009 ms) : 1961, 2057
. : milestone, 2009,
section candidate
no_agent (1.472 ms) : 1460, 1483
. : milestone, 1472,
appsec (3.659 ms) : 3442, 3876
. : milestone, 3659,
iast (2.204 ms) : 2141, 2266
. : milestone, 2204,
iast_GLOBAL (2.238 ms) : 2174, 2301
. : milestone, 2238,
profiling (2.058 ms) : 2006, 2110
. : milestone, 2058,
tracing (2.015 ms) : 1966, 2064
. : milestone, 2015,
|
Kafka / producer-benchmarkParameters
See matching parameters
SummaryFound 0 performance improvements and 0 performance regressions! Performance is the same for 3 metrics, 0 unstable metrics. See unchanged results
|
Kafka / consumer-benchmarkParameters
See matching parameters
SummaryFound 0 performance improvements and 0 performance regressions! Performance is the same for 3 metrics, 0 unstable metrics. See unchanged results
|
|
I would like to have a look Today or early Monday if it’s not too late 🙏 |
bric3
approved these changes
Sep 5, 2025
Comment on lines
+91
to
+109
| iastTest { | ||
| filter { | ||
| // This class must be excluded from scanning because it references class from "org.apache.pekko.http" package. | ||
| // When JUnit 5 scans this class, it loads every other class that is present in its method signatures (arguments, return types, throws). | ||
| // As the result, some classes from the datadog.trace.instrumentation.pekkohttp.iast.MakeTaintableInstrumentation#knownMatchingTypes list are loaded. | ||
| // JUnit scanning (and class loading that it triggers) happens before instrumentations are applied. | ||
| // Later when MakeTaintableInstrumentation is applied (in InstrumentationSpecification#setupSpec), | ||
| // it fails to retransform the already-loaded org.apache.pekko.http classes, | ||
| // because it needs to change the set of implemented interfaces, which is not possible for already loaded classes. | ||
| excludeTestsMatching("*PekkoIastTestWebServer*") | ||
| } | ||
| } | ||
|
|
||
| latestDepIastTest { | ||
| filter { | ||
| // Exclude the same problematic class as for iastTest to avoid class loading issues. | ||
| excludeTestsMatching("*PekkoIastTestWebServer*") | ||
| } | ||
| } |
There was a problem hiding this comment.
praise: Great investigation !
dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/build.gradle
Outdated
Show resolved
Hide resolved
...iast/iast-test-fixtures/src/main/groovy/com/datadog/iast/test/TaintedObjectCollection.groovy
Outdated
Show resolved
Hide resolved
...tation-testing/src/main/groovy/datadog/trace/agent/test/BootstrapClasspathSetupListener.java
Outdated
Show resolved
Hide resolved
...tation-testing/src/main/groovy/datadog/trace/agent/test/BootstrapClasspathSetupListener.java
Outdated
Show resolved
Hide resolved
...tation-testing/src/main/groovy/datadog/trace/agent/test/BootstrapClasspathSetupListener.java
Outdated
Show resolved
Hide resolved
...tation-testing/src/main/groovy/datadog/trace/agent/test/BootstrapClasspathSetupListener.java
Outdated
Show resolved
Hide resolved
...tation-testing/src/main/groovy/datadog/trace/agent/test/BootstrapClasspathSetupListener.java
Outdated
Show resolved
Hide resolved
...umentation-testing/src/main/groovy/datadog/trace/agent/test/TestClassShadowingExtension.java
Outdated
Show resolved
Hide resolved
.../instrumentation-testing/src/main/groovy/datadog/trace/agent/test/base/HttpClientTest.groovy
Outdated
Show resolved
Hide resolved
| @@ -862,7 +862,22 @@ abstract class HttpClientTest extends VersionedNamingTestBase { | |||
| "$DDTags.PATHWAY_HASH" { String } | |||
| } | |||
| if (exception) { | |||
| errorTags(exception.class, exception.message) | |||
| // PlayWS classes throw different exception types for the same connection failures | |||
There was a problem hiding this comment.
🎯 suggestion: I wonder if there isn’t a cleaner way to avoid introducing coupling the generic test client with Play instrumentation - especially since it’s coupled with a lot of product already.
What about adding a method assertSpanErrorTag(Class<Throwable> errorType, message) that will delegate to the usual DSL TagsAssert.errorTags but can be overridden into the Play framework instrumentation tests to loosen the assert a bit?
| @@ -3,6 +3,10 @@ plugins { | |||
| id 'me.champeau.jmh' | |||
| } | |||
|
|
|||
| ext { | |||
| latestDepJava11TestMinJavaVersionForTests = JavaVersion.VERSION_11 | |||
There was a problem hiding this comment.
💭 thought: I’m surprised it even runs on instrumentation / JDK8 jobs according the latest dependency requirements 🤷
Comment on lines
+29
to
+31
| forkedTest { | ||
| timeout = Duration.of(15, ChronoUnit.MINUTES) | ||
| } |
There was a problem hiding this comment.
📝 notes: Similarly, we need to find out why the migration extended the timeout
cc @AlexeyKuznetsov-DD
...tp-1.0/src/iastTest/groovy/datadog/trace/instrumentation/pekkohttp/iast/IastPekkoTest.groovy
Outdated
Show resolved
Hide resolved
| callback?.call() | ||
| if (callback != null) { | ||
| // Execute callback in a separate thread to clear trace context | ||
| def thread = new Thread({ callback.call() }) |
There was a problem hiding this comment.
❔ question: Do you have some context about why this kind of change is needed here @amarziali?
I wonder if starting a new thread is the right solution in term of CI stability or if Tracer.muteTracing() could be a safer alternative?
There was a problem hiding this comment.
cc @sarahchen6
There was a problem hiding this comment.
I think what was happening was that the callback was created as a child span, resulting in 2 spans returned instead of 1, which is why the callback is explicitly started in a new thread here. From what I can see, Tracer.muteTracing() mutes the additional span, so this seems like a safer alternative compared to creating a new thread. I can try implementing this!
There was a problem hiding this comment.
Oh sorry -- we do actually need the callback span because that's what the test is checking for, and Tracer.muteTracing() mutes this entirely, so it does not work... Let me know if I'm understanding Tracer.muteTracing() or the test wrong though 😅
There was a problem hiding this comment.
There are two tests that can be done:
- invoke the callback when the http client was running under a parent span -> the callback must be child of the parent
- invoke the callback when the http client was running without a parent span -> the callback must have no parent
PlayWSClientTestBase has testCallbackWithParent to false (I imagine because that one was just not working). So we are just testing the case that the callback must not have a parent. This means that, if the test was failing because the callback was attached to some parent does not means that the test has to be fixed but that the integration is broken. Having run the callback in a separate thread is wrong here.
Rather, we must have investigated why the instrumentation is capturing a bad parent. At this point I would suggest to log a ticket into the idm board in order to have play ws fixed in the future (cc @vandonr for awareness)
There was a problem hiding this comment.
Ah I see. I logged a ticket in the intake column here: https://datadoghq.atlassian.net/browse/AIDM-101
dd-java-agent/instrumentation/play-ws-1/src/test/groovy/PlayWSClientTest.groovy
Outdated
Show resolved
Hide resolved
PerfectSlayer
approved these changes
Sep 9, 2025
There was a problem hiding this comment.
🧹 chore: Excluded classes from :dd-java-agent:testing build.grade could be updated to removed the old runner exclusion:
dd-trace-java/dd-java-agent/testing/build.gradle
Lines 22 to 24 in 6195dc7
🧹 chore: Similarly, can we add @DataDog/asm-java as codeowner of the newly introduced modules :dd-java-agent:appsec:appsec-test-fixtures and :dd-java-agent:agent-iast:iast-test-fixtures here:
dd-trace-java/.github/CODEOWNERS
Line 45 in 3ff796a
👏 praise: Amazing work! Thanks for unblocking instrumented testing using JUnit 5 💪 We tried several times during R&D week and nobody went to the bottom of it. Thanks a lot!
That’s all for me, I will approve and we can follow up in PR comment discussion or in follow up PR if you would like to get this one merge soon (to avoid merge conflict as much as possible).
Comment on lines
+16
to
+22
| forkedTest { | ||
| timeout = Duration.of(15, ChronoUnit.MINUTES) | ||
| } | ||
|
|
||
| latestDepForkedTest { | ||
| timeout = Duration.of(15, ChronoUnit.MINUTES) | ||
| } |
There was a problem hiding this comment.
📝 notes: Same here about investigating timeout increase
cc @AlexeyKuznetsov-DD
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What Does This Do
Migrates
AgentTestRunner(base class for instrumentation tests) from JUnit4-basedSpockRunnerto JUnit5-basedSpockExtension.Summary of the changes:
SpockRunnerwith JUnit 5-basedTestClassShadowingExtensionandTooManyInvocationsErrorHandlerAgentTestRunnertoInstrumentationSpecification:dd-java-agent:instrumentation-testing:dd-java-agent:appsec:appsec-test-fixtures:dd-java-agent:agent-iast:iast-test-fixtures:dd-java-agent:agent-ci-visibility:civisibility-test-fixtures(shared between CI Vis instrumentation and smoke tests) and:dd-java-agent:agent-ci-visibility:civisibility-instrumentation-test-fixtures(for CI Vis instrumentation tests)Motivation
Required for supporting JDK 25 and JUnit 6 instrumentation.
The tracer uses a Spock version that runs on top of JUnit 5.
Previously it was using
JUnitPlatformRunnerto execute tests "in a JUnit 4 environment".In recent JUnit versions the platform runner is no longer supported so we have to fully migrate to JUnit 5.
Additional Notes
Instrumentation tests need to patch the bootstrap classpath adding some core tracer classes to it.
The classes added to the bootstrap classpath cannot be loaded before the classpath patching takes place - if they're loaded by the application classloader first, then these application CP versions will be used instead of the bootstrap ones.
When running instrumentation tests with JUnit 5 this becomes a problem: the framework scans classpath to determine which tests to run. When scanning the classpath, it loads classes - including the classes that should be appended to the bootstrap classpath.
To make sure classpath patching happens before scanning, a custom
org.junit.platform.launcher.LauncherSessionListenerimplementation was added:datadog.trace.agent.test.BootstrapClasspathSetup.LauncherSessionListenerimplementations are discovered using Java ServiceLoader fromMETA-INF/services/org.junit.platform.launcher.LauncherSessionListenerfiles available on the classpath.The overridden
org.junit.platform.launcher.LauncherSessionListener#launcherSessionOpenedmethod is executed early in the testing framework lifecycle - before the classpath scanning occurs.One problem with this approach is that it will trigger classpath patching for every execution that has
BootstrapClasspathSetupin the classpath (since it will be discovered by the service loader automatically).This includes regular unit tests, where patching the bootstrap classpath caused failures in some cases.
To avoid this,
BootstrapClasspathSetupwas moved to a new Gradle moduleinstrumentation-testing, which is only added to the dependencies of the instrumentation modules that need it.Test fixtures in some of the product modules (Appsec, IAST, CI Visibility) had to be split into separate modules for the same reason: they referenced
AgentTestRunnerandBootstrapClasspathSetup, so they had to be excluded from the test classpath of their parent modules (:dd-java-agent:agent-appsec,:dd-java-agent:agent-iast,:dd-java-agent:agent-civisibility) to avoid interfering with the unit tests there.Some instrumentation tests started failing after migration to JUnit 5. They are fixed in this PR. Here are the main reasons for the failures:
Contributor Checklist
type:and (comp:orinst:) labels in addition to any usefull labelsclose,fixor any linking keywords when referencing an issue.Use
solvesinstead, and assign the PR milestone to the issueJira ticket: [PROJ-IDENT]