Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 12 additions & 42 deletions sentry_streams/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion sentry_streams/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 3 additions & 2 deletions sentry_streams/src/fake_strategy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -61,6 +61,7 @@ impl ProcessingStrategy<RoutedValue> for FakeStrategy {
topic: Topic::new("test"),
index: 0,
},
reason: InvalidMessageReason::Invalid,
}))
}
}
Expand Down
5 changes: 3 additions & 2 deletions sentry_streams/src/filter_step.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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")
};
Expand Down
5 changes: 3 additions & 2 deletions sentry_streams/src/header_filter_step.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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")
};
Expand Down
9 changes: 6 additions & 3 deletions sentry_streams/src/python_operator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -248,6 +248,7 @@ impl ProcessingStrategy<RoutedValue> for PythonAdapter {
offset,
partition: convert_partition(partition)
.expect("Unable to convert partition from InvalidMessage into sentry_arroyo::types::Partition"),
reason: InvalidMessageReason::Invalid,
},
))
} else {
Expand Down Expand Up @@ -540,7 +541,8 @@ class RustOperatorDelegateFactory:
Err(SubmitError::InvalidMessage(
sentry_arroyo::processing::strategies::InvalidMessage {
partition: Partition { .. },
offset: 42
offset: 42,
..
}
))
));
Expand Down Expand Up @@ -648,7 +650,8 @@ class RustOperatorDelegateFactory:
Err(StrategyError::InvalidMessage(
sentry_arroyo::processing::strategies::InvalidMessage {
partition: Partition { .. },
offset: 0
offset: 0,
..
}
))
));
Expand Down
5 changes: 3 additions & 2 deletions sentry_streams/src/routers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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")
};
Expand Down
5 changes: 3 additions & 2 deletions sentry_streams/src/transformer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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")
};
Expand Down
2 changes: 1 addition & 1 deletion sentry_streams/uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion sentry_streams_k8s/uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading