Added FXIOS-7559 [v121] health metrics telemetry (backport #17844) (#…

…17864) * Added FXIOS-7559 [v121] health metrics telemetry (#17844) * Add crashed last launch metric * Add cpu exception telemetry * Add hang exception * Update link * Fix warning * Update links (cherry picked from commit 0898ac8) # Conflicts: # Client/Telemetry/TelemetryWrapper.swift # Client/metrics.yaml * Fix conflicts --------- Co-authored-by: OrlaM <[email protected]> Co-authored-by: Laurie Marceau <[email protected]>
mozilla-mobile · Jan 1, 2024 · 06ec6e3 · 06ec6e3
1 parent 6606641
commit 06ec6e3
Show file tree

Hide file tree

Showing 5 changed files with 125 additions and 2 deletions.
diff --git a/Client/Application/AppLaunchUtil.swift b/Client/Application/AppLaunchUtil.swift
@@ -31,7 +31,7 @@ class AppLaunchUtil {
         }
 
         TelemetryWrapper.shared.setup(profile: profile)
-        recordUserPrefsTelemetry()
+        recordStartUpTelemetry()
 
         // Need to get "settings.sendUsageData" this way so that Sentry can be initialized before getting the Profile.
         let sendUsageData = NSUserDefaultsPrefs(prefix: "profile").boolForKey(AppConstants.prefSendUsageData) ?? true
@@ -191,12 +191,19 @@ class AppLaunchUtil {
         }
     }
 
-    private func recordUserPrefsTelemetry() {
+    private func recordStartUpTelemetry() {
         let isEnabled: Bool = (profile.prefs.boolForKey(PrefsKeys.UserFeatureFlagPrefs.SponsoredShortcuts) ?? true) &&
                                (profile.prefs.boolForKey(PrefsKeys.UserFeatureFlagPrefs.TopSiteSection) ?? true)
         TelemetryWrapper.recordEvent(category: .information,
                                      method: .view,
                                      object: .sponsoredShortcuts,
                                      extras: [TelemetryWrapper.EventExtraKey.preference.rawValue: isEnabled])
+
+        if logger.crashedLastLaunch {
+            TelemetryWrapper.recordEvent(category: .information,
+                                         method: .error,
+                                         object: .app,
+                                         value: .crashedLastLaunch)
+        }
     }
 }
diff --git a/Client/Telemetry/MetricKit/MetricKitWrapper.swift b/Client/Telemetry/MetricKit/MetricKitWrapper.swift
@@ -25,6 +25,12 @@ class MetricKitWrapper: NSObject, MXMetricManagerSubscriber {
             payload.diskWriteExceptionDiagnostics?.forEach({ exception in
                 self.handleDiskWriteException(exception)
             })
+            payload.cpuExceptionDiagnostics?.forEach({ exception in
+                self.handleCPUException(exception)
+            })
+            payload.hangDiagnostics?.forEach({ exception in
+                self.handleHangException(exception)
+            })
         }
     }
 
@@ -37,4 +43,24 @@ class MetricKitWrapper: NSObject, MXMetricManagerSubscriber {
                                      value: .largeFileWrite,
                                      extras: eventExtra)
     }
+
+    private func handleCPUException(_ exception: MXCPUExceptionDiagnostic) {
+        let size = Int32(measurementFormatter.string(from: exception.totalCPUTime)) ?? -1
+        let eventExtra = [TelemetryWrapper.EventExtraKey.size.rawValue: size]
+        telemetryWrapper.recordEvent(category: .information,
+                                     method: .error,
+                                     object: .app,
+                                     value: .cpuException,
+                                     extras: eventExtra)
+    }
+
+    private func handleHangException(_ exception: MXHangDiagnostic) {
+        let size = Int32(measurementFormatter.string(from: exception.hangDuration)) ?? -1
+        let eventExtra = [TelemetryWrapper.EventExtraKey.size.rawValue: size]
+        telemetryWrapper.recordEvent(category: .information,
+                                     method: .error,
+                                     object: .app,
+                                     value: .hangException,
+                                     extras: eventExtra)
+    }
 }
