Update to Wasmtime 21.0.0

This commit updates Wasmtime to 21.0.0 from the previous 20.0.2 version.
Notable changes here are handling refactorings around
`wasmtime-wasi-http` and its types there in addition to how some traits
are handled in the `wasmtime-wasi` crate.

Signed-off-by: Alex Crichton <[email protected]>

Author: alexcrichton

Cargo.lock

@@ -126,10 +126,10 @@ hyper = { version = "1.0.0", features = ["full"] }
 reqwest = { version = "0.11", features = ["stream", "blocking"] }
 tracing = { version = "0.1", features = ["log"] }
 
-wasi-common-preview1 = { version = "20.0.2", package = "wasi-common", features = ["tokio"] }
-wasmtime = "20.0.2"
-wasmtime-wasi = "20.0.2"
-wasmtime-wasi-http = "20.0.2"
+wasi-common-preview1 = { version = "21.0.0", package = "wasi-common", features = ["tokio"] }
+wasmtime = "21.0.0"
+wasmtime-wasi = "21.0.0"
+wasmtime-wasi-http = "21.0.0"
 
 spin-componentize = { path = "crates/componentize" }
 

Cargo.toml

@@ -19,6 +19,7 @@ cap-primitives = "3.0.0"
 tokio = "1.0"
 bytes = "1.0"
 spin-telemetry = { path = "../telemetry" }
+http = "1.0"
 
 [target.'cfg(unix)'.dependencies]
 rustix = "0.37.19"

crates/core/Cargo.toml

@@ -20,9 +20,11 @@ use std::{path::PathBuf, time::Duration};
 
 use anyhow::Result;
 use crossbeam_channel::Sender;
+use http::Request;
 use tracing::{field::Empty, instrument};
 use wasmtime::{InstanceAllocationStrategy, PoolingAllocationConfig};
 use wasmtime_wasi::ResourceTable;
+use wasmtime_wasi_http::body::HyperOutgoingBody;
 use wasmtime_wasi_http::types::{default_send_request, WasiHttpCtx, WasiHttpView};
 
 use self::host_component::{HostComponents, HostComponentsBuilder};
@@ -256,18 +258,29 @@ impl<T: Send + OutboundWasiHttpHandler> WasiHttpView for Data<T> {
         &mut self.table
     }
 
-    #[instrument(name = "spin_core.send_request", skip_all, fields(otel.kind = "client", url.full = %request.request.uri(), http.request.method = %request.request.method(), otel.name = %request.request.method(), http.response.status_code = Empty, server.address = Empty, server.port = Empty))]
+    #[instrument(
+        name = "spin_core.send_request",
+        skip_all,
+        fields(
+            otel.kind = "client",
+            url.full = %request.uri(),
+            http.request.method = %request.method(),
+            otel.name = %request.method(),
+            http.response.status_code = Empty,
+            server.address = Empty,
+            server.port = Empty,
+        ),
+    )]
     fn send_request(
         &mut self,
-        mut request: wasmtime_wasi_http::types::OutgoingRequest,
-    ) -> wasmtime_wasi_http::HttpResult<
-        wasmtime::component::Resource<wasmtime_wasi_http::types::HostFutureIncomingResponse>,
-    >
+        mut request: Request<HyperOutgoingBody>,
+        config: wasmtime_wasi_http::types::OutgoingRequestConfig,
+    ) -> wasmtime_wasi_http::HttpResult<wasmtime_wasi_http::types::HostFutureIncomingResponse>
     where
         Self: Sized,
     {
-        spin_telemetry::inject_trace_context(&mut request.request);
-        T::send_request(self, request)
+        spin_telemetry::inject_trace_context(&mut request);
+        T::send_request(self, request, config)
     }
 }
 
@@ -276,25 +289,23 @@ pub trait OutboundWasiHttpHandler {
     /// Send the request
     fn send_request(
         data: &mut Data<Self>,
-        request: wasmtime_wasi_http::types::OutgoingRequest,
-    ) -> wasmtime_wasi_http::HttpResult<
-        wasmtime::component::Resource<wasmtime_wasi_http::types::HostFutureIncomingResponse>,
-    >
+        request: Request<HyperOutgoingBody>,
+        config: wasmtime_wasi_http::types::OutgoingRequestConfig,
+    ) -> wasmtime_wasi_http::HttpResult<wasmtime_wasi_http::types::HostFutureIncomingResponse>
     where
         Self: Sized;
 }
 
 impl OutboundWasiHttpHandler for () {
     fn send_request(
-        data: &mut Data<Self>,
-        request: wasmtime_wasi_http::types::OutgoingRequest,
-    ) -> wasmtime_wasi_http::HttpResult<
-        wasmtime::component::Resource<wasmtime_wasi_http::types::HostFutureIncomingResponse>,
-    >
+        _data: &mut Data<Self>,
+        request: Request<HyperOutgoingBody>,
+        config: wasmtime_wasi_http::types::OutgoingRequestConfig,
+    ) -> wasmtime_wasi_http::HttpResult<wasmtime_wasi_http::types::HostFutureIncomingResponse>
     where
         Self: Sized,
     {
-        default_send_request(data, request)
+        Ok(default_send_request(request, config))
     }
 }
 

