fix

Author: lalitb

opentelemetry-appender-tracing/src/layer.rs

@@ -35,61 +35,62 @@ fn get_filename(filepath: &str) -> &str {
     filepath
 }
 
-impl <'a, LR: LogRecord> EventVisitor<'a, LR> {
+impl<'a, LR: LogRecord> EventVisitor<'a, LR> {
     fn new(log_record: &'a mut LR) -> Self {
-        EventVisitor{log_record}
+        EventVisitor { log_record }
     }
     fn visit_metadata(&mut self, meta: &Metadata) {
-        self.log_record.add_attribute(Key::new("name"), AnyValue::from(meta.name()));
+        self.log_record
+            .add_attribute(Key::new("name"), AnyValue::from(meta.name()));
 
         #[cfg(feature = "experimental_metadata_attributes")]
         self.visit_experimental_metadata(meta);
     }
 
     #[cfg(feature = "experimental_metadata_attributes")]
     fn visit_experimental_metadata(&mut self, meta: &Metadata) {
-        self.log_record_attributes
-            .push(("log.target".into(), meta.target().to_owned().into()));
+        self.log_record.add_attribute(
+            Key::new("log.target"),
+            AnyValue::from(meta.target().to_owned()),
+        );
 
         if let Some(module_path) = meta.module_path() {
-            self.log_record_attributes
-                .push(("code.namespace".into(), module_path.to_owned().into()));
+            self.log_record.add_attribute(
+                Key::new("code.namespace"),
+                AnyValue::from(module_path.to_owned()),
+            );
+            s
         }
 
         if let Some(filepath) = meta.file() {
-            self.log_record_attributes
-                .push(("code.filepath".into(), filepath.to_owned().into()));
-            self.log_record_attributes.push((
-                "code.filename".into(),
-                get_filename(filepath).to_owned().into(),
-            ));
+            self.log_record.add_attribute(
+                Key::new("code.filepath"),
+                AnyValue::from(filepath.to_owned()),
+            );
+            self.log_record.add_attribute(
+                Key::new("code.filename"),
+                AnyValue::from(get_filename(filepath).to_owned()),
+            );
         }
 
         if let Some(line) = meta.line() {
-            self.log_record_attributes
-                .push(("code.lineno".into(), line.into()));
-        }
-    }
-
-    fn push_to_otel_log_record<LR: LogRecord>(self, log_record: &mut LR) {
-        if let Some(body) = self.log_record_body {
-            log_record.set_body(body);
+            self.log_record
+                .add_attribute(Key::new("code.lineno"), AnyValue::from(line));
         }
-        log_record.add_attributes(self.log_record_attributes);
     }
 }
 
-impl tracing::field::Visit for EventVisitor {
+impl<'a, LR: LogRecord> tracing::field::Visit for EventVisitor<'a, LR> {
     fn record_debug(&mut self, field: &tracing::field::Field, value: &dyn std::fmt::Debug) {
         #[cfg(feature = "experimental_metadata_attributes")]
         if is_duplicated_metadata(field.name()) {
             return;
         }
         if field.name() == "message" {
-            self.log_record_body = Some(format!("{value:?}").into());
+            self.log_record.set_body(format!("{:?}", value).into());
         } else {
-            self.log_record_attributes
-                .push((field.name().into(), format!("{value:?}").into()));
+            self.log_record
+                .add_attribute(Key::new(field.name()), AnyValue::from(format!("{value:?}")));
         }
     }
 
@@ -98,27 +99,27 @@ impl tracing::field::Visit for EventVisitor {
         if is_duplicated_metadata(field.name()) {
             return;
         }
-        self.log_record_attributes
-            .push((field.name().into(), value.to_owned().into()));
+        self.log_record
+            .add_attribute(Key::new(field.name()), AnyValue::from(value.to_owned()));
     }
 
     fn record_bool(&mut self, field: &tracing_core::Field, value: bool) {
-        self.log_record_attributes
-            .push((field.name().into(), value.into()));
+        self.log_record
+            .add_attribute(Key::new(field.name()), AnyValue::from(value));
     }
 
     fn record_f64(&mut self, field: &tracing::field::Field, value: f64) {
-        self.log_record_attributes
-            .push((field.name().into(), value.into()));
+        self.log_record
+            .add_attribute(Key::new(field.name()), AnyValue::from(value));
     }
 
     fn record_i64(&mut self, field: &tracing::field::Field, value: i64) {
         #[cfg(feature = "experimental_metadata_attributes")]
         if is_duplicated_metadata(field.name()) {
             return;
         }
-        self.log_record_attributes
-            .push((field.name().into(), value.into()));
+        self.log_record
+            .add_attribute(Key::new(field.name()), AnyValue::from(value));
     }
 
     // TODO: Remaining field types from AnyValue : Bytes, ListAny, Boolean
@@ -173,11 +174,10 @@ where
         log_record.set_severity_number(severity_of_level(meta.level()));
         log_record.set_severity_text(meta.level().to_string().into());
 
-        let mut visitor = EventVisitor::default();
+        let mut visitor = EventVisitor::new(&mut log_record);
         visitor.visit_metadata(meta);
         // Visit fields.
         event.record(&mut visitor);
-        visitor.push_to_otel_log_record(&mut log_record);
 
         self.logger.emit(log_record);
     }