fix(factor-otel): updating WIT

Signed-off-by: Andrew Steurer <[email protected]>

Author: asteurer

crates/factor-otel/src/host.rs

@@ -1,6 +1,9 @@
+use std::fmt::format;
+
 use anyhow::anyhow;
 use anyhow::Result;
 use opentelemetry::trace::TraceContextExt;
+use opentelemetry_sdk::error::OTelSdkError;
 use opentelemetry_sdk::metrics::exporter::PushMetricExporter;
 use opentelemetry_sdk::trace::SpanProcessor;
 use spin_world::wasi;
@@ -58,14 +61,23 @@ impl wasi::otel::tracing::Host for InstanceState {
 }
 
 impl wasi::otel::metrics::Host for InstanceState {
-    async fn collect(
+    async fn export(
         &mut self,
         metrics: wasi::otel::metrics::ResourceMetrics,
-    ) -> spin_core::wasmtime::Result<std::result::Result<(), wasi::otel::metrics::OtelError>> {
+    ) -> spin_core::wasmtime::Result<std::result::Result<(), wasi::otel::metrics::Error>> {
         let mut rm: opentelemetry_sdk::metrics::data::ResourceMetrics = metrics.into();
         match self.metric_exporter.export(&mut rm).await {
             Ok(_) => Ok(Ok(())),
-            Err(e) => Ok(Err(e.into())),
+            Err(e) => match e {
+                OTelSdkError::AlreadyShutdown => {
+                    Ok(Err("Shutdown has already been invoked".to_string()))
+                }
+                OTelSdkError::InternalFailure(e) => Ok(Err("Internal failure: ".to_string() + &e)),
+                OTelSdkError::Timeout(d) => Ok(Err(format!(
+                    "Operation timed out after {} seconds",
+                    d.as_secs()
+                ))),
+            },
         }
     }
 }

crates/world/src/conversions.rs

@@ -557,7 +557,6 @@ mod llm {
 mod otel {
     use super::*;
     use opentelemetry::StringValue;
-    use opentelemetry_sdk::error::OTelSdkError;
     use opentelemetry_sdk::trace::{SpanEvents, SpanLinks};
     use std::borrow::Cow;
     use std::time::{Duration, SystemTime, UNIX_EPOCH};
@@ -566,18 +565,6 @@ mod otel {
     use wasi::otel::tracing as wasi_tracing;
     use wasi::otel::types as wasi_types;
 
-    impl From<OTelSdkError> for wasi::otel::metrics::OtelError {
-        fn from(value: OTelSdkError) -> Self {
-            match value {
-                OTelSdkError::AlreadyShutdown => wasi::otel::metrics::OtelError::AlreadyShutdown,
-                OTelSdkError::InternalFailure(v) => {
-                    wasi::otel::metrics::OtelError::InternalFailure(v)
-                }
-                OTelSdkError::Timeout(d) => wasi::otel::metrics::OtelError::Timeout(d.as_secs()),
-            }
-        }
-    }
-
     impl From<wasi_metrics::ResourceMetrics> for opentelemetry_sdk::metrics::data::ResourceMetrics {
         fn from(value: wasi_metrics::ResourceMetrics) -> Self {
             Self {

wit/deps/otel/metrics.wit

@@ -4,13 +4,13 @@ interface metrics {
     use types.{key-value, instrumentation-scope};
     use tracing.{span-id, trace-id};
 
-    /// `collect` gathers all metric data related to a Reader from the SDK
-    collect: func(metrics: resource-metrics) -> result<_, otel-error>;
+    /// `export` sends all metric data related to a Reader from the SDK
+    %export: func(metrics: resource-metrics) -> result<_, error>;
+
+    type error = string;
 
     /// `resource-metrics` is a collection of `scope-metrics` and the associated `resource`
     /// that created them.
-    ///
-    /// See https://github.com/open-telemetry/opentelemetry-rust/blob/c811cde1ae21c624870c1b952190e687b16f76b8/opentelemetry-sdk/src/metrics/data/mod.rs#L13
     record resource-metrics {
         /// The entity that collected the metrics.
         %resource: %resource,
@@ -255,13 +255,4 @@ interface metrics {
         %s64(s64),
         %u64(u64),
     }
-
-    /// The WASI representation of the `OTelSdkError`.
-    ///
-    /// See https://github.com/open-telemetry/opentelemetry-rust/blob/353bbb0d80fc35a26a00b4f4fed0dcaed23e5523/opentelemetry-sdk/src/error.rs#L15
-    variant otel-error {
-        already-shutdown,
-        timeout(duration),
-        internal-failure(string),
-    }
-}
+}