add container report

Author: ferenc-csaky

.circleci/config.yml

@@ -148,7 +148,7 @@ commands:
             if [ -f "$JACOCO_AGG" ]; then
               echo "=== Using aggregate JaCoCo report: $JACOCO_AGG ==="
               ls -lh "$JACOCO_AGG"
-              ./codecov upload-coverage $COMMON_ARGS --files "$JACOCO_AGG"
+              ./codecov upload-coverage $COMMON_ARGS --file "$JACOCO_AGG"
             else
               echo "=== No aggregate JaCoCo report found; skipping coverage upload ==="
               # Avoid uploading empty/partial reports (they can drag down overall coverage).
@@ -297,15 +297,19 @@ jobs:
           name: Auth ghcr
           command: echo "$GITHUB_TOKEN" | docker login ghcr.io -u "$GITHUB_USER" --password-stdin
       - run:
-          name: Build with Docker images (instrumented for coverage)
-          command: mvn -U clean -T1C -B install -DonlyImages -Pinstrument -Ddocker.image.tag=local-${CIRCLE_SHA1}
+          name: Build Docker images
+          command: mvn -U clean -T1C -B install -DonlyImages -Ddocker.image.tag=local-${CIRCLE_SHA1}
       - run:
           name: Run container tests using TestContainers
           command: |
             mvn -B install -DonlyContainerE2E \
               -pl :sqrl-testing-container \
+              -Dsqrl.container.coverage=true \
               -Ddocker.image.tag=local-${CIRCLE_SHA1} \
               -Dmcp.inspector.version=$MCP_TAG
+      - run:
+          name: Generate aggregate JaCoCo report
+          command: mvn -B -pl :sqrl-coverage -am -DskipTests -DskipITs verify
       - save-test-results
 
   deploy:

sqrl-testing/sqrl-coverage/pom.xml

@@ -70,6 +70,7 @@
               <dataFileIncludes>
                 <dataFileInclude>**/target/jacoco.exec</dataFileInclude>
                 <dataFileInclude>**/target/jacoco-it.exec</dataFileInclude>
+                <dataFileInclude>**/target/jacoco/jacoco-container.exec</dataFileInclude>
               </dataFileIncludes>
             </configuration>
           </execution>

sqrl-testing/sqrl-testing-container/src/test/java/com/datasqrl/container/testing/SqrlContainerTestBase.java

