refactor: migrate to tracing for logging

.gitignore

@@ -4,3 +4,6 @@
 
 # These are backup files generated by rustfmt
 **/*.rs.bk
+
+# local environment variables
+.env

Cargo.lock

@@ -35,6 +35,15 @@ dependencies = [
  "zerocopy",
 ]
 
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "allocator-api2"
 version = "0.2.18"
@@ -144,7 +153,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706"
 dependencies = [
  "memchr",
- "regex-automata",
+ "regex-automata 0.4.6",
  "serde",
 ]
 
@@ -380,25 +389,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "dirs-next"
+name = "dotenvy"
-version = "2.0.0"
+version = "0.15.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
+checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
-dependencies = [
- "cfg-if",
- "dirs-sys-next",
-]
-
-[[package]]
-name = "dirs-sys-next"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
-dependencies = [
- "libc",
- "redox_users",
- "winapi",
-]
 
 [[package]]
 name = "dunce"
@@ -1673,17 +1667,6 @@ version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
 
-[[package]]
-name = "is-terminal"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
-dependencies = [
- "hermit-abi",
- "libc",
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "itoa"
 version = "1.0.11"
@@ -1739,16 +1722,6 @@ version = "0.2.155"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
 
-[[package]]
-name = "libredox"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
-dependencies = [
- "bitflags 2.5.0",
- "libc",
-]
-
 [[package]]
 name = "linux-raw-sys"
 version = "0.4.14"
@@ -1777,6 +1750,15 @@ version = "0.11.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9106e1d747ffd48e6be5bb2d97fa706ed25b144fbee4d5c02eae110cd8d6badd"
 
+[[package]]
+name = "matchers"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+dependencies = [
+ "regex-automata 0.1.10",
+]
+
 [[package]]
 name = "maud"
 version = "0.26.0"
@@ -1869,6 +1851,16 @@ dependencies = [
  "tempfile",
 ]
 
+[[package]]
+name = "nu-ansi-term"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+dependencies = [
+ "overload",
+ "winapi",
+]
+
 [[package]]
 name = "num-conv"
 version = "0.1.0"
@@ -1953,6 +1945,12 @@ dependencies = [
  "vcpkg",
 ]
 
+[[package]]
+name = "overload"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+
 [[package]]
 name = "owned_ttf_parser"
 version = "0.15.2"
@@ -2206,14 +2204,24 @@ dependencies = [
 ]
 
 [[package]]
-name = "redox_users"
+name = "regex"
-version = "0.4.5"
+version = "1.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
+checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
 dependencies = [
- "getrandom",
+ "aho-corasick",
- "libredox",
+ "memchr",
- "thiserror",
+ "regex-automata 0.4.6",
+ "regex-syntax 0.8.3",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+dependencies = [
+ "regex-syntax 0.6.29",
 ]
 
 [[package]]
@@ -2221,6 +2229,23 @@ name = "regex-automata"
 version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax 0.8.3",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
 
 [[package]]
 name = "relative-path"
@@ -2422,12 +2447,6 @@ dependencies = [
  "owned_ttf_parser",
 ]
 
-[[package]]
-name = "rustversion"
-version = "1.0.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
-
 [[package]]
 name = "ryu"
 version = "1.0.18"
@@ -2559,6 +2578,15 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
 
+[[package]]
+name = "sharded-slab"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
+dependencies = [
+ "lazy_static",
+]
+
 [[package]]
 name = "shell-words"
 version = "1.1.0"
@@ -2574,6 +2602,7 @@ dependencies = [
  "cadence",
  "crates-index",
  "derive_more",
+ "dotenvy",
  "font-awesome-as-a-crate",
  "futures-util",
  "gix",
@@ -2592,11 +2621,10 @@ dependencies = [
  "serde",
  "serde_urlencoded",
  "sha-1",
- "slog",
- "slog-async",
- "slog-term",
  "tokio",
  "toml 0.8.13",
+ "tracing",
+ "tracing-subscriber",
 ]
 
 [[package]]
@@ -2614,37 +2642,6 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "slog"
-version = "2.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8347046d4ebd943127157b94d63abb990fcf729dc4e9978927fdf4ac3c998d06"
-
-[[package]]
-name = "slog-async"
-version = "2.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72c8038f898a2c79507940990f05386455b3a317d8f18d4caea7cbc3d5096b84"
-dependencies = [
- "crossbeam-channel",
- "slog",
- "take_mut",
- "thread_local",
-]
-
-[[package]]
-name = "slog-term"
-version = "2.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6e022d0b998abfe5c3782c1f03551a596269450ccd677ea51c56f8b214610e8"
-dependencies = [
- "is-terminal",
- "slog",
- "term",
- "thread_local",
- "time",
-]
-
 [[package]]
 name = "smallvec"
 version = "1.13.2"
@@ -2737,12 +2734,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "take_mut"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60"
-
 [[package]]
 name = "tame-index"
 version = "0.12.0"
@@ -2780,17 +2771,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "term"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f"
-dependencies = [
- "dirs-next",
- "rustversion",
- "winapi",
-]
-
 [[package]]
 name = "thiserror"
 version = "1.0.61"
@@ -3033,9 +3013,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
 dependencies = [
  "pin-project-lite",
+ "tracing-attributes",
  "tracing-core",
 ]
 
+[[package]]
+name = "tracing-attributes"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
 [[package]]
 name = "tracing-core"
 version = "0.1.32"
@@ -3043,6 +3035,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
 dependencies = [
  "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-log"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
+dependencies = [
+ "log",
+ "once_cell",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
+dependencies = [
+ "matchers",
+ "nu-ansi-term",
+ "once_cell",
+ "regex",
+ "sharded-slab",
+ "smallvec",
+ "thread_local",
+ "tracing",
+ "tracing-core",
+ "tracing-log",
 ]
 
 [[package]]
@@ -3142,6 +3164,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
 [[package]]
 name = "vcpkg"
 version = "0.2.15"

Cargo.toml

@@ -18,6 +18,7 @@ anyhow = "1"
 cadence = "1"
 crates-index = { version = "2", default-features = false, features = ["git"] }
 derive_more = "0.99"
+dotenvy = "0.15"
 font-awesome-as-a-crate = "0.3"
 futures-util = { version = "0.3", default-features = false, features = ["std"] }
 hyper = { version = "0.14.10", features = ["full"] }
@@ -33,11 +34,10 @@ rustsec = "0.29"
 semver = { version = "1.0", features = ["serde"] }
 serde = { version = "1", features = ["derive"] }
 serde_urlencoded = "0.7"
-slog = "2"
-slog-async = "2"
-slog-term = "2"
 tokio = { version = "1.24.2", features = ["rt-multi-thread", "macros", "sync", "time"] }
 toml = "0.8"
+tracing = "0.1.30"
+tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [target.'cfg(any())'.dependencies]
 gix = { version = "0.63", default-features = false, features = ["blocking-http-transport-reqwest-rust-tls"] }

src/engine/mod.rs

@@ -18,7 +18,6 @@ use once_cell::sync::Lazy;
 use relative_path::{RelativePath, RelativePathBuf};
 use rustsec::database::Database;
 use semver::VersionReq;
-use slog::Logger;
 
 use crate::interactors::crates::{GetPopularCrates, QueryCrate};
 use crate::interactors::github::GetPopularRepos;
@@ -45,33 +44,25 @@ pub struct Engine {
 }
 
 impl Engine {
-    pub fn new(client: reqwest::Client, index: ManagedIndex, logger: Logger) -> Engine {
+    pub fn new(client: reqwest::Client, index: ManagedIndex) -> Engine {
         let metrics = Arc::new(StatsdClient::from_sink("engine", NopMetricSink));
 
-        let query_crate = Cache::new(
+        let query_crate = Cache::new(QueryCrate::new(index), Duration::from_secs(10), 500);
-            QueryCrate::new(index),
-            Duration::from_secs(10),
-            500,
-            logger.clone(),
-        );
         let get_popular_crates = Cache::new(
             GetPopularCrates::new(client.clone()),
             Duration::from_secs(15 * 60),
             1,
-            logger.clone(),
         );
         let get_popular_repos = Cache::new(
             GetPopularRepos::new(client.clone()),
             Duration::from_secs(5 * 60),
             1,
-            logger.clone(),
         );
         let retrieve_file_at_path = RetrieveFileAtPath::new(client.clone());
         let fetch_advisory_db = Cache::new(
             FetchAdvisoryDatabase::new(client),
             Duration::from_secs(30 * 60),
             1,
-            logger,
         );
 
         Engine {

src/main.rs

@@ -17,7 +17,7 @@ use hyper::{
 };
 
 use reqwest::redirect::Policy as RedirectPolicy;
-use slog::{error, info, o, Drain, Logger};
+use tracing::Instrument as _;
 
 mod engine;
 mod interactors;
@@ -43,18 +43,29 @@ fn init_metrics() -> QueuingMetricSink {
     QueuingMetricSink::from(sink)
 }
 
-fn init_root_logger() -> Logger {
+fn init_tracing_subscriber() {
-    let decorator = slog_term::TermDecorator::new().build();
+    use tracing::level_filters::LevelFilter;
-    let drain = slog_term::FullFormat::new(decorator).build().fuse();
+    use tracing_subscriber::{fmt, prelude::*, EnvFilter};
-    let drain = slog_async::Async::new(drain).build().fuse();
 
-    Logger::root(drain, o!())
+    let stdout_logger = match env::var("RUST_LOG_TIME").as_deref() {
+        Ok("false") => fmt::layer().without_time().boxed(),
+        _ => fmt::layer().boxed(),
+    };
+
+    tracing_subscriber::registry()
+        .with(
+            EnvFilter::builder()
+                .with_default_directive(LevelFilter::INFO.into())
+                .from_env_lossy(),
+        )
+        .with(stdout_logger)
+        .init();
 }
 
 #[tokio::main]
 async fn main() {
-    let logger = init_root_logger();
+    dotenvy::dotenv().ok();
-
+    init_tracing_subscriber();
     let metrics = init_metrics();
 
     let client = reqwest::Client::builder()
@@ -71,7 +82,7 @@ async fn main() {
 
     let addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::UNSPECIFIED), port);
 
-    let index = ManagedIndex::new(logger.clone());
+    let index = ManagedIndex::new();
 
     {
         let index = index.clone();
@@ -81,27 +92,32 @@ async fn main() {
         });
     }
 
-    let mut engine = Engine::new(client.clone(), index, logger.new(o!()));
+    let mut engine = Engine::new(client.clone(), index);
     engine.set_metrics(metrics);
 
-    let svc_logger = logger.new(o!());
     let make_svc = make_service_fn(move |_socket: &AddrStream| {
         let engine = engine.clone();
-        let logger = svc_logger.clone();
 
         async move {
-            let server = App::new(logger.clone(), engine.clone());
+            let server = App::new(engine.clone());
             Ok::<_, hyper::Error>(service_fn(move |req| {
                 let server = server.clone();
-                async move { server.handle(req).await }
+                async move {
+                    let path = req.uri().path().to_owned();
+
+                    server
+                        .handle(req)
+                        .instrument(tracing::info_span!("@", %path))
+                        .await
+                }
             }))
         }
     });
     let server = Server::bind(&addr).serve(make_svc);
 
-    info!(logger, "Server running on port {}", port);
+    tracing::info!("Server running on port {port}");
 
-    if let Err(e) = server.await {
+    if let Err(err) = server.await {
-        error!(logger, "server error: {}", e);
+        tracing::error!("server error: {err}");
     }
 }

src/server/mod.rs

@@ -10,7 +10,6 @@ use once_cell::sync::Lazy;
 use route_recognizer::{Params, Router};
 use semver::VersionReq;
 use serde::Deserialize;
-use slog::{error, info, o, Logger};
 
 mod assets;
 mod views;
@@ -47,13 +46,12 @@ enum Route {
 
 #[derive(Clone)]
 pub struct App {
-    logger: Logger,
     engine: Engine,
     router: Arc<Router<Route>>,
 }
 
 impl App {
-    pub fn new(logger: Logger, engine: Engine) -> App {
+    pub fn new(engine: Engine) -> App {
         let mut router = Router::new();
 
         router.add("/", Route::Index);
@@ -83,15 +81,12 @@ impl App {
         );
 
         App {
-            logger,
             engine,
             router: Arc::new(router),
         }
     }
 
     pub async fn handle(&self, req: Request<Body>) -> Result<Response<Body>, HyperError> {
-        let logger = self.logger.new(o!("path" => req.uri().path().to_owned()));
-        let logger2 = logger.clone();
         let start = Instant::now();
 
         // allows `/path/` to also match `/path`
@@ -99,28 +94,25 @@ impl App {
 
         let res = if let Ok(route_match) = self.router.recognize(normalized_path) {
             match (req.method(), route_match.handler()) {
-                (&Method::GET, Route::Index) => {
+                (&Method::GET, Route::Index) => self.index(req, route_match.params().clone()).await,
-                    self.index(req, route_match.params().clone(), logger).await
-                }
 
                 (&Method::GET, Route::RepoStatus(format)) => {
-                    self.repo_status(req, route_match.params().clone(), logger, *format)
+                    self.repo_status(req, route_match.params().clone(), *format)
                         .await
                 }
 
                 (&Method::GET, Route::CrateStatus(format)) => {
-                    self.crate_status(req, route_match.params().clone(), logger, *format)
+                    self.crate_status(req, route_match.params().clone(), *format)
                         .await
                 }
 
                 (&Method::GET, Route::LatestCrateBadge) => {
-                    self.crate_status(req, route_match.params().clone(), logger, StatusFormat::Svg)
+                    self.crate_status(req, route_match.params().clone(), StatusFormat::Svg)
                         .await
                 }
 
                 (&Method::GET, Route::CrateRedirect) => {
-                    self.crate_redirect(req, route_match.params().clone(), logger)
+                    self.crate_redirect(req, route_match.params().clone()).await
-                        .await
                 }
 
                 (&Method::GET, Route::Static(file)) => Ok(App::static_file(*file)),
@@ -135,12 +127,11 @@ impl App {
         let diff = end - start;
 
         match &res {
-            Ok(res) => info!(
+            Ok(res) => tracing::info!(
-                logger2, "";
+                status = %res.status(),
-                "status" => res.status().to_string(),
+                time = %format_args!("{}ms", diff.as_millis()),
-                "time" => format!("{}ms", diff.as_millis())
             ),
-            Err(err) => error!(logger2, ""; "error" => err.to_string()),
+            Err(err) => tracing::error!(%err),
         };
 
         res
@@ -152,7 +143,6 @@ impl App {
         &self,
         _req: Request<Body>,
         _params: Params,
-        logger: Logger,
     ) -> Result<Response<Body>, HyperError> {
         let engine = self.engine.clone();
 
@@ -161,7 +151,7 @@ impl App {
 
         match popular {
             Err(err) => {
-                error!(logger, "error: {}", err);
+                tracing::error!(%err);
                 let mut response =
                     views::html::error::render("Could not retrieve popular items", "");
                 *response.status_mut() = StatusCode::INTERNAL_SERVER_ERROR;
@@ -177,7 +167,6 @@ impl App {
         &self,
         req: Request<Body>,
         params: Params,
-        logger: Logger,
         format: StatusFormat,
     ) -> Result<Response<Body>, HyperError> {
         let server = self.clone();
@@ -192,7 +181,7 @@ impl App {
 
         match repo_path_result {
             Err(err) => {
-                error!(logger, "error: {}", err);
+                tracing::error!(%err);
                 let mut response = views::html::error::render(
                     "Could not parse repository path",
                     "Please make sure to provide a valid repository path.",
@@ -209,7 +198,7 @@ impl App {
 
                 match analyze_result {
                     Err(err) => {
-                        error!(logger, "error: {}", err);
+                        tracing::error!(%err);
                         let response = App::status_format_analysis(
                             None,
                             format,
@@ -236,7 +225,6 @@ impl App {
         &self,
         _req: Request<Body>,
         params: Params,
-        logger: Logger,
     ) -> Result<Response<Body>, HyperError> {
         let engine = self.engine.clone();
 
@@ -245,7 +233,7 @@ impl App {
 
         match crate_name_result {
             Err(err) => {
-                error!(logger, "error: {}", err);
+                tracing::error!(%err);
                 let mut response = views::html::error::render(
                     "Could not parse crate name",
                     "Please make sure to provide a valid crate name.",
@@ -261,7 +249,7 @@ impl App {
 
                 match release_result {
                     Err(err) => {
-                        error!(logger, "error: {}", err);
+                        tracing::error!(%err);
                         let mut response = views::html::error::render(
                             "Could not fetch crate information",
                             "Please make sure to provide a valid crate name.",
@@ -302,7 +290,6 @@ impl App {
         &self,
         req: Request<Body>,
         params: Params,
-        logger: Logger,
         format: StatusFormat,
     ) -> Result<Response<Body>, HyperError> {
         let server = self.clone();
@@ -332,7 +319,7 @@ impl App {
                     Ok(Some(latest_rel)) => latest_rel.version.to_string(),
                     Ok(None) => return Ok(not_found()),
                     Err(err) => {
-                        error!(logger, "error: {}", err);
+                        tracing::error!(%err);
                         let mut response = views::html::error::render(
                             "Could not fetch crate information",
                             "Please make sure to provide a valid crate name.",
@@ -349,7 +336,7 @@ impl App {
 
         match crate_path_result {
             Err(err) => {
-                error!(logger, "error: {}", err);
+                tracing::error!(%err);
                 let mut response = views::html::error::render(
                     "Could not parse crate path",
                     "Please make sure to provide a valid crate name and version.",
@@ -365,7 +352,7 @@ impl App {
 
                 match analyze_result {
                     Err(err) => {
-                        error!(logger, "error: {}", err);
+                        tracing::error!(%err);
                         let response = App::status_format_analysis(
                             None,
                             format,

src/utils/cache.rs

@@ -3,7 +3,6 @@ use std::{fmt, sync::Arc, time::Duration};
 use derive_more::{Display, Error, From};
 use hyper::service::Service;
 use lru_time_cache::LruCache;
-use slog::{debug, Logger};
 use tokio::sync::Mutex;
 
 #[derive(Debug, Clone, Display, From, Error)]
@@ -18,7 +17,6 @@ where
 {
     inner: S,
     cache: Arc<Mutex<LruCache<Req, S::Response>>>,
-    logger: Logger,
 }
 
 impl<S, Req> fmt::Debug for Cache<S, Req>
@@ -38,13 +36,12 @@ where
     S::Response: Clone,
     Req: Clone + Eq + Ord + fmt::Debug,
 {
-    pub fn new(service: S, ttl: Duration, capacity: usize, logger: Logger) -> Cache<S, Req> {
+    pub fn new(service: S, ttl: Duration, capacity: usize) -> Cache<S, Req> {
         let cache = LruCache::with_expiry_duration_and_capacity(ttl, capacity);
 
         Cache {
             inner: service,
             cache: Arc::new(Mutex::new(cache)),
-            logger,
         }
     }
 
@@ -53,19 +50,19 @@ where
             let mut cache = self.cache.lock().await;
 
             if let Some(cached_response) = cache.get(&req) {
-                debug!(
+                tracing::debug!(
-                    self.logger, "cache hit";
+                    svc = ?self.inner,
-                    "svc" => format!("{:?}", self.inner),
+                    req = ?req,
-                    "req" => format!("{:?}", &req)
+                    cache = "hit",
                 );
                 return Ok(cached_response.clone());
             }
         }
 
-        debug!(
+        tracing::debug!(
-            self.logger, "cache miss";
+            svc = ?self.inner,
-            "svc" => format!("{:?}", self.inner),
+            req = ?req,
-            "req" => format!("{:?}", &req)
+            cache = "miss",
         );
 
         let mut service = self.inner.clone();

src/utils/index.rs

@@ -6,21 +6,20 @@ use crate::models::crates::CrateName;
 use anyhow::Result;
 use crates_index::Crate;
 use crates_index::GitIndex;
-use slog::{error, Logger};
 use tokio::task::spawn_blocking;
 use tokio::time::{self, MissedTickBehavior};
 
 #[derive(Clone)]
 pub struct ManagedIndex {
     index: Arc<Mutex<GitIndex>>,
-    logger: Logger,
 }
 
 impl ManagedIndex {
-    pub fn new(logger: Logger) -> Self {
+    pub fn new() -> Self {
         // the index path is configurable through the `CARGO_HOME` env variable
         let index = Arc::new(Mutex::new(GitIndex::new_cargo_default().unwrap()));
-        Self { index, logger }
+
+        Self { index }
     }
 
     pub fn crate_(&self, crate_name: CrateName) -> Option<Crate> {
@@ -34,10 +33,9 @@ impl ManagedIndex {
         update_interval.set_missed_tick_behavior(MissedTickBehavior::Delay);
 
         loop {
-            if let Err(e) = self.refresh().await {
+            if let Err(err) = self.refresh().await {
-                error!(
+                tracing::error!(
-                    self.logger,
+                    "failed refreshing the crates.io-index, the operation will be retried: {err}"
-                    "failed refreshing the crates.io-index, the operation will be retried: {}", e
                 );
             }
             update_interval.tick().await;