From 7629e419c8f5b601787ef352350cc5ead8ddb6c0 Mon Sep 17 00:00:00 2001 From: Simon Cruanes Date: Fri, 20 Sep 2024 09:22:13 -0400 Subject: [PATCH] format --- Makefile | 2 +- dune | 9 +++++++-- src/ambient-context/dune | 13 +++++++++---- src/atomic/gen.ml | 12 ++++++------ src/client-cohttp-lwt/dune | 10 ++++++++-- src/client-ocurl/dune | 12 ++++++++++-- src/core/dune | 11 +++++++++-- tests/bin/dune | 15 +++++++++++---- tests/core/dune | 3 +-- 9 files changed, 62 insertions(+), 25 deletions(-) diff --git a/Makefile b/Makefile index 97241e15..f769d8f1 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ protoc-gen: FORCE_GENPROTO=true @dune build @lint format: - @dune build @fmt + @dune build @fmt --auto-promote WATCH ?= @all watch: diff --git a/dune b/dune index 6b9e175b..c37d0f24 100644 --- a/dune +++ b/dune @@ -1,4 +1,9 @@ (env (_ - (flags :standard -warn-error -a+8 -w +a-4-30-40-41-42-44-48-70 - -strict-sequence))) + (flags + :standard + -warn-error + -a+8 + -w + +a-4-30-40-41-42-44-48-70 + -strict-sequence))) diff --git a/src/ambient-context/dune b/src/ambient-context/dune index f0f87c7d..f2198d56 100644 --- a/src/ambient-context/dune +++ b/src/ambient-context/dune @@ -4,8 +4,13 @@ (synopsis "Abstraction over thread-local storage and fiber-local storage mechanisms") (private_modules hmap_key_) - (libraries thread-local-storage threads atomic + (libraries + thread-local-storage + threads + atomic opentelemetry.ambient-context.types - (select hmap_key_.ml from - (rcontext hmap -> hmap_key_.rcontext.ml) - (-> hmap_key_.new.ml)))) + (select + hmap_key_.ml + from + (rcontext hmap -> hmap_key_.rcontext.ml) + (-> hmap_key_.new.ml)))) diff --git a/src/atomic/gen.ml b/src/atomic/gen.ml index 7eafc3c3..226da610 100644 --- a/src/atomic/gen.ml +++ b/src/atomic/gen.ml @@ -51,13 +51,13 @@ let () = let version = Scanf.sscanf Sys.ocaml_version "%d.%d.%s" (fun x y _ -> x, y) in write_file "atomic.ml" (if version >= (4, 12) then - atomic_after_412 - else - atomic_before_412); + atomic_after_412 + else + atomic_before_412); copy_file (if version >= (4, 12) then - "atomic.post412.mli" - else - "atomic.pre412.mli") + "atomic.post412.mli" + else + "atomic.pre412.mli") "atomic.mli"; () diff --git a/src/client-cohttp-lwt/dune b/src/client-cohttp-lwt/dune index f4198731..45cc6cfe 100644 --- a/src/client-cohttp-lwt/dune +++ b/src/client-cohttp-lwt/dune @@ -4,5 +4,11 @@ (synopsis "Opentelemetry collector using cohttp+lwt+unix") (preprocess (pps lwt_ppx)) - (libraries opentelemetry lwt cohttp-lwt cohttp-lwt-unix pbrt mtime - mtime.clock.os)) + (libraries + opentelemetry + lwt + cohttp-lwt + cohttp-lwt-unix + pbrt + mtime + mtime.clock.os)) diff --git a/src/client-ocurl/dune b/src/client-ocurl/dune index a8162b4a..112c19da 100644 --- a/src/client-ocurl/dune +++ b/src/client-ocurl/dune @@ -1,5 +1,13 @@ (library (name opentelemetry_client_ocurl) (public_name opentelemetry-client-ocurl) - (libraries opentelemetry opentelemetry.atomic curl pbrt threads mtime - mtime.clock.os ezcurl ezcurl.core)) + (libraries + opentelemetry + opentelemetry.atomic + curl + pbrt + threads + mtime + mtime.clock.os + ezcurl + ezcurl.core)) diff --git a/src/core/dune b/src/core/dune index 235f8ad9..248e3aff 100644 --- a/src/core/dune +++ b/src/core/dune @@ -2,6 +2,13 @@ (name opentelemetry) (synopsis "API for opentelemetry instrumentation") (flags :standard -warn-error -a+8) - (libraries opentelemetry.proto opentelemetry.ambient-context ptime ptime.clock.os pbrt threads - opentelemetry.atomic hmap) + (libraries + opentelemetry.proto + opentelemetry.ambient-context + ptime + ptime.clock.os + pbrt + threads + opentelemetry.atomic + hmap) (public_name opentelemetry)) diff --git a/tests/bin/dune b/tests/bin/dune index 7d0ebe08..cb4712fb 100644 --- a/tests/bin/dune +++ b/tests/bin/dune @@ -8,11 +8,18 @@ (modules emit1_cohttp) (preprocess (pps lwt_ppx)) - (libraries unix opentelemetry opentelemetry-lwt - opentelemetry-client-cohttp-lwt lwt.unix)) + (libraries + unix + opentelemetry + opentelemetry-lwt + opentelemetry-client-cohttp-lwt + lwt.unix)) (executable (name cohttp_client) (modules cohttp_client) - (libraries cohttp-lwt-unix opentelemetry opentelemetry-client-cohttp-lwt - opentelemetry-cohttp-lwt)) + (libraries + cohttp-lwt-unix + opentelemetry + opentelemetry-client-cohttp-lwt + opentelemetry-cohttp-lwt)) diff --git a/tests/core/dune b/tests/core/dune index da93554f..8a702b10 100644 --- a/tests/core/dune +++ b/tests/core/dune @@ -1,5 +1,4 @@ - (tests - (names test_trace_context ) + (names test_trace_context) (package opentelemetry) (libraries opentelemetry))