chore: segment new tracing setup behavior behind new feature flag

Author: the-wondersmith

runtime/Cargo.toml

@@ -45,22 +45,11 @@ tokio = { workspace = true, features = ["full"] }
 tokio-util = { workspace = true }
 tokio-stream = { workspace = true }
 tonic = { workspace = true }
-tracing = { workspace = true, optional = true, features = ["attributes", "std"] }
+tracing = { workspace = true, features = ["attributes", "std"] }
 tracing-core = { version = "0.1", optional = true, default-features = false, features = ["std"] }
 tracing-log = { version = "0.2", optional = true, default-features = false, features = ["log-tracer", "std"] }
 tracing-opentelemetry = { version = "0.28.0", optional = true, default-features = false, features = ["metrics"] }
-tracing-subscriber = { workspace = true, optional = true, features = [
-    "alloc",
-    "env-filter",
-    "fmt",
-    "parking_lot",
-    "registry",
-    "smallvec",
-    "std",
-    "tracing",
-    "tracing-log",
-    "tracing-serde",
-] }
+tracing-subscriber = { workspace = true, optional = true, default-features = false }
 
 [dev-dependencies]
 portpicker = { workspace = true }
@@ -73,14 +62,26 @@ default = ["setup-tracing"]
 api-client-tracing = ["shuttle-api-client/tracing"]
 
 setup-tracing = [
+    "tracing-subscriber/ansi",
+    "tracing-subscriber/env-filter",
+    "tracing-subscriber/fmt",
+    "tracing-subscriber/smallvec",
+    "tracing-subscriber/std",
+    "tracing-subscriber/tracing-log",
+]
+setup-telemetry = [
+    "setup-tracing",
     "dep:log",
     "dep:opentelemetry",
     "dep:opentelemetry-otlp",
     "dep:opentelemetry_sdk",
     "dep:opentelemetry-semantic-conventions",
-    "dep:tracing",
     "dep:tracing-core",
     "dep:tracing-log",
     "dep:tracing-opentelemetry",
-    "dep:tracing-subscriber",
+    "tracing-subscriber/alloc",
+    "tracing-subscriber/parking_lot",
+    "tracing-subscriber/registry",
+    "tracing-subscriber/tracing",
+    "tracing-subscriber/tracing-serde",
 ]

runtime/src/lib.rs

@@ -12,7 +12,7 @@ mod plugins;
 mod rt;
 mod start;
 
-#[cfg(feature = "setup-tracing")]
+#[cfg(feature = "setup-telemetry")]
 mod trace;
 
 // Public API

runtime/src/start.rs

@@ -51,7 +51,9 @@ impl Args {
 pub async fn start(
     loader: impl Loader + Send + 'static,
     runner: impl Runner + Send + 'static,
-    #[cfg_attr(not(feature = "setup-tracing"), allow(unused_variables))] project_name: &'static str,
+    #[cfg_attr(not(feature = "setup-telemetry"), allow(unused_variables))]
+    project_name: &'static str,
+    #[cfg_attr(not(feature = "setup-telemetry"), allow(unused_variables))]
     project_version: &'static str,
 ) {
     // `--version` overrides any other arguments. Used by cargo-shuttle to check compatibility on local runs.
@@ -74,17 +76,40 @@ pub async fn start(
     };
 
     // this is handled after arg parsing to not interfere with --version above
-    #[cfg(feature = "setup-tracing")]
+    #[cfg(all(feature = "setup-tracing", not(feature = "setup-telemetry")))]
+    {
+        use tracing_subscriber::{fmt, prelude::*, registry, EnvFilter};
+        registry()
+            .with(fmt::layer().without_time())
+            .with(
+                // let user override RUST_LOG in local run if they want to
+                EnvFilter::try_from_default_env().unwrap_or_else(|_| {
+                    // otherwise use our default
+                    Into::into(format!(
+                        "{},{}=debug",
+                        if args.beta {
+                            "info"
+                        } else {
+                            "info,shuttle=trace"
+                        },
+                        project_name
+                    ))
+                }),
+            )
+            .init();
+    }
+
+    #[cfg(feature = "setup-telemetry")]
     let _guard = crate::trace::init_tracing_subscriber(project_name, project_version);
 
-    #[cfg(feature = "setup-tracing")]
+    #[cfg(any(feature = "setup-tracing", feature = "setup-telemetry"))]
     if args.beta {
-        eprintln!(
-            "INFO - Default tracing subscriber initialized (https://docs.shuttle.dev/docs/logs)"
+        tracing::warn!(
+            "Default tracing subscriber initialized (https://docs.shuttle.dev/docs/logs)"
         );
     } else {
-        eprintln!(
-            "INFO - Default tracing subscriber initialized (https://docs.shuttle.rs/configuration/logs)"
+        tracing::warn!(
+            "Default tracing subscriber initialized (https://docs.shuttle.rs/configuration/logs)"
         );
     }