Fix automatic coverage includes calculation for headless test sessions (

#7784)
DataDog · Oct 18, 2024 · 52cdab0 · 52cdab0
1 parent 6514628
commit 52cdab0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/...gent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilitySystem.java b/...gent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilitySystem.java
@@ -30,6 +30,7 @@
 import datadog.trace.civisibility.events.BuildEventsHandlerImpl;
 import datadog.trace.civisibility.events.TestEventsHandlerImpl;
 import datadog.trace.civisibility.ipc.SignalServer;
+import datadog.trace.civisibility.source.index.RepoIndex;
 import datadog.trace.civisibility.telemetry.CiVisibilityMetricCollectorImpl;
 import datadog.trace.civisibility.test.ExecutionStrategy;
 import datadog.trace.civisibility.utils.ConcurrentHashMapContextStore;
@@ -90,7 +91,8 @@ public static void start(Instrumentation inst, SharedCommunicationObjects sco) {
           // so if lines are explicitly enabled,
           // we rely on Jacoco instrumentation rather than on our own coverage mechanism
           !config.isCiVisibilityCoverageLinesEnabled()) {
-        Predicate<String> instrumentationFilter = createCoverageInstrumentationFilter(config);
+        Predicate<String> instrumentationFilter =
+            createCoverageInstrumentationFilter(services, repoServices);
         inst.addTransformer(new CoverageClassTransformer(instrumentationFilter));
       }
 
@@ -112,9 +114,15 @@ private static Path getCurrentPath() {
     }
   }
 
-  private static Predicate<String> createCoverageInstrumentationFilter(Config config) {
-    String[] includedPackages = config.getCiVisibilityCodeCoverageIncludedPackages();
-    String[] excludedPackages = config.getCiVisibilityCodeCoverageExcludedPackages();
+  private static Predicate<String> createCoverageInstrumentationFilter(
+      CiVisibilityServices services, CiVisibilityRepoServices repoServices) {
+    String[] includedPackages = services.config.getCiVisibilityCodeCoverageIncludedPackages();
+    if (includedPackages.length == 0 && services.processHierarchy.isHeadless()) {
+      RepoIndex repoIndex = repoServices.repoIndexProvider.getIndex();
+      includedPackages =
+          Config.convertJacocoExclusionFormatToPackagePrefixes(repoIndex.getRootPackages());
+    }
+    String[] excludedPackages = services.config.getCiVisibilityCodeCoverageExcludedPackages();
     return new CoverageInstrumentationFilter(includedPackages, excludedPackages);
   }
 

diff --git a/internal-api/src/main/java/datadog/trace/api/Config.java b/internal-api/src/main/java/datadog/trace/api/Config.java
@@ -1773,7 +1773,7 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment())
    * my.package.*,my.other.package.*}) to list of package prefixes suitable for use with ASM ({@code
    * my/package/,my/other/package/})
    */
-  private static String[] convertJacocoExclusionFormatToPackagePrefixes(List<String> packages) {
+  public static String[] convertJacocoExclusionFormatToPackagePrefixes(List<String> packages) {
     return packages.stream()
         .map(s -> (s.endsWith("*") ? s.substring(0, s.length() - 1) : s).replace('.', '/'))
         .toArray(String[]::new);