Revert "For #20516: Renew product telemetry probes expiring in August (…

…#20517)"

This reverts commit 6928901.

app/metrics.yaml

@@ -8,35 +8,6 @@ no_lint:
   - CATEGORY_GENERIC
 
 events:
-  app_received_intent:
-    type: event
-    description: |
-      The system received an Intent for the HomeActivity. An intent
-      is received an external entity wants to the app to display
-      content. Intents can be received when the app is closed – at
-      which point the app will be opened – or when the app is
-      already opened – at which point the already open app will make
-      changes such as loading a url. This can be used loosely as a
-      heuristic for when the user requested to open the app. The
-      HomeActivity encompasses the home screen and browser screen but
-      may include other screens. This differs from the app_opened
-      probe because it measures all startups, not just cold startup.
-    extra_keys:
-      source:
-        description: |
-          The method used to open Fenix. Possible values are `app_icon`,
-          `custom_tab`, `link` or `unknown`
-    bugs:
-      - https://github.com/mozilla-mobile/fenix/issues/11830
-      - https://github.com/mozilla-mobile/fenix/issues/19923
-    data_reviews:
-      - https://github.com/mozilla-mobile/fenix/pull/11940/
-      - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
-      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
-    notification_emails:
-      - esmyth@mozilla.com
-      - perf-android-fe@mozilla.com
-    expires: "2021-12-01"
   app_opened:
     type: event
     description: |
@@ -418,6 +389,26 @@ events:
     notification_emails:
       - android-probes@mozilla.com
     expires: "2021-12-10"
+  tab_view_changed:
+    type: event
+    description: |
+      Indicates that the user has changed their tab view
+      settings, either from the default or by personal
+      preference.
+    extra_keys:
+      type:
+        description: |
+          A string containing the name of the tab view the user tapped.
+          These items include: list or grid.
+    bugs:
+      - https://github.com/mozilla-mobile/fenix/issues/19956
+    data_reviews:
+      - https://github.com/mozilla-mobile/fenix/pull/19959#issuecomment-882539619
+    data_sensitivity:
+      - interaction
+    notification_emails:
+      - android-probes@mozilla.com
+    expires: "2022-05-10"
 
 onboarding:
   fxa_auto_signin:
@@ -1051,60 +1042,6 @@ metrics:
     notification_emails:
       - android-probes@mozilla.com
     expires: "2022-02-01"
-  credit_cards_saved_count:
-    type: counter
-    lifetime: application
-    description: |
-      A counter that indicates the number of credit cards that have been
-      saved manually by the user.
-    send_in_pings:
-      - metrics
-    bugs:
-      - https://github.com/mozilla-mobile/fenix/issues/18711
-    data_reviews:
-      - https://github.com/mozilla-mobile/fenix/pull/19548#issuecomment-848811030
-      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
-    data_sensitivity:
-      - interaction
-    notification_emails:
-      - android-probes@mozilla.com
-    expires: "2021-10-01"
-  credit_cards_deleted_count:
-    type: counter
-    lifetime: application
-    description: |
-      A counter that indicates the number of credit cards that have been
-      deleted by the user.
-    send_in_pings:
-      - metrics
-    bugs:
-      - https://github.com/mozilla-mobile/fenix/issues/18711
-    data_reviews:
-      - https://github.com/mozilla-mobile/fenix/pull/19548#issuecomment-848811030
-      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
-    data_sensitivity:
-      - interaction
-    notification_emails:
-      - android-probes@mozilla.com
-    expires: "2021-10-01"
-  credit_cards_autofill_count:
-    type: counter
-    lifetime: application
-    description: |
-      A counter that indicates the number of times the user has autofilled
-      a credit card.
-    send_in_pings:
-      - metrics
-    bugs:
-      - https://github.com/mozilla-mobile/fenix/issues/18711
-    data_reviews:
-      - https://github.com/mozilla-mobile/fenix/pull/19548#issuecomment-848811030
-      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
-    data_sensitivity:
-      - interaction
-    notification_emails:
-      - android-probes@mozilla.com
-    expires: "2021-10-01"
   mozilla_products:
     type: string_list
     lifetime: application
@@ -2652,39 +2589,6 @@ reader_mode:
       - android-probes@mozilla.com
     expires: "2022-02-01"
 
-tabs_tray.cfr:
-  dismiss:
-    type: event
-    description: |
-      A user dismisses the tabs tray CFR.
-    bugs:
-      - https://github.com/mozilla-mobile/fenix/issues/16485
-    data_reviews:
-      - https://github.com/mozilla-mobile/fenix/pull/17442
-      - https://github.com/mozilla-mobile/fenix/issues/16485#issuecomment-759641324
-      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
-    data_sensitivity:
-      - interaction
-    notification_emails:
-      - android-probes@mozilla.com
-    expires: "2021-08-01"
-  go_to_settings:
-    type: event
-    description: |
-      A user selects the CFR option to navigate to settings.
-    bugs:
-      - https://github.com/mozilla-mobile/fenix/issues/16485
-    data_reviews:
-      - https://github.com/mozilla-mobile/fenix/pull/17442
-      - https://github.com/mozilla-mobile/fenix/issues/16485#issuecomment-759641324
-      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
-      - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
-    data_sensitivity:
-      - interaction
-    notification_emails:
-      - android-probes@mozilla.com
-    expires: "2022-02-01"
-
 tabs_tray:
   opened:
     type: event
@@ -5737,6 +5641,155 @@ awesomebar:
       - android-probes@mozilla.com
     expires: "2022-02-01"
 
