From d737022e111cefcd853b3b36186a6951a751fe23 Mon Sep 17 00:00:00 2001 From: Simon Cruanes Date: Fri, 11 Apr 2025 12:25:10 -0400 Subject: [PATCH] fix: beware of dummy trace id --- src/fuchsia/write/trace_fuchsia_write.ml | 5 ++++- src/tef/trace_tef.ml | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/fuchsia/write/trace_fuchsia_write.ml b/src/fuchsia/write/trace_fuchsia_write.ml index ab669e3..1968c9b 100644 --- a/src/fuchsia/write/trace_fuchsia_write.ml +++ b/src/fuchsia/write/trace_fuchsia_write.ml @@ -11,7 +11,10 @@ open struct let spf = Printf.sprintf let[@inline] int64_of_trace_id_ (id : Trace_core.trace_id) : int64 = - Bytes.get_int64_le (Bytes.unsafe_of_string id) 0 + if id == Trace_core.Collector.dummy_trace_id then + 0L + else + Bytes.get_int64_le (Bytes.unsafe_of_string id) 0 end open Util diff --git a/src/tef/trace_tef.ml b/src/tef/trace_tef.ml index a6f4e7a..41938a8 100644 --- a/src/tef/trace_tef.ml +++ b/src/tef/trace_tef.ml @@ -7,7 +7,10 @@ module A = Trace_core.Internal_.Atomic_ let on_tracing_error = ref (fun s -> Printf.eprintf "trace-tef error: %s\n%!" s) let[@inline] int64_of_trace_id_ (id : Trace_core.trace_id) : int64 = - Bytes.get_int64_le (Bytes.unsafe_of_string id) 0 + if id == Trace_core.Collector.dummy_trace_id then + 0L + else + Bytes.get_int64_le (Bytes.unsafe_of_string id) 0 module Mock_ = struct let enabled = ref false