From fad60ef216fec14b5f33bfe4fe1134e629ab4d00 Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Mon, 25 May 2026 12:22:50 +0200 Subject: [PATCH 1/5] fix: junitconsole smoke test assertions --- .../trace/civisibility/CiVisibilitySmokeTest.java | 11 ++++++++--- .../test_junit_console_failed_test_replay/events.ftl | 5 +++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/src/main/java/datadog/trace/civisibility/CiVisibilitySmokeTest.java b/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/src/main/java/datadog/trace/civisibility/CiVisibilitySmokeTest.java index 5bab6cc7ef6..d40ecf6b244 100644 --- a/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/src/main/java/datadog/trace/civisibility/CiVisibilitySmokeTest.java +++ b/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,12 +285,13 @@ protected static void verifySnapshots(List> logs, int expect assertEquals(expectedCount, logs.size()); List requiredLogFields = - Arrays.asList("logger.name", "logger.method", "dd.spanid", "dd.traceid"); + Arrays.asList("logger.name", "logger.method", "dd.span_id", "dd.trace_id"); List requiredSnapshotFields = Arrays.asList("captures", "exceptionId", "probe", "stack"); for (Map log : logs) { - requiredLogFields.forEach(log::containsKey); + requiredLogFields.forEach( + field -> assertTrue(log.containsKey(field), "log must contain field: " + field)); @SuppressWarnings("unchecked") Map debuggerMap = (Map) log.get("debugger"); @@ -297,7 +299,10 @@ protected static void verifySnapshots(List> logs, int expect Map snapshotContent = (Map) 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)); } } } diff --git a/dd-smoke-tests/junit-console/src/test/resources/test_junit_console_failed_test_replay/events.ftl b/dd-smoke-tests/junit-console/src/test/resources/test_junit_console_failed_test_replay/events.ftl index 2ee6214cae9..0261044895b 100644 --- a/dd-smoke-tests/junit-console/src/test/resources/test_junit_console_failed_test_replay/events.ftl +++ b/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", From 16d3d4f80c21ba2ece37c7cc927747869cd93ef8 Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Mon, 25 May 2026 12:51:27 +0200 Subject: [PATCH 2/5] fix: fixture updates --- .../test-failed-flaky-retries/events.ftl | 6 +++++ .../events.ftl | 2 ++ .../events.ftl | 2 ++ .../resources/test-succeed-junit-5/events.ftl | 3 +++ .../coverages.ftl | 22 +++++++++---------- .../events.ftl | 4 ++++ .../events.ftl | 4 ++++ .../events.ftl | 3 +++ .../events.ftl | 5 +++++ .../test_successful_maven_run/events.ftl | 3 +++ .../events.ftl | 3 +++ .../events.ftl | 2 ++ .../events.ftl | 3 +++ .../events.ftl | 3 +++ .../events.ftl | 3 +++ .../events.ftl | 9 ++++++++ .../events.ftl | 3 +++ 17 files changed, 69 insertions(+), 11 deletions(-) diff --git a/dd-smoke-tests/gradle/src/test/resources/test-failed-flaky-retries/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-failed-flaky-retries/events.ftl index d979c6ad5f6..b5b22bf1686 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-failed-flaky-retries/events.ftl +++ b/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", diff --git a/dd-smoke-tests/gradle/src/test/resources/test-failed-new-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-failed-new-instrumentation/events.ftl index 7cc854d3c39..4c20a4b24c0 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-failed-new-instrumentation/events.ftl +++ b/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", diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-gradle-plugin-test/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-gradle-plugin-test/events.ftl index 0d92092ab56..ebcf3f8c6f3 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-gradle-plugin-test/events.ftl +++ b/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", diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/events.ftl index 54f13e7a501..39d54d1ccc4 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/events.ftl +++ b/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", diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/coverages.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/coverages.ftl index 2fe41431bbf..567ef02b425 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/coverages.ftl +++ b/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} } ] \ No newline at end of file diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/events.ftl index b1b9cbf320a..b39c2005ae9 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/events.ftl +++ b/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", diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/events.ftl index ba67705f819..13be2c459db 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/events.ftl +++ b/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", diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/events.ftl index 739a850f012..ed5f7b89f2d 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/events.ftl +++ b/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", diff --git a/dd-smoke-tests/maven/src/test/resources/test_failed_maven_failed_test_replay/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_failed_maven_failed_test_replay/events.ftl index a0a08671e68..2b5a9e28542 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_failed_maven_failed_test_replay/events.ftl +++ b/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", diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/events.ftl index de28439b093..3ce7410d542 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/events.ftl +++ b/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", diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/events.ftl index e6a97ab492c..e166040a268 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/events.ftl +++ b/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", diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_child_service_propagation/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_child_service_propagation/events.ftl index 3bfd277008f..10d0f2f1dc8 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_child_service_propagation/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_child_service_propagation/events.ftl @@ -241,6 +241,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", @@ -300,6 +301,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", diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/events.ftl index 8868dd0e19c..8296cebb7dc 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/events.ftl @@ -279,6 +279,7 @@ "span.kind" : "test_suite_end", "test.framework" : "junit5", "test.framework_version" : "5.9.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" : "junit5", "test.framework_version" : "5.9.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" : "junit5", "test.framework_version" : "5.9.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", diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/events.ftl index de28439b093..3ce7410d542 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/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", diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/events.ftl index de28439b093..3ce7410d542 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/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", diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/events.ftl index 79afac0c22d..1ece6a2c99b 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/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/TestFailed.java", "test.status" : "pass", @@ -305,6 +306,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_failed", "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java", @@ -359,6 +361,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/TestSucceeded.java", "test.status" : "pass", @@ -417,6 +420,7 @@ "span.kind" : "test", "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_succeeded", "test.source.file" : "src/test/java/datadog/smoke/TestSucceeded.java", @@ -482,6 +486,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_another_succeeded", "test.retry_reason" : "attempt_to_fix", @@ -548,6 +553,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_another_succeeded", "test.retry_reason" : "attempt_to_fix", @@ -614,6 +620,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_another_succeeded", "test.retry_reason" : "attempt_to_fix", @@ -681,6 +688,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_another_succeeded", "test.retry_reason" : "attempt_to_fix", @@ -748,6 +756,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_succeeded", "test.skip_reason" : "Flaky test is disabled by Datadog", diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/events.ftl index 8386bc1b380..1dd47554009 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/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", From 343021cb4690d2e8fe8e33663c0a8043328fb4dc Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Mon, 25 May 2026 12:51:37 +0200 Subject: [PATCH 3/5] chore: restore latest testing for gradle plugin scenario --- .../src/test/java/datadog/smoketest/GradleDaemonSmokeTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dd-smoke-tests/gradle/src/test/java/datadog/smoketest/GradleDaemonSmokeTest.java b/dd-smoke-tests/gradle/src/test/java/datadog/smoketest/GradleDaemonSmokeTest.java index 4d1f4997bd6..d9d9d69dfbf 100644 --- a/dd-smoke-tests/gradle/src/test/java/datadog/smoketest/GradleDaemonSmokeTest.java +++ b/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( From 62532b1d826ae61f7a5d32daab0450b8b8823235 Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Mon, 25 May 2026 12:51:52 +0200 Subject: [PATCH 4/5] chore: remove unused method --- .../src/main/java/datadog/trace/util/ComparableVersion.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/internal-api/src/main/java/datadog/trace/util/ComparableVersion.java b/internal-api/src/main/java/datadog/trace/util/ComparableVersion.java index 7411667e39f..16ca1452fcb 100644 --- a/internal-api/src/main/java/datadog/trace/util/ComparableVersion.java +++ b/internal-api/src/main/java/datadog/trace/util/ComparableVersion.java @@ -126,11 +126,6 @@ public int compareTo(ComparableVersion o) { return this.items.compareTo(o.items); } - /** Checks if the version is in the range {@code [start, end)} */ - public boolean isWithin(@Nonnull ComparableVersion start, @Nonnull ComparableVersion end) { - return compareTo(start) >= 0 && compareTo(end) < 0; - } - public String toString() { return this.value; } From 2064ee9589473bf4089e5c195da2805ac2fd90c2 Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Mon, 25 May 2026 13:00:55 +0200 Subject: [PATCH 5/5] chore: spotless --- .../src/main/java/datadog/trace/util/ComparableVersion.java | 1 - 1 file changed, 1 deletion(-) diff --git a/internal-api/src/main/java/datadog/trace/util/ComparableVersion.java b/internal-api/src/main/java/datadog/trace/util/ComparableVersion.java index 16ca1452fcb..147607c71f0 100644 --- a/internal-api/src/main/java/datadog/trace/util/ComparableVersion.java +++ b/internal-api/src/main/java/datadog/trace/util/ComparableVersion.java @@ -9,7 +9,6 @@ import java.util.List; import java.util.Locale; import java.util.Properties; -import javax.annotation.Nonnull; // backported from org.apache.maven:maven-artifact:3.9.9 public class ComparableVersion implements Comparable {