For #10343: Updates metrics accordingly to 'Library' removal

4 years ago · 15dfe0811d
parent b2e5820364
commit 15dfe0811d
4 changed files with 4 additions and 65 deletions
--- a/app/metrics.yaml
+++ b/app/metrics.yaml
@ -89,10 +89,10 @@ events:
          A string containing the name of the item the user tapped. These items
          include:

-            Settings, Library, Help, Desktop Site toggle on/off, Find in Page,
+            Settings, Help, Desktop Site toggle on/off, Find in Page,
            New Tab, Private Tab, Share, Report Site Issue, Back/Forward button,
            Reload Button, Quit, Reader Mode On, Reader Mode Off, Open In app,
-            Add To Top Sites, Add-ons Manager
+            Add To Top Sites, Add-ons Manager, Bookmarks, History
    bugs:
      - https://github.com/mozilla-mobile/fenix/issues/1024
    data_reviews:
@ -808,44 +808,6 @@ qr_scanner:
      - fenix-core@mozilla.com
    expires: "2020-09-01"

-library:
-  opened:
-    type: event
-    description: |
-      A user opened the library
-    bugs:
-      - https://github.com/mozilla-mobile/fenix/issues/976
-    data_reviews:
-      - https://github.com/mozilla-mobile/fenix/pull/2538#issuecomment-492830242
-    notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2020-09-01"
-  closed:
-    type: event
-    description: |
-      A user closed the library
-    bugs:
-      - https://github.com/mozilla-mobile/fenix/issues/976
-    data_reviews:
-      - https://github.com/mozilla-mobile/fenix/pull/2538#issuecomment-492830242
-    notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2020-09-01"
-  selected_item:
-    type: event
-    description: |
-      A user selected a library item
-    extra_keys:
-      item:
-        description: "The library item the user selected"
-    bugs:
-      - https://github.com/mozilla-mobile/fenix/issues/976
-    data_reviews:
-      - https://github.com/mozilla-mobile/fenix/pull/2538#issuecomment-492830242
-    notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2020-09-01"
-
 error_page:
  visited_error:
    type: event
--- a/app/src/main/java/org/mozilla/fenix/components/metrics/GleanMetricsService.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/metrics/GleanMetricsService.kt
@ -22,7 +22,6 @@ import org.mozilla.fenix.GleanMetrics.ErrorPage
 import org.mozilla.fenix.GleanMetrics.Events
 import org.mozilla.fenix.GleanMetrics.FindInPage
 import org.mozilla.fenix.GleanMetrics.History
-import org.mozilla.fenix.GleanMetrics.Library
 import org.mozilla.fenix.GleanMetrics.Logins
 import org.mozilla.fenix.GleanMetrics.MediaNotification
 import org.mozilla.fenix.GleanMetrics.MediaState
@ -213,16 +212,6 @@ private val Event.wrapper: EventWrapper<*>?
        is Event.QRScannerNavigationDenied -> EventWrapper<NoExtraKeys>(
            { QrScanner.navigationDenied.record(it) }
        )