@@ -71,6 +71,8 @@ protected void commonTearDown() {
   protected static final String SQRL_CMD_IMAGE = "datasqrl/cmd";
   protected static final String SQRL_SERVER_IMAGE = "datasqrl/sqrl-server";
   protected static final String BUILD_DIR = "/build";
+  protected static final String JACOCO_OUT_DIR = "/jacoco";
+  protected static final String JACOCO_AGENT_PATH = "/jacoco-agent.jar";
   protected static final int HTTP_SERVER_PORT = 8888;
 
   protected static Network sharedNetwork;
@@ -115,6 +117,8 @@ protected GenericContainer<?> createCmdContainer(Path workingDir, boolean debug)
             .withFileSystemBind(workingDir.toString(), BUILD_DIR, BindMode.READ_WRITE)
             .withEnv("TZ", "America/Los_Angeles");
 
+    container = configureJacocoCoverage(container, "cmd");
+
     if (debug) {
       container = container.withEnv("SQRL_DEBUG", "1");
     }
@@ -127,14 +131,19 @@ protected GenericContainer<?> createServerContainer(Path workingDir) {
     var deployPlanPath = workingDir.resolve("build/deploy/plan");
     assertThat(deployPlanPath).exists().isDirectory();
 
-    return new GenericContainer<>(DockerImageName.parse(SQRL_SERVER_IMAGE + ":" + getImageTag()))
-        .withNetwork(sharedNetwork)
-        .withExposedPorts(HTTP_SERVER_PORT)
-        .withFileSystemBind(deployPlanPath.toString(), "/opt/sqrl/config", BindMode.READ_ONLY)
-        .withEnv("SQRL_DEBUG", "1")
-        .waitingFor(
-            Wait.forLogMessage(".*HTTP server listening on port 8888.*", 1)
-                .withStartupTimeout(Duration.ofSeconds(30)));
+    var container =
+        new GenericContainer<>(DockerImageName.parse(SQRL_SERVER_IMAGE + ":" + getImageTag()))
+            .withNetwork(sharedNetwork)
+            .withExposedPorts(HTTP_SERVER_PORT)
+            .withFileSystemBind(deployPlanPath.toString(), "/opt/sqrl/config", BindMode.READ_ONLY)
+            .withEnv("SQRL_DEBUG", "1")
+            .waitingFor(
+                Wait.forLogMessage(".*HTTP server listening on port 8888.*", 1)
+                    .withStartupTimeout(Duration.ofSeconds(30)));
+
+    container = configureJacocoCoverage(container, "server");
+
+    return container;
   }
 
   protected void compileSqrlProject(Path workingDir) {
@@ -290,6 +299,75 @@ private String getImageTag() {
     return System.getProperty("docker.image.tag", "local");
   }
 
+  @SneakyThrows
+  private GenericContainer<?> configureJacocoCoverage(GenericContainer<?> container, String component) {
+    if (!Boolean.parseBoolean(System.getProperty("sqrl.container.coverage", "false"))) {
+      return container;
+    }
+
+    var jacocoAgentJar = findJacocoAgentJar();
+    if (jacocoAgentJar == null) {
+      log.warn("Container coverage enabled but JaCoCo agent jar not found in ~/.m2; skipping");
+      return container;
+    }
+
+    var jacocoOutDir = Paths.get("target", "jacoco").toAbsolutePath();
+    var hostDestFile = jacocoOutDir.resolve("jacoco-container.exec");
+    Files.createDirectories(jacocoOutDir);
+
+    var containerDestFile = JACOCO_OUT_DIR + "/jacoco-container.exec";
+    var agentArg =
+        "-javaagent:"
+            + JACOCO_AGENT_PATH
+            + "=destfile="
+            + containerDestFile
+            + ",append=true,excludes=org/**";
+
+    var toolOptions = agentArg;
+
+    log.info(
+        "Enabling container JaCoCo for {}: agent={} destfile={}",
+        component,
+        jacocoAgentJar,
+        hostDestFile);
+
+    return container
+        .withFileSystemBind(jacocoOutDir.toString(), JACOCO_OUT_DIR, BindMode.READ_WRITE)
+        .withFileSystemBind(jacocoAgentJar.toString(), JACOCO_AGENT_PATH, BindMode.READ_ONLY)
+        .withEnv("JAVA_TOOL_OPTIONS", toolOptions);
+  }
+
+  @Nullable
+  private Path findJacocoAgentJar() {
+    var m2 = Paths.get(System.getProperty("user.home"), ".m2", "repository");
+    var jacocoDir = m2.resolve(Paths.get("org", "jacoco", "org.jacoco.agent"));
+    if (!Files.exists(jacocoDir)) {
+      return null;
+    }
+
+    try (var stream = Files.list(jacocoDir)) {
+      var versions =
+          stream
+              .filter(Files::isDirectory)
+              .map(p -> p.getFileName().toString())
+              .sorted()
+              .toList();
+      for (int i = versions.size() - 1; i >= 0; i--) {
+        var version = versions.get(i);
+        var candidate =
+            jacocoDir.resolve(
+                Paths.get(version, "org.jacoco.agent-" + version + "-runtime.jar"));
+        if (Files.exists(candidate)) {
+          return candidate;
+        }
+      }
+      return null;
+    } catch (Exception e) {
+      log.warn("Failed to locate JaCoCo agent jar under {}", jacocoDir, e);
+      return null;
+    }
+  }
+
   protected String getDockerRunCommand(GenericContainer<?> container, Path workingDir) {
     var sb = new StringBuilder();
     sb.append("docker run -it --rm");