Deprecate PixelKit daily pixel suffixes (#3509)

Task/Issue URL: https://app.asana.com/0/0/1208695427490034/f Tech Design URL: CC: Description: This PR updates the app to use the new legacyDailyAndCount PixelKit suffix type.
duckduckgo · Nov 6, 2024 · d6f051a · d6f051a
1 parent a8de1e0
commit d6f051a
Show file tree

Hide file tree

Showing 29 changed files with 145 additions and 145 deletions.
diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -14778,7 +14778,7 @@
 			repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = 203.3.0;
+				version = 204.0.0;
 			};
 		};
 		9FF521422BAA8FF300B9819B /* XCRemoteSwiftPackageReference "lottie-spm" */ = {

diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/BrowserServicesKit",
       "state" : {
-        "revision" : "64a5d8d1e19951fe397305a14e521713fb0eaa49",
-        "version" : "203.3.0"
+        "revision" : "14594b6f3f3ddbea65be2818298e2e79305d8a26",
+        "version" : "204.0.0"
       }
     },
     {

diff --git a/DuckDuckGo/DBP/DataBrokerProtectionPixelsHandler.swift b/DuckDuckGo/DBP/DataBrokerProtectionPixelsHandler.swift
@@ -40,7 +40,7 @@ public class DataBrokerProtectionPixelsHandler: EventMapping<DataBrokerProtectio
                     .ipcServerImmediateScansFinishedWithError(error: let error),
                     .ipcServerAppLaunchedXPCError(error: let error),
                     .ipcServerAppLaunchedScheduledScansFinishedWithError(error: let error):
-                PixelKit.fire(DebugEvent(event, error: error), frequency: .dailyAndCount, includeAppVersionParameter: true)
+                PixelKit.fire(DebugEvent(event, error: error), frequency: .legacyDailyAndCount, includeAppVersionParameter: true)
             case .ipcServerProfileSavedCalledByApp,
                     .ipcServerProfileSavedReceivedByAgent,
                     .ipcServerImmediateScansInterrupted,
@@ -50,7 +50,7 @@ public class DataBrokerProtectionPixelsHandler: EventMapping<DataBrokerProtectio
                     .ipcServerAppLaunchedScheduledScansBlocked,
                     .ipcServerAppLaunchedScheduledScansInterrupted,
                     .ipcServerAppLaunchedScheduledScansFinishedWithoutError:
-                PixelKit.fire(event, frequency: .dailyAndCount, includeAppVersionParameter: true)
+                PixelKit.fire(event, frequency: .legacyDailyAndCount, includeAppVersionParameter: true)
             case .parentChildMatches,
                     .optOutStart,
                     .optOutEmailGenerate,
@@ -122,7 +122,7 @@ public class DataBrokerProtectionPixelsHandler: EventMapping<DataBrokerProtectio
                     .entitlementCheckValid,
                     .entitlementCheckInvalid,
                     .entitlementCheckError:
-                PixelKit.fire(event, frequency: .dailyAndCount)
+                PixelKit.fire(event, frequency: .legacyDailyAndCount)
             }
         }
     }

diff --git a/DuckDuckGo/LoginItems/LoginItemsManager.swift b/DuckDuckGo/LoginItems/LoginItemsManager.swift
@@ -95,7 +95,7 @@ final class LoginItemsManager: LoginItemsManaging {
                                                       action: "enable",
                                                       buildType: AppVersion.shared.buildType,
                                                       osVersion: AppVersion.shared.osVersion)
-        PixelKit.fire(DebugEvent(event, error: error), frequency: .dailyAndCount)
+        PixelKit.fire(DebugEvent(event, error: error), frequency: .legacyDailyAndCount)
         Logger.networkProtection.error("Could not enable \(item.debugDescription, privacy: .public): \(error.debugDescription, privacy: .public)")
     }
 

