Restore VPN pixels in main browser (#2129)

Task/Issue URL: https://app.asana.com/0/0/1206461359050575/f
Tech Design URL:
CC:

Description:

This PR fixes an issue where some pixels weren't sending properly from the main browser.

DuckDuckGo.xcodeproj/project.pbxproj

@@ -13121,7 +13121,7 @@
 			repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = 103.0.2;
+				version = 104.0.0;
 			};
 		};
 		AA06B6B52672AF8100F541C5 /* XCRemoteSwiftPackageReference "Sparkle" */ = {

DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -14,8 +14,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/BrowserServicesKit",
       "state" : {
-        "revision" : "1f7a1b5fe1c404d331fe34e55c99296828107c1d",
-        "version" : "103.0.2"
+        "revision" : "872090e651ad8e26ca9903a95f3d094b21d48e23",
+        "version" : "104.0.0"
       }
     },
     {

DuckDuckGo/Application/AppDelegate.swift

@@ -29,6 +29,7 @@ import DDGSync
 import ServiceManagement
 import SyncDataProviders
 import UserNotifications
+import PixelKit
 
 #if NETWORK_PROTECTION
 import NetworkProtection
@@ -117,8 +118,10 @@ final class AppDelegate: NSObject, NSApplicationDelegate, FileDownloadManagerDel
         if NSApplication.runType.requiresEnvironment {
 #if DEBUG
             Pixel.setUp(dryRun: true)
+            Self.setUpPixelKit(dryRun: true)
 #else
             Pixel.setUp()
+            Self.setUpPixelKit(dryRun: false)
 #endif
 
             Database.shared.loadStore { _, error in
@@ -360,6 +363,33 @@ final class AppDelegate: NSObject, NSApplicationDelegate, FileDownloadManagerDel
         appearancePreferences.updateUserInterfaceStyle()
     }
 
+    private static func setUpPixelKit(dryRun: Bool) {
+#if NETWORK_PROTECTION
+#if APPSTORE
+        let source = "browser-appstore"
+#else
+        let source = "browser-dmg"
+#endif
+
+        PixelKit.setUp(dryRun: dryRun,
+                       appVersion: AppVersion.shared.versionNumber,
+                       source: source,
+                       defaultHeaders: [:],
+                       log: .networkProtectionPixel,
+                       defaults: .netP) { (pixelName: String, headers: [String: String], parameters: [String: String], _, _, onComplete: @escaping PixelKit.CompletionBlock) in
+
+            let url = URL.pixelUrl(forPixelNamed: pixelName)
+            let apiHeaders = APIRequest.Headers(additionalHeaders: headers)
+            let configuration = APIRequest.Configuration(url: url, method: .get, queryParameters: parameters, headers: apiHeaders)
+            let request = APIRequest(configuration: configuration)
+
+            request.fetch { _, error in
+                onComplete(error == nil, error)
+            }
+        }
+#endif
+    }
+
     // MARK: - Sync
 
     private func startupSync() {

DuckDuckGo/NetworkProtection/AppAndExtensionAndAgentTargets/NetworkProtectionPixelEvent.swift

@@ -66,6 +66,7 @@ enum NetworkProtectionPixelEvent: PixelKitEvent {
     case networkProtectionKeychainErrorFailedToCastKeychainValueToData(field: String)
     case networkProtectionKeychainReadError(field: String, status: Int32)
     case networkProtectionKeychainWriteError(field: String, status: Int32)
+    case networkProtectionKeychainUpdateError(field: String, status: Int32)
     case networkProtectionKeychainDeleteError(status: Int32)
 
     case networkProtectionWireguardErrorCannotLocateTunnelFileDescriptor
@@ -190,6 +191,9 @@ enum NetworkProtectionPixelEvent: PixelKitEvent {
         case .networkProtectionKeychainWriteError:
             return "m_mac_netp_keychain_error_write_failed"
 
+        case .networkProtectionKeychainUpdateError:
+            return "m_mac_netp_keychain_error_update_failed"
+
         case .networkProtectionKeychainDeleteError:
             return "m_mac_netp_keychain_error_delete_failed"
 
@@ -239,6 +243,12 @@ enum NetworkProtectionPixelEvent: PixelKitEvent {
                 PixelKit.Parameters.errorCode: String(status)
             ]
 
+        case .networkProtectionKeychainUpdateError(let field, let status):
+            return [
+                PixelKit.Parameters.keychainFieldName: field,
+                PixelKit.Parameters.errorCode: String(status)
+            ]
+
         case .networkProtectionKeychainDeleteError(let status):
             return [
                 PixelKit.Parameters.errorCode: String(status)

DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/EventMapping+NetworkProtectionError.swift

@@ -53,6 +53,9 @@ extension EventMapping where Event == NetworkProtectionError {
         case .keychainWriteError(field: let field, status: let status):
             domainEvent = .networkProtectionKeychainWriteError(field: field, status: status)
             frequency = .standard
+        case .keychainUpdateError(field: let field, status: let status):
+            domainEvent = .networkProtectionKeychainUpdateError(field: field, status: status)
+            frequency = .standard
         case .keychainDeleteError(status: let status):
             domainEvent = .networkProtectionKeychainDeleteError(status: status)
             frequency = .standard

DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/MacPacketTunnelProvider.swift

@@ -100,6 +100,8 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
                 domainEvent = .networkProtectionKeychainReadError(field: field, status: status)
             case .keychainWriteError(let field, let status):
                 domainEvent = .networkProtectionKeychainWriteError(field: field, status: status)
+            case .keychainUpdateError(let field, let status):
+                domainEvent = .networkProtectionKeychainUpdateError(field: field, status: status)
             case .keychainDeleteError(let status):
                 domainEvent = .networkProtectionKeychainDeleteError(status: status)
             case .wireGuardCannotLocateTunnelFileDescriptor:

LocalPackages/DataBrokerProtection/Package.swift

@@ -29,7 +29,7 @@ let package = Package(
             targets: ["DataBrokerProtection"])
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "103.0.2"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "104.0.0"),
         .package(path: "../PixelKit"),
         .package(path: "../SwiftUIExtensions"),
         .package(path: "../XPCHelper")

LocalPackages/LoginItems/Package.swift

@@ -13,7 +13,7 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "103.0.2"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "104.0.0"),
     ],
     targets: [
         .target(

LocalPackages/NetworkProtectionMac/Package.swift

@@ -30,7 +30,7 @@ let package = Package(
         .library(name: "NetworkProtectionUI", targets: ["NetworkProtectionUI"])
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "103.0.2"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "104.0.0"),
         .package(path: "../XPCHelper"),
         .package(path: "../SwiftUIExtensions")
     ],

LocalPackages/PixelKit/Package.swift

@@ -20,7 +20,7 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "103.0.2"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "104.0.0"),
     ],
     targets: [
         .target(

LocalPackages/Subscription/Package.swift

@@ -12,7 +12,7 @@ let package = Package(
             targets: ["Subscription"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "103.0.2"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "104.0.0"),
     ],
     targets: [
         .target(

LocalPackages/SwiftUIExtensions/Package.swift

@@ -11,7 +11,7 @@ let package = Package(
         .library(name: "PreferencesViews", targets: ["PreferencesViews"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "103.0.2"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "104.0.0"),
     ],
     targets: [
         .target(

LocalPackages/SyncUI/Package.swift

@@ -13,7 +13,7 @@ let package = Package(
     ],
     dependencies: [
         .package(path: "../SwiftUIExtensions"),
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "103.0.2"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "104.0.0"),
     ],
     targets: [
         .target(

LocalPackages/SystemExtensionManager/Package.swift

@@ -16,7 +16,7 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "103.0.2"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "104.0.0"),
     ],
     targets: [
         // Targets are the basic building blocks of a package, defining a module or a test suite.

LocalPackages/XPCHelper/Package.swift

@@ -30,7 +30,7 @@ let package = Package(
         .library(name: "XPCHelper", targets: ["XPCHelper"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "103.0.2"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "104.0.0"),
     ],
     targets: [
         .target(