RUM-917 Enforce unique uuid for all sub recorders

DataDog · Oct 24, 2024 · cbf9ef9 · cbf9ef9
1 parent b7ebb2c
commit cbf9ef9
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 15 deletions.
diff --git a/...corder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UIDatePickerRecorder.swift b/...corder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UIDatePickerRecorder.swift
@@ -16,9 +16,9 @@ internal struct UIDatePickerRecorder: NodeRecorder {
 
     init(identifier: UUID) {
         self.identifier = identifier
-        self.wheelsStyleRecorder = WheelsStyleDatePickerRecorder(identifier: identifier)
-        self.compactStyleRecorder = CompactStyleDatePickerRecorder(identifier: identifier)
-        self.inlineStyleRecorder = InlineStyleDatePickerRecorder(identifier: identifier)
+        self.wheelsStyleRecorder = WheelsStyleDatePickerRecorder(identifier: UUID())
+        self.compactStyleRecorder = CompactStyleDatePickerRecorder(identifier: UUID())
+        self.inlineStyleRecorder = InlineStyleDatePickerRecorder(identifier: UUID())
     }
 
     func semantics(of view: UIView, with attributes: ViewAttributes, in context: ViewTreeRecordingContext) -> NodeSemantics? {
@@ -104,9 +104,9 @@ private struct InlineStyleDatePickerRecorder {
     let subtreeRecorder: ViewTreeRecorder
 
     init(identifier: UUID) {
-        self.viewRecorder = UIViewRecorder(identifier: identifier)
+        self.viewRecorder = UIViewRecorder(identifier: UUID())
         self.labelRecorder = UILabelRecorder(
-            identifier: identifier,
+            identifier: UUID(),
             textObfuscator: { context, viewAttributes in
                 return viewAttributes.resolveTextAndInputPrivacyLevel(in: context).staticTextObfuscator
             }
@@ -115,8 +115,8 @@ private struct InlineStyleDatePickerRecorder {
             nodeRecorders: [
                 viewRecorder,
                 labelRecorder,
-                UIImageViewRecorder(identifier: identifier),
-                UISegmentRecorder(identifier: identifier), // iOS 14.x uses `UISegmentedControl` for "AM | PM"
+                UIImageViewRecorder(identifier: UUID()),
+                UISegmentRecorder(identifier: UUID()), // iOS 14.x uses `UISegmentedControl` for "AM | PM"
             ]
         )
     }
@@ -151,9 +151,9 @@ private struct CompactStyleDatePickerRecorder {
     init(identifier: UUID) {
         self.subtreeRecorder = ViewTreeRecorder(
             nodeRecorders: [
-                UIViewRecorder(identifier: identifier),
+                UIViewRecorder(identifier: UUID()),
                 UILabelRecorder(
-                    identifier: identifier,
+                    identifier: UUID(),
                     textObfuscator: { context, viewAttributes in
                         return viewAttributes.resolveTextAndInputPrivacyLevel(in: context).staticTextObfuscator
                     }

diff --git a/...corder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UIPickerViewRecorder.swift b/...corder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UIPickerViewRecorder.swift
@@ -33,7 +33,7 @@ internal struct UIPickerViewRecorder: NodeRecorder {
         }
     ) {
         self.identifier = identifier
-        self.selectionRecorder = ViewTreeRecorder(nodeRecorders: [UIViewRecorder(identifier: identifier)])
+        self.selectionRecorder = ViewTreeRecorder(nodeRecorders: [UIViewRecorder(identifier: UUID())])
         self.labelsRecorder = ViewTreeRecorder(
             nodeRecorders: [
                 UIViewRecorder(

diff --git a/...s/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITabBarRecorder.swift b/...s/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITabBarRecorder.swift
@@ -9,9 +9,13 @@ import UIKit
 
 internal final class UITabBarRecorder: NodeRecorder {
     internal let identifier: UUID
+    internal let labelRecorder: UILabelRecorder
+    internal let viewRecorder: UIViewRecorder
 
     init(identifier: UUID) {
         self.identifier = identifier
+        self.labelRecorder = UILabelRecorder(identifier: UUID())
+        self.viewRecorder = UIViewRecorder(identifier: UUID())
     }
 
     func semantics(of view: UIView, with attributes: ViewAttributes, in context: ViewTreeRecordingContext) -> NodeSemantics? {
@@ -63,9 +67,8 @@ internal final class UITabBarRecorder: NodeRecorder {
                         return tabBar.tintColor ?? SystemColors.systemBlue
                     }
                 ),
-                UILabelRecorder(identifier: identifier),
-                // This is for recording the badge view
-                UIViewRecorder(identifier: identifier)
+                labelRecorder,
+                viewRecorder
             ]
         )
 

diff --git a/...ecorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextFieldRecorder.swift b/...ecorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextFieldRecorder.swift
@@ -30,8 +30,8 @@ internal struct UITextFieldRecorder: NodeRecorder {
 
     init(identifier: UUID) {
         self.identifier = identifier
-        self.backgroundViewRecorder = UIViewRecorder(identifier: identifier)
-        self.iconsRecorder = UIImageViewRecorder(identifier: identifier)
+        self.backgroundViewRecorder = UIViewRecorder(identifier: UUID())
+        self.iconsRecorder = UIImageViewRecorder(identifier: UUID())
         self.subtreeRecorder = ViewTreeRecorder(nodeRecorders: [backgroundViewRecorder, iconsRecorder])
     }