feat(protocol): Add lock attribute to the frame protocol (#2171)

Author: romtsn

CHANGELOG.md

@@ -1,11 +1,17 @@
 # Changelog
 
+## Unreleased
+
+**Features**:
+
+- Add support for X-Vercel-Forwarded-For header. ([#2124](https://github.com/getsentry/relay/pull/2124))
+- Add `lock` attribute to the frame protocol. ([#2171](https://github.com/getsentry/relay/pull/2171))
+
 ## 23.5.2
 
 **Features**:
 
 - Use different error message for empty strings in schema processing. ([#2151](https://github.com/getsentry/relay/pull/2151))
-- Add support for X-Vercel-Forwarded-For header. ([#2124](https://github.com/getsentry/relay/pull/2124))
 
 ## 23.5.1
 

relay-general/src/protocol/stacktrace.rs

@@ -5,7 +5,7 @@ use std::str::FromStr;
 
 use serde::{Deserialize, Serialize};
 
-use crate::protocol::{Addr, NativeImagePath, RegVal};
+use crate::protocol::{Addr, LockReason, NativeImagePath, RegVal};
 use crate::types::{
     Annotated, Array, Empty, ErrorKind, FromValue, IntoValue, Object, SkipSerialization, Value,
 };
@@ -185,6 +185,10 @@ pub struct Frame {
     #[metastructure(skip_serialization = "null")]
     pub stack_start: Annotated<bool>,
 
+    /// A possible lock (java monitor object) held by this frame.
+    #[metastructure(skip_serialization = "null")]
+    pub lock: Annotated<LockReason>,
+
     /// Additional arbitrary fields for forwards compatibility.
     #[metastructure(additional_properties)]
     pub other: Object<Value>,
@@ -506,6 +510,7 @@ impl From<Stacktrace> for RawStacktrace {
 
 #[cfg(test)]
 mod tests {
+    use crate::protocol::{LockReasonType, ThreadId};
     use similar_asserts::assert_eq;
 
     use super::*;
@@ -544,6 +549,13 @@ mod tests {
   "trust": "69",
   "lang": "rust",
   "stack_start": true,
+  "lock": {
+    "type": 2,
+    "address": "0x07d7437b",
+    "package_name": "io.sentry.samples",
+    "class_name": "MainActivity",
+    "thread_id": 7
+  },
   "other": "value"
 }"#;
         let frame = Annotated::new(Frame {
@@ -581,6 +593,14 @@ mod tests {
             trust: Annotated::new("69".into()),
             lang: Annotated::new("rust".into()),
             stack_start: Annotated::new(true),
+            lock: Annotated::new(LockReason {
+                ty: Annotated::new(LockReasonType::Waiting),
+                address: Annotated::new("0x07d7437b".to_string()),
+                package_name: Annotated::new("io.sentry.samples".to_string()),
+                class_name: Annotated::new("MainActivity".to_string()),
+                thread_id: Annotated::new(ThreadId::Int(7)),
+                other: Default::default(),
+            }),
             other: {
                 let mut vars = Object::new();
                 vars.insert(

relay-general/tests/snapshots/test_fixtures__event_schema.snap

@@ -1648,6 +1648,18 @@ expression: "relay_general::protocol::event_json_schema()"
               "format": "uint64",
               "minimum": 0.0
             },
+            "lock": {
+              "description": " A possible lock (java monitor object) held by this frame.",
+              "default": null,
+              "anyOf": [
+                {
+                  "$ref": "#/definitions/LockReason"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
             "module": {
               "description": " Name of the module the frame is contained in.\n\n Note that this might also include a class name if that is something the\n language natively considers to be part of the stack (for instance in Java).",
               "default": null,