Merge pull request #107 from shonfeder/fix-deps

Fix dependencies
This commit is contained in:
Simon Cruanes 2025-09-15 09:13:16 -04:00 committed by GitHub
commit 9974d6a0b6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 25 additions and 9 deletions

View file

@ -44,7 +44,9 @@
(and
:with-dev-setup
(>= 0.27)
(< 0.28))))
(< 0.28)))
(mtime
(>= "1.4")))
(depopts trace lwt eio)
(conflicts
(trace
@ -98,7 +100,13 @@
(odoc :with-doc)
(logs
(>= "0.7.0"))
(alcotest :with-test))
(alcotest :with-test)
(containers :with-test)
(cohttp-lwt-unix :with-test)
(opentelemetry-client-cohttp-lwt
(and :with-test (= :version)))
(opentelemetry-cohttp-lwt
(and :with-test (= :version))))
(synopsis "Opentelemetry tracing for Cohttp HTTP servers"))
(package
@ -136,7 +144,8 @@
cohttp-lwt
cohttp-lwt-unix
(alcotest :with-test)
(containers :with-test))
(containers :with-test)
(opentelemetry-lwt (and :with-test (= :version))))
(synopsis "Collector client for opentelemetry, using cohttp + lwt"))
(package
@ -154,7 +163,9 @@
(cohttp-eio
(>= 6.1.0))
(eio_main :with-test)
tls-eio
(tls-eio
(>= 2.0.1))
(alcotest :with-test)
(containers :with-test))
(containers :with-test)
(cohttp-lwt-unix :with-test))
(synopsis "Collector client for opentelemetry, using cohttp + eio"))

View file

@ -21,9 +21,10 @@ depends: [
"odoc" {with-doc}
"cohttp-eio" {>= "6.1.0"}
"eio_main" {with-test}
"tls-eio"
"tls-eio" {>= "2.0.1"}
"alcotest" {with-test}
"containers" {with-test}
"cohttp-lwt-unix" {with-test}
]
build: [
["dune" "subst"] {dev}

View file

@ -23,6 +23,7 @@ depends: [
"cohttp-lwt-unix"
"alcotest" {with-test}
"containers" {with-test}
"opentelemetry-lwt" {with-test & = version}
]
build: [
["dune" "subst"] {dev}

View file

@ -18,6 +18,10 @@ depends: [
"odoc" {with-doc}
"logs" {>= "0.7.0"}
"alcotest" {with-test}
"containers" {with-test}
"cohttp-lwt-unix" {with-test}
"opentelemetry-client-cohttp-lwt" {with-test & = version}
"opentelemetry-cohttp-lwt" {with-test & = version}
]
build: [
["dune" "subst"] {dev}

View file

@ -24,6 +24,7 @@ depends: [
"pbrt" {>= "3.0" & < "4.0"}
"ocaml-lsp-server" {with-dev-setup}
"ocamlformat" {with-dev-setup & >= "0.27" & < "0.28"}
"mtime" {>= "1.4"}
]
depopts: ["trace" "lwt" "eio"]
conflicts: [

View file

@ -23,8 +23,6 @@
(executable
(name emit1_eio)
(modules emit1_eio)
(preprocess
(pps lwt_ppx))
(enabled_if
(>= %{ocaml_version} 5.0))
(libraries

View file

@ -33,7 +33,7 @@
(package opentelemetry-client-cohttp-lwt)
(enabled_if
(>= %{ocaml_version} 5.0))
(deps %{bin:emit1_cohttp} %{bin:emit1_eio})
(deps %{bin:emit1_cohttp})
(libraries clients_e2e_lib alcotest opentelemetry opentelemetry.client))
(tests