Dogfood/2.0.0 beta2

.spi.yml

@@ -0,0 +1,5 @@
+version: 1
+builder:
+  configs:
+    - platform: ios
+      documentation_targets: ["Datadog", "DatadogObjc", "DatadogCrashReporting"]

BenchmarkTests/BenchmarkMocks.swift

@@ -14,14 +14,14 @@ extension PerformancePreset {
 struct FeatureRequestBuilderMock: FeatureRequestBuilder {
     let dataFormat = DataFormat(prefix: "", suffix: "", separator: "\n")
 
-    func request(for events: [Data], with context: DatadogContext) -> URLRequest {
+    func request(for events: [Event], with context: DatadogContext) -> URLRequest {
         let builder = URLRequestBuilder(
             url: .mockAny(),
             queryItems: [.ddtags(tags: ["foo:bar"])],
             headers: []
         )
 
-        let data = dataFormat.format(events)
+        let data = dataFormat.format(events.map { $0.data })
         return builder.uploadRequest(with: data)
     }
 }

BenchmarkTests/DataUpload/DataUploaderBenchmarkTests.swift

@@ -37,7 +37,7 @@ class DataUploaderBenchmarkTests: BenchmarkTests {
         measure(metrics: [XCTMemoryMetric()]) {
             // in each, 10 requests are done:
             try? (0..<10).forEach { _ in
-                let events = [Data(repeating: 0x41, count: 10 * 1_024 * 1_024)]
+                let events = [Event(data: Data(repeating: 0x41, count: 10 * 1_024 * 1_024))]
                 _ = try dataUploader.upload(events: events, context: context)
             }
             // After all, the baseline asserts `0kB` or less grow in Physical Memory.

CHANGELOG.md

@@ -1,10 +1,13 @@
 # Unreleased
 
-# 1.21.0 / 27-07-2023
+- [IMPROVEMENT] Reduce number of view updates by filtering events from payload. See [#1328][]
+
+# 1.21.0 / 27-06-2023
 - [BUGFIX] Fix TracingUUID string format. See [#1311][] (Thanks [@changm4n][])
 - [BUGFIX] Rename _Datadog_Private to DatadogPrivate. See [#1331] (Thanks [@alexfanatics][])
 - [IMPROVEMENT] Add context to crash when there's an active view. See [#1315][]
 
+
 # 1.20.0 / 01-06-2023
 - [BUGFIX] Use targetTimestamp as reference to calculate FPS for variable refresh rate displays. See [#1272][]
 
@@ -472,6 +475,7 @@
 [#1311]: https://github.com/DataDog/dd-sdk-ios/pull/1311
 [#1315]: https://github.com/DataDog/dd-sdk-ios/pull/1315
 [#1331]: https://github.com/DataDog/dd-sdk-ios/pull/1331
+[#1328]: https://github.com/DataDog/dd-sdk-ios/pull/1328
 [@00fa9a]: https://github.com/00FA9A
 [@britton-earnin]: https://github.com/Britton-Earnin
 [@hengyu]: https://github.com/Hengyu

Datadog/Datadog.xcodeproj/xcshareddata/xcschemes/DatadogCore tvOS.xcscheme

@@ -224,16 +224,6 @@
                ReferencedContainer = "container:Datadog.xcodeproj">
             </BuildableReference>
          </TestableReference>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "3CE11A2629F7BE1B00202522"
-               BuildableName = "DatadogWebViewTrackingTests.xctest"
-               BlueprintName = "DatadogWebViewTrackingTests tvOS"
-               ReferencedContainer = "container:Datadog.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction

Datadog/E2ETests/E2ETests.swift

@@ -5,7 +5,12 @@
 */
 
 import XCTest
-import DatadogCore
+import DatadogInternal
+import DatadogLogs
+import DatadogTrace
+import DatadogRUM
+
+@testable import DatadogCore
 
 /// A base class for all E2E test cases.
 class E2ETests: XCTestCase {
@@ -18,7 +23,14 @@ class E2ETests: XCTestCase {
         super.setUp()
         deleteAllSDKData()
         if !skipSDKInitialization {
-            initializeSDK()
+            Datadog.initialize(
+                with: .e2e,
+                trackingConsent: .granted
+            )
+
+            Logs.enable()
+            Trace.enable()
+            RUM.enable(with: .e2e)
         }
     }
 
@@ -47,29 +59,15 @@ class E2ETests: XCTestCase {
         let result = block()
         let stop = Date()
 
-        let performanceSpan = DatadogTracer.shared().startRootSpan(operationName: "perf_measure", startTime: start)
-        performanceSpan.setTag(key: DDTags.resource, value: resourceName)
+        let performanceSpan = Tracer.shared().startRootSpan(operationName: "perf_measure", startTime: start)
+        performanceSpan.setTag(key: SpanTags.resource, value: resourceName)
         performanceSpan.finish(at: stop)
 
         return result
     }
 
     // MARK: - SDK Lifecycle
 
-    func initializeSDK(
-        trackingConsent: TrackingConsent = .granted,
-        configuration: Datadog.Configuration = Datadog.Configuration.builderUsingE2EConfig().build()
-    ) {
-        Datadog.initialize(
-            appContext: .init(),
-            trackingConsent: trackingConsent,
-            configuration: configuration
-        )
-
-        DatadogTracer.initialize()
-        Global.rum = RUMMonitor.initialize()
-    }
-
     /// Sends all collected data and deinitializes the SDK. It is executed synchronously.
     private func sendAllDataAndDeinitializeSDK() {
         Datadog.flushAndDeinitialize()
@@ -79,6 +77,7 @@ class E2ETests: XCTestCase {
 
     /// Deletes persisted data for all SDK features. Ensures clean start for each test.
     private func deleteAllSDKData() {
-        PersistenceHelpers.deleteAllSDKData()
+        let core = CoreRegistry.default as? DatadogCore
+        core?.stores.values.forEach { $0.storage.clearAllData() }
     }
 }

Datadog/E2ETests/E2EUtils.swift

@@ -5,7 +5,6 @@
  */
 
 import Foundation
-import DatadogCore
 
 /// Collection of utilities for creating values for facets configured in "Mobile - Integration" org.
 struct DD {
@@ -98,7 +97,7 @@ struct DD {
     /// Attributes added to each log event.
     ///
     /// Each attributes has a facet used in monitor to assert that events are actually delivered.
-    static func logAttributes(functionName: StaticString = #function) -> [AttributeKey: AttributeValue] {
+    static func logAttributes(functionName: StaticString = #function) -> [String: Encodable] {
         return [
             "test_method_name": testMethodName(functionName: functionName)
         ]

Datadog/E2ETests/Helpers/DatadogE2EHelpers.swift

@@ -7,11 +7,10 @@
 import DatadogCore
 
 extension Datadog.Configuration {
-    static func builderUsingE2EConfig() -> Datadog.Configuration.Builder {
-        return builderUsing(
-            rumApplicationID: E2EConfig.readRUMApplicationID(),
+    static var e2e: Self {
+        .init(
             clientToken: E2EConfig.readClientToken(),
-            environment: E2EConfig.readEnv()
-        ).set(sampleTelemetry: 100)
+            env: E2EConfig.readEnv()
+        )
     }
 }

Datadog/E2ETests/Helpers/LoggingE2EHelpers.swift

@@ -4,11 +4,11 @@
  * Copyright 2019-Present Datadog, Inc.
  */
 
+import DatadogLogs
 import TestUtilities
-import DatadogCore
 
-extension Logger {
-    func sendRandomLog(with attributes: [AttributeKey: AttributeValue]) {
+extension LoggerProtocol {
+    func sendRandomLog(with attributes: [String: Encodable]) {
         let message: String = .mockRandom()
         let error: Error? = Bool.random() ? ErrorMock(.mockRandom()) : nil
 
@@ -28,9 +28,9 @@ extension Logger {
     }
 }
 
-extension Logger.Builder.ConsoleLogFormat {
-    static func random() -> Logger.Builder.ConsoleLogFormat {
-        let allFormats: [Logger.Builder.ConsoleLogFormat] = [
+extension Logger.Configuration.ConsoleLogFormat {
+    static func random() -> Logger.Configuration.ConsoleLogFormat {
+        let allFormats: [Logger.Configuration.ConsoleLogFormat] = [
             .short,
             .shortWith(prefix: .mockRandom())
         ]

Datadog/E2ETests/Helpers/RUME2EHelpers.swift

@@ -4,8 +4,17 @@
  * Copyright 2019-Present Datadog, Inc.
  */
 
-import DatadogCore
+@testable import DatadogRUM
 
-extension DDRUMMonitor {
-    var dd: RUMMonitor { self as! RUMMonitor }
+extension RUMMonitorProtocol {
+    var dd: Monitor { self as! Monitor }
+}
+
+extension RUM.Configuration {
+    static var e2e: Self {
+        .init(
+            applicationID: E2EConfig.readRUMApplicationID(),
+            telemetrySampleRate: 100
+        )
+    }
 }