From 7b5b451b2ca322255d049adb2d98caf5016054e9 Mon Sep 17 00:00:00 2001 From: Simon Cruanes Date: Sat, 27 Dec 2025 22:18:08 -0500 Subject: [PATCH] finally redact these logs --- tests/logs/test_logs_e2e.expected | 13 +------------ tests/logs/test_logs_e2e.ml | 10 ++++++++++ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/tests/logs/test_logs_e2e.expected b/tests/logs/test_logs_e2e.expected index 451aad62..64c76d63 100644 --- a/tests/logs/test_logs_e2e.expected +++ b/tests/logs/test_logs_e2e.expected @@ -1,17 +1,6 @@ { resource = Some( - { attributes = - [{ key = "service.namespace"; - value = Some(String_value("ocaml-otel.test")); - }; - { key = "service.name"; value = Some(String_value("emit_logs")); }; - { key = "process.runtime.version"; - value = Some(String_value("5.3.0")); - }; - { key = "process.runtime.name"; - value = Some(String_value("ocaml")); - } - ]; + { attributes = []; dropped_attributes_count = 0 (* absent *); entity_refs = []; }); diff --git a/tests/logs/test_logs_e2e.ml b/tests/logs/test_logs_e2e.ml index 8739a249..2fa61986 100644 --- a/tests/logs/test_logs_e2e.ml +++ b/tests/logs/test_logs_e2e.ml @@ -1,5 +1,6 @@ module Client = Opentelemetry_client module L = Opentelemetry_proto.Logs +module Res = Opentelemetry_proto.Resource (* NOTE: This port must be different from that used by other integration tests, to prevent socket binding clashes. *) @@ -18,6 +19,14 @@ let tests (signal_batches : Client.Resource_signal.t list) = | Logs ls -> ls (* Mask out the times so tests don't change in between runs *) |> List.map (fun (l : L.resource_logs) -> + let masked_resource = + l.resource + |> Option.map (fun (r : Res.resource) -> + let r = Res.copy_resource r in + (* just remove the metadata... *) + Res.resource_set_attributes r []; + r) + in let masked_scope_logs = List.map (fun (sl : L.scope_logs) -> @@ -40,6 +49,7 @@ let tests (signal_batches : Client.Resource_signal.t list) = in let l = L.copy_resource_logs l in L.resource_logs_set_scope_logs l masked_scope_logs; + Option.iter (L.resource_logs_set_resource l) masked_resource; l) |> List.iter (Format.printf "%a\n" L.pp_resource_logs) | _ -> ())