feat: add support for parent spans

Author: coroiu

crates/bitwarden-logging/src/dynamic_tracing/span_factory.rs

@@ -15,6 +15,7 @@ pub enum SpanBuilder<'a> {
         metadata: &'static Metadata<'static>,
         fields: &'static BTreeMap<&'static str, Field>,
         values: Vec<(&'static Field, Option<&'a dyn Value>)>,
+        parent: Option<tracing::Id>,
     },
     Disabled {
         metadata: &'static Metadata<'static>,
@@ -30,6 +31,7 @@ impl Builder for SpanBuilder<'_> {
             metadata,
             fields,
             values: Vec::new(),
+            parent: None,
         }
     }
     fn create_disabled(metadata: &'static Metadata<'static>) -> Self {
@@ -38,6 +40,13 @@ impl Builder for SpanBuilder<'_> {
 }
 
 impl<'a> SpanBuilder<'a> {
+    pub fn with_parent(&mut self, parent: Option<tracing::Id>) -> &mut Self {
+        if let SpanBuilder::Enabled { parent: p, .. } = self {
+            *p = parent;
+        }
+        self
+    }
+
     #[inline]
     pub fn with(&mut self, name: &str, value: &'a dyn Value) -> &mut Self {
         if let SpanBuilder::Enabled { values, fields, .. } = self {
@@ -51,15 +60,18 @@ impl<'a> SpanBuilder<'a> {
     pub fn build(&self) -> Span {
         match self {
             SpanBuilder::Enabled {
-                metadata, values, ..
+                parent,
+                metadata,
+                values,
+                ..
             } => {
                 macro_rules! finish {
                     ($n:literal) => {
                         if $n == values.len() {
                             let values: [(&'static Field, Option<&'a (dyn Value)>); $n] =
                                 values.as_slice().try_into().unwrap();
                             let value_set = metadata.fields().value_set(&values);
-                            return Span::new(metadata, &value_set);
+                            return ::tracing::Span::child_of(parent.clone(), metadata, &value_set);
                         }
                     };
                 }

crates/bitwarden-logging/src/wasm/span.rs

@@ -20,15 +20,22 @@ impl SpanDefinition {
             factory: SpanFactory::new(&name, &target, level.into(), None, None, None, fields_slice),
         }
     }
-
-    // TODO: Add fields
     pub fn enter(&self, fields: Vec<FieldValue>) -> Span {
         let span = self.factory.create().build();
         for field in fields {
             span.record(field.name.as_str(), &field.value);
         }
         Span::new(span)
     }
+
+    pub fn enter_with_parent(&self, parent: &Span, fields: Vec<FieldValue>) -> Span {
+        let span = self.factory.create().with_parent(parent.span.id()).build();
+        // TODO: fix duplicate code
+        for field in fields {
+            span.record(field.name.as_str(), &field.value);
+        }
+        Span::new(span)
+    }
 }
 
 #[wasm_bindgen]
@@ -46,7 +53,14 @@ impl Span {
 
 #[wasm_bindgen]
 impl Span {
-    pub fn record(&self, event: &EventDefinition, message: Option<String>) {
+    /// Record a field on the span. Use when the span is already entered
+    /// and the field value was not known at span creation time.
+    pub fn record(&self, field: FieldValue) {
+        self.span.record(field.name.as_str(), &field.value);
+    }
+
+    /// Emit an event associated with this span.
+    pub fn event(&self, event: &EventDefinition, message: Option<String>) {
         event.record(
             self.span.id(),
             message.unwrap_or_else(|| {