From b044203b799ef7fbaf96a47d7fb4873158c47b93 Mon Sep 17 00:00:00 2001 From: Simon Cruanes Date: Mon, 8 Dec 2025 20:07:18 -0500 Subject: [PATCH] update HTTP clients --- .../opentelemetry_client_cohttp_eio.ml | 6 +++--- .../opentelemetry_client_cohttp_eio.mli | 2 +- .../opentelemetry_client_cohttp_lwt.mli | 2 +- .../opentelemetry_client_ocurl_lwt.mli | 2 +- src/client-ocurl/opentelemetry_client_ocurl.ml | 12 ++---------- src/client-ocurl/opentelemetry_client_ocurl.mli | 2 +- 6 files changed, 9 insertions(+), 17 deletions(-) diff --git a/src/client-cohttp-eio/opentelemetry_client_cohttp_eio.ml b/src/client-cohttp-eio/opentelemetry_client_cohttp_eio.ml index 890f65d8..9788a057 100644 --- a/src/client-cohttp-eio/opentelemetry_client_cohttp_eio.ml +++ b/src/client-cohttp-eio/opentelemetry_client_cohttp_eio.ml @@ -56,8 +56,8 @@ struct Eio.Mutex.unlock self.mutex (** Ensure we get signalled when the queue goes from empty to non-empty *) - let register_bounded_queue (self : t) (bq : _ Bounded_queue.t) : unit = - Bounded_queue.on_non_empty bq (fun () -> trigger self) + let register_bounded_queue (self : t) (bq : _ Bounded_queue.Recv.t) : unit = + Bounded_queue.Recv.on_non_empty bq (fun () -> trigger self) end module Httpc : Generic_http_consumer.HTTPC with module IO = IO = struct @@ -159,7 +159,7 @@ struct end let create_consumer ?(config = Config.make ()) ~sw ~env () : - Consumer.any_resource_builder = + _ Consumer.Builder.t = let module M = Make (struct let sw = sw diff --git a/src/client-cohttp-eio/opentelemetry_client_cohttp_eio.mli b/src/client-cohttp-eio/opentelemetry_client_cohttp_eio.mli index 1b8eb7e7..cae9dde1 100644 --- a/src/client-cohttp-eio/opentelemetry_client_cohttp_eio.mli +++ b/src/client-cohttp-eio/opentelemetry_client_cohttp_eio.mli @@ -15,7 +15,7 @@ val create_consumer : sw:Eio.Switch.t -> env:Eio_unix.Stdenv.base -> unit -> - Opentelemetry_client.Consumer.any_resource_builder + Opentelemetry_client.Consumer.any_signal_l_builder (** Consumer that pulls from a queue *) val create_exporter : diff --git a/src/client-cohttp-lwt/opentelemetry_client_cohttp_lwt.mli b/src/client-cohttp-lwt/opentelemetry_client_cohttp_lwt.mli index 556f0e0e..beb2d216 100644 --- a/src/client-cohttp-lwt/opentelemetry_client_cohttp_lwt.mli +++ b/src/client-cohttp-lwt/opentelemetry_client_cohttp_lwt.mli @@ -11,7 +11,7 @@ val set_headers : (string * string) list -> unit module Config = Config val create_consumer : - ?config:Config.t -> unit -> Opentelemetry_client.Consumer.any_resource_builder + ?config:Config.t -> unit -> Opentelemetry_client.Consumer.any_signal_l_builder (** Consumer that pulls from a queue *) val create_exporter : ?config:Config.t -> unit -> Opentelemetry.Exporter.t diff --git a/src/client-ocurl-lwt/opentelemetry_client_ocurl_lwt.mli b/src/client-ocurl-lwt/opentelemetry_client_ocurl_lwt.mli index a5ea4ff1..040fe24c 100644 --- a/src/client-ocurl-lwt/opentelemetry_client_ocurl_lwt.mli +++ b/src/client-ocurl-lwt/opentelemetry_client_ocurl_lwt.mli @@ -11,7 +11,7 @@ val set_headers : (string * string) list -> unit module Config = Config val create_consumer : - ?config:Config.t -> unit -> Opentelemetry_client.Consumer.any_resource_builder + ?config:Config.t -> unit -> Opentelemetry_client.Consumer.any_signal_l_builder (** Consumer that pulls from a queue *) val create_exporter : ?config:Config.t -> unit -> Opentelemetry.Exporter.t diff --git a/src/client-ocurl/opentelemetry_client_ocurl.ml b/src/client-ocurl/opentelemetry_client_ocurl.ml index d67f0b46..cc35ca39 100644 --- a/src/client-ocurl/opentelemetry_client_ocurl.ml +++ b/src/client-ocurl/opentelemetry_client_ocurl.ml @@ -18,15 +18,7 @@ type error = OTELC.Export_error.t open struct module Notifier = OTELC.Notifier_sync - - module IO : OTELC.Generic_io.S_WITH_CONCURRENCY with type 'a t = 'a = struct - include OTELC.Generic_io.Direct_style - - let sleep_s = Thread.delay - - let[@inline] spawn f = - ignore (OTELC.Util_thread.start_bg_thread f : Thread.t) - end + module IO = OTELC.Io_sync end module Httpc : OTELC.Generic_http_consumer.HTTPC with module IO = IO = struct @@ -82,7 +74,7 @@ end module Consumer_impl = OTELC.Generic_http_consumer.Make (IO) (Notifier) (Httpc) let consumer ?(config = Config.make ()) () : - Opentelemetry_client.Consumer.any_resource_builder = + Opentelemetry_client.Consumer.any_signal_l_builder = let n_workers = max 2 (min 32 config.bg_threads) in let ticker_task = if config.ticker_thread then diff --git a/src/client-ocurl/opentelemetry_client_ocurl.mli b/src/client-ocurl/opentelemetry_client_ocurl.mli index bebd486c..1a995b57 100644 --- a/src/client-ocurl/opentelemetry_client_ocurl.mli +++ b/src/client-ocurl/opentelemetry_client_ocurl.mli @@ -14,7 +14,7 @@ val n_bytes_sent : unit -> int (** Global counter of bytes sent (or attempted to be sent) *) val consumer : - ?config:Config.t -> unit -> Opentelemetry_client.Consumer.any_resource_builder + ?config:Config.t -> unit -> Opentelemetry_client.Consumer.any_signal_l_builder (** Consumer that pulls from a queue *) val create_exporter : ?config:Config.t -> unit -> Opentelemetry.Exporter.t