Merge pull request #2184 from DataDog/release/2.23.0

Release 2.23.0

Co-authored-by: maxep <[email protected]>
Co-authored-by: mariedm <[email protected]>
Co-authored-by: simaoseica-dd <[email protected]>
Co-authored-by: ncreated <[email protected]>
Co-authored-by: maciejburda <[email protected]>
Co-authored-by: dd-mergequeue[bot] <121105855+dd-mergequeue[bot]@users.noreply.github.com>
Co-authored-by: Reallnas <[email protected]>
Co-authored-by: gonzalezreal <[email protected]>

BenchmarkTests/BenchmarkTests.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -58,7 +58,7 @@
          </EnvironmentVariable>
          <EnvironmentVariable
             key = "BENCHMARK_SCENARIO"
-            value = "sessionReplay"
+            value = "sessionReplaySwiftUI"
             isEnabled = "YES">
          </EnvironmentVariable>
       </EnvironmentVariables>

BenchmarkTests/Runner/Scenarios/SessionReplay/SessionReplayScenario.swift

@@ -36,7 +36,9 @@ struct SessionReplayScenario: Scenario {
         SessionReplay.enable(
             with: SessionReplay.Configuration(
                 replaySampleRate: 100,
-                defaultPrivacyLevel: .allow
+                textAndInputPrivacyLevel: .maskSensitiveInputs,
+                imagePrivacyLevel: .maskNone,
+                touchPrivacyLevel: .show
             )
         )
 

BenchmarkTests/Runner/Scenarios/SessionReplay/SessionReplaySwiftUIScenario.swift

@@ -0,0 +1,60 @@
+/*
+ * 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 Foundation
+import UIKit
+import SwiftUI
+
+import DatadogCore
+import DatadogRUM
+import DatadogSessionReplay
+
+import SwiftUICatalog
+
+struct SessionReplaySwiftUIScenario: Scenario {
+    var initialViewController: UIViewController {
+        UIHostingController(rootView: SwiftUICatalog.ContentView(monitor: DatadogMonitor()))
+    }
+
+    func instrument(with info: AppInfo) {
+        Datadog.initialize(
+            with: .benchmark(info: info),
+            trackingConsent: .granted
+        )
+
+        RUM.enable(
+            with: RUM.Configuration(
+                applicationID: info.applicationID
+            )
+        )
+
+        SessionReplay.enable(
+            with: SessionReplay.Configuration(
+                replaySampleRate: 100,
+                textAndInputPrivacyLevel: .maskSensitiveInputs,
+                imagePrivacyLevel: .maskNone,
+                touchPrivacyLevel: .show,
+                featureFlags: [.swiftui: true]
+            )
+        )
+
+        RUMMonitor.shared().addAttribute(forKey: "scenario", value: "SessionReplaySwiftUI")
+    }
+}
+
+private struct DatadogMonitor: SwiftUICatalog.DatadogMonitor {
+    func viewModifier(name: String) -> AnyViewModifier {
+        AnyViewModifier { content in
+            content.trackRUMView(name: name)
+        }
+    }
+
+    func actionModifier(name: String) -> AnyViewModifier {
+        AnyViewModifier { content in
+            content.trackRUMTapAction(name: name)
+        }
+    }
+}

BenchmarkTests/Runner/Scenarios/SyntheticScenario.swift

@@ -13,6 +13,7 @@ internal struct SyntheticScenario: Scenario {
     /// The Synthetics benchmark scenario value.
     internal enum Name: String {
         case sessionReplay
+        case sessionReplaySwiftUI
     }
     /// The scenario's name.
     let name: Name
@@ -36,6 +37,8 @@ internal struct SyntheticScenario: Scenario {
         switch name {
         case .sessionReplay:
             _scenario = SessionReplayScenario()
+        case .sessionReplaySwiftUI:
+            _scenario = SessionReplaySwiftUIScenario()
         }
 
         self.name = name

BenchmarkTests/SwiftUICatalog/AnyViewModifier.swift

@@ -0,0 +1,23 @@
+/*
+ * 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 SwiftUI
+
+public struct AnyViewModifier: ViewModifier {
+    private let _body: (Content) -> AnyView
+
+    public init<Body: View>(@ViewBuilder body: @escaping (Content) -> Body) {
+        self._body = { AnyView(body($0)) }
+    }
+
+    public init() {
+        self._body = { AnyView($0) }
+    }
+
+    public func body(content: Content) -> some View {
+        _body(content)
+    }
+}

BenchmarkTests/SwiftUICatalog/Assets.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BenchmarkTests/SwiftUICatalog/Assets.xcassets/colors/AccentColor.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "display-p3",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.038",
+          "green" : "0.005",
+          "red" : "0.020"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "display-p3",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.323",
+          "green" : "0.680",
+          "red" : "0.596"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BenchmarkTests/SwiftUICatalog/Assets.xcassets/colors/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BenchmarkTests/SwiftUICatalog/Assets.xcassets/colors/Dark.colorset/Contents.json

@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.122",
+          "green" : "0.122",
+          "red" : "0.129"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BenchmarkTests/SwiftUICatalog/Assets.xcassets/colors/MainFont.colorset/Contents.json

@@ -0,0 +1,28 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "platform" : "universal",
+        "reference" : "labelColor"
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "platform" : "ios",
+        "reference" : "labelColor"
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BenchmarkTests/SwiftUICatalog/Assets.xcassets/colors/Medium.colorset/Contents.json

@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.651",
+          "green" : "0.173",
+          "red" : "0.388"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BenchmarkTests/SwiftUICatalog/Assets.xcassets/colors/PageContainerColor.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "display-p3",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "1.000",
+          "green" : "0.976",
+          "red" : "0.973"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "display-p3",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.651",
+          "green" : "0.173",
+          "red" : "0.388"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BenchmarkTests/SwiftUICatalog/Assets.xcassets/github.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "5347-github_102542.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}

BenchmarkTests/SwiftUICatalog/Assets.xcassets/landmarks/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BenchmarkTests/SwiftUICatalog/Assets.xcassets/landmarks/charleyrivers_feature.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BenchmarkTests/SwiftUICatalog/Assets.xcassets/landmarks/stmarylake_feature.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BenchmarkTests/SwiftUICatalog/Assets.xcassets/landmarks/turtlerock_feature.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}