diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy index 7ab44abc90d..3af7ef49258 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy @@ -90,7 +90,7 @@ class CucumberTest extends CiVisibilityInstrumentationTest { } def "test quarantined #testcaseName"() { - givenQuarantineEnabled(true) + givenTestManagementEnabled(true) givenQuarantinedTests(quarantined) runFeatures(features, true) @@ -105,7 +105,7 @@ class CucumberTest extends CiVisibilityInstrumentationTest { } def "test quarantined auto-retries #testcaseName"() { - givenQuarantineEnabled(true) + givenTestManagementEnabled(true) givenQuarantinedTests(quarantined) givenFlakyRetryEnabled(true) @@ -126,7 +126,7 @@ class CucumberTest extends CiVisibilityInstrumentationTest { } def "test quarantined early flakiness detection #testcaseName"() { - givenQuarantineEnabled(true) + givenTestManagementEnabled(true) givenQuarantinedTests(quarantined) givenEarlyFlakinessDetectionEnabled(true) diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-atr/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-atr/events.ftl index f1393968ce4..f4a4473bc4e 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-atr/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-atr/events.ftl @@ -293,6 +293,7 @@ "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.status" : "fail", + "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" }, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-efd/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-efd/events.ftl index fa19404348d..a0ada96ee0e 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-efd/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-efd/events.ftl @@ -199,6 +199,7 @@ "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.status" : "fail", + "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" }, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-known/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-known/events.ftl index ac1976f8ed8..b5e7dfe5179 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-known/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-known/events.ftl @@ -97,6 +97,7 @@ "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.status" : "fail", + "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" }, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed/events.ftl index 962da0e4e21..a2d0d168953 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed/events.ftl @@ -96,6 +96,7 @@ "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.status" : "fail", + "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" }, diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/groovy/MUnitTest.groovy b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/groovy/MUnitTest.groovy index ab757fcdd80..0e81d910ce4 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/groovy/MUnitTest.groovy +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/groovy/MUnitTest.groovy @@ -80,7 +80,7 @@ class MUnitTest extends CiVisibilityInstrumentationTest { } def "test quarantined #testcaseName"() { - givenQuarantineEnabled(true) + givenTestManagementEnabled(true) givenQuarantinedTests(quarantined) runTests(tests, true) @@ -93,7 +93,7 @@ class MUnitTest extends CiVisibilityInstrumentationTest { } def "test quarantined auto-retries #testcaseName"() { - givenQuarantineEnabled(true) + givenTestManagementEnabled(true) givenQuarantinedTests(quarantined) givenFlakyRetryEnabled(true) @@ -110,7 +110,7 @@ class MUnitTest extends CiVisibilityInstrumentationTest { } def "test quarantined early flakiness detection #testcaseName"() { - givenQuarantineEnabled(true) + givenTestManagementEnabled(true) givenQuarantinedTests(quarantined) givenEarlyFlakinessDetectionEnabled(true) diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-atr/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-atr/events.ftl index 04497596505..d64ada6dcc4 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-atr/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-atr/events.ftl @@ -17,6 +17,7 @@ "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, "test.status" : "fail", + "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" }, diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-efd/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-efd/events.ftl index 571e11423f8..bc0c817cc25 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-efd/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-efd/events.ftl @@ -18,6 +18,7 @@ "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, "test.status" : "fail", + "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" }, diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-known/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-known/events.ftl index 773f3cfd3f8..577b1e57a08 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-known/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-known/events.ftl @@ -18,6 +18,7 @@ "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, "test.status" : "fail", + "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" }, diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed/events.ftl index 84feb9b6f22..4c69a447437 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed/events.ftl @@ -17,6 +17,7 @@ "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, "test.status" : "fail", + "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" }, diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/groovy/JUnit4Test.groovy b/dd-java-agent/instrumentation/junit-4.10/src/test/groovy/JUnit4Test.groovy index 54d352f7156..fe4229e373b 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/groovy/JUnit4Test.groovy +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/groovy/JUnit4Test.groovy @@ -127,7 +127,7 @@ class JUnit4Test extends CiVisibilityInstrumentationTest { } def "test quarantined #testcaseName"() { - givenQuarantineEnabled(true) + givenTestManagementEnabled(true) givenQuarantinedTests(quarantined) runTests(tests, true) @@ -141,7 +141,7 @@ class JUnit4Test extends CiVisibilityInstrumentationTest { } def "test quarantined auto-retries #testcaseName"() { - givenQuarantineEnabled(true) + givenTestManagementEnabled(true) givenQuarantinedTests(quarantined) givenFlakyRetryEnabled(true) @@ -158,7 +158,7 @@ class JUnit4Test extends CiVisibilityInstrumentationTest { } def "test quarantined early flakiness detection #testcaseName"() { - givenQuarantineEnabled(true) + givenTestManagementEnabled(true) givenQuarantinedTests(quarantined) givenEarlyFlakinessDetectionEnabled(true) diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-atr/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-atr/events.ftl index 01e9eb9ba7c..12bc6187c42 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-atr/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-atr/events.ftl @@ -17,6 +17,7 @@ "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, "test.status" : "fail", + "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" }, diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-efd/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-efd/events.ftl index f1b6e55176f..23e17404724 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-efd/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-efd/events.ftl @@ -18,6 +18,7 @@ "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, "test.status" : "fail", + "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" }, diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-known/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-known/events.ftl index 837ccef8468..c01694b5a88 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-known/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-known/events.ftl @@ -18,6 +18,7 @@ "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, "test.status" : "fail", + "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" }, diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-parameterized/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-parameterized/events.ftl index 2e1945b0a8b..f509764085d 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-parameterized/events.ftl @@ -17,6 +17,7 @@ "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, "test.status" : "fail", + "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" }, diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed/events.ftl index 743ea4e0b55..abdbf5f2836 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed/events.ftl @@ -17,6 +17,7 @@ "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, "test.status" : "fail", + "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" }, diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy index 0c370fa1e10..80dfe6be817 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy @@ -100,7 +100,7 @@ class CucumberTest extends CiVisibilityInstrumentationTest { } def "test quarantined #testcaseName"() { - givenQuarantineEnabled(true) + givenTestManagementEnabled(true) givenQuarantinedTests(quarantined) runFeatures(features, false, true) @@ -115,7 +115,7 @@ class CucumberTest extends CiVisibilityInstrumentationTest { } def "test quarantined auto-retries #testcaseName"() { - givenQuarantineEnabled(true) + givenTestManagementEnabled(true) givenQuarantinedTests(quarantined) givenFlakyRetryEnabled(true) @@ -136,7 +136,7 @@ class CucumberTest extends CiVisibilityInstrumentationTest { } def "test quarantined early flakiness detection #testcaseName"() { - givenQuarantineEnabled(true) + givenTestManagementEnabled(true) givenQuarantinedTests(quarantined) givenEarlyFlakinessDetectionEnabled(true) diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-atr/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-atr/events.ftl index d3b57289a18..f3295b08ced 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-atr/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-atr/events.ftl @@ -293,6 +293,7 @@ "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.status" : "fail", + "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" }, diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-efd/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-efd/events.ftl index 0aae442aa7b..234173ad399 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-efd/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-efd/events.ftl @@ -199,6 +199,7 @@ "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.status" : "fail", + "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" }, diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-known/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-known/events.ftl index f128c440822..8f489671d7d 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-known/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-known/events.ftl @@ -97,6 +97,7 @@ "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.status" : "fail", + "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" }, diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed/events.ftl index 94bee36a5bd..fd2000293c0 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed/events.ftl @@ -96,6 +96,7 @@ "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.status" : "fail", + "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" }, diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/SpockTest.groovy b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/SpockTest.groovy index 1f76fb7d93d..1196821b5c6 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/SpockTest.groovy +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/SpockTest.groovy @@ -1,5 +1,4 @@ import datadog.trace.api.DisableTestTrace -import datadog.trace.api.civisibility.CIConstants import datadog.trace.api.civisibility.config.TestIdentifier import datadog.trace.civisibility.CiVisibilityInstrumentationTest import datadog.trace.civisibility.diff.FileDiff @@ -133,7 +132,7 @@ class SpockTest extends CiVisibilityInstrumentationTest { } def "test quarantined #testcaseName"() { - givenQuarantineEnabled(true) + givenTestManagementEnabled(true) givenQuarantinedTests(quarantined) runTests(tests, true) @@ -147,7 +146,7 @@ class SpockTest extends CiVisibilityInstrumentationTest { } def "test quarantined auto-retries #testcaseName"() { - givenQuarantineEnabled(true) + givenTestManagementEnabled(true) givenQuarantinedTests(quarantined) givenFlakyRetryEnabled(true) @@ -164,7 +163,7 @@ class SpockTest extends CiVisibilityInstrumentationTest { } def "test quarantined early flakiness detection #testcaseName"() { - givenQuarantineEnabled(true) + givenTestManagementEnabled(true) givenQuarantinedTests(quarantined) givenEarlyFlakinessDetectionEnabled(true) diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-atr/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-atr/events.ftl index 057e0af9afd..f3a48eef64c 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-atr/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-atr/events.ftl @@ -317,6 +317,7 @@ "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.status" : "fail", + "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" }, diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-efd/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-efd/events.ftl index 30fb242b205..857db154c05 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-efd/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-efd/events.ftl @@ -215,6 +215,7 @@ "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.status" : "fail", + "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" }, diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-known/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-known/events.ftl index 10784161694..fe0306641fb 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-known/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-known/events.ftl @@ -105,6 +105,7 @@ "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.status" : "fail", + "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" }, diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-parameterized/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-parameterized/events.ftl index d09ffd910aa..30493e53ae9 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-parameterized/events.ftl @@ -153,6 +153,7 @@ "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.status" : "fail", + "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" }, diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed/events.ftl index cb3f8597871..91ce7740989 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed/events.ftl @@ -104,6 +104,7 @@ "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.status" : "fail", + "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" }, diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/groovy/JUnit5Test.groovy b/dd-java-agent/instrumentation/junit-5.3/src/test/groovy/JUnit5Test.groovy index 49225c3547b..049253836b4 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/groovy/JUnit5Test.groovy +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/groovy/JUnit5Test.groovy @@ -165,7 +165,7 @@ class JUnit5Test extends CiVisibilityInstrumentationTest { } def "test quarantined #testcaseName"() { - givenQuarantineEnabled(true) + givenTestManagementEnabled(true) givenQuarantinedTests(quarantined) runTests(tests, true) @@ -179,7 +179,7 @@ class JUnit5Test extends CiVisibilityInstrumentationTest { } def "test quarantined auto-retries #testcaseName"() { - givenQuarantineEnabled(true) + givenTestManagementEnabled(true) givenQuarantinedTests(quarantined) givenFlakyRetryEnabled(true) @@ -196,7 +196,7 @@ class JUnit5Test extends CiVisibilityInstrumentationTest { } def "test quarantined early flakiness detection #testcaseName"() { - givenQuarantineEnabled(true) + givenTestManagementEnabled(true) givenQuarantinedTests(quarantined) givenEarlyFlakinessDetectionEnabled(true) diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-atr/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-atr/events.ftl index 4283b62ced7..dc8b9070ed5 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-atr/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-atr/events.ftl @@ -17,6 +17,7 @@ "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.status" : "fail", + "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" }, diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-efd/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-efd/events.ftl index ee69490a5cc..88168cc8695 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-efd/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-efd/events.ftl @@ -18,6 +18,7 @@ "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.status" : "fail", + "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" }, diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-known/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-known/events.ftl index 0681acfab8d..8f49744147b 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-known/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-known/events.ftl @@ -18,6 +18,7 @@ "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.status" : "fail", + "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" }, diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-parameterized/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-parameterized/events.ftl index dc422d1d12a..ed0a72743bf 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-parameterized/events.ftl @@ -17,6 +17,7 @@ "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.status" : "fail", + "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" }, diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed/events.ftl index 6ba32d8dccb..f1785157e56 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed/events.ftl @@ -17,6 +17,7 @@ "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.status" : "fail", + "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" }, diff --git a/dd-java-agent/instrumentation/karate/src/test/groovy/KarateTest.groovy b/dd-java-agent/instrumentation/karate/src/test/groovy/KarateTest.groovy index 3a866bd64e8..367562a8992 100644 --- a/dd-java-agent/instrumentation/karate/src/test/groovy/KarateTest.groovy +++ b/dd-java-agent/instrumentation/karate/src/test/groovy/KarateTest.groovy @@ -96,7 +96,7 @@ class KarateTest extends CiVisibilityInstrumentationTest { } def "test quarantined #testcaseName"() { - givenQuarantineEnabled(true) + givenTestManagementEnabled(true) givenQuarantinedTests(quarantined) runTests(tests, true) diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-quarantined-failed/events.ftl index 2440c78cd2c..ce167b8f692 100644 --- a/dd-java-agent/instrumentation/karate/src/test/resources/test-quarantined-failed/events.ftl +++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-quarantined-failed/events.ftl @@ -185,6 +185,7 @@ "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.status" : "fail", + "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" }, diff --git a/dd-java-agent/instrumentation/scalatest/src/test/groovy/ScalatestTest.groovy b/dd-java-agent/instrumentation/scalatest/src/test/groovy/ScalatestTest.groovy index 35f68295a2b..fdc41360152 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/groovy/ScalatestTest.groovy +++ b/dd-java-agent/instrumentation/scalatest/src/test/groovy/ScalatestTest.groovy @@ -102,7 +102,7 @@ class ScalatestTest extends CiVisibilityInstrumentationTest { } def "test quarantined #testcaseName"() { - givenQuarantineEnabled(true) + givenTestManagementEnabled(true) givenQuarantinedTests(quarantined) runTests(tests, true) @@ -115,7 +115,7 @@ class ScalatestTest extends CiVisibilityInstrumentationTest { } def "test quarantined auto-retries #testcaseName"() { - givenQuarantineEnabled(true) + givenTestManagementEnabled(true) givenQuarantinedTests(quarantined) givenFlakyRetryEnabled(true) @@ -132,7 +132,7 @@ class ScalatestTest extends CiVisibilityInstrumentationTest { } def "test quarantined early flakiness detection #testcaseName"() { - givenQuarantineEnabled(true) + givenTestManagementEnabled(true) givenQuarantinedTests(quarantined) givenEarlyFlakinessDetectionEnabled(true) diff --git a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed-atr/events.ftl b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed-atr/events.ftl index 6349dc54035..83d11a89341 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed-atr/events.ftl +++ b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed-atr/events.ftl @@ -302,6 +302,7 @@ "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, "test.status" : "fail", + "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" }, diff --git a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed-efd/events.ftl b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed-efd/events.ftl index d41a5052157..0dff69a5bc1 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed-efd/events.ftl +++ b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed-efd/events.ftl @@ -206,6 +206,7 @@ "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, "test.status" : "fail", + "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" }, diff --git a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed-known/events.ftl b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed-known/events.ftl index b58aa206350..55308c9de52 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed-known/events.ftl +++ b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed-known/events.ftl @@ -102,6 +102,7 @@ "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, "test.status" : "fail", + "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" }, diff --git a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed/events.ftl index 14dd8e63817..90ff0b202ac 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed/events.ftl +++ b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed/events.ftl @@ -101,6 +101,7 @@ "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, "test.status" : "fail", + "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" }, diff --git a/dd-java-agent/instrumentation/testng/src/testFixtures/groovy/datadog/trace/instrumentation/testng/TestNGTest.groovy b/dd-java-agent/instrumentation/testng/src/testFixtures/groovy/datadog/trace/instrumentation/testng/TestNGTest.groovy index 29168c66838..d5d6fec2f24 100644 --- a/dd-java-agent/instrumentation/testng/src/testFixtures/groovy/datadog/trace/instrumentation/testng/TestNGTest.groovy +++ b/dd-java-agent/instrumentation/testng/src/testFixtures/groovy/datadog/trace/instrumentation/testng/TestNGTest.groovy @@ -157,7 +157,7 @@ abstract class TestNGTest extends CiVisibilityInstrumentationTest { def "test quarantined #testcaseName"() { Assumptions.assumeTrue(isExceptionSuppressionSupported()) - givenQuarantineEnabled(true) + givenTestManagementEnabled(true) givenQuarantinedTests(quarantined) runTests(tests, null, true) @@ -173,7 +173,7 @@ abstract class TestNGTest extends CiVisibilityInstrumentationTest { def "test quarantined auto-retries #testcaseName"() { Assumptions.assumeTrue(isExceptionSuppressionSupported()) - givenQuarantineEnabled(true) + givenTestManagementEnabled(true) givenQuarantinedTests(quarantined) givenFlakyRetryEnabled(true) @@ -192,7 +192,7 @@ abstract class TestNGTest extends CiVisibilityInstrumentationTest { def "test quarantined early flakiness detection #testcaseName"() { Assumptions.assumeTrue(isExceptionSuppressionSupported()) - givenQuarantineEnabled(true) + givenTestManagementEnabled(true) givenQuarantinedTests(quarantined) givenEarlyFlakinessDetectionEnabled(true) diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-7/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-7/events.ftl index 65f4bf6b328..2fa88f128ac 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-7/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-7/events.ftl @@ -104,6 +104,7 @@ "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.status" : "fail", + "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" }, diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-atr-7/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-atr-7/events.ftl index f1039d9b205..492f58c1d62 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-atr-7/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-atr-7/events.ftl @@ -317,6 +317,7 @@ "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.status" : "fail", + "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" }, diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-efd/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-efd/events.ftl index 335d848e69b..1d325591a33 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-efd/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-efd/events.ftl @@ -215,6 +215,7 @@ "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.status" : "fail", + "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" }, diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-known/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-known/events.ftl index 49a6099e0c5..da2766e90bf 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-known/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-known/events.ftl @@ -105,6 +105,7 @@ "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.status" : "fail", + "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" }, diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-parameterized/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-parameterized/events.ftl index 25f435dc2fb..1d01ae4ea75 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-parameterized/events.ftl @@ -153,6 +153,7 @@ "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.status" : "fail", + "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" },