Cleanup CIVis smoke tests

dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/src/main/java/datadog/trace/civisibility/CiVisibilitySmokeTest.java

@@ -4,6 +4,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import datadog.trace.api.Config;
 import datadog.trace.api.civisibility.config.TestFQN;
@@ -284,20 +285,24 @@ protected static void verifySnapshots(List<Map<String, Object>> logs, int expect
     assertEquals(expectedCount, logs.size());
 
     List<String> requiredLogFields =
-        Arrays.asList("logger.name", "logger.method", "dd.spanid", "dd.traceid");
+        Arrays.asList("logger.name", "logger.method", "dd.span_id", "dd.trace_id");
     List<String> requiredSnapshotFields =
         Arrays.asList("captures", "exceptionId", "probe", "stack");
 
     for (Map<String, Object> log : logs) {
-      requiredLogFields.forEach(log::containsKey);
+      requiredLogFields.forEach(
+          field -> assertTrue(log.containsKey(field), "log must contain field: " + field));
 
       @SuppressWarnings("unchecked")
       Map<String, Object> debuggerMap = (Map<String, Object>) log.get("debugger");
       @SuppressWarnings("unchecked")
       Map<String, Object> snapshotContent = (Map<String, Object>) debuggerMap.get("snapshot");
 
       assertNotNull(snapshotContent, "snapshot must not be null");
-      requiredSnapshotFields.forEach(snapshotContent::containsKey);
+      requiredSnapshotFields.forEach(
+          field ->
+              assertTrue(
+                  snapshotContent.containsKey(field), "snapshot must contain field: " + field));
     }
   }
 }

dd-smoke-tests/gradle/src/test/java/datadog/smoketest/GradleDaemonSmokeTest.java