-        is Event.LibraryOpened -> EventWrapper<NoExtraKeys>(
-            { Library.opened.record(it) }
-        )
-        is Event.LibraryClosed -> EventWrapper<NoExtraKeys>(
-            { Library.closed.record(it) }
-        )
-        is Event.LibrarySelectedItem -> EventWrapper(
-            { Library.selectedItem.record(it) },
-            { Library.selectedItemKeys.valueOf(it) }
-        )
        is Event.ErrorPageVisited -> EventWrapper(
            { ErrorPage.visitedError.record(it) },
            { ErrorPage.visitedErrorKeys.valueOf(it) }
--- a/app/src/main/java/org/mozilla/fenix/components/metrics/Metrics.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/metrics/Metrics.kt
@ -29,7 +29,6 @@ import org.mozilla.fenix.GleanMetrics.ContextMenu
 import org.mozilla.fenix.GleanMetrics.CrashReporter
 import org.mozilla.fenix.GleanMetrics.ErrorPage
 import org.mozilla.fenix.GleanMetrics.Events
-import org.mozilla.fenix.GleanMetrics.Library
 import org.mozilla.fenix.GleanMetrics.Logins
 import org.mozilla.fenix.GleanMetrics.SearchShortcuts
 import org.mozilla.fenix.GleanMetrics.Tip
@ -67,8 +66,6 @@ sealed class Event {
    object QRScannerPromptDisplayed : Event()
    object QRScannerNavigationAllowed : Event()
    object QRScannerNavigationDenied : Event()
-    object LibraryOpened : Event()
-    object LibraryClosed : Event()
    object SyncAuthOpened : Event()
    object SyncAuthClosed : Event()
    object SyncAuthSignUp : Event()
@ -267,12 +264,6 @@ sealed class Event {
            )
    }

-    data class LibrarySelectedItem(val item: LibraryItem) : Event() {
-        enum class LibraryItem { BOOKMARKS, HISTORY }
-        override val extras: Map<Library.selectedItemKeys, String>?
-            get() = mapOf(Library.selectedItemKeys.item to item.name)
-    }
-
    data class ErrorPageVisited(val errorType: ErrorType) : Event() {
        override val extras: Map<ErrorPage.visitedErrorKeys, String>?
            get() = mapOf(ErrorPage.visitedErrorKeys.errorType to errorType.name)
@ -408,7 +399,7 @@ sealed class Event {

    data class BrowserMenuItemTapped(val item: Item) : Event() {
        enum class Item {
-            SETTINGS, LIBRARY, HELP, DESKTOP_VIEW_ON, DESKTOP_VIEW_OFF, FIND_IN_PAGE, NEW_TAB,
+            SETTINGS, HELP, DESKTOP_VIEW_ON, DESKTOP_VIEW_OFF, FIND_IN_PAGE, NEW_TAB,
            NEW_PRIVATE_TAB, SHARE, REPORT_SITE_ISSUE, BACK, FORWARD, RELOAD, STOP, OPEN_IN_FENIX,
            SAVE_TO_COLLECTION, ADD_TO_TOP_SITES, ADD_TO_HOMESCREEN, QUIT, READER_MODE_ON,
            READER_MODE_OFF, OPEN_IN_APP, BOOKMARK, READER_MODE_APPEARANCE, ADDONS_MANAGER,
--- a/docs/metrics.md
+++ b/docs/metrics.md
@ -113,7 +113,7 @@ The following metrics are added to the ping:
 | download_notification.try_again |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user tapped on try again when a download fails in the download notification  |[1](https://github.com/mozilla-mobile/fenix/pull/6554)||2020-09-01 |
 | error_page.visited_error |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user encountered an error page  |[1](https://github.com/mozilla-mobile/fenix/pull/2491#issuecomment-492414486)|<ul><li>error_type: The error type of the error page encountered</li></ul>|2020-09-01 |
 | events.app_opened |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user opened the app  |[1](https://github.com/mozilla-mobile/fenix/pull/1067#issuecomment-474598673)|<ul><li>source: The method used to open Fenix. Possible values are: `app_icon`, `custom_tab` or `link` </li></ul>|2020-09-01 |
-| events.browser_menu_action |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A browser menu item was tapped  |[1](https://github.com/mozilla-mobile/fenix/pull/1214#issue-264756708), [2](https://github.com/mozilla-mobile/fenix/pull/5098#issuecomment-529658996), [3](https://github.com/mozilla-mobile/fenix/pull/6310)|<ul><li>item: A string containing the name of the item the user tapped. These items include:    Settings, Library, Help, Desktop Site toggle on/off, Find in Page,   New Tab, Private Tab, Share, Report Site Issue, Back/Forward button,   Reload Button, Quit, Reader Mode On, Reader Mode Off, Open In app,   Add To Top Sites, Add-ons Manager </li></ul>|2020-09-01 |
+| events.browser_menu_action |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A browser menu item was tapped  |[1](https://github.com/mozilla-mobile/fenix/pull/1214#issue-264756708), [2](https://github.com/mozilla-mobile/fenix/pull/5098#issuecomment-529658996), [3](https://github.com/mozilla-mobile/fenix/pull/6310)|<ul><li>item: A string containing the name of the item the user tapped. These items include:    Settings, Help, Desktop Site toggle on/off, Find in Page,   New Tab, Private Tab, Share, Report Site Issue, Back/Forward button,   Reload Button, Quit, Reader Mode On, Reader Mode Off, Open In app,   Add To Top Sites, Add-ons Manager, Bookmarks, History </li></ul>|2020-09-01 |
 | events.entered_url |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user entered a url  |[1](https://github.com/mozilla-mobile/fenix/pull/1067#issuecomment-474598673)|<ul><li>autocomplete: A boolean that tells us whether the URL was autofilled by an Autocomplete suggestion </li></ul>|2020-09-01 |
 | events.opened_link |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user opened a link with Fenix  |[1](https://github.com/mozilla-mobile/fenix/pull/5975)|<ul><li>mode: The mode the link was opened in. Either 'PRIVATE' or 'NORMAL'. </li></ul>|2020-09-01 |
 | events.performed_search |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user performed a search  |[1](https://github.com/mozilla-mobile/fenix/pull/1067#issuecomment-474598673), [2](https://github.com/mozilla-mobile/fenix/pull/1677)|<ul><li>source: A string that tells us how the user performed the search. Possible values are:  * default.action * default.suggestion * shortcut.action * shortcut.suggestion </li></ul>|2020-09-01 |
@ -128,9 +128,6 @@ The following metrics are added to the ping:
 | history.removed |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user removed a history item  |[1](https://github.com/mozilla-mobile/fenix/pull/3940)||2020-09-01 |
 | history.removed_all |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user removed all history items  |[1](https://github.com/mozilla-mobile/fenix/pull/3940)||2020-09-01 |
 | history.shared |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user shared a history item  |[1](https://github.com/mozilla-mobile/fenix/pull/3940)||2020-09-01 |
-| library.closed |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user closed the library  |[1](https://github.com/mozilla-mobile/fenix/pull/2538#issuecomment-492830242)||2020-09-01 |
-| library.opened |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user opened the library  |[1](https://github.com/mozilla-mobile/fenix/pull/2538#issuecomment-492830242)||2020-09-01 |
-| library.selected_item |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user selected a library item  |[1](https://github.com/mozilla-mobile/fenix/pull/2538#issuecomment-492830242)|<ul><li>item: The library item the user selected</li></ul>|2020-09-01 |
 | logins.copy_login |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user copied a piece of a login in saved logins  |[1](https://github.com/mozilla-mobile/fenix/pull/6352)||2020-09-01 |
 | logins.open_individual_login |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user accessed an individual login in saved logins  |[1](https://github.com/mozilla-mobile/fenix/pull/6352)||2020-09-01 |
 | logins.open_logins |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user accessed Logins in Settings  |[1](https://github.com/mozilla-mobile/fenix/pull/6352)||2020-09-01 |