update to trace 0.12 and OTEL main

Author: c-cube

devkit.opam

@@ -19,7 +19,7 @@ depends: [
   "libevent" {>= "0.8.0"}
   "ocurl" {>= "0.7.2"}
   "pcre2" {>= "8.0.3"}
-  "trace" {>= "0.4"}
+  "trace" {>= "0.12"}
   "extunix" {>= "0.1.4"}
   "lwt" {>= "5.7.0"}
   "lwt_ppx"
@@ -37,6 +37,6 @@ depopts: [
 ]
 conflicts: [
   "jemalloc" {< "0.2"}
-  "opentelemetry" {< "0.6"}
+  "opentelemetry" {< "0.13"}
 ]
 available: arch != "arm32" & arch != "x86_32"

possibly_otel.mli

@@ -2,7 +2,7 @@ module Otrace := Trace_core
 
 module Traceparent : sig
   val name : string
-  val get_ambient : ?explicit_span:Trace_core.explicit_span -> unit -> string option
+  val get_ambient : ?explicit_span:Trace_core.span -> unit -> string option
 end
 
 val enter_manual_span :
@@ -11,4 +11,4 @@ val enter_manual_span :
   __LINE__:int ->
   ?data:(unit -> (string * Otrace.user_data) list) ->
   string ->
-  Trace_core.explicit_span
+  Trace_core.span

possibly_otel.real.ml

@@ -1,26 +1,18 @@
 open Opentelemetry
 
-let (let*) o f = Option.map f o
-
 module Traceparent = struct
   let name = Trace_context.Traceparent.name
 
   let get_ambient ?explicit_span () =
-    let* Scope.{ trace_id; span_id; _ } = Scope.get_ambient_scope () in
-    let span_id = match explicit_span with
-      | Some {Trace_core.span; _} -> Opentelemetry_trace.Internal.otel_of_otrace span
-      | None -> span_id 
-    in
-    Trace_context.Traceparent.to_value ~trace_id ~parent_id:span_id ()
+    match explicit_span, Trace_core.current_span () with
+    | Some (Opentelemetry_trace.Extensions.Span_otel span), _
+    | _, Some (Opentelemetry_trace.Extensions.Span_otel span) ->
+        let ctx = Trace_context.Traceparent.to_value
+          ~trace_id:(Span.trace_id span) ~parent_id:(Span.id span) () in
+        Some ctx
+    | _ -> None
 end
 
 let enter_manual_span ~__FUNCTION__ ~__FILE__ ~__LINE__ ?data name =
-    match Scope.get_ambient_scope () with
-    | None ->
-      Trace_core.enter_manual_toplevel_span ~__FUNCTION__ ~__FILE__ ~__LINE__ ?data name
-    | Some Scope.{ span_id; _ } ->
-      let otrace_espan = Trace_core.{
-        span = Opentelemetry_trace.Internal.otrace_of_otel span_id;
-        meta = Trace_core.Meta_map.empty
-      } in
-      Trace_core.enter_manual_sub_span ~parent:otrace_espan ~__FUNCTION__ ~__FILE__ ~__LINE__ ?data name
+    let parent = Trace_core.current_span () in
+    Trace_core.enter_span ~parent ~__FUNCTION__ ~__FILE__ ~__LINE__ ?data name

possibly_otel.stub.ml

@@ -5,5 +5,5 @@ module Traceparent = struct
 end
 
 
-let enter_manual_span ~__FUNCTION__ ~__FILE__ ~__LINE__ ?data name =
-  Trace_core.enter_manual_toplevel_span ~__FUNCTION__ ~__FILE__ ~__LINE__ ?data name
+let[@inline] enter_manual_span ~__FUNCTION__ ~__FILE__ ~__LINE__ ?data name =
+  Trace_core.enter_span ~__FUNCTION__ ~__FILE__ ~__LINE__ ?data name

web.ml

@@ -362,9 +362,9 @@ module Http (IO : IO_TYPE) (Curl_IO : CURL with type 'a t = 'a IO.t) : HTTP with
           | Some v -> ("http.response.header.x-clickhouse-summary",  `String v) :: data in
         let data = match !resp_content_encoding with None -> data
           | Some v -> ("http.response.header.content-encoding", `String v) :: data in
-        Trace_core.add_data_to_manual_span explicit_span data
+        Trace_core.add_data_to_span explicit_span data
       );
-      Trace_core.exit_manual_span explicit_span;
+      Trace_core.exit_span explicit_span;
       return ()
     ) in