wip

Signed-off-by: Lann Martin <lann.martin@fermyon.com>

Author: lann

Cargo.lock

@@ -44,7 +44,7 @@ tokio = { version = "1.11", features = [ "full" ] }
 toml = "0.5"
 tracing = { version = "0.1", features = [ "log" ] }
 tracing-futures = "0.2"
-tracing-subscriber = { version = "0.3.7", features = [ "env-filter" ] }
+tracing-subscriber = { version = "0.3", features = [ "env-filter" ] }
 url = "2.2.2"
 uuid = "^1.0"
 wasi-outbound-http = { path = "crates/outbound-http" }

Cargo.toml

@@ -35,13 +35,13 @@ tokio-rustls = { version = "0.23.2" }
 rustls-pemfile = "0.3.0"
 tracing = { version = "0.1", features = ["log"] }
 tracing-futures = "0.2"
-tracing-subscriber = { version = "0.3.7", features = ["env-filter"] }
 url = "2.2"
-wasi-cap-std-sync = "0.39.1"
-wasi-common = "0.39.1"
 wasmtime = "0.39.1"
-wasmtime-wasi = "0.39.1"
-wit-bindgen-wasmtime = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "cb871cfa1ee460b51eb1d144b175b9aab9c50aba" }
+wit-bindgen-wasmtime = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "cb871cfa1ee460b51eb1d144b175b9aab9c50aba", features = ["async"] }
+
+# Temporary refactor deps
+spin-app = { path = "../../../lhc/crates/spin-app" }
+spin-core = { path = "../../../lhc/crates/spin-core" }
 
 [dev-dependencies]
 criterion = { version = "0.3.5", features = ["async_tokio"] }

crates/http/Cargo.toml

@@ -7,7 +7,6 @@ use futures::future::join_all;
 use http::uri::Scheme;
 use http::Request;
 use spin_http_engine::HttpTrigger;
-use spin_manifest::{HttpConfig, HttpExecutor};
 use spin_testing::{assert_http_response_success, TestConfig};
 use tokio::runtime::Runtime;
 use tokio::task;
@@ -29,7 +28,7 @@ fn bench_startup(c: &mut Criterion) {
         b.to_async(&async_runtime).iter(|| async {
             let trigger = TestConfig::default()
                 .test_program("spin-http-benchmark.wasm")
-                .http_trigger(Default::default())
+                .http_spin_trigger("/")
                 .build_http_trigger()
                 .await;
             run_concurrent_requests(Arc::new(trigger), 0, 1).await;
@@ -39,10 +38,7 @@ fn bench_startup(c: &mut Criterion) {
         b.to_async(&async_runtime).iter(|| async {
             let trigger = TestConfig::default()
                 .test_program("wagi-benchmark.wasm")
-                .http_trigger(HttpConfig {
-                    executor: Some(HttpExecutor::Wagi(Default::default())),
-                    ..Default::default()
-                })
+                .http_wagi_trigger("/", Default::default())
                 .build_http_trigger()
                 .await;
             run_concurrent_requests(Arc::new(trigger), 0, 1).await;
@@ -58,7 +54,7 @@ fn bench_spin_concurrency_minimal(c: &mut Criterion) {
         async_runtime.block_on(
             TestConfig::default()
                 .test_program("spin-http-benchmark.wasm")
-                .http_trigger(Default::default())
+                .http_spin_trigger("/")
                 .build_http_trigger(),
         ),
     );
@@ -94,10 +90,7 @@ fn bench_wagi_concurrency_minimal(c: &mut Criterion) {
         async_runtime.block_on(
             TestConfig::default()
                 .test_program("wagi-benchmark.wasm")
-                .http_trigger(HttpConfig {
-                    executor: Some(HttpExecutor::Wagi(Default::default())),
-                    ..Default::default()
-                })
+                .http_wagi_trigger("/", Default::default())
                 .build_http_trigger(),
         ),
     );