feat(apple): Set account slug from Swift -> Rust to hydrate Sentry with (#7662)

- Refactor Telemetry module to expose firezoneId and accountSlug for
easier access in the Adapter module
- Set accountSlug to WrappedSession.connect for hydrating the Rust
sentry context

rust/connlib/clients/apple/src/lib.rs

@@ -57,6 +57,7 @@ mod ffi {
             api_url: String,
             token: String,
             device_id: String,
+            account_slug: String,
             device_name_override: Option<String>,
             os_version_override: Option<String>,
             log_dir: String,
@@ -236,6 +237,7 @@ impl WrappedSession {
         api_url: String,
         token: String,
         device_id: String,
+        account_slug: String,
         device_name_override: Option<String>,
         os_version_override: Option<String>,
         log_dir: String,
@@ -246,6 +248,7 @@ impl WrappedSession {
         let mut telemetry = Telemetry::default();
         telemetry.start(&api_url, RELEASE, APPLE_DSN);
         telemetry.set_firezone_id(device_id.clone());
+        telemetry.set_account_slug(account_slug);
 
         init_logging(log_dir.into(), log_filter)?;
         install_rustls_crypto_provider();

swift/apple/Firezone/Application/FirezoneApp.swift

@@ -86,7 +86,7 @@ struct FirezoneApp: App {
         let id = try await FirezoneId.createIfMissing()
 
         // Hydrate telemetry userId with our firezone id
-        Telemetry.setFirezoneId(id.uuid.uuidString)
+        Telemetry.firezoneId = id.uuid.uuidString
       }
 
       if let store = store {

swift/apple/FirezoneKit/Sources/FirezoneKit/Helpers/Telemetry.swift

@@ -11,8 +11,26 @@ public enum Telemetry {
   // the existing one. So we need to collect these fields from various codepaths
   // during initialization / sign in so we can build a new User object any time
   // one of these is updated.
-  private static var userId: String?
-  private static var accountSlug: String?
+  private static var _firezoneId: String?
+  private static var _accountSlug: String?
+  public static var firezoneId: String? {
+    set {
+      self._firezoneId = newValue
+      updateUser(id: self._firezoneId, slug: self._accountSlug)
+    }
+    get {
+      return self._firezoneId
+    }
+  }
+  public static var accountSlug: String? {
+    set {
+      self._accountSlug = newValue
+      updateUser(id: self._firezoneId, slug: self._accountSlug)
+    }
+    get {
+      return self._accountSlug
+    }
+  }
 
   public static func start() {
     SentrySDK.start { options in
@@ -53,27 +71,17 @@ public enum Telemetry {
     SentrySDK.capture(error: err)
   }
 
-  public static func setFirezoneId(_ id: String?) {
-    self.userId = id
-    updateUser()
-  }
-
-  public static func setAccountSlug(_ slug: String?) {
-    self.accountSlug = slug
-    updateUser()
-  }
-
-  private static func updateUser() {
-    guard let userId,
-          let accountSlug
+  private static func updateUser(id: String?, slug: String?) {
+    guard let id,
+          let slug
     else {
       return
     }
 
     SentrySDK.configureScope { configuration in
       // Matches the format we use in rust/telemetry/lib.rs
-      let user = User(userId: userId)
-      user.data = ["account_slug": accountSlug]
+      let user = User(userId: id)
+      user.data = ["account_slug": slug]
 
       configuration.setUser(user)
     }

swift/apple/FirezoneKit/Sources/FirezoneKit/Managers/TunnelManager.swift

@@ -190,9 +190,7 @@ public class TunnelManager {
 
           // Configure our Telemetry environment
           Telemetry.setEnvironmentOrClose(settings.apiURL)
-          Telemetry.setAccountSlug(
-            providerConfiguration[TunnelManagerKeys.accountSlug]
-          )
+          Telemetry.accountSlug = providerConfiguration[TunnelManagerKeys.accountSlug]
 
           // Share what we found with our caller
           callback(status, settings, actorName)

swift/apple/FirezoneNetworkExtension/Adapter.swift

@@ -137,14 +137,13 @@ class Adapter {
       let jsonEncoder = JSONEncoder()
       jsonEncoder.keyEncodingStrategy = .convertToSnakeCase
 
-      let firezoneId = try await FirezoneId.load()
-
       // Grab a session pointer
       let session =
         try WrappedSession.connect(
           apiURL,
           "\(token)",
-          "\(firezoneId!)",
+          "\(Telemetry.firezoneId!)",
+          "\(Telemetry.accountSlug!)",
           DeviceMetadata.getDeviceName(),
           DeviceMetadata.getOSVersion(),
           connlibLogFolderPath,

swift/apple/FirezoneNetworkExtension/PacketTunnelProvider.swift

@@ -48,7 +48,7 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
         let id = try await FirezoneId.createIfMissing()
 
         // Hydrate the telemetry userId with our firezone id
-        Telemetry.setFirezoneId(id.uuid.uuidString)
+        Telemetry.firezoneId = id.uuid.uuidString
 
         let passedToken = options?["token"] as? String
         let keychainToken = try await Token.load()
@@ -87,9 +87,7 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
         }
 
         // Hydrate telemetry account slug
-        Telemetry.setAccountSlug(
-          providerConfiguration[TunnelManagerKeys.accountSlug]
-        )
+        Telemetry.accountSlug = providerConfiguration[TunnelManagerKeys.accountSlug]
 
         let internetResourceEnabled: Bool = if let internetResourceEnabledJSON = providerConfiguration[TunnelManagerKeys.internetResourceEnabled]?.data(using: .utf8) {
           (try? JSONDecoder().decode(Bool.self, from: internetResourceEnabledJSON )) ?? false