Add capabilities tagging

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

@@ -7,6 +7,7 @@
 import datadog.trace.api.civisibility.DDTest;
 import datadog.trace.api.civisibility.DDTestSuite;
 import datadog.trace.api.civisibility.InstrumentationBridge;
+import datadog.trace.api.civisibility.config.LibraryCapability;
 import datadog.trace.api.civisibility.coverage.CoveragePerTestBridge;
 import datadog.trace.api.civisibility.events.BuildEventsHandler;
 import datadog.trace.api.civisibility.events.TestEventsHandler;
@@ -39,6 +40,7 @@
 import java.lang.instrument.Instrumentation;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Collection;
 import java.util.function.Predicate;
 import javax.annotation.Nullable;
 import org.slf4j.Logger;
@@ -167,9 +169,11 @@ private TestEventsHandlerFactory(
     public <SuiteKey, TestKey> TestEventsHandler<SuiteKey, TestKey> create(
         String component,
         @Nullable ContextStore<SuiteKey, DDTestSuite> suiteStore,
-        @Nullable ContextStore<TestKey, DDTest> testStore) {
+        @Nullable ContextStore<TestKey, DDTest> testStore,
+        Collection<LibraryCapability> availableCapabilities) {
       TestFrameworkSession testSession =
-          sessionFactory.startSession(repoServices.moduleName, component, null);
+          sessionFactory.startSession(
+              repoServices.moduleName, component, null, availableCapabilities);
       TestFrameworkModule testModule = testSession.testModuleStart(repoServices.moduleName, null);
       return new TestEventsHandlerImpl<>(
           services.metricCollector,
@@ -231,7 +235,10 @@ private static TestFrameworkSession.Factory childTestFrameworkSessionFactory(
       CiVisibilityRepoServices repoServices,
       CiVisibilityCoverageServices.Child coverageServices,
       ExecutionSettings executionSettings) {
-    return (String projectName, String component, Long startTime) -> {
+    return (String projectName,
+        String component,
+        Long startTime,
+        Collection<LibraryCapability> availableCapabilities) -> {
       String sessionName = services.config.getCiVisibilitySessionName();
       String testCommand = services.config.getCiVisibilityTestCommand();
       TestDecorator testDecorator =
@@ -255,7 +262,8 @@ private static TestFrameworkSession.Factory childTestFrameworkSessionFactory(
           coverageServices.coverageStoreFactory,
           coverageServices.coverageReporter,
           services.signalClientFactory,
-          executionStrategy);
+          executionStrategy,
+          availableCapabilities);
     };
   }
 
@@ -264,7 +272,10 @@ private static TestFrameworkSession.Factory headlessTestFrameworkSessionFactory(
       CiVisibilityRepoServices repoServices,
       CiVisibilityCoverageServices.Child coverageServices,
       ExecutionSettings executionSettings) {
-    return (String projectName, String component, Long startTime) -> {
+    return (String projectName,
+        String component,
+        Long startTime,
+        Collection<LibraryCapability> availableCapabilities) -> {
       repoServices.gitDataUploader.startOrObserveGitDataUpload();
 
       String sessionName = services.config.getCiVisibilitySessionName();
@@ -288,7 +299,8 @@ private static TestFrameworkSession.Factory headlessTestFrameworkSessionFactory(
           repoServices.codeowners,
           services.linesResolver,
           coverageServices.coverageStoreFactory,
-          executionStrategy);
+          executionStrategy,
+          availableCapabilities);
     };
   }
 

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

@@ -0,0 +1,35 @@
+package datadog.trace.civisibility.config;
+
+import datadog.trace.api.DDTags;
+import datadog.trace.api.civisibility.config.LibraryCapability;
+import java.util.Collection;
+import java.util.EnumMap;
+import java.util.HashMap;
+import java.util.Map;
+
+public abstract class LibraryCapabilityUtils {
+
+  public static final Map<LibraryCapability, String> CAPABILITY_TAG_MAP = capabilitiesTagMap();
+
+  private static Map<LibraryCapability, String> capabilitiesTagMap() {
+    Map<LibraryCapability, String> capabilitiesTags = new EnumMap<>(LibraryCapability.class);
+    capabilitiesTags.put(LibraryCapability.TIA, DDTags.LIBRARY_CAPABILITIES_TIA);
+    capabilitiesTags.put(LibraryCapability.EFD, DDTags.LIBRARY_CAPABILITIES_EFD);
+    capabilitiesTags.put(LibraryCapability.ATR, DDTags.LIBRARY_CAPABILITIES_ATR);
+    capabilitiesTags.put(LibraryCapability.IMPACTED, DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS);
+    capabilitiesTags.put(
+        LibraryCapability.FAIL_FAST, DDTags.LIBRARY_CAPABILITIES_FAIL_FAST_TEST_ORDER);
+    capabilitiesTags.put(LibraryCapability.QUARANTINE, DDTags.LIBRARY_CAPABILITIES_QUARANTINE);
+    capabilitiesTags.put(LibraryCapability.DISABLED, DDTags.LIBRARY_CAPABILITIES_DISABLED);
+    capabilitiesTags.put(
+        LibraryCapability.ATTEMPT_TO_FIX, DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX);
+    return capabilitiesTags;
+  }
+
+  public static Map<LibraryCapability, Boolean> filterCapabilities(
+      Collection<LibraryCapability> available, Map<LibraryCapability, Boolean> capabilitiesStatus) {
+    Map<LibraryCapability, Boolean> capabilities = new HashMap<>(capabilitiesStatus);
+    capabilities.keySet().retainAll(available);
+    return capabilities;
+  }
+}

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

@@ -1,5 +1,7 @@
 package datadog.trace.civisibility.domain;
 
+import datadog.trace.api.civisibility.config.LibraryCapability;
+import java.util.Collection;
 import javax.annotation.Nullable;
 
 /** Test session abstraction that is used by test framework instrumentations (e.g. JUnit, TestNG) */
@@ -9,6 +11,10 @@ public interface TestFrameworkSession {
   TestFrameworkModule testModuleStart(String moduleName, @Nullable Long startTime);
 
   interface Factory {
-    TestFrameworkSession startSession(String projectName, String component, Long startTime);
+    TestFrameworkSession startSession(
+        String projectName,
+        String component,
+        Long startTime,
+        Collection<LibraryCapability> availableCapabilities);
   }
 }

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

@@ -9,6 +9,7 @@
 import datadog.trace.api.civisibility.CIConstants;
 import datadog.trace.api.civisibility.DDTest;
 import datadog.trace.api.civisibility.InstrumentationTestBridge;
+import datadog.trace.api.civisibility.config.LibraryCapability;
 import datadog.trace.api.civisibility.config.TestIdentifier;
 import datadog.trace.api.civisibility.coverage.CoveragePerTestBridge;
 import datadog.trace.api.civisibility.coverage.CoverageStore;
@@ -37,6 +38,7 @@
 import datadog.trace.bootstrap.instrumentation.api.TagContext;
 import datadog.trace.bootstrap.instrumentation.api.Tags;
 import datadog.trace.civisibility.codeowners.Codeowners;
+import datadog.trace.civisibility.config.LibraryCapabilityUtils;
 import datadog.trace.civisibility.decorator.TestDecorator;
 import datadog.trace.civisibility.source.LinesResolver;
 import datadog.trace.civisibility.source.SourcePathResolver;
@@ -45,6 +47,7 @@
 import java.lang.reflect.Method;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Map;
 import java.util.function.Consumer;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -86,6 +89,7 @@ public TestImpl(
       Codeowners codeowners,
       CoverageStore.Factory coverageStoreFactory,
       ExecutionResults executionResults,
+      Map<LibraryCapability, Boolean> libraryCapabilities,
       Consumer<AgentSpan> onSpanFinish) {
     this.instrumentation = instrumentation;
     this.metricCollector = metricCollector;
@@ -144,6 +148,11 @@ public TestImpl(
       span.setTag(Tags.ITR_CORRELATION_ID, itrCorrelationId);
     }
 
+    for (Map.Entry<LibraryCapability, Boolean> entry : libraryCapabilities.entrySet()) {
+      String capabilityTag = LibraryCapabilityUtils.CAPABILITY_TAG_MAP.get(entry.getKey());
+      span.setTag(capabilityTag, entry.getValue());
+    }
+
     testDecorator.afterStart(span);
 
     metricCollector.add(CiVisibilityCountMetric.EVENT_CREATED, 1, instrumentation, EventType.TEST);

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

@@ -6,6 +6,7 @@
 
 import datadog.trace.api.Config;
 import datadog.trace.api.civisibility.DDTestSuite;
+import datadog.trace.api.civisibility.config.LibraryCapability;
 import datadog.trace.api.civisibility.coverage.CoverageStore;
 import datadog.trace.api.civisibility.telemetry.CiVisibilityCountMetric;
 import datadog.trace.api.civisibility.telemetry.CiVisibilityMetricCollector;
@@ -26,6 +27,7 @@
 import datadog.trace.civisibility.utils.SpanUtils;
 import java.lang.reflect.Method;
 import java.util.Collection;
+import java.util.Map;
 import java.util.function.Consumer;
 import javax.annotation.Nullable;
 import org.slf4j.Logger;
@@ -52,6 +54,7 @@ public class TestSuiteImpl implements DDTestSuite {
   private final CoverageStore.Factory coverageStoreFactory;
   private final ExecutionResults executionResults;
   private final boolean parallelized;
+  private final Map<LibraryCapability, Boolean> libraryCapabilities;
   private final Consumer<AgentSpan> onSpanFinish;
 
   public TestSuiteImpl(
@@ -72,6 +75,7 @@ public TestSuiteImpl(
       LinesResolver linesResolver,
       CoverageStore.Factory coverageStoreFactory,
       ExecutionResults executionResults,
+      Map<LibraryCapability, Boolean> libraryCapabilities,
       Consumer<AgentSpan> onSpanFinish) {
     this.moduleSpanContext = moduleSpanContext;
     this.moduleName = moduleName;
@@ -88,6 +92,7 @@ public TestSuiteImpl(
     this.linesResolver = linesResolver;
     this.coverageStoreFactory = coverageStoreFactory;
     this.executionResults = executionResults;
+    this.libraryCapabilities = libraryCapabilities;
     this.onSpanFinish = onSpanFinish;
 
     AgentTracer.SpanBuilder spanBuilder =
@@ -259,6 +264,12 @@ public TestImpl testStart(
         codeowners,
         coverageStoreFactory,
         executionResults,
-        SpanUtils.propagateCiVisibilityTagsTo(span));
+        libraryCapabilities,
+        this::propagateTestTags);
+  }
+
+  private void propagateTestTags(AgentSpan testSpan) {
+    SpanUtils.propagateCiVisibilityTags(span, testSpan);
+    SpanUtils.propagateLibraryCapabilities(span, testSpan);
   }
 }

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

@@ -2,6 +2,7 @@
 
 import datadog.trace.api.Config;
 import datadog.trace.api.DDTraceId;
+import datadog.trace.api.civisibility.config.LibraryCapability;
 import datadog.trace.api.civisibility.config.TestIdentifier;
 import datadog.trace.api.civisibility.config.TestSourceData;
 import datadog.trace.api.civisibility.coverage.CoverageStore;
@@ -30,6 +31,7 @@
 import datadog.trace.civisibility.test.ExecutionResults;
 import datadog.trace.civisibility.test.ExecutionStrategy;
 import java.util.Collection;
+import java.util.Map;
 import java.util.TreeSet;
 import java.util.concurrent.ConcurrentHashMap;
 import javax.annotation.Nonnull;
@@ -60,6 +62,7 @@ public class ProxyTestModule implements TestFrameworkModule {
   private final LinesResolver linesResolver;
   private final CoverageStore.Factory coverageStoreFactory;
   private final Collection<TestFramework> testFrameworks = ConcurrentHashMap.newKeySet();
+  private final Map<LibraryCapability, Boolean> libraryCapabilities;
 
   public ProxyTestModule(
       AgentSpanContext parentProcessModuleContext,
@@ -73,7 +76,8 @@ public ProxyTestModule(
       LinesResolver linesResolver,
       CoverageStore.Factory coverageStoreFactory,
       ChildProcessCoverageReporter childProcessCoverageReporter,
-      SignalClient.Factory signalClientFactory) {
+      SignalClient.Factory signalClientFactory,
+      Map<LibraryCapability, Boolean> libraryCapabilities) {
     this.parentProcessModuleContext = parentProcessModuleContext;
     this.moduleName = moduleName;
     this.executionStrategy = executionStrategy;
@@ -87,6 +91,7 @@ public ProxyTestModule(
     this.codeowners = codeowners;
     this.linesResolver = linesResolver;
     this.coverageStoreFactory = coverageStoreFactory;
+    this.libraryCapabilities = libraryCapabilities;
   }
 
   @Override
@@ -210,6 +215,7 @@ public TestSuiteImpl testSuiteStart(
         linesResolver,
         coverageStoreFactory,
         executionResults,
+        libraryCapabilities,
         this::propagateTestFrameworkData);
   }
 

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

@@ -1,11 +1,13 @@
 package datadog.trace.civisibility.domain.buildsystem;
 
 import datadog.trace.api.Config;
+import datadog.trace.api.civisibility.config.LibraryCapability;
 import datadog.trace.api.civisibility.coverage.CoverageStore;
 import datadog.trace.api.civisibility.telemetry.CiVisibilityMetricCollector;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext;
 import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
 import datadog.trace.civisibility.codeowners.Codeowners;
+import datadog.trace.civisibility.config.LibraryCapabilityUtils;
 import datadog.trace.civisibility.coverage.percentage.child.ChildProcessCoverageReporter;
 import datadog.trace.civisibility.decorator.TestDecorator;
 import datadog.trace.civisibility.domain.TestFrameworkModule;
@@ -14,6 +16,8 @@
 import datadog.trace.civisibility.source.LinesResolver;
 import datadog.trace.civisibility.source.SourcePathResolver;
 import datadog.trace.civisibility.test.ExecutionStrategy;
+import java.util.Collection;
+import java.util.Map;
 import javax.annotation.Nullable;
 
 /**
@@ -34,6 +38,7 @@ public class ProxyTestSession implements TestFrameworkSession {
   private final ChildProcessCoverageReporter childProcessCoverageReporter;
   private final SignalClient.Factory signalClientFactory;
   private final ExecutionStrategy executionStrategy;
+  private final Map<LibraryCapability, Boolean> libraryCapabilities;
 
   public ProxyTestSession(
       AgentSpanContext parentProcessModuleContext,
@@ -46,7 +51,8 @@ public ProxyTestSession(
       CoverageStore.Factory coverageStoreFactory,
       ChildProcessCoverageReporter childProcessCoverageReporter,
       SignalClient.Factory signalClientFactory,
-      ExecutionStrategy executionStrategy) {
+      ExecutionStrategy executionStrategy,
+      Collection<LibraryCapability> availableCapabilities) {
     this.parentProcessModuleContext = parentProcessModuleContext;
     this.config = config;
     this.metricCollector = metricCollector;
@@ -58,6 +64,9 @@ public ProxyTestSession(
     this.childProcessCoverageReporter = childProcessCoverageReporter;
     this.signalClientFactory = signalClientFactory;
     this.executionStrategy = executionStrategy;
+    this.libraryCapabilities =
+        LibraryCapabilityUtils.filterCapabilities(
+            availableCapabilities, executionStrategy.getCapabilitiesStatus());
   }
 
   @Override
@@ -82,6 +91,7 @@ public TestFrameworkModule testModuleStart(String moduleName, @Nullable Long sta
         linesResolver,
         coverageStoreFactory,
         childProcessCoverageReporter,
-        signalClientFactory);
+        signalClientFactory,
+        libraryCapabilities);
   }
 }

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

@@ -3,6 +3,7 @@
 import datadog.trace.api.Config;
 import datadog.trace.api.DDTags;
 import datadog.trace.api.civisibility.CIConstants;
+import datadog.trace.api.civisibility.config.LibraryCapability;
 import datadog.trace.api.civisibility.config.TestIdentifier;
 import datadog.trace.api.civisibility.config.TestSourceData;
 import datadog.trace.api.civisibility.coverage.CoverageStore;
@@ -27,6 +28,7 @@
 import datadog.trace.civisibility.test.ExecutionResults;
 import datadog.trace.civisibility.test.ExecutionStrategy;
 import datadog.trace.civisibility.utils.SpanUtils;
+import java.util.Map;
 import java.util.function.Consumer;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -43,6 +45,7 @@ public class HeadlessTestModule extends AbstractTestModule implements TestFramew
   private final CoverageStore.Factory coverageStoreFactory;
   private final ExecutionStrategy executionStrategy;
   private final ExecutionResults executionResults;
+  private final Map<LibraryCapability, Boolean> libraryCapabilities;
 
   public HeadlessTestModule(
       AgentSpanContext sessionSpanContext,
@@ -56,6 +59,7 @@ public HeadlessTestModule(
       LinesResolver linesResolver,
       CoverageStore.Factory coverageStoreFactory,
       ExecutionStrategy executionStrategy,
+      Map<LibraryCapability, Boolean> libraryCapabilities,
       Consumer<AgentSpan> onSpanFinish) {
     super(
         sessionSpanContext,
@@ -72,6 +76,7 @@ public HeadlessTestModule(
     this.coverageStoreFactory = coverageStoreFactory;
     this.executionStrategy = executionStrategy;
     this.executionResults = new ExecutionResults();
+    this.libraryCapabilities = libraryCapabilities;
   }
 
   @Override
@@ -181,6 +186,12 @@ public TestSuiteImpl testSuiteStart(
         linesResolver,
         coverageStoreFactory,
         executionResults,
-        SpanUtils.propagateCiVisibilityTagsTo(span));
+        libraryCapabilities,
+        this::propagateSuiteTags);
+  }
+
+  private void propagateSuiteTags(AgentSpan suiteSpan) {
+    SpanUtils.propagateCiVisibilityTags(span, suiteSpan);
+    SpanUtils.propagateLibraryCapabilities(span, suiteSpan);
   }
 }