simon/ocaml-opentelemetry
1
0
Fork 0
mirror of https://github.com/ocaml-tracing/ocaml-opentelemetry.git synced 2026-03-09 04:17:56 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make emit1_eio.ml emit deterministic signals

Browse source 
As soon as we start running this in multible system threads, the race to
trigger the globals `stop` and `iterations` makes the signal emissions
non-deterministic, which makes the test kind of meaningless. This change
should make them determinstic.
This commit is contained in:
Shon Feder 2025-08-01 14:10:02 -04:00
parent 0890a1a5cd
commit 16de06aac5
No known key found for this signature in database
1 changed files with 52 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
tests/bin/emit1_eio.ml
View file

@ -11,8 +11,6 @@ let sleep_outer = ref 2.0
let n_jobs = ref 1 let n_jobs = ref 1
let iterations = Atomic.make 1
let num_sleep = Atomic.make 0 let num_sleep = Atomic.make 0
let stress_alloc_ = ref true let stress_alloc_ = ref true
@ -24,16 +22,15 @@ let num_tr = Atomic.make 0
(* Counter used to mark simulated failures *) (* Counter used to mark simulated failures *)
let i = ref 0 let i = ref 0
let run_job clock _job_id : unit = let run_job clock _job_id iterations : unit =
while not @@ Atomic.get stop do
let@ scope = let@ scope =
Atomic.incr num_tr; Atomic.incr num_tr;
OT.Trace.with_ ~kind:OT.Span.Span_kind_producer "loop.outer" OT.Trace.with_ ~kind:OT.Span.Span_kind_producer "loop.outer"
~attrs:[ "i", `Int !i ] ~attrs:[ "i", `Int !i ]
in in
for j = 0 to Atomic.get iterations do for j = 0 to iterations do
if j >= Atomic.get iterations then if j >= iterations then
(* Terminate program, having reached our max iterations *) (* Terminate program, having reached our max iterations *)
Atomic.set stop true Atomic.set stop true
else else
@ -78,9 +75,8 @@ let run_job clock _job_id : unit =
OT.Event.make "done with alloc") OT.Event.make "done with alloc")
with Failure _ -> () with Failure _ -> ()
done done
done
let run env proc () : unit = let run env proc iterations () : unit =
OT.GC_metrics.basic_setup (); OT.GC_metrics.basic_setup ();
OT.Metrics_callbacks.register (fun () -> OT.Metrics_callbacks.register (fun () ->
@ -95,7 +91,7 @@ let run env proc () : unit =
Eio.Switch.run (fun sw -> Eio.Switch.run (fun sw ->
for j = 1 to n_jobs do for j = 1 to n_jobs do
Eio.Fiber.fork ~sw (fun () -> run_job env#clock j) Eio.Fiber.fork ~sw (fun () -> run_job env#clock j iterations)
done) done)
let () = let () =
@ -109,6 +105,7 @@ let () =
let batch_metrics = ref 3 in let batch_metrics = ref 3 in
let batch_logs = ref 400 in let batch_logs = ref 400 in
let url = ref None in let url = ref None in
let n_iterations = ref 1 in
let n_procs = ref 1 in let n_procs = ref 1 in
let opts = let opts =
[ [
@ -127,7 +124,7 @@ let () =
"--sleep-inner", Arg.Set_float sleep_inner, " sleep (in s) in inner loop"; "--sleep-inner", Arg.Set_float sleep_inner, " sleep (in s) in inner loop";
"--sleep-outer", Arg.Set_float sleep_outer, " sleep (in s) in outer loop"; "--sleep-outer", Arg.Set_float sleep_outer, " sleep (in s) in outer loop";
( "--iterations", ( "--iterations",
Arg.Int (Atomic.set iterations), Arg.Set_int n_iterations,
" the number of iterations to run" ); " the number of iterations to run" );
"-j", Arg.Set_int n_jobs, " number of jobs per processes"; "-j", Arg.Set_int n_jobs, " number of jobs per processes";
"--procs", Arg.Set_int n_procs, " number of processes"; "--procs", Arg.Set_int n_procs, " number of processes";
@ -161,7 +158,8 @@ let () =
in in
Eio_main.run @@ fun env -> Eio_main.run @@ fun env ->
(if !n_procs < 2 then (if !n_procs < 2 then
Opentelemetry_client_cohttp_eio.with_setup ~stop ~config (run env 0) env Opentelemetry_client_cohttp_eio.with_setup ~stop ~config
(run env 0 !n_iterations) env
else else
Eio.Switch.run @@ fun sw -> Eio.Switch.run @@ fun sw ->
Opentelemetry_client_cohttp_eio.setup ~stop ~config ~sw env; Opentelemetry_client_cohttp_eio.setup ~stop ~config ~sw env;
@ -169,6 +167,6 @@ let () =
Eio.Switch.run (fun sw -> Eio.Switch.run (fun sw ->
for proc = 1 to !n_procs do for proc = 1 to !n_procs do
Eio.Fiber.fork ~sw @@ fun () -> Eio.Fiber.fork ~sw @@ fun () ->
Eio.Domain_manager.run dm (run env proc) Eio.Domain_manager.run dm (run env proc !n_iterations)
done)); done));
Opentelemetry.Collector.remove_backend () ~on_done:ignore Opentelemetry.Collector.remove_backend () ~on_done:ignore