From 51ddd79634320e233c506d7fe8d5ac67e51e3c4a Mon Sep 17 00:00:00 2001
From: Dave Aitken <dave.aitken@gmail.com>
Date: Wed, 23 Mar 2022 15:11:03 +0000
Subject: [PATCH] tidy: return scope from lwt with_ (consistent with non-lwt
 version)

---
 src/lwt/opentelemetry_lwt.ml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/lwt/opentelemetry_lwt.ml b/src/lwt/opentelemetry_lwt.ml
index b144d54a..1ca95653 100644
--- a/src/lwt/opentelemetry_lwt.ml
+++ b/src/lwt/opentelemetry_lwt.ml
@@ -24,9 +24,10 @@ module Trace = struct
   let with_
       ?trace_state ?service_name ?attrs
       ?kind ?(trace_id=Trace_id.create()) ?parent ?links
-      name (f:Trace_id.t * Span_id.t -> 'a Lwt.t) : 'a Lwt.t =
+      name (f:Trace.scope -> 'a Lwt.t) : 'a Lwt.t =
     let start_time = Timestamp_ns.now_unix_ns() in
     let span_id = Span_id.create() in
+    let scope = {trace_id;span_id;events=[]} in
     let finally ok =
       let status = match ok with
         | Ok () -> default_status ~code:Status_code_ok ()
@@ -42,7 +43,7 @@ module Trace = struct
     in
     Lwt.catch
       (fun () ->
-         let* x = f (trace_id,span_id) in
+         let* x = f scope in
          let+ () = finally (Ok ()) in
          x)
       (fun e ->