diff --git a/Cargo.lock b/Cargo.lock index 8ba7cf3aa6..5f45e032e0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -249,9 +249,6 @@ name = "anyhow" version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" -dependencies = [ - "backtrace", -] [[package]] name = "api-auth" @@ -6280,18 +6277,6 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "findshlibs" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40b9e59cd0f7e0806cca4be089683ecb6434e602038df21fe6bf6711b2f07f64" -dependencies = [ - "cc", - "lazy_static", - "libc", - "winapi", -] - [[package]] name = "fixedbitset" version = "0.4.2" @@ -7471,17 +7456,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "hostname" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56f203cd1c76362b69e3863fd987520ac36cf70a8c92627449b2f64a8cf7d65" -dependencies = [ - "cfg-if", - "libc", - "windows-link", -] - [[package]] name = "hstr" version = "0.2.12" @@ -10392,17 +10366,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "os_info" -version = "3.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a604e53c24761286860eba4e2c8b23a0161526476b1de520139d69cdb85a6b5" -dependencies = [ - "log", - "serde", - "windows-sys 0.52.0", -] - [[package]] name = "os_pipe" version = "1.1.5" @@ -12023,7 +11986,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" dependencies = [ - "hostname 0.3.1", + "hostname", "quick-error", ] @@ -12209,7 +12172,6 @@ dependencies = [ "kv-str", "nix 0.27.1", "rivet-toolchain", - "sentry", "serde", "serde_json", "sysinfo 0.32.1", @@ -13668,127 +13630,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -[[package]] -name = "sentry" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "255914a8e53822abd946e2ce8baa41d4cded6b8e938913b7f7b9da5b7ab44335" -dependencies = [ - "httpdate", - "reqwest 0.12.12", - "rustls 0.23.25", - "sentry-anyhow", - "sentry-backtrace", - "sentry-contexts", - "sentry-core", - "sentry-debug-images", - "sentry-panic", - "sentry-tracing", - "tokio", - "ureq", - "webpki-roots 0.26.7", -] - -[[package]] -name = "sentry-anyhow" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ddfaa9f4d64827e05f394c72d5628d99bf27f8979ef37b89baf057fb4b8a908" -dependencies = [ - "anyhow", - "sentry-backtrace", - "sentry-core", -] - -[[package]] -name = "sentry-backtrace" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00293cd332a859961f24fd69258f7e92af736feaeb91020cff84dac4188a4302" -dependencies = [ - "backtrace", - "once_cell", - "regex", - "sentry-core", -] - -[[package]] -name = "sentry-contexts" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "961990f9caa76476c481de130ada05614cd7f5aa70fb57c2142f0e09ad3fb2aa" -dependencies = [ - "hostname 0.4.1", - "libc", - "os_info", - "rustc_version 0.4.1", - "sentry-core", - "uname", -] - -[[package]] -name = "sentry-core" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a6409d845707d82415c800290a5d63be5e3df3c2e417b0997c60531dfbd35ef" -dependencies = [ - "once_cell", - "rand 0.8.5", - "sentry-types", - "serde", - "serde_json", -] - -[[package]] -name = "sentry-debug-images" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71ab5df4f3b64760508edfe0ba4290feab5acbbda7566a79d72673065888e5cc" -dependencies = [ - "findshlibs", - "once_cell", - "sentry-core", -] - -[[package]] -name = "sentry-panic" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "609b1a12340495ce17baeec9e08ff8ed423c337c1a84dffae36a178c783623f3" -dependencies = [ - "sentry-backtrace", - "sentry-core", -] - -[[package]] -name = "sentry-tracing" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f4e86402d5c50239dc7d8fd3f6d5e048221d5fcb4e026d8d50ab57fe4644cb" -dependencies = [ - "sentry-backtrace", - "sentry-core", - "tracing-core", - "tracing-subscriber", -] - -[[package]] -name = "sentry-types" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d3f117b8755dbede8260952de2aeb029e20f432e72634e8969af34324591631" -dependencies = [ - "debugid", - "hex", - "rand 0.8.5", - "serde", - "serde_json", - "thiserror 1.0.69", - "time 0.3.37", - "url", - "uuid", -] - [[package]] name = "serde" version = "1.0.219" @@ -16484,15 +16325,6 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" -[[package]] -name = "uname" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b72f89f0ca32e4db1c04e2a72f5345d59796d4866a1ee0609084569f73683dc8" -dependencies = [ - "libc", -] - [[package]] name = "unic-char-property" version = "0.9.0" @@ -17643,12 +17475,6 @@ dependencies = [ "syn 2.0.90", ] -[[package]] -name = "windows-link" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38" - [[package]] name = "windows-registry" version = "0.2.0" diff --git a/packages/toolchain/cli/Cargo.toml b/packages/toolchain/cli/Cargo.toml index 086705af6b..0bbb4ca0bc 100644 --- a/packages/toolchain/cli/Cargo.toml +++ b/packages/toolchain/cli/Cargo.toml @@ -9,9 +9,9 @@ edition.workspace = true name = "rivet" path = "src/main.rs" -[features] -default = ["sentry"] -sentry = [] +# [features] +# default = ["sentry"] +# sentry = [] [dependencies] clap = { version = "4.5.9", features = ["derive"] } @@ -26,7 +26,7 @@ base64 = "0.22.1" kv-str.workspace = true inquire = "0.7.5" webbrowser = "1.0.2" -sentry = { version = "0.37.0", default-features = false, features = ["anyhow", "backtrace", "contexts", "debug-images", "panic", "reqwest", "rustls"] } +# sentry = { version = "0.37.0", default-features = false, features = ["anyhow", "backtrace", "contexts", "debug-images", "panic", "reqwest", "rustls"] } sysinfo = "0.32.0" ctrlc = "3.4.5" async-posthog.workspace = true diff --git a/packages/toolchain/cli/src/main.rs b/packages/toolchain/cli/src/main.rs index b2a86a699c..20f31ba0f3 100644 --- a/packages/toolchain/cli/src/main.rs +++ b/packages/toolchain/cli/src/main.rs @@ -33,14 +33,14 @@ struct Cli { } fn main() -> ExitCode { - // We use a sync main for Sentry. Read more: https://docs.sentry.io/platforms/rust/#async-main-function - - // This has a 2 second deadline to flush any remaining events which is sufficient for - // short-lived commands. - let _guard = sentry::init(("https://b329eb15c63e1002611fb3b7a58a1dfa@o4504307129188352.ingest.us.sentry.io/4508361147809792", sentry::ClientOptions { - release: sentry::release_name!(), - ..Default::default() -})); +// // We use a sync main for Sentry. Read more: https://docs.sentry.io/platforms/rust/#async-main-function +// +// // This has a 2 second deadline to flush any remaining events which is sufficient for +// // short-lived commands. +// let _guard = sentry::init(("https://b329eb15c63e1002611fb3b7a58a1dfa@o4504307129188352.ingest.us.sentry.io/4508361147809792", sentry::ClientOptions { +// release: sentry::release_name!(), +// ..Default::default() +// })); // Run main let exit_code = tokio::runtime::Builder::new_multi_thread() @@ -81,18 +81,18 @@ async fn main_async() -> ExitCode { exit_code } -async fn report_error(err: anyhow::Error) { - let event_id = sentry::integrations::anyhow::capture_anyhow(&err); +async fn report_error(_err: anyhow::Error) { + // let event_id = sentry::integrations::anyhow::capture_anyhow(&err); // Capture event in PostHog - util::telemetry::capture_event( - "$exception", - Some(|event: &mut async_posthog::Event| { - event.insert_prop("errors", format!("{}", err))?; - event.insert_prop("$sentry_event_id", event_id.to_string())?; - event.insert_prop("$sentry_url", format!("https://sentry.io/organizations/rivet-gaming/issues/?project=4508361147809792&query={event_id}"))?; - Ok(()) - }), - ) - .await; + // util::telemetry::capture_event( + // "$exception", + // Some(|event: &mut async_posthog::Event| { + // event.insert_prop("errors", format!("{}", err))?; + // event.insert_prop("$sentry_event_id", event_id.to_string())?; + // event.insert_prop("$sentry_url", format!("https://sentry.io/organizations/rivet-gaming/issues/?project=4508361147809792&query={event_id}"))?; + // Ok(()) + // }), + // ) + // .await; }