diff --git a/rust_snuba/Cargo.lock b/rust_snuba/Cargo.lock index 6c80e07bbc..0f68d7ad2d 100644 --- a/rust_snuba/Cargo.lock +++ b/rust_snuba/Cargo.lock @@ -3530,7 +3530,7 @@ dependencies = [ "sentry", "sentry-kafka-schemas", "sentry-options", - "sentry_arroyo", + "sentry_arroyo 2.43.1", "sentry_protos", "sentry_usage_accountant", "seq-macro", @@ -3971,6 +3971,32 @@ dependencies = [ "uuid", ] +[[package]] +name = "sentry_arroyo" +version = "2.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b962caedc7c28baaf90780020e464d1f2436c6c2a38008dcfd43d96536802ce" +dependencies = [ + "async-stream", + "chrono", + "coarsetime", + "futures", + "metrics", + "once_cell", + "parking_lot", + "rand 0.8.6", + "rdkafka", + "sentry-core", + "serde", + "serde_json", + "thiserror 1.0.58", + "tokio", + "tokio-stream", + "tokio-util", + "tracing", + "uuid", +] + [[package]] name = "sentry_protos" version = "0.80.0" @@ -3985,16 +4011,15 @@ dependencies = [ [[package]] name = "sentry_usage_accountant" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88a60bb78d48a84d672855fa919d6ff462e243929f7106c89d7b08b8a818eea9" +checksum = "9893113dbc7d8c93b69a1f81bd707af33d7636ee8a69ee622976dc3041ff7c97" dependencies = [ "chrono", - "rdkafka", + "sentry_arroyo 2.48.0", "serde", "serde_json", "thiserror 1.0.58", - "tracing", ] [[package]] diff --git a/rust_snuba/Cargo.toml b/rust_snuba/Cargo.toml index 7eb7ca2ba0..b9cd387be5 100644 --- a/rust_snuba/Cargo.toml +++ b/rust_snuba/Cargo.toml @@ -70,7 +70,7 @@ sentry-kafka-schemas = "2.1.39" sentry-options = "1.2.1" sentry_protos = "0.80.0" sentry_arroyo = { git = "https://github.com/getsentry/arroyo", branch = "rbroughan/pull-based-arroyo-part-2", features = ["ssl"] } -sentry_usage_accountant = { version = "0.1.2", features = ["kafka"] } +sentry_usage_accountant = { version = "0.2.0", features = ["kafka"] } seq-macro = "0.3" serde = { version = "1.0", features = ["derive"] } serde_json = { version = "1.0", features = ["raw_value"] } diff --git a/rust_snuba/src/logging.rs b/rust_snuba/src/logging.rs index 1ece2c6acf..1ca6842040 100644 --- a/rust_snuba/src/logging.rs +++ b/rust_snuba/src/logging.rs @@ -32,14 +32,6 @@ pub fn setup_logging() { // everything at or above INFO, instead of breadcrumbs. let sentry_layer = sentry::integrations::tracing::layer().event_filter(|metadata| { match *metadata.level() { - // The usage accountant is a best-effort billing side channel. Its - // Kafka producer logs "Purged in queue/flight" at ERROR whenever the - // producer is flushed during a consumer shutdown/rebalance. These - // are transient and don't affect ingestion, so keep them as logs - // rather than issues (SNUBA-474, SNUBA-475). - Level::ERROR if metadata.target().starts_with("sentry_usage_accountant") => { - EventFilter::Log - } // The DogStatsD forwarder logs at ERROR on every undeliverable flush // (e.g. "Connection refused"), which self-heals but floods Sentry when // the target is unreachable. Keep it as logs only (SNUBA-BQ8).