Skip to content

Make dd-trace-java.test-jvm-constraints report architecture in test task inputs #12635

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
Sep 24, 2026
Merged

Make dd-trace-java.test-jvm-constraints report architecture in test task inputs #12635

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
2 changes: 2 additions & 0 deletions ...dSrc/src/main/kotlin/datadog/gradle/plugin/testJvmConstraints/TestJvmConstraintsPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ class TestJvmConstraintsPlugin : Plugin<Project> {
"vendor" to vendor,
"runtimeVersion" to javaRuntimeVersion,
"vmVersion" to jvmVersion,
"operatingSystem" to System.getProperty("os.name"),
"architecture" to System.getProperty("os.arch"),
Comment thread
bric3 marked this conversation as resolved.
Comment thread
bric3 marked this conversation as resolved.
)
}
})
Expand Down
11 changes: 8 additions & 3 deletions buildSrc/src/test/kotlin/datadog/gradle/plugin/testJvmConstraints/TestJvmCacheInputsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import org.junit.jupiter.params.provider.ValueSource

class TestJvmCacheInputsTest : GradleFixture() {
@ParameterizedTest
@ValueSource(strings = ["vendor", "runtimeVersion", "vmVersion"])
@ValueSource(strings = ["vendor", "runtimeVersion", "vmVersion", "os.name", "os.arch"])
fun `test cache follows the selected launcher identity`(changedField: String) {
writeSettings(
"""
Expand Down Expand Up @@ -50,10 +50,15 @@ class TestJvmCacheInputsTest : GradleFixture() {
}

val launcher = javaToolchains.launcherFor {}
val changedField = providers.gradleProperty("changedJvmField").orElse("")
val changedField = providers.gradleProperty("changedJvmField").orNull
if (changedField?.startsWith("os.") == true) {
val original = System.getProperty(changedField)
System.setProperty(changedField, "different-platform")
gradle.buildFinished { System.setProperty(changedField, original) }
}
tasks.test {
useJUnitPlatform()
javaLauncher.set(launcher.map { SelectedLauncher(it, changedField.get()) })
javaLauncher.set(launcher.map { SelectedLauncher(it, changedField ?: "") })
}
"""
)
Expand Down
2 changes: 2 additions & 0 deletions .../src/test/kotlin/datadog/gradle/plugin/testJvmConstraints/TestJvmConstraintsPluginTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ class TestJvmConstraintsPluginTest {
"vendor" to metadata.vendor,
"runtimeVersion" to metadata.javaRuntimeVersion,
"vmVersion" to metadata.jvmVersion,
"operatingSystem" to System.getProperty("os.name"),
"architecture" to System.getProperty("os.arch"),
))
}

Expand Down
2 changes: 1 addition & 1 deletion docs/how_to_work_with_gradle.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -951,7 +951,7 @@ This project provides several custom Gradle extensions to manage multi-JVM testi

Controls which JVM versions are allowed to run tests. Applied via the `dd-trace-java.test-jvm-constraints` plugin.

Each `Test` task also tracks its selected JVM's vendor, full runtime version and VM version as inputs.
Each `Test` task also tracks its selected JVM's vendor, full runtime version, VM version, operating system, and architecture as inputs.
Changing these values invalidates up-to-date checks and build-cache entries, even when the Java major version stays the same.

```Gradle Kotlin DSL
Expand Down
Loading