Merge pull request #1073 from AmbientRun/fix-log-levels

Fix misuse of overly verbose log levels and unify use of log and tracing

Cargo.toml

@@ -12,15 +12,14 @@ rust-version = "1.70.0"
 aho-corasick = "1.1.1"
 profiling = { version = "1.0.11", features = ["profile-with-puffin"] }
 tracing = "0.1.37"
-tracing-tree = { version = "0.2" }
+tracing-tree = { version = "0.2", features = ["time"] }
 tracing-stackdriver = "0.6.2"
 tracing-subscriber = { version = "0.3.17", features = [
     "env-filter",
     "time",
     "local-time",
     "parking_lot",
 ] }
-tracing-log = { version = "0.1" }
 wgpu = { version = "0.16.3", features = ["serde", "trace", "replay"] }
 wgpu-types = { version = "0.16", features = ["serde"] }
 winit = { version = "0.28.6", features = ["serde"] }
@@ -38,7 +37,6 @@ ndarray = { version = "0.15.6", features = ["serde"] }
 rand = "0.8.5"
 rand_pcg = "0.3.1"
 glyph_brush = "0.7.7"
-log = "0.4"
 dyn-clonable = "0.9.0"
 semver = { version = "1.0", features = ["serde"] }
 paste = "1.0"
@@ -177,7 +175,7 @@ wasm-bindgen-futures = "0.4"
 #
 # Networking
 #
-time = { version = "0.3" }
+time = { version = "0.3", features = ["local-offset"] }
 quinn = { version = "0.10" }
 rustls-native-certs = "0.6.3"
 webpki-roots = "0.23.1"

app/Cargo.toml

@@ -45,15 +45,13 @@ ambient_shared_types = { path = "../shared_crates/shared_types", features = [
 
 tracing-tree = { workspace = true, optional = true }
 tracing-stackdriver = { workspace = true, optional = true }
-tracing-subscriber = { workspace = true, optional = true }
-tracing-log = { workspace = true, optional = true }
+tracing-subscriber = { workspace = true }
 time = { workspace = true }
 anyhow = { workspace = true }
 clap = { workspace = true }
 convert_case = { workspace = true }
 env_logger = { workspace = true }
 glam = { workspace = true }
-log = { workspace = true }
 parking_lot = { workspace = true }
 rustls-pemfile = { workspace = true }
 serde = { workspace = true }
@@ -80,8 +78,7 @@ slim = ["stackdriver"]
 production = ["assimp"]
 profile = ["ambient_app/profile"]
 assimp = ["ambient_model_import/russimp"]
-stackdriver = ["tracing", "tracing-stackdriver"]
-tracing = ["tracing-tree", "tracing-subscriber", "tracing-log"]
+stackdriver = ["tracing-stackdriver"]
 tls-native-roots = ["ambient_network/tls-native-roots"]
 tls-webpki-roots = ["ambient_network/tls-webpki-roots"]
 hotload-includes = [

app/src/cli/package/deploy.rs

@@ -52,7 +52,7 @@ pub async fn handle(args: &Deploy, assets: &AssetCache, release_build: bool) ->
     if !release_build {
         // Using string interpolation due to a rustfmt bug where it will break
         // if any one line is too long
-        log::warn!(
+        tracing::warn!(
             "{} {}",
             "Deploying a debug build which might involve uploading large files.",
             "Remove `--debug` to deploy a release build."
@@ -218,7 +218,7 @@ pub async fn handle(args: &Deploy, assets: &AssetCache, release_build: bool) ->
 
         match deployment_id {
             Deployment::Skipped => {
-                log::info!(
+                tracing::info!(
                     "Package \"{main_package_name}\" was already deployed, skipping deployment"
                 );
             }
@@ -238,10 +238,10 @@ pub async fn handle(args: &Deploy, assets: &AssetCache, release_build: bool) ->
                     Some(&deployment_id),
                 );
 
-                log::info!("Package \"{main_package_name}\" deployed successfully!");
-                log::info!("  Deployment ID: {deployment_id}");
-                log::info!("  Join: ambient join '{ensure_running_url}'");
-                log::info!("  Web URL: '{}'", web_url.bright_green());
+                tracing::info!("Package \"{main_package_name}\" deployed successfully!");
+                tracing::info!("  Deployment ID: {deployment_id}");
+                tracing::info!("  Join: ambient join '{ensure_running_url}'");
+                tracing::info!("  Web URL: '{}'", web_url.bright_green());
 
                 if first_deployment_id.is_none() {
                     first_deployment_id = Some(deployment_id);
@@ -256,7 +256,7 @@ pub async fn handle(args: &Deploy, assets: &AssetCache, release_build: bool) ->
         let server =
             ambient_cloud_client::ensure_server_running(assets, api_server, token.into(), spec)
                 .await?;
-        log::info!("Deployed package is running at {}", server.host);
+        tracing::info!("Deployed package is running at {}", server.host);
     }
 
     Ok(())