crates/core/src/lib.rs

@@ -610,7 +610,7 @@ impl WasiCtxBuilder {
             WasiCtxBuilder::Preview1(ctx) => Wasi::Preview1(ctx),
             WasiCtxBuilder::Preview2(mut b) => Wasi::Preview2 {
                 wasi_ctx: b.build(),
-                wasi_http_ctx: WasiHttpCtx,
+                wasi_http_ctx: WasiHttpCtx::new(),
             },
         }
     }

crates/core/src/store.rs

@@ -102,6 +102,8 @@ mod bindings {
             "wasi:http/types/future-incoming-response": latest::http::types::FutureIncomingResponse,
             "wasi:http/types/future-trailers": latest::http::types::FutureTrailers,
         },
+        trappable_imports: true,
+        skip_mut_forwarding_impls: true,
     });
 }
 
@@ -149,35 +151,42 @@ where
     T: WasiView + WasiHttpView,
 {
     // interfaces from the "command" world
-    wasi::clocks::monotonic_clock::add_to_linker(linker, |t| t)?;
-    wasi::clocks::wall_clock::add_to_linker(linker, |t| t)?;
-    wasi::filesystem::types::add_to_linker(linker, |t| t)?;
-    wasi::filesystem::preopens::add_to_linker(linker, |t| t)?;
-    wasi::io::poll::add_to_linker(linker, |t| t)?;
-    wasi::io::streams::add_to_linker(linker, |t| t)?;
-    wasi::random::random::add_to_linker(linker, |t| t)?;
-    wasi::random::insecure::add_to_linker(linker, |t| t)?;
-    wasi::random::insecure_seed::add_to_linker(linker, |t| t)?;
-    wasi::cli::exit::add_to_linker(linker, |t| t)?;
-    wasi::cli::environment::add_to_linker(linker, |t| t)?;
-    wasi::cli::stdin::add_to_linker(linker, |t| t)?;
-    wasi::cli::stdout::add_to_linker(linker, |t| t)?;
-    wasi::cli::stderr::add_to_linker(linker, |t| t)?;
-    wasi::cli::terminal_input::add_to_linker(linker, |t| t)?;
-    wasi::cli::terminal_output::add_to_linker(linker, |t| t)?;
-    wasi::cli::terminal_stdin::add_to_linker(linker, |t| t)?;
-    wasi::cli::terminal_stdout::add_to_linker(linker, |t| t)?;
-    wasi::cli::terminal_stderr::add_to_linker(linker, |t| t)?;
-    wasi::sockets::tcp::add_to_linker(linker, |t| t)?;
-    wasi::sockets::tcp_create_socket::add_to_linker(linker, |t| t)?;
-    wasi::sockets::udp::add_to_linker(linker, |t| t)?;
-    wasi::sockets::udp_create_socket::add_to_linker(linker, |t| t)?;
-    wasi::sockets::instance_network::add_to_linker(linker, |t| t)?;
-    wasi::sockets::network::add_to_linker(linker, |t| t)?;
-    wasi::sockets::ip_name_lookup::add_to_linker(linker, |t| t)?;
-
-    wasi::http::types::add_to_linker(linker, |t| t)?;
-    wasi::http::outgoing_handler::add_to_linker(linker, |t| t)?;
+    fn project<T, F>(f: F) -> F
+    where
+        F: Fn(&mut T) -> &mut T,
+    {
+        f
+    }
+    let closure = project::<T, _>(|t| t);
+    wasi::clocks::monotonic_clock::add_to_linker_get_host(linker, closure)?;
+    wasi::clocks::wall_clock::add_to_linker_get_host(linker, closure)?;
+    wasi::filesystem::types::add_to_linker_get_host(linker, closure)?;
+    wasi::filesystem::preopens::add_to_linker_get_host(linker, closure)?;
+    wasi::io::poll::add_to_linker_get_host(linker, closure)?;
+    wasi::io::streams::add_to_linker_get_host(linker, closure)?;
+    wasi::random::random::add_to_linker_get_host(linker, closure)?;
+    wasi::random::insecure::add_to_linker_get_host(linker, closure)?;
+    wasi::random::insecure_seed::add_to_linker_get_host(linker, closure)?;
+    wasi::cli::exit::add_to_linker_get_host(linker, closure)?;
+    wasi::cli::environment::add_to_linker_get_host(linker, closure)?;
+    wasi::cli::stdin::add_to_linker_get_host(linker, closure)?;
+    wasi::cli::stdout::add_to_linker_get_host(linker, closure)?;
+    wasi::cli::stderr::add_to_linker_get_host(linker, closure)?;
+    wasi::cli::terminal_input::add_to_linker_get_host(linker, closure)?;
+    wasi::cli::terminal_output::add_to_linker_get_host(linker, closure)?;
+    wasi::cli::terminal_stdin::add_to_linker_get_host(linker, closure)?;
+    wasi::cli::terminal_stdout::add_to_linker_get_host(linker, closure)?;
+    wasi::cli::terminal_stderr::add_to_linker_get_host(linker, closure)?;
+    wasi::sockets::tcp::add_to_linker_get_host(linker, closure)?;
+    wasi::sockets::tcp_create_socket::add_to_linker_get_host(linker, closure)?;
+    wasi::sockets::udp::add_to_linker_get_host(linker, closure)?;
+    wasi::sockets::udp_create_socket::add_to_linker_get_host(linker, closure)?;
+    wasi::sockets::instance_network::add_to_linker_get_host(linker, closure)?;
+    wasi::sockets::network::add_to_linker_get_host(linker, closure)?;
+    wasi::sockets::ip_name_lookup::add_to_linker_get_host(linker, closure)?;
+
+    wasi::http::types::add_to_linker_get_host(linker, closure)?;
+    wasi::http::outgoing_handler::add_to_linker_get_host(linker, closure)?;
     Ok(())
 }
 
