From efed84505fc4a6be6206628cdd8fde218b880242 Mon Sep 17 00:00:00 2001
From: Maciej Burda <maciej.burda@datadoghq.com>
Date: Thu, 13 Apr 2023 16:34:31 +0100
Subject: [PATCH 01/14] REPLAY-1523 Add text alignment support

---
 .../NodeRecorders/UILabelRecorder.swift       |  2 +-
 .../Writer/Models/SRDataModels+UIKit.swift    | 30 +++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 DatadogSessionReplay/Sources/Writer/Models/SRDataModels+UIKit.swift

diff --git a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UILabelRecorder.swift b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UILabelRecorder.swift
index 5ad80be18d..59ca4dbb9b 100644
--- a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UILabelRecorder.swift
+++ b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UILabelRecorder.swift
@@ -49,7 +49,7 @@ internal class UILabelRecorder: NodeRecorder {
             attributes: attributes,
             text: label.text ?? "",
             textColor: label.textColor?.cgColor,
-            textAlignment: nil,
+            textAlignment: .init(textAlignment: label.textAlignment),
             font: label.font,
             fontScalingEnabled: label.adjustsFontSizeToFitWidth,
             textObfuscator: textObfuscator(context),
diff --git a/DatadogSessionReplay/Sources/Writer/Models/SRDataModels+UIKit.swift b/DatadogSessionReplay/Sources/Writer/Models/SRDataModels+UIKit.swift
new file mode 100644
index 0000000000..9560f3a8c4
--- /dev/null
+++ b/DatadogSessionReplay/Sources/Writer/Models/SRDataModels+UIKit.swift
@@ -0,0 +1,30 @@
+//
+//  File.swift
+//  
+//
+//  Created by Maciej Burda on 13/04/2023.
+//
+
+import UIKit
+
+extension SRTextPosition.Alignment {
+    init(textAlignment: NSTextAlignment) {
+        self.vertical = .center
+        switch textAlignment {
+        case .left:
+            self.horizontal = .left
+        case .center:
+            self.horizontal = .center
+        case .right:
+            self.horizontal = .right
+        case .justified:
+            self.horizontal = .left
+        default:
+            if UIApplication.shared.userInterfaceLayoutDirection == .leftToRight {
+                self.horizontal = .left
+            } else {
+                self.horizontal = .right
+            }
+        }
+    }
+}

From a335bbec4a7b61021134e7ef92865ee3507575af Mon Sep 17 00:00:00 2001
From: Maciej Burda <maciej.burda@datadoghq.com>
Date: Fri, 14 Apr 2023 11:24:08 +0100
Subject: [PATCH 02/14] REPLAY-1523 Update snapshot

---
 .../SRSnapshotTests/SRHost/Fixtures/Basic.storyboard     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/DatadogSessionReplay/SRSnapshotTests/SRHost/Fixtures/Basic.storyboard b/DatadogSessionReplay/SRSnapshotTests/SRHost/Fixtures/Basic.storyboard
index 27b18b9e11..483b0e1cf7 100644
--- a/DatadogSessionReplay/SRSnapshotTests/SRHost/Fixtures/Basic.storyboard
+++ b/DatadogSessionReplay/SRSnapshotTests/SRHost/Fixtures/Basic.storyboard
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
@@ -79,7 +80,7 @@
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="5e8-XJ-d05">
                                 <rect key="frame" x="20" y="79" width="353" height="261.33333333333331"/>
                                 <subviews>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nE2-nF-tR0">
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Title" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nE2-nF-tR0">
                                         <rect key="frame" x="0.0" y="0.0" width="353" height="36"/>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <fontDescription key="fontDescription" type="boldSystem" pointSize="30"/>
@@ -93,7 +94,7 @@
                                         <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <nil key="highlightedColor"/>
                                     </label>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zGs-5s-YfK">
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zGs-5s-YfK">
                                         <rect key="frame" x="0.0" y="100.00000000000001" width="353" height="161.33333333333337"/>
                                         <string key="text">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</string>
                                         <fontDescription key="fontDescription" type="system" pointSize="15"/>

From 0324e48108ecac124cdece7d268bb8877a73f2a6 Mon Sep 17 00:00:00 2001
From: Maciej Burda <maciej.burda@datadoghq.com>
Date: Fri, 14 Apr 2023 11:48:27 +0100
Subject: [PATCH 03/14] REPLAY-1523 Unify strategy

---
 .../NodeRecorders/UILabelRecorder.swift           |  2 +-
 .../NodeRecorders/UITextFieldRecorder.swift       | 15 +++------------
 .../NodeRecorders/UITextViewRecorder.swift        |  4 ++++
 .../Writer/Models/SRDataModels+UIKit.swift        |  2 ++
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UILabelRecorder.swift b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UILabelRecorder.swift
index 59ca4dbb9b..246a427550 100644
--- a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UILabelRecorder.swift
+++ b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UILabelRecorder.swift
@@ -69,7 +69,7 @@ internal struct UILabelWireframesBuilder: NodeWireframesBuilder {
     /// The color of the text.
     var textColor: CGColor?
     /// The alignment of the text.
-    var textAlignment: SRTextPosition.Alignment?
+    var textAlignment: SRTextPosition.Alignment
     /// The font used by the label.
     let font: UIFont?
     /// Flag that determines if font should be scaled
diff --git a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextFieldRecorder.swift b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextFieldRecorder.swift
index e13d493f3a..92d7242757 100644
--- a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextFieldRecorder.swift
+++ b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextFieldRecorder.swift
@@ -91,7 +91,7 @@ internal struct UITextFieldRecorder: NodeRecorder {
             wireframeID: context.ids.nodeID(for: textField),
             text: text,
             textColor: textField.textColor?.cgColor,
-            textAlignment: textField.textAlignment,
+            textAlignment: .init(textAlignment: textField.textAlignment),
             isPlaceholderText: isPlaceholder,
             font: textField.font,
             fontScalingEnabled: textField.adjustsFontSizeToFitWidth,
@@ -109,29 +109,20 @@ internal struct UITextFieldWireframesBuilder: NodeWireframesBuilder {
 
     let text: String
     let textColor: CGColor?
-    let textAlignment: NSTextAlignment
+    let textAlignment: SRTextPosition.Alignment
     let isPlaceholderText: Bool
     let font: UIFont?
     let fontScalingEnabled: Bool
     let textObfuscator: TextObfuscating
 
     func buildWireframes(with builder: WireframesBuilder) -> [SRWireframe] {
-        let horizontalAlignment: SRTextPosition.Alignment.Horizontal? = {
-            switch textAlignment {
-            case .left:     return .left
-            case .center:   return .center
-            case .right:    return .right
-            default:        return nil
-            }
-        }()
-
         return [
             builder.createTextWireframe(
                 id: wireframeID,
                 frame: wireframeRect,
                 text: textObfuscator.mask(text: text),
                 textFrame: wireframeRect,
-                textAlignment: .init(horizontal: horizontalAlignment, vertical: .center),
+                textAlignment: textAlignment,
                 textColor: isPlaceholderText ? SystemColors.placeholderText : textColor,
                 font: font,
                 fontScalingEnabled: fontScalingEnabled,
diff --git a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextViewRecorder.swift b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextViewRecorder.swift
index 74fa44145e..724e3defe5 100644
--- a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextViewRecorder.swift
+++ b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextViewRecorder.swift
@@ -33,6 +33,7 @@ internal struct UITextViewRecorder: NodeRecorder {
             wireframeID: context.ids.nodeID(for: textView),
             attributes: attributes,
             text: textView.text,
+            textAlignment: .init(textAlignment: textView.textAlignment),
             textColor: textView.textColor?.cgColor ?? UIColor.black.cgColor,
             font: textView.font,
             textObfuscator: textObfuscator(context, isSensitiveText),
@@ -49,6 +50,8 @@ internal struct UITextViewWireframesBuilder: NodeWireframesBuilder {
     let attributes: ViewAttributes
     /// The text inside text field.
     let text: String
+    /// The alignment of the text.
+    var textAlignment: SRTextPosition.Alignment
     /// The color of the text.
     let textColor: CGColor?
     /// The font used by the text field.
@@ -90,6 +93,7 @@ internal struct UITextViewWireframesBuilder: NodeWireframesBuilder {
                 id: wireframeID,
                 frame: relativeIntersectedRect,
                 text: textObfuscator.mask(text: text),
+                textAlignment: textAlignment,
                 clip: clip,
                 textColor: textColor,
                 font: font,
diff --git a/DatadogSessionReplay/Sources/Writer/Models/SRDataModels+UIKit.swift b/DatadogSessionReplay/Sources/Writer/Models/SRDataModels+UIKit.swift
index 9560f3a8c4..1af51d01a5 100644
--- a/DatadogSessionReplay/Sources/Writer/Models/SRDataModels+UIKit.swift
+++ b/DatadogSessionReplay/Sources/Writer/Models/SRDataModels+UIKit.swift
@@ -8,6 +8,8 @@
 import UIKit
 
 extension SRTextPosition.Alignment {
+    /// Custom initializer that allows transforming UIKit's `NSTextAlignment` into `SRTextPosition.Alignment`.
+    /// Must be called on the main thread due to `UIApplication.shared.userInterfaceLayoutDirection`.
     init(textAlignment: NSTextAlignment) {
         self.vertical = .center
         switch textAlignment {

From 049bd2fafe3e101b1f3fb1241ff4af20bc875b1c Mon Sep 17 00:00:00 2001
From: Maciej Burda <maciej.burda@datadoghq.com>
Date: Tue, 18 Apr 2023 12:13:15 +0100
Subject: [PATCH 04/14] REPLAY-1523 Exchange manual vertical alignment with
 text alignment

---
 .../WireframesBuilder.swift                   | 27 ++++++++--------
 .../NodeRecorders/UILabelRecorder.swift       | 24 +++++---------
 .../NodeRecorders/UIPickerViewRecorder.swift  |  2 +-
 .../NodeRecorders/UITextFieldRecorder.swift   |  6 ++--
 .../NodeRecorders/UITextViewRecorder.swift    |  6 ++--
 .../Writer/Models/SRDataModels+UIKit.swift    | 31 +++++++++----------
 6 files changed, 43 insertions(+), 53 deletions(-)

diff --git a/DatadogSessionReplay/Sources/Processor/SRDataModelsBuilder/WireframesBuilder.swift b/DatadogSessionReplay/Sources/Processor/SRDataModelsBuilder/WireframesBuilder.swift
index 8eef1189a1..11ce155a1a 100644
--- a/DatadogSessionReplay/Sources/Processor/SRDataModelsBuilder/WireframesBuilder.swift
+++ b/DatadogSessionReplay/Sources/Processor/SRDataModelsBuilder/WireframesBuilder.swift
@@ -101,24 +101,23 @@ internal class WireframesBuilder {
         cornerRadius: CGFloat? = nil,
         opacity: CGFloat? = nil
     ) -> SRWireframe {
-        var textPosition: SRTextPosition? = nil
-
-        if let textFrame = textFrame {
-            textPosition = .init(
-                alignment: textAlignment,
-                padding: .init(
-                    bottom: Int64(withNoOverflow: frame.maxY - textFrame.maxY),
-                    left: Int64(withNoOverflow: textFrame.minX - frame.minX),
-                    right: Int64(withNoOverflow: frame.maxX - textFrame.maxX),
-                    top: Int64(withNoOverflow: textFrame.minY - frame.minY)
-                )
+
+
+        let textFrame = textFrame ?? frame
+        let textPosition = SRTextPosition(
+            alignment: textAlignment,
+            padding: .init(
+                bottom: Int64(withNoOverflow: frame.maxY - textFrame.maxY),
+                left: Int64(withNoOverflow: textFrame.minX - frame.minX),
+                right: Int64(withNoOverflow: frame.maxX - textFrame.maxX),
+                top: Int64(withNoOverflow: textFrame.minY - frame.minY)
             )
-        }
+        )
 
         var fontSize = Int64(withNoOverflow: font?.pointSize ?? Fallback.fontSize)
-        if let boundingBox = textFrame?.size, text.count > 0, fontScalingEnabled {
+        if text.count > 0, fontScalingEnabled {
             // Calculates the approximate font size for available text area √(frameArea / numberOfCharacters)
-            let area = boundingBox.width * boundingBox.height
+            let area = textFrame.width * textFrame.height
             let calculatedFontSize = Int64(sqrt(area / CGFloat(text.count)))
             if calculatedFontSize < fontSize {
                 fontSize = calculatedFontSize
diff --git a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UILabelRecorder.swift b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UILabelRecorder.swift
index 246a427550..d89c6de90b 100644
--- a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UILabelRecorder.swift
+++ b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UILabelRecorder.swift
@@ -36,24 +36,15 @@ internal class UILabelRecorder: NodeRecorder {
             return InvisibleElement.constant
         }
 
-        // The actual frame of the text, which is smaller than the frame of the label:
-        let textFrame = CGRect(
-            x: attributes.frame.minX,
-            y: attributes.frame.minY + (attributes.frame.height - attributes.intrinsicContentSize.height) * 0.5,
-            width: attributes.intrinsicContentSize.width,
-            height: attributes.intrinsicContentSize.height
-        )
-
         let builder = UILabelWireframesBuilder(
             wireframeID: context.ids.nodeID(for: label),
             attributes: attributes,
             text: label.text ?? "",
             textColor: label.textColor?.cgColor,
-            textAlignment: .init(textAlignment: label.textAlignment),
+            textAlignment: label.textAlignment,
             font: label.font,
             fontScalingEnabled: label.adjustsFontSizeToFitWidth,
-            textObfuscator: textObfuscator(context),
-            wireframeRect: textFrame
+            textObfuscator: textObfuscator(context)
         )
         let node = Node(viewAttributes: attributes, wireframesBuilder: builderOverride(builder))
         return SpecificElement(subtreeStrategy: .ignore, nodes: [node])
@@ -69,7 +60,7 @@ internal struct UILabelWireframesBuilder: NodeWireframesBuilder {
     /// The color of the text.
     var textColor: CGColor?
     /// The alignment of the text.
-    var textAlignment: SRTextPosition.Alignment
+    var textAlignment: NSTextAlignment
     /// The font used by the label.
     let font: UIFont?
     /// Flag that determines if font should be scaled
@@ -77,16 +68,17 @@ internal struct UILabelWireframesBuilder: NodeWireframesBuilder {
     /// Text obfuscator for masking text.
     let textObfuscator: TextObfuscating
 
-    let wireframeRect: CGRect
+    var wireframeRect: CGRect {
+        attributes.frame
+    }
 
     func buildWireframes(with builder: WireframesBuilder) -> [SRWireframe] {
         return [
             builder.createTextWireframe(
                 id: wireframeID,
-                frame: attributes.frame,
+                frame: wireframeRect,
                 text: textObfuscator.mask(text: text),
-                textFrame: wireframeRect,
-                textAlignment: textAlignment,
+                textAlignment: .init(systemTextAlignment: textAlignment),
                 textColor: textColor,
                 font: font,
                 fontScalingEnabled: fontScalingEnabled,
diff --git a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UIPickerViewRecorder.swift b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UIPickerViewRecorder.swift
index ecb433dc5b..8927e27dc9 100644
--- a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UIPickerViewRecorder.swift
+++ b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UIPickerViewRecorder.swift
@@ -50,7 +50,7 @@ internal struct UIPickerViewRecorder: NodeRecorder {
                 UILabelRecorder(
                     builderOverride: { builder in
                         var builder = builder
-                        builder.textAlignment = .init(horizontal: .center, vertical: .center)
+                        builder.textAlignment = .center
                         builder.fontScalingEnabled = true
                         return builder
                     },
diff --git a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextFieldRecorder.swift b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextFieldRecorder.swift
index 92d7242757..57937c9215 100644
--- a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextFieldRecorder.swift
+++ b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextFieldRecorder.swift
@@ -91,7 +91,7 @@ internal struct UITextFieldRecorder: NodeRecorder {
             wireframeID: context.ids.nodeID(for: textField),
             text: text,
             textColor: textField.textColor?.cgColor,
-            textAlignment: .init(textAlignment: textField.textAlignment),
+            textAlignment: textField.textAlignment,
             isPlaceholderText: isPlaceholder,
             font: textField.font,
             fontScalingEnabled: textField.adjustsFontSizeToFitWidth,
@@ -109,7 +109,7 @@ internal struct UITextFieldWireframesBuilder: NodeWireframesBuilder {
 
     let text: String
     let textColor: CGColor?
-    let textAlignment: SRTextPosition.Alignment
+    let textAlignment: NSTextAlignment
     let isPlaceholderText: Bool
     let font: UIFont?
     let fontScalingEnabled: Bool
@@ -122,7 +122,7 @@ internal struct UITextFieldWireframesBuilder: NodeWireframesBuilder {
                 frame: wireframeRect,
                 text: textObfuscator.mask(text: text),
                 textFrame: wireframeRect,
-                textAlignment: textAlignment,
+                textAlignment: .init(systemTextAlignment: textAlignment),
                 textColor: isPlaceholderText ? SystemColors.placeholderText : textColor,
                 font: font,
                 fontScalingEnabled: fontScalingEnabled,
diff --git a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextViewRecorder.swift b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextViewRecorder.swift
index 724e3defe5..8b10b64407 100644
--- a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextViewRecorder.swift
+++ b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextViewRecorder.swift
@@ -33,7 +33,7 @@ internal struct UITextViewRecorder: NodeRecorder {
             wireframeID: context.ids.nodeID(for: textView),
             attributes: attributes,
             text: textView.text,
-            textAlignment: .init(textAlignment: textView.textAlignment),
+            textAlignment: textView.textAlignment,
             textColor: textView.textColor?.cgColor ?? UIColor.black.cgColor,
             font: textView.font,
             textObfuscator: textObfuscator(context, isSensitiveText),
@@ -51,7 +51,7 @@ internal struct UITextViewWireframesBuilder: NodeWireframesBuilder {
     /// The text inside text field.
     let text: String
     /// The alignment of the text.
-    var textAlignment: SRTextPosition.Alignment
+    var textAlignment: NSTextAlignment
     /// The color of the text.
     let textColor: CGColor?
     /// The font used by the text field.
@@ -93,7 +93,7 @@ internal struct UITextViewWireframesBuilder: NodeWireframesBuilder {
                 id: wireframeID,
                 frame: relativeIntersectedRect,
                 text: textObfuscator.mask(text: text),
-                textAlignment: textAlignment,
+                textAlignment: .init(systemTextAlignment: textAlignment, vertical: .top),
                 clip: clip,
                 textColor: textColor,
                 font: font,
diff --git a/DatadogSessionReplay/Sources/Writer/Models/SRDataModels+UIKit.swift b/DatadogSessionReplay/Sources/Writer/Models/SRDataModels+UIKit.swift
index 1af51d01a5..7206763ca6 100644
--- a/DatadogSessionReplay/Sources/Writer/Models/SRDataModels+UIKit.swift
+++ b/DatadogSessionReplay/Sources/Writer/Models/SRDataModels+UIKit.swift
@@ -1,18 +1,19 @@
-//
-//  File.swift
-//  
-//
-//  Created by Maciej Burda on 13/04/2023.
-//
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
 
 import UIKit
 
 extension SRTextPosition.Alignment {
     /// Custom initializer that allows transforming UIKit's `NSTextAlignment` into `SRTextPosition.Alignment`.
-    /// Must be called on the main thread due to `UIApplication.shared.userInterfaceLayoutDirection`.
-    init(textAlignment: NSTextAlignment) {
-        self.vertical = .center
-        switch textAlignment {
+    init(
+        systemTextAlignment: NSTextAlignment,
+        vertical: SRTextPosition.Alignment.Vertical = .center
+    ) {
+        self.vertical = vertical
+        switch systemTextAlignment {
         case .left:
             self.horizontal = .left
         case .center:
@@ -21,12 +22,10 @@ extension SRTextPosition.Alignment {
             self.horizontal = .right
         case .justified:
             self.horizontal = .left
-        default:
-            if UIApplication.shared.userInterfaceLayoutDirection == .leftToRight {
-                self.horizontal = .left
-            } else {
-                self.horizontal = .right
-            }
+        case .natural:
+            self.horizontal = .left
+        @unknown default:
+            self.horizontal = .left
         }
     }
 }

From 36008b096bdba8f6ff6aa3e1c68d0b08b3cfa6b4 Mon Sep 17 00:00:00 2001
From: Maciej Burda <maciej.burda@datadoghq.com>
Date: Tue, 18 Apr 2023 12:26:30 +0100
Subject: [PATCH 05/14] REPLAY-1523 Fix linter warnings

---
 .../Processor/SRDataModelsBuilder/WireframesBuilder.swift       | 2 --
 1 file changed, 2 deletions(-)

diff --git a/DatadogSessionReplay/Sources/Processor/SRDataModelsBuilder/WireframesBuilder.swift b/DatadogSessionReplay/Sources/Processor/SRDataModelsBuilder/WireframesBuilder.swift
index 11ce155a1a..43bc520729 100644
--- a/DatadogSessionReplay/Sources/Processor/SRDataModelsBuilder/WireframesBuilder.swift
+++ b/DatadogSessionReplay/Sources/Processor/SRDataModelsBuilder/WireframesBuilder.swift
@@ -101,8 +101,6 @@ internal class WireframesBuilder {
         cornerRadius: CGFloat? = nil,
         opacity: CGFloat? = nil
     ) -> SRWireframe {
-
-
         let textFrame = textFrame ?? frame
         let textPosition = SRTextPosition(
             alignment: textAlignment,

From ed6c70e2bcd44baed051b5e60059dbe7d2479b0e Mon Sep 17 00:00:00 2001
From: Xavier Gouchet <xavier.gouchet@gmail.com>
Date: Thu, 20 Apr 2023 10:48:18 +0200
Subject: [PATCH 06/14] RUMM-3194 add sampling rate on Tracer

---
 Sources/Datadog/Tracer.swift                  |  3 +
 Sources/Datadog/TracerConfiguration.swift     |  5 ++
 Sources/Datadog/Tracing/DDSpan.swift          |  6 +-
 .../Tracing/Span/SpanEventBuilder.swift       |  4 +
 .../Tracing/Span/SpanEventEncoder.swift       |  8 +-
 .../Datadog/Mocks/TracingFeatureMocks.swift   |  6 ++
 Tests/DatadogTests/Datadog/TracerTests.swift  | 22 +++++
 .../Tracing/Span/SpanEventBuilderTests.swift  | 88 +++++++++++++++++++
 Tests/DatadogTests/Matchers/SpanMatcher.swift | 20 +++++
 9 files changed, 159 insertions(+), 3 deletions(-)

diff --git a/Sources/Datadog/Tracer.swift b/Sources/Datadog/Tracer.swift
index 083fe45b9c..86fe1a53d4 100644
--- a/Sources/Datadog/Tracer.swift
+++ b/Sources/Datadog/Tracer.swift
@@ -65,6 +65,8 @@ public class Tracer: OTTracer {
 
     internal let activeSpansPool = ActiveSpansPool()
 
+    internal let sampler: Sampler
+
     /// Tracer Attributes shared with other Feature registered in core.
     internal struct Attributes {
         internal static let traceID = "dd.trace_id"
@@ -146,6 +148,7 @@ public class Tracer: OTTracer {
         self.dateProvider = dateProvider
         self.rumIntegration = rumIntegration
         self.loggingIntegration = loggingIntegration
+        self.sampler = Sampler(samplingRate: configuration.samplingRate)
     }
 
     // MARK: - Open Tracing interface
diff --git a/Sources/Datadog/TracerConfiguration.swift b/Sources/Datadog/TracerConfiguration.swift
index 96d5e8a087..2a5fab9098 100644
--- a/Sources/Datadog/TracerConfiguration.swift
+++ b/Sources/Datadog/TracerConfiguration.swift
@@ -27,6 +27,9 @@ extension Tracer {
         /// - Parameter enabled: `true` by default
         public var bundleWithRUM: Bool
 
+        /// TRhe sampling rate for Traces, as a Float between 0 and 100.
+        public var samplingRate: Float
+
         /// Initializes the Datadog Tracer configuration.
         /// - Parameter serviceName: the service name that will appear in traces (if not provided or `nil`, the SDK default `serviceName` will be used).
         /// - Parameter sendNetworkInfo: adds network connection info to every span and span logs (`false` by default).
@@ -37,11 +40,13 @@ extension Tracer {
             serviceName: String? = nil,
             sendNetworkInfo: Bool = false,
             bundleWithRUM: Bool = true,
+            samplingRate: Float = 100,
             globalTags: [String: Encodable]? = nil
         ) {
             self.serviceName = serviceName
             self.sendNetworkInfo = sendNetworkInfo
             self.bundleWithRUM = bundleWithRUM
+            self.samplingRate = samplingRate
             self.globalTags = globalTags
         }
     }
diff --git a/Sources/Datadog/Tracing/DDSpan.swift b/Sources/Datadog/Tracing/DDSpan.swift
index 0a3a2fd012..89e44209d6 100644
--- a/Sources/Datadog/Tracing/DDSpan.swift
+++ b/Sources/Datadog/Tracing/DDSpan.swift
@@ -123,14 +123,14 @@ internal class DDSpan: OTSpan {
             if let activity = activityReference {
                 ddTracer.removeSpan(activityReference: activity)
             }
-            sendSpan(finishTime: time)
+            sendSpan(finishTime: time, sampler: ddTracer.sampler)
         }
     }
 
     // MARK: - Writing SpanEvent
 
     /// Sends span event for given `DDSpan`.
-    private func sendSpan(finishTime: Date) {
+    private func sendSpan(finishTime: Date, sampler: Sampler) {
         guard let tracing = ddTracer.core.v1.scope(for: TracingFeature.self) else {
             return
         }
@@ -160,6 +160,8 @@ internal class DDSpan: OTSpan {
                     operationName: self.unsafeOperationName,
                     startTime: self.startTime,
                     finishTime: finishTime,
+                    samplingRate: sampler.samplingRate / 100.0,
+                    isKept: sampler.sample(),
                     tags: self.unsafeTags,
                     baggageItems: baggageItems,
                     logFields: self.unsafeLogFields
diff --git a/Sources/Datadog/Tracing/Span/SpanEventBuilder.swift b/Sources/Datadog/Tracing/Span/SpanEventBuilder.swift
index 271eb49a9b..151e1ab824 100644
--- a/Sources/Datadog/Tracing/Span/SpanEventBuilder.swift
+++ b/Sources/Datadog/Tracing/Span/SpanEventBuilder.swift
@@ -25,6 +25,8 @@ internal struct SpanEventBuilder {
         operationName: String,
         startTime: Date,
         finishTime: Date,
+        samplingRate: Float,
+        isKept: Bool,
         tags: [String: Encodable],
         baggageItems: [String: String],
         logFields: [[String: Encodable]]
@@ -60,6 +62,8 @@ internal struct SpanEventBuilder {
             isError: tagsReducer.extractedIsError ?? false,
             source: context.source,
             origin: context.ciAppOrigin,
+            samplingRate: samplingRate,
+            isKept: isKept,
             tracerVersion: context.sdkVersion,
             applicationVersion: context.version,
             networkConnectionInfo: sendNetworkInfo ? context.networkConnectionInfo : nil,
diff --git a/Sources/Datadog/Tracing/Span/SpanEventEncoder.swift b/Sources/Datadog/Tracing/Span/SpanEventEncoder.swift
index ec388817ec..2e9d90465d 100644
--- a/Sources/Datadog/Tracing/Span/SpanEventEncoder.swift
+++ b/Sources/Datadog/Tracing/Span/SpanEventEncoder.swift
@@ -55,6 +55,10 @@ public struct SpanEvent: Encodable {
     internal let source: String
     /// The origin for the Span, it is used to label the spans used created under testing
     internal let origin: String?
+    /// The sampling rate for the span (between 0 and 100)
+    internal let samplingRate: Float
+    /// If the span is kept according to sampling rules
+    internal let isKept: Bool
 
     // MARK: - Meta
 
@@ -111,6 +115,7 @@ internal struct SpanEventEncoder {
 
         case isRootSpan = "metrics._top_level"
         case samplingPriority = "metrics._sampling_priority_v1"
+        case samplingRate = "_dd.agent_psr"
 
         // MARK: - Meta
 
@@ -177,8 +182,9 @@ internal struct SpanEventEncoder {
         // NOTE: RUMM-299 only numeric values are supported for `metrics.*` attributes
         if span.parentID == nil {
             try container.encode(1, forKey: .isRootSpan)
+            try container.encode(span.samplingRate, forKey: .samplingRate)
+            try container.encode((span.isKept ? 1 : 0), forKey: .samplingPriority)
         }
-        try container.encode(1, forKey: .samplingPriority)
     }
 
     /// Encodes default `meta.*` attributes
diff --git a/Tests/DatadogTests/Datadog/Mocks/TracingFeatureMocks.swift b/Tests/DatadogTests/Datadog/Mocks/TracingFeatureMocks.swift
index 4117fc3f1c..8839fdaaaf 100644
--- a/Tests/DatadogTests/Datadog/Mocks/TracingFeatureMocks.swift
+++ b/Tests/DatadogTests/Datadog/Mocks/TracingFeatureMocks.swift
@@ -146,6 +146,8 @@ extension SpanEvent: AnyMockable, RandomMockable {
         isError: Bool = .mockAny(),
         source: String = .mockAny(),
         origin: String? = nil,
+        samplingRate: Float = 100,
+        isKept: Bool = true,
         tracerVersion: String = .mockAny(),
         applicationVersion: String = .mockAny(),
         networkConnectionInfo: NetworkConnectionInfo? = .mockAny(),
@@ -165,6 +167,8 @@ extension SpanEvent: AnyMockable, RandomMockable {
             isError: isError,
             source: source,
             origin: origin,
+            samplingRate: samplingRate,
+            isKept: isKept,
             tracerVersion: tracerVersion,
             applicationVersion: applicationVersion,
             networkConnectionInfo: networkConnectionInfo,
@@ -189,6 +193,8 @@ extension SpanEvent: AnyMockable, RandomMockable {
             isError: .random(),
             source: .mockRandom(),
             origin: .mockRandom(),
+            samplingRate: .mockRandom(),
+            isKept: .mockRandom(),
             tracerVersion: .mockRandom(),
             applicationVersion: .mockRandom(),
             networkConnectionInfo: .mockRandom(),
diff --git a/Tests/DatadogTests/Datadog/TracerTests.swift b/Tests/DatadogTests/Datadog/TracerTests.swift
index e13af51205..c9bfd218ec 100644
--- a/Tests/DatadogTests/Datadog/TracerTests.swift
+++ b/Tests/DatadogTests/Datadog/TracerTests.swift
@@ -54,6 +54,7 @@ class TracerTests: XCTestCase {
         {
           "spans": [
             {
+              "_dd.agent_psr": 1,
               "trace_id": "1",
               "span_id": "2",
               "parent_id": "0",
@@ -132,6 +133,27 @@ class TracerTests: XCTestCase {
         XCTAssertEqual(try spanMatcher.meta.custom(keyPath: "meta.globaltag2"), "overwrittenValue")
     }
 
+    // MARK: - Tracer with sampling rate
+
+    func testUsingSamplingRate() throws {
+        let feature: TracingFeature = .mockAny()
+        core.register(feature: feature)
+
+        let tracer = Tracer.initialize(configuration: .init(samplingRate: 42), in: core).dd
+
+        let span = tracer.startSpan(
+            operationName: "operation",
+            startTime: .mockDecember15th2019At10AMUTC()
+        )
+        span.finish(at: .mockDecember15th2019At10AMUTC(addingTimeInterval: 0.5))
+
+        let spanMatcher = try core.waitAndReturnSpanMatchers()[0]
+        XCTAssertEqual(try spanMatcher.operationName(), "operation")
+        XCTAssertEqual(try spanMatcher.startTime(), 1_576_404_000_000_000_000)
+        XCTAssertEqual(try spanMatcher.duration(), 500_000_000)
+        XCTAssertEqual(try spanMatcher.dd.samplingRate(), 0.42)
+    }
+
     // MARK: - Sending Customized Spans
 
     func testSendingCustomizedSpan() throws {
diff --git a/Tests/DatadogTests/Datadog/Tracing/Span/SpanEventBuilderTests.swift b/Tests/DatadogTests/Datadog/Tracing/Span/SpanEventBuilderTests.swift
index 9cfb68c940..4f874e7fc7 100644
--- a/Tests/DatadogTests/Datadog/Tracing/Span/SpanEventBuilderTests.swift
+++ b/Tests/DatadogTests/Datadog/Tracing/Span/SpanEventBuilderTests.swift
@@ -21,6 +21,8 @@ class SpanEventBuilderTests: XCTestCase {
             operationName: "operation-name",
             startTime: .mockDecember15th2019At10AMUTC(),
             finishTime: .mockDecember15th2019At10AMUTC(addingTimeInterval: 0.5),
+            samplingRate: .mockAny(),
+            isKept: .mockAny(),
             tags: [
                 "foo": "bar",
                 "bizz": 123
@@ -60,6 +62,8 @@ class SpanEventBuilderTests: XCTestCase {
             operationName: "original operation name",
             startTime: .mockAny(),
             finishTime: .mockAny(),
+            samplingRate: .mockAny(),
+            isKept: .mockAny(),
             tags: [:],
             baggageItems: [:],
             logFields: []
@@ -81,6 +85,8 @@ class SpanEventBuilderTests: XCTestCase {
             operationName: .mockAny(),
             startTime: .mockAny(),
             finishTime: .mockAny(),
+            samplingRate: .mockAny(),
+            isKept: .mockAny(),
             tags: [OTTags.error: true],
             baggageItems: [:],
             logFields: []
@@ -99,6 +105,8 @@ class SpanEventBuilderTests: XCTestCase {
             operationName: .mockAny(),
             startTime: .mockAny(),
             finishTime: .mockAny(),
+            samplingRate: .mockAny(),
+            isKept: .mockAny(),
             tags: [OTTags.error: false],
             baggageItems: [:],
             logFields: []
@@ -121,6 +129,8 @@ class SpanEventBuilderTests: XCTestCase {
             operationName: .mockAny(),
             startTime: .mockAny(),
             finishTime: .mockAny(),
+            samplingRate: .mockAny(),
+            isKept: .mockAny(),
             tags: [:],
             baggageItems: [:],
             logFields: [
@@ -141,6 +151,8 @@ class SpanEventBuilderTests: XCTestCase {
             operationName: .mockAny(),
             startTime: .mockAny(),
             finishTime: .mockAny(),
+            samplingRate: .mockAny(),
+            isKept: .mockAny(),
             tags: [:],
             baggageItems: [:],
             logFields: [
@@ -173,6 +185,8 @@ class SpanEventBuilderTests: XCTestCase {
             operationName: .mockAny(),
             startTime: .mockAny(),
             finishTime: .mockAny(),
+            samplingRate: .mockAny(),
+            isKept: .mockAny(),
             tags: [:],
             baggageItems: [:],
             logFields: [
@@ -199,6 +213,8 @@ class SpanEventBuilderTests: XCTestCase {
             operationName: .mockAny(),
             startTime: .mockAny(),
             finishTime: .mockAny(),
+            samplingRate: .mockAny(),
+            isKept: .mockAny(),
             tags: [
                 "error": true
             ],
@@ -220,6 +236,8 @@ class SpanEventBuilderTests: XCTestCase {
             operationName: .mockAny(),
             startTime: .mockAny(),
             finishTime: .mockAny(),
+            samplingRate: .mockAny(),
+            isKept: .mockAny(),
             tags: [
                 "error": false
             ],
@@ -245,6 +263,8 @@ class SpanEventBuilderTests: XCTestCase {
             operationName: .mockAny(),
             startTime: .mockAny(),
             finishTime: .mockAny(),
+            samplingRate: .mockAny(),
+            isKept: .mockAny(),
             tags: [
                 DDTags.resource: "custom resource name"
             ],
@@ -269,6 +289,8 @@ class SpanEventBuilderTests: XCTestCase {
             operationName: .mockAny(),
             startTime: .mockAny(),
             finishTime: .mockAny(),
+            samplingRate: .mockAny(),
+            isKept: .mockAny(),
             tags: [
                 "tag-name": "tag value"
             ],
@@ -287,6 +309,66 @@ class SpanEventBuilderTests: XCTestCase {
         XCTAssertEqual(span.tags["tag-name"], "tag value", "It should prefer tags over baggage items if their names duplicate")
     }
 
+    func testBuildingKeptRootSpanWithSamplingRateSet() {
+        let builder: SpanEventBuilder = .mockAny()
+
+        // When
+        let span = builder.createSpanEvent(
+            context: .mockAny(),
+            traceID: .mockAny(),
+            spanID: .mockAny(),
+            parentSpanID: nil,
+            operationName: .mockAny(),
+            startTime: .mockAny(),
+            finishTime: .mockAny(),
+            samplingRate: 0.42,
+            isKept: true,
+            tags: [
+                "tag-name": "tag value"
+            ],
+            baggageItems: [
+                "item-1": "value 1",
+                "item-2": "value 2",
+                "tag-name": "baggage item value"
+            ],
+            logFields: []
+        )
+
+        // Then
+        XCTAssertEqual(span.samplingRate, 0.42)
+        XCTAssertTrue(span.isKept)
+    }
+
+    func testBuildingDiscardedRootSpanWithSamplingRateSet() {
+        let builder: SpanEventBuilder = .mockAny()
+
+        // When
+        let span = builder.createSpanEvent(
+            context: .mockAny(),
+            traceID: .mockAny(),
+            spanID: .mockAny(),
+            parentSpanID: nil,
+            operationName: .mockAny(),
+            startTime: .mockAny(),
+            finishTime: .mockAny(),
+            samplingRate: 0.13,
+            isKept: false,
+            tags: [
+                "tag-name": "tag value"
+            ],
+            baggageItems: [
+                "item-1": "value 1",
+                "item-2": "value 2",
+                "tag-name": "baggage item value"
+            ],
+            logFields: []
+        )
+
+        // Then
+        XCTAssertEqual(span.samplingRate, 0.13)
+        XCTAssertFalse(span.isKept)
+    }
+
     // MARK: - Attributes Conversion
 
     private struct Foo: Encodable {
@@ -336,6 +418,8 @@ class SpanEventBuilderTests: XCTestCase {
             operationName: .mockAny(),
             startTime: .mockAny(),
             finishTime: .mockAny(),
+            samplingRate: .mockAny(),
+            isKept: .mockAny(),
             tags: createMockAttributes(),
             baggageItems: [:],
             logFields: []
@@ -366,6 +450,8 @@ class SpanEventBuilderTests: XCTestCase {
             operationName: .mockAny(),
             startTime: .mockAny(),
             finishTime: .mockAny(),
+            samplingRate: .mockAny(),
+            isKept: .mockAny(),
             tags: [:],
             baggageItems: [:],
             logFields: []
@@ -392,6 +478,8 @@ class SpanEventBuilderTests: XCTestCase {
             operationName: .mockAny(),
             startTime: .mockAny(),
             finishTime: .mockAny(),
+            samplingRate: .mockAny(),
+            isKept: .mockAny(),
             tags: [
                 "failing-tag": FailingEncodableMock(errorMessage: "Value cannot be encoded.")
             ],
diff --git a/Tests/DatadogTests/Matchers/SpanMatcher.swift b/Tests/DatadogTests/Matchers/SpanMatcher.swift
index da44504575..913734aa23 100644
--- a/Tests/DatadogTests/Matchers/SpanMatcher.swift
+++ b/Tests/DatadogTests/Matchers/SpanMatcher.swift
@@ -8,6 +8,8 @@ import Foundation
 
 /// Implemented by types allowed to represent span attribute `.*` value in JSON.
 protocol AllowedSpanAttributeValue {}
+/// Implemented by types allowed to represent span attribute `_dd.*` value in JSON.
+protocol AllowedSpanDdValue {}
 /// Implemented by types allowed to represent span `metrics.*` value in JSON.
 protocol AllowedSpanMetricValue {}
 /// Implemented by types allowed to represent span `meta.*` value in JSON.
@@ -18,6 +20,9 @@ extension String: AllowedSpanAttributeValue {}
 extension UInt64: AllowedSpanAttributeValue {}
 extension Int: AllowedSpanAttributeValue {}
 
+// Only numeric values are allowed for `span._dd.*`.
+extension Float: AllowedSpanDdValue {}
+
 // Only numeric values are allowed for `span.metrics.*`.
 extension Int: AllowedSpanMetricValue {}
 
@@ -88,6 +93,16 @@ internal class SpanMatcher {
     func isError()          throws -> Int { try attribute(forKeyPath: "error") }
     func environment()      throws -> String { try envelope.value(forKeyPath: "env") }
 
+    // MARK: - _dd matching
+
+    var dd: Dd { Dd(matcher: self) }
+
+    struct Dd {
+        fileprivate let matcher: SpanMatcher
+
+        func samplingRate() throws -> Float { try matcher.dd(forKeyPath: "_dd.agent_psr") }
+    }
+
     // MARK: - Metrics matching
 
     var metrics: Metrics { Metrics(matcher: self) }
@@ -142,6 +157,11 @@ internal class SpanMatcher {
         return try span.value(forKeyPath: keyPath)
     }
 
+    private func dd<T: AllowedSpanDdValue & Equatable>(forKeyPath keyPath: String) throws -> T {
+        precondition(keyPath.hasPrefix("_dd."))
+        return try span.value(forKeyPath: keyPath)
+    }
+
     private func metric<T: AllowedSpanMetricValue & Equatable>(forKeyPath keyPath: String) throws -> T {
         precondition(keyPath.hasPrefix("metrics."))
         return try span.value(forKeyPath: keyPath)

From 5d4b391e2928b643a5522fbb4fa6cea649cb2767 Mon Sep 17 00:00:00 2001
From: Maxime Epain <maxime.epain@datadoghq.com>
Date: Tue, 25 Apr 2023 13:57:51 +0200
Subject: [PATCH 07/14] RUMM-3239 Fix RUM context in Logs

---
 Sources/Datadog/Logging/RemoteLogger.swift   |  4 +-
 Tests/DatadogTests/Datadog/LoggerTests.swift | 47 +++++++++++++-------
 2 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/Sources/Datadog/Logging/RemoteLogger.swift b/Sources/Datadog/Logging/RemoteLogger.swift
index 72810b1f33..bf1f519492 100644
--- a/Sources/Datadog/Logging/RemoteLogger.swift
+++ b/Sources/Datadog/Logging/RemoteLogger.swift
@@ -125,8 +125,8 @@ internal final class RemoteLogger: LoggerProtocol {
             var internalAttributes: [String: Encodable] = [:]
             let contextAttributes = context.featuresAttributes
 
-            if self.rumContextIntegration, let attributes: [String: String] = contextAttributes["rum"]?.ids {
-                let attributes = attributes.compactMapValues(AnyEncodable.init)
+            if self.rumContextIntegration, let attributes: [String: AnyCodable?] = contextAttributes["rum"]?.ids {
+                let attributes = attributes.compactMapValues { $0 }
                 internalAttributes.merge(attributes) { $1 }
             }
 
diff --git a/Tests/DatadogTests/Datadog/LoggerTests.swift b/Tests/DatadogTests/Datadog/LoggerTests.swift
index f6b2cc123a..ddf08eefe0 100644
--- a/Tests/DatadogTests/Datadog/LoggerTests.swift
+++ b/Tests/DatadogTests/Datadog/LoggerTests.swift
@@ -551,28 +551,41 @@ class LoggerTests: XCTestCase {
         // given
         let logger = Logger.builder.build(in: core)
         Global.rum = RUMMonitor.initialize(in: core)
-        Global.rum.startView(viewController: mockView)
-        Global.rum.startUserAction(type: .tap, name: .mockAny())
         defer { Global.rum = DDNoopRUMMonitor() }
 
         // when
-        logger.info("info message")
+        Global.rum.startView(viewController: mockView)
+        logger.info("message 0")
+        Global.rum.startUserAction(type: .tap, name: .mockAny())
+        logger.info("message 1")
 
         // then
-        let logMatcher = try core.waitAndReturnLogMatchers()[0]
-        logMatcher.assertValue(
-            forKeyPath: RUMContextAttributes.IDs.applicationID,
-            equals: rum.configuration.applicationID
-        )
-        logMatcher.assertValue(
-            forKeyPath: RUMContextAttributes.IDs.sessionID,
-            isTypeOf: String.self
-        )
-        logMatcher.assertValue(
-            forKeyPath: RUMContextAttributes.IDs.viewID,
-            isTypeOf: String.self
-        )
-        logMatcher.assertValue(
+        let logMatchers = try core.waitAndReturnLogMatchers()
+        XCTAssertEqual(logMatchers.count, 2)
+
+        logMatchers.forEach {
+            $0.assertValue(
+                forKeyPath: RUMContextAttributes.IDs.applicationID,
+                equals: rum.configuration.applicationID
+            )
+        }
+        logMatchers.forEach {
+            $0.assertValue(
+                forKeyPath: RUMContextAttributes.IDs.sessionID,
+                isTypeOf: String.self
+            )
+        }
+
+        logMatchers.forEach {
+            $0.assertValue(
+                forKeyPath: RUMContextAttributes.IDs.viewID,
+                isTypeOf: String.self
+            )
+        }
+
+        logMatchers.first?.assertNoValue(forKeyPath: RUMContextAttributes.IDs.userActionID)
+
+        logMatchers.last?.assertValue(
             forKeyPath: RUMContextAttributes.IDs.userActionID,
             isTypeOf: String.self
         )

From 35f40b3cfd246da8feda5a784e6bcde11c820fee Mon Sep 17 00:00:00 2001
From: Maxime Epain <maxime.epain@datadoghq.com>
Date: Tue, 25 Apr 2023 14:02:08 +0200
Subject: [PATCH 08/14] Update CHANGELOG.md

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 476dfdaedb..04547f744d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Unreleased
 
+- [BUGFIX] Fix RUM context not being attached to log when no user action exists. See [#1264][]
+
 # 1.18.0 / 19-04-2023
 - [IMPROVEMENT] Add start reason to the session. See [#1247][]
 - [IMPROVEMENT] Add ability to stop the session. See [#1219][]
@@ -452,6 +454,7 @@
 [#1219]: https://github.com/DataDog/dd-sdk-ios/pull/1219
 [#1220]: https://github.com/DataDog/dd-sdk-ios/pull/1220
 [#1247]: https://github.com/DataDog/dd-sdk-ios/pull/1247
+[#1264]: https://github.com/DataDog/dd-sdk-ios/pull/1264
 [@00fa9a]: https://github.com/00FA9A
 [@britton-earnin]: https://github.com/Britton-Earnin
 [@hengyu]: https://github.com/Hengyu

From 660aa75d95c39cf8ed34e33740685fdeaf0c0a68 Mon Sep 17 00:00:00 2001
From: Maxime Epain <maxime.epain@datadoghq.com>
Date: Tue, 25 Apr 2023 17:55:11 +0200
Subject: [PATCH 09/14] Update LoggerTests.swift

---
 Tests/DatadogTests/Datadog/LoggerTests.swift | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Tests/DatadogTests/Datadog/LoggerTests.swift b/Tests/DatadogTests/Datadog/LoggerTests.swift
index ddf08eefe0..70bbaaaf07 100644
--- a/Tests/DatadogTests/Datadog/LoggerTests.swift
+++ b/Tests/DatadogTests/Datadog/LoggerTests.swift
@@ -568,15 +568,12 @@ class LoggerTests: XCTestCase {
                 forKeyPath: RUMContextAttributes.IDs.applicationID,
                 equals: rum.configuration.applicationID
             )
-        }
-        logMatchers.forEach {
+
             $0.assertValue(
                 forKeyPath: RUMContextAttributes.IDs.sessionID,
                 isTypeOf: String.self
             )
-        }
 
-        logMatchers.forEach {
             $0.assertValue(
                 forKeyPath: RUMContextAttributes.IDs.viewID,
                 isTypeOf: String.self

From a2b9362863e7fcc6c0a7b698d3d90b84305e5ed4 Mon Sep 17 00:00:00 2001
From: Maxime Epain <maxime.epain@datadoghq.com>
Date: Wed, 26 Apr 2023 10:47:34 +0200
Subject: [PATCH 10/14] Bumped version to 1.19.0

---
 DatadogSDK.podspec                   | 2 +-
 DatadogSDKAlamofireExtension.podspec | 2 +-
 DatadogSDKCrashReporting.podspec     | 4 ++--
 DatadogSDKObjc.podspec               | 4 ++--
 DatadogSDKSessionReplay.podspec      | 2 +-
 Sources/Datadog/Versioning.swift     | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/DatadogSDK.podspec b/DatadogSDK.podspec
index 76f9fba59e..8a2babed95 100644
--- a/DatadogSDK.podspec
+++ b/DatadogSDK.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name         = "DatadogSDK"
   s.module_name  = "Datadog"
-  s.version      = "1.18.0"
+  s.version      = "1.19.0"
   s.summary      = "Official Datadog Swift SDK for iOS."
   
   s.homepage     = "https://www.datadoghq.com"
diff --git a/DatadogSDKAlamofireExtension.podspec b/DatadogSDKAlamofireExtension.podspec
index 79a331d713..4a50250fa6 100644
--- a/DatadogSDKAlamofireExtension.podspec
+++ b/DatadogSDKAlamofireExtension.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name         = "DatadogSDKAlamofireExtension"
   s.module_name  = "DatadogAlamofireExtension"
-  s.version      = "1.18.0"
+  s.version      = "1.19.0"
   s.summary      = "An Official Extensions of Datadog Swift SDK for Alamofire."
   
   s.homepage     = "https://www.datadoghq.com"
diff --git a/DatadogSDKCrashReporting.podspec b/DatadogSDKCrashReporting.podspec
index e8e473c809..23bc03e27c 100644
--- a/DatadogSDKCrashReporting.podspec
+++ b/DatadogSDKCrashReporting.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name         = "DatadogSDKCrashReporting"
   s.module_name  = "DatadogCrashReporting"
-  s.version      = "1.18.0"
+  s.version      = "1.19.0"
   s.summary      = "Official Datadog Crash Reporting SDK for iOS."
   
   s.homepage     = "https://www.datadoghq.com"
@@ -22,6 +22,6 @@ Pod::Spec.new do |s|
   s.static_framework = true
 
   s.source_files = "Sources/DatadogCrashReporting/**/*.swift"
-  s.dependency 'DatadogSDK', '1.18.0'
+  s.dependency 'DatadogSDK', '1.19.0'
   s.dependency 'PLCrashReporter', '~> 1.11.0'
 end
diff --git a/DatadogSDKObjc.podspec b/DatadogSDKObjc.podspec
index 590888172f..2ff8586d00 100644
--- a/DatadogSDKObjc.podspec
+++ b/DatadogSDKObjc.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name         = "DatadogSDKObjc"
   s.module_name  = "DatadogObjc"
-  s.version      = "1.18.0"
+  s.version      = "1.19.0"
   s.summary      = "Official Datadog Objective-C SDK for iOS."
   
   s.homepage     = "https://www.datadoghq.com"
@@ -21,5 +21,5 @@ Pod::Spec.new do |s|
   s.source = { :git => 'https://github.com/DataDog/dd-sdk-ios.git', :tag => s.version.to_s }
 
   s.source_files = "Sources/DatadogObjc/**/*.swift"
-  s.dependency 'DatadogSDK', '1.18.0'
+  s.dependency 'DatadogSDK', '1.19.0'
 end
diff --git a/DatadogSDKSessionReplay.podspec b/DatadogSDKSessionReplay.podspec
index 559559c80f..907a9c7565 100644
--- a/DatadogSDKSessionReplay.podspec
+++ b/DatadogSDKSessionReplay.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name         = "DatadogSDKSessionReplay"
   s.module_name  = "DatadogSessionReplay"
-  s.version      = "1.18.0"
+  s.version      = "1.19.0"
   s.summary      = "Official Datadog Session Replay SDK for iOS. This module is currently in beta - contact Datadog to request a try."
   
   s.homepage     = "https://www.datadoghq.com"
diff --git a/Sources/Datadog/Versioning.swift b/Sources/Datadog/Versioning.swift
index 76ae335bc7..2b65373519 100644
--- a/Sources/Datadog/Versioning.swift
+++ b/Sources/Datadog/Versioning.swift
@@ -1,3 +1,3 @@
 // GENERATED FILE: Do not edit directly
 
-internal let __sdkVersion = "1.18.0"
+internal let __sdkVersion = "1.19.0"

From 4c6a5a1e383aa9e33548234b66889312540913ac Mon Sep 17 00:00:00 2001
From: Maxime Epain <maxime.epain@datadoghq.com>
Date: Wed, 26 Apr 2023 10:49:11 +0200
Subject: [PATCH 11/14] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04547f744d..5432d261c2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Unreleased
 
+- [IMPROVEMENT] Add Tracer sampling rate. See [#1259][]
 - [BUGFIX] Fix RUM context not being attached to log when no user action exists. See [#1264][]
 
 # 1.18.0 / 19-04-2023
@@ -454,6 +455,7 @@
 [#1219]: https://github.com/DataDog/dd-sdk-ios/pull/1219
 [#1220]: https://github.com/DataDog/dd-sdk-ios/pull/1220
 [#1247]: https://github.com/DataDog/dd-sdk-ios/pull/1247
+[#1259]: https://github.com/DataDog/dd-sdk-ios/pull/1259
 [#1264]: https://github.com/DataDog/dd-sdk-ios/pull/1264
 [@00fa9a]: https://github.com/00FA9A
 [@britton-earnin]: https://github.com/Britton-Earnin

From 828eef9f9996eeef72849c31cdb693c65635f756 Mon Sep 17 00:00:00 2001
From: Maxime Epain <maxime.epain@datadoghq.com>
Date: Wed, 26 Apr 2023 11:37:02 +0200
Subject: [PATCH 12/14] Fix benchmark tests

---
 .../DataStorage/TracingStorageBenchmarkTests.swift              | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Tests/DatadogBenchmarkTests/DataStorage/TracingStorageBenchmarkTests.swift b/Tests/DatadogBenchmarkTests/DataStorage/TracingStorageBenchmarkTests.swift
index b3b51de6a1..ff990f22c3 100644
--- a/Tests/DatadogBenchmarkTests/DataStorage/TracingStorageBenchmarkTests.swift
+++ b/Tests/DatadogBenchmarkTests/DataStorage/TracingStorageBenchmarkTests.swift
@@ -94,6 +94,8 @@ class TracingStorageBenchmarkTests: XCTestCase {
             isError: false,
             source: "ios",
             origin: nil,
+            samplingRate: 100,
+            isKept: true,
             tracerVersion: "0.0.0",
             applicationVersion: "0.0.0",
             networkConnectionInfo: NetworkConnectionInfo(

From 753105ade2daf63accf434d0bba4622a5faa0ce9 Mon Sep 17 00:00:00 2001
From: Maxime Epain <maxime.epain@datadoghq.com>
Date: Wed, 26 Apr 2023 12:16:39 +0200
Subject: [PATCH 13/14] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5432d261c2..0aa1e8c5be 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Unreleased
 
+- [BUGFIX] Fix view attributes override by action attributes. See [#1250][]
 - [IMPROVEMENT] Add Tracer sampling rate. See [#1259][]
 - [BUGFIX] Fix RUM context not being attached to log when no user action exists. See [#1264][]
 
@@ -455,6 +456,7 @@
 [#1219]: https://github.com/DataDog/dd-sdk-ios/pull/1219
 [#1220]: https://github.com/DataDog/dd-sdk-ios/pull/1220
 [#1247]: https://github.com/DataDog/dd-sdk-ios/pull/1247
+[#1250]: https://github.com/DataDog/dd-sdk-ios/pull/1250
 [#1259]: https://github.com/DataDog/dd-sdk-ios/pull/1259
 [#1264]: https://github.com/DataDog/dd-sdk-ios/pull/1264
 [@00fa9a]: https://github.com/00FA9A

From 6cb2a5f6ca7bac868ea9a5ee1e1975032a6eeb7e Mon Sep 17 00:00:00 2001
From: Maxime Epain <maxime.epain@datadoghq.com>
Date: Wed, 26 Apr 2023 17:20:41 +0200
Subject: [PATCH 14/14] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0aa1e8c5be..eea84513df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Unreleased
 
+# 1.19.0 / 26-04-2023
 - [BUGFIX] Fix view attributes override by action attributes. See [#1250][]
 - [IMPROVEMENT] Add Tracer sampling rate. See [#1259][]
 - [BUGFIX] Fix RUM context not being attached to log when no user action exists. See [#1264][]