update RunNTimes logic for success on all retries

Author: daniel-mohedano

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/Regular.java

@@ -2,7 +2,7 @@
 
 import datadog.trace.api.civisibility.execution.TestExecutionPolicy;
 import datadog.trace.api.civisibility.telemetry.tag.RetryReason;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
 
 /** Regular test case execution with no alterations. */
 public class Regular implements TestExecutionPolicy {

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/RetryUntilSuccessful.java

@@ -3,7 +3,7 @@
 import datadog.trace.api.civisibility.execution.TestExecutionPolicy;
 import datadog.trace.api.civisibility.telemetry.tag.RetryReason;
 import java.util.concurrent.atomic.AtomicInteger;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
 
 /** Retries a test case if it failed, up to a maximum number of times. */
 public class RetryUntilSuccessful implements TestExecutionPolicy {

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/RunNTimes.java

@@ -4,15 +4,16 @@
 import datadog.trace.api.civisibility.telemetry.tag.RetryReason;
 import datadog.trace.civisibility.config.ExecutionsByDuration;
 import java.util.List;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
 
 /** Runs a test case N times (N depends on test duration) regardless of success or failure. */
 public class RunNTimes implements TestExecutionPolicy {
 
   private final boolean suppressFailures;
-  private int executions;
   private final List<ExecutionsByDuration> executionsByDuration;
+  private int executions;
   private int maxExecutions;
+  private int totalExecutionsSeen;
   private int successfulExecutionsSeen;
   private final RetryReason retryReason;
 
@@ -21,9 +22,11 @@ public RunNTimes(
       boolean suppressFailures,
       RetryReason retryReason) {
     this.suppressFailures = suppressFailures;
-    this.executions = 0;
     this.executionsByDuration = executionsByDuration;
+    this.executions = 0;
     this.maxExecutions = getExecutions(0);
+    this.totalExecutionsSeen = 0;
+    this.successfulExecutionsSeen = 0;
     this.retryReason = retryReason;
   }
 
@@ -52,6 +55,7 @@ private int getExecutions(long durationMillis) {
 
   @Override
   public boolean retry(boolean successful, long durationMillis) {
+    ++totalExecutionsSeen;
     if (successful) {
       ++successfulExecutionsSeen;
     }
@@ -77,6 +81,6 @@ public boolean hasFailedAllRetries() {
 
   @Override
   public boolean hasSucceededAllRetries() {
-    return currentExecutionIsLast() && successfulExecutionsSeen == maxExecutions - 1;
+    return currentExecutionIsLast() && successfulExecutionsSeen == totalExecutionsSeen;
   }
 }

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/RunOnceIgnoreOutcome.java

@@ -2,7 +2,7 @@
 
 import datadog.trace.api.civisibility.execution.TestExecutionPolicy;
 import datadog.trace.api.civisibility.telemetry.tag.RetryReason;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * Runs a test case once. If it fails - suppresses the failure so that the build status is not