diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java index e1e87f67765..5266de922af 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java @@ -77,6 +77,7 @@ public TestImpl( String testName, @Nullable String testParameters, @Nullable String itrCorrelationId, + boolean testSkippingEnabled, @Nullable Long startTime, @Nullable Class testClass, @Nullable Method testMethod, @@ -158,6 +159,10 @@ public TestImpl( testDecorator.afterStart(span); + if (testSkippingEnabled) { + span.setTag(Tags.TEST_ITR_TESTS_SKIPPING_ENABLED, true); + } + configurationErrors.applyTags(span); metricCollector.add(CiVisibilityCountMetric.EVENT_CREATED, 1, instrumentation, EventType.TEST); diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java index ed853e9576e..3c4a6dc4242 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java @@ -41,6 +41,7 @@ public class TestSuiteImpl implements DDTestSuite { private final String moduleName; private final String testSuiteName; private final String itrCorrelationId; + private final boolean testSkippingEnabled; private final Class testClass; private final InstrumentationType instrumentationType; private final TestFrameworkInstrumentation instrumentation; @@ -63,6 +64,7 @@ public TestSuiteImpl( String moduleName, String testSuiteName, String itrCorrelationId, + boolean testSkippingEnabled, @Nullable Class testClass, @Nullable Long startTime, boolean parallelized, @@ -83,6 +85,7 @@ public TestSuiteImpl( this.moduleName = moduleName; this.testSuiteName = testSuiteName; this.itrCorrelationId = itrCorrelationId; + this.testSkippingEnabled = testSkippingEnabled; this.parallelized = parallelized; this.instrumentationType = instrumentationType; this.instrumentation = instrumentation; @@ -134,6 +137,10 @@ public TestSuiteImpl( testDecorator.afterStart(span); + if (testSkippingEnabled) { + span.setTag(Tags.TEST_ITR_TESTS_SKIPPING_ENABLED, true); + } + configurationErrors.applyTags(span); if (!parallelized) { @@ -252,6 +259,7 @@ public TestImpl testStart( testName, testParameters, itrCorrelationId, + testSkippingEnabled, startTime, testClass, testMethod, diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestModule.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestModule.java index 43c4e8748cb..41107bbe923 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestModule.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestModule.java @@ -199,6 +199,7 @@ public TestSuiteImpl testSuiteStart( moduleName, testSuiteName, executionStrategy.getExecutionSettings().getItrCorrelationId(), + config.isCiVisibilityTestSkippingEnabled(), testClass, startTime, parallelized, diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java index 142c2abd46b..1c111bba967 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java @@ -174,6 +174,7 @@ public TestSuiteImpl testSuiteStart( moduleName, testSuiteName, executionStrategy.getExecutionSettings().getItrCorrelationId(), + executionStrategy.getExecutionSettings().isTestSkippingEnabled(), testClass, startTime, parallelized, diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestModule.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestModule.java index 3ec4196401f..4b4fb8e8f1f 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestModule.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestModule.java @@ -69,6 +69,7 @@ public ManualApiTestSuite testSuiteStart( moduleName, testSuiteName, null, + false, testClass, startTime, parallelized, diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestImplTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestImplTest.groovy index 5c1d7801e55..95ccfe9b8a1 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestImplTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestImplTest.groovy @@ -129,6 +129,7 @@ class TestImplTest extends SpanWriterTest { "testName", "testParameters", null, + false, null, null, null, diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestSuiteImplTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestSuiteImplTest.groovy index 3059fe6e8f2..1ec604268b7 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestSuiteImplTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestSuiteImplTest.groovy @@ -72,6 +72,7 @@ class TestSuiteImplTest extends SpanWriterTest { "moduleName", "suiteName", "", + false, MyClass, null, false, diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-itr-skipping/events.ftl b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-itr-skipping/events.ftl index 53276db3886..08c7d97c604 100644 --- a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-itr-skipping/events.ftl +++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-itr-skipping/events.ftl @@ -11,6 +11,7 @@ "span.kind" : "test_suite_end", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-4-cucumber-5.4", "test.status" : "skip", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", @@ -48,6 +49,7 @@ "test.final_status" : "skip", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-4-cucumber-5.4", "test.name" : "Addition", "test.skip_reason" : "Skipped by Datadog Test Impact Analysis", diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-itr-unskippable-suite/events.ftl b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-itr-unskippable-suite/events.ftl index b5274d363ff..91efb8a5fa9 100644 --- a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-itr-unskippable-suite/events.ftl +++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-itr-unskippable-suite/events.ftl @@ -11,6 +11,7 @@ "span.kind" : "test_suite_end", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-4-cucumber-5.4", "test.status" : "pass", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature:Basic Arithmetic", @@ -49,6 +50,7 @@ "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.itr.forced_run" : "true", + "test.itr.tests_skipping.enabled" : "true", "test.itr.unskippable" : "true", "test.module" : "junit-4-cucumber-5.4", "test.name" : "Addition", diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-itr-unskippable/events.ftl b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-itr-unskippable/events.ftl index 02770f4fdd1..e6ca955a1a0 100644 --- a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-itr-unskippable/events.ftl +++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-itr-unskippable/events.ftl @@ -11,6 +11,7 @@ "span.kind" : "test_suite_end", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-4-cucumber-5.4", "test.status" : "pass", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_unskippable.feature:Basic Arithmetic", @@ -49,6 +50,7 @@ "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.itr.forced_run" : "true", + "test.itr.tests_skipping.enabled" : "true", "test.itr.unskippable" : "true", "test.module" : "junit-4-cucumber-5.4", "test.name" : "Addition", diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/resources/test-itr-skipping-parameterized/events.ftl b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/resources/test-itr-skipping-parameterized/events.ftl index a80f745204e..9d1e57588f4 100644 --- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/resources/test-itr-skipping-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/resources/test-itr-skipping-parameterized/events.ftl @@ -86,6 +86,7 @@ "test.codeowners" : "[\"owner1\",\"owner2\"]", "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-4.10", "test.source.file" : "dummy_source_path", "test.status" : "pass", @@ -127,6 +128,7 @@ "test.final_status" : "skip", "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-4.10", "test.name" : "parameterized_test_succeed", "test.parameters" : "{\"metadata\":{\"test_name\":\"parameterized_test_succeed[str1]\"}}", @@ -179,6 +181,7 @@ "test.final_status" : "pass", "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-4.10", "test.name" : "parameterized_test_succeed", "test.parameters" : "{\"metadata\":{\"test_name\":\"parameterized_test_succeed[\\\"str2\\\"]\"}}", diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/resources/test-itr-skipping/events.ftl b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/resources/test-itr-skipping/events.ftl index a4bf477f330..00f0574b19b 100644 --- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/resources/test-itr-skipping/events.ftl +++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/resources/test-itr-skipping/events.ftl @@ -86,6 +86,7 @@ "test.codeowners" : "[\"owner1\",\"owner2\"]", "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-4.10", "test.source.file" : "dummy_source_path", "test.status" : "pass", @@ -127,6 +128,7 @@ "test.final_status" : "skip", "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-4.10", "test.name" : "test_another_succeed", "test.skip_reason" : "Skipped by Datadog Test Impact Analysis", @@ -178,6 +180,7 @@ "test.final_status" : "skip", "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-4.10", "test.name" : "test_failed", "test.skip_reason" : "Skipped by Datadog Test Impact Analysis", @@ -229,6 +232,7 @@ "test.final_status" : "pass", "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-4.10", "test.name" : "test_succeed", "test.source.file" : "dummy_source_path", diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/resources/test-itr-unskippable-not-skipped/events.ftl b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/resources/test-itr-unskippable-not-skipped/events.ftl index 157873ece62..7cf5cda1073 100644 --- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/resources/test-itr-unskippable-not-skipped/events.ftl +++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/resources/test-itr-unskippable-not-skipped/events.ftl @@ -84,6 +84,7 @@ "test.codeowners" : "[\"owner1\",\"owner2\"]", "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-4.10", "test.source.file" : "dummy_source_path", "test.status" : "pass", @@ -125,6 +126,7 @@ "test.final_status" : "pass", "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.itr.unskippable" : "true", "test.module" : "junit-4.10", "test.name" : "test_succeed", diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/resources/test-itr-unskippable-suite/events.ftl b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/resources/test-itr-unskippable-suite/events.ftl index 468890146cc..cca8ec2cdde 100644 --- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/resources/test-itr-unskippable-suite/events.ftl +++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/resources/test-itr-unskippable-suite/events.ftl @@ -84,6 +84,7 @@ "test.codeowners" : "[\"owner1\",\"owner2\"]", "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-4.10", "test.source.file" : "dummy_source_path", "test.status" : "pass", @@ -127,6 +128,7 @@ "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, "test.itr.forced_run" : "true", + "test.itr.tests_skipping.enabled" : "true", "test.itr.unskippable" : "true", "test.module" : "junit-4.10", "test.name" : "test_succeed", diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/resources/test-itr-unskippable/events.ftl b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/resources/test-itr-unskippable/events.ftl index 0ea08fd956b..c14bb455d29 100644 --- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/resources/test-itr-unskippable/events.ftl +++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/resources/test-itr-unskippable/events.ftl @@ -84,6 +84,7 @@ "test.codeowners" : "[\"owner1\",\"owner2\"]", "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-4.10", "test.source.file" : "dummy_source_path", "test.status" : "pass", @@ -126,6 +127,7 @@ "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, "test.itr.forced_run" : "true", + "test.itr.tests_skipping.enabled" : "true", "test.itr.unskippable" : "true", "test.module" : "junit-4.10", "test.name" : "test_succeed", diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-itr-skipping/events.ftl b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-itr-skipping/events.ftl index 9d89d9475f6..1d325c00b28 100644 --- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-itr-skipping/events.ftl +++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-itr-skipping/events.ftl @@ -11,6 +11,7 @@ "span.kind" : "test_suite_end", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-5-cucumber-5.4", "test.status" : "skip", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", @@ -48,6 +49,7 @@ "test.final_status" : "skip", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-5-cucumber-5.4", "test.name" : "Addition", "test.skip_reason" : "Skipped by Datadog Test Impact Analysis", diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-itr-unskippable-suite/events.ftl b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-itr-unskippable-suite/events.ftl index d010ec4b9b3..957a4be99f2 100644 --- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-itr-unskippable-suite/events.ftl +++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-itr-unskippable-suite/events.ftl @@ -11,6 +11,7 @@ "span.kind" : "test_suite_end", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-5-cucumber-5.4", "test.status" : "pass", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature:Basic Arithmetic", @@ -49,6 +50,7 @@ "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.itr.forced_run" : "true", + "test.itr.tests_skipping.enabled" : "true", "test.itr.unskippable" : "true", "test.module" : "junit-5-cucumber-5.4", "test.name" : "Addition", diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-itr-unskippable/events.ftl b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-itr-unskippable/events.ftl index 6f3b50d2b67..b0d36762d63 100644 --- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-itr-unskippable/events.ftl +++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-itr-unskippable/events.ftl @@ -11,6 +11,7 @@ "span.kind" : "test_suite_end", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-5-cucumber-5.4", "test.status" : "pass", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_unskippable.feature:Basic Arithmetic", @@ -49,6 +50,7 @@ "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.itr.forced_run" : "true", + "test.itr.tests_skipping.enabled" : "true", "test.itr.unskippable" : "true", "test.module" : "junit-5-cucumber-5.4", "test.name" : "Addition", diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/resources/test-itr-not-skipping-parameterized-spec-setup/events.ftl b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/resources/test-itr-not-skipping-parameterized-spec-setup/events.ftl index 3122a5fa134..0ba3760902d 100644 --- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/resources/test-itr-not-skipping-parameterized-spec-setup/events.ftl +++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/resources/test-itr-not-skipping-parameterized-spec-setup/events.ftl @@ -86,6 +86,7 @@ "test.codeowners" : "[\"owner1\",\"owner2\"]", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-5-spock-2.0", "test.source.file" : "dummy_source_path", "test.status" : "pass", @@ -127,6 +128,7 @@ "test.final_status" : "skip", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-5-spock-2.0", "test.name" : "test add 1 and 2", "test.parameters" : "{\"metadata\":{\"test_name\":\"test add 1 and 2\"}}", @@ -179,6 +181,7 @@ "test.final_status" : "pass", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-5-spock-2.0", "test.name" : "test add 4 and 4", "test.parameters" : "{\"metadata\":{\"test_name\":\"test add 4 and 4\"}}", diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/resources/test-itr-not-skipping-spec-setup/events.ftl b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/resources/test-itr-not-skipping-spec-setup/events.ftl index 15f94190a28..ede587849a2 100644 --- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/resources/test-itr-not-skipping-spec-setup/events.ftl +++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/resources/test-itr-not-skipping-spec-setup/events.ftl @@ -86,6 +86,7 @@ "test.codeowners" : "[\"owner1\",\"owner2\"]", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-5-spock-2.0", "test.source.file" : "dummy_source_path", "test.status" : "pass", @@ -127,6 +128,7 @@ "test.final_status" : "pass", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-5-spock-2.0", "test.name" : "test another success", "test.source.file" : "dummy_source_path", @@ -176,6 +178,7 @@ "test.final_status" : "skip", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-5-spock-2.0", "test.name" : "test success", "test.skip_reason" : "Skipped by Datadog Test Impact Analysis", diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/resources/test-itr-skipping-parameterized/events.ftl b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/resources/test-itr-skipping-parameterized/events.ftl index e06c79a65c9..5ae7af463ab 100644 --- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/resources/test-itr-skipping-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/resources/test-itr-skipping-parameterized/events.ftl @@ -86,6 +86,7 @@ "test.codeowners" : "[\"owner1\",\"owner2\"]", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-5-spock-2.0", "test.source.file" : "dummy_source_path", "test.status" : "pass", @@ -127,6 +128,7 @@ "test.final_status" : "skip", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-5-spock-2.0", "test.name" : "test add 1 and 2", "test.parameters" : "{\"metadata\":{\"test_name\":\"test add 1 and 2\"}}", @@ -179,6 +181,7 @@ "test.final_status" : "pass", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-5-spock-2.0", "test.name" : "test add 4 and 4", "test.parameters" : "{\"metadata\":{\"test_name\":\"test add 4 and 4\"}}", diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/resources/test-itr-skipping-spec-setup/events.ftl b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/resources/test-itr-skipping-spec-setup/events.ftl index 129fbac149a..9b0cf7190a0 100644 --- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/resources/test-itr-skipping-spec-setup/events.ftl +++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/resources/test-itr-skipping-spec-setup/events.ftl @@ -86,6 +86,7 @@ "test.codeowners" : "[\"owner1\",\"owner2\"]", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-5-spock-2.0", "test.skip_reason" : "Skipped by Datadog Test Impact Analysis", "test.source.file" : "dummy_source_path", @@ -128,6 +129,7 @@ "test.final_status" : "skip", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-5-spock-2.0", "test.name" : "test another success", "test.skip_reason" : "Skipped by Datadog Test Impact Analysis", @@ -179,6 +181,7 @@ "test.final_status" : "skip", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-5-spock-2.0", "test.name" : "test success", "test.skip_reason" : "Skipped by Datadog Test Impact Analysis", diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/resources/test-itr-skipping/events.ftl b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/resources/test-itr-skipping/events.ftl index 9128a1c6075..c94410f527d 100644 --- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/resources/test-itr-skipping/events.ftl +++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/resources/test-itr-skipping/events.ftl @@ -86,6 +86,7 @@ "test.codeowners" : "[\"owner1\",\"owner2\"]", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-5-spock-2.0", "test.skip_reason" : "Skipped by Datadog Test Impact Analysis", "test.source.file" : "dummy_source_path", @@ -128,6 +129,7 @@ "test.final_status" : "skip", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-5-spock-2.0", "test.name" : "test success", "test.skip_reason" : "Skipped by Datadog Test Impact Analysis", diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/resources/test-itr-unskippable-suite/events.ftl b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/resources/test-itr-unskippable-suite/events.ftl index ac7e3a6b202..5949484e280 100644 --- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/resources/test-itr-unskippable-suite/events.ftl +++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/resources/test-itr-unskippable-suite/events.ftl @@ -84,6 +84,7 @@ "test.codeowners" : "[\"owner1\",\"owner2\"]", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-5-spock-2.0", "test.source.file" : "dummy_source_path", "test.status" : "pass", @@ -126,6 +127,7 @@ "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.itr.forced_run" : "true", + "test.itr.tests_skipping.enabled" : "true", "test.itr.unskippable" : "true", "test.module" : "junit-5-spock-2.0", "test.name" : "test success", diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/resources/test-itr-unskippable/events.ftl b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/resources/test-itr-unskippable/events.ftl index c1f19099531..fde1cec2ee4 100644 --- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/resources/test-itr-unskippable/events.ftl +++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/resources/test-itr-unskippable/events.ftl @@ -84,6 +84,7 @@ "test.codeowners" : "[\"owner1\",\"owner2\"]", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-5-spock-2.0", "test.source.file" : "dummy_source_path", "test.status" : "pass", @@ -126,6 +127,7 @@ "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.itr.forced_run" : "true", + "test.itr.tests_skipping.enabled" : "true", "test.itr.unskippable" : "true", "test.module" : "junit-5-spock-2.0", "test.name" : "test success", diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-itr-skipping-parametrized-6/events.ftl b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-itr-skipping-parametrized-6/events.ftl index d5d856f9e8b..816b87460cc 100644 --- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-itr-skipping-parametrized-6/events.ftl +++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-itr-skipping-parametrized-6/events.ftl @@ -84,6 +84,7 @@ "test.codeowners" : "[\"owner1\",\"owner2\"]", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-5.3", "test.source.file" : "dummy_source_path", "test.status" : "pass", @@ -125,6 +126,7 @@ "test.final_status" : "pass", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-5.3", "test.name" : "test_parameterized", "test.parameters" : "{\"metadata\":{\"test_name\":\"[1] 0, 0, \\\"0\\\", \\\"some:\\\\\\\"parameter\\\\\\\"\\\"\"}}", @@ -175,6 +177,7 @@ "test.final_status" : "pass", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-5.3", "test.name" : "test_parameterized", "test.parameters" : "{\"metadata\":{\"test_name\":\"[2] 1, 1, 2, \\\"some:\\\\\\\"parameter\\\\\\\"\\\"\"}}", diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-itr-skipping-parametrized/events.ftl b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-itr-skipping-parametrized/events.ftl index 9271e17fa87..351a8881d60 100644 --- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-itr-skipping-parametrized/events.ftl +++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-itr-skipping-parametrized/events.ftl @@ -86,6 +86,7 @@ "test.codeowners" : "[\"owner1\",\"owner2\"]", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-5.3", "test.source.file" : "dummy_source_path", "test.status" : "pass", @@ -127,6 +128,7 @@ "test.final_status" : "skip", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-5.3", "test.name" : "test_parameterized", "test.parameters" : "{\"metadata\":{\"test_name\":\"[1] 0, 0, 0, some:\\\"parameter\\\"\"}}", @@ -179,6 +181,7 @@ "test.final_status" : "pass", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-5.3", "test.name" : "test_parameterized", "test.parameters" : "{\"metadata\":{\"test_name\":\"[2] 1, 1, 2, some:\\\"parameter\\\"\"}}", diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-itr-skipping/events.ftl b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-itr-skipping/events.ftl index 8de62f1bfa4..97a85e988e6 100644 --- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-itr-skipping/events.ftl +++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-itr-skipping/events.ftl @@ -86,6 +86,7 @@ "test.codeowners" : "[\"owner1\",\"owner2\"]", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-5.3", "test.source.file" : "dummy_source_path", "test.status" : "pass", @@ -127,6 +128,7 @@ "test.final_status" : "skip", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-5.3", "test.name" : "test_another_succeed", "test.skip_reason" : "Skipped by Datadog Test Impact Analysis", @@ -178,6 +180,7 @@ "test.final_status" : "skip", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-5.3", "test.name" : "test_failed", "test.skip_reason" : "Skipped by Datadog Test Impact Analysis", @@ -229,6 +232,7 @@ "test.final_status" : "pass", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-5.3", "test.name" : "test_succeed", "test.source.file" : "dummy_source_path", diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-itr-unskippable-not-skipped/events.ftl b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-itr-unskippable-not-skipped/events.ftl index 87dec381a07..ffc4a5b366f 100644 --- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-itr-unskippable-not-skipped/events.ftl +++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-itr-unskippable-not-skipped/events.ftl @@ -84,6 +84,7 @@ "test.codeowners" : "[\"owner1\",\"owner2\"]", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-5.3", "test.source.file" : "dummy_source_path", "test.status" : "pass", @@ -125,6 +126,7 @@ "test.final_status" : "pass", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.itr.unskippable" : "true", "test.module" : "junit-5.3", "test.name" : "test_succeed", diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-itr-unskippable-suite/events.ftl b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-itr-unskippable-suite/events.ftl index 698588a11ba..4dfa9b02465 100644 --- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-itr-unskippable-suite/events.ftl +++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-itr-unskippable-suite/events.ftl @@ -84,6 +84,7 @@ "test.codeowners" : "[\"owner1\",\"owner2\"]", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-5.3", "test.source.file" : "dummy_source_path", "test.status" : "pass", @@ -127,6 +128,7 @@ "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.itr.forced_run" : "true", + "test.itr.tests_skipping.enabled" : "true", "test.itr.unskippable" : "true", "test.module" : "junit-5.3", "test.name" : "test_succeed", diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-itr-unskippable/events.ftl b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-itr-unskippable/events.ftl index 35eff6a47c8..b8fee414fbc 100644 --- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-itr-unskippable/events.ftl +++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-itr-unskippable/events.ftl @@ -84,6 +84,7 @@ "test.codeowners" : "[\"owner1\",\"owner2\"]", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "junit-5.3", "test.source.file" : "dummy_source_path", "test.status" : "pass", @@ -126,6 +127,7 @@ "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.itr.forced_run" : "true", + "test.itr.tests_skipping.enabled" : "true", "test.itr.unskippable" : "true", "test.module" : "junit-5.3", "test.name" : "test_succeed", diff --git a/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-itr-skipping-parameterized/events.ftl b/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-itr-skipping-parameterized/events.ftl index b66e8fc1c27..298c2a5faa6 100644 --- a/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-itr-skipping-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-itr-skipping-parameterized/events.ftl @@ -83,6 +83,7 @@ "span.kind" : "test_suite_end", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "karate-1.0", "test.status" : "pass", "test.suite" : "[org/example/test_parameterized] test parameterized", @@ -120,6 +121,7 @@ "test.final_status" : "skip", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "karate-1.0", "test.name" : "first scenario as an outline", "test.parameters" : "{\"param\":\"'a'\",\"value\":\"aa\"}", @@ -167,6 +169,7 @@ "test.final_status" : "pass", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "karate-1.0", "test.name" : "first scenario as an outline", "test.parameters" : "{\"param\":\"'b'\",\"value\":\"bb\"}", diff --git a/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-itr-skipping/events.ftl b/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-itr-skipping/events.ftl index d75ad145a05..de497a7d3b8 100644 --- a/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-itr-skipping/events.ftl +++ b/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-itr-skipping/events.ftl @@ -35,6 +35,7 @@ "span.kind" : "test_suite_end", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "karate-1.0", "test.status" : "pass", "test.suite" : "[org/example/test_succeed] test succeed", @@ -73,6 +74,7 @@ "test.final_status" : "skip", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "karate-1.0", "test.name" : "first scenario", "test.skip_reason" : "Skipped by Datadog Test Impact Analysis", @@ -120,6 +122,7 @@ "test.final_status" : "pass", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "karate-1.0", "test.name" : "second scenario", "test.status" : "pass", diff --git a/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-itr-unskippable/events.ftl b/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-itr-unskippable/events.ftl index 07388ca3db8..4eae17fb489 100644 --- a/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-itr-unskippable/events.ftl +++ b/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-itr-unskippable/events.ftl @@ -59,6 +59,7 @@ "span.kind" : "test_suite_end", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "karate-1.0", "test.status" : "pass", "test.suite" : "[org/example/test_unskippable] test unskippable", @@ -97,6 +98,7 @@ "test.final_status" : "pass", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.itr.forced_run" : "true", "test.itr.unskippable" : "true", "test.module" : "karate-1.0", @@ -144,6 +146,7 @@ "test.final_status" : "pass", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "karate-1.0", "test.name" : "second scenario", "test.status" : "pass", diff --git a/dd-java-agent/instrumentation/scalatest-3.0.8/src/test/resources/test-itr-skipping/events.ftl b/dd-java-agent/instrumentation/scalatest-3.0.8/src/test/resources/test-itr-skipping/events.ftl index b14fac5cba8..91b8d1ffa5e 100644 --- a/dd-java-agent/instrumentation/scalatest-3.0.8/src/test/resources/test-itr-skipping/events.ftl +++ b/dd-java-agent/instrumentation/scalatest-3.0.8/src/test/resources/test-itr-skipping/events.ftl @@ -12,6 +12,7 @@ "test.codeowners" : "[\"owner1\",\"owner2\"]", "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "scalatest-3.0.8", "test.source.file" : "dummy_source_path", "test.status" : "skip", @@ -53,6 +54,7 @@ "test.final_status" : "skip", "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "scalatest-3.0.8", "test.name" : "Example.add adds two numbers", "test.skip_reason" : "Skipped by Datadog Test Impact Analysis", diff --git a/dd-java-agent/instrumentation/scalatest-3.0.8/src/test/resources/test-itr-unskippable-not-skipped/events.ftl b/dd-java-agent/instrumentation/scalatest-3.0.8/src/test/resources/test-itr-unskippable-not-skipped/events.ftl index a68163cdadc..4f64bce5c18 100644 --- a/dd-java-agent/instrumentation/scalatest-3.0.8/src/test/resources/test-itr-unskippable-not-skipped/events.ftl +++ b/dd-java-agent/instrumentation/scalatest-3.0.8/src/test/resources/test-itr-unskippable-not-skipped/events.ftl @@ -12,6 +12,7 @@ "test.codeowners" : "[\"owner1\",\"owner2\"]", "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "scalatest-3.0.8", "test.source.file" : "dummy_source_path", "test.status" : "pass", @@ -53,6 +54,7 @@ "test.final_status" : "pass", "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.itr.unskippable" : "true", "test.module" : "scalatest-3.0.8", "test.name" : "test should assert something", diff --git a/dd-java-agent/instrumentation/scalatest-3.0.8/src/test/resources/test-itr-unskippable/events.ftl b/dd-java-agent/instrumentation/scalatest-3.0.8/src/test/resources/test-itr-unskippable/events.ftl index 9cb9963eb63..d6e4114bdd4 100644 --- a/dd-java-agent/instrumentation/scalatest-3.0.8/src/test/resources/test-itr-unskippable/events.ftl +++ b/dd-java-agent/instrumentation/scalatest-3.0.8/src/test/resources/test-itr-unskippable/events.ftl @@ -12,6 +12,7 @@ "test.codeowners" : "[\"owner1\",\"owner2\"]", "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "scalatest-3.0.8", "test.source.file" : "dummy_source_path", "test.status" : "pass", @@ -54,6 +55,7 @@ "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, "test.itr.forced_run" : "true", + "test.itr.tests_skipping.enabled" : "true", "test.itr.unskippable" : "true", "test.module" : "scalatest-3.0.8", "test.name" : "test should assert something", diff --git a/dd-java-agent/instrumentation/testng/testng-6.4/src/test/resources/test-itr-skipping-factory-data-provider/events.ftl b/dd-java-agent/instrumentation/testng/testng-6.4/src/test/resources/test-itr-skipping-factory-data-provider/events.ftl index 7b597e46c5d..e91f002e2b8 100644 --- a/dd-java-agent/instrumentation/testng/testng-6.4/src/test/resources/test-itr-skipping-factory-data-provider/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-6.4/src/test/resources/test-itr-skipping-factory-data-provider/events.ftl @@ -12,6 +12,7 @@ "test.codeowners" : "[\"owner1\",\"owner2\"]", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "testng-6.4", "test.source.file" : "dummy_source_path", "test.status" : "skip", @@ -53,6 +54,7 @@ "test.final_status" : "skip", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "testng-6.4", "test.name" : "testMethod", "test.skip_reason" : "Skipped by Datadog Test Impact Analysis", diff --git a/dd-java-agent/instrumentation/testng/testng-6.4/src/test/resources/test-itr-skipping-parameterized/events.ftl b/dd-java-agent/instrumentation/testng/testng-6.4/src/test/resources/test-itr-skipping-parameterized/events.ftl index c8a53028c8e..d4d97de625c 100644 --- a/dd-java-agent/instrumentation/testng/testng-6.4/src/test/resources/test-itr-skipping-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-6.4/src/test/resources/test-itr-skipping-parameterized/events.ftl @@ -12,6 +12,7 @@ "test.codeowners" : "[\"owner1\",\"owner2\"]", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "testng-6.4", "test.source.file" : "dummy_source_path", "test.status" : "pass", @@ -53,6 +54,7 @@ "test.final_status" : "skip", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "testng-6.4", "test.name" : "parameterized_test_succeed", "test.parameters" : "{\"arguments\":{\"0\":\"hello\",\"1\":\"true\"}}", @@ -105,6 +107,7 @@ "test.final_status" : "pass", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "testng-6.4", "test.name" : "parameterized_test_succeed", "test.parameters" : "{\"arguments\":{\"0\":\"\\\"goodbye\\\"\",\"1\":\"false\"}}", diff --git a/dd-java-agent/instrumentation/testng/testng-6.4/src/test/resources/test-itr-skipping/events.ftl b/dd-java-agent/instrumentation/testng/testng-6.4/src/test/resources/test-itr-skipping/events.ftl index 1caf9dbd328..fd24c545b86 100644 --- a/dd-java-agent/instrumentation/testng/testng-6.4/src/test/resources/test-itr-skipping/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-6.4/src/test/resources/test-itr-skipping/events.ftl @@ -12,6 +12,7 @@ "test.codeowners" : "[\"owner1\",\"owner2\"]", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "testng-6.4", "test.source.file" : "dummy_source_path", "test.status" : "pass", @@ -53,6 +54,7 @@ "test.final_status" : "skip", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "testng-6.4", "test.name" : "test_another_succeed", "test.skip_reason" : "Skipped by Datadog Test Impact Analysis", @@ -104,6 +106,7 @@ "test.final_status" : "skip", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "testng-6.4", "test.name" : "test_failed", "test.skip_reason" : "Skipped by Datadog Test Impact Analysis", @@ -155,6 +158,7 @@ "test.final_status" : "pass", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "testng-6.4", "test.name" : "test_succeed", "test.source.file" : "dummy_source_path", diff --git a/dd-java-agent/instrumentation/testng/testng-6.4/src/test/resources/test-itr-unskippable-not-skipped/events.ftl b/dd-java-agent/instrumentation/testng/testng-6.4/src/test/resources/test-itr-unskippable-not-skipped/events.ftl index dd333846aa0..17795900ffb 100644 --- a/dd-java-agent/instrumentation/testng/testng-6.4/src/test/resources/test-itr-unskippable-not-skipped/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-6.4/src/test/resources/test-itr-unskippable-not-skipped/events.ftl @@ -12,6 +12,7 @@ "test.codeowners" : "[\"owner1\",\"owner2\"]", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "testng-6.4", "test.source.file" : "dummy_source_path", "test.status" : "pass", @@ -54,6 +55,7 @@ "test.final_status" : "pass", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.itr.unskippable" : "true", "test.module" : "testng-6.4", "test.name" : "test_succeed", diff --git a/dd-java-agent/instrumentation/testng/testng-6.4/src/test/resources/test-itr-unskippable/events.ftl b/dd-java-agent/instrumentation/testng/testng-6.4/src/test/resources/test-itr-unskippable/events.ftl index 12dbe3eadbf..03639f4ddeb 100644 --- a/dd-java-agent/instrumentation/testng/testng-6.4/src/test/resources/test-itr-unskippable/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-6.4/src/test/resources/test-itr-unskippable/events.ftl @@ -12,6 +12,7 @@ "test.codeowners" : "[\"owner1\",\"owner2\"]", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "testng-6.4", "test.source.file" : "dummy_source_path", "test.status" : "pass", @@ -55,6 +56,7 @@ "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.itr.forced_run" : "true", + "test.itr.tests_skipping.enabled" : "true", "test.itr.unskippable" : "true", "test.module" : "testng-6.4", "test.name" : "test_succeed", diff --git a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-itr-skipping-factory-data-provider/events.ftl b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-itr-skipping-factory-data-provider/events.ftl index 8d76d8b1fff..cad76f95682 100644 --- a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-itr-skipping-factory-data-provider/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-itr-skipping-factory-data-provider/events.ftl @@ -12,6 +12,7 @@ "test.codeowners" : "[\"owner1\",\"owner2\"]", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "testng-7.0", "test.source.file" : "dummy_source_path", "test.status" : "skip", @@ -53,6 +54,7 @@ "test.final_status" : "skip", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "testng-7.0", "test.name" : "testMethod", "test.skip_reason" : "Skipped by Datadog Test Impact Analysis", diff --git a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-itr-skipping-parameterized/events.ftl b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-itr-skipping-parameterized/events.ftl index 25555eb3e66..12c9d906952 100644 --- a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-itr-skipping-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-itr-skipping-parameterized/events.ftl @@ -12,6 +12,7 @@ "test.codeowners" : "[\"owner1\",\"owner2\"]", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "testng-7.0", "test.source.file" : "dummy_source_path", "test.status" : "pass", @@ -53,6 +54,7 @@ "test.final_status" : "skip", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "testng-7.0", "test.name" : "parameterized_test_succeed", "test.parameters" : "{\"arguments\":{\"0\":\"hello\",\"1\":\"true\"}}", @@ -105,6 +107,7 @@ "test.final_status" : "pass", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "testng-7.0", "test.name" : "parameterized_test_succeed", "test.parameters" : "{\"arguments\":{\"0\":\"\\\"goodbye\\\"\",\"1\":\"false\"}}", diff --git a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-itr-skipping/events.ftl b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-itr-skipping/events.ftl index c2ab8f02c28..f15122b63d1 100644 --- a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-itr-skipping/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-itr-skipping/events.ftl @@ -12,6 +12,7 @@ "test.codeowners" : "[\"owner1\",\"owner2\"]", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "testng-7.0", "test.source.file" : "dummy_source_path", "test.status" : "pass", @@ -53,6 +54,7 @@ "test.final_status" : "skip", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "testng-7.0", "test.name" : "test_another_succeed", "test.skip_reason" : "Skipped by Datadog Test Impact Analysis", @@ -104,6 +106,7 @@ "test.final_status" : "skip", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "testng-7.0", "test.name" : "test_failed", "test.skip_reason" : "Skipped by Datadog Test Impact Analysis", @@ -155,6 +158,7 @@ "test.final_status" : "pass", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "testng-7.0", "test.name" : "test_succeed", "test.source.file" : "dummy_source_path", diff --git a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-itr-unskippable-not-skipped/events.ftl b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-itr-unskippable-not-skipped/events.ftl index 01b8e0bdd2d..1b375b192bc 100644 --- a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-itr-unskippable-not-skipped/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-itr-unskippable-not-skipped/events.ftl @@ -12,6 +12,7 @@ "test.codeowners" : "[\"owner1\",\"owner2\"]", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "testng-7.0", "test.source.file" : "dummy_source_path", "test.status" : "pass", @@ -54,6 +55,7 @@ "test.final_status" : "pass", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.itr.unskippable" : "true", "test.module" : "testng-7.0", "test.name" : "test_succeed", diff --git a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-itr-unskippable/events.ftl b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-itr-unskippable/events.ftl index eac089c12e2..0083ee336a1 100644 --- a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-itr-unskippable/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-itr-unskippable/events.ftl @@ -12,6 +12,7 @@ "test.codeowners" : "[\"owner1\",\"owner2\"]", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, + "test.itr.tests_skipping.enabled" : "true", "test.module" : "testng-7.0", "test.source.file" : "dummy_source_path", "test.status" : "pass", @@ -55,6 +56,7 @@ "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.itr.forced_run" : "true", + "test.itr.tests_skipping.enabled" : "true", "test.itr.unskippable" : "true", "test.module" : "testng-7.0", "test.name" : "test_succeed",