Update analytics

Author: SubvertDev

Packages/Package.swift

@@ -162,6 +162,7 @@ let package = Package(
         .target(
             name: "AnalyticsClient",
             dependencies: [
+                "PersistenceKeys",
                 .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
                 .product(name: "Mixpanel", package: "mixpanel-swift"),
                 .product(name: "Sentry", package: "sentry-cocoa")

Packages/Sources/AnalyticsClient/AnalyticsClient.swift

@@ -7,13 +7,16 @@
 
 import Foundation
 import ComposableArchitecture
+import PersistenceKeys
 import Mixpanel
 import Sentry
 import OSLog
 
 @DependencyClient
 public struct AnalyticsClient: Sendable {
     public var configure: @Sendable () -> Void
+    public var identify: @Sendable (_ distinctId: String) -> Void
+    public var logout: @Sendable () -> Void
     public var log: @Sendable (any Event) -> Void
     public var capture: @Sendable (any Error) -> Void
 }
@@ -36,8 +39,16 @@ extension AnalyticsClient: DependencyKey {
                 configureMixpanel(id: analyticsId)
                 configureSentry(id: analyticsId)
             },
+            identify: { id in
+                logger.info("Identifying user with id: \(id)")
+                Mixpanel.mainInstance().identify(distinctId: id)
+            },
+            logout: {
+                logger.info("Analytics has been reset after logout")
+                Mixpanel.mainInstance().reset()
+            },
             log: { event in
-                logger.info("\(event.name) | \(event.properties ?? [:])")
+                logger.info("\(event.name) \(event.properties.map { "(\($0))" } ?? "")")
                 Mixpanel.mainInstance().track(event: event.name, properties: event.properties)
             },
             capture: { error in
@@ -49,6 +60,8 @@ extension AnalyticsClient: DependencyKey {
 
     public static let previewValue = Self(
         configure: {},
+        identify: { _ in },
+        logout: {},
         log: { event in
             if let properties = event.properties {
                 print("[Analytics] \(event.name) (\(properties))")
@@ -70,7 +83,6 @@ extension AnalyticsClient {
             trackAutomaticEvents: true, // FIXME: LEGACY, REMOVE. https://docs.mixpanel.com/docs/tracking-methods/sdks/swift#legacy-automatically-tracked-events
             optOutTrackingByDefault: isDebug
         )
-        Mixpanel.mainInstance().userId = id
     }
 
     private static func configureSentry(id: String) {
@@ -79,6 +91,7 @@ extension AnalyticsClient {
             options.debug = isDebug
             options.enabled = !isDebug
             options.tracesSampleRate = 1.0
+            options.profilesSampleRate = 1.0
             options.diagnosticLevel = .warning
             options.attachScreenshot = true
             options.attachViewHierarchy = true

Packages/Sources/AnalyticsClient/Events/Event.swift

@@ -12,7 +12,7 @@ public protocol Event {
     var properties: [String: String]? { get }
 }
 
-// RELEASE: Test if this works accurately
+// TODO: Test if this works accurately
 public func eventName(for object: Any) -> String {
     if let string = Mirror(reflecting: object).children.first?.label {
         return string.inProperCase
@@ -21,7 +21,7 @@ public func eventName(for object: Any) -> String {
     }
 }
 
-public extension String { // RELEASE: Move public or make private
+extension String { 
     var inProperCase: String {
         // Regular expressions to match different case styles
         let camelCasePattern = "([a-z0-9])([A-Z])"

Packages/Sources/AnalyticsClient/Events/MenuEvent.swift

@@ -15,15 +15,15 @@ public enum MenuEvent: Event {
     case changelogTelegramTapped
     case chatTelegramTapped
     case githubTapped
-    case _userSessionUpdated(Int?)
+    case userSessionUpdated(Int?)
 
     public var name: String {
         return "Menu " + eventName(for: self).inProperCase
     }
 
     public var properties: [String: String]? {
         switch self {
-        case let ._userSessionUpdated(userId):
+        case let .userSessionUpdated(userId):
             if let userId {
                 return ["userId": String(userId)]
             } else {

Packages/Sources/AnalyticsClient/Events/SettingsEvent.swift

@@ -14,15 +14,15 @@ public enum SettingsEvent: Event {
     case copyDebugIdTapped
     case clearCacheTapped
     case checkVersionsTapped
-    case _somethingWentWrong(any Error)
+    case somethingWentWrong(any Error)
 
     public var name: String {
         return "Settings " + eventName(for: self).inProperCase
     }
 
     public var properties: [String: String]? {
         switch self {
-        case let ._somethingWentWrong(error):
+        case let .somethingWentWrong(error):
             return ["error": error.localizedDescription]
         default:
             return nil

Packages/Sources/ArticlesListFeature/ArticlesListFeature.swift

@@ -102,7 +102,7 @@ public struct ArticlesListFeature: Sendable {
             case .onFirstAppear:
                 return .run { [offset = state.offset, amount = state.loadAmount] send in
                     do {
-                        await apiClient.setLogResponses(type: .full)
+                        await apiClient.setLogResponses(type: .none)
                         try await apiClient.connect()
                         let result = await Result { try await apiClient.getArticlesList(offset: offset, amount: amount) }
                         await send(._articlesResponse(result))

Packages/Sources/AuthFeature/Analytics/AuthFeature+Analytics.swift

@@ -34,6 +34,7 @@ extension AuthFeature {
 
                 case let .delegate(.loginSuccess(userId: userId)):
                     analyticsClient.log(AuthEvent.loginSuccess(userId))
+                    analyticsClient.identify(String(userId))
                 }
                 return .none
             }

Packages/Sources/ProfileFeature/Analytics/ProfileFeature+Analytics.swift

@@ -25,6 +25,7 @@ extension ProfileFeature {
 
                 case .logoutButtonTapped:
                     analyticsClient.log(ProfileEvent.logoutTapped)
+                    analyticsClient.logout()
 
                 case let ._userResponse(.success(user)):
                     analyticsClient.log(ProfileEvent.userLoaded(user.id))