Use normalized_metadata instead of manually normalizing metadata

src/json/formatter.rs

@@ -4,6 +4,7 @@ use std::io::Write;
 use serde::ser::{SerializeMap, Serializer};
 use serde::Serialize;
 use tracing::{Event, Metadata, Subscriber};
+use tracing_log::NormalizeEvent;
 use tracing_subscriber::{
     fmt::MakeWriter,
     layer::Context,
@@ -118,7 +119,7 @@ impl EventFormatter for DefaultEventFormatter {
     where
         S: Subscriber + for<'a> tracing_subscriber::registry::LookupSpan<'a>,
     {
-        let metadata = event.metadata();
+        let metadata = event.normalized_metadata();
         let mut buffer = Vec::new();
         let mut serializer = serde_json::Serializer::new(&mut buffer);
         let mut map_serializer = serializer.serialize_map(None)?;
@@ -209,36 +210,6 @@ where
         let mut map_serializer = serializer.serialize_map(None)?;
 
         map_serializer.serialize_entry("environment", self.environment)?;
-        map_serializer.serialize_entry(
-            "target",
-            self.visitor
-                .get("log.target")
-                .unwrap_or_else(|| self.metadata.target()),
-        )?;
-        map_serializer.serialize_entry(
-            "file",
-            self.metadata
-                .file()
-                .or_else(|| self.visitor.get("log.file"))
-                .unwrap_or("-"),
-        )?;
-        map_serializer.serialize_entry(
-            "line",
-            &self
-                .metadata
-                .line()
-                .or_else(|| self.visitor.get("log.line"))
-                .unwrap_or(0),
-        )?;
-
-        for (key, value) in self
-            .visitor
-            .fields()
-            .iter()
-            .filter(|(&key, _)| key != "message" && !key.starts_with("log."))
-        {
-            map_serializer.serialize_entry(key, value)?;
-        }
 
         if let Some(current_span) = self
             .ctx