diff --git a/.gitlab/ci/pipelines/before_merging.yml b/.gitlab/ci/pipelines/before_merging.yml index 346fb40de231821f8ad43ae3085c8766c78fb999..9c46aebd7c3a7ceb0b2302688a432c10b700ea66 100644 --- a/.gitlab/ci/pipelines/before_merging.yml +++ b/.gitlab/ci/pipelines/before_merging.yml @@ -4985,6 +4985,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 6733752396836bca872509a24f47ea7b458f7997..d8aadb1bf7584f9b31f527c87280883dc19b9dad 100644 --- a/.gitlab/ci/pipelines/master_branch.yml +++ b/.gitlab/ci/pipelines/master_branch.yml @@ -406,6 +406,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 1ace66d9c3fae93619d60b49350f17a99c9213d1..932845d3756891224ed1b30b76b025fc3dc4f32b 100644 --- a/.gitlab/ci/pipelines/merge_train.yml +++ b/.gitlab/ci/pipelines/merge_train.yml @@ -4984,6 +4984,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_extended_test.yml b/.gitlab/ci/pipelines/schedule_extended_test.yml index 15cd6d74f36daea10f573f8129cfcd124c51bfde..f86927a46ed1e619e024ddc1d824d2cebf54a59e 100644 --- a/.gitlab/ci/pipelines/schedule_extended_test.yml +++ b/.gitlab/ci/pipelines/schedule_extended_test.yml @@ -3344,6 +3344,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 4e5d2e37a2e30aca787a738a9f37be57aee62e2f..46c459ffe5a198ea52dffe01e13c2ce36b22bacd 100644 --- a/ci/bin/common.ml +++ b/ci/bin/common.ml @@ -1219,7 +1219,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 111c57d51028597eb191402be15bdfdcec362d8c..5d2cbc801f10a560d50e9fa75f6e73496454a2d6 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 34f44386a9f21876a108e0bf8fb12cf9de59100c..2974c8acb8cdfa4fc659a83ec2431b7f99d02a65 100644 --- a/manifest/externals.ml +++ b/manifest/externals.ml @@ -66,7 +66,11 @@ let caqti_lwt = external_lib "caqti-lwt" V.(at_least "2.0.1") let caqti_lwt_unix = external_sublib caqti_lwt "caqti-lwt.unix" -let caqti_sqlite = external_lib "caqti-driver-sqlite3" V.(at_least "2.0.1") +let caqti_sqlite = + (* We have evidence that latest version of Caqti Sqlite introduces + flakiness/hanged connections, at least for the EVM Node. We’ll revert the + upperbound once we have identified the issue. *) + external_lib "caqti-driver-sqlite3" V.(at_least "2.0.1" && less_than "2.2.0") let caqti_postgresql = external_lib "caqti-driver-postgresql" V.(at_least "2.0.1") @@ -352,9 +356,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/octez-l2-libs.opam b/opam/octez-l2-libs.opam index dcd38706487f09decc0d3dc60cb3a1f64d110899..8aa3ea80c88b797394c5f0ec68f23e966d304f18 100644 --- a/opam/octez-l2-libs.opam +++ b/opam/octez-l2-libs.opam @@ -24,7 +24,7 @@ depends: [ "octez-riscv-pvm" { = version } "caqti" "caqti-lwt" { >= "2.0.1" } - "caqti-driver-sqlite3" { >= "2.0.1" } + "caqti-driver-sqlite3" { >= "2.0.1" & < "2.2.0" } "yaml" { >= "3.1.0" } "crunch" { >= "3.3.0" } "re" { >= "1.10.0" } diff --git a/opam/octez-teztale.opam b/opam/octez-teztale.opam index abd176b304e4c4f1a1f96283565e500229ee2b17..4c21d62f649c30914515156ec0951b65c94065c2 100644 --- a/opam/octez-teztale.opam +++ b/opam/octez-teztale.opam @@ -13,7 +13,7 @@ depends: [ "bls12-381" "aches" { >= "1.1.0" } "caqti-driver-postgresql" { >= "2.0.1" } - "caqti-driver-sqlite3" { >= "2.0.1" } + "caqti-driver-sqlite3" { >= "2.0.1" & < "2.2.0" } "caqti-lwt" { >= "2.0.1" } "octez-libs" "ezgzip" diff --git a/opam/virtual/octez-deps.opam b/opam/virtual/octez-deps.opam index 27f309f3a743cae5071215dea91cad47cf30f645..ba331d59917e3c95eb66af0e143baec084815266 100644 --- a/opam/virtual/octez-deps.opam +++ b/opam/virtual/octez-deps.opam @@ -28,7 +28,7 @@ depends: [ "camlzip" { >= "1.12" & < "1.13" } "caqti" "caqti-driver-postgresql" { >= "2.0.1" } - "caqti-driver-sqlite3" { >= "2.0.1" } + "caqti-driver-sqlite3" { >= "2.0.1" & < "2.2.0" } "caqti-dynload" "caqti-lwt" { >= "2.0.1" } "checkseum" { != "0.5.0" } diff --git a/opam/virtual/octez-deps.opam.locked b/opam/virtual/octez-deps.opam.locked index 74f780d1cc086042e2d90fbc6a3c046156d34196..4702c17bf1e2dfd16b8a9ab80927af9c6ed10468 100644 --- a/opam/virtual/octez-deps.opam.locked +++ b/opam/virtual/octez-deps.opam.locked @@ -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,7 +40,7 @@ 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"} @@ -52,14 +53,13 @@ depends: [ "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,26 +72,26 @@ 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-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"} "either" {= "1.0.0"} "eqaf" {= "0.10"} "ezgzip" {= "0.2.3"} @@ -99,8 +99,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"} @@ -129,12 +129,12 @@ 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_ppx" {= "5.8.0"} + "lwt_ppx" {= "5.9.1"} "lwt_react" {= "1.2.0"} "lwt_ssl" {= "1.2.0"} "macaddr" {= "5.6.0"} @@ -148,11 +148,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"} @@ -163,19 +163,19 @@ 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"} - "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"} @@ -198,7 +198,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"} @@ -209,8 +209,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"} @@ -223,17 +223,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"} @@ -241,21 +241,22 @@ depends: [ "tezos-sapling-parameters" {= "1.1.0"} "tezt" {= "4.2.0"} "tezt-bam" {= "0.3"} + "thread-local-storage" {= "0.2"} "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 a3553f591677612964cf05df1d4c9a8f4f939105..8a92798fd75fe008836009a7797e3a38fe63151e 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. @@ -56,7 +56,7 @@ export cargo_version='1.77.2' export opam_version='2.3.0' # Installed via apk python3-dev -export python_version='3.12.9' +export python_version='3.12.10' # Installed via apk export poetry_version='1.8.3' 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}