Merge pull request #16 from svanill/better-sentry-integration

Update Sentry and setup instrumentations
svanill · Mar 29, 2022 · ceec550 · ceec550
2 parents 15fe9f1 + 994ec6c
commit ceec550
Show file tree

Hide file tree

Showing 7 changed files with 60 additions and 77 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/svanill-vault-server/Cargo.toml b/svanill-vault-server/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name = "svanill-vault-server"
 description = "svanill-vault, the server"
-version = "0.4.2"
+version = "0.5.0"
 authors = ["Riccardo Attilio Galli <[email protected]>"]
 repository = "https://github.com/svanill/svanill-vault-server"
-edition = "2018"
+edition = "2021"
 license = "AGPL-3.0-or-later"
 readme = "README.md"
 
@@ -42,11 +42,12 @@ diesel_migrations = "1.4.0"
 reqwest = { version = "0.11.6", default-features = false, features = ["blocking", "gzip", "multipart", "json", "rustls-tls", "rustls-tls-webpki-roots"] }
 hyper = { version = "0.14.14", features = ["full"] }
 hyper-rustls = { version = "0.22.1", features = ["webpki-roots"] }
+sentry-actix = "0.25.0"
 
 [dependencies.sentry]
-version = "0.23.0"
+version = "0.25.0"
 default-features = false
-features = ["rustls", "backtrace", "contexts", "panic", "reqwest"]
+features = ["rustls", "backtrace", "contexts", "panic", "reqwest", "tracing"]
 
 [dev-dependencies]
 tokio = "1.13.1"

diff --git a/svanill-vault-server/src/bin/svanill-vault-server.rs b/svanill-vault-server/src/bin/svanill-vault-server.rs
@@ -141,6 +141,10 @@ async fn main() -> Result<()> {
         release: Some(format!("svanill-vault-server@{}", std::env!("GIT_HASH")).into()),
         attach_stacktrace: true,
         in_app_include: vec!["svanill"],
+        session_mode: sentry::SessionMode::Request,
+        auto_session_tracking: true,
+        sample_rate: 1.0,
+        traces_sample_rate: 1.0,
         ..Default::default()
     });
 

diff --git a/svanill-vault-server/src/file_server.rs b/svanill-vault-server/src/file_server.rs
@@ -85,7 +85,7 @@ impl FileServer {
                 .unwrap_or_default()
                 .into_iter()
                 .filter(|x| x.key.is_some())
-                .map(|obj| async {
+                .map(|obj| async move {
                     let key = obj.key.unwrap(); // always ok, we filtered for Some(key) only
                     let size = obj.size.unwrap_or_default();
 

diff --git a/svanill-vault-server/src/http/mod.rs b/svanill-vault-server/src/http/mod.rs
@@ -1,3 +1,2 @@
 mod auth_middleware;
 pub mod handlers;
-pub mod sentry_middleware;
diff --git a/svanill-vault-server/src/http/sentry_middleware.rs b/svanill-vault-server/src/http/sentry_middleware.rs
diff --git a/svanill-vault-server/src/server.rs b/svanill-vault-server/src/server.rs
@@ -5,8 +5,6 @@ use actix_web::{http, web, App, HttpServer};
 use crate::auth::tokens_cache::TokensCache;
 use crate::file_server::FileServer;
 use crate::http::handlers::{config_handlers, render_40x, render_500};
-use crate::http::sentry_middleware::enrich_sentry_event_with_request_metadata;
-use actix_web::dev::Service;
 use diesel::{
     r2d2::{self, ConnectionManager},
     SqliteConnection,
@@ -58,10 +56,7 @@ pub fn run(listener: TcpListener, data: AppData) -> Result<Server, std::io::Erro
             .wrap(ErrorHandlers::new().handler(http::StatusCode::BAD_REQUEST, render_40x))
             .wrap(Logger::default())
             .wrap(cors_handler)
-            .wrap_fn(|req, srv| {
-                enrich_sentry_event_with_request_metadata(&req);
-                srv.call(req)
-            })
+            .wrap(sentry_actix::Sentry::with_transaction())
             .configure(config_handlers)
     })
     .listen(listener)?