WIP

Author: tokenrove

ci/nightly/coverage.py

@@ -44,7 +44,6 @@ def main() -> int:
             [
                 "--find",
                 composition,
-                "--coverage",
                 "down",
                 "-v",
             ]
@@ -56,21 +55,35 @@ def main() -> int:
             "rust-profdata",
             "merge",
             "-sparse",
-            *Path("test/sqllogictest/coverage").glob("sqllogictest*.profraw"),
+            *Path("test/sqllogictest/coverage").glob("*.profraw"),
             "-o",
             "sqllogictest.profdata",
         ]
     )
-    with open("coverage-sqllogictest.json", "w") as out:
+    with open("coverage-sqllogictest.lcov", "w") as out:
         subprocess.run(
             [
                 "rust-cov",
                 "export",
+                "--format=lcov",
                 "./target-xcompile/x86_64-unknown-linux-gnu/release/sqllogictest",
+                "./target-xcompile/x86_64-unknown-linux-gnu/release/clusterd",
                 "--instr-profile=sqllogictest.profdata",
             ],
             stdout=out,
         )
+    # XXX may need to do this with the volumes still around
+    with open("coverage-sqllogictest.html", "w") as out:
+        subprocess.run(
+            [
+                "rust-cov",
+                "show",
+                "--format=html",
+                "./target-xcompile/x86_64-unknown-linux-gnu/release/sqllogictest",
+                "--instr-profile=sqllogictest.profdata",
+            ],
+            stdout=out
+        )
 
     return 0
 

misc/python/materialize/mzcompose/__init__.py

@@ -195,6 +195,8 @@ def _munge_services(
                 # this only have an effect if the service runs instrumented Rust
                 # binaries.
                 config.setdefault("volumes", []).append(coverage_volume)
+                # XXX may need to change this per-binary, so perhaps
+                # we shouldn't set this here.
                 config.setdefault("environment", []).append(
                     f"LLVM_PROFILE_FILE=/coverage/{name}-%m.profraw"
                 )