Merge pull request #19 from kate-goldenring/disable-logging

fix(logging): disable logging in shim to improve performance
spinkube · Feb 26, 2024 · 6d1afaa · 6d1afaa
2 parents 1db14d4 + 518dc6b
commit 6d1afaa
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/containerd-shim-spin/Cargo.toml b/containerd-shim-spin/Cargo.toml
@@ -12,6 +12,7 @@ Containerd shim for running Spin workloads.
 
 [dependencies]
 containerd-shim-wasm = { git = "https://github.com/containerd/runwasi", rev = "c768e5b0919ca02903a301bf82a390489437dabe" }
+containerd-shim = "0.6.0"
 log = "0.4"
 spin-app = { git = "https://github.com/fermyon/spin", tag = "v2.2.0" }
 spin-core = { git = "https://github.com/fermyon/spin", tag = "v2.2.0" }

diff --git a/containerd-shim-spin/src/main.rs b/containerd-shim-spin/src/main.rs
@@ -1,8 +1,22 @@
+use containerd_shim::Config;
 use containerd_shim_wasm::container::Instance;
 use containerd_shim_wasm::sandbox::cli::{revision, shim_main, version};
 
 mod engine;
 
 fn main() {
- shim_main::<Instance<engine::SpinEngine>>("spin", version!(), revision!(), "v2", None);
+ // Configure the shim to disable all logging for performance improvements.
+ // TODO: consider supporting some logging once log level specification is
+ // supported in https://github.com/containerd/rust-extensions/pull/247
+ let shim_config = Config {
+ no_setup_logger: true,
+ ..Default::default()
+ };
+ shim_main::<Instance<engine::SpinEngine>>(
+ "spin",
+ version!(),
+ revision!(),
+ "v2",
+ Some(shim_config),
+ );
 }