WIP dune_stat: tracing helpers

Signed-off-by: Ali Caglayan <[email protected]>

Author: Alizter

src/dune_engine/sandbox.ml

@@ -183,9 +183,9 @@ let snapshot t =
 let create ~mode ~dune_stats ~rule_loc ~dirs ~deps ~rule_dir ~rule_digest =
   let event =
     Dune_stats.start dune_stats (fun () ->
-      let cat = Some [ "create-sandbox" ] in
+      let cat = [ "create-sandbox" ] in
       let name = Loc.to_file_colon_line rule_loc in
-      let args = None in
+      let args = [] in
       { cat; name; args })
   in
   init ();

src/dune_pkg/archive_driver.ml

@@ -72,17 +72,15 @@ let choose_for_filename_default_to_tar filename =
 ;;
 
 let extract t ~archive ~target =
-  let event =
-    Dune_stats.(
-      start (global ()) (fun () ->
-        { cat = Some [ "fetch" ]
-        ; name = "extract"
-        ; args =
-            Some
-              [ "archive", `String (Path.to_string archive)
-              ; "target", `String (Path.to_string target)
-              ]
-        }))
+  let open Dune_stats.Fiber.O in
+  let& () =
+    { Dune_stats.name = "extract"
+    ; cat = [ "fetch" ]
+    ; args =
+        [ "archive", `String (Path.to_string archive)
+        ; "target", `String (Path.to_string target)
+        ]
+    }
   in
   let* () = Fiber.return () in
   let command = Lazy.force t.command in
@@ -95,7 +93,6 @@ let extract t ~archive ~target =
   Fiber.finalize ~finally:(fun () ->
     Temp.destroy Dir target_in_temp;
     Temp.destroy File temp_stderr_path;
-    Dune_stats.finish event;
     Fiber.return ())
   @@ fun () ->
   Path.mkdir_p target_in_temp;

src/dune_pkg/fetch.ml

@@ -253,19 +253,17 @@ let fetch ~unpack ~checksum ~target ~url:(url_loc, url) =
   let event =
     Dune_stats.(
       start (global ()) (fun () ->
-        { cat = Some [ "fetch" ]
+        { cat = [ "fetch" ]
         ; name = label
         ; args =
-            (let args =
-               [ "url", `String (OpamUrl.to_string url)
-               ; "target", `String (Path.to_string target)
-               ]
-             in
-             Some
-               (match checksum with
-                | None -> args
-                | Some checksum ->
-                  ("checksum", `String (Checksum.to_string checksum)) :: args))
+            List.concat
+              [ Option.map checksum ~f:(fun checksum ->
+                  "checksum", `String (Checksum.to_string checksum))
+                |> Option.to_list
+              ; [ "url", `String (OpamUrl.to_string url)
+                ; "target", `String (Path.to_string target)
+                ]
+              ]
         }))
   in
   let unsupported_backend s =

src/dune_pkg/lock_dir.ml

@@ -1460,13 +1460,12 @@ module Write_disk = struct
     let event =
       Dune_stats.(
         start (global ()) (fun () ->
-          { cat = Some [ "lock_dir" ]
+          { cat = [ "lock_dir" ]
           ; name = "write_lock_dir"
           ; args =
-              Some
-                [ "lock_dir", `String (Path.to_string lock_dir_path_external)
-                ; "package_count", `Int (Package_name.Map.cardinal files)
-                ]
+              [ "lock_dir", `String (Path.to_string lock_dir_path_external)
+              ; "package_count", `Int (Package_name.Map.cardinal files)
+              ]
           }))
     in
     let lock_dir_hidden =
@@ -1725,17 +1724,14 @@ module Load_immediate = Make_load (struct
 let read_disk = Load_immediate.load
 
 let read_disk_exn path =
-  let event =
-    Dune_stats.(
-      start (global ()) (fun () ->
-        { cat = Some [ "lock_dir" ]
-        ; name = "load_lock_dir"
-        ; args = Some [ "lock_dir", `String (Path.to_string path) ]
-        }))
+  let open Dune_stats.O in
+  let& () =
+    { Dune_stats.name = "load_lock_dir"
+    ; cat = [ "lock_dir" ]
+    ; args = [ "lock_dir", `String (Path.to_string path) ]
+    }
   in
-  let result = Load_immediate.load_exn path in
-  Dune_stats.finish event;
-  result
+  Load_immediate.load_exn path
 ;;
 
 let transitive_dependency_closure t ~platform start =

src/dune_pkg/opam_repo.ml

@@ -243,13 +243,12 @@ let all_packages_versions_map ts opam_package_name =
 ;;
 
 let load_all_versions_by_keys ts =
-  let event =
-    Dune_stats.(
-      start (global ()) (fun () ->
-        { cat = Some [ "opam_repo" ]
-        ; name = "load_all_versions_by_keys"
-        ; args = Some [ "version_count", `Int (OpamPackage.Version.Map.cardinal ts) ]
-        }))
+  let open Dune_stats.Fiber.O in
+  let& () =
+    { Dune_stats.name = "load_all_versions_by_keys"
+    ; cat = [ "opam_repo" ]
+    ; args = [ "version_count", `Int (OpamPackage.Version.Map.cardinal ts) ]
+    }
   in
   let from_git, from_dirs =
     OpamPackage.Version.Map.values ts
@@ -278,7 +277,6 @@ let load_all_versions_by_keys ts =
       List.map2 resolved_packages packages ~f:(fun resolved_package (_, pkg, _, _) ->
         pkg, resolved_package)
   in
-  Dune_stats.finish event;
   from_dirs @ from_git
   |> List.rev_map ~f:(fun (opam_package, resolved_package) ->
     OpamPackage.version opam_package, resolved_package)