No issue: Renew/remove metrics set to expire in April 2022 (#23786)

app/metrics.yaml

@@ -639,11 +639,12 @@ experiments_default_browser:
       - https://github.com/mozilla-mobile/fenix/pull/18982#pullrequestreview-635098629
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/21076#issuecomment-909237275
+      - https://github.com/mozilla-mobile/fenix/pull/23786#issuecomment-1042331298
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-04-01"
+    expires: "2023-03-31"
 toolbar_settings:
   changed_position:
     type: event
@@ -6656,11 +6657,12 @@ home_menu:
       - https://github.com/mozilla-mobile/fenix/pull/18987
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/21076#issuecomment-909237275
+      - https://github.com/mozilla-mobile/fenix/pull/23786#issuecomment-1042331298
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-04-01"
+    expires: "2023-03-31"
     metadata:
       tags:
         - Settings
@@ -6676,11 +6678,12 @@ home_screen:
       - https://github.com/mozilla-mobile/fenix/pull/19025
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/21076#issuecomment-909237275
+      - https://github.com/mozilla-mobile/fenix/pull/23786#issuecomment-1042331298
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-04-01"
+    expires: "2023-03-31"
     metadata:
       tags:
         - HomeScreen
@@ -6824,63 +6827,6 @@ android_keystore_experiment:
       - android-probes@mozilla.com
     expires: "2022-03-01"
 
-set_default_newtab_experiment:
-  set_default_browser_clicked:
-    type: event
-    description: |
-      Set default browser was clicked from new tab screen.
-    bugs:
-      - https://github.com/mozilla-mobile/fenix/issues/18853
-    data_reviews:
-      - https://github.com/mozilla-mobile/fenix/pull/18895
-      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
-      - https://github.com/mozilla-mobile/fenix/pull/21076#issuecomment-909237275
-    data_sensitivity:
-      - interaction
-    notification_emails:
-      - android-probes@mozilla.com
-    expires: "2022-04-01"
-    metadata:
-      tags:
-        - Experiments
-  close_experiment_card_clicked:
-    type: event
-    description: |
-      Close experiment card was clicked from new tab screen.
-    bugs:
-      - https://github.com/mozilla-mobile/fenix/issues/18853
-    data_reviews:
-      - https://github.com/mozilla-mobile/fenix/pull/18895
-      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
-      - https://github.com/mozilla-mobile/fenix/pull/21076#issuecomment-909237275
-    data_sensitivity:
-      - interaction
-    notification_emails:
-      - android-probes@mozilla.com
-    expires: "2022-04-01"
-
-    metadata:
-      tags:
-        - Experiments
-set_default_setting_experiment:
-  set_default_browser_clicked:
-    type: event
-    description: |
-      Set default browser was clicked from settings screen.
-    bugs:
-      - https://github.com/mozilla-mobile/fenix/issues/18852
-    data_reviews:
-      - https://github.com/mozilla-mobile/fenix/pull/19047
-      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
-      - https://github.com/mozilla-mobile/fenix/pull/21076#issuecomment-909237275
-    data_sensitivity:
-      - interaction
-    notification_emails:
-      - android-probes@mozilla.com
-    expires: "2022-04-01"
-    metadata:
-      tags:
-        - Experiments
 start_on_home:
   enter_home_screen:
     type: event
@@ -7060,11 +7006,12 @@ recent_searches:
       - https://github.com/mozilla-mobile/fenix/issues/22175
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/22176#issuecomment-956421788
+      - https://github.com/mozilla-mobile/fenix/pull/23786#issuecomment-1042331298
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-04-01"
+    expires: "2023-03-31"
 
 credit_cards:
   saved:

app/src/main/java/org/mozilla/fenix/components/metrics/Event.kt

@@ -271,11 +271,8 @@ sealed class Event {
     object OpenedTabSuggestionClicked : Event()
 
     // Set default browser experiment metrics
-    object SetDefaultBrowserNewTabClicked : Event()
-    object CloseExperimentCardClicked : Event()
     object ToolbarMenuShown : Event()
     object SetDefaultBrowserToolbarMenuClicked : Event()
-    object SetDefaultBrowserSettingsScreenClicked : Event()
 
     // Home menu interaction
     object HomeMenuSettingsItemClicked : Event()

app/src/main/java/org/mozilla/fenix/components/metrics/GleanMetricsService.kt

@@ -46,8 +46,6 @@ import org.mozilla.fenix.GleanMetrics.RecentlyClosedTabs
 import org.mozilla.fenix.GleanMetrics.SearchShortcuts
 import org.mozilla.fenix.GleanMetrics.SearchTerms
 import org.mozilla.fenix.GleanMetrics.SearchWidget
-import org.mozilla.fenix.GleanMetrics.SetDefaultNewtabExperiment
-import org.mozilla.fenix.GleanMetrics.SetDefaultSettingExperiment
 import org.mozilla.fenix.GleanMetrics.StartOnHome
 import org.mozilla.fenix.GleanMetrics.SyncAccount
 import org.mozilla.fenix.GleanMetrics.SyncAuth
@@ -820,15 +818,6 @@ private val Event.wrapper: EventWrapper<*>?
             { HomeMenu.settingsItemClicked.record(it) }
         )
 
-        is Event.CloseExperimentCardClicked -> EventWrapper<NoExtraKeys>(
-            { SetDefaultNewtabExperiment.closeExperimentCardClicked.record(it) }
-        )
-        is Event.SetDefaultBrowserNewTabClicked -> EventWrapper<NoExtraKeys>(
-            { SetDefaultNewtabExperiment.setDefaultBrowserClicked.record(it) }
-        )
-        is Event.SetDefaultBrowserSettingsScreenClicked -> EventWrapper<NoExtraKeys>(
-            { SetDefaultSettingExperiment.setDefaultBrowserClicked.record(it) }
-        )
         is Event.HomeScreenDisplayed -> EventWrapper<NoExtraKeys>(
             { HomeScreen.homeScreenDisplayed.record(it) }
         )

app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt

@@ -599,13 +599,11 @@ class DefaultSessionControlController(
 
     override fun handleSetDefaultBrowser() {
         settings.userDismissedExperimentCard = true
-        metrics.track(Event.SetDefaultBrowserNewTabClicked)
         activity.openSetDefaultBrowserOption()
     }
 
     override fun handleCloseExperimentCard() {
         settings.userDismissedExperimentCard = true
-        metrics.track(Event.CloseExperimentCardClicked)
         fragmentStore.dispatch(HomeFragmentAction.RemoveSetDefaultBrowserCard)
     }
 

app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt

@@ -474,9 +474,6 @@ class SettingsFragment : PreferenceFragmentCompat() {
      */
     private fun getClickListenerForMakeDefaultBrowser(): Preference.OnPreferenceClickListener {
         return Preference.OnPreferenceClickListener {
-            if (isDefaultBrowserExperimentBranch()) {
-                requireContext().metrics.track(Event.SetDefaultBrowserSettingsScreenClicked)
-            }
             activity?.openSetDefaultBrowserOption()
             true
         }