robur/mirage-monitoring
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

adapt to defunctorisation work #1

Closed
hannes wants to merge 1 commit from variants into main
pull from: variants
merge into: robur:main
Conversation 0 Commits 1 Files changed 4 +9 -9
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 79fd0362b5 - Show all commits

6
mirage-monitoring.opam
View file

@ -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)" ]

2
src/dune
View file

@ -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))

8
src/mirage_monitoring.ml
View file

@ -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

2
src/mirage_monitoring.mli
View file

@ -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 ->