Cleaning up telemetry

Author: lmarceau

firefox-ios/Client/Glean/probes/metrics.yaml

@@ -1450,27 +1450,6 @@ firefox_home_page:
     notification_emails:
       - [email protected]
     expires: "2026-01-01"
-  recently_saved_bookmark_view:
-    type: event
-    description: |
-      Counts the number of bookmarked items appearing
-      in the Recently Saved section on the home page.
-    extra_keys:
-      bookmark_count:
-        type: string
-        description: |
-          The number of bookmarked items in the
-          Recently Saved section.
-    bugs:
-      - https://github.com/mozilla-mobile/firefox-ios/pull/8656
-    data_reviews:
-      - https://github.com/mozilla-mobile/firefox-ios/pull/8656
-      - https://github.com/mozilla-mobile/firefox-ios/pull/9673
-      - https://github.com/mozilla-mobile/firefox-ios/pull/12334
-      - https://github.com/mozilla-mobile/firefox-ios/pull/14102
-    notification_emails:
-      - [email protected]
-    expires: "2026-01-01"
   reading_list_view:
     type: event
     description: |
@@ -1751,24 +1730,6 @@ firefox_home_page:
     notification_emails:
       - [email protected]
     expires: "2026-01-01"
-  firefox_homepage_origin:
-    type: labeled_counter
-    description: |
-      The number of times a user sees the Firefox Homepage,
-      with a home page origin.
-    labels:
-      - zero-search
-      - origin-other
-    bugs:
-      - https://github.com/mozilla-mobile/firefox-ios/pull/9494
-    data_reviews:
-      - https://github.com/mozilla-mobile/firefox-ios/pull/9494
-      - https://github.com/mozilla-mobile/firefox-ios/pull/9673
-      - https://github.com/mozilla-mobile/firefox-ios/pull/12334
-      - https://github.com/mozilla-mobile/firefox-ios/pull/14102
-    notification_emails:
-      - [email protected]
-    expires: "2026-01-01"
   pocket_stories_visible:
     type: boolean
     description: |

firefox-ios/Client/Telemetry/HomepageTelemetry.swift

@@ -33,6 +33,11 @@ struct HomepageTelemetry {
         }
     }
 
