use the tracing event name as the otel event name

Author: zzlk

src/layer.rs

@@ -1052,6 +1052,7 @@ where
             let target = KeyValue::new(target, Value::String(meta.target().into()));
 
             let mut otel_event = otel::Event::new(
+                // event.metadata().name(),
                 String::new(),
                 crate::time::now(),
                 vec![
@@ -1071,6 +1072,15 @@ where
                 sem_conv_config: self.sem_conv_config,
             });
 
+            // If the event name is still empty, then there was no special handling of error fields.
+            // It should be safe to set the event name to the name provided by tracing.
+            // This is a hack but there are existing hacks that depend on the name being empty, so to avoid breaking those the event name is set here.
+            // Ideally, the name should be set above when the event is constructed.
+            // see: https://github.com/tokio-rs/tracing-opentelemetry/pull/28
+            if otel_event.name.is_empty() {
+                otel_event.name = std::borrow::Cow::Borrowed(event.metadata().name());
+            }
+
             let mut extensions = span.extensions_mut();
             let otel_data = extensions.get_mut::<OtelData>();
 
@@ -1489,6 +1499,45 @@ mod tests {
         );
     }
 
+    #[test]
+    fn records_event_name() {
+        let tracer = TestTracer(Arc::new(Mutex::new(None)));
+        let subscriber = tracing_subscriber::registry().with(layer().with_tracer(tracer.clone()));
+
+        let err = TestDynError::new("base error")
+            .with_parent("intermediate error")
+            .with_parent("user error");
+
+        tracing::subscriber::with_default(subscriber, || {
+            let span = tracing::debug_span!(
+                "request",
+                error = &err as &(dyn std::error::Error + 'static)
+            );
+
+            span.in_scope(|| {
+                tracing::event!(tracing::Level::INFO, "event name 1");
+                tracing::event!(name: "event name 2", tracing::Level::INFO, field1 = "field1");
+            });
+        });
+
+        let events = tracer
+            .0
+            .lock()
+            .unwrap()
+            .as_ref()
+            .unwrap()
+            .builder
+            .events
+            .as_ref()
+            .unwrap()
+            .clone();
+
+        let mut iter = events.iter();
+
+        assert_eq!(iter.next().unwrap().name, "event name 1");
+        assert_eq!(iter.next().unwrap().name, "event name 2");
+    }
+
     #[test]
     fn records_no_error_fields() {
         let tracer = TestTracer(Arc::new(Mutex::new(None)));