Skip to content

Fix Finatra test server lifecycle #12272

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 1 commit into from
Aug 26, 2026
Merged

Fix Finatra test server lifecycle #12272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 8 additions & 6 deletions dd-java-agent/instrumentation/finatra-2.9/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
apply from: "$rootDir/gradle/test-with-scala.gradle"

// Up to 20.7 where the server structure changes
addTestSuiteForDir('latestPre207Test', 'test')
addTestSuiteForDir('latestPre207ForkedTest', 'test')
Comment thread
AlexeyKuznetsov-DD marked this conversation as resolved.
addTestSuite('latestDepTest')

muzzle {
Expand All @@ -32,7 +32,9 @@ dependencies {
// Required for older versions of finatra on JDKs >= 11
testImplementation group: 'com.sun.activation', name: 'javax.activation', version: '1.2.0'

latestPre207TestImplementation group: 'com.twitter', name: 'finatra-http_2.11', version: '[,20.7.0)'
// Lower bound matters: an open '[,20.7.0)' is satisfied by the 19.12.0 above, so conflict
// resolution would keep 19.12.0 and this suite would just repeat 'forkedTest'.
Comment thread
AlexeyKuznetsov-DD marked this conversation as resolved.
latestPre207ForkedTestImplementation group: 'com.twitter', name: 'finatra-http_2.11', version: '[20.6.0,20.7.0)'

latestDepTestImplementation group: 'com.twitter', name: 'finatra-http_2.11', version: '+'
}
Expand All @@ -42,11 +44,11 @@ tasks.named("compileLatestDepTestGroovy", GroovyCompile) {
dependsOn "compileLatestDepTestScala"
}

tasks.named("compileLatestPre207TestGroovy", GroovyCompile) {
classpath += files(tasks.named('compileLatestPre207TestScala').map { it.destinationDirectory })
dependsOn "compileLatestPre207TestScala"
tasks.named("compileLatestPre207ForkedTestGroovy", GroovyCompile) {
classpath += files(tasks.named('compileLatestPre207ForkedTestScala').map { it.destinationDirectory })
dependsOn "compileLatestPre207ForkedTestScala"
}

tasks.named("latestDepTest", Test) {
finalizedBy 'latestPre207Test'
finalizedBy 'latestPre207ForkedTest'
}
Loading