Fix test execution: handle system properties and test filtering

- Move test properties into plugin (avoid doFirst ordering issues)
- Fix test filter: use --select-class instead of --scan-classpath when filtering
- Simplify build.gradle.kts (plugin now handles all properties)
- Tests now execute successfully with -Ptests filter

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

Author: jbachorik

build-logic/conventions/src/main/kotlin/com/datadoghq/profiler/ProfilerTestPlugin.kt

@@ -156,8 +156,6 @@ class ProfilerTestPlugin : Plugin<Project> {
 
                 // Configure JVM arguments and test execution
                 testTask.doFirst {
-                    // Preserve any args added by build scripts (doFirst blocks run in LIFO order)
-                    val buildScriptArgs = testTask.args.toList()
                     val allArgs = mutableListOf<String>()
 
                     // Standard JVM args
@@ -167,8 +165,11 @@ class ProfilerTestPlugin : Plugin<Project> {
                     }
                     allArgs.addAll(extension.extraJvmArgs.get())
 
-                    // Add any args from build scripts (e.g., -Dddprof_test.* properties)
-                    allArgs.addAll(buildScriptArgs)
+                    // Test-specific system properties (extracted from config name)
+                    val keepRecordings = project.hasProperty("keepJFRs") || System.getenv("KEEP_JFRS")?.toBoolean() ?: false
+                    allArgs.add("-Dddprof_test.keep_jfrs=$keepRecordings")
+                    allArgs.add("-Dddprof_test.config=$configName")
+                    allArgs.add("-Dddprof_test.ci=${project.hasProperty("CI")}")
 
                     // System properties
                     allArgs.add("-DDDPROF_TEST_DISABLE_RATE_LIMIT=1")
@@ -185,11 +186,9 @@ class ProfilerTestPlugin : Plugin<Project> {
 
                     // JUnit Platform Console Launcher
                     allArgs.add("org.junit.platform.console.ConsoleLauncher")
-                    allArgs.add("--scan-classpath")
-                    allArgs.add("--details=verbose")
-                    allArgs.add("--details-theme=unicode")
 
                     // Support Gradle's --tests filter by mapping to JUnit's selection options
+                    // Note: Cannot use --scan-classpath with explicit selectors
                     if (project.hasProperty("tests")) {
                         val testFilter = project.property("tests") as String
                         // Only use --select-method if filter contains '#' (method separator)
@@ -199,8 +198,14 @@ class ProfilerTestPlugin : Plugin<Project> {
                         } else {
                             allArgs.add("--select-class=$testFilter")
                         }
+                    } else {
+                        // No filter specified, scan the entire classpath
+                        allArgs.add("--scan-classpath")
                     }
 
+                    allArgs.add("--details=verbose")
+                    allArgs.add("--details-theme=unicode")
+
                     testTask.args = allArgs
                 }
 

ddprof-test/build.gradle.kts

@@ -55,18 +55,6 @@ dependencies {
 tasks.withType<org.gradle.api.tasks.Exec>().matching { it.name.startsWith("test") }.configureEach {
   // Ensure native test library is built before running tests
   dependsOn(":ddprof-test-native:linkLib")
-
-  // Extract config name from task name for test-specific system properties
-  val configName = name.replace("test", "")
-  val keepRecordings = project.hasProperty("keepJFRs") || System.getenv("KEEP_JFRS")?.toBoolean() ?: false
-
-  // Pass test configuration as system properties
-  // The plugin's doFirst preserves args added here (doFirst blocks run in LIFO order)
-  doFirst {
-    args("-Dddprof_test.keep_jfrs=$keepRecordings")
-    args("-Dddprof_test.config=$configName")
-    args("-Dddprof_test.ci=${project.hasProperty("CI")}")
-  }
 }
 
 // Disable the default 'test' task - we use config-specific tasks instead

gradle/libs.versions.toml

@@ -3,10 +3,11 @@
 [versions]
 cpp-standard = "17"
 kotlin = "1.9.22"
-spotless = "6.11.0"
+spotless = "7.0.2"
 
 # Testing
 junit = "5.9.2"
+junit-platform = "1.9.2"  # JUnit Platform version corresponding to JUnit Jupiter 5.9.2
 junit-pioneer = "1.9.1"
 slf4j = "1.7.32"
 
@@ -28,7 +29,7 @@ jmh = "1.36"
 junit-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }
 junit-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }
 junit-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit" }
-junit-platform-console = { module = "org.junit.platform:junit-platform-console", version = "1.9.2" }
+junit-platform-console = { module = "org.junit.platform:junit-platform-console", version.ref = "junit-platform" }
 junit-pioneer = { module = "org.junit-pioneer:junit-pioneer", version.ref = "junit-pioneer" }
 
 # Logging