diff --git a/...kGo/NetworkProtection/AppTargets/BothAppTargets/EventMapping+NetworkProtectionError.swift b/...kGo/NetworkProtection/AppTargets/BothAppTargets/EventMapping+NetworkProtectionError.swift
@@ -62,10 +62,10 @@ extension EventMapping where Event == NetworkProtectionError {
             frequency = .standard
         case .failedToFetchLocationList(let error):
             domainEvent = .networkProtectionClientFailedToFetchLocations(error)
-            frequency = .dailyAndCount
+            frequency = .legacyDailyAndCount
         case .failedToParseLocationListResponse(let error):
             domainEvent = .networkProtectionClientFailedToParseLocationsResponse(error)
-            frequency = .dailyAndCount
+            frequency = .legacyDailyAndCount
         case .noServerRegistrationInfo,
                 .couldNotSelectClosestServer,
                 .couldNotGetPeerPublicKey,

diff --git a/...uckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionTunnelController.swift b/...uckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionTunnelController.swift
@@ -537,7 +537,7 @@ final class NetworkProtectionTunnelController: TunnelController, TunnelSessionPr
     func start() async {
         VPNOperationErrorRecorder().beginRecordingControllerStart()
         PixelKit.fire(NetworkProtectionPixelEvent.networkProtectionControllerStartAttempt,
-                      frequency: .dailyAndCount)
+                      frequency: .legacyDailyAndCount)
         controllerErrorStore.lastErrorMessage = nil
 
         do {
@@ -580,19 +580,19 @@ final class NetworkProtectionTunnelController: TunnelController, TunnelSessionPr
                 // in the packet tunnel provider side that can be used to debug additional logic.
                 //
                 PixelKit.fire(NetworkProtectionPixelEvent.networkProtectionControllerStartSuccess,
-                              frequency: .dailyAndCount)
+                              frequency: .legacyDailyAndCount)
             }
         } catch {
             VPNOperationErrorRecorder().recordControllerStartFailure(error)
             knownFailureStore.lastKnownFailure = KnownFailure(error)
 
             if case StartError.cancelled = error {
                 PixelKit.fire(
-                    NetworkProtectionPixelEvent.networkProtectionControllerStartCancelled, frequency: .dailyAndCount, includeAppVersionParameter: true
+                    NetworkProtectionPixelEvent.networkProtectionControllerStartCancelled, frequency: .legacyDailyAndCount, includeAppVersionParameter: true
                 )
             } else {
                 PixelKit.fire(
-                    NetworkProtectionPixelEvent.networkProtectionControllerStartFailure(error), frequency: .dailyAndCount, includeAppVersionParameter: true
+                    NetworkProtectionPixelEvent.networkProtectionControllerStartFailure(error), frequency: .legacyDailyAndCount, includeAppVersionParameter: true
                 )
             }
 

diff --git a/...DuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/VPNLocationViewModel.swift b/...DuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/VPNLocationViewModel.swift
@@ -74,13 +74,13 @@ final class VPNLocationViewModel: ObservableObject {
     }
 
     func onNearestItemSelection() async {
-        PixelKit.fire(GeneralPixel.networkProtectionGeoswitchingSetNearest, frequency: .dailyAndCount)
+        PixelKit.fire(GeneralPixel.networkProtectionGeoswitchingSetNearest, frequency: .legacyDailyAndCount)
         selectedLocation = .nearest
         await reloadList()
     }
 
     func onCountryItemSelection(id: String, cityId: String? = nil) async {
-        PixelKit.fire(GeneralPixel.networkProtectionGeoswitchingSetCustom, frequency: .dailyAndCount)
+        PixelKit.fire(GeneralPixel.networkProtectionGeoswitchingSetCustom, frequency: .legacyDailyAndCount)
         let city = cityId == VPNCityItemModel.nearest.id ? nil : cityId
         let location = NetworkProtectionSelectedLocation(country: id, city: city)
         selectedLocation = .location(location)
@@ -95,7 +95,7 @@ final class VPNLocationViewModel: ObservableObject {
     private func reloadList() async {
         guard let locations = try? await locationListRepository.fetchLocationList().sortedByName() else { return }
         if locations.isEmpty {
-            PixelKit.fire(GeneralPixel.networkProtectionGeoswitchingNoLocations, frequency: .dailyAndCount)
+            PixelKit.fire(GeneralPixel.networkProtectionGeoswitchingNoLocations, frequency: .legacyDailyAndCount)
         }
         let isNearestSelected = selectedLocation == .nearest
         self.isNearestSelected = isNearestSelected

diff --git a/...NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionIPCTunnelController.swift b/...NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionIPCTunnelController.swift
@@ -96,7 +96,7 @@ extension NetworkProtectionIPCTunnelController: TunnelController {
             knownFailureStore.lastKnownFailure = KnownFailure(error)
             errorRecorder.recordIPCStartFailure(error)
             log(error)
-            pixelKit?.fire(StartAttempt.failure(error), frequency: .dailyAndCount)
+            pixelKit?.fire(StartAttempt.failure(error), frequency: .legacyDailyAndCount)
         }
 
         do {
@@ -112,7 +112,7 @@ extension NetworkProtectionIPCTunnelController: TunnelController {
                 if let error {
                     handleFailure(error)
                 } else {
-                    pixelKit?.fire(StartAttempt.success, frequency: .dailyAndCount)
+                    pixelKit?.fire(StartAttempt.success, frequency: .legacyDailyAndCount)
                 }
             }
         } catch {
@@ -126,7 +126,7 @@ extension NetworkProtectionIPCTunnelController: TunnelController {
 
         func handleFailure(_ error: Error) {
             log(error)
-            pixelKit?.fire(StopAttempt.failure(error), frequency: .dailyAndCount)
+            pixelKit?.fire(StopAttempt.failure(error), frequency: .legacyDailyAndCount)
         }
 
         do {
@@ -136,7 +136,7 @@ extension NetworkProtectionIPCTunnelController: TunnelController {
                 if let error {
                     handleFailure(error)
                 } else {
-                    pixelKit?.fire(StopAttempt.success, frequency: .dailyAndCount)
+                    pixelKit?.fire(StopAttempt.success, frequency: .legacyDailyAndCount)
                 }
             }
         } catch {