From 8511f547d7fa3f912e7f5304e0a2492a1fa5234b Mon Sep 17 00:00:00 2001 From: Shon Feder Date: Tue, 10 Jun 2025 18:11:30 -0400 Subject: [PATCH] Fix name of library Matches the convention in /src/trace/dune and prevents dependency on the library from polluting the global namespace of a component with the generic `Client` module. --- src/client-cohttp-lwt/config.ml | 6 +++--- src/client-cohttp-lwt/config.mli | 6 +++--- src/client-ocurl/config.ml | 7 ++++--- src/client-ocurl/config.mli | 6 +++--- src/client/dune | 2 +- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/client-cohttp-lwt/config.ml b/src/client-cohttp-lwt/config.ml index 328b0f46..930881ff 100644 --- a/src/client-cohttp-lwt/config.ml +++ b/src/client-cohttp-lwt/config.ml @@ -1,7 +1,7 @@ -type t = Client.Config.t +type t = Opentelemetry_client.Config.t -module Env = Client.Config.Env () +module Env = Opentelemetry_client.Config.Env () -let pp = Client.Config.pp +let pp = Opentelemetry_client.Config.pp let make = Env.make (fun common () -> common) diff --git a/src/client-cohttp-lwt/config.mli b/src/client-cohttp-lwt/config.mli index 69059b08..100bb696 100644 --- a/src/client-cohttp-lwt/config.mli +++ b/src/client-cohttp-lwt/config.mli @@ -1,4 +1,4 @@ -type t = Client.Config.t +type t = Opentelemetry_client.Config.t (** Configuration. To build one, use {!make} below. This might be extended with more fields in @@ -6,7 +6,7 @@ type t = Client.Config.t val pp : Format.formatter -> t -> unit -val make : (unit -> t) Client.Config.make +val make : (unit -> t) Opentelemetry_client.Config.make (** Make a configuration {!t}. *) -module Env : Client.Config.ENV +module Env : Opentelemetry_client.Config.ENV diff --git a/src/client-ocurl/config.ml b/src/client-ocurl/config.ml index 72a772ea..0954fbe6 100644 --- a/src/client-ocurl/config.ml +++ b/src/client-ocurl/config.ml @@ -10,7 +10,7 @@ type t = { [ticker_thread] is [true]. This will be clamped between [2 ms] and some longer interval (maximum [60s] currently). Default 500. @since 0.7 *) - common: Client.Config.t; + common: Opentelemetry_client.Config.t; (** Common configuration options @since 0.12*) } @@ -20,9 +20,10 @@ let pp out self = Format.fprintf out "{@[ bg_threads=%d;@ ticker_thread=%B;@ ticker_interval_ms=%d;@ common=%a \ @]}" - bg_threads ticker_thread ticker_interval_ms Client.Config.pp common + bg_threads ticker_thread ticker_interval_ms Opentelemetry_client.Config.pp + common -module Env = Client.Config.Env () +module Env = Opentelemetry_client.Config.Env () let make = Env.make diff --git a/src/client-ocurl/config.mli b/src/client-ocurl/config.mli index 13310941..8519d8c8 100644 --- a/src/client-ocurl/config.mli +++ b/src/client-ocurl/config.mli @@ -12,7 +12,7 @@ type t = { [ticker_thread] is [true]. This will be clamped between [2 ms] and some longer interval (maximum [60s] currently). Default 500. @since 0.7 *) - common: Client.Config.t; + common: Opentelemetry_client.Config.t; (** Common configuration options @since NEXT_RELEASE*) } @@ -29,7 +29,7 @@ val make : ?ticker_interval_ms:int -> unit -> t) - Client.Config.make + Opentelemetry_client.Config.make (** Make a configuration {!t}. *) -module Env : Client.Config.ENV +module Env : Opentelemetry_client.Config.ENV diff --git a/src/client/dune b/src/client/dune index e912c8a1..2bc4e4a5 100644 --- a/src/client/dune +++ b/src/client/dune @@ -1,4 +1,4 @@ (library - (name client) + (name opentelemetry_client) (public_name opentelemetry.client) (synopsis "Common types and logic shared between client implementations"))