Skip to content

Commit

Permalink
format
Browse files Browse the repository at this point in the history
  • Loading branch information
c-cube committed Sep 20, 2024
1 parent 242d304 commit 7629e41
Show file tree
Hide file tree
Showing 9 changed files with 62 additions and 25 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ protoc-gen:
FORCE_GENPROTO=true @dune build @lint

format:
@dune build @fmt
@dune build @fmt --auto-promote

WATCH ?= @all
watch:
Expand Down
9 changes: 7 additions & 2 deletions dune
Original file line number Diff line number Diff line change
@@ -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)))
13 changes: 9 additions & 4 deletions src/ambient-context/dune
Original file line number Diff line number Diff line change
Expand Up @@ -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))))
12 changes: 6 additions & 6 deletions src/atomic/gen.ml
Original file line number Diff line number Diff line change
Expand Up @@ -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";
()
10 changes: 8 additions & 2 deletions src/client-cohttp-lwt/dune
Original file line number Diff line number Diff line change
Expand Up @@ -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))
12 changes: 10 additions & 2 deletions src/client-ocurl/dune
Original file line number Diff line number Diff line change
@@ -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))
11 changes: 9 additions & 2 deletions src/core/dune
Original file line number Diff line number Diff line change
Expand Up @@ -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))
15 changes: 11 additions & 4 deletions tests/bin/dune
Original file line number Diff line number Diff line change
Expand Up @@ -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))
3 changes: 1 addition & 2 deletions tests/core/dune
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@

(tests
(names test_trace_context )
(names test_trace_context)
(package opentelemetry)
(libraries opentelemetry))

0 comments on commit 7629e41

Please sign in to comment.