From b6d5f226fa23cd256bed6f88d3136812fa95aaf7 Mon Sep 17 00:00:00 2001 From: Nathan Shaaban <86252985+ctrlaltf24@users.noreply.github.com> Date: Fri, 14 Jul 2023 12:59:09 -0700 Subject: [PATCH] fix: remove key collision logging While this log message is nice to have, it's not worth having an infinite loop over Alternative solutions: - Consider renaming colliding field Fixes #33 --- src/formatting_layer.rs | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/src/formatting_layer.rs b/src/formatting_layer.rs index 72feb98..f9e0f21 100644 --- a/src/formatting_layer.rs +++ b/src/formatting_layer.rs @@ -209,26 +209,20 @@ impl MakeWriter<'a> + 'static> BunyanFormattingLayer { // Add all default fields for (key, value) in self.default_fields.iter() { + // Make sure this key isn't reserved. If it is reserved, + // silently ignore if !BUNYAN_REQUIRED_FIELDS.contains(&key.as_str()) { self.serialize_field(&mut map_serializer, key, value)?; - } else { - tracing::debug!( - "{} is a reserved field in the bunyan log format. Skipping it.", - key - ); } } let extensions = span.extensions(); if let Some(visitor) = extensions.get::() { for (key, value) in visitor.values() { + // Make sure this key isn't reserved. If it is reserved, + // silently ignore if !BUNYAN_REQUIRED_FIELDS.contains(key) { self.serialize_field(&mut map_serializer, key, value)?; - } else { - tracing::debug!( - "{} is a reserved field in the bunyan log format. Skipping it.", - key - ); } } } @@ -361,13 +355,10 @@ where let extensions = span.extensions(); if let Some(visitor) = extensions.get::() { for (key, value) in visitor.values() { + // Make sure this key isn't reserved. If it is reserved, + // silently ignore if !BUNYAN_REQUIRED_FIELDS.contains(key) { self.serialize_field(&mut map_serializer, key, value)?; - } else { - tracing::debug!( - "{} is a reserved field in the bunyan log format. Skipping it.", - key - ); } } }