fix(rust): Nullability around headers and frames (#5532)

getsentry · Feb 13, 2024 · 6a01567 · 6a01567
1 parent 0045a57
commit 6a01567
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/rust_snuba/src/processors/errors.rs b/rust_snuba/src/processors/errors.rs
@@ -213,7 +213,7 @@ struct ExceptionMechanism {
 #[derive(Debug, Deserialize, JsonSchema, Default)]
 struct StackTrace {
  #[serde(default)]
- frames: Option<Vec<StackFrame>>,
+ frames: Option<Vec<Option<StackFrame>>>,
 }
 
 #[derive(Debug, Deserialize, JsonSchema)]
@@ -278,7 +278,7 @@ struct Request {
  #[serde(default)]
  method: Unicodify,
  #[serde(default)]
- headers: Option<Vec<(String, Unicodify)>>,
+ headers: Option<Vec<Option<(String, Unicodify)>>>,
 }
 
 // User
@@ -437,7 +437,12 @@ impl ErrorRow {
 
  // Extract HTTP referrer from the headers list.
  let mut http_referer = None;
- for (key, value) in from_request.headers.unwrap_or_default() {
+ for (key, value) in from_request
+ .headers
+ .unwrap_or_default()
+ .into_iter()
+ .flatten()
+ {
  if key == "Referrer" {
  http_referer = value.0;
  break;
@@ -596,6 +601,8 @@ impl ErrorRow {
  .unwrap_or_default()
  .frames
  .unwrap_or_default()
+ .into_iter()
+ .flatten()
  {
  frame_abs_paths.push(frame.abs_path.0);
  frame_filenames.push(frame.filename.0);