VPN logs level set as default instead of debug. (#3438)

federicocappelli · web-flow · commit f89f2daf63b3 · 2024-10-23T10:50:03.000+02:00
Task/Issue URL: https://app.asana.com/0/1205842942115003/1208598980823867/f Some VPN logs level was incorrectly changed during the logging refactoring, this PR reverts it to the original value
diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -14384,7 +14384,7 @@
 			repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = 200.1.0;
+				version = 200.1.1;
 			};
 		};
 		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" : "65cfb8b60909be241d4b5d11c764c1eb3f174534",
-        "version" : "200.1.0"
+        "revision" : "75930fb1caa2790bd757221660b85a839d215f9f",
+        "version" : "200.1.1"
       }
     },
     {
diff --git a/DuckDuckGo/LoginItems/LoginItemsManager.swift b/DuckDuckGo/LoginItems/LoginItemsManager.swift
@@ -46,7 +46,7 @@ final class LoginItemsManager: LoginItemsManaging {
         for item in items {
             do {
                 try item.enable()
-                Logger.networkProtection.debug("🟢 Enabled successfully \(String(describing: item), privacy: .public)")
+                Logger.networkProtection.log("🟢 Enabled successfully \(String(describing: item), privacy: .public)")
             } catch let error as NSError {
                 handleError(for: item, action: .enable, error: error)
             }
@@ -59,7 +59,7 @@ final class LoginItemsManager: LoginItemsManaging {
         for item in items {
             do {
                 try item.enable()
-                Logger.networkProtection.debug("🟢 Enabled successfully \(String(describing: item), privacy: .public)")
+                Logger.networkProtection.log("🟢 Enabled successfully \(String(describing: item), privacy: .public)")
             } catch let error as NSError {
                 handleError(for: item, action: .enable, error: error)
                 throw error
@@ -71,7 +71,7 @@ final class LoginItemsManager: LoginItemsManaging {
         for item in items {
             do {
                 try item.restart()
-                Logger.networkProtection.debug("🟢 Restarted successfully \(String(describing: item), privacy: .public)")
+                Logger.networkProtection.log("🟢 Restarted successfully \(String(describing: item), privacy: .public)")
             } catch let error as NSError {
                 handleError(for: item, action: .restart, error: error)
             }
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionTunnelController.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionTunnelController.swift
@@ -830,7 +830,7 @@ final class NetworkProtectionTunnelController: TunnelController, TunnelSessionPr
 
     private func fetchAuthToken() throws -> NSString? {
         if let accessToken = try? accessTokenStorage.getAccessToken() {
-            Logger.networkProtection.debug("🟢 TunnelController found token")
+            Logger.networkProtection.log("🟢 TunnelController found token")
             return Self.adaptAccessTokenForVPN(accessToken) as NSString?
         } else {
             Logger.networkProtection.error("TunnelController found no token")
diff --git a/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/MacPacketTunnelProvider.swift b/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/MacPacketTunnelProvider.swift
@@ -569,7 +569,7 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
         try super.loadVendorOptions(from: provider)
 
         guard let vendorOptions = provider?.providerConfiguration else {
-            Logger.networkProtection.debug("🔵 Provider is nil, or providerConfiguration is not set")
+            Logger.networkProtection.log("🔵 Provider is nil, or providerConfiguration is not set")
             throw ConfigurationError.missingProviderConfiguration
         }
 
@@ -578,7 +578,7 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
 
     private func loadDefaultPixelHeaders(from options: [String: Any]) throws {
         guard let defaultPixelHeaders = options[NetworkProtectionOptionKey.defaultPixelHeaders] as? [String: String] else {
-            Logger.networkProtection.debug("🔵 Pixel options are not set")
+            Logger.networkProtection.log("🔵 Pixel options are not set")
             throw ConfigurationError.missingPixelHeaders
         }
 
diff --git a/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/NetworkProtectionTokenStore+SubscriptionTokenKeychainStorage.swift b/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/NetworkProtectionTokenStore+SubscriptionTokenKeychainStorage.swift
@@ -33,7 +33,7 @@ extension NetworkProtectionKeychainTokenStore: SubscriptionTokenStoring {
         if token.hasPrefix("ddg:") {
             token = token.replacingOccurrences(of: "ddg:", with: "")
         }
-        Logger.networkProtection.debug("🟢 Wrapper successfully fetched token \(token)")
+        Logger.networkProtection.log("🟢 Wrapper successfully fetched token \(token)")
         return token
     }
 
diff --git a/DuckDuckGoNotifications/DuckDuckGoNotificationsAppDelegate.swift b/DuckDuckGoNotifications/DuckDuckGoNotificationsAppDelegate.swift
@@ -72,11 +72,11 @@ final class DuckDuckGoNotificationsAppDelegate: NSObject, NSApplicationDelegate
         Logger.networkProtection.info("Login item finished launching")
 
         startObservingVPNStatusChanges()
-        Logger.networkProtection.info("Login item listening")
+        Logger.networkProtection.log("Login item listening")
     }
 
     private func startObservingVPNStatusChanges() {
-        Logger.networkProtection.info("Register with sysex")
+        Logger.networkProtection.log("Register with sysex")
 
         distributedNotificationCenter.publisher(for: .showIssuesStartedNotification)
             .receive(on: DispatchQueue.main)
@@ -110,7 +110,7 @@ final class DuckDuckGoNotificationsAppDelegate: NSObject, NSApplicationDelegate
             }.store(in: &cancellables)
 
         distributedNotificationCenter.publisher(for: .serverSelected).sink { [weak self] _ in
-            Logger.networkProtection.info("Got notification: listener started")
+            Logger.networkProtection.log("Got notification: listener started")
             self?.notificationsPresenter.requestAuthorization()
         }.store(in: &cancellables)
 
diff --git a/DuckDuckGoVPN/DuckDuckGoVPNAppDelegate.swift b/DuckDuckGoVPN/DuckDuckGoVPNAppDelegate.swift
@@ -41,7 +41,7 @@ final class DuckDuckGoVPNApplication: NSApplication {
     private let _delegate: DuckDuckGoVPNAppDelegate
 
     override init() {
-        Logger.networkProtection.debug("🟢 Status Bar Agent starting\nPath: (\(Bundle.main.bundlePath, privacy: .public))\nVersion: \("\(Bundle.main.versionNumber!).\(Bundle.main.buildNumber)", privacy: .public)\nPID: \(NSRunningApplication.current.processIdentifier, privacy: .public)")
+        Logger.networkProtection.log("🟢 Status Bar Agent starting\nPath: (\(Bundle.main.bundlePath, privacy: .public))\nVersion: \("\(Bundle.main.versionNumber!).\(Bundle.main.buildNumber)", privacy: .public)\nPID: \(NSRunningApplication.current.processIdentifier, privacy: .public)")
 
         // prevent agent from running twice
         if let anotherInstance = NSRunningApplication.runningApplications(withBundleIdentifier: Bundle.main.bundleIdentifier!).first(where: { $0 != .current }) {
@@ -75,7 +75,7 @@ final class DuckDuckGoVPNApplication: NSApplication {
 
 #if DEBUG
         if accountManager.accessToken != nil {
-            Logger.networkProtection.debug("🟢 VPN Agent found token")
+            Logger.networkProtection.error("🟢 VPN Agent found token")
         } else {
             Logger.networkProtection.error("VPN Agent found no token")
         }
@@ -363,7 +363,7 @@ final class DuckDuckGoVPNAppDelegate: NSObject, NSApplicationDelegate {
     func applicationDidFinishLaunching(_ aNotification: Notification) {
 
         APIRequest.Headers.setUserAgent(UserAgent.duckDuckGoUserAgent())
-        Logger.networkProtection.info("DuckDuckGoVPN started")
+        Logger.networkProtection.log("DuckDuckGoVPN started")
 
         // Setup Remote Configuration
         Configuration.setURLProvider(VPNAgentConfigurationURLProvider())
diff --git a/LocalPackages/DataBrokerProtection/Package.swift b/LocalPackages/DataBrokerProtection/Package.swift
@@ -29,7 +29,7 @@ let package = Package(
             targets: ["DataBrokerProtection"])
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "200.1.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "200.1.1"),
         .package(path: "../SwiftUIExtensions"),
         .package(path: "../XPCHelper"),
     ],
diff --git a/LocalPackages/NetworkProtectionMac/Package.swift b/LocalPackages/NetworkProtectionMac/Package.swift
@@ -32,7 +32,7 @@ let package = Package(
         .library(name: "VPNAppLauncher", targets: ["VPNAppLauncher"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "200.1.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "200.1.1"),
         .package(url: "https://github.com/airbnb/lottie-spm", exact: "4.4.3"),
         .package(path: "../AppLauncher"),
         .package(path: "../UDSHelper"),
diff --git a/LocalPackages/SubscriptionUI/Package.swift b/LocalPackages/SubscriptionUI/Package.swift
@@ -12,7 +12,7 @@ let package = Package(
             targets: ["SubscriptionUI"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "200.1.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "200.1.1"),
         .package(path: "../SwiftUIExtensions")
     ],
     targets: [

Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,8 @@`
`32`	`32`	`"kind" : "remoteSourceControl",`
`33`	`33`	`"location" : "https://github.com/duckduckgo/BrowserServicesKit",`
`34`	`34`	`"state" : {`
`35`		`- "revision" : "65cfb8b60909be241d4b5d11c764c1eb3f174534",`
`36`		`- "version" : "200.1.0"`
	`35`	`+ "revision" : "75930fb1caa2790bd757221660b85a839d215f9f",`
	`36`	`+ "version" : "200.1.1"`
`37`	`37`	`}`
`38`	`38`	`},`
`39`	`39`	`{`
Original file line number	Diff line number	Diff line change
`@@ -569,7 +569,7 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {`
`569`	`569`	`try super.loadVendorOptions(from: provider)`
`570`	`570`
`571`	`571`	`guard let vendorOptions = provider?.providerConfiguration else {`
`572`		`- Logger.networkProtection.debug("🔵 Provider is nil, or providerConfiguration is not set")`
	`572`	`+ Logger.networkProtection.log("🔵 Provider is nil, or providerConfiguration is not set")`
`573`	`573`	`throw ConfigurationError.missingProviderConfiguration`
`574`	`574`	`}`
`575`	`575`
`@@ -578,7 +578,7 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {`
`578`	`578`
`579`	`579`	`private func loadDefaultPixelHeaders(from options: [String: Any]) throws {`
`580`	`580`	`guard let defaultPixelHeaders = options[NetworkProtectionOptionKey.defaultPixelHeaders] as? [String: String] else {`
`581`		`- Logger.networkProtection.debug("🔵 Pixel options are not set")`
	`581`	`+ Logger.networkProtection.log("🔵 Pixel options are not set")`
`582`	`582`	`throw ConfigurationError.missingPixelHeaders`
`583`	`583`	`}`
`584`	`584`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ extension NetworkProtectionKeychainTokenStore: SubscriptionTokenStoring {`
`33`	`33`	`if token.hasPrefix("ddg:") {`
`34`	`34`	`token = token.replacingOccurrences(of: "ddg:", with: "")`
`35`	`35`	`}`
`36`		`- Logger.networkProtection.debug("🟢 Wrapper successfully fetched token \(token)")`
	`36`	`+ Logger.networkProtection.log("🟢 Wrapper successfully fetched token \(token)")`
`37`	`37`	`return token`
`38`	`38`	`}`
`39`	`39`
-Original file line number
+Diff line change
         .library(name: "VPNAppLauncher", targets: ["VPNAppLauncher"]),
     ],
     dependencies: [
 -        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "200.1.0"),
 +        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "200.1.1"),
         .package(url: "https://github.com/airbnb/lottie-spm", exact: "4.4.3"),
         .package(path: "../AppLauncher"),
         .package(path: "../UDSHelper"),