diff --git a/.gitlab/ci/pipelines/before_merging.yml b/.gitlab/ci/pipelines/before_merging.yml index 3cdea366d1d09535683ec33cf91293cac6a70444..1c3343613d5602127c0ab285dc1afc39528e00d3 100644 --- a/.gitlab/ci/pipelines/before_merging.yml +++ b/.gitlab/ci/pipelines/before_merging.yml @@ -4340,6 +4340,10 @@ documentation:odoc: - eval $(opam env) - . ./scripts/ci/sccache-start.sh script: + - export OPAMFETCH='wget' + - opam remote add default https://opam.ocaml.org/ + - opam update + - opam install --yes odoc.2.4.4 - make -C docs odoc-lite after_script: - ./scripts/ci/sccache-stop.sh diff --git a/.gitlab/ci/pipelines/master_branch.yml b/.gitlab/ci/pipelines/master_branch.yml index 41314e5db9749c6987337e2155f2966a3f1037cb..9502906e8745c3392bc43de38895f13ee0b65d06 100644 --- a/.gitlab/ci/pipelines/master_branch.yml +++ b/.gitlab/ci/pipelines/master_branch.yml @@ -430,6 +430,10 @@ documentation:odoc: - eval $(opam env) - . ./scripts/ci/sccache-start.sh script: + - export OPAMFETCH='wget' + - opam remote add default https://opam.ocaml.org/ + - opam update + - opam install --yes odoc.2.4.4 - make -C docs odoc after_script: - ./scripts/ci/sccache-stop.sh diff --git a/.gitlab/ci/pipelines/merge_train.yml b/.gitlab/ci/pipelines/merge_train.yml index 28aff3b5ee85cd94f8591c8b5d553d2ca60bd9eb..4ad05ec264166c2013da45e913b61b1aa774c44c 100644 --- a/.gitlab/ci/pipelines/merge_train.yml +++ b/.gitlab/ci/pipelines/merge_train.yml @@ -4339,6 +4339,10 @@ documentation:odoc: - eval $(opam env) - . ./scripts/ci/sccache-start.sh script: + - export OPAMFETCH='wget' + - opam remote add default https://opam.ocaml.org/ + - opam update + - opam install --yes odoc.2.4.4 - make -C docs odoc-lite after_script: - ./scripts/ci/sccache-stop.sh diff --git a/.gitlab/ci/pipelines/schedule_documentation.yml b/.gitlab/ci/pipelines/schedule_documentation.yml index 34e37ce9997bbc42bb245bf837f97c81c98e7fd1..17de8e37d2b5b90c49b00ccc41ee7ded11b02f04 100644 --- a/.gitlab/ci/pipelines/schedule_documentation.yml +++ b/.gitlab/ci/pipelines/schedule_documentation.yml @@ -139,6 +139,10 @@ documentation:odoc: - eval $(opam env) - . ./scripts/ci/sccache-start.sh script: + - export OPAMFETCH='wget' + - opam remote add default https://opam.ocaml.org/ + - opam update + - opam install --yes odoc.2.4.4 - make -C docs odoc after_script: - ./scripts/ci/sccache-stop.sh diff --git a/.gitlab/ci/pipelines/schedule_extended_test.yml b/.gitlab/ci/pipelines/schedule_extended_test.yml index c2da152f42311f103c3fdb4fc45d02f21b59f321..454b95e0473e2c423b010de5c0ca930687f076e9 100644 --- a/.gitlab/ci/pipelines/schedule_extended_test.yml +++ b/.gitlab/ci/pipelines/schedule_extended_test.yml @@ -3499,6 +3499,10 @@ documentation:odoc: - eval $(opam env) - . ./scripts/ci/sccache-start.sh script: + - export OPAMFETCH='wget' + - opam remote add default https://opam.ocaml.org/ + - opam update + - opam install --yes odoc.2.4.4 - make -C docs odoc-lite after_script: - ./scripts/ci/sccache-stop.sh diff --git a/ci/bin/common.ml b/ci/bin/common.ml index 8f6b33fb6922ef412c89a512c2d76d5864d59e3c..c165537b3594c0b2cb9fc7e6358042d80f2d015a 100644 --- a/ci/bin/common.ml +++ b/ci/bin/common.ml @@ -1169,7 +1169,13 @@ module Documentation = struct ~expire_in:(Duration (Hours 1)) (* Path must be terminated with / to expose artifact (gitlab-org/gitlab#/36706) *) ["docs/_build/api/odoc/"; "docs/odoc.log"]) - ["make -C docs " ^ target] + [ + "export OPAMFETCH='wget'"; + "opam remote add default https://opam.ocaml.org/"; + "opam update"; + "opam install --yes odoc.2.4.4"; + "make -C docs " ^ target; + ] |> enable_cargo_cache |> enable_sccache (** Create the manuals job. diff --git a/flake.lock b/flake.lock index 63038e534aef5ac3bdcf4e61594ecdbfb204c1f6..ee086cd38dc730c1a80e66929f521d6551579bca 100644 --- a/flake.lock +++ b/flake.lock @@ -121,11 +121,11 @@ "opam-repository": { "flake": false, "locked": { - "lastModified": 1738066957, - "narHash": "sha256-zUOPhbEsAJprwvanDVDT3DSV1ioUjuGxMVYCYlzfd2E=", + "lastModified": 1748329542, + "narHash": "sha256-bx4cgSSa5vxFVaySWFsU6wGbUdHN/eMEPWkTpccf9sE=", "owner": "ocaml", "repo": "opam-repository", - "rev": "aa131f3eda80ed7121debe7582faaf50448bc105", + "rev": "e9ce8525130a382fac004612302b2f2268f4188c", "type": "github" }, "original": { diff --git a/manifest/externals.ml b/manifest/externals.ml index 5659c08f87ee92f2d98954336de2fc8e9b15cc54..a2cbd42d7491b53fad90ec798ecd2cda36eaedfa 100644 --- a/manifest/externals.ml +++ b/manifest/externals.ml @@ -362,9 +362,7 @@ let () = [ external_lib "merlin" V.(at_least "4.18"); external_lib "ocaml-lsp-server" V.(at_least "1.20.1"); - (* TODO: https://gitlab.com/tezos/tezos/-/issues/7085 - remove constraint on odoc version when odoc bug is solved *) - external_lib "odoc" V.(at_least "2.4.2"); + external_lib "odoc" V.(at_least "2.4.2" && less_than "3.0.0"); external_lib "ocp-indent" V.True; external_lib "merge-fmt" V.True; ] diff --git a/opam/virtual/octez-deps.opam.locked b/opam/virtual/octez-deps.opam.locked index 7b228522d2c6b76e27252756ec2bcabd57d2f8cf..000c3eead141b0dd9faddfc150de7a32134d7566 100644 --- a/opam/virtual/octez-deps.opam.locked +++ b/opam/virtual/octez-deps.opam.locked @@ -1,6 +1,6 @@ opam-version: "2.0" name: "octez-deps" -version: "~dev" +version: "dev" synopsis: "Virtual package depending on Octez dependencies (profile: octez-deps)" description: @@ -14,17 +14,18 @@ depends: [ "aches" {= "1.1.0"} "aches-lwt" {= "1.1.0"} "afl-persistent" {= "1.4"} - "alcotest" {= "1.8.0"} - "alcotest-lwt" {= "1.8.0"} + "alcotest" {= "1.9.0"} + "alcotest-lwt" {= "1.9.0"} "ambient-context" {= "0.1.0"} "ambient-context-lwt" {= "0.1.0"} "angstrom" {= "0.16.1"} "asetmap" {= "0.8.1"} "asn1-combinators" {= "0.3.2"} "astring" {= "0.8.5"} + "atomic" {= "base"} "bam" {= "0.3"} "bam-ppx" {= "0.3"} - "base" {= "v0.16.3"} + "base" {= "v0.16.4"} "base-bigarray" {= "base"} "base-bytes" {= "base"} "base-domains" {= "base"} @@ -39,27 +40,26 @@ depends: [ "bigstringaf" {= "0.10.0"} "bisect_ppx" {= "2.8.3"} "bos" {= "0.2.1"} - "ca-certs" {= "1.0.0"} + "ca-certs" {= "1.0.1"} "camlp-streams" {= "5.0.1"} "camlzip" {= "1.12"} - "caqti" {= "2.1.2"} - "caqti-driver-postgresql" {= "2.1.2"} - "caqti-driver-sqlite3" {= "2.1.1"} + "caqti" {= "2.2.4"} + "caqti-driver-postgresql" {= "2.2.4"} + "caqti-driver-sqlite3" {= "2.2.4"} "caqti-dynload" {= "2.0.1"} - "caqti-lwt" {= "2.1.1"} + "caqti-lwt" {= "2.2.4"} "checkseum" {= "0.5.2"} "clap" {= "0.3.0"} "class_group_vdf" {= "0.0.5"} "cmdliner" {= "1.3.0"} "cohttp" {= "5.3.1"} - "conduit" {= "7.1.0"} - "conduit-lwt" {= "7.1.0"} - "conduit-lwt-unix" {= "7.1.0"} - "conf-bash" {= "1"} + "conduit" {= "8.0.0"} + "conduit-lwt" {= "8.0.0"} + "conduit-lwt-unix" {= "8.0.0"} "conf-cmake" {= "1"} "conf-g++" {= "1.0"} - "conf-gmp" {= "4"} - "conf-gmp-powm-sec" {= "3"} + "conf-gmp" {= "5"} + "conf-gmp-powm-sec" {= "4"} "conf-hidapi" {= "0"} "conf-libev" {= "4-12"} "conf-libffi" {= "2.0.0"} @@ -72,27 +72,27 @@ depends: [ "conf-zlib" {= "1"} "cppo" {= "1.8.0"} "crowbar" {= "0.2.1"} - "crunch" {= "3.3.1"} + "crunch" {= "4.0.0"} "csexp" {= "1.5.2"} "cstruct" {= "6.2.0"} "cstruct-lwt" {= "6.2.0"} "ctypes" {= "0.23.0"} "ctypes-foreign" {= "0.23.0"} "decompress" {= "1.5.3"} - "digestif" {= "1.2.0"} + "digestif" {= "1.3.0"} "dmap" {= "0.5"} "domain-local-await" {= "1.0.1"} - "domain-name" {= "0.4.0"} + "domain-name" {= "0.4.1"} "dream" {= "1.0.0~alpha7"} "dream-httpaf" {= "1.0.0~alpha3"} "dream-pure" {= "1.0.0~alpha2"} - "dune" {= "3.17.2"} - "dune-build-info" {= "3.17.2"} - "dune-configurator" {= "3.17.2"} - "dune-private-libs" {= "3.17.2"} - "dune-site" {= "3.17.2"} + "dune" {= "3.19.0"} + "dune-build-info" {= "3.19.0"} + "dune-configurator" {= "3.19.0"} + "dune-private-libs" {= "3.19.0"} + "dune-site" {= "3.19.0"} "duration" {= "0.2.1"} - "dyn" {= "3.17.2"} + "dyn" {= "3.19.0"} "eio" {= "1.2"} "eio_posix" {= "1.2"} "either" {= "1.0.0"} @@ -102,8 +102,8 @@ depends: [ "faraday" {= "0.8.2"} "faraday-lwt" {= "0.8.2"} "faraday-lwt-unix" {= "0.8.2"} - "fix" {= "20230505"} - "fmt" {= "0.9.0"} + "fix" {= "20250428"} + "fmt" {= "0.10.0"} "fpath" {= "0.7.3"} "gmap" {= "0.3.0"} "graphql" {= "0.14.0"} @@ -133,14 +133,14 @@ depends: [ "ledgerwallet-tezos" {= "0.4.1"} "logs" {= "0.7.0"} "lru" {= "0.3.1"} - "lwt" {= "5.8.0"} + "lwt" {= "5.8.1"} "lwt-canceler" {= "0.3"} - "lwt-dllist" {= "1.0.1"} + "lwt-dllist" {= "1.1.0"} "lwt-exit" {= "1.0"} "lwt-watcher" {= "0.2"} - "lwt_log" {= "1.1.2"} "lwt_eio" {= "0.5.1"} - "lwt_ppx" {= "5.8.0"} + "lwt_log" {= "1.1.2"} + "lwt_ppx" {= "5.9.1"} "lwt_react" {= "1.2.0"} "lwt_ssl" {= "1.2.0"} "macaddr" {= "5.6.0"} @@ -154,11 +154,11 @@ depends: [ "mew" {= "0.1.0"} "mew_vi" {= "0.5.0"} "mirage-clock" {= "4.2.0"} - "mirage-crypto" {= "1.1.0"} - "mirage-crypto-ec" {= "1.1.0"} - "mirage-crypto-pk" {= "1.1.0"} - "mirage-crypto-rng" {= "1.1.0"} - "mirage-crypto-rng-lwt" {= "1.1.0"} + "mirage-crypto" {= "1.2.0"} + "mirage-crypto-ec" {= "1.2.0"} + "mirage-crypto-pk" {= "1.2.0"} + "mirage-crypto-rng" {= "1.2.0"} + "mirage-crypto-rng-lwt" {= "1.2.0"} "mtime" {= "2.1.0"} "multipart_form" {= "0.6.0"} "multipart_form-lwt" {= "0.6.0"} @@ -169,20 +169,20 @@ depends: [ "ocaml-config" {= "3"} "ocaml-options-vanilla" {= "1"} "ocaml-syntax-shims" {= "1.0.0"} - "ocaml-version" {= "3.7.3"} - "ocamlbuild" {= "0.15.0"} - "ocamlfind" {= "1.9.6"} + "ocaml-version" {= "4.0.0"} + "ocamlbuild" {= "0.16.1"} + "ocamlfind" {= "1.9.8"} "ocamlformat" {= "0.26.2"} "ocamlformat-lib" {= "0.26.2"} - "ocamlgraph" {= "2.1.0"} + "ocamlgraph" {= "2.2.0"} "ocp-indent" {= "1.8.1"} "ocp-ocamlres" {= "0.4"} "ocplib-endian" {= "1.2"} "ohex" {= "0.2.0"} "opam-file-format" {= "2.1.6"} - "opentelemetry" {= "0.10"} + "opentelemetry" {= "0.11.2"} "optint" {= "0.3.0"} - "ordering" {= "3.17.2"} + "ordering" {= "3.19.0"} "parsexp" {= "v0.16.0"} "pbrt" {= "3.1.1"} "pecu" {= "0.7"} @@ -205,7 +205,7 @@ depends: [ "ppx_optcomp" {= "v0.16.0"} "ppx_repr" {= "0.7.0"} "ppx_sexp_conv" {= "v0.16.0"} - "ppxlib" {= "0.34.0"} + "ppxlib" {= "0.35.0"} "prbnmcn-basic-structures" {= "0.0.1"} "prbnmcn-linalg" {= "0.0.1"} "prbnmcn-stats" {= "0.0.6"} @@ -216,8 +216,8 @@ depends: [ "ptime" {= "1.2.0"} "pure-splitmix" {= "0.3"} "pyml" {= "20231101"} - "qcheck-alcotest" {= "0.23"} - "qcheck-core" {= "0.23"} + "qcheck-alcotest" {= "0.25"} + "qcheck-core" {= "0.25"} "re" {= "1.12.0"} "react" {= "1.2.2"} "repr" {= "0.7.0"} @@ -230,17 +230,17 @@ depends: [ "secp256k1-internal" {= "0.4.0"} "semaphore-compat" {= "1.0.2"} "seq" {= "base"} - "seqes" {= "0.3"} + "seqes" {= "0.4"} "sexplib" {= "v0.16.0"} "sexplib0" {= "v0.16.0"} - "sqlite3" {= "5.3.0"} + "sqlite3" {= "5.3.1"} "ssl" {= "0.7.0"} "stdcompat" {= "19"} "stdint" {= "0.7.2"} "stdio" {= "v0.16.0"} "stdlib-random" {= "1.2.0"} "stdlib-shims" {= "0.3.0"} - "stdune" {= "3.17.2"} + "stdune" {= "3.19.0"} "stringext" {= "1.6.0"} "tar" {= "2.6.0"} "tar-unix" {= "2.6.0"} @@ -248,22 +248,23 @@ depends: [ "tezos-sapling-parameters" {= "1.1.0"} "tezt" {= "4.2.0"} "tezt-bam" {= "0.3"} + "thread-local-storage" {= "0.2"} "thread-table" {= "1.0.0"} "time_now" {= "v0.16.0"} - "tls" {= "1.0.4"} - "tls-lwt" {= "1.0.4"} - "topkg" {= "1.0.7"} + "tls" {= "2.0.1"} + "tls-lwt" {= "2.0.1"} + "topkg" {= "1.0.8"} "trie" {= "1.0.0"} "uchar" {= "0.0.2"} "unstrctrd" {= "0.4"} "uri" {= "4.4.0"} "uri-sexp" {= "4.4.0"} "uucp" {= "16.0.0"} - "uuidm" {= "0.9.9"} + "uuidm" {= "0.9.10"} "uuseg" {= "16.0.0"} - "uutf" {= "1.0.3"} + "uutf" {= "1.0.4"} "vector" {= "1.0.0"} - "x509" {= "1.0.5"} + "x509" {= "1.0.6"} "yaml" {= "3.2.0"} "yojson" {= "2.2.2"} "zarith" {= "1.13"} diff --git a/opam/virtual/octez-dev-deps.opam b/opam/virtual/octez-dev-deps.opam index 0b36ad0a9c0b93118b20c679afdbcd9ba463a03a..4db70888d4cb8dd67de0ab0f2ce31ed3d5963ce5 100644 --- a/opam/virtual/octez-dev-deps.opam +++ b/opam/virtual/octez-dev-deps.opam @@ -13,7 +13,7 @@ depends: [ "merlin" { >= "4.18" } "ocaml-lsp-server" { >= "1.20.1" } "ocp-indent" - "odoc" { >= "2.4.2" } + "odoc" { >= "2.4.2" & < "3.0.0" } "utop" { >= "2.8" } ] build: [] diff --git a/scripts/version.sh b/scripts/version.sh index b4e1f78c1acd089a42a4b8930edd1f51641824ab..dc1354e766b50d552106f2dfe14941769bc917fb 100644 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -24,7 +24,7 @@ export recommended_node_version=18.18.2 ## opam_repository is a commit hash of the public opam repository, i.e. ## https://github.com/ocaml/opam-repository -export opam_repository_tag=aa131f3eda80ed7121debe7582faaf50448bc105 +export opam_repository_tag=e9ce8525130a382fac004612302b2f2268f4188c # SHA-256 hashes of the DAL SRSs, as used in 'scripts/install_dal_trusted_setup.sh' to verify # integrity of downloaded SRS. diff --git a/src/lib_profiler/backends/complex/opentelemetry_profiler.ml b/src/lib_profiler/backends/complex/opentelemetry_profiler.ml index 4302efb31094f3009dff3e326ecc698025d6510c..a93121b08ba61b6c4f62281755cf1b15136f1c7d 100644 --- a/src/lib_profiler/backends/complex/opentelemetry_profiler.ml +++ b/src/lib_profiler/backends/complex/opentelemetry_profiler.ml @@ -61,7 +61,10 @@ let trace_operation op ?attrs = let update_scope s f = match s with | Some s -> - Ambient_context.with_binding Opentelemetry.Scope.ambient_scope_key s f + Opentelemetry_ambient_context.with_binding + Opentelemetry.Scope.ambient_scope_key + s + f | None -> f () type config = {service_name : string; verbosity : Profiler.verbosity}