From 57a915e880e427045906992de760f20871dd7241 Mon Sep 17 00:00:00 2001 From: Simon Cruanes Date: Wed, 17 Dec 2025 11:15:03 -0500 Subject: [PATCH] chore: update dune files after implicit_trans_deps=false --- src/ambient-context/core/dune | 3 ++- src/ambient-context/dune | 5 +++-- src/ambient-context/eio/dune | 6 +++++- src/ambient-context/tls/dune | 4 +++- src/client-cohttp-eio/dune | 20 +++++++++++++------- src/client-cohttp-lwt/dune | 14 +++++++++----- src/client-ocurl-lwt/dune | 17 ++++++++++------- src/client-ocurl/dune | 11 ++++++----- src/client/dune | 7 ++++--- src/client/lwt/dune | 10 +++++++--- src/core/dune | 8 ++++---- src/emitter/dune | 4 +++- src/integrations/cohttp/dune | 2 +- src/lib/dune | 6 +++--- src/ptime/dune | 5 +++++ src/trace/dune | 8 ++++---- src/util/dune | 4 +++- tests/bin/dune | 12 +++++++++--- 18 files changed, 94 insertions(+), 52 deletions(-) create mode 100644 src/ptime/dune diff --git a/src/ambient-context/core/dune b/src/ambient-context/core/dune index 97961205..3c0fe6cb 100644 --- a/src/ambient-context/core/dune +++ b/src/ambient-context/core/dune @@ -2,4 +2,5 @@ (name opentelemetry_ambient_context_core) (public_name opentelemetry.ambient-context.core) (synopsis "Core definitions for ambient-context") - (libraries hmap)) + (libraries + (re_export hmap))) diff --git a/src/ambient-context/dune b/src/ambient-context/dune index 65425271..acc92e9c 100644 --- a/src/ambient-context/dune +++ b/src/ambient-context/dune @@ -11,8 +11,9 @@ Opentelemetry_atomic) (libraries hmap - opentelemetry.ambient-context.core - opentelemetry.atomic + threads + (re_export opentelemetry.ambient-context.core) + (re_export opentelemetry.atomic) (select default_.ml from diff --git a/src/ambient-context/eio/dune b/src/ambient-context/eio/dune index fa56edd8..2e251b08 100644 --- a/src/ambient-context/eio/dune +++ b/src/ambient-context/eio/dune @@ -4,4 +4,8 @@ (synopsis "Storage backend for ambient-context using Eio's fibre-local storage") (optional) ; eio - (libraries eio hmap opentelemetry.ambient-context.core)) + (libraries + (re_export eio) + (re_export eio.core) + hmap + (re_export opentelemetry.ambient-context.core))) diff --git a/src/ambient-context/tls/dune b/src/ambient-context/tls/dune index c0a285bc..ca613612 100644 --- a/src/ambient-context/tls/dune +++ b/src/ambient-context/tls/dune @@ -3,4 +3,6 @@ (public_name opentelemetry.ambient-context.tls) (synopsis "Implementation of ambient-context from thread-local-storage") (optional) ; TLS - (libraries opentelemetry.ambient-context.core thread-local-storage)) + (libraries + (re_export opentelemetry.ambient-context.core) + thread-local-storage)) diff --git a/src/client-cohttp-eio/dune b/src/client-cohttp-eio/dune index 2bed9063..10216ecb 100644 --- a/src/client-cohttp-eio/dune +++ b/src/client-cohttp-eio/dune @@ -5,15 +5,21 @@ (enabled_if (>= %{ocaml_version} 5.0)) (libraries - opentelemetry - opentelemetry-client - eio - eio.unix - cohttp - cohttp-eio - tls-eio + (re_export opentelemetry) + opentelemetry.ptime + (re_export opentelemetry-client) + (re_export eio) + (re_export eio.core) + (re_export eio.unix) + (re_export cohttp) + (re_export cohttp-eio) + (re_export tls-eio) + fmt + tls + domain-name uri pbrt + threads mtime mtime.clock.os ca-certs diff --git a/src/client-cohttp-lwt/dune b/src/client-cohttp-lwt/dune index 56b0b4f8..2b27fb06 100644 --- a/src/client-cohttp-lwt/dune +++ b/src/client-cohttp-lwt/dune @@ -5,12 +5,16 @@ (preprocess (pps lwt_ppx)) (libraries - opentelemetry - opentelemetry-client + (re_export opentelemetry) + (re_export opentelemetry-client) + opentelemetry.ptime opentelemetry-client.lwt - lwt - cohttp-lwt - cohttp-lwt-unix + (re_export lwt) + (re_export cohttp-lwt) + (re_export cohttp-lwt-unix) + (re_export cohttp) + uri + threads pbrt mtime mtime.clock.os)) diff --git a/src/client-ocurl-lwt/dune b/src/client-ocurl-lwt/dune index 41dd39a9..829286ff 100644 --- a/src/client-ocurl-lwt/dune +++ b/src/client-ocurl-lwt/dune @@ -5,14 +5,17 @@ (preprocess (pps lwt_ppx)) (libraries - opentelemetry + (re_export opentelemetry) + opentelemetry.ptime opentelemetry.atomic - opentelemetry-client - opentelemetry-client.lwt + (re_export opentelemetry-client) + (re_export opentelemetry-client.lwt) + threads pbrt mtime mtime.clock.os - ezcurl-lwt - ezcurl.core - lwt - lwt.unix)) + (re_export curl) + (re_export ezcurl-lwt) + (re_export ezcurl.core) + (re_export lwt) + (re_export lwt.unix))) diff --git a/src/client-ocurl/dune b/src/client-ocurl/dune index befb9396..0437175a 100644 --- a/src/client-ocurl/dune +++ b/src/client-ocurl/dune @@ -2,13 +2,14 @@ (name opentelemetry_client_ocurl) (public_name opentelemetry-client-ocurl) (libraries - opentelemetry + (re_export opentelemetry) opentelemetry.atomic - opentelemetry-client - curl + (re_export opentelemetry-client) + (re_export opentelemetry.ptime) + (re_export curl) pbrt threads mtime mtime.clock.os - ezcurl - ezcurl.core)) + (re_export ezcurl) + (re_export ezcurl.core))) diff --git a/src/client/dune b/src/client/dune index 4f8d8258..73807419 100644 --- a/src/client/dune +++ b/src/client/dune @@ -8,9 +8,10 @@ opentelemetry.emitter opentelemetry.proto opentelemetry.domain - pbrt - threads.posix mtime - mtime.clock.os) + mtime.clock.os + unix + pbrt + threads.posix) (synopsis "Basic exporters, as well as common types and logic shared between exporters")) diff --git a/src/client/lwt/dune b/src/client/lwt/dune index 2b7d082b..e8b58b5e 100644 --- a/src/client/lwt/dune +++ b/src/client/lwt/dune @@ -11,11 +11,15 @@ Opentelemetry_atomic) (optional) ; lwt (libraries - opentelemetry.core opentelemetry.util opentelemetry.atomic opentelemetry.emitter - opentelemetry-client - lwt + (re_export opentelemetry.core) + (re_export opentelemetry) + (re_export opentelemetry-client) + (re_export lwt) + threads + mtime + mtime.clock.os lwt.unix) (synopsis "Lwt-specific helpers for opentelemetry-client")) diff --git a/src/core/dune b/src/core/dune index c33b4edc..5b1001ea 100644 --- a/src/core/dune +++ b/src/core/dune @@ -6,10 +6,10 @@ (libraries opentelemetry.proto opentelemetry.util - opentelemetry.atomic - opentelemetry.emitter - ptime - ptime.clock.os + (re_export opentelemetry.atomic) + (re_export opentelemetry.emitter) pbrt threads + unix + mtime hmap)) diff --git a/src/emitter/dune b/src/emitter/dune index 3844e185..744c7762 100644 --- a/src/emitter/dune +++ b/src/emitter/dune @@ -1,6 +1,8 @@ (library (name opentelemetry_emitter) (public_name opentelemetry.emitter) - (libraries mtime mtime.clock.os opentelemetry.atomic) + (libraries + (re_export opentelemetry.atomic) + (re_export mtime)) (flags :standard -open Opentelemetry_atomic) (synopsis "Modular emitters for a single signal at a time")) diff --git a/src/integrations/cohttp/dune b/src/integrations/cohttp/dune index 16a92278..5879dbf3 100644 --- a/src/integrations/cohttp/dune +++ b/src/integrations/cohttp/dune @@ -1,4 +1,4 @@ (library (name opentelemetry_cohttp_lwt) (public_name opentelemetry-cohttp-lwt) - (libraries cohttp-lwt opentelemetry opentelemetry-lwt)) + (libraries lwt cohttp uri cohttp-lwt opentelemetry opentelemetry-lwt)) diff --git a/src/lib/dune b/src/lib/dune index b35bb6c3..97c6cc03 100644 --- a/src/lib/dune +++ b/src/lib/dune @@ -14,12 +14,12 @@ Opentelemetry_core.Common_) (libraries (re_export opentelemetry.core) - opentelemetry.proto + (re_export opentelemetry.proto) (re_export opentelemetry.util) (re_export opentelemetry.ambient-context) (re_export opentelemetry.atomic) - ptime - ptime.clock.os + mtime + mtime.clock.os pbrt threads hmap)) diff --git a/src/ptime/dune b/src/ptime/dune new file mode 100644 index 00000000..8dfe6bd8 --- /dev/null +++ b/src/ptime/dune @@ -0,0 +1,5 @@ +(library + (name opentelemetry_ptime) + (public_name opentelemetry.ptime) + (synopsis "clock for opentelemetry using ptime") + (libraries opentelemetry.core ptime ptime.clock.os)) diff --git a/src/trace/dune b/src/trace/dune index da752802..c3cfe892 100644 --- a/src/trace/dune +++ b/src/trace/dune @@ -5,9 +5,9 @@ (optional) ; trace (flags :standard -open Opentelemetry_util -open Opentelemetry_atomic) (libraries - opentelemetry.ambient-context - opentelemetry.util + (re_export opentelemetry.ambient-context) + (re_export opentelemetry.util) opentelemetry.atomic - opentelemetry - trace.core + (re_export opentelemetry) + (re_export trace.core) trace.subscriber)) diff --git a/src/util/dune b/src/util/dune index 32ca575a..70a6f758 100644 --- a/src/util/dune +++ b/src/util/dune @@ -2,5 +2,7 @@ (name opentelemetry_util) (public_name opentelemetry.util) (flags :standard -open Opentelemetry_atomic) - (libraries opentelemetry.atomic opentelemetry.domain mtime mtime.clock.os) + (libraries + (re_export opentelemetry.atomic) + opentelemetry.domain) (synopsis "Basic utilities for opentelemetry")) diff --git a/tests/bin/dune b/tests/bin/dune index 452cd4ab..00f75d2f 100644 --- a/tests/bin/dune +++ b/tests/bin/dune @@ -3,6 +3,7 @@ (modules emit1) (libraries unix + threads opentelemetry opentelemetry-client opentelemetry-client-ocurl)) @@ -14,6 +15,7 @@ (pps lwt_ppx)) (libraries unix + threads lwt lwt.unix opentelemetry @@ -23,7 +25,7 @@ (executable (name emit1_stdout) (modules emit1_stdout) - (libraries unix opentelemetry opentelemetry-client)) + (libraries unix threads opentelemetry opentelemetry-client)) (executable (name emit1_cohttp) @@ -32,6 +34,7 @@ (pps lwt_ppx)) (libraries unix + threads opentelemetry opentelemetry-lwt opentelemetry-client @@ -50,6 +53,7 @@ logs.fmt logs.threaded opentelemetry + opentelemetry-lwt opentelemetry-client opentelemetry-client-cohttp-eio)) @@ -60,11 +64,13 @@ (pps lwt_ppx)) (libraries cohttp-lwt-unix - opentelemetry + opentelemetry-lwt opentelemetry-client-cohttp-lwt opentelemetry-cohttp-lwt opentelemetry-logs - logs)) + logs + lwt.unix + logs.fmt)) (executable (name cohttp_client)