Decouple test JDK and gradle JDK in selenium latestDepTest (#8236)

* Decouple test JDK and gradle JDK in selenium latestDepTest
* Disable selenium latestDepTest until fixed

Author: smola

dd-java-agent/instrumentation/selenium/build.gradle

@@ -2,6 +2,10 @@ plugins {
   id 'java-test-fixtures'
 }
 
+ext {
+  latestDepTestMinJavaVersionForTests = JavaVersion.VERSION_11
+}
+
 apply from: "$rootDir/gradle/java.gradle"
 
 muzzle {
@@ -38,9 +42,8 @@ configurations.matching({ it.name.startsWith('test') || it.name.startsWith('late
   }
 })
 
-tasks.matching { it.name.startsWith('latestDepTest') || it.name.contains('LatestDepTest') }.each {
-  it.onlyIf {
-    // Only run latest dep tests tasks (including compilation) if the current JVM is compatible with the latest Selenium version
-    JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_11)
-  }
+tasks.named("compileLatestDepTestJava").configure {
+  setJavaVersion(it, 11)
+  sourceCompatibility = JavaVersion.VERSION_1_8
+  targetCompatibility = JavaVersion.VERSION_1_8
 }

dd-java-agent/instrumentation/selenium/src/latestDepTest/resources/test-succeed-multiple/events.ftl

@@ -11,24 +11,25 @@
     "start" : ${content_start},
     "duration" : ${content_duration},
     "error" : 0,
-    "metrics" : { },
+    "metrics" : {
+      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count},
+      "test.source.end" : 19,
+      "test.source.start" : 11
+    },
     "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid},
       "test.type" : "test",
-      "os.architecture" : ${content_meta_os_architecture},
       "test.source.file" : "dummy_source_path",
       "test.module" : "selenium",
       "test.status" : "pass",
-      "runtime.name" : ${content_meta_runtime_name},
-      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "test_session.name" : "session-name",
       "env" : "none",
-      "os.platform" : ${content_meta_os_platform},
       "dummy_ci_tag" : "dummy_ci_tag_value",
-      "os.version" : ${content_meta_os_version},
+      "test.codeowners" : "[\"owner1\",\"owner2\"]",
       "library_version" : ${content_meta_library_version},
       "component" : "junit",
       "span.kind" : "test_suite_end",
       "test.suite" : "org.example.TestSucceedMultipleSelenium",
-      "runtime.version" : ${content_meta_runtime_version},
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.framework" : "junit5"
     }
@@ -53,32 +54,29 @@
       "process_id" : ${content_metrics_process_id},
       "_dd.profiling.enabled" : 0,
       "_dd.trace_span_attribute_schema" : 0,
+      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2},
       "test.source.end" : 18,
       "test.source.start" : 12
     },
     "meta" : {
-      "os.architecture" : ${content_meta_os_architecture},
       "test.browser.driver_version" : ${content_meta_test_browser_driver_version},
+      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
       "test.source.file" : "dummy_source_path",
       "test.source.method" : "test_succeed()V",
       "test.module" : "selenium",
       "test.status" : "pass",
       "language" : "jvm",
-      "runtime.name" : ${content_meta_runtime_name},
       "test.browser.name" : "htmlunit",
-      "os.platform" : ${content_meta_os_platform},
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "os.version" : ${content_meta_os_version},
       "library_version" : ${content_meta_library_version},
       "test.name" : "test_succeed",
       "span.kind" : "test",
       "test.suite" : "org.example.TestSucceedMultipleSelenium",
-      "runtime.version" : ${content_meta_runtime_version},
       "runtime-id" : ${content_meta_runtime_id},
       "test.type" : "browser",
       "test.browser.driver" : "selenium",
       "test.is_rum_active" : "true",
-      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "test_session.name" : "session-name",
       "env" : "none",
       "dummy_ci_tag" : "dummy_ci_tag_value",
       "component" : "junit",
@@ -108,32 +106,29 @@
       "process_id" : ${content_metrics_process_id},
       "_dd.profiling.enabled" : 0,
       "_dd.trace_span_attribute_schema" : 0,
+      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3},
       "test.source.end" : 18,
       "test.source.start" : 12
     },
     "meta" : {
-      "os.architecture" : ${content_meta_os_architecture},
       "test.browser.driver_version" : ${content_meta_test_browser_driver_version},
+      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
       "test.source.file" : "dummy_source_path",
       "test.source.method" : "test_succeed_another()V",
       "test.module" : "selenium",
       "test.status" : "pass",
       "language" : "jvm",
-      "runtime.name" : ${content_meta_runtime_name},
       "test.browser.name" : "htmlunit",
-      "os.platform" : ${content_meta_os_platform},
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "os.version" : ${content_meta_os_version},
       "library_version" : ${content_meta_library_version},
       "test.name" : "test_succeed_another",
       "span.kind" : "test",
       "test.suite" : "org.example.TestSucceedMultipleSelenium",
-      "runtime.version" : ${content_meta_runtime_version},
       "runtime-id" : ${content_meta_runtime_id},
       "test.type" : "browser",
       "test.browser.driver" : "selenium",
       "test.is_rum_active" : "true",
-      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "test_session.name" : "session-name",
       "env" : "none",
       "dummy_ci_tag" : "dummy_ci_tag_value",
       "component" : "junit",
@@ -155,26 +150,24 @@
     "duration" : ${content_duration_4},
     "error" : 0,
     "metrics" : {
+      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4},
       "process_id" : ${content_metrics_process_id},
       "_dd.profiling.enabled" : 0,
       "_dd.trace_span_attribute_schema" : 0
     },
     "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_2},
       "test.type" : "test",
-      "os.architecture" : ${content_meta_os_architecture},
+      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
       "test.status" : "pass",
+      "test_session.name" : "session-name",
       "language" : "jvm",
-      "runtime.name" : ${content_meta_runtime_name},
-      "runtime.vendor" : ${content_meta_runtime_vendor},
       "env" : "none",
-      "os.platform" : ${content_meta_os_platform},
       "dummy_ci_tag" : "dummy_ci_tag_value",
-      "os.version" : ${content_meta_os_version},
       "library_version" : ${content_meta_library_version},
       "component" : "junit",
       "_dd.profiling.ctx" : "test",
       "span.kind" : "test_session_end",
-      "runtime.version" : ${content_meta_runtime_version},
       "runtime-id" : ${content_meta_runtime_id},
       "test.command" : "selenium",
       "test.framework_version" : ${content_meta_test_framework_version},
@@ -193,22 +186,20 @@
     "start" : ${content_start_5},
     "duration" : ${content_duration_5},
     "error" : 0,
-    "metrics" : { },
+    "metrics" : {
+      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5}
+    },
     "meta" : {
+      "_dd.p.tid" : ${content_meta__dd_p_tid_3},
       "test.type" : "test",
-      "os.architecture" : ${content_meta_os_architecture},
       "test.module" : "selenium",
       "test.status" : "pass",
-      "runtime.name" : ${content_meta_runtime_name},
-      "runtime.vendor" : ${content_meta_runtime_vendor},
+      "test_session.name" : "session-name",
       "env" : "none",
-      "os.platform" : ${content_meta_os_platform},
       "dummy_ci_tag" : "dummy_ci_tag_value",
-      "os.version" : ${content_meta_os_version},
       "library_version" : ${content_meta_library_version},
       "component" : "junit",
       "span.kind" : "test_module_end",
-      "runtime.version" : ${content_meta_runtime_version},
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.framework" : "junit5"
     }