Use dotted property form for JMH options (jmh.includes) and testJvm property for the JMH JVM

Author: mcculls

dd-trace-core/build.gradle

@@ -1,3 +1,5 @@
+import datadog.gradle.plugin.testJvmConstraints.TestJvmSpec
+
 plugins {
   id 'me.champeau.jmh'
   id 'dd-trace-java.version-file'
@@ -114,15 +116,14 @@ dependencies {
 jmh {
   jmhVersion = libs.versions.jmh.get()
   duplicateClassesStrategy = DuplicatesStrategy.EXCLUDE
-  if (project.hasProperty('jmhIncludes')) {
-    includes = [project.jmhIncludes]
+  if (project.hasProperty('jmh.includes')) {
+    includes = [project.property('jmh.includes').replace(',', '|')]
   }
-  if (project.hasProperty('jmhProfilers')) {
-    profilers = [project.jmhProfilers]
+  if (project.hasProperty('jmh.profilers')) {
+    profilers = project.property('jmh.profilers').tokenize(',')
   }
-  if (project.hasProperty('jmhJvm')) {
-    jvm = project.javaToolchains.launcherFor {
-      languageVersion = JavaLanguageVersion.of(project.jmhJvm as int)
-    }.map { it.executablePath.asFile.absolutePath }
+  if (project.hasProperty('testJvm')) {
+    def testJvmSpec = new TestJvmSpec(project)
+    jvm = testJvmSpec.javaTestLauncher.map { it.executablePath.asFile.absolutePath }
   }
 }

dd-trace-core/src/jmh/java/datadog/context/ContextManagerBenchmark.java

@@ -34,7 +34,7 @@
  * <p>Run with:
  *
  * <pre>
- * {@code ./gradlew :dd-trace-core:jmh -PjmhIncludes=ContextManagerBenchmark -PjmhJvm=25 -PjmhProfilers=gc}
+ * {@code ./gradlew :dd-trace-core:jmh -Pjmh.includes=ContextManagerBenchmark -PtestJvm=25 -Pjmh.profilers=gc}
  * </pre>
  */
 @State(Scope.Benchmark)

dd-trace-core/src/jmh/java/datadog/context/ContextManagerDepthBenchmark.java

@@ -28,7 +28,7 @@
  * <p>Run with:
  *
  * <pre>
- * {@code ./gradlew :dd-trace-core:jmh -PjmhIncludes=ContextManagerDepthBenchmark -PjmhJvm=25 -PjmhProfilers=gc}
+ * {@code ./gradlew :dd-trace-core:jmh -Pjmh.includes=ContextManagerDepthBenchmark -PtestJvm=25 -Pjmh.profilers=gc}
  * </pre>
  */
 @State(Scope.Benchmark)