fix: profiling-controller-oracle tests could never run, introduce an includeJdk directive

Author: bric3

buildSrc/src/main/kotlin/datadog.test-jvm-contraints.gradle.kts

@@ -4,6 +4,7 @@ import datadog.gradle.plugin.testJvmConstraints.TestJvmJavaLauncher
 import datadog.gradle.plugin.testJvmConstraints.isJavaLauncherAllowed
 import datadog.gradle.plugin.testJvmConstraints.isJavaVersionAllowed
 import datadog.gradle.plugin.testJvmConstraints.isJdkExcluded
+import datadog.gradle.plugin.testJvmConstraints.isJdkIncluded
 import datadog.gradle.plugin.testJvmConstraints.isJdkForced
 
 plugins {
@@ -27,6 +28,7 @@ tasks.withType<Test>().configureEach {
 
   inputs.property("${TestJvmConstraintsExtension.NAME}.allowReflectiveAccessToJdk", taskExtension.allowReflectiveAccessToJdk).optional(true)
   inputs.property("${TestJvmConstraintsExtension.NAME}.excludeJdk", taskExtension.excludeJdk)
+  inputs.property("${TestJvmConstraintsExtension.NAME}.includeJdk", taskExtension.includeJdk)
   inputs.property("${TestJvmConstraintsExtension.NAME}.forceJdk", taskExtension.forceJdk)
   inputs.property("${TestJvmConstraintsExtension.NAME}.minJavaVersionForTests", taskExtension.minJavaVersionForTests).optional(true)
   inputs.property("${TestJvmConstraintsExtension.NAME}.maxJavaVersionForTests", taskExtension.maxJavaVersionForTests).optional(true)
@@ -63,6 +65,7 @@ fun Test.configureTestJvm(extension: TestJvmConstraintsExtension) {
   if (testJvmJavaLauncher.javaTestLauncher.isPresent) {
     javaLauncher = testJvmJavaLauncher.javaTestLauncher
     onlyIf("Allowed or forced JDK") {
+      extension.isJdkIncluded(testJvmJavaLauncher.normalizedTestJvm.get()) &&
       !extension.isJdkExcluded(testJvmJavaLauncher.normalizedTestJvm.get()) &&
         (extension.isJavaLauncherAllowed(testJvmJavaLauncher.javaTestLauncher.get()) ||
           extension.isJdkForced(testJvmJavaLauncher.normalizedTestJvm.get()))

buildSrc/src/main/kotlin/datadog/gradle/plugin/testJvmConstraints/TestJvmConstraintsExtension.kt

@@ -12,10 +12,35 @@ import org.gradle.kotlin.dsl.property
 import javax.inject.Inject
 
 interface TestJvmConstraintsExtension {
+  /**
+   * Sets an explicit minimum bound to allowed JDK version
+   */
   val minJavaVersionForTests: Property<JavaVersion>
+
+  /**
+   * Sets an explicit maximum bound to allowed JDK version
+   */
   val maxJavaVersionForTests: Property<JavaVersion>
+
+  /**
+   * List of allowed JDK names (passed through the `testJvm` property).
+   */
   val forceJdk: ListProperty<String>
+
+  /**
+   * List of included JDK names (passed through the `testJvm` property).
+   */
+  val includeJdk: ListProperty<String>
+
+  /**
+   * List of excluded JDK names (passed through the `testJvm` property).
+   */
   val excludeJdk: ListProperty<String>
+
+  /**
+   * Indicate if test jvm allows reflective access to JDK modules, in particular this toggle
+   * openning `java.base/java.lang` and `java.base/java.util`.
+   */
   val allowReflectiveAccessToJdk: Property<Boolean>
 
   companion object {

buildSrc/src/main/kotlin/datadog/gradle/plugin/testJvmConstraints/TestJvmConstraintsUtils.kt

@@ -36,9 +36,17 @@ internal fun TestJvmConstraintsExtension.isJavaLauncherAllowed(javaLauncher: Jav
 }
 
 internal fun TestJvmConstraintsExtension.isJdkForced(javaName: String): Boolean {
-  return forceJdk.get().any { it.equals(javaName, ignoreCase = true) }
+  return forceJdk.orNull?.any { it.equals(javaName, ignoreCase = true) } ?: false
 }
 
 internal fun TestJvmConstraintsExtension.isJdkExcluded(javaName: String): Boolean {
   return excludeJdk.get().any { it.equals(javaName, ignoreCase = true) }
 }
+
+internal fun TestJvmConstraintsExtension.isJdkIncluded(javaName: String): Boolean {
+  val included = includeJdk.get()
+  return when {
+      included.isEmpty() -> true
+      else -> included.any { it.equals(javaName, ignoreCase = true) }
+  }
+}

dd-java-agent/agent-profiling/profiling-controller-oracle/build.gradle

@@ -26,8 +26,8 @@ dependencies {
 
 // Oracle JDK requires extra JVM arguments to enable JFR
 tasks.withType(Test).configureEach {
-  onlyIf {
-    it.name.contains('ORACLE8')
+  testJvmConstraint {
+    includeJdk = ['ORACLE8']
   }
 
   jvmArgs += [