+    private enum EventValue: String {
+        case fxHomepageOriginZeroSearch = "zero-search"
+        case fxHomepageOriginOther = "origin-other"
+    }
+
     private let gleanWrapper: GleanWrapper
     init(gleanWrapper: GleanWrapper = DefaultGleanWrapper()) {
         self.gleanWrapper = gleanWrapper
@@ -69,7 +74,7 @@ struct HomepageTelemetry {
     }
 
     func sendTopSitesPressedEvent(position: Int, tileType: String, isZeroSearch: Bool) {
-        let originExtra: TelemetryWrapper.EventValue = isZeroSearch ? .fxHomepageOriginZeroSearch : .fxHomepageOriginOther
+        let originExtra: EventValue = isZeroSearch ? .fxHomepageOriginZeroSearch : .fxHomepageOriginOther
         gleanWrapper.incrementLabeledCounter(
             for: GleanMetrics.TopSites.pressedTileOrigin,
             label: originExtra.rawValue
@@ -82,7 +87,7 @@ struct HomepageTelemetry {
 
     // MARK: - Pocket
     func sendTapOnPocketStoryCounter(position: Int, isZeroSearch: Bool) {
-        let originExtra: TelemetryWrapper.EventValue = isZeroSearch ? .fxHomepageOriginZeroSearch : .fxHomepageOriginOther
+        let originExtra: EventValue = isZeroSearch ? .fxHomepageOriginZeroSearch : .fxHomepageOriginOther
         gleanWrapper.incrementLabeledCounter(for: GleanMetrics.Pocket.openStoryOrigin, label: originExtra.rawValue)
         gleanWrapper.incrementLabeledCounter(for: GleanMetrics.Pocket.openStoryPosition, label: "position-\(position)")
     }

firefox-ios/Client/Telemetry/TelemetryWrapper.swift

@@ -489,13 +489,9 @@ extension TelemetryWrapper {
         case mediumQuickActionCopiedLink = "medium-quick-action-copied-link"
         case mediumQuickActionClosePrivate = "medium-quick-action-close-private"
         case mediumTopSitesWidget = "medium-top-sites-widget"
-        case topSiteTile = "top-site-tile"
-        case topSiteContextualMenu = "top-site-contextual-menu"
-        case pocketStory = "pocket-story"
-        case pocketSectionImpression = "pocket-section-impression"
         // MARK: - App menu
-        case homePageMenu = "homepage-menu"
-        case siteMenu = "site-menu"
+        case homePageMenu = "homepage-menu" // Legacy photon menu
+        case siteMenu = "site-menu" // Legacy photon menu
         case home = "home-page"
         case blockImagesEnabled = "block-images-enabled"
         case blockImagesDisabled = "block-images-disabled"
@@ -533,12 +529,8 @@ extension TelemetryWrapper {
         case requestMobileSite = "request-mobile-site"
         case pinToTopSites = "pin-to-top-sites"
         case removePinnedSite = "remove-pinned-site"
-        case firefoxHomepage = "firefox-homepage"
         case wallpaperSettings = "wallpaper-settings"
         case contextualHint = "contextual-hint"
-        case jumpBackInTileImpressions = "jump-back-in-tile-impressions"
-        case syncedTabTileImpressions = "synced-tab-tile-impressions"
-        case bookmarkImpressions = "bookmark-impressions"
         case reload = "reload"
         case reloadFromUrlBar = "reload-from-url-bar"
         case fxaLoginWebpage = "fxa-login-webpage"
@@ -562,9 +554,6 @@ extension TelemetryWrapper {
         case activityStream = "activity-stream"
         case appIcon = "app-icon"
         case appMenu = "app-menu"
-        case bookmarkItemAction = "bookmark-item-action"
-        case bookmarkSectionShowAll = "bookmark-section-show-all"
-        case bookmarkItemView = "bookmark-item-view"
         case browser = "browser"
         case contextMenu = "context-menu"
         case downloadCompleteToast = "download-complete-toast"
@@ -598,23 +587,12 @@ extension TelemetryWrapper {
         case downloadsPanel = "downloads-panel"
         case syncPanel = "sync-panel"
         case yourLibrarySection = "your-library-section"
-        case jumpBackInSectionShowAll = "jump-back-in-section-show-all"
         case jumpBackInSectionTabOpened = "jump-back-in-section-tab-opened"
-        case jumpBackInSectionGroupOpened = "jump-back-in-section-group-opened"
-        case jumpBackInSectionSyncedTabShowAll = "jump-back-in-section-synced-tab-show-all"
-        case jumpBackInSectionSyncedTabOpened = "jump-back-in-section-synced-tab-opened"
-        case topSite = "top-site"
-        case pocketSite = "pocket-site"
-        case customizeHomepageButton = "customize-homepage-button"
         case wallpaperSelected = "wallpaper-selected"
         case dismissCFRFromButton = "dismiss-cfr-from-button"
         case dismissCFRFromOutsideTap = "dismiss-cfr-from-outside-tap"
         case pressCFRActionButton = "press-cfr-action-button"
-        case fxHomepageOrigin = "firefox-homepage-origin"
-        case fxHomepageOriginZeroSearch = "zero-search"
-        case fxHomepageOriginOther = "origin-other"
         case addBookmarkToast = "add-bookmark-toast"
-        case openHomeFromAwesomebar = "open-home-from-awesomebar"
         case openHomeFromPhotonMenuButton = "open-home-from-photon-menu-button"
         case openRecentlyClosedTab = "openRecentlyClosedTab"
         case closeGroupedTab = "recordCloseGroupedTab"
@@ -644,11 +622,6 @@ extension TelemetryWrapper {
         case isDefaultBrowser = "is-default-browser"
         case didComeFromBrowserChoiceScreen = "did-come-from-browser-choice-screen"
 
-        case topSitePosition = "tilePosition"
-        case topSiteTileType = "tileType"
-        case contextualMenuType = "contextualMenuType"
-        case pocketTilePosition = "pocketTilePosition"
-        case fxHomepageOrigin = "fxHomepageOrigin"
         case tabsQuantity = "tabsQuantity"
         case recordSearchLocation = "recordSearchLocation"
         case recordSearchEngineID = "recordSearchEngineID"
@@ -793,26 +766,6 @@ extension TelemetryWrapper {
         case(.action, .swipe, .historySingleItemRemoved, _, _):
             GleanMetrics.History.removed.record()
 
-        // MARK: Top Site
-        case (.action, .tap, .topSiteTile, _, let extras):
-            if let homePageOrigin = extras?[EventExtraKey.fxHomepageOrigin.rawValue] as? String {
-                GleanMetrics.TopSites.pressedTileOrigin[homePageOrigin].add()
-            }
-
-            if let position = extras?[EventExtraKey.topSitePosition.rawValue] as? String, let tileType = extras?[EventExtraKey.topSiteTileType.rawValue] as? String {
-                GleanMetrics.TopSites.tilePressed.record(GleanMetrics.TopSites.TilePressedExtra(position: position, tileType: tileType))
-            } else {
-                recordUninstrumentedMetrics(category: category, method: method, object: object, value: value, extras: extras)
-            }
-
-        case (.action, .view, .topSiteContextualMenu, _, let extras):
-            if let type = extras?[EventExtraKey.contextualMenuType.rawValue] as? String {
-                GleanMetrics.TopSites.contextualMenu.record(GleanMetrics.TopSites.ContextualMenuExtra(type: type))
-            } else {
-                recordUninstrumentedMetrics(category: category, method: method, object: object, value: value, extras: extras)
-            }
-        case (.action, .tap, .newPrivateTab, .topSite, _):
-            GleanMetrics.TopSites.openInPrivateTab.record()
         // MARK: Preferences
         case (.action, .change, .setting, _, _):
             assertionFailure("Please record telemetry for settings using the SettingsTelemetry().changedSetting() method")
@@ -1266,22 +1219,6 @@ extension TelemetryWrapper {
         case (.action, .open, .mediumTopSitesWidget, _, _):
             GleanMetrics.Widget.mTopSitesWidget.add()
 
-        // MARK: Pocket
-        case (.action, .tap, .pocketStory, _, let extras):
-            if let homePageOrigin = extras?[EventExtraKey.fxHomepageOrigin.rawValue] as? String {
-                GleanMetrics.Pocket.openStoryOrigin[homePageOrigin].add()
-            }
-
-            if let position = extras?[EventExtraKey.pocketTilePosition.rawValue] as? String {
-                GleanMetrics.Pocket.openStoryPosition["position-"+position].add()
-            } else {
-                recordUninstrumentedMetrics(category: category, method: method, object: object, value: value, extras: extras)
-            }
-        case (.action, .view, .pocketSectionImpression, _, _):
-            GleanMetrics.Pocket.sectionImpressions.add()
-        case (.action, .tap, .newPrivateTab, .pocketSite, _):
-            GleanMetrics.Pocket.openInPrivateTab.record()
-
         // History Panel related
         case (.action, .tap, .selectedHistoryItem, let type?, _):
             GleanMetrics.History.selectedItem[type.rawValue].add()
@@ -1481,62 +1418,7 @@ extension TelemetryWrapper {
             }
         case (.action, .tap, .newPrivateTab, .tabTray, _):
             GleanMetrics.TabsTray.newPrivateTabTapped.record()
-        // MARK: Firefox Homepage
-        case (.action, .view, .firefoxHomepage, .fxHomepageOrigin, let extras):
-            if let homePageOrigin = extras?[EventExtraKey.fxHomepageOrigin.rawValue] as? String {
-                GleanMetrics.FirefoxHomePage.firefoxHomepageOrigin[homePageOrigin].add()
-            }
-        case (.action, .open, .firefoxHomepage, .openHomeFromAwesomebar, _):
-            GleanMetrics.FirefoxHomePage.openFromAwesomebar.add()
-        case (.action, .open, .firefoxHomepage, .openHomeFromPhotonMenuButton, _):
-            GleanMetrics.FirefoxHomePage.openFromMenuHomeButton.add()
-
-        case (.action, .view, .firefoxHomepage, .bookmarkItemView, let extras):
-            if let bookmarksCount = extras?[EventObject.bookmarkImpressions.rawValue] as? String {
-                GleanMetrics.FirefoxHomePage.recentlySavedBookmarkView.record(GleanMetrics.FirefoxHomePage.RecentlySavedBookmarkViewExtra(bookmarkCount: bookmarksCount))
-            }
-        case (.action, .tap, .firefoxHomepage, .bookmarkSectionShowAll, let extras):
-            GleanMetrics.FirefoxHomePage.recentlySavedShowAll.add()
-            if let homePageOrigin = extras?[EventExtraKey.fxHomepageOrigin.rawValue] as? String {
-                GleanMetrics.FirefoxHomePage.recentlySavedShowAllOrigin[homePageOrigin].add()
-            }
-        case (.action, .tap, .firefoxHomepage, .bookmarkItemAction, let extras):
-            GleanMetrics.FirefoxHomePage.recentlySavedBookmarkItem.add()
-            if let homePageOrigin = extras?[EventExtraKey.fxHomepageOrigin.rawValue] as? String {
-                GleanMetrics.FirefoxHomePage.recentlySavedBookmarkOrigin[homePageOrigin].add()
-            }
-        case (.action, .tap, .firefoxHomepage, .jumpBackInSectionShowAll, let extras):
-            GleanMetrics.FirefoxHomePage.jumpBackInShowAll.add()
-            if let homePageOrigin = extras?[EventExtraKey.fxHomepageOrigin.rawValue] as? String {
-                GleanMetrics.FirefoxHomePage.jumpBackInShowAllOrigin[homePageOrigin].add()
-            }
-        case (.action, .view, .jumpBackInTileImpressions, _, _):
-            GleanMetrics.FirefoxHomePage.jumpBackInTileView.add()
-        case (.action, .tap, .firefoxHomepage, .jumpBackInSectionTabOpened, let extras):
-            GleanMetrics.FirefoxHomePage.jumpBackInTabOpened.add()
-            if let homePageOrigin = extras?[EventExtraKey.fxHomepageOrigin.rawValue] as? String {
-                GleanMetrics.FirefoxHomePage.jumpBackInTabOpenedOrigin[homePageOrigin].add()
-            }
-        case (.action, .tap, .firefoxHomepage, .jumpBackInSectionGroupOpened, let extras):
-            GleanMetrics.FirefoxHomePage.jumpBackInGroupOpened.add()
-            if let homePageOrigin = extras?[EventExtraKey.fxHomepageOrigin.rawValue] as? String {
-                GleanMetrics.FirefoxHomePage.jumpBackInGroupOpenOrigin[homePageOrigin].add()
-            }
-        case (.action, .tap, .firefoxHomepage, .jumpBackInSectionSyncedTabShowAll, let extras):
-            GleanMetrics.FirefoxHomePage.syncedTabShowAll.add()
-            if let homePageOrigin = extras?[EventExtraKey.fxHomepageOrigin.rawValue] as? String {
-                GleanMetrics.FirefoxHomePage.syncedTabShowAllOrigin[homePageOrigin].add()
-            }
-        case (.action, .tap, .firefoxHomepage, .jumpBackInSectionSyncedTabOpened, let extras):
-            GleanMetrics.FirefoxHomePage.syncedTabOpened.add()
-            if let homePageOrigin = extras?[EventExtraKey.fxHomepageOrigin.rawValue] as? String {
-                GleanMetrics.FirefoxHomePage.syncedTabOpenedOrigin[homePageOrigin].add()
-            }
-        case (.action, .view, .syncedTabTileImpressions, _, _):
-            GleanMetrics.FirefoxHomePage.syncedTabTileView.add()
 
-        case (.action, .tap, .firefoxHomepage, .customizeHomepageButton, _):
-            GleanMetrics.FirefoxHomePage.customizeHomepageButton.add()
         // MARK: - Wallpaper related
         case (.action, .tap, .wallpaperSettings, .wallpaperSelected, let extras):
             if let name = extras?[EventExtraKey.wallpaperName.rawValue] as? String,
@@ -1727,14 +1609,4 @@ extension TelemetryWrapper {
                                  description: "\(category), \(method), \(object), \(String(describing: value)), \(String(describing: extras))")
     }
 }
-
-// MARK: - Firefox Home Page
-extension TelemetryWrapper {
-    /// Bundle the extras dictionary for the home page origin
-    static func getOriginExtras(isZeroSearch: Bool) -> [String: String] {
-        let origin = isZeroSearch ? TelemetryWrapper.EventValue.fxHomepageOriginZeroSearch : TelemetryWrapper.EventValue.fxHomepageOriginOther
-        return [TelemetryWrapper.EventExtraKey.fxHomepageOrigin.rawValue: origin.rawValue]
-    }
-}
-
 // swiftlint:enable line_length

firefox-ios/firefox-ios-tests/Tests/ClientTests/TelemetryWrapperTests.swift

@@ -68,43 +68,7 @@ class TelemetryWrapperTests: XCTestCase {
                                   failureMessage: "Incorrect mobile bookmarks quantity returned.")
     }
 
-    // MARK: - Top Site
-
-    func test_topSiteTileWithExtras_GleanIsCalled() throws {
-        let topSitePositionKey = TelemetryWrapper.EventExtraKey.topSitePosition.rawValue
-        let topSiteTileTypeKey = TelemetryWrapper.EventExtraKey.topSiteTileType.rawValue
-        let extras = [topSitePositionKey: "\(1)", topSiteTileTypeKey: "history-based"]
-        TelemetryWrapper.recordEvent(
-            category: .action,
-            method: .tap,
-            object: .topSiteTile,
-            value: nil,
-            extras: extras
-        )
-
-        try testEventMetricRecordingSuccess(metric: GleanMetrics.TopSites.tilePressed)
-    }
-
-    func test_topSiteTileWithoutExtras_GleanIsNotCalled() {
-        TelemetryWrapper.recordEvent(
-            category: .action,
-            method: .tap,
-            object: .topSiteTile,
-            value: nil
-        )
-        XCTAssertNil(GleanMetrics.TopSites.tilePressed.testGetValue())
-    }
-
-    func test_topSiteContextualMenuWithoutExtra_GleanIsNotCalled() {
-        TelemetryWrapper.recordEvent(
-            category: .action,
-            method: .view,
-            object: .topSiteContextualMenu,
-            value: nil,
-            extras: nil
-        )
-        XCTAssertNil(GleanMetrics.TopSites.contextualMenu.testGetValue())
-    }
+    // MARK: - Sponsored shortcuts
 
     func test_sponsoredShortcuts_GleanIsCalled() {
         TelemetryWrapper.recordEvent(
@@ -119,44 +83,6 @@ class TelemetryWrapperTests: XCTestCase {
                               failureMessage: "Sponsored shortcut value not tracked")
     }
 
-    // MARK: - Firefox Home Page
-
-    func test_recentlySavedBookmarkViewWithExtras_GleanIsCalled() throws {
-        let extras: [String: Any] = [TelemetryWrapper.EventObject.bookmarkImpressions.rawValue: "\([String]().count)"]
-        TelemetryWrapper.recordEvent(
-            category: .action,
-            method: .view,
-            object: .firefoxHomepage,
-            value: .bookmarkItemView,
-            extras: extras
-        )
-
-        try testEventMetricRecordingSuccess(metric: GleanMetrics.FirefoxHomePage.recentlySavedBookmarkView)
-    }
-
-    func test_recentlySavedBookmarkViewWithoutExtras_GleanIsNotCalled() {
-        TelemetryWrapper.recordEvent(
-            category: .action,
-            method: .view,
-            object: .firefoxHomepage,
-            value: .bookmarkItemView
-        )
-        XCTAssertNil(GleanMetrics.FirefoxHomePage.recentlySavedBookmarkView.testGetValue())
-    }
-
-    func test_firefoxHomePageAddView_GleanIsCalled() {
-        let extras = [ExtraKey.fxHomepageOrigin.rawValue: ValueKey.fxHomepageOriginZeroSearch.rawValue]
-        TelemetryWrapper.recordEvent(
-            category: .action,
-            method: .view,
-            object: .firefoxHomepage,
-            value: .fxHomepageOrigin,
-            extras: extras
-        )
-
-        testLabeledMetricSuccess(metric: GleanMetrics.FirefoxHomePage.firefoxHomepageOrigin)
-    }
-
     // MARK: - CFR Analytics
 
     func test_contextualHintDismissButtonWithoutExtras_GleanIsNotCalled() {