diff --git a/Cargo.lock b/Cargo.lock index bd45f3f..2ea761a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -116,7 +116,7 @@ dependencies = [ "base64 0.21.7", "bytes", "futures", - "http 0.2.12", + "http", "memchr", "nkeys 0.3.2", "nuid", @@ -126,7 +126,7 @@ dependencies = [ "ring", "rustls", "rustls-native-certs", - "rustls-pemfile 1.0.4", + "rustls-pemfile", "rustls-webpki", "serde", "serde_json", @@ -215,9 +215,9 @@ dependencies = [ "bitflags 1.3.2", "bytes", "futures-util", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.28", + "http", + "http-body", + "hyper", "itoa 1.0.11", "matchit", "memchr", @@ -241,8 +241,8 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http 0.2.12", - "http-body 0.4.6", + "http", + "http-body", "mime", "rustversion", "tower-layer", @@ -702,7 +702,6 @@ dependencies = [ "rand 0.8.5", "rcgen", "rsa", - "sentry", "serde", "serde_json", "sha2", @@ -841,16 +840,6 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" -[[package]] -name = "debugid" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" -dependencies = [ - "serde", - "uuid", -] - [[package]] name = "defguard_wireguard_rs" version = "0.4.2" @@ -1118,18 +1107,6 @@ dependencies = [ "windows-sys 0.52.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" @@ -1560,7 +1537,6 @@ dependencies = [ "prost-types 0.12.4", "protobuf", "provisioning", - "sentry", "serde", "settings", "status", @@ -1638,7 +1614,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http 0.2.12", + "http", "indexmap 2.2.6", "slab", "tokio", @@ -1709,17 +1685,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "hostname" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba" -dependencies = [ - "cfg-if", - "libc", - "windows 0.52.0", -] - [[package]] name = "html5ever" version = "0.26.0" @@ -1745,17 +1710,6 @@ dependencies = [ "itoa 1.0.11", ] -[[package]] -name = "http" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" -dependencies = [ - "bytes", - "fnv", - "itoa 1.0.11", -] - [[package]] name = "http-body" version = "0.4.6" @@ -1763,30 +1717,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http 0.2.12", - "pin-project-lite", -] - -[[package]] -name = "http-body" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" -dependencies = [ - "bytes", - "http 1.1.0", -] - -[[package]] -name = "http-body-util" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" -dependencies = [ - "bytes", - "futures-core", - "http 1.1.0", - "http-body 1.0.0", + "http", "pin-project-lite", ] @@ -1819,8 +1750,8 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http 0.2.12", - "http-body 0.4.6", + "http", + "http-body", "httparse", "httpdate", "itoa 1.0.11", @@ -1832,32 +1763,13 @@ dependencies = [ "want", ] -[[package]] -name = "hyper" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http 1.1.0", - "http-body 1.0.0", - "httparse", - "itoa 1.0.11", - "pin-project-lite", - "smallvec", - "tokio", - "want", -] - [[package]] name = "hyper-timeout" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "hyper 0.14.28", + "hyper", "pin-project-lite", "tokio", "tokio-io-timeout", @@ -1870,46 +1782,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper 0.14.28", - "native-tls", - "tokio", - "tokio-native-tls", -] - -[[package]] -name = "hyper-tls" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" -dependencies = [ - "bytes", - "http-body-util", - "hyper 1.3.1", - "hyper-util", + "hyper", "native-tls", "tokio", "tokio-native-tls", - "tower-service", -] - -[[package]] -name = "hyper-util" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http 1.1.0", - "http-body 1.0.0", - "hyper 1.3.1", - "pin-project-lite", - "socket2", - "tokio", - "tower", - "tower-service", - "tracing", ] [[package]] @@ -2384,8 +2260,6 @@ dependencies = [ "prost-types 0.12.4", "protobuf", "provisioning", - "sentry", - "sentry-tracing", "serde", "serde_json", "settings", @@ -2426,8 +2300,7 @@ dependencies = [ "events", "identity", "nats-client", - "reqwest 0.11.27", - "sentry-tracing", + "reqwest", "serde", "services", "sha256", @@ -2661,9 +2534,7 @@ dependencies = [ "local-ip-address", "messaging", "nix", - "reqwest 0.11.27", - "sentry", - "sentry-tracing", + "reqwest", "serde", "serde_json", "serde_yaml", @@ -3038,7 +2909,7 @@ checksum = "a819b71d6530c4297b49b3cae2939ab3a8cc1b9f382826a1bc29dd0ca3864906" dependencies = [ "async-trait", "bytes", - "http 0.2.12", + "http", "opentelemetry_api", ] @@ -3051,7 +2922,7 @@ dependencies = [ "async-trait", "futures", "futures-util", - "http 0.2.12", + "http", "opentelemetry 0.19.0", "opentelemetry-http", "opentelemetry-proto 0.2.0", @@ -3069,7 +2940,7 @@ checksum = "f24cda83b20ed2433c68241f918d0f6fdec8b1d43b7a9590ab4420c5095ca930" dependencies = [ "async-trait", "futures-core", - "http 0.2.12", + "http", "opentelemetry 0.21.0", "opentelemetry-proto 0.4.0", "opentelemetry-semantic-conventions 0.13.0", @@ -3215,17 +3086,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "os_info" -version = "3.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092" -dependencies = [ - "log", - "serde", - "windows-sys 0.52.0", -] - [[package]] name = "overload" version = "0.1.1" @@ -3825,9 +3685,7 @@ dependencies = [ "identity", "kv-store", "messaging", - "reqwest 0.11.27", - "sentry", - "sentry-tracing", + "reqwest", "serde", "serde_json", "serde_yaml", @@ -4063,10 +3921,10 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.28", - "hyper-tls 0.5.0", + "http", + "http-body", + "hyper", + "hyper-tls", "ipnet", "js-sys", "log", @@ -4075,7 +3933,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls-pemfile 1.0.4", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", @@ -4091,46 +3949,6 @@ dependencies = [ "winreg 0.50.0", ] -[[package]] -name = "reqwest" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e6cc1e89e689536eb5aeede61520e874df5a4707df811cd5da4aa5fbb2aae19" -dependencies = [ - "base64 0.22.0", - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "http 1.1.0", - "http-body 1.0.0", - "http-body-util", - "hyper 1.3.1", - "hyper-tls 0.6.0", - "hyper-util", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls-pemfile 2.1.2", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "tokio", - "tokio-native-tls", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winreg 0.52.0", -] - [[package]] name = "ring" version = "0.17.8" @@ -4213,7 +4031,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", - "rustls-pemfile 1.0.4", + "rustls-pemfile", "schannel", "security-framework", ] @@ -4227,22 +4045,6 @@ dependencies = [ "base64 0.21.7", ] -[[package]] -name = "rustls-pemfile" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" -dependencies = [ - "base64 0.22.0", - "rustls-pki-types", -] - -[[package]] -name = "rustls-pki-types" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247" - [[package]] name = "rustls-webpki" version = "0.101.7" @@ -4357,126 +4159,6 @@ dependencies = [ "serde", ] -[[package]] -name = "sentry" -version = "0.32.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00421ed8fa0c995f07cde48ba6c89e80f2b312f74ff637326f392fbfd23abe02" -dependencies = [ - "httpdate", - "native-tls", - "reqwest 0.12.3", - "sentry-anyhow", - "sentry-backtrace", - "sentry-contexts", - "sentry-core", - "sentry-debug-images", - "sentry-panic", - "sentry-tracing", - "tokio", - "ureq", -] - -[[package]] -name = "sentry-anyhow" -version = "0.32.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddcbce6e6785c2d91e67c55196f60ac561fab5946b6c7d60cc29f498fc126076" -dependencies = [ - "anyhow", - "sentry-backtrace", - "sentry-core", -] - -[[package]] -name = "sentry-backtrace" -version = "0.32.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a79194074f34b0cbe5dd33896e5928bbc6ab63a889bd9df2264af5acb186921e" -dependencies = [ - "backtrace", - "once_cell", - "regex", - "sentry-core", -] - -[[package]] -name = "sentry-contexts" -version = "0.32.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eba8870c5dba2bfd9db25c75574a11429f6b95957b0a78ac02e2970dd7a5249a" -dependencies = [ - "hostname", - "libc", - "os_info", - "rustc_version", - "sentry-core", - "uname", -] - -[[package]] -name = "sentry-core" -version = "0.32.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a75011ea1c0d5c46e9e57df03ce81f5c7f0a9e199086334a1f9c0a541e0826" -dependencies = [ - "once_cell", - "rand 0.8.5", - "sentry-types", - "serde", - "serde_json", -] - -[[package]] -name = "sentry-debug-images" -version = "0.32.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ec2a486336559414ab66548da610da5e9626863c3c4ffca07d88f7dc71c8de8" -dependencies = [ - "findshlibs", - "once_cell", - "sentry-core", -] - -[[package]] -name = "sentry-panic" -version = "0.32.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eaa3ecfa3c8750c78dcfd4637cfa2598b95b52897ed184b4dc77fcf7d95060d" -dependencies = [ - "sentry-backtrace", - "sentry-core", -] - -[[package]] -name = "sentry-tracing" -version = "0.32.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f715932bf369a61b7256687c6f0554141b7ce097287e30e3f7ed6e9de82498fe" -dependencies = [ - "sentry-backtrace", - "sentry-core", - "tracing-core", - "tracing-subscriber", -] - -[[package]] -name = "sentry-types" -version = "0.32.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4519c900ce734f7a0eb7aba0869dfb225a7af8820634a7dd51449e3b093cfb7c" -dependencies = [ - "debugid", - "hex", - "rand 0.8.5", - "serde", - "serde_json", - "thiserror", - "time", - "url", - "uuid", -] - [[package]] name = "serde" version = "1.0.198" @@ -4868,7 +4550,6 @@ dependencies = [ "events", "identity", "messaging", - "sentry", "serde", "serde_json", "services", @@ -5112,7 +4793,7 @@ dependencies = [ "glob", "gtk", "heck 0.5.0", - "http 0.2.12", + "http", "ignore", "objc", "once_cell", @@ -5205,7 +4886,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd7ffddf36d450791018e63a3ddf54979b9581d9644c584a5fb5611e6b5f20b4" dependencies = [ "gtk", - "http 0.2.12", + "http", "http-range", "rand 0.8.5", "raw-window-handle", @@ -5595,9 +5276,9 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.28", + "http", + "http-body", + "hyper", "hyper-timeout", "percent-encoding", "pin-project", @@ -5626,9 +5307,9 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.28", + "http", + "http-body", + "hyper", "hyper-timeout", "percent-encoding", "pin-project", @@ -5653,9 +5334,9 @@ dependencies = [ "base64 0.21.7", "bytes", "h2", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.28", + "http", + "http-body", + "hyper", "hyper-timeout", "percent-encoding", "pin-project", @@ -5743,7 +5424,6 @@ version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -5859,15 +5539,6 @@ version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" -[[package]] -name = "uname" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b72f89f0ca32e4db1c04e2a72f5345d59796d4866a1ee0609084569f73683dc8" -dependencies = [ - "libc", -] - [[package]] name = "unicode-bidi" version = "0.3.15" @@ -5918,19 +5589,6 @@ dependencies = [ "windows 0.52.0", ] -[[package]] -name = "ureq" -version = "2.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11f214ce18d8b2cbe84ed3aa6486ed3f5b285cf8d8fbdbce9f3f767a724adc35" -dependencies = [ - "base64 0.21.7", - "log", - "native-tls", - "once_cell", - "url", -] - [[package]] name = "url" version = "2.5.0" @@ -5962,7 +5620,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ "getrandom 0.2.14", - "serde", ] [[package]] @@ -6567,7 +6224,7 @@ dependencies = [ "glib", "gtk", "html5ever", - "http 0.2.12", + "http", "kuchikiki", "libc", "log", diff --git a/Cargo.toml b/Cargo.toml index cf77448..d64cb27 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,8 +22,6 @@ serde_json = "1.0.33" serde_yaml = "0.9.21" tracing = "0.1" tracing-subscriber = { version = "0.3", features = ["env-filter"] } -sentry-tracing = {version= "0.32.1"} -sentry = { version = "0.32.1",features = ["backtrace", "anyhow"] } init-tracing-opentelemetry = { version = "0.12.0", features = ["otlp", "tracing_subscriber_ext"] } anyhow = { version= "1.0.71", features = ["backtrace"]} opentelemetry = "0.21.0" diff --git a/agent/Cargo.toml b/agent/Cargo.toml index dc367f5..2232542 100644 --- a/agent/Cargo.toml +++ b/agent/Cargo.toml @@ -28,8 +28,6 @@ serde = { workspace = true } serde_json = { workspace = true } tracing = { workspace = true } tracing-subscriber = { workspace = true } -sentry-tracing = { workspace = true } -sentry = { workspace = true } init-tracing-opentelemetry = { workspace = true } anyhow = { workspace = true } opentelemetry = { workspace = true } diff --git a/agent/src/bin/agent.rs b/agent/src/bin/agent.rs index 47ee42f..7e69b52 100644 --- a/agent/src/bin/agent.rs +++ b/agent/src/bin/agent.rs @@ -7,7 +7,6 @@ use init_tracing_opentelemetry::tracing_subscriber_ext::{ use mecha_agent::init::init_services; use opentelemetry::global; use opentelemetry_appender_tracing::layer::OpenTelemetryTracingBridge; -use sentry_tracing::EventFilter; use telemetry::config::init_logs_config; use tracing_subscriber::prelude::__tracing_subscriber_SubscriberExt; const PACKAGE_NAME: &str = env!("CARGO_PKG_NAME"); @@ -35,7 +34,6 @@ async fn main() -> Result<()> { let subscriber = tracing_subscriber::registry() .with(tracing_bridge_layer) - .with(sentry_tracing::layer().event_filter(|_| EventFilter::Ignore)) .with(build_loglevel_filter_layer()) //temp for terminal log .with(build_logger_text()) //temp for terminal log .with(build_otel_layer().unwrap()); diff --git a/client/app/Cargo.toml b/client/app/Cargo.toml index 714fe46..c0dd856 100644 --- a/client/app/Cargo.toml +++ b/client/app/Cargo.toml @@ -30,8 +30,6 @@ tokio-util = "0.7.10" reqwest = "0.11" tracing = "0.1" tracing-subscriber = { version = "0.3", features = ["env-filter"] } -sentry-tracing = {version= "0.32.1"} -sentry = { version = "0.32.1",features = ["backtrace", "anyhow"] } init-tracing-opentelemetry = { version = "0.12.0", features = ["otlp", "tracing_subscriber_ext"] } opentelemetry-appender-tracing = "0.2.0" simple-base64 = "0.23.2" diff --git a/commons/crypto/Cargo.toml b/commons/crypto/Cargo.toml index c22d72b..c6c665a 100644 --- a/commons/crypto/Cargo.toml +++ b/commons/crypto/Cargo.toml @@ -18,7 +18,6 @@ tracing = { workspace = true } base64 = "0.21.4" mkdirp = "1.0.0" rand = "0.8.5" -sentry = { workspace = true } serde_json = { workspace = true } serde = { workspace = true } tonic = { workspace = true } diff --git a/grpc-server/Cargo.toml b/grpc-server/Cargo.toml index 7e8e9f6..89940b3 100644 --- a/grpc-server/Cargo.toml +++ b/grpc-server/Cargo.toml @@ -19,7 +19,6 @@ telemetry = { path = "../telemetry" } tokio = { version = "1.27.0", features = ["full"] } serde = { version = "1.0.159", features = ["derive"]} tracing = "0.1" -sentry = { version = "0.32.1",features = ["backtrace", "anyhow"] } anyhow = { workspace = true } prost = { workspace = true } prost-types = { workspace = true } diff --git a/messaging/Cargo.toml b/messaging/Cargo.toml index 9318e14..e184d40 100644 --- a/messaging/Cargo.toml +++ b/messaging/Cargo.toml @@ -23,7 +23,6 @@ tonic = { workspace = true } tonic-types = { workspace = true } tracing = { workspace = true } reqwest = { workspace = true } -sentry-tracing = { workspace = true } serde = { workspace = true } sha256 = { workspace = true } \ No newline at end of file diff --git a/networking/Cargo.toml b/networking/Cargo.toml index fc0edd4..72ec8bf 100644 --- a/networking/Cargo.toml +++ b/networking/Cargo.toml @@ -29,8 +29,6 @@ tonic-types = { workspace = true } tracing = { workspace = true } tracing-subscriber = { workspace = true } reqwest = { workspace = true } -sentry = { workspace = true } -sentry-tracing = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } diff --git a/provisioning/Cargo.toml b/provisioning/Cargo.toml index 5c4f9fb..5494eef 100644 --- a/provisioning/Cargo.toml +++ b/provisioning/Cargo.toml @@ -22,8 +22,6 @@ fs = { path = "../commons/fs" } anyhow = { workspace = true } async-trait = { workspace = true } reqwest = { workspace = true } -sentry = { workspace = true } -sentry-tracing = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } diff --git a/status/Cargo.toml b/status/Cargo.toml index c085bd7..19884ef 100644 --- a/status/Cargo.toml +++ b/status/Cargo.toml @@ -20,7 +20,6 @@ channel = { path = "../commons/channel" } agent-settings = { path = "../core/settings" } crypto = { path = "../commons/crypto" } anyhow = { workspace = true } -sentry = { workspace = true } serde_json = { workspace = true } serde = { workspace = true }