Rebase fixup

Signed-off-by: Caleb Schoepp <caleb.schoepp@fermyon.com>

Author: calebschoepp

crates/factor-otel/src/host.rs

@@ -5,7 +5,6 @@ use anyhow::Result;
 use opentelemetry::trace::TraceContextExt;
 use opentelemetry::Context;
 use opentelemetry_sdk::trace::SpanProcessor;
-use spin_core::async_trait;
 use spin_world::wasi::otel::tracing as wasi_otel;
 use spin_world::wasi::otel::tracing::SpanContext;
 use tracing::span;
@@ -14,7 +13,6 @@ use tracing_opentelemetry::OpenTelemetrySpanExt;
 
 use crate::InstanceState;
 
-#[async_trait]
 impl wasi_otel::Host for InstanceState {
     async fn on_start(
         &mut self,
@@ -115,5 +113,3 @@ impl wasi_otel::Host for InstanceState {
             .into())
     }
 }
-
-// TODO: Rename module to otel

crates/world/src/conversions.rs

@@ -609,7 +609,7 @@ mod otel {
             match value {
                 wasi_otel::Value::String(v) => v.into(),
                 wasi_otel::Value::Bool(v) => v.into(),
-                wasi_otel::Value::Float64(v) => v.into(),
+                wasi_otel::Value::F64(v) => v.into(),
                 wasi_otel::Value::S64(v) => v.into(),
                 wasi_otel::Value::StringArray(v) => opentelemetry::Value::Array(
                     v.into_iter()
@@ -618,7 +618,7 @@ mod otel {
                         .into(),
                 ),
                 wasi_otel::Value::BoolArray(v) => opentelemetry::Value::Array(v.into()),
-                wasi_otel::Value::Float64Array(v) => opentelemetry::Value::Array(v.into()),
+                wasi_otel::Value::F64Array(v) => opentelemetry::Value::Array(v.into()),
                 wasi_otel::Value::S64Array(v) => opentelemetry::Value::Array(v.into()),
             }
         }

tests/test-components/components/Cargo.lock

@@ -11,6 +11,6 @@ anyhow = "1"
 http = "0.2"
 opentelemetry = "0.27.0"
 opentelemetry_sdk = "0.27.0"
-opentelemetry-wasi = { git = "https://github.com/calebschoepp/opentelemetry-wasi", rev = "bf4a6bf93b93bec48835360cc4d2f4155858a697" }
+opentelemetry-wasi = { git = "https://github.com/calebschoepp/opentelemetry-wasi", rev = "78d0cf0d1e2674591ab0dfdca8443a81a1e402bd" }
 spin-sdk = "3.1.0"
 wit-bindgen = "0.30.0"

tests/test-components/components/wasi-otel-tracing/Cargo.toml

@@ -108,15 +108,15 @@ interface tracing {
         /// A boolean value.
         %bool(bool),
         /// A double precision floating point value.
-        %float64(float64),
+        %f64(f64),
         /// A signed 64 bit integer value.
         %s64(s64),
         /// A homogeneous array of string values.
         string-array(list<string>),
         /// A homogeneous array of boolean values.
         bool-array(list<bool>),
         /// A homogeneous array of double precision floating point values.
-        float64-array(list<float64>),
+        f64-array(list<f64>),
         /// A homogeneous array of 64 bit integer values.
         s64-array(list<s64>),
     }