simon/ocaml-trace
1
0
Fork 0
mirror of https://github.com/ocaml-tracing/ocaml-trace.git synced 2026-03-07 18:37:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleaner tracing errors

Browse source
This commit is contained in:
Simon Cruanes 2025-05-07 15:44:39 -04:00
parent 86e65d2046
commit d7f0aff406
No known key found for this signature in database
GPG key ID: EBFFF6F283F3A2B4
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/fuchsia/subscriber.ml
View file

@ -35,8 +35,7 @@ open struct
let spans = Span_tbl.to_list spans in let spans = Span_tbl.to_list spans in
if spans <> [] then ( if spans <> [] then (
!on_tracing_error !on_tracing_error
@@ Printf.sprintf "trace-tef: warning: %d spans were not closed\n" @@ Printf.sprintf "warning: %d spans were not closed" (List.length spans);
(List.length spans);
let names = let names =
List.fold_left List.fold_left
(fun set (_, span) -> Str_set.add span.name set) (fun set (_, span) -> Str_set.add span.name set)
@ -44,7 +43,7 @@ open struct
in in
Str_set.iter Str_set.iter
(fun name -> (fun name ->
!on_tracing_error @@ Printf.sprintf " span %S was not closed\n" name) !on_tracing_error @@ Printf.sprintf " span %S was not closed" name)
names; names;
flush stderr flush stderr
) )

12
src/tef/subscriber.ml
View file

@ -23,7 +23,7 @@ open struct
Bytes.get_int64_le (Bytes.unsafe_of_string id) 0 Bytes.get_int64_le (Bytes.unsafe_of_string id) 0
end end
let on_tracing_error = ref (fun s -> Printf.eprintf "trace-tef error: %s\n%!" s) let on_tracing_error = ref (fun s -> Printf.eprintf "%s\n%!" s)
type span_info = { type span_info = {
tid: int; tid: int;
@ -51,7 +51,7 @@ open struct
let spans = Span_tbl.to_list spans in let spans = Span_tbl.to_list spans in
if spans <> [] then ( if spans <> [] then (
!on_tracing_error !on_tracing_error
@@ Printf.sprintf "trace-tef: warning: %d spans were not closed\n" @@ Printf.sprintf "trace-tef: warning: %d spans were not closed"
(List.length spans); (List.length spans);
let names = let names =
List.fold_left List.fold_left
@ -60,7 +60,7 @@ open struct
in in
Str_set.iter Str_set.iter
(fun name -> (fun name ->
!on_tracing_error @@ Printf.sprintf " span %S was not closed\n" name) !on_tracing_error @@ Printf.sprintf " span %S was not closed" name)
names; names;
flush stderr flush stderr
) )
@ -113,7 +113,8 @@ module Callbacks = struct
match Span_tbl.find_exn self.spans span with match Span_tbl.find_exn self.spans span with
| exception Not_found -> | exception Not_found ->
!on_tracing_error (Printf.sprintf "cannot find span %Ld" span) !on_tracing_error
(Printf.sprintf "trace-tef: error: cannot find span %Ld" span)
| { tid; name; start_us; data } -> | { tid; name; start_us; data } ->
Span_tbl.remove self.spans span; Span_tbl.remove self.spans span;
let@ buf = Rpool.with_ self.buf_pool in let@ buf = Rpool.with_ self.buf_pool in
@ -128,7 +129,8 @@ module Callbacks = struct
let info = Span_tbl.find_exn self.spans span in let info = Span_tbl.find_exn self.spans span in
info.data <- List.rev_append data info.data info.data <- List.rev_append data info.data
with Not_found -> with Not_found ->
!on_tracing_error (Printf.sprintf "cannot find span %Ld" span) !on_tracing_error
(Printf.sprintf "trace-tef: error: cannot find span %Ld" span)
) )
let on_message (self : st) ~time_ns ~tid ~span:_ ~data msg : unit = let on_message (self : st) ~time_ns ~tid ~span:_ ~data msg : unit =