chore: update dune files after implicit_trans_deps=false

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)))

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

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)))

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))

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

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))

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)))

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)))

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"))

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"))

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))

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"))

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))

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))

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))

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))

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"))

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)