add test management check to skip instrumentations

daniel-mohedano · daniel-mohedano · commit 8eb4cc13eb83 · 2025-02-12T15:04:27.000+01:00
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberSkipInstrumentation.java b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberSkipInstrumentation.java
@@ -34,7 +34,9 @@ public JUnit4CucumberSkipInstrumentation() {
 
   @Override
   public boolean isApplicable(Set<TargetSystem> enabledSystems) {
-    return super.isApplicable(enabledSystems) && Config.get().isCiVisibilityTestSkippingEnabled();
+    return super.isApplicable(enabledSystems)
+        && (Config.get().isCiVisibilityTestSkippingEnabled()
+            || Config.get().isCiVisibilityTestManagementEnabled());
   }
 
   @Override
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4SkipInstrumentation.java b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4SkipInstrumentation.java
@@ -36,7 +36,9 @@ public JUnit4SkipInstrumentation() {
 
   @Override
   public boolean isApplicable(Set<TargetSystem> enabledSystems) {
-    return super.isApplicable(enabledSystems) && Config.get().isCiVisibilityTestSkippingEnabled();
+    return super.isApplicable(enabledSystems)
+        && (Config.get().isCiVisibilityTestSkippingEnabled()
+            || Config.get().isCiVisibilityTestManagementEnabled());
   }
 
   @Override
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberSkipInstrumentation.java b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberSkipInstrumentation.java
@@ -38,7 +38,9 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
 
   @Override
   public boolean isApplicable(Set<TargetSystem> enabledSystems) {
-    return super.isApplicable(enabledSystems) && Config.get().isCiVisibilityTestSkippingEnabled();
+    return super.isApplicable(enabledSystems)
+        && (Config.get().isCiVisibilityTestSkippingEnabled()
+            || Config.get().isCiVisibilityTestManagementEnabled());
   }
 
   @Override
diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SpockSkipInstrumentation.java b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SpockSkipInstrumentation.java
@@ -38,7 +38,9 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
 
   @Override
   public boolean isApplicable(Set<TargetSystem> enabledSystems) {
-    return super.isApplicable(enabledSystems) && Config.get().isCiVisibilityTestSkippingEnabled();
+    return super.isApplicable(enabledSystems)
+        && (Config.get().isCiVisibilityTestSkippingEnabled()
+            || Config.get().isCiVisibilityTestManagementEnabled());
   }
 
   @Override
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SkipInstrumentation.java b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SkipInstrumentation.java
@@ -34,7 +34,9 @@ public JUnit5SkipInstrumentation() {
 
   @Override
   public boolean isApplicable(Set<TargetSystem> enabledSystems) {
-    return super.isApplicable(enabledSystems) && Config.get().isCiVisibilityTestSkippingEnabled();
+    return super.isApplicable(enabledSystems)
+        && (Config.get().isCiVisibilityTestSkippingEnabled()
+            || Config.get().isCiVisibilityTestManagementEnabled());
   }
 
   @Override
diff --git a/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateTracingHook.java b/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateTracingHook.java
@@ -114,7 +114,8 @@ public boolean beforeScenario(ScenarioRuntime sr) {
     String parameters = KarateUtils.getParameters(scenario);
     Collection<String> categories = scenario.getTagsEffective().getTagKeys();
 
-    if (Config.get().isCiVisibilityTestSkippingEnabled()) {
+    if (Config.get().isCiVisibilityTestSkippingEnabled()
+        || Config.get().isCiVisibilityTestManagementEnabled()) {
       TestIdentifier skippableTest = KarateUtils.toTestIdentifier(scenario);
       SkipReason skipReason = TestEventsHandlerHolder.TEST_EVENTS_HANDLER.skipReason(skippableTest);
 
diff --git a/dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestSkipInstrumentation.java b/dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestSkipInstrumentation.java
@@ -30,7 +30,9 @@ public ScalatestSkipInstrumentation() {
 
   @Override
   public boolean isApplicable(Set<TargetSystem> enabledSystems) {
-    return super.isApplicable(enabledSystems) && Config.get().isCiVisibilityTestSkippingEnabled();
+    return super.isApplicable(enabledSystems)
+        && (Config.get().isCiVisibilityTestSkippingEnabled()
+            || Config.get().isCiVisibilityTestManagementEnabled());
   }
 
   @Override
diff --git a/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestNGSkipInstrumentation.java b/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestNGSkipInstrumentation.java
@@ -27,7 +27,9 @@ public TestNGSkipInstrumentation() {
 
   @Override
   public boolean isApplicable(Set<TargetSystem> enabledSystems) {
-    return super.isApplicable(enabledSystems) && Config.get().isCiVisibilityTestSkippingEnabled();
+    return super.isApplicable(enabledSystems)
+        && (Config.get().isCiVisibilityTestSkippingEnabled()
+            || Config.get().isCiVisibilityTestManagementEnabled());
   }
 
   @Override

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,9 @@ public JUnit4CucumberSkipInstrumentation() {`
`34`	`34`
`35`	`35`	`@Override`
`36`	`36`	`public boolean isApplicable(Set<TargetSystem> enabledSystems) {`
`37`		`- return super.isApplicable(enabledSystems) && Config.get().isCiVisibilityTestSkippingEnabled();`
	`37`	`+ return super.isApplicable(enabledSystems)`
	`38`	`+ && (Config.get().isCiVisibilityTestSkippingEnabled()`
	`39`	`+ \|\| Config.get().isCiVisibilityTestManagementEnabled());`
`38`	`40`	`}`
`39`	`41`
`40`	`42`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,9 @@ public JUnit4SkipInstrumentation() {`
`36`	`36`
`37`	`37`	`@Override`
`38`	`38`	`public boolean isApplicable(Set<TargetSystem> enabledSystems) {`
`39`		`- return super.isApplicable(enabledSystems) && Config.get().isCiVisibilityTestSkippingEnabled();`
	`39`	`+ return super.isApplicable(enabledSystems)`
	`40`	`+ && (Config.get().isCiVisibilityTestSkippingEnabled()`
	`41`	`+ \|\| Config.get().isCiVisibilityTestManagementEnabled());`
`40`	`42`	`}`
`41`	`43`
`42`	`44`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,9 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {`
`38`	`38`
`39`	`39`	`@Override`
`40`	`40`	`public boolean isApplicable(Set<TargetSystem> enabledSystems) {`
`41`		`- return super.isApplicable(enabledSystems) && Config.get().isCiVisibilityTestSkippingEnabled();`
	`41`	`+ return super.isApplicable(enabledSystems)`
	`42`	`+ && (Config.get().isCiVisibilityTestSkippingEnabled()`
	`43`	`+ \|\| Config.get().isCiVisibilityTestManagementEnabled());`
`42`	`44`	`}`
`43`	`45`
`44`	`46`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,9 @@ public JUnit5SkipInstrumentation() {`
`34`	`34`
`35`	`35`	`@Override`
`36`	`36`	`public boolean isApplicable(Set<TargetSystem> enabledSystems) {`
`37`		`- return super.isApplicable(enabledSystems) && Config.get().isCiVisibilityTestSkippingEnabled();`
	`37`	`+ return super.isApplicable(enabledSystems)`
	`38`	`+ && (Config.get().isCiVisibilityTestSkippingEnabled()`
	`39`	`+ \|\| Config.get().isCiVisibilityTestManagementEnabled());`
`38`	`40`	`}`
`39`	`41`
`40`	`42`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,9 @@ public ScalatestSkipInstrumentation() {`
`30`	`30`
`31`	`31`	`@Override`
`32`	`32`	`public boolean isApplicable(Set<TargetSystem> enabledSystems) {`
`33`		`- return super.isApplicable(enabledSystems) && Config.get().isCiVisibilityTestSkippingEnabled();`
	`33`	`+ return super.isApplicable(enabledSystems)`
	`34`	`+ && (Config.get().isCiVisibilityTestSkippingEnabled()`
	`35`	`+ \|\| Config.get().isCiVisibilityTestManagementEnabled());`
`34`	`36`	`}`
`35`	`37`
`36`	`38`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,9 @@ public TestNGSkipInstrumentation() {`
`27`	`27`
`28`	`28`	`@Override`
`29`	`29`	`public boolean isApplicable(Set<TargetSystem> enabledSystems) {`
`30`		`- return super.isApplicable(enabledSystems) && Config.get().isCiVisibilityTestSkippingEnabled();`
	`30`	`+ return super.isApplicable(enabledSystems)`
	`31`	`+ && (Config.get().isCiVisibilityTestSkippingEnabled()`
	`32`	`+ \|\| Config.get().isCiVisibilityTestManagementEnabled());`
`31`	`33`	`}`
`32`	`34`
`33`	`35`	`@Override`