Rename skip EFD tag

nikita-tkachenko-datadog · nikita-tkachenko-datadog · commit a617ea012fb5 · 2025-03-04T16:54:56.000+01:00
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/test/ExecutionStrategy.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/test/ExecutionStrategy.java
@@ -173,7 +173,7 @@ private boolean isEFDApplicable(
         && !isEFDLimitReached()
         && (isNew(test) || isModified(testSource))
         // endsWith matching is needed for JUnit4-based frameworks, where tags are classes
-        && testTags.stream().noneMatch(t -> t.endsWith(CIConstants.Tags.SKIP_EFD_TAG));
+        && testTags.stream().noneMatch(t -> t.endsWith(CIConstants.Tags.EFD_DISABLE_TAG));
   }
 
   public boolean isEFDLimitReached() {
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_skip_efd.feature b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_skip_efd.feature
@@ -3,7 +3,7 @@ Feature: Basic Arithmetic
   Background: A Calculator
     Given a calculator I just turned on
 
-  @datadog_skip_efd
+  @datadog_efd_disable
   Scenario: Addition
   # Try to change one of the values below to provoke a failure
     When I add 4 and 5
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-skip-new-test/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-skip-new-test/events.ftl
@@ -51,7 +51,7 @@
       "test.name" : "Addition",
       "test.status" : "pass",
       "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_skip_efd.feature:Basic Arithmetic",
-      "test.traits" : "{\"category\":[\"datadog_skip_efd\"]}",
+      "test.traits" : "{\"category\":[\"datadog_efd_disable\"]}",
       "test.type" : "test",
       "test_session.name" : "session-name"
     },
@@ -142,4 +142,4 @@
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
+} ]
diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-efd-skip-new-test/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-efd-skip-new-test/events.ftl
@@ -125,7 +125,7 @@
       "test.source.file" : "dummy_source_path",
       "test.status" : "pass",
       "test.suite" : "org.example.TestSucceedMUnitSkipEfd",
-      "test.traits" : "{\"category\":[\"datadog_skip_efd\"]}",
+      "test.traits" : "{\"category\":[\"datadog_efd_disable\"]}",
       "test.type" : "test",
       "test_session.name" : "session-name"
     },
@@ -148,4 +148,4 @@
   },
   "type" : "test",
   "version" : 2
-} ]
+} ]
diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/scala/org/example/TestSucceedMUnitSkipEfd.scala b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/scala/org/example/TestSucceedMUnitSkipEfd.scala
@@ -3,7 +3,7 @@ package org.example
 import munit.FunSuite
 
 class TestSucceedMUnitSkipEfd extends FunSuite {
-  test("Calculator.add".tag(new munit.Tag("datadog_skip_efd"))) {
+  test("Calculator.add".tag(new munit.Tag("datadog_efd_disable"))) {
     assertEquals(1 + 2, 3)
   }
 }
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestSucceedSkipEfd.java b/dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestSucceedSkipEfd.java
@@ -7,11 +7,11 @@
 
 public class TestSucceedSkipEfd {
 
-  @Category(datadog_skip_efd.class)
+  @Category(datadog_efd_disable.class)
   @Test
   public void test_succeed() {
     assertTrue(true);
   }
 
-  public interface datadog_skip_efd {}
+  public interface datadog_efd_disable {}
 }
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-skip-new-test/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-skip-new-test/events.ftl
@@ -126,7 +126,7 @@
       "test.source.method" : "test_succeed()V",
       "test.status" : "pass",
       "test.suite" : "org.example.TestSucceedSkipEfd",
-      "test.traits" : "{\"category\":[\"org.example.TestSucceedSkipEfd$datadog_skip_efd\"]}",
+      "test.traits" : "{\"category\":[\"org.example.TestSucceedSkipEfd$datadog_efd_disable\"]}",
       "test.type" : "test",
       "test_session.name" : "session-name"
     },
@@ -151,4 +151,4 @@
   },
   "type" : "test",
   "version" : 2
