From 8288bcb59b82748ee2c8da4df379960c3bd410a2 Mon Sep 17 00:00:00 2001
From: Shon Feder <shon.feder@gmail.com>
Date: Thu, 10 Jul 2025 16:02:15 -0400
Subject: [PATCH] Use containers in tests

To get access to useful functions that are not in the Stdlib in OCaml 4.08.
---
 dune-project                         |  3 ++-
 opentelemetry-client-cohttp-lwt.opam |  1 +
 tests/client_e2e/clients_e2e_lib.ml  | 28 +++++++++++-----------------
 tests/client_e2e/dune                |  1 +
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/dune-project b/dune-project
index ec273074..8dd272eb 100644
--- a/dune-project
+++ b/dune-project
@@ -122,5 +122,6 @@
    (>= "2.0"))
   cohttp-lwt
   cohttp-lwt-unix
-  (alcotest :with-test))
+  (alcotest :with-test)
+  (containers :with-test))
  (synopsis "Collector client for opentelemetry, using cohttp + lwt"))
diff --git a/opentelemetry-client-cohttp-lwt.opam b/opentelemetry-client-cohttp-lwt.opam
index 1a07ec45..988ad44a 100644
--- a/opentelemetry-client-cohttp-lwt.opam
+++ b/opentelemetry-client-cohttp-lwt.opam
@@ -22,6 +22,7 @@ depends: [
   "cohttp-lwt"
   "cohttp-lwt-unix"
   "alcotest" {with-test}
+  "containers" {with-test}
 ]
 build: [
   ["dune" "subst"] {dev}
diff --git a/tests/client_e2e/clients_e2e_lib.ml b/tests/client_e2e/clients_e2e_lib.ml
index d7752e2a..aa79e84a 100644
--- a/tests/client_e2e/clients_e2e_lib.ml
+++ b/tests/client_e2e/clients_e2e_lib.ml
@@ -1,5 +1,6 @@
 module Client = Opentelemetry_client
 module Proto = Opentelemetry.Proto
+open Containers
 
 let batch_size : Client.Signal.t -> int = function
   | Traces ts -> List.length ts
@@ -25,27 +26,18 @@ let signals_from_batch (signal_batch : Client.Signal.t) =
   | Logs ls -> List.map (fun l -> `Log l) ls
   | Metrics ms -> List.map (fun m -> `Metric m) ms
 
-(* For backwards compat with OCaml 4.08.
-   Copied from the standard library. *)
-let rec find_map f = function
-  | [] -> None
-  | x :: l ->
-    (match f x with
-    | Some _ as result -> result
-    | None -> find_map f l)
-
 let filter_map_spans f signals =
   signals
   |> List.filter_map (function
        | `Log _ | `Metric _ -> None
        | `Trace (r : Proto.Trace.resource_spans) ->
          r.scope_spans
-         |> find_map (fun ss -> ss.Proto.Trace.spans |> find_map f))
+         |> List.find_map (fun ss -> ss.Proto.Trace.spans |> List.find_map f))
 
 let count_spans_with_name name signals =
   signals
   |> filter_map_spans (fun s ->
-         if s.Proto.Trace.name = name then
+         if String.equal s.Proto.Trace.name name then
            Some s
          else
            None)
@@ -57,7 +49,8 @@ let filter_map_metrics f signals =
        | `Log _ | `Trace _ -> None
        | `Metric (r : Proto.Metrics.resource_metrics) ->
          r.scope_metrics
-         |> find_map (fun ss -> ss.Proto.Metrics.metrics |> find_map f))
+         |> List.find_map (fun ss ->
+                ss.Proto.Metrics.metrics |> List.find_map f))
 
 let number_data_point_to_float : Proto.Metrics.number_data_point_value -> float
     = function
@@ -67,7 +60,7 @@ let number_data_point_to_float : Proto.Metrics.number_data_point_value -> float
 let get_metric_values name signals =
   signals
   |> filter_map_metrics (fun (m : Proto.Metrics.metric) ->
-         if m.name <> name then
+         if not (String.equal m.name name) then
            None
          else
            Option.some
@@ -86,7 +79,8 @@ let filter_map_logs (f : Proto.Logs.log_record -> 'a option) signals : 'a list =
        | `Metric _ | `Trace _ -> None
        | `Log (r : Proto.Logs.resource_logs) ->
          r.scope_logs
-         |> find_map (fun ss -> ss.Proto.Logs.log_records |> find_map f))
+         |> List.find_map (fun ss ->
+                ss.Proto.Logs.log_records |> List.find_map f))
 
 let count_logs_with_body p signals =
   signals
@@ -156,7 +150,7 @@ let tests params signal_batches =
             (let all_alloc_events =
                signals
                |> filter_map_spans (fun s ->
-                      if s.name <> "alloc" then
+                      if not (String.equal s.name "alloc") then
                         Some s.events
                       else
                         None)
@@ -164,7 +158,7 @@ let tests params signal_batches =
              in
              all_alloc_events
              |> List.for_all (fun (e : Proto.Trace.span_event) ->
-                    e.name = "done with alloc")));
+                    String.equal e.name "done with alloc")));
     test "num-sleep metrics" (fun () ->
         Alcotest.(check' (float 0.))
           ~msg:"should record jobs * iterations sleeps"
@@ -180,7 +174,7 @@ let tests params signal_batches =
             (signals
             |> count_logs_with_body (function
                  | Some (Proto.Common.String_value s)
-                   when String.starts_with ~prefix:"inner at" s ->
+                   when String.prefix ~pre:"inner at" s ->
                    true
                  | _ -> false)));
   ]
diff --git a/tests/client_e2e/dune b/tests/client_e2e/dune
index 142b6630..706740da 100644
--- a/tests/client_e2e/dune
+++ b/tests/client_e2e/dune
@@ -16,6 +16,7 @@
   cohttp-lwt-unix
   fmt
   unix
+  containers
   logs.fmt
   logs.threaded
   opentelemetry.client))