Merge pull request #78 from tarides/update_trace_fuschia

tmcgilchrist · web-flow · commit 00c3cfebd057 · 2026-02-13T18:08:21.000+11:00
Update trace-fuchsia.0.11
diff --git a/dune-project b/dune-project
@@ -19,8 +19,8 @@
   (ocaml (>= "5.0.0~"))
   hdr_histogram
   (cmdliner (>= 2.0.0))
-  (trace-fuchsia (= 0.10))
-  (trace (= 0.10))
+  (trace-fuchsia (>= 0.11))
+  (trace (>= 0.11))
   (menhir :with-test)
   (ocamlformat (and :with-dev-setup (= 0.28.1)))
   (alcotest (and :with-test (>= 1.9.0)))))
diff --git a/lib/olly_trace/olly_format_backend/olly_format_fuchsia.ml b/lib/olly_trace/olly_format_backend/olly_format_fuchsia.ml
@@ -8,7 +8,7 @@ module Trace = Trace_fuchsia.Writer
 type trace = {
   doms : Trace.Thread_ref.t array;
   buf : Trace_fuchsia.Buf_chain.t;
-  subscriber : Trace_fuchsia.Subscriber.t;
+  collector : Trace_fuchsia.Collector_fuchsia.t;
   exporter : Trace_fuchsia.Exporter.t;
 }
 
@@ -22,22 +22,22 @@ let create ~filename =
   let buf = Trace_fuchsia.Buf_chain.create ~sharded:true ~buf_pool () in
   let oc = Out_channel.open_bin filename in
   let exporter = Trace_fuchsia.Exporter.of_out_channel ~close_channel:true oc in
-  let subscriber =
-    Trace_fuchsia.Subscriber.create ~buf_pool ~pid:0 ~exporter ()
+  let collector =
+    Trace_fuchsia.Collector_fuchsia.create ~buf_pool ~pid:0 ~exporter ()
   in
   (* Adds the headers to output *)
-  Trace_fuchsia.Subscriber.Callbacks.on_init subscriber ~time_ns:0L;
+  Trace_fuchsia.Collector_fuchsia.callbacks.init collector;
   let doms =
     let max_doms = 128 in
     Array.init max_doms (fun i ->
         (* Use a different pid for each domain *)
         Trace.Thread_ref.ref (i + 1))
   in
-  { doms; buf; subscriber; exporter }
+  { doms; buf; collector; exporter }
 
 let close trace =
   flush trace;
-  Trace_fuchsia.Subscriber.close trace.subscriber
+  Trace_fuchsia.Collector_fuchsia.close trace.collector
 
 let emit trace evt =
   let open Event in
diff --git a/runtime_events_tools.opam b/runtime_events_tools.opam
@@ -12,8 +12,8 @@ depends: [
   "ocaml" {>= "5.0.0~"}
   "hdr_histogram"
   "cmdliner" {>= "2.0.0"}
-  "trace-fuchsia" {= "0.10"}
-  "trace" {= "0.10"}
+  "trace-fuchsia" {>= "0.11"}
+  "trace" {>= "0.11"}
   "menhir" {with-test}
   "ocamlformat" {with-dev-setup & = "0.28.1"}
   "alcotest" {with-test & >= "1.9.0"}
