use Clock.ptime_clock where it makes sense

src/client-cohttp-eio/dune

@@ -6,7 +6,6 @@
   (>= %{ocaml_version} 5.0))
  (libraries
   (re_export opentelemetry)
-  opentelemetry.ptime
   (re_export opentelemetry-client)
   (re_export eio)
   (re_export eio.core)

src/client-cohttp-eio/opentelemetry_client_cohttp_eio.ml

@@ -174,7 +174,7 @@ let create_exporter ?(config = Config.make ()) ~sw ~env () =
     Bounded_queue_sync.create
       ~high_watermark:Bounded_queue.Defaults.high_watermark ()
   in
-  Exporter_queued.create ~clock:Opentelemetry_ptime.clock ~q:bq ~consumer ()
+  Exporter_queued.create ~clock:Clock.ptime_clock ~q:bq ~consumer ()
   |> Exporter_add_batching.add_batching ~config
 
 let create_backend = create_exporter

src/client-cohttp-lwt/dune

@@ -7,7 +7,6 @@
  (libraries
   (re_export opentelemetry)
   (re_export opentelemetry-client)
-  opentelemetry.ptime
   opentelemetry-client.lwt
   (re_export lwt)
   (re_export cohttp-lwt)

src/client-cohttp-lwt/opentelemetry_client_cohttp_lwt.ml

@@ -114,7 +114,7 @@ let create_exporter ?(config = Config.make ()) () =
     Bounded_queue_sync.create
       ~high_watermark:Bounded_queue.Defaults.high_watermark ()
   in
-  Exporter_queued.create ~clock:Opentelemetry_ptime.clock ~q:bq ~consumer ()
+  Exporter_queued.create ~clock:Clock.ptime_clock ~q:bq ~consumer ()
   |> Exporter_add_batching.add_batching ~config
 
 let create_backend = create_exporter

src/client-ocurl-lwt/dune

@@ -6,7 +6,6 @@
   (pps lwt_ppx))
  (libraries
   (re_export opentelemetry)
-  opentelemetry.ptime
   opentelemetry.atomic
   (re_export opentelemetry-client)
   (re_export opentelemetry-client.lwt)

src/client-ocurl-lwt/opentelemetry_client_ocurl_lwt.ml

@@ -85,7 +85,7 @@ let create_exporter ?(config = Config.make ()) () =
     Bounded_queue_sync.create
       ~high_watermark:Bounded_queue.Defaults.high_watermark ()
   in
-  Exporter_queued.create ~clock:Opentelemetry_ptime.clock ~q:bq ~consumer ()
+  Exporter_queued.create ~clock:Clock.ptime_clock ~q:bq ~consumer ()
   |> Exporter_add_batching.add_batching ~config
 
 let create_backend = create_exporter

src/client-ocurl/dune

@@ -5,7 +5,6 @@
   (re_export opentelemetry)
   opentelemetry.atomic
   (re_export opentelemetry-client)
-  (re_export opentelemetry.ptime)
   (re_export curl)
   pbrt
   threads

src/client-ocurl/opentelemetry_client_ocurl.ml

@@ -92,8 +92,7 @@ let create_exporter ?(config = Config.make ()) () : OTEL.Exporter.t =
       ~high_watermark:OTELC.Bounded_queue.Defaults.high_watermark ()
   in
 
-  OTELC.Exporter_queued.create ~clock:Opentelemetry_ptime.clock ~q:bq ~consumer
+  OTELC.Exporter_queued.create ~clock:OTEL.Clock.ptime_clock ~q:bq ~consumer ()
-    ()
   |> OTELC.Exporter_add_batching.add_batching ~config:config.common
 
 let create_backend = create_exporter

src/core/exporter.ml

@@ -35,7 +35,7 @@ let dummy () : t =
   let active, trigger = Aswitch.create () in
   {
     active = (fun () -> active);
-    clock = Clock.unix;
+    clock = Clock.ptime_clock;
     emit_spans = Emitter.dummy;
     emit_metrics = Emitter.dummy;
     emit_logs = Emitter.dummy;

tests/bin/dune

@@ -14,10 +14,10 @@
  (preprocess
   (pps lwt_ppx))
  (libraries
-  unix
   threads
   lwt
   lwt.unix
+  unix
   opentelemetry
   opentelemetry-client
   opentelemetry-client-ocurl-lwt))
@@ -69,6 +69,7 @@
   opentelemetry-cohttp-lwt
   opentelemetry-logs
   logs
+  unix
   lwt.unix
   logs.fmt))
 
@@ -77,6 +78,7 @@
  (modules cohttp_client)
  (libraries
   cohttp-lwt-unix
+  unix
   opentelemetry
   opentelemetry-client-cohttp-lwt
   opentelemetry-cohttp-lwt))

tests/bin/emit1_eio.ml

@@ -23,10 +23,9 @@ let num_tr = Atomic.make 0
 let i = Atomic.make 0
 
 let run_job clock _job_id iterations : unit =
-  let tracer = OT.Tracer.get_main () in
   let@ scope =
     Atomic.incr num_tr;
-    OT.Tracer.with_ ~tracer ~kind:OT.Span.Span_kind_producer "loop.outer"
+    OT.Tracer.with_ ~kind:OT.Span.Span_kind_producer "loop.outer"
       ~attrs:[ "i", `Int (Atomic.get i) ]
   in
 
@@ -38,7 +37,7 @@ let run_job clock _job_id iterations : unit =
       (* parent scope is found via thread local storage *)
       let@ scope =
         Atomic.incr num_tr;
-        OT.Tracer.with_ ~tracer ~parent:scope ~kind:OT.Span.Span_kind_internal
+        OT.Tracer.with_ ~parent:scope ~kind:OT.Span.Span_kind_internal
           ~attrs:[ "j", `Int j ]
           "loop.inner"
       in
@@ -55,8 +54,7 @@ let run_job clock _job_id iterations : unit =
       try
         Atomic.incr num_tr;
         let@ scope =
-          OT.Tracer.with_ ~tracer ~kind:OT.Span.Span_kind_internal ~parent:scope
+          OT.Tracer.with_ ~kind:OT.Span.Span_kind_internal ~parent:scope "alloc"
-            "alloc"
         in
         (* allocate some stuff *)
         if !stress_alloc_ then (
@@ -80,10 +78,11 @@ let run env proc iterations () : unit =
   OT.Metrics_callbacks.(
     with_set_added_to_main_exporter (fun set ->
         add_metrics_cb set (fun () ->
+            let now = OT.Clock.now_main () in
             OT.Metrics.
               [
                 sum ~name:"num-sleep" ~is_monotonic:true
-                  [ int (Atomic.get num_sleep) ];
+                  [ int ~now (Atomic.get num_sleep) ];
               ])));
 
   let n_jobs = max 1 !n_jobs in