@@ -1694,11 +1703,11 @@ where
     }
 }
 
-impl<T> wasi::http::types::Host for T where T: WasiHttpView {}
+impl<T> wasi::http::types::Host for T where T: WasiHttpView + Send {}
 
 impl<T> wasi::http::types::HostFields for T
 where
-    T: WasiHttpView,
+    T: WasiHttpView + Send,
 {
     fn new(
         &mut self,
@@ -1768,7 +1777,7 @@ where
 
 impl<T> wasi::http::types::HostIncomingRequest for T
 where
-    T: WasiHttpView,
+    T: WasiHttpView + Send,
 {
     fn method(
         &mut self,
@@ -1823,7 +1832,7 @@ where
 
 impl<T> wasi::http::types::HostIncomingResponse for T
 where
-    T: WasiHttpView,
+    T: WasiHttpView + Send,
 {
     fn status(
         &mut self,
@@ -1856,7 +1865,7 @@ where
 
 impl<T> wasi::http::types::HostIncomingBody for T
 where
-    T: WasiHttpView,
+    T: WasiHttpView + Send,
 {
     fn stream(
         &mut self,
@@ -1879,7 +1888,7 @@ where
 
 impl<T> wasi::http::types::HostOutgoingRequest for T
 where
-    T: WasiHttpView,
+    T: WasiHttpView + Send,
 {
     fn new(
         &mut self,
@@ -1956,7 +1965,7 @@ where
 
 impl<T> wasi::http::types::HostOutgoingResponse for T
 where
-    T: WasiHttpView,
+    T: WasiHttpView + Send,
 {
     fn new(
         &mut self,
@@ -1996,7 +2005,7 @@ where
 
 impl<T> wasi::http::types::HostOutgoingBody for T
 where
-    T: WasiHttpView,
+    T: WasiHttpView + Send,
 {
     fn write(
         &mut self,
@@ -2021,7 +2030,7 @@ where
 
 impl<T> wasi::http::types::HostResponseOutparam for T
 where
-    T: WasiHttpView,
+    T: WasiHttpView + Send,
 {
     fn set(
         &mut self,
@@ -2053,7 +2062,7 @@ where
 
 impl<T> wasi::http::types::HostFutureTrailers for T
 where
-    T: WasiHttpView,
+    T: WasiHttpView + Send,
 {
     fn subscribe(
         &mut self,
@@ -2084,7 +2093,7 @@ where
 
 impl<T> wasi::http::types::HostFutureIncomingResponse for T
 where
-    T: WasiHttpView,
+    T: WasiHttpView + Send,
 {
     fn get(
         &mut self,
@@ -2117,7 +2126,7 @@ where
 
 impl<T> wasi::http::outgoing_handler::Host for T
 where
-    T: WasiHttpView,
+    T: WasiHttpView + Send,
 {
     fn handle(
         &mut self,