Skip to content

Commit da89573

Browse files
authored
dune_trace: Dune trace abstract event (#12864)
* refactor(trace): make event module abstract Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
1 parent 6e204e5 commit da89573

File tree

4 files changed

+16
-12
lines changed

4 files changed

+16
-12
lines changed

src/dune_engine/sandbox.ml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,7 @@ let create ~mode ~dune_stats ~rule_loc ~dirs ~deps ~rule_dir ~rule_digest =
185185
Dune_trace.start dune_stats (fun () ->
186186
let cat = Some [ "create-sandbox" ] in
187187
let name = Loc.to_file_colon_line rule_loc in
188-
let args = None in
189-
{ cat; name; args })
188+
Dune_trace.Event.data ~cat ~name ~args:None)
190189
in
191190
init ();
192191
let sandbox_dir =

src/dune_pkg/fetch.ml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -253,9 +253,10 @@ let fetch ~unpack ~checksum ~target ~url:(url_loc, url) =
253253
let event =
254254
Dune_trace.(
255255
start (global ()) (fun () ->
256-
{ cat = None
257-
; name = label
258-
; args =
256+
Dune_trace.Event.data
257+
~cat:None
258+
~name:label
259+
~args:
259260
(let args =
260261
[ "url", `String (OpamUrl.to_string url)
261262
; "target", `String (Path.to_string target)
@@ -265,8 +266,7 @@ let fetch ~unpack ~checksum ~target ~url:(url_loc, url) =
265266
(match checksum with
266267
| None -> args
267268
| Some checksum ->
268-
("checksum", `String (Checksum.to_string checksum)) :: args))
269-
}))
269+
("checksum", `String (Checksum.to_string checksum)) :: args))))
270270
in
271271
let unsupported_backend s =
272272
User_error.raise ~loc:url_loc [ Pp.textf "Unsupported backend: %s" s ]

src/dune_trace/dune_trace.ml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ module Event = struct
9595
; event_data : data
9696
; start : float
9797
}
98+
99+
let data ~args ~cat ~name = { args; cat; name }
98100
end
99101

100102
let start t k : Event.t option =

src/dune_trace/dune_trace.mli

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
type t
22

33
module Json : sig
4+
type t = Chrome_trace.Json.t
5+
46
val to_string : Chrome_trace.Json.t -> string
57
end
68

@@ -22,12 +24,13 @@ val extended_build_job_info : t -> bool
2224

2325
module Event : sig
2426
type t
27+
type data
2528

26-
type data =
27-
{ args : Chrome_trace.Event.args option
28-
; cat : string list option
29-
; name : string
30-
}
29+
val data
30+
: args:(string * Json.t) list option
31+
-> cat:string list option
32+
-> name:string
33+
-> data
3134
end
3235

3336
val start : t option -> (unit -> Event.data) -> Event.t option

0 commit comments

Comments
 (0)