-} ]
+} ]
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_skip_efd.feature b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_skip_efd.feature
@@ -3,7 +3,7 @@ Feature: Basic Arithmetic
   Background: A Calculator
     Given a calculator I just turned on
 
-  @datadog_skip_efd
+  @datadog_efd_disable
   Scenario: Addition
     When I add 4 and 5
     Then the result is 9
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-skip-new-test/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-skip-new-test/events.ftl
@@ -51,7 +51,7 @@
       "test.name" : "Addition",
       "test.status" : "pass",
       "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_skip_efd.feature:Basic Arithmetic",
-      "test.traits" : "{\"category\":[\"datadog_skip_efd\"]}",
+      "test.traits" : "{\"category\":[\"datadog_efd_disable\"]}",
       "test.type" : "test",
       "test_session.name" : "session-name"
     },
@@ -142,4 +142,4 @@
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
+} ]
diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestSucceedSpockSkipEfd.groovy b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestSucceedSpockSkipEfd.groovy
@@ -6,7 +6,7 @@ import spock.lang.Tag
 
 class TestSucceedSpockSkipEfd extends Specification {
 
-  @Tag(CIConstants.Tags.SKIP_EFD_TAG)
+  @Tag(CIConstants.Tags.EFD_DISABLE_TAG)
   def "test success"() {
     expect:
     1 == 1
diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-skip-new-test/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-skip-new-test/events.ftl
@@ -58,7 +58,7 @@
       "test.source.method" : "test success()V",
       "test.status" : "pass",
       "test.suite" : "org.example.TestSucceedSpockSkipEfd",
-      "test.traits" : "{\"category\":[\"datadog_skip_efd\"]}",
+      "test.traits" : "{\"category\":[\"datadog_efd_disable\"]}",
       "test.type" : "test",
       "test_session.name" : "session-name"
     },
@@ -151,4 +151,4 @@
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
+} ]
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestSucceedSkipEfd.java b/dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestSucceedSkipEfd.java
@@ -10,7 +10,7 @@
 public class TestSucceedSkipEfd {
 
   @Test
-  @Tags({@Tag(CIConstants.Tags.SKIP_EFD_TAG)})
+  @Tags({@Tag(CIConstants.Tags.EFD_DISABLE_TAG)})
   public void test_succeed() {
     assertTrue(true);
   }
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-skip-new-test/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-skip-new-test/events.ftl
@@ -126,7 +126,7 @@
       "test.source.method" : "test_succeed()V",
       "test.status" : "pass",
       "test.suite" : "org.example.TestSucceedSkipEfd",
-      "test.traits" : "{\"category\":[\"datadog_skip_efd\"]}",
+      "test.traits" : "{\"category\":[\"datadog_efd_disable\"]}",
       "test.type" : "test",
       "test_session.name" : "session-name"
     },
@@ -151,4 +151,4 @@
   },
   "type" : "test",
   "version" : 2
-} ]
+} ]
diff --git a/dd-java-agent/instrumentation/karate/src/test/java/org/example/test_succeed_skip_efd.feature b/dd-java-agent/instrumentation/karate/src/test/java/org/example/test_succeed_skip_efd.feature
@@ -1,6 +1,6 @@
 @foo
 Feature: test succeed
 
-  @datadog_skip_efd
+  @datadog_efd_disable
   Scenario: first scenario
     * print 'first'
diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-efd-skip-new-test/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-efd-skip-new-test/events.ftl
@@ -76,7 +76,7 @@
       "test.name" : "first scenario",
       "test.status" : "pass",
       "test.suite" : "[org/example/test_succeed_skip_efd] test succeed",
-      "test.traits" : "{\"category\":[\"datadog_skip_efd\",\"foo\"]}",
+      "test.traits" : "{\"category\":[\"datadog_efd_disable\",\"foo\"]}",
       "test.type" : "test",
       "test_session.name" : "session-name"
     },
