Merge branch 'master' into replays-annotated-parse

getsentry · Jan 9, 2023 · e87b92e · e87b92e
2 parents f9f5486 + c0d39b3
commit e87b92e
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -36,6 +36,7 @@
 - Apply dynamic sampling to transactions from older SDKs and even in case Relay cannot load project information. This avoids accidentally storing 100% of transactions. ([#1667](https://github.com/getsentry/relay/pull/1667))
 - Replay recording parser now uses the entire body rather than a subset. ([#1682](https://github.com/getsentry/relay/pull/1682))
 - Fix a potential OOM in the Replay recording parser. ([#1691](https://github.com/getsentry/relay/pull/1691))
+- Fix type error in replay recording parser. ([#1702](https://github.com/getsentry/relay/pull/1702))
 
 **Internal**:
 

diff --git a/py/.craft.yml b/py/.craft.yml
@@ -1,11 +1,13 @@
 ---
-minVersion: 0.23.1
+minVersion: 0.34.1
 changelogPolicy: auto
 preReleaseCommand: ../scripts/bump-library.sh
 releaseBranchPrefix: release-library
 
 targets:
   - name: pypi
+  - name: sentry-pypi
+    internalPypiRepo: getsentry/pypi
   - name: gcs
     bucket: sentry-sdk-assets
     includeNames: /^(sentry-relay|sentry_relay).*(.whl|.zip)$/

diff --git a/relay-replays/src/recording.rs b/relay-replays/src/recording.rs
@@ -185,7 +185,7 @@ impl RecordingProcessor<'_> {
             "script" | "style" => {}
             "img" | "source" => {
                 let attrs = &mut element.attributes;
-                attrs.insert("src".to_string(), "#".to_string());
+                attrs.insert("src".to_string(), Value::String("#".to_string()));
                 self.recurse_element_children(element)?
             }
             _ => self.recurse_element_children(element)?,
@@ -444,36 +444,36 @@ struct DocumentNode {
 struct DocumentTypeNode {
     #[serde(rename = "type")]
     ty: u8,
-    id: u32,
-    public_id: String,
-    system_id: String,
-    name: String,
+    id: Value,
+    public_id: Value,
+    system_id: Value,
+    name: Value,
 }
 
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 struct ElementNode {
-    id: u32,
+    id: Value,
     #[serde(rename = "type")]
     ty: u8,
-    attributes: HashMap<String, String>,
+    attributes: HashMap<String, Value>,
     tag_name: String,
     child_nodes: Vec<Node>,
     #[serde(rename = "isSVG", skip_serializing_if = "Option::is_none")]
-    is_svg: Option<bool>,
+    is_svg: Option<Value>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    need_block: Option<bool>,
+    need_block: Option<Value>,
 }
 
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 struct TextNode {
-    id: u32,
+    id: Value,
     #[serde(rename = "type")]
     ty: u8,
     text_content: String,
     #[serde(skip_serializing_if = "Option::is_none")]
-    is_style: Option<bool>,
+    is_style: Option<Value>,
 }
 
 /// Incremental Source Parser
@@ -535,7 +535,10 @@ struct InputIncrementalSourceData {
     source: u8,
     id: u32,
     text: String,
-    is_checked: bool,
+    is_checked: Value,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(default)]
+    user_triggered: Option<Value>,
 }
 
 #[derive(Debug, Serialize, Deserialize)]
@@ -547,14 +550,14 @@ struct MutationIncrementalSourceData {
     removes: Vec<Value>,
     adds: Vec<MutationAdditionIncrementalSourceData>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    is_attach_iframe: Option<bool>,
+    is_attach_iframe: Option<Value>,
 }
 
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 struct MutationAdditionIncrementalSourceData {
-    parent_id: u32,
-    next_id: Option<u32>,
+    parent_id: Value,
+    next_id: Value,
     node: Node,
 }
 

diff --git a/relay-replays/tests/fixtures/rrweb-node-2.json b/relay-replays/tests/fixtures/rrweb-node-2.json
@@ -2,7 +2,9 @@
     "type": 2,
     "tagName": "h1",
     "attributes": {
-        "id": "react-tooltip"
+        "id": "react-tooltip",
+        "rr_scrollLeft": 1070,
+        "rr_scrollTop": 385
     },
     "childNodes": [
         {

diff --git a/relay-replays/tests/fixtures/rrweb-pii.json b/relay-replays/tests/fixtures/rrweb-pii.json
@@ -6,9 +6,11 @@
             "texts": [],
             "attributes": [],
             "removes": [],
+            "isAttachIframe": true,
             "adds": [
                 {
                     "parentId": 74,
+                    "previousId": null,
                     "nextId": null,
                     "node": {
                         "type": 2,