Merge pull request #1086 from DataDog/maxep/RUMM-2745/decouple-webvie…

…w-tracking RUMM-2745 Decouple Webview Tracking
DataDog · Dec 20, 2022 · c478fe4 · c478fe4
2 parents 282de76 + 3283010
commit c478fe4
Show file tree

Hide file tree

Showing 57 changed files with 492 additions and 1,821 deletions.
diff --git a/Datadog/Datadog.xcodeproj/project.pbxproj b/Datadog/Datadog.xcodeproj/project.pbxproj
diff --git a/Sources/Datadog/Core/System/AppVersionProvider.swift b/Sources/Datadog/Core/System/AppVersionProvider.swift
diff --git a/Sources/Datadog/Core/System/CarrierInfoProvider.swift b/Sources/Datadog/Core/System/CarrierInfoProvider.swift
diff --git a/Sources/Datadog/Core/System/NetworkConnectionInfoProvider.swift b/Sources/Datadog/Core/System/NetworkConnectionInfoProvider.swift
diff --git a/Sources/Datadog/Core/System/Time/ServerDateCorrector.swift b/Sources/Datadog/Core/System/Time/ServerDateCorrector.swift
diff --git a/Sources/Datadog/Datadog.swift b/Sources/Datadog/Datadog.swift
@@ -188,9 +188,6 @@ public class Datadog {
 
         let userInfoProvider = UserInfoProvider()
         let serverDateProvider = configuration.common.serverDateProvider ?? DatadogNTPDateProvider()
-        let dateCorrector = ServerDateCorrector(serverDateProvider: serverDateProvider)
-        let networkConnectionInfoProvider = NetworkConnectionInfoProvider()
-        let carrierInfoProvider = CarrierInfoProvider()
         let appStateListener = AppStateListener(dateProvider: configuration.common.dateProvider)
 
         // Set default `DatadogCore`:
@@ -202,14 +199,6 @@ public class Datadog {
             performance: configuration.common.performance,
             httpClient: HTTPClient(proxyConfiguration: configuration.common.proxyConfiguration),
             encryption: configuration.common.encryption,
-            v1Context: DatadogV1Context(
-                configuration: configuration.common,
-                device: .init(),
-                dateCorrector: dateCorrector,
-                networkConnectionInfoProvider: networkConnectionInfoProvider,
-                carrierInfoProvider: carrierInfoProvider,
-                userInfoProvider: userInfoProvider
-            ),
             contextProvider: DatadogContextProvider(
                 configuration: configuration.common,
                 device: .init(),
@@ -236,7 +225,10 @@ public class Datadog {
             )
 
             rum = try core.create(
-                configuration: createRUMConfiguration(intake: rumConfiguration.uploadURL),
+                configuration: createRUMConfiguration(
+                    intake: rumConfiguration.uploadURL,
+                    dateProvider: rumConfiguration.dateProvider
+                ),
                 featureSpecificConfiguration: rumConfiguration
             )