simplify condition to add explicit keys

src/logger/formatter.rs

@@ -30,8 +30,6 @@ const MESSAGE: &str = "message";
 const HOSTNAME: &str = "hostname";
 const PID: &str = "pid";
 const LEVEL: &str = "level";
-const X_TENANT_ID: &str = "tenant_id";
-const X_REQUEST_ID: &str = "request_id";
 const TARGET: &str = "target";
 const SERVICE: &str = "service";
 const LINE: &str = "line";
@@ -59,17 +57,6 @@ pub static IMPLICIT_KEYS: Lazy<rustc_hash::FxHashSet<&str>> = Lazy::new(|| {
     set
 });
 
-/// Extra implicit keys. Keys that are not purely implicit but need to be logged alongside
-/// other implicit keys in the log json.
-pub static EXTRA_IMPLICIT_KEYS: Lazy<rustc_hash::FxHashSet<&str>> = Lazy::new(|| {
-    let mut set = rustc_hash::FxHashSet::default();
-
-    set.insert(X_TENANT_ID);
-    set.insert(X_REQUEST_ID);
-
-    set
-});
-
 /// Describe type of record: entering a span, exiting a span, an event.
 #[derive(Clone, Debug)]
 pub enum RecordType {
@@ -160,7 +147,6 @@ where
         S: Subscriber + for<'a> LookupSpan<'a>,
     {
         let is_extra = |s: &str| !IMPLICIT_KEYS.contains(s);
-        let is_extra_implicit = |s: &str| is_extra(s) && EXTRA_IMPLICIT_KEYS.contains(s);
 
         map_serializer.serialize_entry(MESSAGE, &message)?;
         map_serializer.serialize_entry(HOSTNAME, &self.hostname)?;
@@ -200,9 +186,7 @@ where
             let extensions = span.extensions();
             if let Some(visitor) = extensions.get::<Storage<'_>>() {
                 for (key, value) in &visitor.values {
-                    if is_extra_implicit(key) && !explicit_entries_set.contains(key)
-                        || is_extra(key) && !explicit_entries_set.contains(key)
-                    {
+                    if is_extra(key) && !explicit_entries_set.contains(key) {
                         map_serializer.serialize_entry(key, value)?;
                     } else {
                         tracing::warn!(