From f31062a602ae41c6bc08b3f781e2241b009c3f52 Mon Sep 17 00:00:00 2001 From: Simon Cruanes Date: Mon, 12 Jan 2026 20:50:53 -0500 Subject: [PATCH] rename batching modules --- .../opentelemetry_client_cohttp_eio.ml | 2 +- .../opentelemetry_client_cohttp_lwt.ml | 2 +- .../opentelemetry_client_ocurl_lwt.ml | 2 +- src/client-ocurl/opentelemetry_client_ocurl.ml | 2 +- ...emitter_add_batching.ml => emitter_batch.ml} | 0 ...itter_add_batching.mli => emitter_batch.mli} | 0 ...porter_add_batching.ml => exporter_batch.ml} | 17 +++++------------ src/client/exporter_batch.mli | 10 ++++++++++ 8 files changed, 19 insertions(+), 16 deletions(-) rename src/client/{emitter_add_batching.ml => emitter_batch.ml} (100%) rename src/client/{emitter_add_batching.mli => emitter_batch.mli} (100%) rename src/client/{exporter_add_batching.ml => exporter_batch.ml} (55%) create mode 100644 src/client/exporter_batch.mli diff --git a/src/client-cohttp-eio/opentelemetry_client_cohttp_eio.ml b/src/client-cohttp-eio/opentelemetry_client_cohttp_eio.ml index 3978b9ba..da841b95 100644 --- a/src/client-cohttp-eio/opentelemetry_client_cohttp_eio.ml +++ b/src/client-cohttp-eio/opentelemetry_client_cohttp_eio.ml @@ -175,7 +175,7 @@ let create_exporter ?(config = Config.make ()) ~sw ~env () = ~high_watermark:Bounded_queue.Defaults.high_watermark () in Exporter_queued.create ~clock:Clock.ptime_clock ~q:bq ~consumer () - |> Exporter_add_batching.add_batching ~config + |> Exporter_batch.add_batching ~config let create_backend = create_exporter diff --git a/src/client-cohttp-lwt/opentelemetry_client_cohttp_lwt.ml b/src/client-cohttp-lwt/opentelemetry_client_cohttp_lwt.ml index ff622e66..d8b52b83 100644 --- a/src/client-cohttp-lwt/opentelemetry_client_cohttp_lwt.ml +++ b/src/client-cohttp-lwt/opentelemetry_client_cohttp_lwt.ml @@ -115,7 +115,7 @@ let create_exporter ?(config = Config.make ()) () = ~high_watermark:Bounded_queue.Defaults.high_watermark () in Exporter_queued.create ~clock:Clock.ptime_clock ~q:bq ~consumer () - |> Exporter_add_batching.add_batching ~config + |> Exporter_batch.add_batching ~config let create_backend = create_exporter diff --git a/src/client-ocurl-lwt/opentelemetry_client_ocurl_lwt.ml b/src/client-ocurl-lwt/opentelemetry_client_ocurl_lwt.ml index bf57a9ed..5bc2fe7a 100644 --- a/src/client-ocurl-lwt/opentelemetry_client_ocurl_lwt.ml +++ b/src/client-ocurl-lwt/opentelemetry_client_ocurl_lwt.ml @@ -86,7 +86,7 @@ let create_exporter ?(config = Config.make ()) () = ~high_watermark:Bounded_queue.Defaults.high_watermark () in Exporter_queued.create ~clock:Clock.ptime_clock ~q:bq ~consumer () - |> Exporter_add_batching.add_batching ~config + |> Exporter_batch.add_batching ~config let create_backend = create_exporter diff --git a/src/client-ocurl/opentelemetry_client_ocurl.ml b/src/client-ocurl/opentelemetry_client_ocurl.ml index 2f320597..1216666d 100644 --- a/src/client-ocurl/opentelemetry_client_ocurl.ml +++ b/src/client-ocurl/opentelemetry_client_ocurl.ml @@ -93,7 +93,7 @@ let create_exporter ?(config = Config.make ()) () : OTEL.Exporter.t = in OTELC.Exporter_queued.create ~clock:OTEL.Clock.ptime_clock ~q:bq ~consumer () - |> OTELC.Exporter_add_batching.add_batching ~config:config.common + |> OTELC.Exporter_batch.add_batching ~config:config.common let create_backend = create_exporter diff --git a/src/client/emitter_add_batching.ml b/src/client/emitter_batch.ml similarity index 100% rename from src/client/emitter_add_batching.ml rename to src/client/emitter_batch.ml diff --git a/src/client/emitter_add_batching.mli b/src/client/emitter_batch.mli similarity index 100% rename from src/client/emitter_add_batching.mli rename to src/client/emitter_batch.mli diff --git a/src/client/exporter_add_batching.ml b/src/client/exporter_batch.ml similarity index 55% rename from src/client/exporter_add_batching.ml rename to src/client/exporter_batch.ml index d5f495af..c8df20ca 100644 --- a/src/client/exporter_add_batching.ml +++ b/src/client/exporter_batch.ml @@ -1,26 +1,19 @@ -(** Add batching to the emitters of an exporter. - - The exporter has multiple emitters (one per signal type), this can add - batching on top of each of them (so that they emit less frequent, larger - batches of signals, amortizing the per-signal cost). *) - open Common_ -(** Given an exporter, add batches for each emitter according to [config]. *) let add_batching ~(config : Http_config.t) (exp : OTEL.Exporter.t) : OTEL.Exporter.t = let timeout = Mtime.Span.(config.batch_timeout_ms * ms) in let emit_spans = - Emitter_add_batching.add_batching_opt ~timeout - ~batch_size:config.batch_traces exp.emit_spans + Emitter_batch.add_batching_opt ~timeout ~batch_size:config.batch_traces + exp.emit_spans in let emit_metrics = - Emitter_add_batching.add_batching_opt ~timeout - ~batch_size:config.batch_metrics exp.emit_metrics + Emitter_batch.add_batching_opt ~timeout ~batch_size:config.batch_metrics + exp.emit_metrics in let emit_logs = - Emitter_add_batching.add_batching_opt ~timeout ~batch_size:config.batch_logs + Emitter_batch.add_batching_opt ~timeout ~batch_size:config.batch_logs exp.emit_logs in diff --git a/src/client/exporter_batch.mli b/src/client/exporter_batch.mli new file mode 100644 index 00000000..6dacbc74 --- /dev/null +++ b/src/client/exporter_batch.mli @@ -0,0 +1,10 @@ +(** Add batching to the emitters of an exporter. + + The exporter has multiple emitters (one per signal type), this can add + batching on top of each of them (so that they emit less frequent, larger + batches of signals, amortizing the per-signal cost). *) + +open Common_ + +val add_batching : config:Http_config.t -> OTEL.Exporter.t -> OTEL.Exporter.t +(** Given an exporter, add batches for each emitter according to [config]. *)