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

more tests, better error message

Browse source
This commit is contained in:
Simon Cruanes 2024-02-12 13:57:20 -05:00
parent 84ba8c7473
commit 1b9ba95faf
No known key found for this signature in database
GPG key ID: EBFFF6F283F3A2B4
2 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/core/opentelemetry.ml
View file

@ -1,5 +1,9 @@
(** Opentelemetry types and instrumentation *) (** Opentelemetry types and instrumentation *)
open struct
let spf = Printf.sprintf
end
module Lock = Lock module Lock = Lock
(** Global lock. *) (** Global lock. *)
@ -233,7 +237,7 @@ module Util_ = struct
let int_of_hex = function let int_of_hex = function
| '0' .. '9' as c -> Char.code c - Char.code '0' | '0' .. '9' as c -> Char.code c - Char.code '0'
| 'a' .. 'f' as c -> 10 + Char.code c - Char.code 'a' | 'a' .. 'f' as c -> 10 + Char.code c - Char.code 'a'
| _ -> raise (Invalid_argument "invalid hex char") | c -> raise (Invalid_argument (spf "invalid hex char: %C" c))
let bytes_of_hex_substring (s : string) off len = let bytes_of_hex_substring (s : string) off len =
if len mod 2 <> 0 then if len mod 2 <> 0 then
@ -445,8 +449,6 @@ end = struct
Bytes.set bs 54 '0'; Bytes.set bs 54 '0';
bs bs
let spf = Printf.sprintf
let of_w3c_trace_context bs : _ result = let of_w3c_trace_context bs : _ result =
try try
if Bytes.length bs <> 55 then invalid_arg "trace context must be 55 bytes"; if Bytes.length bs <> 55 then invalid_arg "trace context must be 55 bytes";
@ -455,10 +457,16 @@ end = struct
| Some n -> invalid_arg @@ spf "version is %d, expected 0" n | Some n -> invalid_arg @@ spf "version is %d, expected 0" n
| None -> invalid_arg "expected 2-digit version"); | None -> invalid_arg "expected 2-digit version");
if Bytes.get bs 2 <> '-' then invalid_arg "expected '-' before trace_id"; if Bytes.get bs 2 <> '-' then invalid_arg "expected '-' before trace_id";
let trace_id = Trace_id.of_hex_substring (Bytes.unsafe_to_string bs) 3 in let trace_id =
try Trace_id.of_hex_substring (Bytes.unsafe_to_string bs) 3
with Invalid_argument msg -> invalid_arg (spf "in trace id: %s" msg)
in
if Bytes.get bs (3 + 32) <> '-' then if Bytes.get bs (3 + 32) <> '-' then
invalid_arg "expected '-' before parent_id"; invalid_arg "expected '-' before parent_id";
let parent_id = Span_id.of_hex_substring (Bytes.unsafe_to_string bs) 36 in let parent_id =
try Span_id.of_hex_substring (Bytes.unsafe_to_string bs) 36
with Invalid_argument msg -> invalid_arg (spf "in span id: %s" msg)
in
if Bytes.get bs 52 <> '-' then invalid_arg "expected '-' after parent_id"; if Bytes.get bs 52 <> '-' then invalid_arg "expected '-' after parent_id";
(* ignore flags *) (* ignore flags *)

6
tests/core/test_trace_context.ml
View file

@ -36,6 +36,12 @@ let () = test_of_value "00-0123456789abcdef0123456789abcdef-0123456789abcdef-00"
let () = test_of_value "00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01" let () = test_of_value "00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01"
let () = test_of_value "03-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01"
let () = test_of_value "00-ohnonohex7b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01"
let () = test_of_value "00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aazzzzzzb7-01"
let () = print_endline "" let () = print_endline ""
let test_to_value trace_id parent_id = let test_to_value trace_id parent_id =