refactor test management overriding logic

Author: daniel-mohedano

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettingsFactoryImpl.java

@@ -178,20 +178,7 @@ private Map<String, ExecutionSettings> doCreate(
             CiVisibilitySettings::isKnownTestsEnabled,
             Config::isCiVisibilityKnownTestsRequestEnabled);
 
-    boolean testManagementEnabled =
-        isFeatureEnabled(
-            settings,
-            s -> s.getTestManagementSettings().isEnabled(),
-            Config::isCiVisibilityTestManagementEnabled);
-    TestManagementSettings testManagementSettings = TestManagementSettings.DEFAULT;
-    if (testManagementEnabled) {
-      testManagementSettings = settings.getTestManagementSettings();
-      if (isValueOverriden(Config::getCiVisibilityTestManagementAttemptToFixRetries, null)) {
-        testManagementSettings =
-            new TestManagementSettings(
-                true, config.getCiVisibilityTestManagementAttemptToFixRetries());
-      }
-    }
+    TestManagementSettings testManagementSettings = getTestManagementSettings(settings);
 
     LOGGER.info(
         "CI Visibility settings ({}, {}/{}/{}):\n"
@@ -214,7 +201,7 @@ private Map<String, ExecutionSettings> doCreate(
         impactedTestsEnabled,
         knownTestsRequest,
         flakyTestRetriesEnabled,
-        testManagementEnabled);
+        testManagementSettings.isEnabled());
 
     Future<SkippableTests> skippableTestsFuture =
         executor.submit(() -> getSkippableTests(tracerEnvironment, itrEnabled));
@@ -288,9 +275,24 @@ private boolean isFeatureEnabled(
     return remoteSetting.apply(ciVisibilitySettings) && killSwitch.apply(config);
   }
 
-  private boolean isValueOverriden(Function<Config, Integer> valueGetter, Integer defaultValue) {
-    Integer value = valueGetter.apply(config);
-    return !value.equals(defaultValue);
+  @Nonnull
+  private TestManagementSettings getTestManagementSettings(CiVisibilitySettings settings) {
+    boolean testManagementEnabled =
+        isFeatureEnabled(
+            settings,
+            s -> s.getTestManagementSettings().isEnabled(),
+            Config::isCiVisibilityTestManagementEnabled);
+
+    if (!testManagementEnabled) {
+      return TestManagementSettings.DEFAULT;
+    }
+
+    Integer retries = config.getCiVisibilityTestManagementAttemptToFixRetries();
+    if (retries != null) {
+      return new TestManagementSettings(true, retries);
+    }
+
+    return settings.getTestManagementSettings();
   }
 
   @Nonnull
@@ -325,7 +327,6 @@ private SkippableTests getSkippableTests(
       Thread.currentThread().interrupt();
       LOGGER.error("Interrupted while waiting for git data upload", e);
       return SkippableTests.EMPTY;
-
     } catch (Exception e) {
       LOGGER.error("Could not obtain list of skippable tests, will proceed without skipping", e);
       return SkippableTests.EMPTY;

internal-api/src/main/java/datadog/trace/api/Config.java

@@ -2990,7 +2990,7 @@ public boolean isCiVisibilityTestManagementEnabled() {
     return ciVisibilityTestManagementEnabled;
   }
 
-  public int getCiVisibilityTestManagementAttemptToFixRetries() {
+  public Integer getCiVisibilityTestManagementAttemptToFixRetries() {
     return ciVisibilityTestManagementAttemptToFixRetries;
   }