diff --git a/src/client-cohttp-eio/dune b/src/client-cohttp-eio/dune index 10216ecb..96477c9f 100644 --- a/src/client-cohttp-eio/dune +++ b/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) diff --git a/src/client-cohttp-eio/opentelemetry_client_cohttp_eio.ml b/src/client-cohttp-eio/opentelemetry_client_cohttp_eio.ml index d726e82e..f7f21def 100644 --- a/src/client-cohttp-eio/opentelemetry_client_cohttp_eio.ml +++ b/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 diff --git a/src/client-cohttp-lwt/dune b/src/client-cohttp-lwt/dune index 2b27fb06..ff03a8f1 100644 --- a/src/client-cohttp-lwt/dune +++ b/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) diff --git a/src/client-cohttp-lwt/opentelemetry_client_cohttp_lwt.ml b/src/client-cohttp-lwt/opentelemetry_client_cohttp_lwt.ml index 149c272a..844765e7 100644 --- a/src/client-cohttp-lwt/opentelemetry_client_cohttp_lwt.ml +++ b/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 diff --git a/src/client-ocurl-lwt/dune b/src/client-ocurl-lwt/dune index 829286ff..f9453892 100644 --- a/src/client-ocurl-lwt/dune +++ b/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) diff --git a/src/client-ocurl-lwt/opentelemetry_client_ocurl_lwt.ml b/src/client-ocurl-lwt/opentelemetry_client_ocurl_lwt.ml index f062d8dd..973fe20d 100644 --- a/src/client-ocurl-lwt/opentelemetry_client_ocurl_lwt.ml +++ b/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 diff --git a/src/client-ocurl/dune b/src/client-ocurl/dune index 0437175a..cc685dc9 100644 --- a/src/client-ocurl/dune +++ b/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 diff --git a/src/client-ocurl/opentelemetry_client_ocurl.ml b/src/client-ocurl/opentelemetry_client_ocurl.ml index 9980e22a..fe7d80fa 100644 --- a/src/client-ocurl/opentelemetry_client_ocurl.ml +++ b/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 diff --git a/src/core/exporter.ml b/src/core/exporter.ml index bc7514a5..622604f1 100644 --- a/src/core/exporter.ml +++ b/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; diff --git a/tests/bin/dune b/tests/bin/dune index 00f75d2f..07dde77a 100644 --- a/tests/bin/dune +++ b/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)) diff --git a/tests/bin/emit1_eio.ml b/tests/bin/emit1_eio.ml index a0744e7c..f215da12 100644 --- a/tests/bin/emit1_eio.ml +++ b/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 - "alloc" + OT.Tracer.with_ ~kind:OT.Span.Span_kind_internal ~parent:scope "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