fix: fix trace_id in logs when nested in tracing crate's spans

Author: SF-Zhou

opentelemetry-appender-tracing/src/layer.rs

@@ -247,28 +247,26 @@ where
         #[cfg(feature = "experimental_use_tracing_span_context")]
         if let Some(span) = _ctx.event_span(event) {
             use tracing_opentelemetry::OtelData;
-            let opt_span_id = span
-                .extensions()
-                .get::<OtelData>()
-                .and_then(|otd| otd.builder.span_id);
-
-            let opt_trace_id = span.scope().last().and_then(|root_span| {
-                root_span
-                    .extensions()
-                    .get::<OtelData>()
-                    .and_then(|otd| otd.builder.trace_id)
-            });
-
-            if let Some((trace_id, span_id)) = opt_trace_id.zip(opt_span_id) {
-                log_record.set_trace_context(trace_id, span_id, None);
-            }
-
             if let Some(otd) = span.extensions().get::<OtelData>() {
                 if let Some(attributes) = &otd.builder.attributes {
                     for attribute in attributes {
                         log_record.add_attribute(attribute.key.clone(), &attribute.value);
                     }
                 }
+
+                if let Some(span_id) = otd.builder.span_id {
+                    let opt_trace_id = otd.builder.trace_id.or_else(|| {
+                        span.scope().last().and_then(|root_span| {
+                            root_span
+                                .extensions()
+                                .get::<OtelData>()
+                                .and_then(|otd| otd.builder.trace_id)
+                        })
+                    });
+                    if let Some(trace_id) = opt_trace_id {
+                        log_record.set_trace_context(trace_id, span_id, None);
+                    }
+                }
             }
         }