From 24e9a14bfa7887b9116b97b8233445c3b8054363 Mon Sep 17 00:00:00 2001 From: Ameer Ghani Date: Wed, 1 Nov 2023 16:33:03 -0500 Subject: [PATCH] Remove global HPKE keypair cache from tracing spans (#2213) --- aggregator/src/aggregator.rs | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/aggregator/src/aggregator.rs b/aggregator/src/aggregator.rs index 34c9e9417..d952c714a 100644 --- a/aggregator/src/aggregator.rs +++ b/aggregator/src/aggregator.rs @@ -1110,19 +1110,7 @@ macro_rules! vdaf_ops_dispatch { } impl VdafOps { - #[tracing::instrument( - skip( - self, - clock, - upload_decrypt_failure_counter, - upload_decode_failure_counter, - task, - report_writer, - report - ), - fields(task_id = ?task.id()), - err - )] + #[tracing::instrument(skip_all, fields(task_id = ?task.id()), err)] async fn handle_upload( &self, clock: &C, @@ -1170,7 +1158,7 @@ impl VdafOps { /// Implements the `/aggregate` endpoint for initialization requests for the helper, described /// in §4.4.4.1 & §4.4.4.2 of draft-gpew-priv-ppm. #[tracing::instrument( - skip(self, datastore, aggregate_step_failure_counter, task, req_bytes), + skip(self, datastore, global_hpke_keypairs, aggregate_step_failure_counter, task, req_bytes), fields(task_id = ?task.id()), err )]