From 2fa98ae46330b54dd0fb1bc60f45daf7229f4b29 Mon Sep 17 00:00:00 2001
From: Hannes Mehnert <hannes@mehnert.org>
Date: Mon, 10 Feb 2025 15:50:40 +0100
Subject: [PATCH] adapt to defunctorisation work

---
 mirage-monitoring.opam    | 6 +++---
 src/dune                  | 2 +-
 src/mirage_monitoring.ml  | 8 ++++----
 src/mirage_monitoring.mli | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/mirage-monitoring.opam b/mirage-monitoring.opam
index c0418a5..189bea6 100644
--- a/mirage-monitoring.opam
+++ b/mirage-monitoring.opam
@@ -14,11 +14,10 @@ depends: [
   "metrics" {>= "0.4.0"}
   "metrics-lwt" {>= "0.2.0"}
   "metrics-influx" {>= "0.2.0"}
-  "mirage-time" {>= "2.0.0"}
+  "mirage-sleep" {>= "4.0.0"}
   "tcpip" {>= "7.0.0"}
   "mirage-runtime" {>= "4.5.0"}
-  "memtrace-mirage" {>= "0.2.1.2.2"}
-  "mirage-clock" {>= "4.0.0"}
+  "memtrace-mirage" {>= "0.2.1.2.3"}
 ]
 conflicts: [
   "mirage-solo5" {< "0.9.2"}
@@ -34,3 +33,4 @@ description: """
 Reporting metrics to Influx, Telegraf. Dynamic adjusting log level and metrics
 sources, memprof profiling.
 """
+x-maintenance-intent: [ "(latest)" ]
diff --git a/src/dune b/src/dune
index 868768a..f982195 100644
--- a/src/dune
+++ b/src/dune
@@ -2,5 +2,5 @@
  (name mirage_monitoring)
  (public_name mirage-monitoring)
  (wrapped false)
- (libraries logs metrics metrics-lwt metrics-influx mirage-time mirage-clock
+ (libraries logs metrics metrics-lwt metrics-influx mirage-sleep
             memtrace-mirage tcpip mirage-runtime))
diff --git a/src/mirage_monitoring.ml b/src/mirage_monitoring.ml
index e3c356b..0d29a92 100644
--- a/src/mirage_monitoring.ml
+++ b/src/mirage_monitoring.ml
@@ -165,8 +165,8 @@ let adjust_metrics s =
     srcs ;
   Ok `Empty
 
-module Make (T : Mirage_time.S) (P : Mirage_clock.PCLOCK) (S : Tcpip.Stack.V4V6) = struct
-  module Memtrace = Memtrace.Make(P)(S.TCP)
+module Make (S : Tcpip.Stack.V4V6) = struct
+  module Memtrace = Memtrace.Make(S.TCP)
 
   let timer conn get host stack dst =
     let datas =
@@ -204,7 +204,7 @@ module Make (T : Mirage_time.S) (P : Mirage_clock.PCLOCK) (S : Tcpip.Stack.V4V6)
     let rec one () =
       Lwt.join [
           timer conn get host stack dst;
-          T.sleep_ns (Duration.of_sec interval)
+          Mirage_sleep.ns (Duration.of_sec interval)
         ] >>= fun () ->
       (one[@tailcall]) ()
     in
@@ -267,7 +267,7 @@ module Make (T : Mirage_time.S) (P : Mirage_clock.PCLOCK) (S : Tcpip.Stack.V4V6)
     let get_cache, reporter = Metrics.cache_reporter () in
     Metrics.set_reporter reporter;
     Metrics.enable_all ();
-    Metrics_lwt.init_periodic (fun () -> T.sleep_ns (Duration.of_sec interval));
+    Metrics_lwt.init_periodic (fun () -> Mirage_sleep.ns (Duration.of_sec interval));
     let host = match hostname with None -> [] | Some host -> [vmname host] in
     Lwt.async (timer_loop get_cache host interval stack (dst, port));
     create_listener stack listen_port
diff --git a/src/mirage_monitoring.mli b/src/mirage_monitoring.mli
index 755ab6b..dbbaf66 100644
--- a/src/mirage_monitoring.mli
+++ b/src/mirage_monitoring.mli
@@ -5,7 +5,7 @@ val counter_metrics : f:('a -> string) -> string ->
 val vmname : string -> Metrics.field
 (** [vmname name] creates a [tag] with the virtual machine name. *)
 
-module Make (T : Mirage_time.S) (P : Mirage_clock.PCLOCK) (S : Tcpip.Stack.V4V6) : sig
+module Make (S : Tcpip.Stack.V4V6) : sig
 
   val create : ?interval:int -> ?hostname:string -> Ipaddr.t -> ?port:int ->
     ?listen_port:int -> ?memtrace_port:int -> ?sampling_rate:float -> S.t ->