ci: resolve CI errors in shuttle-next (#580)

* test: compile wasm module in axum runtime test setup * ci: add next patch override to CI * ci: include wasm32-wasi target in rust install * fix: deployer tests where runtime fails to start * fix: incorrect provisioner address * feat: log service state changes in runtime * feat: don't send stop req on startup failure * refactor: unused imports * refactor: handling legacy panics * tests: deadlock less * refactor: fixups * refactor: clippy suggestions * tests: mock provisioner * refactor: restore capture from 'log' and colors * refactor: clippy suggestions * tests: longer wait * tests: don't panic while holding lock * tests: don't panic on stream closed * tests: don't filter out state logs * tests: bigger timeout * ci: remove duplicate patch * refactor: comments --------- Co-authored-by: chesedo <[email protected]>
shuttle-hq · Mar 10, 2023 · adf8926 · adf8926
1 parent 4e1690d
commit adf8926
Show file tree

Hide file tree

Showing 16 changed files with 549 additions and 384 deletions.
diff --git a/admin/Cargo.toml b/admin/Cargo.toml
@@ -12,8 +12,8 @@ serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 tokio = { version = "1.22.0", features = ["macros", "rt-multi-thread"] }
 toml = "0.5.9"
-tracing = { workspace = true }
-tracing-subscriber = { workspace = true, features = ["env-filter"] }
+tracing = { workspace = true, features = ["default"] }
+tracing-subscriber = { workspace = true, features = ["default", "env-filter"] }
 
 [dependencies.shuttle-common]
 workspace = true

diff --git a/cargo-shuttle/Cargo.toml b/cargo-shuttle/Cargo.toml
@@ -45,8 +45,8 @@ tokio-tungstenite = { version = "0.17.2", features = ["native-tls"] }
 toml = "0.5.9"
 toml_edit = "0.15.0"
 tonic = { workspace = true }
-tracing = { workspace = true }
-tracing-subscriber = { workspace = true, features = ["env-filter", "fmt"] }
+tracing = { workspace = true, features = ["default"] }
+tracing-subscriber = { workspace = true, features = ["default", "env-filter", "fmt"] }
 url = "2.3.1"
 uuid = { workspace = true, features = ["v4"] }
 webbrowser = "0.8.2"

diff --git a/cargo-shuttle/src/lib.rs b/cargo-shuttle/src/lib.rs
@@ -510,7 +510,7 @@ impl Shuttle {
             .into_inner();
 
         tokio::spawn(async move {
-            while let Some(log) = stream.message().await.expect("to get log from stream") {
+            while let Ok(Some(log)) = stream.message().await {
                 let log: shuttle_common::LogItem = log.try_into().expect("to convert log");
                 println!("{log}");
             }

diff --git a/deployer/Cargo.toml b/deployer/Cargo.toml
@@ -40,9 +40,9 @@ toml = "0.5.9"
 tonic = { workspace = true }
 tower = { version = "0.4.13", features = ["make"] }
 tower-http = { version = "0.3.4", features = ["auth", "trace"] }
-tracing = { workspace = true }
+tracing = { workspace = true, features = ["default"] }
 tracing-opentelemetry = "0.18.0"
-tracing-subscriber = { workspace = true, features = ["env-filter", "fmt"] }
+tracing-subscriber = { workspace = true, features = ["default", "env-filter", "fmt"] }
 uuid = { workspace = true, features = ["v4"] }
 
 [dependencies.shuttle-common]