simon/ocaml-opentelemetry
1
0
Fork 0
mirror of https://github.com/ocaml-tracing/ocaml-opentelemetry.git synced 2026-03-10 20:48:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: proper starting point for cumulative metrics

Browse source 
use the start of the program as a fixed reference point.
see: https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/datamodel.md#temporality
This commit is contained in:
Simon Cruanes 2022-04-26 10:08:56 -04:00
parent 62f3bb8b03
commit 2149bb0714
No known key found for this signature in database
GPG key ID: EBFFF6F283F3A2B4
1 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/opentelemetry.ml
View file

@ -582,24 +582,26 @@ module Metrics = struct
type t = Metrics_types.metric type t = Metrics_types.metric
let _program_start = Timestamp_ns.now_unix_ns()
(** Number data point, as a float *) (** Number data point, as a float *)
let float ?start_time_unix_nano let float ?(start_time_unix_nano=_program_start)
?(now=Timestamp_ns.now_unix_ns()) ?(now=Timestamp_ns.now_unix_ns())
?(attrs=[]) ?(attrs=[])
(d:float) : number_data_point = (d:float) : number_data_point =
let attributes = attrs |> List.map _conv_key_value in let attributes = attrs |> List.map _conv_key_value in
default_number_data_point default_number_data_point
?start_time_unix_nano ~time_unix_nano:now ~start_time_unix_nano ~time_unix_nano:now
~attributes ~attributes
~value:(As_double d) () ~value:(As_double d) ()
(** Number data point, as an int *) (** Number data point, as an int *)
let int ?start_time_unix_nano let int ?(start_time_unix_nano=_program_start)
?(now=Timestamp_ns.now_unix_ns()) ?(now=Timestamp_ns.now_unix_ns())
?(attrs=[]) ?(attrs=[])
(i:int) : number_data_point = (i:int) : number_data_point =
let attributes = attrs |> List.map _conv_key_value in let attributes = attrs |> List.map _conv_key_value in
default_number_data_point ?start_time_unix_nano ~time_unix_nano:now default_number_data_point ~start_time_unix_nano ~time_unix_nano:now
~attributes ~attributes
~value:(As_int (Int64.of_int i)) () ~value:(As_int (Int64.of_int i)) ()
@ -768,34 +770,30 @@ end = struct
let word_to_bytes n = n * bytes_per_word let word_to_bytes n = n * bytes_per_word
let word_to_bytes_f n = n *. float bytes_per_word let word_to_bytes_f n = n *. float bytes_per_word
(* TODO: use atomic *)
let last = ref (Timestamp_ns.now_unix_ns())
let get_metrics () : Metrics.t list = let get_metrics () : Metrics.t list =
let gc = Gc.quick_stat () in let gc = Gc.quick_stat () in
let start_time_unix_nano = !last in let now = Timestamp_ns.now_unix_ns() in
last := Timestamp_ns.now_unix_ns();
let open Metrics in let open Metrics in
let open Conventions.Metrics in let open Conventions.Metrics in
[ [
gauge ~name:Process.Runtime.Ocaml.GC.major_heap ~unit_:"B" gauge ~name:Process.Runtime.Ocaml.GC.major_heap ~unit_:"B"
[ int (word_to_bytes gc.Gc.heap_words) ]; [ int ~now (word_to_bytes gc.Gc.heap_words) ];
sum ~name:Process.Runtime.Ocaml.GC.minor_allocated sum ~name:Process.Runtime.Ocaml.GC.minor_allocated
~aggregation_temporality:Metrics.Aggregation_temporality_cumulative ~aggregation_temporality:Metrics.Aggregation_temporality_cumulative
~is_monotonic:true ~is_monotonic:true
~unit_:"B" ~unit_:"B"
[ float ~start_time_unix_nano (word_to_bytes_f gc.Gc.minor_words) ]; [ float ~now (word_to_bytes_f gc.Gc.minor_words) ];
sum ~name:Process.Runtime.Ocaml.GC.minor_collections sum ~name:Process.Runtime.Ocaml.GC.minor_collections
~aggregation_temporality:Metrics.Aggregation_temporality_cumulative ~aggregation_temporality:Metrics.Aggregation_temporality_cumulative
~is_monotonic:true ~is_monotonic:true
[ int ~start_time_unix_nano gc.Gc.minor_collections ]; [ int ~now gc.Gc.minor_collections ];
sum ~name:Process.Runtime.Ocaml.GC.major_collections sum ~name:Process.Runtime.Ocaml.GC.major_collections
~aggregation_temporality:Metrics.Aggregation_temporality_cumulative ~aggregation_temporality:Metrics.Aggregation_temporality_cumulative
~is_monotonic:true ~is_monotonic:true
[ int ~start_time_unix_nano gc.Gc.major_collections ]; [ int ~now gc.Gc.major_collections ];
sum ~name:Process.Runtime.Ocaml.GC.compactions sum ~name:Process.Runtime.Ocaml.GC.compactions
~aggregation_temporality:Metrics.Aggregation_temporality_cumulative ~aggregation_temporality:Metrics.Aggregation_temporality_cumulative
~is_monotonic:true ~is_monotonic:true
[ int ~start_time_unix_nano gc.Gc.compactions ]; [ int ~now gc.Gc.compactions ];
] ]
end end