fix: tests

Author: daniel-mohedano

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/BuildSystemModuleImpl.java

@@ -14,7 +14,6 @@
 import datadog.trace.api.config.CiVisibilityConfig;
 import datadog.trace.api.config.DebuggerConfig;
 import datadog.trace.api.config.GeneralConfig;
-import datadog.trace.api.config.RemoteConfigConfig;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext;
 import datadog.trace.bootstrap.instrumentation.api.Tags;

dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy

@@ -96,6 +96,7 @@ abstract class CiVisibilityInstrumentationTest extends AgentTestRunner {
     injectSysConfig(CiVisibilityConfig.TEST_MANAGEMENT_ENABLED, "true")
     injectSysConfig(CiVisibilityConfig.TEST_MANAGEMENT_ATTEMPT_TO_FIX_RETRIES, "5")
     injectSysConfig(CiVisibilityConfig.CIVISIBILITY_TEST_ORDER, CIConstants.FAIL_FAST_TEST_ORDER)
+    injectSysConfig(CiVisibilityConfig.TEST_FAILED_TEST_REPLAY_ENABLED, "true")
   }
 
   private static final class Settings {
@@ -112,6 +113,7 @@ abstract class CiVisibilityInstrumentationTest extends AgentTestRunner {
     private volatile boolean earlyFlakinessDetectionEnabled
     private volatile boolean impactedTestsDetectionEnabled
     private volatile boolean testManagementEnabled
+    private volatile boolean failedTestReplayEnabled
   }
 
   private final Settings settings = new Settings()
@@ -233,6 +235,7 @@ abstract class CiVisibilityInstrumentationTest extends AgentTestRunner {
       settings.itrEnabled,
       settings.flakyRetryEnabled,
       settings.impactedTestsDetectionEnabled,
+      settings.failedTestReplayEnabled,
       earlyFlakinessDetectionSettings,
       testManagementSettings,
       settings.itrEnabled ? "itrCorrelationId" : null,
@@ -346,6 +349,10 @@ abstract class CiVisibilityInstrumentationTest extends AgentTestRunner {
     settings.impactedTestsDetectionEnabled = impactedTestsDetectionEnabled
   }
 
+  def givenFailedTestReplayEnabled(boolean failedTestReplayEnabled) {
+    settings.failedTestReplayEnabled = failedTestReplayEnabled
+  }
+
   def assertSpansData(String testcaseName, Map<String, String> replacements = [:], List<String> ignoredTags = []) {
     Predicate<DDSpan> sessionSpan = span -> span.spanType == "test_session_end"
     spanFilter.waitForSpan(sessionSpan, TimeUnit.SECONDS.toMillis(20))

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/exception/DefaultExceptionDebugger.java

@@ -115,9 +115,9 @@ public void handleException(Throwable t, AgentSpan span) {
                 throwable.getStackTrace(), chainedExceptionIdx);
         if (creationResult.probesCreated > 0) {
           if (Config.get().isCiVisibilityFailedTestReplayEnabled()) {
-              // Assume Exception Replay is working under Failed Test Replay logic,
-              // instrumentation applied sync for immediate test retries
-             applyExceptionConfiguration(fingerprint);
+            // Assume Exception Replay is working under Failed Test Replay logic,
+            // instrumentation applied sync for immediate test retries
+            applyExceptionConfiguration(fingerprint);
           } else {
             AgentTaskScheduler.INSTANCE.execute(() -> applyExceptionConfiguration(fingerprint));
           }

dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/CucumberUtils.java

@@ -73,6 +73,7 @@ public static String getVersion() {
           LibraryCapability.TIA,
           LibraryCapability.ATR,
           LibraryCapability.EFD,
+          LibraryCapability.FTR,
           LibraryCapability.QUARANTINE,
           LibraryCapability.DISABLED,
           LibraryCapability.ATTEMPT_TO_FIX);

dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitUtils.java

@@ -27,6 +27,7 @@ public abstract class MUnitUtils {
           LibraryCapability.ATR,
           LibraryCapability.EFD,
           LibraryCapability.IMPACTED,
+          LibraryCapability.FTR,
           LibraryCapability.QUARANTINE,
           LibraryCapability.ATTEMPT_TO_FIX);
 

dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Utils.java

@@ -65,6 +65,7 @@ public abstract class JUnit4Utils {
           LibraryCapability.ATR,
           LibraryCapability.EFD,
           LibraryCapability.IMPACTED,
+          LibraryCapability.FTR,
           LibraryCapability.QUARANTINE,
           LibraryCapability.DISABLED,
           LibraryCapability.ATTEMPT_TO_FIX);

dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java

@@ -59,6 +59,7 @@ public abstract class JUnitPlatformUtils {
           LibraryCapability.ATR,
           LibraryCapability.EFD,
           LibraryCapability.IMPACTED,
+          LibraryCapability.FTR,
           LibraryCapability.QUARANTINE,
           LibraryCapability.DISABLED,
           LibraryCapability.ATTEMPT_TO_FIX);
@@ -69,6 +70,7 @@ public abstract class JUnitPlatformUtils {
           LibraryCapability.ATR,
           LibraryCapability.EFD,
           LibraryCapability.IMPACTED,
+          LibraryCapability.FTR,
           LibraryCapability.QUARANTINE,
           LibraryCapability.DISABLED,
           LibraryCapability.ATTEMPT_TO_FIX,
@@ -80,6 +82,7 @@ public abstract class JUnitPlatformUtils {
           LibraryCapability.ATR,
           LibraryCapability.EFD,
           LibraryCapability.IMPACTED,
+          LibraryCapability.FTR,
           LibraryCapability.QUARANTINE,
           LibraryCapability.DISABLED,
           LibraryCapability.ATTEMPT_TO_FIX);
@@ -89,6 +92,7 @@ public abstract class JUnitPlatformUtils {
           LibraryCapability.TIA,
           LibraryCapability.ATR,
           LibraryCapability.EFD,
+          LibraryCapability.FTR,
           LibraryCapability.QUARANTINE,
           LibraryCapability.DISABLED,
           LibraryCapability.ATTEMPT_TO_FIX);

dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateUtils.java

@@ -56,13 +56,15 @@ private KarateUtils() {}
       Arrays.asList(
           LibraryCapability.ATR,
           LibraryCapability.EFD,
+          LibraryCapability.FTR,
           LibraryCapability.QUARANTINE,
           LibraryCapability.ATTEMPT_TO_FIX);
 
   public static final List<LibraryCapability> CAPABILITIES_SKIPPING =
       Arrays.asList(
           LibraryCapability.ATR,
           LibraryCapability.EFD,
+          LibraryCapability.FTR,
           LibraryCapability.QUARANTINE,
           LibraryCapability.ATTEMPT_TO_FIX,
           LibraryCapability.TIA,

dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestUtils.java

@@ -24,6 +24,7 @@ public abstract class ScalatestUtils {
           LibraryCapability.EFD,
           LibraryCapability.ATR,
           LibraryCapability.IMPACTED,
+          LibraryCapability.FTR,
           LibraryCapability.QUARANTINE,
           LibraryCapability.DISABLED,
           LibraryCapability.ATTEMPT_TO_FIX);

dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestNGUtils.java

@@ -282,7 +282,10 @@ public static List<LibraryCapability> capabilities(String version) {
     List<LibraryCapability> baseCapabilities =
         new ArrayList<>(
             Arrays.asList(
-                LibraryCapability.TIA, LibraryCapability.IMPACTED, LibraryCapability.DISABLED));
+                LibraryCapability.TIA,
+                LibraryCapability.IMPACTED,
+                LibraryCapability.FTR,
+                LibraryCapability.DISABLED));
 
     boolean isEFDSupported = isEFDSupported(version);
     boolean isExceptionSuppressionSupported = isExceptionSuppressionSupported(version);