Cleanup wit a bit

Signed-off-by: Caleb Schoepp <[email protected]>

Author: calebschoepp

crates/factor-otel/src/host.rs

@@ -9,11 +9,7 @@ use tracing_opentelemetry::OpenTelemetrySpanExt;
 use crate::InstanceState;
 
 impl wasi_otel::Host for InstanceState {
-    async fn on_start(
-        &mut self,
-        span_data: wasi_otel::SpanData,
-        _parent: wasi_otel::SpanContext,
-    ) -> Result<()> {
+    async fn on_start(&mut self, context: wasi_otel::SpanContext) -> Result<()> {
         let mut state = self.state.write().unwrap();
 
         // Before we do anything make sure we track the original host span ID for reparenting
@@ -28,7 +24,7 @@ impl wasi_otel::Host for InstanceState {
         }
 
         // Track the guest spans context in our ordered map
-        let span_context: opentelemetry::trace::SpanContext = span_data.span_context.into();
+        let span_context: opentelemetry::trace::SpanContext = context.into();
         state
             .guest_span_contexts
             .insert(span_context.span_id(), span_context);
@@ -51,7 +47,7 @@ impl wasi_otel::Host for InstanceState {
         Ok(())
     }
 
-    async fn current_span_context(&mut self) -> Result<wasi_otel::SpanContext> {
+    async fn outer_span_context(&mut self) -> Result<wasi_otel::SpanContext> {
         Ok(tracing::Span::current()
             .context()
             .span()

wit/deps/otel/tracing.wit

@@ -2,13 +2,13 @@ interface tracing {
     use wasi:clocks/wall-clock@0.2.0.{datetime};
 
     /// Called when a span is started.
-    on-start: func(span: span-data, parent: span-context);
+    on-start: func(context: span-context);
 
     /// Called when a span is ended.
     on-end: func(span: span-data);
 
-    /// Returns the current span context of the host.
-    current-span-context: func() -> span-context;
+    /// Returns the span context of the host.
+    outer-span-context: func() -> span-context;
 
     /// The data associated with a span.
     record span-data {