diff --git a/Cargo.lock b/Cargo.lock index f9d82c3..e67b406 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -64,7 +64,7 @@ dependencies = [ "flate2", "foldhash 0.2.0", "futures-core", - "h2 0.3.27", + "h2", "http 0.2.12", "httparse", "httpdate", @@ -833,17 +833,6 @@ dependencies = [ "slab", ] -[[package]] -name = "getrandom" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - [[package]] name = "getrandom" version = "0.3.4" @@ -895,25 +884,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "h2" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f44da3a8150a6703ed5d34e164b875fd14c2cdab9af1252a9a1020bde2bdc54" -dependencies = [ - "atomic-waker", - "bytes", - "fnv", - "futures-core", - "futures-sink", - "http 1.4.0", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - [[package]] name = "hashbrown" version = "0.15.5" @@ -1033,7 +1003,6 @@ dependencies = [ "bytes", "futures-channel", "futures-core", - "h2 0.4.13", "http 1.4.0", "http-body", "httparse", @@ -1045,22 +1014,6 @@ dependencies = [ "want", ] -[[package]] -name = "hyper-rustls" -version = "0.27.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" -dependencies = [ - "http 1.4.0", - "hyper", - "hyper-util", - "rustls", - "rustls-pki-types", - "tokio", - "tokio-rustls", - "tower-service", -] - [[package]] name = "hyper-tls" version = "0.6.0" @@ -1383,12 +1336,11 @@ checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" [[package]] name = "maxminddb" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e84ef32bcbf18a95548989e880db4af6fafd563463753afb4b9a149fb2782c" +checksum = "a7bd67e2f5d65937ff283e418fcad53c8e2eeda0719e455508b62dad8ffe6180" dependencies = [ "ipnetwork", - "log", "memchr", "serde", "thiserror", @@ -1926,12 +1878,10 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2 0.4.13", "http 1.4.0", "http-body", "http-body-util", "hyper", - "hyper-rustls", "hyper-tls", "hyper-util", "js-sys", @@ -1954,20 +1904,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "ring" -version = "0.17.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" -dependencies = [ - "cc", - "cfg-if", - "getrandom 0.2.17", - "libc", - "untrusted", - "windows-sys 0.52.0", -] - [[package]] name = "rustc-demangle" version = "0.1.26" @@ -1996,19 +1932,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "rustls" -version = "0.23.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "758025cb5fccfd3bc2fd74708fd4682be41d99e5dff73c377c0646c6012c73a4" -dependencies = [ - "once_cell", - "rustls-pki-types", - "rustls-webpki", - "subtle", - "zeroize", -] - [[package]] name = "rustls-pki-types" version = "1.13.0" @@ -2018,17 +1941,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "rustls-webpki" -version = "0.103.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e" -dependencies = [ - "ring", - "rustls-pki-types", - "untrusted", -] - [[package]] name = "rustversion" version = "1.0.22" @@ -2087,9 +1999,9 @@ checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" [[package]] name = "sentry" -version = "0.48.5" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d631477761f57c76148456e55e80e9a479ff3fa4c65b2b4a0c3acf1167fd4638" +checksum = "d91e4790d8c2f43a6645ee2cb12aac2db79221fddd035b94c8166b88ea094408" dependencies = [ "cfg_aliases", "httpdate", @@ -2100,6 +2012,7 @@ dependencies = [ "sentry-contexts", "sentry-core", "sentry-debug-images", + "sentry-log", "sentry-panic", "sentry-tracing", "tokio", @@ -2108,9 +2021,9 @@ dependencies = [ [[package]] name = "sentry-actix" -version = "0.48.5" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "119ede4e37790ec04e8a14073c8414f0a4b2648402856c0563495a9a5cf54d57" +checksum = "5a12b26925e70eba6c346588650f8b346d9e78a83249970b706068456005cd61" dependencies = [ "actix-http", "actix-web", @@ -2121,9 +2034,9 @@ dependencies = [ [[package]] name = "sentry-backtrace" -version = "0.48.5" +version = "0.49.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "448b0981fbde6cdc9eb087ba3dc01035a253fef9a0d9e79aaf198fc26acb2e64" +checksum = "e3bcc2497c2327998146207b7600599ef7592233920f4d4e1d41ddeeba0e4210" dependencies = [ "backtrace", "regex", @@ -2132,9 +2045,9 @@ dependencies = [ [[package]] name = "sentry-contexts" -version = "0.48.5" +version = "0.49.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e5e909d02170ba6d1dc5ebd05bef7999280f5d960e3eaee5d1a18d88d41b334" +checksum = "1cb04cba225b38f59d08f9e3c29ab7259d9cc94fbb2c46d613a51cb0a4a7ee05" dependencies = [ "hostname", "libc", @@ -2146,9 +2059,9 @@ dependencies = [ [[package]] name = "sentry-core" -version = "0.48.5" +version = "0.49.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecf0b1a4a4e9ec88395b52e6fa4868b95564c1fa96b26a0606f5f6288a0f7149" +checksum = "48759bc392fb5e3b36b4efcb485f51074c0ba8479711cd5c8cf79e86f9f75d41" dependencies = [ "rand 0.9.4", "sentry-types", @@ -2159,19 +2072,30 @@ dependencies = [ [[package]] name = "sentry-debug-images" -version = "0.48.5" +version = "0.49.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f81d7749c57fc78ed52134889e8121da874065bc40da788d5798cce0f8c19f15" +checksum = "0a5bd325059b70b21ca6e42b0f2409821272dddc1cf37923de37269af55389b5" dependencies = [ "findshlibs", "sentry-core", ] +[[package]] +name = "sentry-log" +version = "0.49.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9553a2f0f75bc8550137ebc753e8d2161af63ff780ca59983935f8df8f01655" +dependencies = [ + "bitflags", + "log", + "sentry-core", +] + [[package]] name = "sentry-panic" -version = "0.48.5" +version = "0.49.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7d93d6ecb55d2251c5fc084c55c03a2bc68904918d76117e602c999e92f00f" +checksum = "a685d22f672b1562ebeff3f2affceb5960595648cc936dae73da3e1d6a55fbd1" dependencies = [ "sentry-backtrace", "sentry-core", @@ -2179,9 +2103,9 @@ dependencies = [ [[package]] name = "sentry-tracing" -version = "0.48.5" +version = "0.49.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58d26379236c4ef97eaf081bca3c7bf0ef6f06b3aa881eca2ee8e8dbc923e5b8" +checksum = "8aa7d8e0db4cccddbac01ddabd5344ad03b7c2f954b3ff850cecb1d9cf5d4758" dependencies = [ "bitflags", "sentry-backtrace", @@ -2192,9 +2116,9 @@ dependencies = [ [[package]] name = "sentry-types" -version = "0.48.5" +version = "0.49.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2239099d47e76857b0825a182ecdb90159add7aa1097b60247c6e7ca6bf49c6a" +checksum = "fab146d15a30ab4897a95fd15d6a038b8d7fbf2661c5f8b13738ce8df7a095b7" dependencies = [ "debugid", "hex", @@ -2405,12 +2329,6 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" -[[package]] -name = "subtle" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" - [[package]] name = "syn" version = "1.0.109" @@ -2588,16 +2506,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-rustls" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" -dependencies = [ - "rustls", - "tokio", -] - [[package]] name = "tokio-util" version = "0.7.17" @@ -2731,12 +2639,6 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - [[package]] name = "ureq" version = "3.1.4" diff --git a/Cargo.toml b/Cargo.toml index e4f9f93..a46a240 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,10 +17,10 @@ cadence = "^1.8.0" envy = "^0.4.2" futures = "^0.3" lazy_static = "^1.5.0" -maxminddb = "0.29.0" +maxminddb = "0.30.0" regex = "^1.12.3" -sentry = "^0.48.2" -sentry-actix = "^0.48.0" +sentry = "^0.49.0" +sentry-actix = "^0.49.0" serde = "^1.0.228" serde_derive = "^1.0.219" serde_json = "^1.0.150" diff --git a/src/main.rs b/src/main.rs index 5558f39..3911a22 100644 --- a/src/main.rs +++ b/src/main.rs @@ -51,15 +51,11 @@ async fn main() -> Result<(), ClassifyError> { .unwrap_or_else(|err| panic!("Critical failure setting up metrics logging: {err}")), ); - let _guard = sentry::init(( - sentry_dsn, - sentry::ClientOptions { - release: sentry::release_name!(), - environment: Some(sentry_env.into()), - sample_rate: sentry_sample_rate, - ..Default::default() - }, - )); + let sentry_opts = sentry::ClientOptions::new() + .maybe_release(sentry::release_name!()) + .environment(sentry_env) + .sample_rate(sentry_sample_rate); + let _guard = sentry::init((sentry_dsn, sentry_opts)); let state = EndpointState { api_keys_hashset: keys::load(api_keys_file, app_log.clone()),