Skip to content

Run the forked tests of every test suite #13218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gh-worker-dd-mergequeue-cf854d merged 8 commits into from
Nov 6, 2026
Merged

Run the forked tests of every test suite #13218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3aba00e
Run the forked tests of every test suite
PerfectSlayer Nov 4, 2026
3af8469
Skip forked tests of failing and old driver suites
PerfectSlayer Nov 5, 2026
2006851
Skip okhttp-3.0 latest dependency forked tests
PerfectSlayer Nov 5, 2026
a4d31d5
Skip enable-wallclock-profiling latest dependency forked tests
PerfectSlayer Nov 5, 2026
26adffb
Keep jetty-server-10.0 latest dependency test logging
PerfectSlayer Nov 5, 2026
46ecbac
Link the aws-java-sdk-2.2 forked test opt-out to its ticket
PerfectSlayer Nov 5, 2026
b2edb33
Run forked suite companions with the suite Java launcher
PerfectSlayer Nov 6, 2026
a3a48ff
Remove legacy forked test finalizers
PerfectSlayer Nov 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/dd-trace-java.module.instrumentation.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ dependencies {
}

tasks.withType<Test>().configureEach {
if (name in listOf("latestDepTest", "latestDepForkedTest", "latestDepTestForkedTest")) {
if (name in listOf("latestDepTest", "latestDepForkedTest")) {
jvmArgs("-Dtest.dd.latestDepTest=true")
}
}
8 changes: 0 additions & 8 deletions dd-java-agent/instrumentation/aerospike-4.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,13 @@ muzzle {

addTestSuiteForDir("latestDepTest", "test")
addTestSuiteForDir("latest7DepTest", "test")
addTestSuiteExtendingForDir("latestDepForkedTest", "latestDepTest", "test")
addTestSuiteExtendingForDir("latest7DepForkedTest", "latest7DepTest", "test")

tasks.named("latestDepTest", Test) {
testJvmConstraints {
minJavaVersion = JavaVersion.VERSION_21
}
}

tasks.named("latestDepForkedTest", Test) {
testJvmConstraints {
minJavaVersion = JavaVersion.VERSION_21
}
}

dependencies {
compileOnly group: 'com.aerospike', name: 'aerospike-client', version: '4.0.0'
testContainerImage(image('aerospike:ce-6.2.0.2', 'test.aerospike.image'))
Expand Down
196 changes: 98 additions & 98 deletions dd-java-agent/instrumentation/aerospike-4.0/gradle.lockfile
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 0 additions & 5 deletions dd-java-agent/instrumentation/akka/akka-actor-2.5/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,11 @@ muzzle {
}

addTestSuite('akka23Test')
addForkedTestTask('akka23Test')
addTestSuiteForDir('latestDepTest', 'test')
addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'akka23Test')

tasks.named("compileAkka23TestGroovy", GroovyCompile) {
classpath += files(sourceSets.akka23Test.scala.classesDirectory)
}
tasks.named("compileLatestDepForkedTestGroovy", GroovyCompile) {
classpath += files(sourceSets.latestDepForkedTest.scala.classesDirectory)
}

// Run the akka23Test against the normal and latestDep akka version as well
sourceSets {
Expand Down
180 changes: 90 additions & 90 deletions dd-java-agent/instrumentation/akka/akka-actor-2.5/gradle.lockfile
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 0 additions & 6 deletions dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ plugins {
// we put the test classes in the baseTest test set so that the scala
// version is not inherited
addTestSuite('baseTest')
addForkedTestTask('baseTest')
addTestSuiteForDir('version101Test', 'baseTest')
addTestSuiteExtendingForDir('version101ForkedTest', 'version101Test', 'baseTest')
addTestSuiteForDir('version102Scala213Test', 'latestDepTest')
addTestSuite('latestDepTest')
addTestSuite('lagomTest')
Expand Down Expand Up @@ -172,10 +170,6 @@ tasks.named("compileVersion101TestGroovy", GroovyCompile) {
classpath += files(tasks.named('compileVersion101TestScala').map { it.destinationDirectory })
}

tasks.named("compileVersion101ForkedTestGroovy", GroovyCompile) {
classpath += files(tasks.named('compileVersion101TestScala').map { it.destinationDirectory })
}

tasks.named("compileVersion102Scala213TestGroovy", GroovyCompile) {
classpath += files(tasks.named('compileVersion102Scala213TestScala').map { it.destinationDirectory })
}
Expand Down
212 changes: 106 additions & 106 deletions dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/gradle.lockfile
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 0 additions & 5 deletions dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,6 @@ protobuf {
}

addTestSuiteForDir('latestDepTest', 'test')
addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test')

tasks.named("latestDepTest", Test) {
finalizedBy 'latestDepForkedTest'
}

dependencies {
compileOnly group: 'com.linecorp.armeria', name: 'armeria-grpc', version: '0.84.0'
Expand Down
292 changes: 146 additions & 146 deletions dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/gradle.lockfile
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ muzzle {
}

addTestSuiteForDir('latestDepTest', 'test')
addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test')

dependencies {
compileOnly group: 'software.amazon.awssdk', name: 'dynamodb', version: '2.30.22'
Expand Down
272 changes: 136 additions & 136 deletions dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/gradle.lockfile
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ muzzle {
}

addTestSuiteForDir('latestDepTest', 'test')
addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test')

dependencies {
compileOnly group: 'software.amazon.awssdk', name: 'eventbridge', version: '2.27.19'
Expand Down
288 changes: 144 additions & 144 deletions dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/gradle.lockfile
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion dd-java-agent/instrumentation/aws-java/aws-java-s3-2.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ muzzle {
}

addTestSuiteForDir('latestDepTest', 'test')
addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test')

dependencies {
compileOnly group: 'software.amazon.awssdk', name: 's3', version: '2.29.26'
Expand Down
278 changes: 139 additions & 139 deletions dd-java-agent/instrumentation/aws-java/aws-java-s3-2.0/gradle.lockfile
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 0 additions & 4 deletions dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,11 @@ muzzle {
// We test older version in separate test set to test newer version and latest deps in the 'default'
// test dir. Otherwise we get strange warnings in Idea.
addTestSuite('test_before_1_11_106')
addForkedTestTask('test_before_1_11_106')

addTestSuiteForDir('latestDepTest', 'test')
addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test')

addTestSuite('dsmTest')
addForkedTestTask('dsmTest')
addTestSuiteForDir('latestDsmTest', 'dsmTest')
addTestSuiteExtendingForDir('latestDsmForkedTest', 'latestDsmTest', 'dsmTest')

dependencies {
compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-core', version: '1.11.0'
Expand Down
232 changes: 116 additions & 116 deletions dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/gradle.lockfile
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 2 additions & 7 deletions dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,14 @@ muzzle {
}
}

addTestSuiteForDir('latestDepTest', 'test')
// Broken: at some point S3 moved the bucket name to the hostname resulting in host not found somebucket.localhost on all S3 tests
// addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test')
// TODO APMLP-2196: no latestDepForkedTest until the tests handle S3 moving the bucket name to the hostname (somebucket.localhost)
addTestSuiteForDir('latestDepTest', 'test', false)

addTestSuite('dsmTest')
addForkedTestTask('dsmTest')
addTestSuiteForDir('latestDsmTest', 'dsmTest')
addTestSuiteExtendingForDir('latestDsmForkedTest', 'latestDsmTest', 'dsmTest')

addTestSuite('payloadTaggingTest')
addForkedTestTask('payloadTaggingTest')
addTestSuiteForDir('latestPayloadTaggingTest', 'payloadTaggingTest')
addTestSuiteExtendingForDir('latestPayloadTaggingForkedTest', 'latestPayloadTaggingTest', 'payloadTaggingTest')

configurations.named('latestPayloadTaggingTestContainerImage') {
extendsFrom(configurations.named('payloadTaggingTestContainerImage').get())
Expand Down
Loading
Loading