From 9051b72bb51d8657d5fc5cfdc977e46cf7a2e5d5 Mon Sep 17 00:00:00 2001
From: Sam Symons <sam@samsymons.com>
Date: Mon, 4 Nov 2024 20:57:28 -0800
Subject: [PATCH 1/2] Set BSK branch.

---
 DuckDuckGo.xcodeproj/project.pbxproj                          | 4 ++--
 .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
index 731efbd4e7..ec7aa28466 100644
--- a/DuckDuckGo.xcodeproj/project.pbxproj
+++ b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -14777,8 +14777,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
 			requirement = {
-				kind = exactVersion;
-				version = 203.1.0;
+				branch = "sam/remove-test-rollout-pixel";
+				kind = branch;
 			};
 		};
 		9FF521422BAA8FF300B9819B /* XCRemoteSwiftPackageReference "lottie-spm" */ = {
diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 6c7c3d5617..f3d4797780 100644
--- 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" : "19f1e5c945aa92562ad2d087e8d6c99801edf656",
-        "version" : "203.1.0"
+        "branch" : "sam/remove-test-rollout-pixel",
+        "revision" : "40b7a3763ed74ab080d5a9480e2e5a3512e75408"
       }
     },
     {

From 1c1891013d3f492f591857f6a237c70743c733f2 Mon Sep 17 00:00:00 2001
From: Sam Symons <sam@samsymons.com>
Date: Mon, 4 Nov 2024 20:59:29 -0800
Subject: [PATCH 2/2] Remove test pixel.

---
 .../DBP/DataBrokerProtectionPixelsHandler.swift    |  1 -
 .../NetworkProtectionPixelEvent.swift              |  8 +-------
 DuckDuckGoVPN/DuckDuckGoVPNAppDelegate.swift       | 14 --------------
 .../Pixels/DataBrokerProtectionPixels.swift        |  4 ----
 .../DataBrokerProtectionAgentManager.swift         |  9 ---------
 5 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/DuckDuckGo/DBP/DataBrokerProtectionPixelsHandler.swift b/DuckDuckGo/DBP/DataBrokerProtectionPixelsHandler.swift
index cc4c928d89..ae969c1b72 100644
--- a/DuckDuckGo/DBP/DataBrokerProtectionPixelsHandler.swift
+++ b/DuckDuckGo/DBP/DataBrokerProtectionPixelsHandler.swift
@@ -106,7 +106,6 @@ public class DataBrokerProtectionPixelsHandler: EventMapping<DataBrokerProtectio
                     .dataBrokerMetricsWeeklyStats,
                     .dataBrokerMetricsMonthlyStats,
                     .invalidPayload,
-                    .pixelTest,
                     .customDataBrokerStatsOptoutSubmit,
                     .customGlobalStatsOptoutSubmit,
                     .weeklyChildBrokerOrphanedOptOuts:
diff --git a/DuckDuckGo/NetworkProtection/AppAndExtensionAndAgentTargets/NetworkProtectionPixelEvent.swift b/DuckDuckGo/NetworkProtection/AppAndExtensionAndAgentTargets/NetworkProtectionPixelEvent.swift
index ce1b4fca3a..656a4a2f52 100644
--- a/DuckDuckGo/NetworkProtection/AppAndExtensionAndAgentTargets/NetworkProtectionPixelEvent.swift
+++ b/DuckDuckGo/NetworkProtection/AppAndExtensionAndAgentTargets/NetworkProtectionPixelEvent.swift
@@ -115,7 +115,6 @@ enum NetworkProtectionPixelEvent: PixelKitEventV2 {
 
     case networkProtectionConfigurationInvalidPayload(configuration: Configuration)
     case networkProtectionConfigurationErrorLoadingCachedConfig(_ error: Error)
-    case networkProtectionConfigurationPixelTest
     case networkProtectionConfigurationFailedToParse(_ error: Error)
 
     case networkProtectionMalformedErrorDetected(_ error: Error)
@@ -344,9 +343,6 @@ enum NetworkProtectionPixelEvent: PixelKitEventV2 {
         case .networkProtectionConfigurationErrorLoadingCachedConfig:
             return "netp_ev_configuration_error_loading_cached_config"
 
-        case .networkProtectionConfigurationPixelTest:
-            return "netp_ev_configuration_pixel_test"
-
         case .networkProtectionConfigurationFailedToParse:
             return "netp_ev_configuration_failed_to_parse"
 
@@ -471,7 +467,6 @@ enum NetworkProtectionPixelEvent: PixelKitEventV2 {
                 .networkProtectionDNSUpdateCustom,
                 .networkProtectionDNSUpdateDefault,
                 .networkProtectionConfigurationInvalidPayload,
-                .networkProtectionConfigurationPixelTest,
                 .networkProtectionMalformedErrorDetected:
             return nil
         }
@@ -555,8 +550,7 @@ enum NetworkProtectionPixelEvent: PixelKitEventV2 {
                 .networkProtectionServerMigrationSuccess,
                 .networkProtectionDNSUpdateCustom,
                 .networkProtectionDNSUpdateDefault,
-                .networkProtectionConfigurationInvalidPayload,
-                .networkProtectionConfigurationPixelTest:
+                .networkProtectionConfigurationInvalidPayload:
             return nil
         }
     }
diff --git a/DuckDuckGoVPN/DuckDuckGoVPNAppDelegate.swift b/DuckDuckGoVPN/DuckDuckGoVPNAppDelegate.swift
index 40ecf9650b..0635cfe701 100644
--- a/DuckDuckGoVPN/DuckDuckGoVPNAppDelegate.swift
+++ b/DuckDuckGoVPN/DuckDuckGoVPNAppDelegate.swift
@@ -134,7 +134,6 @@ final class DuckDuckGoVPNAppDelegate: NSObject, NSApplicationDelegate {
     private let configurationStore = ConfigurationStore()
     private let configurationManager: ConfigurationManager
     private let privacyConfigurationManager = VPNPrivacyConfigurationManager()
-    private var configurationSubscription: AnyCancellable?
 
     public init(accountManager: AccountManager,
                 accessTokenStorage: SubscriptionTokenKeychainStorage,
@@ -386,11 +385,6 @@ final class DuckDuckGoVPNAppDelegate: NSObject, NSApplicationDelegate {
 
             setUpSubscriptionMonitoring()
 
-            configurationSubscription = privacyConfigurationManager.updatesPublisher
-                .sink { [weak self] in
-                    self?.firePrivacyConfigTestPixelIfNecessary()
-                }
-
             if launchedOnStartup {
                 Task {
                     let isConnected = await tunnelController.isConnected
@@ -427,8 +421,6 @@ final class DuckDuckGoVPNAppDelegate: NSObject, NSApplicationDelegate {
     private func setUpSubscriptionMonitoring() {
         guard accountManager.isUserAuthenticated else { return }
 
-        self.firePrivacyConfigTestPixelIfNecessary()
-
         let entitlementsCheck = {
             await self.accountManager.hasEntitlement(forProductName: .networkProtection, cachePolicy: .reloadIgnoringLocalCacheData)
         }
@@ -456,12 +448,6 @@ final class DuckDuckGoVPNAppDelegate: NSObject, NSApplicationDelegate {
         }
     }
 
-    private func firePrivacyConfigTestPixelIfNecessary() {
-        if privacyConfigurationManager.privacyConfig.isSubfeatureEnabled(BackgroundAgentPixelTestSubfeature.pixelTest) {
-            PixelKit.fire(NetworkProtectionPixelEvent.networkProtectionConfigurationPixelTest, frequency: .daily)
-        }
-    }
-
 }
 
 extension DuckDuckGoVPNAppDelegate: AccountManagerKeychainAccessDelegate {
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionPixels.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionPixels.swift
index f5fdcd9ce4..caea7b0dd3 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionPixels.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionPixels.swift
@@ -196,7 +196,6 @@ public enum DataBrokerProtectionPixels {
     // Configuration
     case invalidPayload(Configuration)
     case errorLoadingCachedConfig(Error)
-    case pixelTest
     case failedToParsePrivacyConfig(Error)
 
     // Measure success/failure rate of Personal Information Removal Pixels
@@ -337,7 +336,6 @@ extension DataBrokerProtectionPixels: PixelKitEvent {
             // Configuration
         case .invalidPayload(let configuration): return "m_mac_dbp_\(configuration.rawValue)_invalid_payload".lowercased()
         case .errorLoadingCachedConfig: return "m_mac_dbp_configuration_error_loading_cached_config"
-        case .pixelTest: return "m_mac_dbp_configuration_pixel_test"
         case .failedToParsePrivacyConfig: return "m_mac_dbp_configuration_failed_to_parse"
 
             // Various monitoring pixels
@@ -453,7 +451,6 @@ extension DataBrokerProtectionPixels: PixelKitEvent {
                 .secureVaultKeyStoreUpdateError,
                 .secureVaultError,
                 .invalidPayload,
-                .pixelTest,
                 .failedToParsePrivacyConfig:
             return [:]
         case .ipcServerProfileSavedCalledByApp,
@@ -614,7 +611,6 @@ public class DataBrokerProtectionPixelsHandler: EventMapping<DataBrokerProtectio
                     .dataBrokerMetricsWeeklyStats,
                     .dataBrokerMetricsMonthlyStats,
                     .invalidPayload,
-                    .pixelTest,
                     .customDataBrokerStatsOptoutSubmit,
                     .customGlobalStatsOptoutSubmit,
                     .weeklyChildBrokerOrphanedOptOuts:
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionAgentManager.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionAgentManager.swift
index e60248a16f..17c4fa0d61 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionAgentManager.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionAgentManager.swift
@@ -138,8 +138,6 @@ public final class DataBrokerProtectionAgentManager {
 
     private var didStartActivityScheduler = false
 
-    private var configurationSubscription: AnyCancellable?
-
     init(userNotificationService: DataBrokerProtectionUserNotificationService,
          activityScheduler: DataBrokerProtectionBackgroundActivityScheduler,
          ipcServer: DataBrokerProtectionIPCServer,
@@ -187,13 +185,6 @@ public final class DataBrokerProtectionAgentManager {
             /// Monitors entitlement changes every 60 minutes to optimize system performance and resource utilization by avoiding unnecessary operations when entitlement is invalid.
             /// While keeping the agent active with invalid entitlement has no significant risk, setting the monitoring interval at 60 minutes is a good balance to minimize backend checks.
             agentStopper.monitorEntitlementAndStopAgentIfEntitlementIsInvalidAndUserIsNotFreemium(interval: .minutes(60))
-
-            configurationSubscription = privacyConfigurationManager.updatesPublisher
-                .sink { [weak self] _ in
-                    if self?.privacyConfigurationManager.privacyConfig.isSubfeatureEnabled(BackgroundAgentPixelTestSubfeature.pixelTest) ?? false {
-                        PixelKit.fire(DataBrokerProtectionPixels.pixelTest, frequency: .daily)
-                    }
-                }
         }
     }
 }