feat: synchronize on span propagation

Author: daniel-mohedano

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

@@ -30,6 +30,7 @@ public abstract class AbstractTestModule {
   protected final Codeowners codeowners;
   protected final LinesResolver linesResolver;
   private final Consumer<AgentSpan> onSpanFinish;
+  protected final Object tagPropagationLock = new Object();
 
   public AbstractTestModule(
       AgentSpanContext sessionSpanContext,

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

@@ -46,6 +46,7 @@ public abstract class AbstractTestSession {
   protected final SourcePathResolver sourcePathResolver;
   protected final Codeowners codeowners;
   protected final LinesResolver linesResolver;
+  protected final Object tagPropagationLock = new Object();
 
   public AbstractTestSession(
       String projectName,

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

@@ -56,6 +56,7 @@ public class TestSuiteImpl implements DDTestSuite {
   private final boolean parallelized;
   private final Collection<LibraryCapability> capabilities;
   private final Consumer<AgentSpan> onSpanFinish;
+  private final Object tagPropagationLock = new Object();
 
   public TestSuiteImpl(
       AgentSpanContext moduleSpanContext,
@@ -264,6 +265,6 @@ public TestImpl testStart(
         coverageStoreFactory,
         executionResults,
         capabilities,
-        SpanUtils.propagateCiVisibilityTagsTo(span));
+        SpanUtils.propagateStatusTo(span, tagPropagationLock));
   }
 }

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

@@ -289,7 +289,10 @@ private SignalResponse onModuleExecutionResultReceived(ModuleExecutionResult res
 
     testsSkipped.add(result.getTestsSkippedTotal());
 
-    SpanUtils.mergeTestFrameworks(span, result.getTestFrameworks());
+    synchronized (tagPropagationLock) {
+      // avoids desync between read and merging
+      SpanUtils.mergeTestFrameworks(span, result.getTestFrameworks());
+    }
 
     return AckResponse.INSTANCE;
   }

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

@@ -54,7 +54,6 @@ public class BuildSystemSessionImpl<T extends CoverageCalculator> extends Abstra
   private final CoverageCalculator.Factory<T> coverageCalculatorFactory;
   private final T coverageCalculator;
   private final BuildSessionSettings settings;
-  private final Object tagPropagationLock = new Object();
 
   public BuildSystemSessionImpl(
       String projectName,

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java

@@ -183,6 +183,6 @@ public TestSuiteImpl testSuiteStart(
         coverageStoreFactory,
         executionResults,
         capabilities,
-        SpanUtils.propagateCiVisibilityTagsTo(span));
+        SpanUtils.propagateCiVisibilityTagsTo(span, tagPropagationLock));
   }
 }

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestSession.java

@@ -82,22 +82,17 @@ public HeadlessTestModule testModuleStart(String moduleName, @Nullable Long star
         coverageStoreFactory,
         executionStrategy,
         capabilities,
-        this::propagateModuleTags);
-  }
-
-  private void propagateModuleTags(AgentSpan moduleSpan) {
-    SpanUtils.propagateCiVisibilityTags(span, moduleSpan);
-    SpanUtils.propagateTags(
-        span,
-        moduleSpan,
-        Tags.TEST_CODE_COVERAGE_ENABLED,
-        Tags.TEST_ITR_TESTS_SKIPPING_ENABLED,
-        Tags.TEST_ITR_TESTS_SKIPPING_TYPE,
-        Tags.TEST_ITR_TESTS_SKIPPING_COUNT,
-        Tags.TEST_EARLY_FLAKE_ENABLED,
-        Tags.TEST_EARLY_FLAKE_ABORT_REASON,
-        DDTags.CI_ITR_TESTS_SKIPPED,
-        Tags.TEST_TEST_MANAGEMENT_ENABLED);
+        SpanUtils.propagateCiVisibilityTagsTo(
+            span,
+            tagPropagationLock,
+            Tags.TEST_CODE_COVERAGE_ENABLED,
+            Tags.TEST_ITR_TESTS_SKIPPING_ENABLED,
+            Tags.TEST_ITR_TESTS_SKIPPING_TYPE,
+            Tags.TEST_ITR_TESTS_SKIPPING_COUNT,
+            Tags.TEST_EARLY_FLAKE_ENABLED,
+            Tags.TEST_EARLY_FLAKE_ABORT_REASON,
+            DDTags.CI_ITR_TESTS_SKIPPED,
+            Tags.TEST_TEST_MANAGEMENT_ENABLED));
   }
 
   @Override

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestModule.java

@@ -81,6 +81,6 @@ public TestSuiteImpl testSuiteStart(
         coverageStoreFactory,
         executionResults,
         Collections.emptyList(),
-        SpanUtils.propagateCiVisibilityTagsTo(span));
+        SpanUtils.propagateCiVisibilityTagsTo(span, tagPropagationLock));
   }
 }

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestSession.java

@@ -60,6 +60,6 @@ public ManualApiTestModule testModuleStart(String moduleName, @Nullable Long sta
         codeowners,
         linesResolver,
         coverageStoreFactory,
-        SpanUtils.propagateCiVisibilityTagsTo(span));
+        SpanUtils.propagateCiVisibilityTagsTo(span, tagPropagationLock));
   }
 }

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/SpanUtils.java

@@ -17,8 +17,23 @@
 public class SpanUtils {
   public static final Consumer<AgentSpan> DO_NOT_PROPAGATE_CI_VISIBILITY_TAGS = span -> {};
 
-  public static Consumer<AgentSpan> propagateCiVisibilityTagsTo(AgentSpan parentSpan) {
-    return childSpan -> propagateCiVisibilityTags(parentSpan, childSpan);
+  public static Consumer<AgentSpan> propagateCiVisibilityTagsTo(AgentSpan parentSpan, Object lock, String... additionalTags) {
+    return childSpan -> {
+      synchronized (lock) {
+        propagateCiVisibilityTags(parentSpan, childSpan);
+        if (additionalTags != null) {
+          propagateTags(parentSpan, childSpan, additionalTags);
+        }
+      }
+    };
+  }
+
+  public static Consumer<AgentSpan> propagateStatusTo(AgentSpan parentSpan, Object lock) {
+    return childSpan -> {
+      synchronized (lock) {
+        propagateStatus(parentSpan, childSpan);
+      }
+    };
   }
 
   public static void propagateCiVisibilityTags(AgentSpan parentSpan, AgentSpan childSpan) {