From 672fcee8aa2063473d48b3da78dbc647858f35b9 Mon Sep 17 00:00:00 2001 From: Irevoire Date: Tue, 24 Aug 2021 12:27:30 +0200 Subject: [PATCH] remove sentry --- Cargo.lock | 214 +---------------------------------- README.md | 2 - meilisearch-http/Cargo.toml | 16 +-- meilisearch-http/src/main.rs | 36 +----- 4 files changed, 8 insertions(+), 260 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 43222363e..1227d0a03 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -232,15 +232,6 @@ dependencies = [ "path-slash", ] -[[package]] -name = "addr2line" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7a2e47a1fbe209ee101dd6d61285226744c6c8d3c21c8dc878ba6cb9f467f3a" -dependencies = [ - "gimli", -] - [[package]] name = "adler" version = "1.0.2" @@ -352,21 +343,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" -[[package]] -name = "backtrace" -version = "0.3.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7815ea54e4d821e791162e078acbebfd6d8c8939cd559c9335dceb1c8ca7282" -dependencies = [ - "addr2line", - "cc", - "cfg-if 1.0.0", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - [[package]] name = "base-x" version = "0.2.8" @@ -763,16 +739,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "debugid" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91cf5a8c2f2097e2a32627123508635d47ce10563d999ec1a95addf08b502ba" -dependencies = [ - "serde", - "uuid", -] - [[package]] name = "derive_more" version = "0.99.14" @@ -1110,12 +1076,6 @@ dependencies = [ "syn 1.0.73", ] -[[package]] -name = "gimli" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4075386626662786ddb0ec9081e7c7eeb1ba31951f447ca780ef9f5d568189" - [[package]] name = "git2" version = "0.13.20" @@ -1249,17 +1209,6 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -[[package]] -name = "hostname" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" -dependencies = [ - "libc", - "match_cfg", - "winapi", -] - [[package]] name = "http" version = "0.2.4" @@ -1288,12 +1237,6 @@ version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68" -[[package]] -name = "httpdate" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" - [[package]] name = "httpdate" version = "1.0.1" @@ -1326,7 +1269,7 @@ dependencies = [ "http", "http-body", "httparse", - "httpdate 1.0.1", + "httpdate", "itoa", "pin-project-lite", "socket2", @@ -1603,12 +1546,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" -[[package]] -name = "match_cfg" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" - [[package]] name = "matches" version = "0.1.8" @@ -1674,7 +1611,6 @@ dependencies = [ "regex", "reqwest", "rustls", - "sentry", "serde", "serde_json", "serde_url_params", @@ -1911,15 +1847,6 @@ dependencies = [ "libc", ] -[[package]] -name = "object" -version = "0.25.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a38f2be3697a57b4060074ff41b44c16870d916ad7877c17696e063257482bc7" -dependencies = [ - "memchr", -] - [[package]] name = "obkv" version = "0.2.0" @@ -2511,28 +2438,13 @@ dependencies = [ "retain_mut", ] -[[package]] -name = "rustc-demangle" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dead70b0b5e03e9c814bcb6b01e03e68f7c57a80aa48c72ec92152ab3e818d49" - [[package]] name = "rustc_version" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" dependencies = [ - "semver 0.9.0", -] - -[[package]] -name = "rustc_version" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" -dependencies = [ - "semver 0.11.0", + "semver", ] [[package]] @@ -2591,16 +2503,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" dependencies = [ - "semver-parser 0.7.0", -] - -[[package]] -name = "semver" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser 0.10.2", + "semver-parser", ] [[package]] @@ -2609,105 +2512,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "sentry" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27c425b07c7186018e2ef9ac3a25b01dae78b05a7ef604d07f216b9f59b42b4" -dependencies = [ - "httpdate 0.3.2", - "reqwest", - "sentry-backtrace", - "sentry-contexts", - "sentry-core", - "sentry-log", - "sentry-panic", -] - -[[package]] -name = "sentry-backtrace" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80a5b9d9be0a0e25b2aaa5f3e9815d7fc6b8904f800c41800e5583652b5ca733" -dependencies = [ - "backtrace", - "lazy_static", - "regex", - "sentry-core", -] - -[[package]] -name = "sentry-contexts" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2410b212de9b2eb7427d2bf9a1f4f5cb2aa14359863d982066ead00d6de9bce0" -dependencies = [ - "hostname", - "lazy_static", - "libc", - "regex", - "rustc_version 0.3.3", - "sentry-core", - "uname", -] - -[[package]] -name = "sentry-core" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbbe485e384cb5540940e65d729820ffcbedc0c902fcb27081e44dacfe6a0c34" -dependencies = [ - "lazy_static", - "rand 0.8.4", - "sentry-types", - "serde", - "serde_json", -] - -[[package]] -name = "sentry-log" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "647143f672410ae5f242acd40f9f8f39729aff5ac7e856d91450fdfc30c2e960" -dependencies = [ - "log", - "sentry-core", -] - -[[package]] -name = "sentry-panic" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89cf195cff04a50b90e6b9ac8b4874dc63b8e0a466f193702801ef98baa9bd90" -dependencies = [ - "sentry-backtrace", - "sentry-core", -] - -[[package]] -name = "sentry-types" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5e777cff85b44538ac766a9604676b7180d01d2566e76b2ac41426c734498c" -dependencies = [ - "chrono", - "debugid", - "serde", - "serde_json", - "thiserror", - "url", - "uuid", -] - [[package]] name = "serde" version = "1.0.126" @@ -2896,7 +2700,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" dependencies = [ "discard", - "rustc_version 0.2.3", + "rustc_version", "stdweb-derive", "stdweb-internal-macros", "stdweb-internal-runtime", @@ -3273,15 +3077,6 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" -[[package]] -name = "uname" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b72f89f0ca32e4db1c04e2a72f5345d59796d4866a1ee0609084569f73683dc8" -dependencies = [ - "libc", -] - [[package]] name = "unicase" version = "2.6.0" @@ -3349,7 +3144,6 @@ dependencies = [ "idna", "matches", "percent-encoding", - "serde", ] [[package]] diff --git a/README.md b/README.md index fbaaa0e6c..40378e468 100644 --- a/README.md +++ b/README.md @@ -183,8 +183,6 @@ This helps us better understand developers' usage of MeiliSearch features. To see what information we're retrieving, please see the complete list [on the dedicated issue](https://github.com/meilisearch/MeiliSearch/issues/720). -We also use Sentry to make us crash and error reports. If you want to know more about what Sentry collects, please visit their [privacy policy website](https://sentry.io/privacy/). - This program is optional, you can disable these analytics by using the `MEILI_NO_ANALYTICS` env variable. ## Feature request diff --git a/meilisearch-http/Cargo.toml b/meilisearch-http/Cargo.toml index 0f8a5e21f..d94a30093 100644 --- a/meilisearch-http/Cargo.toml +++ b/meilisearch-http/Cargo.toml @@ -78,20 +78,6 @@ whoami = { version = "1.1.2", optional = true } reqwest = { version = "0.11.3", features = ["json", "rustls-tls"], default-features = false, optional = true } serdeval = "0.1.0" -[dependencies.sentry] -default-features = false -features = [ - "backtrace", - "contexts", - "panic", - "reqwest", - "rustls", - "log", -] -optional = true -version = "0.22.0" - - [dev-dependencies] actix-rt = "2.1.0" assert-json-diff = { branch = "master", git = "https://github.com/qdequele/assert-json-diff" } @@ -112,7 +98,7 @@ mini-dashboard = [ "tempfile", "zip", ] -analytics = ["sentry", "whoami", "reqwest"] +analytics = ["whoami", "reqwest"] default = ["analytics", "mini-dashboard"] [target.'cfg(target_os = "linux")'.dependencies] diff --git a/meilisearch-http/src/main.rs b/meilisearch-http/src/main.rs index 78dacd640..9cf8f24df 100644 --- a/meilisearch-http/src/main.rs +++ b/meilisearch-http/src/main.rs @@ -14,9 +14,6 @@ use std::sync::Arc; #[global_allocator] static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc; -#[cfg(all(not(debug_assertions), feature = "analytics"))] -const SENTRY_DSN: &str = "https://5ddfa22b95f241198be2271aaf028653@sentry.io/3060337"; - #[actix_web::main] async fn main() -> Result<(), MainError> { let opt = Opt::from_args(); @@ -28,6 +25,8 @@ async fn main() -> Result<(), MainError> { log_builder.filter_module("milli", log::LevelFilter::Warn); } + log_builder.init(); + match opt.env.as_ref() { "production" => { if opt.master_key.is_none() { @@ -36,37 +35,8 @@ async fn main() -> Result<(), MainError> { .into(), ); } - - #[cfg(all(not(debug_assertions), feature = "analytics"))] - if !opt.no_analytics { - let logger = - sentry::integrations::log::SentryLogger::with_dest(log_builder.build()); - log::set_boxed_logger(Box::new(logger)) - .map(|()| log::set_max_level(log::LevelFilter::Info)) - .unwrap(); - - let sentry = sentry::init(sentry::ClientOptions { - release: sentry::release_name!(), - dsn: Some(SENTRY_DSN.parse()?), - before_send: Some(Arc::new(|event| { - if matches!(event.message, Some(ref msg) if msg.to_lowercase().contains("no space left on device")) - { - None - } else { - Some(event) - } - })), - ..Default::default() - }); - // sentry must stay alive as long as possible - std::mem::forget(sentry); - } else { - log_builder.init(); - } - } - "development" => { - log_builder.init(); } + "development" => (), _ => unreachable!(), }