@@ -89,7 +89,7 @@ void testLegacy(
     "corrupted-config-new       | latest        | test-corrupted-config-new-instrumentation     | false              | false           | false        | 1              | 0                ",
     "succeed-junit-5            | latest        | test-succeed-junit-5                          | false              | true            | false        | 5              | 1                ",
     "failed-flaky-retries       | latest        | test-failed-flaky-retries                     | false              | false           | true         | 8              | 0                ",
-    "succeed-gradle-plugin-test | 9.3.1         | test-succeed-gradle-plugin-test               | false              | true            | false        | 5              | 0                "
+    "succeed-gradle-plugin-test | latest        | test-succeed-gradle-plugin-test               | false              | true            | false        | 5              | 0                "
   })
   @ParameterizedTest
   void testNew(

dd-smoke-tests/gradle/src/test/resources/test-failed-flaky-retries/events.ftl

@@ -209,6 +209,7 @@
       "span.kind" : "test_suite_end",
       "test.framework" : "junit4",
       "test.framework_version" : "4.10",
+      "test.itr.tests_skipping.enabled" : "true",
       "test.module" : ":test",
       "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java",
       "test.status" : "fail",
@@ -269,6 +270,7 @@
       "test.failure_suppressed" : "true",
       "test.framework" : "junit4",
       "test.framework_version" : "4.10",
+      "test.itr.tests_skipping.enabled" : "true",
       "test.module" : ":test",
       "test.name" : "test_failed",
       "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java",
@@ -335,6 +337,7 @@
       "test.framework" : "junit4",
       "test.framework_version" : "4.10",
       "test.is_retry" : "true",
+      "test.itr.tests_skipping.enabled" : "true",
       "test.module" : ":test",
       "test.name" : "test_failed",
       "test.retry_reason" : "auto_test_retry",
@@ -402,6 +405,7 @@
       "test.framework" : "junit4",
       "test.framework_version" : "4.10",
       "test.is_retry" : "true",
+      "test.itr.tests_skipping.enabled" : "true",
       "test.module" : ":test",
       "test.name" : "test_failed",
       "test.retry_reason" : "auto_test_retry",
@@ -469,6 +473,7 @@
       "test.framework" : "junit4",
       "test.framework_version" : "4.10",
       "test.is_retry" : "true",
+      "test.itr.tests_skipping.enabled" : "true",
       "test.module" : ":test",
       "test.name" : "test_failed",
       "test.retry_reason" : "auto_test_retry",
@@ -537,6 +542,7 @@
       "test.framework_version" : "4.10",
       "test.has_failed_all_retries" : "true",
       "test.is_retry" : "true",
+      "test.itr.tests_skipping.enabled" : "true",
       "test.module" : ":test",
       "test.name" : "test_failed",
       "test.retry_reason" : "auto_test_retry",

dd-smoke-tests/gradle/src/test/resources/test-failed-new-instrumentation/events.ftl

@@ -209,6 +209,7 @@
       "span.kind" : "test_suite_end",
       "test.framework" : "junit4",
       "test.framework_version" : "4.10",
+      "test.itr.tests_skipping.enabled" : "true",
       "test.module" : ":test",
       "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java",
       "test.status" : "fail",
@@ -269,6 +270,7 @@
       "test.final_status" : "fail",
       "test.framework" : "junit4",
       "test.framework_version" : "4.10",
+      "test.itr.tests_skipping.enabled" : "true",
       "test.module" : ":test",
       "test.name" : "test_failed",
       "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java",

dd-smoke-tests/gradle/src/test/resources/test-succeed-gradle-plugin-test/events.ftl

@@ -203,6 +203,7 @@
       "span.kind" : "test_suite_end",
       "test.framework" : "junit5",
       "test.framework_version" : "5.10.2",
+      "test.itr.tests_skipping.enabled" : "true",
       "test.module" : ":test",
       "test.source.file" : "src/test/java/datadog/smoke/HelloPluginFunctionalTest.java",
       "test.status" : "pass",
@@ -262,6 +263,7 @@
       "test.final_status" : "pass",
       "test.framework" : "junit5",
       "test.framework_version" : "5.10.2",
+      "test.itr.tests_skipping.enabled" : "true",
       "test.module" : ":test",
       "test.name" : "pluginPrintsHelloMessageOnGradle85",
       "test.source.file" : "src/test/java/datadog/smoke/HelloPluginFunctionalTest.java",

dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/events.ftl

@@ -205,6 +205,7 @@
       "span.kind" : "test_suite_end",
       "test.framework" : "junit5",
       "test.framework_version" : "5.9.3",
+      "test.itr.tests_skipping.enabled" : "true",
       "test.module" : ":test",
       "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java",
       "test.status" : "pass",
@@ -264,6 +265,7 @@
       "test.final_status" : "pass",
       "test.framework" : "junit5",
       "test.framework_version" : "5.9.3",
+      "test.itr.tests_skipping.enabled" : "true",
       "test.module" : ":test",
       "test.name" : "test_succeed",
       "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java",
@@ -328,6 +330,7 @@
       "test.final_status" : "skip",
       "test.framework" : "junit5",
       "test.framework_version" : "5.9.3",
+      "test.itr.tests_skipping.enabled" : "true",
       "test.module" : ":test",
       "test.name" : "test_to_skip_with_itr",
       "test.skip_reason" : "Skipped by Datadog Test Impact Analysis",

dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/coverages.ftl

@@ -1,15 +1,4 @@
 [ {
-  "files" : [ {
-    "bitmap" : "gAw=",
-    "filename" : "src/test/java/datadog/smoke/TestSucceed.java"
-  }, {
-    "bitmap" : "IA==",
-    "filename" : "src/main/java/datadog/smoke/Calculator.java"
-  } ],
-  "span_id" : ${content_span_id_4},
-  "test_session_id" : ${content_test_session_id},
-  "test_suite_id" : ${content_test_suite_id}
-}, {
   "files" : [ {
     "bitmap" : "AAE=",
     "filename" : "src/main/java/datadog/smoke/Calculator.java"
@@ -20,4 +9,15 @@
   "span_id" : ${content_span_id_5},
   "test_session_id" : ${content_test_session_id},
   "test_suite_id" : ${content_test_suite_id_2}
+}, {
+  "files" : [ {
+    "bitmap" : "gAw=",
+    "filename" : "src/test/java/datadog/smoke/TestSucceed.java"
+  }, {
+    "bitmap" : "IA==",
+    "filename" : "src/main/java/datadog/smoke/Calculator.java"
+  } ],
+  "span_id" : ${content_span_id_4},
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id}
 } ]

dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/events.ftl

@@ -203,6 +203,7 @@
       "span.kind" : "test_suite_end",
       "test.framework" : "junit4",
       "test.framework_version" : "4.13.2",
+      "test.itr.tests_skipping.enabled" : "true",
       "test.module" : ":test",
       "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java",
       "test.status" : "pass",
@@ -262,6 +263,7 @@
       "test.final_status" : "pass",
       "test.framework" : "junit4",
       "test.framework_version" : "4.13.2",
+      "test.itr.tests_skipping.enabled" : "true",
       "test.module" : ":test",
       "test.name" : "test_succeed",
       "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java",
@@ -315,6 +317,7 @@
       "span.kind" : "test_suite_end",
       "test.framework" : "junit5",
       "test.framework_version" : "5.9.3",
+      "test.itr.tests_skipping.enabled" : "true",
       "test.module" : ":test",
       "test.source.file" : "src/test/java/datadog/smoke/TestSucceedJunit5.java",
       "test.status" : "pass",
@@ -374,6 +377,7 @@
       "test.final_status" : "pass",
       "test.framework" : "junit5",
       "test.framework_version" : "5.9.3",
+      "test.itr.tests_skipping.enabled" : "true",
       "test.module" : ":test",
       "test.name" : "test_succeed",
       "test.source.file" : "src/test/java/datadog/smoke/TestSucceedJunit5.java",

dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/events.ftl

@@ -162,6 +162,7 @@
       "span.kind" : "test_suite_end",
       "test.framework" : "junit4",
       "test.framework_version" : "4.10",
+      "test.itr.tests_skipping.enabled" : "true",
       "test.module" : ":submodule-a:test",
       "test.source.file" : "submodule-a/src/test/java/datadog/smoke/TestSucceed.java",
       "test.status" : "pass",
@@ -210,6 +211,7 @@
       "span.kind" : "test_suite_end",
       "test.framework" : "junit4",
       "test.framework_version" : "4.10",
+      "test.itr.tests_skipping.enabled" : "true",
       "test.module" : ":submodule-b:test",
       "test.source.file" : "submodule-b/src/test/java/datadog/smoke/TestSucceed.java",
       "test.status" : "pass",
@@ -268,6 +270,7 @@
       "test.final_status" : "pass",
       "test.framework" : "junit4",
       "test.framework_version" : "4.10",
+      "test.itr.tests_skipping.enabled" : "true",
       "test.module" : ":submodule-a:test",
       "test.name" : "test_succeed",
       "test.source.file" : "submodule-a/src/test/java/datadog/smoke/TestSucceed.java",
@@ -331,6 +334,7 @@
       "test.final_status" : "pass",
       "test.framework" : "junit4",
       "test.framework_version" : "4.10",
+      "test.itr.tests_skipping.enabled" : "true",
       "test.module" : ":submodule-b:test",
       "test.name" : "test_succeed",
       "test.source.file" : "submodule-b/src/test/java/datadog/smoke/TestSucceed.java",

dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/events.ftl

@@ -205,6 +205,7 @@
       "span.kind" : "test_suite_end",
       "test.framework" : "junit4",
       "test.framework_version" : "4.10",
+      "test.itr.tests_skipping.enabled" : "true",
       "test.module" : ":test",
       "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java",
       "test.status" : "pass",
@@ -263,6 +264,7 @@
       "test.final_status" : "pass",
       "test.framework" : "junit4",
       "test.framework_version" : "4.10",
+      "test.itr.tests_skipping.enabled" : "true",
       "test.module" : ":test",
       "test.name" : "test_succeed",
       "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java",
@@ -326,6 +328,7 @@
       "test.final_status" : "skip",
       "test.framework" : "junit4",
       "test.framework_version" : "4.10",
+      "test.itr.tests_skipping.enabled" : "true",
       "test.module" : ":test",
       "test.name" : "test_to_skip_with_itr",
       "test.skip_reason" : "Skipped by Datadog Test Impact Analysis",

dd-smoke-tests/junit-console/src/test/resources/test_junit_console_failed_test_replay/events.ftl

@@ -20,6 +20,7 @@
       "span.kind" : "test_suite_end",
       "test.framework" : "junit5",
       "test.framework_version" : "5.13.4",
+      "test.itr.tests_skipping.enabled" : "true",
       "test.module" : "test-headless-service",
       "test.source.file" : "src/test/java/com/example/TestFailed.java",
       "test.status" : "fail",
@@ -76,6 +77,7 @@
       "test.final_status" : "fail",
       "test.framework" : "junit5",
       "test.framework_version" : "5.13.4",
+      "test.itr.tests_skipping.enabled" : "true",
       "test.module" : "test-headless-service",
       "test.name" : "test_another_failed",
       "test.source.file" : "src/test/java/com/example/TestFailed.java",
@@ -142,6 +144,7 @@
       "test.failure_suppressed" : "true",
       "test.framework" : "junit5",
       "test.framework_version" : "5.13.4",
+      "test.itr.tests_skipping.enabled" : "true",
       "test.module" : "test-headless-service",
       "test.name" : "test_failed",
       "test.source.file" : "src/test/java/com/example/TestFailed.java",
@@ -214,6 +217,7 @@
       "test.framework" : "junit5",
       "test.framework_version" : "5.13.4",
       "test.is_retry" : "true",
+      "test.itr.tests_skipping.enabled" : "true",
       "test.module" : "test-headless-service",
       "test.name" : "test_failed",
       "test.retry_reason" : "auto_test_retry",
@@ -289,6 +293,7 @@
       "test.framework_version" : "5.13.4",
       "test.has_failed_all_retries" : "true",
       "test.is_retry" : "true",
+      "test.itr.tests_skipping.enabled" : "true",
       "test.module" : "test-headless-service",
       "test.name" : "test_failed",
       "test.retry_reason" : "auto_test_retry",

dd-smoke-tests/maven/src/test/resources/test_failed_maven_failed_test_replay/events.ftl

@@ -249,6 +249,7 @@
       "span.kind" : "test_suite_end",
       "test.framework" : "junit4",
       "test.framework_version" : "4.13.2",
+      "test.itr.tests_skipping.enabled" : "true",
       "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test",
       "test.source.file" : "src/test/java/com/example/TestFailed.java",
       "test.status" : "fail",
@@ -310,6 +311,7 @@
       "test.final_status" : "fail",
       "test.framework" : "junit4",
       "test.framework_version" : "4.13.2",
+      "test.itr.tests_skipping.enabled" : "true",
       "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test",
       "test.name" : "test_another_failed",
       "test.source.file" : "src/test/java/com/example/TestFailed.java",
@@ -376,6 +378,7 @@
       "test.failure_suppressed" : "true",
       "test.framework" : "junit4",
       "test.framework_version" : "4.13.2",
+      "test.itr.tests_skipping.enabled" : "true",
       "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test",
       "test.name" : "test_failed",
       "test.source.file" : "src/test/java/com/example/TestFailed.java",
@@ -448,6 +451,7 @@
       "test.framework" : "junit4",
       "test.framework_version" : "4.13.2",
       "test.is_retry" : "true",
+      "test.itr.tests_skipping.enabled" : "true",
       "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test",
       "test.name" : "test_failed",
       "test.retry_reason" : "auto_test_retry",
@@ -523,6 +527,7 @@
       "test.framework_version" : "4.13.2",
       "test.has_failed_all_retries" : "true",
       "test.is_retry" : "true",
+      "test.itr.tests_skipping.enabled" : "true",
       "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test",
       "test.name" : "test_failed",
       "test.retry_reason" : "auto_test_retry",

dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/events.ftl

@@ -279,6 +279,7 @@
       "span.kind" : "test_suite_end",
       "test.framework" : "junit4",
       "test.framework_version" : "4.13.2",
+      "test.itr.tests_skipping.enabled" : "true",
       "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test",
       "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java",
       "test.status" : "pass",
@@ -338,6 +339,7 @@
       "test.final_status" : "pass",
       "test.framework" : "junit4",
       "test.framework_version" : "4.13.2",
+      "test.itr.tests_skipping.enabled" : "true",
       "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test",
       "test.name" : "test_succeed",
       "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java",
@@ -402,6 +404,7 @@
       "test.final_status" : "skip",
       "test.framework" : "junit4",
       "test.framework_version" : "4.13.2",
+      "test.itr.tests_skipping.enabled" : "true",
       "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test",
       "test.name" : "test_to_skip_with_itr",
       "test.skip_reason" : "Skipped by Datadog Test Impact Analysis",

dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/events.ftl

@@ -243,6 +243,7 @@
       "span.kind" : "test_suite_end",
       "test.framework" : "junit4",
       "test.framework_version" : "4.13.2",
+      "test.itr.tests_skipping.enabled" : "true",
       "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test",
       "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java",
       "test.status" : "pass",
@@ -302,6 +303,7 @@
       "test.final_status" : "pass",
       "test.framework" : "junit4",
       "test.framework_version" : "4.13.2",
+      "test.itr.tests_skipping.enabled" : "true",
       "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test",
       "test.name" : "test_succeed",
       "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java",
@@ -366,6 +368,7 @@
       "test.final_status" : "skip",
       "test.framework" : "junit4",
       "test.framework_version" : "4.13.2",
+      "test.itr.tests_skipping.enabled" : "true",
       "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test",
       "test.name" : "test_to_skip_with_itr",
       "test.skip_reason" : "Skipped by Datadog Test Impact Analysis",