From 9ba57c5df1f574aaec027106428c71ad81a8094f Mon Sep 17 00:00:00 2001 From: Matt Bray Date: Wed, 23 Mar 2022 10:01:23 +0000 Subject: [PATCH] refactor: use _conv_key_value --- src/opentelemetry.ml | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/src/opentelemetry.ml b/src/opentelemetry.ml index 8ce4f77d..d0b93d54 100644 --- a/src/opentelemetry.ml +++ b/src/opentelemetry.ml @@ -183,15 +183,21 @@ end type key_value = string * [`Int of int | `String of string | `Bool of bool | `None] +(**/**) +let _conv_value = + let open Proto.Common in + function + | `Int i -> Some (Int_value (Int64.of_int i)) + | `String s -> Some (String_value s) + | `Bool b -> Some (Bool_value b) + | `None -> None + +(**/**) + (**/**) let _conv_key_value (k,v) = let open Proto.Common in - let value = match v with - | `Int i -> Some (Int_value (Int64.of_int i)) - | `String s -> Some (String_value s) - | `Bool b -> Some (Bool_value b) - | `None -> None - in + let value = _conv_value v in default_key_value ~key:k ~value () (**/**) @@ -320,17 +326,7 @@ end = struct let attributes = let open Proto.Common in - let l = List.map - (fun (k,v) -> - let value = match v with - | `Int i -> Some (Int_value (Int64.of_int i)) - | `String s -> Some (String_value s) - | `Bool b -> Some (Bool_value b) - | `None -> None - in - default_key_value ~key:k ~value ()) - attrs - in + let l = List.map _conv_key_value attrs in let l = default_key_value ~key:"service.name" ~value:(Some (String_value service_name)) () :: l