diff --git a/sentry_streams/Cargo.lock b/sentry_streams/Cargo.lock index 0fb92a20..c3101ac7 100644 --- a/sentry_streams/Cargo.lock +++ b/sentry_streams/Cargo.lock @@ -1381,7 +1381,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -2320,7 +2320,7 @@ dependencies = [ "sentry-actix", "sentry-backtrace", "sentry-contexts", - "sentry-core 0.48.1", + "sentry-core", "sentry-debug-images", "sentry-panic", "sentry-tracing", @@ -2338,7 +2338,7 @@ dependencies = [ "actix-web", "bytes", "futures-util", - "sentry-core 0.48.1", + "sentry-core", ] [[package]] @@ -2349,7 +2349,7 @@ checksum = "dc84c325ace9ca2388e510fe7d6672b5d60cd8b3bd0eb4bb4ee8314c323cd686" dependencies = [ "backtrace", "regex", - "sentry-core 0.48.1", + "sentry-core", ] [[package]] @@ -2362,23 +2362,10 @@ dependencies = [ "libc", "os_info", "rustc_version", - "sentry-core 0.48.1", + "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 0.32.3", - "serde", - "serde_json", -] - [[package]] name = "sentry-core" version = "0.48.1" @@ -2386,7 +2373,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f5abf20c42cb1593ec1638976e2647da55f79bccac956444c1707b6cce259a" dependencies = [ "rand 0.9.4", - "sentry-types 0.48.1", + "sentry-types", "serde", "serde_json", "url", @@ -2399,7 +2386,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b88bbe6a760d5724bb40689827e82e8db1e275947df2c59abe171bfc30bb671" dependencies = [ "findshlibs", - "sentry-core 0.48.1", + "sentry-core", ] [[package]] @@ -2409,7 +2396,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0260dcb52562b6a79ae7702312a26dba94b79fb5baee7301087529e5ca4e872e" dependencies = [ "sentry-backtrace", - "sentry-core 0.48.1", + "sentry-core", ] [[package]] @@ -2420,28 +2407,11 @@ checksum = "a1c035f3a0a8671ae1a231c5b457abb68b71acba2bf3054dab2a09a9d4ea487e" dependencies = [ "bitflags", "sentry-backtrace", - "sentry-core 0.48.1", + "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 1.0.69", - "time", - "url", - "uuid", -] - [[package]] name = "sentry-types" version = "0.48.1" @@ -2461,9 +2431,9 @@ dependencies = [ [[package]] name = "sentry_arroyo" -version = "2.39.2" +version = "2.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51da50a6e546268b9694e5f9421b505a55b04ddd9f151623be2ce3d1c8e7f2a8" +checksum = "ead64064bc67db796b37b2ad465c6798a80343a11fc23186cb78f06c116added" dependencies = [ "chrono", "coarsetime", @@ -2471,7 +2441,7 @@ dependencies = [ "parking_lot", "rand 0.8.5", "rdkafka", - "sentry-core 0.32.3", + "sentry-core", "serde", "serde_json", "thiserror 1.0.69", diff --git a/sentry_streams/Cargo.toml b/sentry_streams/Cargo.toml index a950e5c0..e2df8e05 100644 --- a/sentry_streams/Cargo.toml +++ b/sentry_streams/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] pyo3 = { version = "0.28.3" } serde = { version = "1.0", features = ["derive"] } -sentry_arroyo = { version = "2.39.2", features = ["ssl"] } +sentry_arroyo = { version = "2.40.0", features = ["ssl"] } chrono = "0.4.40" tracing = "0.1.40" tracing-subscriber = "0.3.20" diff --git a/sentry_streams/src/fake_strategy.rs b/sentry_streams/src/fake_strategy.rs index b893289a..2c1859a9 100644 --- a/sentry_streams/src/fake_strategy.rs +++ b/sentry_streams/src/fake_strategy.rs @@ -4,8 +4,8 @@ use crate::routes::RoutedValue; use crate::utils::traced_with_gil; use sentry_arroyo::processing::strategies::{ - merge_commit_request, CommitRequest, InvalidMessage, MessageRejected, ProcessingStrategy, - StrategyError, SubmitError, + merge_commit_request, CommitRequest, InvalidMessage, InvalidMessageReason, MessageRejected, + ProcessingStrategy, StrategyError, SubmitError, }; use sentry_arroyo::types::{AnyMessage, BrokerMessage, InnerMessage, Message, Partition, Topic}; use std::collections::HashMap; @@ -61,6 +61,7 @@ impl ProcessingStrategy for FakeStrategy { topic: Topic::new("test"), index: 0, }, + reason: InvalidMessageReason::Invalid, })) } } diff --git a/sentry_streams/src/filter_step.rs b/sentry_streams/src/filter_step.rs index 0cfb15b9..b647ee50 100644 --- a/sentry_streams/src/filter_step.rs +++ b/sentry_streams/src/filter_step.rs @@ -216,8 +216,9 @@ mod tests { 10, Utc::now(), ); - let SubmitError::InvalidMessage(InvalidMessage { partition, offset }) = - filter.submit(message).unwrap_err() + let SubmitError::InvalidMessage(InvalidMessage { + partition, offset, .. + }) = filter.submit(message).unwrap_err() else { panic!("Expected SubmitError::InvalidMessage") }; diff --git a/sentry_streams/src/header_filter_step.rs b/sentry_streams/src/header_filter_step.rs index 25239118..b5f27e87 100644 --- a/sentry_streams/src/header_filter_step.rs +++ b/sentry_streams/src/header_filter_step.rs @@ -333,8 +333,9 @@ mod tests { 10, Utc::now(), ); - let SubmitError::InvalidMessage(InvalidMessage { partition, offset }) = - strategy.submit(message).unwrap_err() + let SubmitError::InvalidMessage(InvalidMessage { + partition, offset, .. + }) = strategy.submit(message).unwrap_err() else { panic!("Expected SubmitError::InvalidMessage") }; diff --git a/sentry_streams/src/python_operator.rs b/sentry_streams/src/python_operator.rs index ee30a143..891eb291 100644 --- a/sentry_streams/src/python_operator.rs +++ b/sentry_streams/src/python_operator.rs @@ -9,9 +9,9 @@ use crate::utils::traced_with_gil; use pyo3::types::{PyDict, PyTuple}; use pyo3::Python; use pyo3::{import_exception, prelude::*}; -use sentry_arroyo::processing::strategies::ProcessingStrategy; use sentry_arroyo::processing::strategies::SubmitError; use sentry_arroyo::processing::strategies::{merge_commit_request, CommitRequest, StrategyError}; +use sentry_arroyo::processing::strategies::{InvalidMessageReason, ProcessingStrategy}; use sentry_arroyo::types::{Message, Partition, Topic}; use sentry_arroyo::utils::timing::Deadline; use std::collections::VecDeque; @@ -248,6 +248,7 @@ impl ProcessingStrategy for PythonAdapter { offset, partition: convert_partition(partition) .expect("Unable to convert partition from InvalidMessage into sentry_arroyo::types::Partition"), + reason: InvalidMessageReason::Invalid, }, )) } else { @@ -540,7 +541,8 @@ class RustOperatorDelegateFactory: Err(SubmitError::InvalidMessage( sentry_arroyo::processing::strategies::InvalidMessage { partition: Partition { .. }, - offset: 42 + offset: 42, + .. } )) )); @@ -648,7 +650,8 @@ class RustOperatorDelegateFactory: Err(StrategyError::InvalidMessage( sentry_arroyo::processing::strategies::InvalidMessage { partition: Partition { .. }, - offset: 0 + offset: 0, + .. } )) )); diff --git a/sentry_streams/src/routers.rs b/sentry_streams/src/routers.rs index 54de5552..22384903 100644 --- a/sentry_streams/src/routers.rs +++ b/sentry_streams/src/routers.rs @@ -167,8 +167,9 @@ mod tests { 10, Utc::now(), ); - let SubmitError::InvalidMessage(InvalidMessage { partition, offset }) = - router.submit(message).unwrap_err() + let SubmitError::InvalidMessage(InvalidMessage { + partition, offset, .. + }) = router.submit(message).unwrap_err() else { panic!("Expected SubmitError::InvalidMessage") }; diff --git a/sentry_streams/src/transformer.rs b/sentry_streams/src/transformer.rs index 6fe3d325..bb8bcfdf 100644 --- a/sentry_streams/src/transformer.rs +++ b/sentry_streams/src/transformer.rs @@ -183,8 +183,9 @@ mod tests { 10, Utc::now(), ); - let SubmitError::InvalidMessage(InvalidMessage { partition, offset }) = - transform.submit(message).unwrap_err() + let SubmitError::InvalidMessage(InvalidMessage { + partition, offset, .. + }) = transform.submit(message).unwrap_err() else { panic!("Expected SubmitError::InvalidMessage") }; diff --git a/sentry_streams/uv.lock b/sentry_streams/uv.lock index a02d2494..a32606f5 100644 --- a/sentry_streams/uv.lock +++ b/sentry_streams/uv.lock @@ -897,7 +897,7 @@ wheels = [ [[package]] name = "sentry-streams" -version = "0.0.55" +version = "0.0.60" source = { editable = "." } dependencies = [ { name = "click" }, diff --git a/sentry_streams_k8s/uv.lock b/sentry_streams_k8s/uv.lock index f736d000..b8a65f1b 100644 --- a/sentry_streams_k8s/uv.lock +++ b/sentry_streams_k8s/uv.lock @@ -1799,7 +1799,7 @@ wheels = [ [[package]] name = "sentry-streams-k8s" -version = "0.0.7" +version = "0.0.9" source = { editable = "." } dependencies = [ { name = "jsonschema" },