Improve ocaml-ci builds

smondet · rr0gi · commit 6ea2ff0b8b6c · 2024-11-14T02:48:25.000Z
- `String.starts_with` added in 4.13.
- `__FUNCTION__` added in 4.12.
- Force version of PCRE bindings (from 2020, OCaml 4.08).
- Force version of Lwt (`Lwt.reraise` added in 5.7.0).
diff --git a/devkit.opam b/devkit.opam
@@ -18,10 +18,10 @@ depends: [
   "camlzip"
   "libevent" {>= "0.8.0"}
   "ocurl" {>= "0.7.2"}
-  "pcre"
+  "pcre" {>= "7.4.6"}
   "trace" {>= "0.4"}
   "extunix" {>= "0.1.4"}
-  "lwt" {>= "2.5.2"}
+  "lwt" {>= "5.7.0"}
   "lwt_ppx"
   "base-bytes"
   "base-unix"
diff --git a/web.ml b/web.ml
@@ -247,7 +247,7 @@ module Http (IO : IO_TYPE) (Curl_IO : CURL with type 'a t = 'a IO.t) : HTTP with
   (* Given a list of strings, check pre-existing entry starting with `~name`; and adds the concatenation of `~name` and `~value` if not. *)
   let add_if_absent ~name ~value strs =
     match strs with
-    | Some strs when List.exists (StringLabels.starts_with ~prefix:(name^":")) strs -> strs
+    | Some strs when List.exists (fun s -> Stre.starts_with s (name^":")) strs -> strs
     | Some strs -> (String.concat ": " [name; value]) :: strs
     | None -> [String.concat ": " [name; value]]
 
@@ -301,7 +301,10 @@ module Http (IO : IO_TYPE) (Curl_IO : CURL with type 'a t = 'a IO.t) : HTTP with
         "url.full", `String url;
       ]
     in
-    let explicit_span = Possibly_otel.enter_manual_span ~__FUNCTION__ ~__FILE__ ~__LINE__ ~data:describe action_name in
+    let explicit_span =
+      (* We set the value of `__FUNCTION__` to preserve the build with OCaml < 4.12. *)
+      Possibly_otel.enter_manual_span
+        ~__FUNCTION__:"Devkit.Web.Http.http_request'" ~__FILE__ ~__LINE__ ~data:describe action_name in
 
     let headers = match Possibly_otel.Traceparent.get_ambient ~explicit_span () with
     | None -> headers