+android_autofill:
+  supported:
+    type: boolean
+    description: |
+      Whether or not Android Autofill is supported by the device and is
+      supported for this user.
+    bugs:
+      - https://github.com/mozilla-mobile/android-components/issues/10301
+    data_reviews:
+      - TBD
+    data_sensitivity:
+      - technical
+    notification_emails:
+      - android-probes@mozilla.com
+      - skaspari@mozilla.com
+    expires: "2022-01-31"
+  enabled:
+    type: boolean
+    description: |
+      Whether or not Firefox is the Android Autofill provider for this user.
+      provider.
+    bugs:
+      - https://github.com/mozilla-mobile/android-components/issues/10301
+    data_reviews:
+      - TBD
+    data_sensitivity:
+      - interaction
+    notification_emails:
+      - android-probes@mozilla.com
+      - skaspari@mozilla.com
+    expires: "2022-01-31"
+  request_matching_logins:
+    type: event
+    description: |
+      The app received an Android Autofill request from the system and was
+      able to find matching logins for the request
+    bugs:
+      - https://github.com/mozilla-mobile/android-components/issues/10301
+    data_reviews:
+      - TBD
+    data_sensitivity:
+      - interaction
+    notification_emails:
+      - android-probes@mozilla.com
+      - skaspari@mozilla.com
+    expires: "2022-01-31"
+  request_no_matching_logins:
+    type: event
+    description: |
+      The app received an Android Autofill request from the system and was
+      not able to find matching logins for the request
+    bugs:
+      - https://github.com/mozilla-mobile/android-components/issues/10301
+    data_reviews:
+      - TBD
+    data_sensitivity:
+      - interaction
+    notification_emails:
+      - android-probes@mozilla.com
+      - skaspari@mozilla.com
+    expires: "2022-01-31"
+  search_displayed:
+    type: event
+    description: |
+      The user has selected the search option to manually search a
+      matching login
+    bugs:
+      - https://github.com/mozilla-mobile/android-components/issues/10301
+    data_reviews:
+      - TBD
+    data_sensitivity:
+      - interaction
+    notification_emails:
+      - android-probes@mozilla.com
+      - skaspari@mozilla.com
+    expires: "2022-01-31"
+  search_item_selected:
+    type: event
+    description: |
+      The user has selected a search result for autofilling.
+    bugs:
+      - https://github.com/mozilla-mobile/android-components/issues/10301
+    data_reviews:
+      - TBD
+    data_sensitivity:
+      - interaction
+    notification_emails:
+      - android-probes@mozilla.com
+      - skaspari@mozilla.com
+    expires: "2022-01-31"
+  unlock_cancelled:
+    type: event
+    description: |
+      The user needed to unlock the app in order to autofill
+      logins, but the process was cancelled.
+    bugs:
+      - https://github.com/mozilla-mobile/android-components/issues/10301
+    data_reviews:
+      - TBD
+    data_sensitivity:
+      - interaction
+    notification_emails:
+      - android-probes@mozilla.com
+      - skaspari@mozilla.com
+    expires: "2022-01-31"
+  unlock_successful:
+    type: event
+    description: |
+      The user successfully unlock the app in order to autofill logins
+    bugs:
+      - https://github.com/mozilla-mobile/android-components/issues/10301
+    data_reviews:
+      - TBD
+    data_sensitivity:
+      - interaction
+    notification_emails:
+      - android-probes@mozilla.com
+      - skaspari@mozilla.com
+    expires: "2022-01-31"
+  confirm_cancelled:
+    type: event
+    description: |
+      The user needed to confirm autofilling an unauthenticated
+      application and decided to cancel
+    bugs:
+      - https://github.com/mozilla-mobile/android-components/issues/10301
+    data_reviews:
+      - TBD
+    data_sensitivity:
+      - interaction
+    notification_emails:
+      - android-probes@mozilla.com
+      - skaspari@mozilla.com
+    expires: "2022-01-31"
+  confirm_successful:
+    type: event
+    description: |
+      The user confirmed autofilling an unauthenticated application
+    bugs:
+      - https://github.com/mozilla-mobile/android-components/issues/10301
+    data_reviews:
+      - TBD
+    data_sensitivity:
+      - interaction
+    notification_emails:
+      - android-probes@mozilla.com
+      - skaspari@mozilla.com
+    expires: "2022-01-31"
+
 home_menu:
   settings_item_clicked:
     type: event
@@ -5946,3 +5999,43 @@ start_on_home:
     notification_emails:
       - android-probes@mozilla.com
     expires: "2022-06-16"
+recent_tabs:
+  show_all_clicked:
+    type: event
+    description: |
+      User has clicked show all button and opened tabs tray.
+    bugs:
+      - https://github.com/mozilla-mobile/fenix/issues/19955
+    data_reviews:
+      - https://github.com/mozilla-mobile/fenix/pull/20138
+    data_sensitivity:
+      - interaction
+    notification_emails:
+      - android-probes@mozilla.com
+    expires: "2022-06-23"
+  recent_tab_opened:
+    type: event
+    description: |
+      User has opened a recent tab from homescreen.
+    bugs:
+      - https://github.com/mozilla-mobile/fenix/issues/19955
+    data_reviews:
+      - https://github.com/mozilla-mobile/fenix/pull/20138
+    data_sensitivity:
+      - interaction
+    notification_emails:
+      - android-probes@mozilla.com
+    expires: "2022-06-23"
+  in_progress_media_tab_opened:
+    type: event
+    description: |
+      User has opened a recent tab from homescreen.
+    bugs:
+      - https://github.com/mozilla-mobile/fenix/issues/20393
+    data_reviews:
+      - https://github.com/mozilla-mobile/fenix/pull/20138
+    data_sensitivity:
+      - interaction
+    notification_emails:
+      - android-probes@mozilla.com
+    expires: "2022-06-23"