diff --git a/Client/Telemetry/TelemetryWrapper.swift b/Client/Telemetry/TelemetryWrapper.swift
@@ -657,6 +657,9 @@ extension TelemetryWrapper {
         case shoppingCFRsDisplayed = "shopping-cfrs-displayed"
         case awesomebarShareTap = "awesomebar-share-tap"
         case largeFileWrite = "large-file-write"
+        case crashedLastLaunch = "crashed_last_launch"
+        case cpuException = "cpu_exception"
+        case hangException = "hang-exception"
     }
 
     public enum EventExtraKey: String, CustomStringConvertible {
@@ -1807,6 +1810,18 @@ extension TelemetryWrapper {
                 let properties = GleanMetrics.AppErrors.LargeFileWriteExtra(size: quantity)
                 GleanMetrics.AppErrors.largeFileWrite.record(properties)
             }
+        case(.information, .error, .app, .crashedLastLaunch, _):
+            GleanMetrics.AppErrors.crashedLastLaunch.record()
+        case(.information, .error, .app, .cpuException, let extras):
+            if let quantity = extras?[EventExtraKey.size.rawValue] as? Int32 {
+                let properties = GleanMetrics.AppErrors.CpuExceptionExtra(size: quantity)
+                GleanMetrics.AppErrors.cpuException.record(properties)
+            }
+        case(.information, .error, .app, .hangException, let extras):
+            if let quantity = extras?[EventExtraKey.size.rawValue] as? Int32 {
+                let properties = GleanMetrics.AppErrors.HangExceptionExtra(size: quantity)
+                GleanMetrics.AppErrors.hangException.record(properties)
+            }
         default:
             recordUninstrumentedMetrics(category: category, method: method, object: object, value: value, extras: extras)
         }

diff --git a/Client/metrics.yaml b/Client/metrics.yaml
@@ -4689,3 +4689,46 @@ app_errors:
     notification_emails:
       - [email protected]
     expires: never
+  crashed_last_launch:
+    type: event
+    description: |
+      Recorded when the previous session ended as a result of a crash
+    bugs:
+      - https://github.com/mozilla-mobile/firefox-ios/issues/16827
+    data_reviews:
+      - https://github.com/mozilla-mobile/firefox-ios/pull/17844
+    notification_emails:
+      - [email protected]
+    expires: never
+  cpu_exception:
+    type: event
+    description: |
+      Recorded when a cpu exception is triggered
+    extra_keys:
+      size:
+        description: |
+          Total CPU time consumed in the scope of the exception
+        type: quantity
+    bugs:
+      - https://github.com/mozilla-mobile/firefox-ios/issues/16828
+    data_reviews:
+      - https://github.com/mozilla-mobile/firefox-ios/pull/17844
+    notification_emails:
+      - [email protected]
+    expires: never
+  hang_exception:
+    type: event
+    description: |
+      Recorded when the main thread hangs
+    extra_keys:
+      size:
+        description: |
+          Total time the main thread was blocked
+        type: quantity
+    bugs:
+      - https://github.com/mozilla-mobile/firefox-ios/issues/16829
+    data_reviews:
+      - https://github.com/mozilla-mobile/firefox-ios/pull/17844
+    notification_emails:
+      - [email protected]
+    expires: never
diff --git a/firefox-ios/Tests/ClientTests/TelemetryWrapperTests.swift b/firefox-ios/Tests/ClientTests/TelemetryWrapperTests.swift
@@ -844,6 +844,38 @@ class TelemetryWrapperTests: XCTestCase {
 
         testEventMetricRecordingSuccess(metric: GleanMetrics.AppErrors.largeFileWrite)
     }
+
+    func test_error_crashedLastLaunchIsCalled() {
+        TelemetryWrapper.recordEvent(category: .information,
+                                     method: .error,
+                                     object: .app,
+                                     value: .crashedLastLaunch)
+
+        testEventMetricRecordingSuccess(metric: GleanMetrics.AppErrors.crashedLastLaunch)
+    }
+
+    func test_error_cpuExceptionIsCalled() {
+        let eventExtra = [TelemetryWrapper.EventExtraKey.size.rawValue: Int32(1000)]
+        TelemetryWrapper.recordEvent(category: .information,
+                                     method: .error,
+                                     object: .app,
+                                     value: .cpuException,
+                                     extras: eventExtra)
+
+        testEventMetricRecordingSuccess(metric: GleanMetrics.AppErrors.cpuException)
+    }
+
+    func test_error_hangExceptionIsCalled() {
+        let eventExtra = [TelemetryWrapper.EventExtraKey.size.rawValue: Int32(1000)]
+        TelemetryWrapper.recordEvent(category: .information,
+                                     method: .error,
+                                     object: .app,
+                                     value: .hangException,
+                                     extras: eventExtra)
+
+        testEventMetricRecordingSuccess(metric: GleanMetrics.AppErrors.hangException)
+    }
+
     // MARK: - RecordSearch
     func test_RecordSearch_GleanIsCalledSearchSuggestion() {
         let extras = [TelemetryWrapper.EventExtraKey.recordSearchLocation.rawValue: "suggestion",