From 1a088da6ef81b001f9e5d1730ba91ea2fa8ca511 Mon Sep 17 00:00:00 2001
From: Ana Hobden <operator@hoverbear.org>
Date: Mon, 26 Oct 2020 13:25:21 -0700
Subject: [PATCH] fix: make instrumentation only on trace

Signed-off-by: Ana Hobden <operator@hoverbear.org>
---
 src/event/log_event.rs  | 28 ++++++++++++++--------------
 src/event/lookup/mod.rs | 14 +++++++-------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/event/log_event.rs b/src/event/log_event.rs
index d121047475eb8..2de3eafc8f9da 100644
--- a/src/event/log_event.rs
+++ b/src/event/log_event.rs
@@ -13,27 +13,27 @@ pub struct LogEvent {
 }
 
 impl LogEvent {
-    #[instrument(skip(self, key), fields(key = %key.as_ref()))]
+    #[instrument(level = "trace", skip(self, key), fields(key = %key.as_ref()))]
     pub fn get(&self, key: impl AsRef<str>) -> Option<&Value> {
         util::log::get(&self.fields, key.as_ref())
     }
 
-    #[instrument(skip(self, key), fields(key = %key.as_ref()))]
+    #[instrument(level = "trace", skip(self, key), fields(key = %key.as_ref()))]
     pub fn get_flat(&self, key: impl AsRef<str>) -> Option<&Value> {
         self.fields.get(key.as_ref())
     }
 
-    #[instrument(skip(self, key), fields(key = %key.as_ref()))]
+    #[instrument(level = "trace", skip(self, key), fields(key = %key.as_ref()))]
     pub fn get_mut(&mut self, key: impl AsRef<str>) -> Option<&mut Value> {
         util::log::get_mut(&mut self.fields, key.as_ref())
     }
 
-    #[instrument(skip(self, key), fields(key = %key.as_ref()))]
+    #[instrument(level = "trace", skip(self, key), fields(key = %key.as_ref()))]
     pub fn contains(&self, key: impl AsRef<str>) -> bool {
         util::log::contains(&self.fields, key.as_ref())
     }
 
-    #[instrument(skip(self, key), fields(key = %key.as_ref()))]
+    #[instrument(level = "trace", skip(self, key), fields(key = %key.as_ref()))]
     pub fn insert(
         &mut self,
         key: impl AsRef<str>,
@@ -42,7 +42,7 @@ impl LogEvent {
         util::log::insert(&mut self.fields, key.as_ref(), value.into())
     }
 
-    #[instrument(skip(self, key), fields(key = ?key))]
+    #[instrument(level = "trace", skip(self, key), fields(key = ?key))]
     pub fn insert_path<V>(&mut self, key: Vec<PathComponent>, value: V) -> Option<Value>
     where
         V: Into<Value> + Debug,
@@ -50,7 +50,7 @@ impl LogEvent {
         util::log::insert_path(&mut self.fields, key, value.into())
     }
 
-    #[instrument(skip(self, key), fields(key = %key))]
+    #[instrument(level = "trace", skip(self, key), fields(key = %key))]
     pub fn insert_flat<K, V>(&mut self, key: K, value: V)
     where
         K: Into<String> + Display,
@@ -59,7 +59,7 @@ impl LogEvent {
         self.fields.insert(key.into(), value.into());
     }
 
-    #[instrument(skip(self, key), fields(key = %key.as_ref()))]
+    #[instrument(level = "trace", skip(self, key), fields(key = %key.as_ref()))]
     pub fn try_insert(&mut self, key: impl AsRef<str>, value: impl Into<Value> + Debug) {
         let key = key.as_ref();
         if !self.contains(key) {
@@ -67,32 +67,32 @@ impl LogEvent {
         }
     }
 
-    #[instrument(skip(self, key), fields(key = %key.as_ref()))]
+    #[instrument(level = "trace", skip(self, key), fields(key = %key.as_ref()))]
     pub fn remove(&mut self, key: impl AsRef<str>) -> Option<Value> {
         util::log::remove(&mut self.fields, key.as_ref(), false)
     }
 
-    #[instrument(skip(self, key), fields(key = %key.as_ref()))]
+    #[instrument(level = "trace", skip(self, key), fields(key = %key.as_ref()))]
     pub fn remove_prune(&mut self, key: impl AsRef<str>, prune: bool) -> Option<Value> {
         util::log::remove(&mut self.fields, key.as_ref(), prune)
     }
 
-    #[instrument(skip(self))]
+    #[instrument(level = "trace", skip(self))]
     pub fn keys<'a>(&'a self) -> impl Iterator<Item = String> + 'a {
         util::log::keys(&self.fields)
     }
 
-    #[instrument(skip(self))]
+    #[instrument(level = "trace", skip(self))]
     pub fn all_fields(&self) -> impl Iterator<Item = (String, &Value)> + Serialize {
         util::log::all_fields(&self.fields)
     }
 
-    #[instrument(skip(self))]
+    #[instrument(level = "trace", skip(self))]
     pub fn is_empty(&self) -> bool {
         self.fields.is_empty()
     }
 
-    #[instrument(skip(self, lookup), fields(lookup = %lookup), err)]
+    #[instrument(level = "trace", skip(self, lookup), fields(lookup = %lookup), err)]
     fn entry(&mut self, lookup: Lookup) -> crate::Result<Entry<String, Value>> {
         trace!("Seeking to entry.");
         let mut walker = lookup.into_iter().enumerate();
diff --git a/src/event/lookup/mod.rs b/src/event/lookup/mod.rs
index f686cb499676e..e93d5502ac4a7 100644
--- a/src/event/lookup/mod.rs
+++ b/src/event/lookup/mod.rs
@@ -90,24 +90,24 @@ impl Display for Lookup {
 
 impl Lookup {
     /// Push onto the internal list of segments.
-    #[instrument]
+    #[instrument(level = "trace")]
     pub fn push(&mut self, segment: Segment) {
         trace!(length = %self.segments.len(), "Pushing.");
         self.segments.push(segment)
     }
 
-    #[instrument]
+    #[instrument(level = "trace")]
     pub fn pop(&mut self) -> Option<Segment> {
         trace!(length = %self.segments.len(), "Popping.");
         self.segments.pop()
     }
 
-    #[instrument]
+    #[instrument(level = "trace")]
     pub fn iter(&self) -> Iter<'_, Segment> {
         self.segments.iter()
     }
 
-    #[instrument]
+    #[instrument(level = "trace")]
     pub fn from_indexmap(
         values: IndexMap<String, TomlValue>,
     ) -> crate::Result<IndexMap<Lookup, Value>> {
@@ -118,7 +118,7 @@ impl Lookup {
         Ok(discoveries)
     }
 
-    #[instrument]
+    #[instrument(level = "trace")]
     pub fn from_toml_table(value: TomlValue) -> crate::Result<IndexMap<Lookup, Value>> {
         let mut discoveries = IndexMap::new();
         match value {
@@ -136,7 +136,7 @@ impl Lookup {
         }
     }
 
-    #[instrument]
+    #[instrument(level = "trace")]
     fn recursive_step(
         lookup: Lookup,
         value: TomlValue,
@@ -170,7 +170,7 @@ impl Lookup {
     }
 
     /// Raise any errors that might stem from the lookup being invalid.
-    #[instrument]
+    #[instrument(level = "trace")]
     fn is_valid(&self) -> crate::Result<()> {
         if self.segments.is_empty() {
             return Err("Lookups must have at least 1 segment to be valid.".into());