Auto merge of #3919 - Turbo87:sentry-tracing, r=JohnTitor

sentry: Enable `tracing` feature

https://github.com/tokio-rs/tracing/releases/tag/tracing-subscriber-0.2.21 enables us to use per-layer event filters, which previously blocked us from using the `tracing` feature of `sentry`. This PR enables the feature using the default configuration, which reports all `error!()` usages as errors and `warn!()` and `info!()` as breadcrumbs for associated errors.

Author: bors

Cargo.lock

@@ -73,7 +73,7 @@ rand = "0.8"
 reqwest = { version = "0.11", features = ["blocking", "gzip", "json"] }
 scheduled-thread-pool = "0.2.0"
 semver = { version = "1.0.3", features = ["serde"] }
-sentry = "0.23.0"
+sentry = { version = "0.23.0", features = ["tracing"] }
 serde = { version = "1.0.0", features = ["derive"] }
 serde_json = "1.0.0"
 sha2 = "0.9"

Cargo.toml

@@ -1,7 +1,7 @@
 #![warn(clippy::all, rust_2018_idioms)]
 
 use cargo_registry::{metrics::LogEncoder, util::errors::AppResult, App, Env};
-use std::{fs::File, process::Command, sync::Arc, time::Duration};
+use std::{env, fs::File, process::Command, sync::Arc, time::Duration};
 
 use conduit_hyper::Service;
 use futures_util::future::FutureExt;
@@ -10,14 +10,27 @@ use reqwest::blocking::Client;
 use std::io::Write;
 use tokio::io::AsyncWriteExt;
 use tokio::signal::unix::{signal, SignalKind};
+use tracing::Level;
+use tracing_subscriber::{filter, prelude::*};
 
 const CORE_THREADS: usize = 4;
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let _sentry = cargo_registry::sentry::init();
 
     // Initialize logging
-    tracing_subscriber::fmt::init();
+
+    let log_filter = env::var("RUST_LOG")
+        .unwrap_or_default()
+        .parse::<filter::Targets>()
+        .expect("Invalid RUST_LOG value");
+
+    let sentry_filter = filter::Targets::new().with_default(Level::INFO);
+
+    tracing_subscriber::registry()
+        .with(tracing_subscriber::fmt::layer().with_filter(log_filter))
+        .with(sentry::integrations::tracing::layer().with_filter(sentry_filter))
+        .init();
 
     let config = cargo_registry::config::Server::default();
     let env = config.env();