From 748f2352e43f2aa563c7f80aa266d74086ba8be9 Mon Sep 17 00:00:00 2001 From: Simon Cruanes Date: Fri, 13 Mar 2026 13:17:51 -0400 Subject: [PATCH] move to dune 3.11, remove dune-build-info --- dune-project | 5 ++--- opentelemetry-client-cohttp-eio.opam | 4 +--- opentelemetry-client-cohttp-lwt.opam | 4 +--- opentelemetry-client-ocurl-lwt.opam | 4 +--- opentelemetry-client-ocurl.opam | 4 +--- opentelemetry-client.opam | 4 +--- opentelemetry-cohttp-lwt.opam | 4 +--- opentelemetry-logs.opam | 4 +--- opentelemetry-lwt.opam | 4 +--- opentelemetry.opam | 5 +---- src/lib/dune | 1 - src/lib/version.ml | 5 +---- 12 files changed, 12 insertions(+), 36 deletions(-) diff --git a/dune-project b/dune-project index 4f3cbf9d..45461685 100644 --- a/dune-project +++ b/dune-project @@ -1,4 +1,4 @@ -(lang dune 2.9) +(lang dune 3.11) (name opentelemetry) @@ -49,8 +49,7 @@ (>= 0.27) (< 0.28))) (mtime - (>= "1.4")) - dune-build-info) + (>= "1.4"))) (depopts atomic trace thread-local-storage lwt eio picos) (conflicts (trace diff --git a/opentelemetry-client-cohttp-eio.opam b/opentelemetry-client-cohttp-eio.opam index 1f3bfcad..1bfdd88f 100644 --- a/opentelemetry-client-cohttp-eio.opam +++ b/opentelemetry-client-cohttp-eio.opam @@ -12,7 +12,7 @@ license: "MIT" homepage: "https://github.com/imandra-ai/ocaml-opentelemetry" bug-reports: "https://github.com/imandra-ai/ocaml-opentelemetry/issues" depends: [ - "dune" {>= "2.9"} + "dune" {>= "3.11"} "ocaml" {>= "5.00"} "mtime" {>= "1.4"} "ca-certs" @@ -37,11 +37,9 @@ build: [ name "-j" jobs - "--promote-install-files=false" "@install" "@runtest" {with-test} "@doc" {with-doc} ] - ["dune" "install" "-p" name "--create-install-files" name] ] dev-repo: "git+https://github.com/imandra-ai/ocaml-opentelemetry.git" diff --git a/opentelemetry-client-cohttp-lwt.opam b/opentelemetry-client-cohttp-lwt.opam index 71053b0b..b70e3f85 100644 --- a/opentelemetry-client-cohttp-lwt.opam +++ b/opentelemetry-client-cohttp-lwt.opam @@ -12,7 +12,7 @@ license: "MIT" homepage: "https://github.com/imandra-ai/ocaml-opentelemetry" bug-reports: "https://github.com/imandra-ai/ocaml-opentelemetry/issues" depends: [ - "dune" {>= "2.9"} + "dune" {>= "3.11"} "ocaml" {>= "4.08"} "mtime" {>= "1.4"} "opentelemetry" {= version} @@ -37,11 +37,9 @@ build: [ name "-j" jobs - "--promote-install-files=false" "@install" "@runtest" {with-test} "@doc" {with-doc} ] - ["dune" "install" "-p" name "--create-install-files" name] ] dev-repo: "git+https://github.com/imandra-ai/ocaml-opentelemetry.git" diff --git a/opentelemetry-client-ocurl-lwt.opam b/opentelemetry-client-ocurl-lwt.opam index 1abeacf5..4f35c686 100644 --- a/opentelemetry-client-ocurl-lwt.opam +++ b/opentelemetry-client-ocurl-lwt.opam @@ -12,7 +12,7 @@ license: "MIT" homepage: "https://github.com/imandra-ai/ocaml-opentelemetry" bug-reports: "https://github.com/imandra-ai/ocaml-opentelemetry/issues" depends: [ - "dune" {>= "2.9"} + "dune" {>= "3.11"} "ocaml" {>= "4.08"} "mtime" {>= "1.4"} "opentelemetry" {= version} @@ -33,11 +33,9 @@ build: [ name "-j" jobs - "--promote-install-files=false" "@install" "@runtest" {with-test} "@doc" {with-doc} ] - ["dune" "install" "-p" name "--create-install-files" name] ] dev-repo: "git+https://github.com/imandra-ai/ocaml-opentelemetry.git" diff --git a/opentelemetry-client-ocurl.opam b/opentelemetry-client-ocurl.opam index 12b01e4e..791b503f 100644 --- a/opentelemetry-client-ocurl.opam +++ b/opentelemetry-client-ocurl.opam @@ -12,7 +12,7 @@ license: "MIT" homepage: "https://github.com/imandra-ai/ocaml-opentelemetry" bug-reports: "https://github.com/imandra-ai/ocaml-opentelemetry/issues" depends: [ - "dune" {>= "2.9"} + "dune" {>= "3.11"} "ocaml" {>= "4.08"} "mtime" {>= "1.4"} "opentelemetry" {= version} @@ -31,11 +31,9 @@ build: [ name "-j" jobs - "--promote-install-files=false" "@install" "@runtest" {with-test} "@doc" {with-doc} ] - ["dune" "install" "-p" name "--create-install-files" name] ] dev-repo: "git+https://github.com/imandra-ai/ocaml-opentelemetry.git" diff --git a/opentelemetry-client.opam b/opentelemetry-client.opam index cf5b04db..b6a69a3d 100644 --- a/opentelemetry-client.opam +++ b/opentelemetry-client.opam @@ -13,7 +13,7 @@ tags: ["tracing" "opentelemetry" "sdk"] homepage: "https://github.com/imandra-ai/ocaml-opentelemetry" bug-reports: "https://github.com/imandra-ai/ocaml-opentelemetry/issues" depends: [ - "dune" {>= "2.9"} + "dune" {>= "3.11"} "opentelemetry" {= version} "odoc" {with-doc} "alcotest" {with-test} @@ -28,11 +28,9 @@ build: [ name "-j" jobs - "--promote-install-files=false" "@install" "@runtest" {with-test} "@doc" {with-doc} ] - ["dune" "install" "-p" name "--create-install-files" name] ] dev-repo: "git+https://github.com/imandra-ai/ocaml-opentelemetry.git" diff --git a/opentelemetry-cohttp-lwt.opam b/opentelemetry-cohttp-lwt.opam index 96de5e67..39b374ed 100644 --- a/opentelemetry-cohttp-lwt.opam +++ b/opentelemetry-cohttp-lwt.opam @@ -12,7 +12,7 @@ license: "MIT" homepage: "https://github.com/imandra-ai/ocaml-opentelemetry" bug-reports: "https://github.com/imandra-ai/ocaml-opentelemetry/issues" depends: [ - "dune" {>= "2.9"} + "dune" {>= "3.11"} "ocaml" {>= "4.08"} "opentelemetry" {= version} "opentelemetry-lwt" {= version} @@ -32,11 +32,9 @@ build: [ name "-j" jobs - "--promote-install-files=false" "@install" "@runtest" {with-test} "@doc" {with-doc} ] - ["dune" "install" "-p" name "--create-install-files" name] ] dev-repo: "git+https://github.com/imandra-ai/ocaml-opentelemetry.git" diff --git a/opentelemetry-logs.opam b/opentelemetry-logs.opam index 90a192fa..ea341e23 100644 --- a/opentelemetry-logs.opam +++ b/opentelemetry-logs.opam @@ -12,7 +12,7 @@ license: "MIT" homepage: "https://github.com/imandra-ai/ocaml-opentelemetry" bug-reports: "https://github.com/imandra-ai/ocaml-opentelemetry/issues" depends: [ - "dune" {>= "2.9"} + "dune" {>= "3.11"} "ocaml" {>= "4.08"} "opentelemetry" {= version} "odoc" {with-doc} @@ -32,11 +32,9 @@ build: [ name "-j" jobs - "--promote-install-files=false" "@install" "@runtest" {with-test} "@doc" {with-doc} ] - ["dune" "install" "-p" name "--create-install-files" name] ] dev-repo: "git+https://github.com/imandra-ai/ocaml-opentelemetry.git" diff --git a/opentelemetry-lwt.opam b/opentelemetry-lwt.opam index ae34a990..275cc90c 100644 --- a/opentelemetry-lwt.opam +++ b/opentelemetry-lwt.opam @@ -13,7 +13,7 @@ tags: ["instrumentation" "tracing" "opentelemetry" "datadog" "lwt"] homepage: "https://github.com/imandra-ai/ocaml-opentelemetry" bug-reports: "https://github.com/imandra-ai/ocaml-opentelemetry/issues" depends: [ - "dune" {>= "2.9"} + "dune" {>= "3.11"} "ocaml" {>= "4.08"} "opentelemetry" {= version} "ambient-context-lwt" @@ -32,11 +32,9 @@ build: [ name "-j" jobs - "--promote-install-files=false" "@install" "@runtest" {with-test} "@doc" {with-doc} ] - ["dune" "install" "-p" name "--create-install-files" name] ] dev-repo: "git+https://github.com/imandra-ai/ocaml-opentelemetry.git" diff --git a/opentelemetry.opam b/opentelemetry.opam index cbe391fd..c2d9f32b 100644 --- a/opentelemetry.opam +++ b/opentelemetry.opam @@ -14,7 +14,7 @@ tags: ["instrumentation" "tracing" "opentelemetry" "datadog" "jaeger"] homepage: "https://github.com/imandra-ai/ocaml-opentelemetry" bug-reports: "https://github.com/imandra-ai/ocaml-opentelemetry/issues" depends: [ - "dune" {>= "2.9"} + "dune" {>= "3.11"} "ocaml" {>= "4.08"} "ptime" "hmap" @@ -26,7 +26,6 @@ depends: [ "ocaml-lsp-server" {with-dev-setup} "ocamlformat" {with-dev-setup & >= "0.27" & < "0.28"} "mtime" {>= "1.4"} - "dune-build-info" ] depopts: ["atomic" "trace" "thread-local-storage" "lwt" "eio" "picos"] conflicts: [ @@ -41,11 +40,9 @@ build: [ name "-j" jobs - "--promote-install-files=false" "@install" "@runtest" {with-test} "@doc" {with-doc} ] - ["dune" "install" "-p" name "--create-install-files" name] ] dev-repo: "git+https://github.com/imandra-ai/ocaml-opentelemetry.git" diff --git a/src/lib/dune b/src/lib/dune index f1482223..98c8aed6 100644 --- a/src/lib/dune +++ b/src/lib/dune @@ -21,7 +21,6 @@ (re_export opentelemetry.ambient-context) (re_export opentelemetry.atomic) (re_export hmap) - (re_export dune-build-info) mtime mtime.clock.os pbrt diff --git a/src/lib/version.ml b/src/lib/version.ml index a037540d..9349a8db 100644 --- a/src/lib/version.ml +++ b/src/lib/version.ml @@ -1,4 +1 @@ -let version = - match Build_info.V1.version () with - | None -> "dev" - | Some v -> Build_info.V1.Version.to_string v +let version = "%%VERSION%%"