From ace1e32443b8c09728db3760fc5480319e87b649 Mon Sep 17 00:00:00 2001 From: Joris Bayer Date: Fri, 27 Feb 2026 09:56:57 +0100 Subject: [PATCH 1/2] build: Upgrade reqwest --- Cargo.lock | 491 ++++++++++++++++++++++++++++++++++++++++++++++------- Cargo.toml | 8 +- 2 files changed, 431 insertions(+), 68 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8dbe813120a..3b2a0618050 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -220,6 +220,28 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" +[[package]] +name = "aws-lc-rs" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9a7b350e3bb1767102698302bc37256cbd48422809984b98d292c40e2579aa9" +dependencies = [ + "aws-lc-sys", + "zeroize", +] + +[[package]] +name = "aws-lc-sys" +version = "0.37.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b092fe214090261288111db7a2b2c2118e5a7f30dc2569f1732c4069a6840549" +dependencies = [ + "cc", + "cmake", + "dunce", + "fs_extra", +] + [[package]] name = "axum" version = "0.8.8" @@ -572,6 +594,12 @@ dependencies = [ "shlex", ] +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + [[package]] name = "cexpr" version = "0.6.0" @@ -809,6 +837,16 @@ dependencies = [ "libc", ] +[[package]] +name = "core-foundation" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "core-foundation-sys" version = "0.8.7" @@ -1206,6 +1244,12 @@ version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" +[[package]] +name = "dunce" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" + [[package]] name = "dynfmt" version = "0.1.5" @@ -1542,6 +1586,12 @@ dependencies = [ "tokio", ] +[[package]] +name = "fs_extra" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" + [[package]] name = "futures" version = "0.3.31" @@ -1687,9 +1737,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0" dependencies = [ "cfg-if", + "js-sys", "libc", "r-efi", "wasi 0.14.2+wasi-0.2.4", + "wasm-bindgen", ] [[package]] @@ -2369,6 +2421,28 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" +[[package]] +name = "jni" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if", + "combine", + "jni-sys", + "log", + "thiserror 1.0.69", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + [[package]] name = "jobserver" version = "0.1.32" @@ -2610,6 +2684,12 @@ dependencies = [ "hashbrown 0.16.1", ] +[[package]] +name = "lru-slab" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" + [[package]] name = "lz4_flex" version = "0.11.3" @@ -2870,10 +2950,10 @@ dependencies = [ "libc", "log", "openssl", - "openssl-probe", + "openssl-probe 0.1.5", "openssl-sys", "schannel", - "security-framework", + "security-framework 2.11.1", "security-framework-sys", "tempfile", ] @@ -3112,7 +3192,7 @@ dependencies = [ "jsonwebtoken", "objectstore-types", "reqwest 0.13.2", - "sentry-core", + "sentry-core 0.41.0", "serde", "thiserror 2.0.17", "tokio", @@ -3181,6 +3261,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +[[package]] +name = "openssl-probe" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" + [[package]] name = "openssl-src" version = "300.4.1+3.4.0" @@ -3768,6 +3854,62 @@ version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" +[[package]] +name = "quinn" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20" +dependencies = [ + "bytes", + "cfg_aliases", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash", + "rustls", + "socket2 0.6.2", + "thiserror 2.0.17", + "tokio", + "tracing", + "web-time", +] + +[[package]] +name = "quinn-proto" +version = "0.11.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31" +dependencies = [ + "aws-lc-rs", + "bytes", + "getrandom 0.3.2", + "lru-slab", + "rand 0.9.2", + "ring", + "rustc-hash", + "rustls", + "rustls-pki-types", + "slab", + "thiserror 2.0.17", + "tinyvec", + "tracing", + "web-time", +] + +[[package]] +name = "quinn-udp" +version = "0.5.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd" +dependencies = [ + "cfg_aliases", + "libc", + "once_cell", + "socket2 0.6.2", + "tracing", + "windows-sys 0.60.2", +] + [[package]] name = "quote" version = "1.0.41" @@ -4045,7 +4187,7 @@ dependencies = [ "relay-log", "relay-server", "relay-statsd", - "reqwest 0.12.24", + "reqwest 0.13.2", "uuid", ] @@ -4141,7 +4283,7 @@ dependencies = [ "criterion", "regex-lite", "relay-pattern", - "sentry-types", + "sentry-types 0.46.2", "serde", "serde_test", ] @@ -4352,8 +4494,8 @@ dependencies = [ "console", "relay-common", "relay-crash", - "sentry", - "sentry-core", + "sentry 0.46.2", + "sentry-core 0.46.2", "serde", "tracing", "tracing-subscriber", @@ -4517,7 +4659,7 @@ dependencies = [ "minidump-writer", "object", "rmpv", - "sentry", + "sentry 0.41.0", "tempfile", "tracing", "watto", @@ -4698,10 +4840,10 @@ dependencies = [ "relay-system", "relay-test", "relay-threading", - "reqwest 0.12.24", + "reqwest 0.13.2", "rmp-serde", "semver", - "sentry", + "sentry 0.46.2", "sentry_protos", "serde", "serde_bytes", @@ -4797,31 +4939,24 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.24" +version = "0.12.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0946410b9f7b082a427e4ef5c8ff541a88b357bc6c637c40db3a68ac70a36f" +checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" dependencies = [ - "async-compression", "base64 0.22.1", "bytes", - "encoding_rs", "futures-channel", "futures-core", "futures-util", - "h2", - "hickory-resolver", "http", "http-body", "http-body-util", "hyper", - "hyper-rustls", "hyper-tls", "hyper-util", "js-sys", "log", - "mime", "native-tls", - "once_cell", "percent-encoding", "pin-project-lite", "rustls-pki-types", @@ -4831,14 +4966,12 @@ dependencies = [ "sync_wrapper", "tokio", "tokio-native-tls", - "tokio-util", "tower", "tower-http", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", - "wasm-streams 0.4.2", "web-sys", ] @@ -4851,6 +4984,7 @@ dependencies = [ "base64 0.22.1", "bytes", "encoding_rs", + "futures-channel", "futures-core", "futures-util", "h2", @@ -4869,12 +5003,16 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", + "quinn", + "rustls", "rustls-pki-types", + "rustls-platform-verifier", "serde", "serde_json", "sync_wrapper", "tokio", "tokio-native-tls", + "tokio-rustls", "tokio-util", "tower", "tower-http", @@ -4882,7 +5020,7 @@ dependencies = [ "url", "wasm-bindgen", "wasm-bindgen-futures", - "wasm-streams 0.5.0", + "wasm-streams", "web-sys", ] @@ -5032,10 +5170,11 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.19" +version = "0.23.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1" +checksum = "758025cb5fccfd3bc2fd74708fd4682be41d99e5dff73c377c0646c6012c73a4" dependencies = [ + "aws-lc-rs", "once_cell", "rustls-pki-types", "rustls-webpki", @@ -5043,6 +5182,18 @@ dependencies = [ "zeroize", ] +[[package]] +name = "rustls-native-certs" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "612460d5f7bea540c490b2b6395d8e34a953e52b491accd6c86c8164c5932a63" +dependencies = [ + "openssl-probe 0.2.1", + "rustls-pki-types", + "schannel", + "security-framework 3.6.0", +] + [[package]] name = "rustls-pemfile" version = "2.2.0" @@ -5058,15 +5209,44 @@ version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79" dependencies = [ + "web-time", "zeroize", ] +[[package]] +name = "rustls-platform-verifier" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d99feebc72bae7ab76ba994bb5e121b8d83d910ca40b36e0921f53becc41784" +dependencies = [ + "core-foundation 0.10.1", + "core-foundation-sys", + "jni", + "log", + "once_cell", + "rustls", + "rustls-native-certs", + "rustls-platform-verifier-android", + "rustls-webpki", + "security-framework 3.6.0", + "security-framework-sys", + "webpki-root-certs 1.0.1", + "windows-sys 0.61.2", +] + +[[package]] +name = "rustls-platform-verifier-android" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" + [[package]] name = "rustls-webpki" -version = "0.102.8" +version = "0.103.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" +checksum = "d7df23109aa6c1567d1c575b9952556388da57401e4ace1d15f79eedad0d8f53" dependencies = [ + "aws-lc-rs", "ring", "rustls-pki-types", "untrusted", @@ -5183,7 +5363,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ "bitflags 2.9.4", - "core-foundation", + "core-foundation 0.9.4", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework" +version = "3.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d17b898a6d6948c3a8ee4372c17cb384f90d2e6e912ef00895b14fd7ab54ec38" +dependencies = [ + "bitflags 2.9.4", + "core-foundation 0.10.1", "core-foundation-sys", "libc", "security-framework-sys", @@ -5191,9 +5384,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.12.1" +version = "2.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" +checksum = "6ce2691df843ecc5d231c0b14ece2acc3efb62c0a398c7e1d875f3983ce020e3" dependencies = [ "core-foundation-sys", "libc", @@ -5221,17 +5414,35 @@ version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "507ac2be9bf2da56c831da57faf1dadd81f434bd282935cdb06193d0c94e8811" dependencies = [ + "httpdate", + "reqwest 0.12.28", + "sentry-backtrace 0.41.0", + "sentry-contexts 0.41.0", + "sentry-core 0.41.0", + "sentry-debug-images 0.41.0", + "sentry-panic 0.41.0", + "sentry-tracing 0.41.0", + "tokio", +] + +[[package]] +name = "sentry" +version = "0.46.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d92d893ba7469d361a6958522fa440e4e2bc8bf4c5803cd1bf40b9af63f8f9a8" +dependencies = [ + "cfg_aliases", "httpdate", "native-tls", - "reqwest 0.12.24", - "sentry-backtrace", - "sentry-contexts", - "sentry-core", - "sentry-debug-images", + "reqwest 0.12.28", + "sentry-backtrace 0.46.2", + "sentry-contexts 0.46.2", + "sentry-core 0.46.2", + "sentry-debug-images 0.46.2", "sentry-log", - "sentry-panic", + "sentry-panic 0.46.2", "sentry-tower", - "sentry-tracing", + "sentry-tracing 0.46.2", "tokio", "ureq", ] @@ -5244,7 +5455,18 @@ checksum = "eb4416302fa5325181a120e0fe7d4afd83cd95e52a9b86afa34a8161383fe0dc" dependencies = [ "backtrace", "regex", - "sentry-core", + "sentry-core 0.41.0", +] + +[[package]] +name = "sentry-backtrace" +version = "0.46.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f8784d0a27b5cd4b5f75769ffc84f0b7580e3c35e1af9cd83cb90b612d769cc" +dependencies = [ + "backtrace", + "regex", + "sentry-core 0.46.2", ] [[package]] @@ -5257,7 +5479,21 @@ dependencies = [ "libc", "os_info", "rustc_version", - "sentry-core", + "sentry-core 0.41.0", + "uname", +] + +[[package]] +name = "sentry-contexts" +version = "0.46.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e5eb42f4cd4f9fdfec9e3b07b25a4c9769df83d218a7e846658984d5948ad3e" +dependencies = [ + "hostname 0.4.1", + "libc", + "os_info", + "rustc_version", + "sentry-core 0.46.2", "uname", ] @@ -5268,9 +5504,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00e9bd2cadaeda3af41e9fa5d14645127d6f6a4aec73da3ae38e477ecafd3682" dependencies = [ "rand 0.9.2", - "sentry-types", + "sentry-types 0.41.0", + "serde", + "serde_json", +] + +[[package]] +name = "sentry-core" +version = "0.46.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0b1e7ca40f965db239da279bf278d87b7407469b98835f27f0c8e59ed189b06" +dependencies = [ + "rand 0.9.2", + "sentry-types 0.46.2", "serde", "serde_json", + "url", ] [[package]] @@ -5280,7 +5529,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1e074fe9a0970c91999b23ed3195e6e30990d589fba3a68f20a1686af0f5cda" dependencies = [ "findshlibs", - "sentry-core", + "sentry-core 0.41.0", +] + +[[package]] +name = "sentry-debug-images" +version = "0.46.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "002561e49ea3a9de316e2efadc40fae553921b8ff41448f02ea85fd135a778d6" +dependencies = [ + "findshlibs", + "sentry-core 0.46.2", ] [[package]] @@ -5301,12 +5560,13 @@ dependencies = [ [[package]] name = "sentry-log" -version = "0.41.0" +version = "0.46.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a693f27e3f63ae085cf7c176b5c44038af27c8a0170d01db30ccf776c2d40ce3" +checksum = "e200860daf76e09f9ad111bce25928f96bedbb84bc5934b37f05bb445727c70e" dependencies = [ + "bitflags 2.9.4", "log", - "sentry-core", + "sentry-core 0.46.2", ] [[package]] @@ -5315,8 +5575,18 @@ version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4651d34f3ba649d9e6dc1268443cae6728b8f741c2f0264004f8ecf5b247330d" dependencies = [ - "sentry-backtrace", - "sentry-core", + "sentry-backtrace 0.41.0", + "sentry-core 0.41.0", +] + +[[package]] +name = "sentry-panic" +version = "0.46.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8906f8be87aea5ac7ef937323fb655d66607427f61007b99b7cb3504dc5a156c" +dependencies = [ + "sentry-backtrace 0.46.2", + "sentry-core 0.46.2", ] [[package]] @@ -5333,13 +5603,13 @@ dependencies = [ [[package]] name = "sentry-tower" -version = "0.41.0" +version = "0.46.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f77964ead7e064d4b4b2b8001d5fc3c36dcac2ac607b3d5e0f1c2ae7a361a594" +checksum = "56aebe376310840b49dad4cca55c7b32d9abdc14946cd071d4158ecb149b63a4" dependencies = [ "http", "pin-project", - "sentry-core", + "sentry-core 0.46.2", "tower-layer", "tower-service", "url", @@ -5352,8 +5622,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c25c47d36bc80c74d26d568ffe970c37b337c061b7234ad6f2d159439c16f000" dependencies = [ "bitflags 2.9.4", - "sentry-backtrace", - "sentry-core", + "sentry-backtrace 0.41.0", + "sentry-core 0.41.0", + "tracing-core", + "tracing-subscriber", +] + +[[package]] +name = "sentry-tracing" +version = "0.46.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b07eefe04486316c57aba08ab53dd44753c25102d1d3fe05775cc93a13262d9" +dependencies = [ + "bitflags 2.9.4", + "sentry-backtrace 0.46.2", + "sentry-core 0.46.2", "tracing-core", "tracing-subscriber", ] @@ -5375,6 +5658,23 @@ dependencies = [ "uuid", ] +[[package]] +name = "sentry-types" +version = "0.46.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567711f01f86a842057e1fc17779eba33a336004227e1a1e7e6cc2599e22e259" +dependencies = [ + "debugid", + "hex", + "rand 0.9.2", + "serde", + "serde_json", + "thiserror 2.0.17", + "time", + "url", + "uuid", +] + [[package]] name = "sentry_protos" version = "0.7.0" @@ -6053,7 +6353,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ "bitflags 2.9.4", - "core-foundation", + "core-foundation 0.9.4", "system-configuration-sys", ] @@ -6800,19 +7100,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "wasm-streams" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65" -dependencies = [ - "futures-util", - "js-sys", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - [[package]] name = "wasm-streams" version = "0.5.0" @@ -6842,6 +7129,16 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + [[package]] name = "webpki-root-certs" version = "0.26.11" @@ -7035,6 +7332,15 @@ dependencies = [ "windows-link 0.1.1", ] +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + [[package]] name = "windows-sys" version = "0.48.0" @@ -7080,6 +7386,21 @@ dependencies = [ "windows-link 0.2.1", ] +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + [[package]] name = "windows-targets" version = "0.48.5" @@ -7137,6 +7458,12 @@ dependencies = [ "windows-link 0.1.1", ] +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" @@ -7155,6 +7482,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" @@ -7173,6 +7506,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + [[package]] name = "windows_i686_gnu" version = "0.48.5" @@ -7203,6 +7542,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + [[package]] name = "windows_i686_msvc" version = "0.48.5" @@ -7221,6 +7566,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" @@ -7239,6 +7590,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" @@ -7257,6 +7614,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" diff --git a/Cargo.toml b/Cargo.toml index 171ff87b77b..59b7cc8a85d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -171,10 +171,10 @@ rdkafka-sys = "4.10.0" redis = { version = "1.0.2", default-features = false } regex = "1.11.3" regex-lite = "0.1.7" -reqwest = "0.12.23" +reqwest = { version = "0.13.2", features = ["blocking"] } rmp-serde = "1.3.0" semver = "1.0.27" -sentry = { version = "0.41.0", default-features = false, features = [ +sentry = { version = "0.46.2", default-features = false, features = [ # default features, except `release-health` is disabled "backtrace", "contexts", @@ -182,12 +182,12 @@ sentry = { version = "0.41.0", default-features = false, features = [ "panic", "transport", ] } -sentry-core = "0.41.0" +sentry-core = "0.46.2" sentry-kafka-schemas = { version = "2.1.24", default-features = false } sentry-release-parser = { version = "1.4.0", default-features = false, features = [ "semver-1", ] } -sentry-types = "0.41.0" +sentry-types = "0.46.2" sentry_protos = "0.7.0" serde = { version = "=1.0.228", features = ["derive", "rc"] } serde-transcode = "1.1.1" From 45d13161a30dcf797a8e35296ca6ad4aa1057955 Mon Sep 17 00:00:00 2001 From: Joris Bayer Date: Fri, 27 Feb 2026 12:19:29 +0100 Subject: [PATCH 2/2] simlpify --- Cargo.lock | 159 +++++++++-------------------------------------------- Cargo.toml | 6 +- 2 files changed, 29 insertions(+), 136 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3b2a0618050..5831a67ac80 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3192,7 +3192,7 @@ dependencies = [ "jsonwebtoken", "objectstore-types", "reqwest 0.13.2", - "sentry-core 0.41.0", + "sentry-core", "serde", "thiserror 2.0.17", "tokio", @@ -4283,7 +4283,7 @@ dependencies = [ "criterion", "regex-lite", "relay-pattern", - "sentry-types 0.46.2", + "sentry-types", "serde", "serde_test", ] @@ -4494,8 +4494,8 @@ dependencies = [ "console", "relay-common", "relay-crash", - "sentry 0.46.2", - "sentry-core 0.46.2", + "sentry", + "sentry-core", "serde", "tracing", "tracing-subscriber", @@ -4659,7 +4659,7 @@ dependencies = [ "minidump-writer", "object", "rmpv", - "sentry 0.41.0", + "sentry", "tempfile", "tracing", "watto", @@ -4843,7 +4843,7 @@ dependencies = [ "reqwest 0.13.2", "rmp-serde", "semver", - "sentry 0.46.2", + "sentry", "sentry_protos", "serde", "serde_bytes", @@ -5414,35 +5414,17 @@ version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "507ac2be9bf2da56c831da57faf1dadd81f434bd282935cdb06193d0c94e8811" dependencies = [ - "httpdate", - "reqwest 0.12.28", - "sentry-backtrace 0.41.0", - "sentry-contexts 0.41.0", - "sentry-core 0.41.0", - "sentry-debug-images 0.41.0", - "sentry-panic 0.41.0", - "sentry-tracing 0.41.0", - "tokio", -] - -[[package]] -name = "sentry" -version = "0.46.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d92d893ba7469d361a6958522fa440e4e2bc8bf4c5803cd1bf40b9af63f8f9a8" -dependencies = [ - "cfg_aliases", "httpdate", "native-tls", "reqwest 0.12.28", - "sentry-backtrace 0.46.2", - "sentry-contexts 0.46.2", - "sentry-core 0.46.2", - "sentry-debug-images 0.46.2", + "sentry-backtrace", + "sentry-contexts", + "sentry-core", + "sentry-debug-images", "sentry-log", - "sentry-panic 0.46.2", + "sentry-panic", "sentry-tower", - "sentry-tracing 0.46.2", + "sentry-tracing", "tokio", "ureq", ] @@ -5455,18 +5437,7 @@ checksum = "eb4416302fa5325181a120e0fe7d4afd83cd95e52a9b86afa34a8161383fe0dc" dependencies = [ "backtrace", "regex", - "sentry-core 0.41.0", -] - -[[package]] -name = "sentry-backtrace" -version = "0.46.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f8784d0a27b5cd4b5f75769ffc84f0b7580e3c35e1af9cd83cb90b612d769cc" -dependencies = [ - "backtrace", - "regex", - "sentry-core 0.46.2", + "sentry-core", ] [[package]] @@ -5479,21 +5450,7 @@ dependencies = [ "libc", "os_info", "rustc_version", - "sentry-core 0.41.0", - "uname", -] - -[[package]] -name = "sentry-contexts" -version = "0.46.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e5eb42f4cd4f9fdfec9e3b07b25a4c9769df83d218a7e846658984d5948ad3e" -dependencies = [ - "hostname 0.4.1", - "libc", - "os_info", - "rustc_version", - "sentry-core 0.46.2", + "sentry-core", "uname", ] @@ -5504,22 +5461,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00e9bd2cadaeda3af41e9fa5d14645127d6f6a4aec73da3ae38e477ecafd3682" dependencies = [ "rand 0.9.2", - "sentry-types 0.41.0", - "serde", - "serde_json", -] - -[[package]] -name = "sentry-core" -version = "0.46.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0b1e7ca40f965db239da279bf278d87b7407469b98835f27f0c8e59ed189b06" -dependencies = [ - "rand 0.9.2", - "sentry-types 0.46.2", + "sentry-types", "serde", "serde_json", - "url", ] [[package]] @@ -5529,17 +5473,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1e074fe9a0970c91999b23ed3195e6e30990d589fba3a68f20a1686af0f5cda" dependencies = [ "findshlibs", - "sentry-core 0.41.0", -] - -[[package]] -name = "sentry-debug-images" -version = "0.46.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "002561e49ea3a9de316e2efadc40fae553921b8ff41448f02ea85fd135a778d6" -dependencies = [ - "findshlibs", - "sentry-core 0.46.2", + "sentry-core", ] [[package]] @@ -5560,13 +5494,12 @@ dependencies = [ [[package]] name = "sentry-log" -version = "0.46.2" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e200860daf76e09f9ad111bce25928f96bedbb84bc5934b37f05bb445727c70e" +checksum = "a693f27e3f63ae085cf7c176b5c44038af27c8a0170d01db30ccf776c2d40ce3" dependencies = [ - "bitflags 2.9.4", "log", - "sentry-core 0.46.2", + "sentry-core", ] [[package]] @@ -5575,18 +5508,8 @@ version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4651d34f3ba649d9e6dc1268443cae6728b8f741c2f0264004f8ecf5b247330d" dependencies = [ - "sentry-backtrace 0.41.0", - "sentry-core 0.41.0", -] - -[[package]] -name = "sentry-panic" -version = "0.46.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8906f8be87aea5ac7ef937323fb655d66607427f61007b99b7cb3504dc5a156c" -dependencies = [ - "sentry-backtrace 0.46.2", - "sentry-core 0.46.2", + "sentry-backtrace", + "sentry-core", ] [[package]] @@ -5603,13 +5526,13 @@ dependencies = [ [[package]] name = "sentry-tower" -version = "0.46.2" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56aebe376310840b49dad4cca55c7b32d9abdc14946cd071d4158ecb149b63a4" +checksum = "f77964ead7e064d4b4b2b8001d5fc3c36dcac2ac607b3d5e0f1c2ae7a361a594" dependencies = [ "http", "pin-project", - "sentry-core 0.46.2", + "sentry-core", "tower-layer", "tower-service", "url", @@ -5622,21 +5545,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c25c47d36bc80c74d26d568ffe970c37b337c061b7234ad6f2d159439c16f000" dependencies = [ "bitflags 2.9.4", - "sentry-backtrace 0.41.0", - "sentry-core 0.41.0", - "tracing-core", - "tracing-subscriber", -] - -[[package]] -name = "sentry-tracing" -version = "0.46.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b07eefe04486316c57aba08ab53dd44753c25102d1d3fe05775cc93a13262d9" -dependencies = [ - "bitflags 2.9.4", - "sentry-backtrace 0.46.2", - "sentry-core 0.46.2", + "sentry-backtrace", + "sentry-core", "tracing-core", "tracing-subscriber", ] @@ -5658,23 +5568,6 @@ dependencies = [ "uuid", ] -[[package]] -name = "sentry-types" -version = "0.46.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567711f01f86a842057e1fc17779eba33a336004227e1a1e7e6cc2599e22e259" -dependencies = [ - "debugid", - "hex", - "rand 0.9.2", - "serde", - "serde_json", - "thiserror 2.0.17", - "time", - "url", - "uuid", -] - [[package]] name = "sentry_protos" version = "0.7.0" diff --git a/Cargo.toml b/Cargo.toml index 59b7cc8a85d..258c74788d6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -174,7 +174,7 @@ regex-lite = "0.1.7" reqwest = { version = "0.13.2", features = ["blocking"] } rmp-serde = "1.3.0" semver = "1.0.27" -sentry = { version = "0.46.2", default-features = false, features = [ +sentry = { version = "0.41.0", default-features = false, features = [ # default features, except `release-health` is disabled "backtrace", "contexts", @@ -182,12 +182,12 @@ sentry = { version = "0.46.2", default-features = false, features = [ "panic", "transport", ] } -sentry-core = "0.46.2" +sentry-core = "0.41.0" sentry-kafka-schemas = { version = "2.1.24", default-features = false } sentry-release-parser = { version = "1.4.0", default-features = false, features = [ "semver-1", ] } -sentry-types = "0.46.2" +sentry-types = "0.41.0" sentry_protos = "0.7.0" serde = { version = "=1.0.228", features = ["derive", "rc"] } serde-transcode = "1.1.1"