From b03ff26ba65882091928515c0b5346b84cf20877 Mon Sep 17 00:00:00 2001 From: Simon Cruanes Date: Tue, 22 Mar 2022 11:18:35 -0400 Subject: [PATCH] change signature of with_setup --- src/client/opentelemetry_client_ocurl.ml | 2 +- src/client/opentelemetry_client_ocurl.mli | 4 +++- tests/emit1.ml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/client/opentelemetry_client_ocurl.ml b/src/client/opentelemetry_client_ocurl.ml index c3f61011..a7dc599f 100644 --- a/src/client/opentelemetry_client_ocurl.ml +++ b/src/client/opentelemetry_client_ocurl.ml @@ -471,6 +471,6 @@ let setup ?(config=Config.make()) () = let cleanup = setup_ ~config () in at_exit cleanup -let with_setup ?(config=Config.make()) f = +let with_setup ?(config=Config.make()) () f = let cleanup = setup_ ~config () in Fun.protect ~finally:cleanup f diff --git a/src/client/opentelemetry_client_ocurl.mli b/src/client/opentelemetry_client_ocurl.mli index b8c9a902..29a14538 100644 --- a/src/client/opentelemetry_client_ocurl.mli +++ b/src/client/opentelemetry_client_ocurl.mli @@ -64,4 +64,6 @@ val setup : ?config:Config.t -> unit -> unit (** Setup endpoint. This modifies {!Opentelemetry.Collector.backend}. @param config configuration to use *) -val with_setup : ?config:Config.t -> (unit -> 'a) -> 'a +val with_setup : ?config:Config.t -> unit -> (unit -> 'a) -> 'a +(** [with_setup () f] is like [setup(); f()] but takes care of cleaning up + after [f()] returns. *) diff --git a/tests/emit1.ml b/tests/emit1.ml index 4e65fd21..38d06042 100644 --- a/tests/emit1.ml +++ b/tests/emit1.ml @@ -82,4 +82,4 @@ let () = Format.printf "@[<2>sleep outer: %.3fs,@ sleep inner: %.3fs,@ config: %a@]@." !sleep_outer !sleep_inner Opentelemetry_client_ocurl.Config.pp config; - Opentelemetry_client_ocurl.with_setup ~config run + Opentelemetry_client_ocurl.with_setup ~config () run