From f3929a78854277e0eb876fa467617dc7eb29601e Mon Sep 17 00:00:00 2001
From: Aadi Desai <21363892+supleed2@users.noreply.github.com>
Date: Fri, 29 Sep 2023 01:48:12 +0100
Subject: [PATCH] Add custom `tracing_subscriber`

---
 Cargo.lock  | 26 ++------------------------
 Cargo.toml  |  3 ++-
 src/main.rs | 13 +++++++++++++
 3 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9b89194..1bc0bca 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -287,17 +287,6 @@ dependencies = [
  "windows-targets",
 ]
 
-[[package]]
-name = "colored"
-version = "2.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6"
-dependencies = [
- "is-terminal",
- "lazy_static",
- "windows-sys",
-]
-
 [[package]]
 name = "comfy-table"
 version = "6.2.0"
@@ -1106,17 +1095,6 @@ version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6"
 
-[[package]]
-name = "is-terminal"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
-dependencies = [
- "hermit-abi",
- "rustix",
- "windows-sys",
-]
-
 [[package]]
 name = "itertools"
 version = "0.10.5"
@@ -1313,6 +1291,7 @@ dependencies = [
  "sqlx",
  "tokio",
  "tracing",
+ "tracing-subscriber",
  "url",
 ]
 
@@ -2363,7 +2342,6 @@ dependencies = [
  "anyhow",
  "async-trait",
  "chrono",
- "colored",
  "prost-types",
  "serde",
  "serde_json",
@@ -2377,7 +2355,6 @@ dependencies = [
  "tokio-stream",
  "tonic",
  "tower",
- "tracing-subscriber",
 ]
 
 [[package]]
@@ -3162,6 +3139,7 @@ dependencies = [
  "sharded-slab",
  "smallvec",
  "thread_local",
+ "time",
  "tracing",
  "tracing-core",
  "tracing-log",
diff --git a/Cargo.toml b/Cargo.toml
index e455c89..b0f78f4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,7 +17,7 @@ indoc = "2.0.4"
 poise = "0.5.6"
 reqwest = { version = "0.11.20", features = ["json"] }
 serde = { version = "1.0.188", features = ["derive"] }
-shuttle-runtime = "0.27.0"
+shuttle-runtime = { version = "0.27.0", default-features = false }
 shuttle-secrets = "0.27.0"
 shuttle-shared-db = { version = "0.27.0", features = ["postgres"] }
 sqlx = { version = "0.7.2", features = [
@@ -27,4 +27,5 @@ sqlx = { version = "0.7.2", features = [
 ] }
 tokio = "1.32.0"
 tracing = "0.1.37"
+tracing-subscriber = { version = "0.3.17", features = ["time"] }
 url = "2.4.1"
diff --git a/src/main.rs b/src/main.rs
index 71d6c5d..09d9b46 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -54,6 +54,19 @@ async fn poise(
     #[shuttle_secrets::Secrets] secret_store: shuttle_secrets::SecretStore,
     #[shuttle_shared_db::Postgres] pool: sqlx::PgPool,
 ) -> Result<service::NanoBot, shuttle_runtime::Error> {
+    // Set Up Tracing Subscriber
+    use tracing_subscriber as ts;
+    use ts::prelude::*;
+    ts::registry()
+        .with(ts::fmt::layer().without_time())
+        .with(
+            tracing_subscriber::EnvFilter::try_from_default_env().unwrap_or_else(|_| {
+                tracing_subscriber::EnvFilter::new("info,nano=info,shuttle=trace,serenity=warn")
+            }),
+        )
+        .init();
+    tracing::info!("Tracing Subscriber Set Up");
+
     // Run SQLx Migrations
     sqlx::migrate!()
         .run(&pool)