@@ -167,4 +167,4 @@
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
+} ]
diff --git a/dd-java-agent/instrumentation/scalatest/src/test/scala/org/example/TestSucceedSkipEfd.scala b/dd-java-agent/instrumentation/scalatest/src/test/scala/org/example/TestSucceedSkipEfd.scala
@@ -5,7 +5,7 @@ import datadog.trace.api.civisibility.{CIConstants, InstrumentationBridge}
 import org.scalatest.Tag
 import org.scalatest.flatspec.AnyFlatSpec
 
-object SkipEfdTag extends Tag(Tags.SKIP_EFD_TAG)
+object SkipEfdTag extends Tag(Tags.EFD_DISABLE_TAG)
 
 class TestSucceedSkipEfd extends AnyFlatSpec {
   "test" should "assert something" taggedAs SkipEfdTag in {
diff --git a/dd-java-agent/instrumentation/testng/src/testFixtures/java/org/example/TestSucceedSkipEfd.java b/dd-java-agent/instrumentation/testng/src/testFixtures/java/org/example/TestSucceedSkipEfd.java
@@ -7,7 +7,7 @@
 
 public class TestSucceedSkipEfd {
 
-  @Test(groups = CIConstants.Tags.SKIP_EFD_TAG)
+  @Test(groups = CIConstants.Tags.EFD_DISABLE_TAG)
   public void test_succeed() {
     assertTrue(true);
   }
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-efd-skip-new-test/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-efd-skip-new-test/events.ftl
@@ -58,7 +58,7 @@
       "test.source.method" : "test_succeed()V",
       "test.status" : "pass",
       "test.suite" : "org.example.TestSucceedSkipEfd",
-      "test.traits" : "{\"category\":[\"datadog_skip_efd\"]}",
+      "test.traits" : "{\"category\":[\"datadog_efd_disable\"]}",
       "test.type" : "test",
       "test_session.name" : "session-name"
     },
@@ -151,4 +151,4 @@
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
+} ]
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/CIConstants.java b/internal-api/src/main/java/datadog/trace/api/civisibility/CIConstants.java
@@ -18,6 +18,6 @@ public interface CIConstants {
   /** Tags that change the behaviour of CI Vis features when applied to a test case. */
   interface Tags {
     String ITR_UNSKIPPABLE_TAG = "datadog_itr_unskippable";
-    String SKIP_EFD_TAG = "datadog_skip_efd";
+    String EFD_DISABLE_TAG = "datadog_efd_disable";
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ private boolean isEFDApplicable(`
`173`	`173`	`&& !isEFDLimitReached()`
`174`	`174`	`&& (isNew(test) \|\| isModified(testSource))`
`175`	`175`	`// endsWith matching is needed for JUnit4-based frameworks, where tags are classes`
`176`		`- && testTags.stream().noneMatch(t -> t.endsWith(CIConstants.Tags.SKIP_EFD_TAG));`
	`176`	`+ && testTags.stream().noneMatch(t -> t.endsWith(CIConstants.Tags.EFD_DISABLE_TAG));`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`public boolean isEFDLimitReached() {`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package org.example`
`3`	`3`	`import munit.FunSuite`
`4`	`4`
`5`	`5`	`class TestSucceedMUnitSkipEfd extends FunSuite {`
`6`		`- test("Calculator.add".tag(new munit.Tag("datadog_skip_efd"))) {`
	`6`	`+ test("Calculator.add".tag(new munit.Tag("datadog_efd_disable"))) {`
`7`	`7`	`assertEquals(1 + 2, 3)`
`8`	`8`	`}`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,11 +7,11 @@`
`7`	`7`
`8`	`8`	`public class TestSucceedSkipEfd {`
`9`	`9`
`10`		`- @Category(datadog_skip_efd.class)`
	`10`	`+ @Category(datadog_efd_disable.class)`
`11`	`11`	`@Test`
`12`	`12`	`public void test_succeed() {`
`13`	`13`	`assertTrue(true);`
`14`	`14`	`}`
`15`	`15`
`16`		`- public interface datadog_skip_efd {}`
	`16`	`+ public interface datadog_efd_disable {}`
`17`	`17`	`}`