From 384dca93e28754a0664f9d9e1b838074a17205b9 Mon Sep 17 00:00:00 2001
From: Simon Cruanes <simon.cruanes.2007@m4x.org>
Date: Fri, 2 May 2025 09:19:35 -0400
Subject: [PATCH] fix: better retrocompat for
 `enter_manual_{toplevel,sub}_span`

---
 src/core/trace_core.ml  | 5 +++--
 src/core/trace_core.mli | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/core/trace_core.ml b/src/core/trace_core.ml
index 6dd66af..e43497e 100644
--- a/src/core/trace_core.ml
+++ b/src/core/trace_core.ml
@@ -84,8 +84,9 @@ let[@inline] enter_manual_toplevel_span ?flavor ?level ?__FUNCTION__ ~__FILE__
 
 let[@inline] enter_manual_sub_span ~parent ?flavor ?level ?__FUNCTION__
     ~__FILE__ ~__LINE__ ?data name : explicit_span =
-  enter_manual_span ~parent:(Some parent) ?flavor ?level ?__FUNCTION__ ~__FILE__
-    ~__LINE__ ?data name
+  enter_manual_span
+    ~parent:(Some (ctx_of_span parent))
+    ?flavor ?level ?__FUNCTION__ ~__FILE__ ~__LINE__ ?data name
 
 let[@inline] exit_manual_span espan : unit =
   if espan != Collector.dummy_explicit_span then (
diff --git a/src/core/trace_core.mli b/src/core/trace_core.mli
index ce09ae6..966f317 100644
--- a/src/core/trace_core.mli
+++ b/src/core/trace_core.mli
@@ -114,7 +114,7 @@ val enter_manual_span :
     @since NEXT_RELEASE *)
 
 val enter_manual_sub_span :
-  parent:explicit_span_ctx ->
+  parent:explicit_span ->
   ?flavor:[ `Sync | `Async ] ->
   ?level:Level.t ->
   ?__FUNCTION__:string ->