For #7525 - Add telemetry for opening a top site in normal and privat…

…e mode and removing a top site
mozilla-mobile · Jan 21, 2020 · b0842c2 · b0842c2
1 parent 44f3654
commit b0842c2
Show file tree

Hide file tree

Showing 5 changed files with 185 additions and 130 deletions.
diff --git a/app/metrics.yaml b/app/metrics.yaml
@@ -1653,3 +1653,38 @@ search_suggestions:
     notification_emails:
      - [email protected]
     expires: "2020-09-01"
+
+top_sites:
+  open_in_new_tab:
+    type: event
+    description: >
+      A user opens a new tab based on a top site item
+    bugs:
+      - https://github.com/mozilla-mobile/fenix/issues/6757
+    data_reviews:
+      - https://github.com/mozilla-mobile/fenix/pull/7523
+    notification_emails:
+      - [email protected]
+    expires: "2020-09-01"
+  open_in_private_tab:
+    type: event
+    description: >
+      A user opens a new private tab based on a top site item
+    bugs:
+      - https://github.com/mozilla-mobile/fenix/issues/6757
+    data_reviews:
+      - https://github.com/mozilla-mobile/fenix/pull/7523
+    notification_emails:
+      - [email protected]
+    expires: "2020-09-01"
+  remove:
+    type: event
+    description: >
+      A user removes a top site item
+    bugs:
+      - https://github.com/mozilla-mobile/fenix/issues/6757
+    data_reviews:
+      - https://github.com/mozilla-mobile/fenix/pull/7523
+    notification_emails:
+      - [email protected]
+    expires: "2020-09-01"
diff --git a/app/src/main/java/org/mozilla/fenix/components/metrics/GleanMetricsService.kt b/app/src/main/java/org/mozilla/fenix/components/metrics/GleanMetricsService.kt
@@ -39,6 +39,7 @@ import org.mozilla.fenix.GleanMetrics.SyncAccount
 import org.mozilla.fenix.GleanMetrics.SyncAuth
 import org.mozilla.fenix.GleanMetrics.Tab
 import org.mozilla.fenix.GleanMetrics.ToolbarSettings
+import org.mozilla.fenix.GleanMetrics.TopSites
 import org.mozilla.fenix.GleanMetrics.TrackingProtection
 import org.mozilla.fenix.GleanMetrics.UserSpecifiedSearchEngines
 import org.mozilla.fenix.ext.components
@@ -452,6 +453,15 @@ private val Event.wrapper: EventWrapper<*>?
         is Event.CustomEngineDeleted -> EventWrapper<NoExtraKeys>(
             { UserSpecifiedSearchEngines.customEngineDeleted.record(it) }
         )
+        is Event.TopSiteOpenInNewTab -> EventWrapper<NoExtraKeys>(
+            { TopSites.openInNewTab.record(it) }
+        )
+        is Event.TopSiteOpenInPrivateTab -> EventWrapper<NoExtraKeys>(
+            { TopSites.openInPrivateTab.record(it) }
+        )
+        is Event.TopSiteRemoved -> EventWrapper<NoExtraKeys>(
+            { TopSites.remove.record(it) }
+        )
         // Don't record other events in Glean:
         is Event.AddBookmark -> null
         is Event.OpenedBookmark -> null

diff --git a/app/src/main/java/org/mozilla/fenix/components/metrics/Metrics.kt b/app/src/main/java/org/mozilla/fenix/components/metrics/Metrics.kt
@@ -126,6 +126,9 @@ sealed class Event {
     object NotificationDownloadTryAgain : Event()
     object NotificationMediaPlay : Event()
     object NotificationMediaPause : Event()
+    object TopSiteOpenInNewTab : Event()
+    object TopSiteOpenInPrivateTab : Event()
+    object TopSiteRemoved : Event()
     object TrackingProtectionTrackerList : Event()
     object TrackingProtectionIconPressed : Event()
     object TrackingProtectionSettingsPanel : Event()

diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt
@@ -260,6 +260,7 @@ class DefaultSessionControlController(
     }
 
     override fun handleOpenInPrivateTabClicked(topSite: TopSite) {
+        metrics.track(Event.TopSiteOpenInPrivateTab)
         with(activity) {
             browsingModeManager.mode = BrowsingMode.Private
             openToBrowserAndLoad(
@@ -288,6 +289,8 @@ class DefaultSessionControlController(
     }
 
     override fun handleRemoveTopSiteClicked(topSite: TopSite) {
+        metrics.track(Event.TopSiteRemoved)
+
         lifecycleScope.launch(Dispatchers.IO) {
             topSiteStorage.removeTopSite(topSite)
         }
@@ -336,6 +339,7 @@ class DefaultSessionControlController(
     }
 
     override fun handleSelectTopSite(url: String) {
+        metrics.track(Event.TopSiteOpenInNewTab)
         activity.components.useCases.tabsUseCases.addTab.invoke(url, true, true)
         navController.nav(
             R.id.homeFragment,