From fee26e62a8ed9085113e69c153978230c6bfa0f8 Mon Sep 17 00:00:00 2001
From: Matt Tighe <mtighe@mozilla.com>
Date: Thu, 2 Dec 2021 15:50:49 -0800
Subject: [PATCH] Fixes #22688: remove inactive_tabs_recently_closed probe

---
 app/metrics.yaml                                    | 13 -------------
 .../org/mozilla/fenix/components/metrics/Event.kt   |  1 -
 .../fenix/components/metrics/GleanMetricsService.kt |  3 ---
 .../mozilla/fenix/tabstray/TabsTrayController.kt    |  2 --
 .../components/metrics/GleanMetricsServiceTest.kt   |  7 -------
 5 files changed, 26 deletions(-)

diff --git a/app/metrics.yaml b/app/metrics.yaml
index dae12cf80..565578c31 100644
--- a/app/metrics.yaml
+++ b/app/metrics.yaml
@@ -3030,19 +3030,6 @@ tabs_tray:
       - android-probes@mozilla.com
       - erichards@mozilla.com
     expires: never
-  inactive_tabs_recently_closed:
-    type: event
-    description: |
-      A user tapped the "Recently closed" option of the inactive tabs menu.
-    bugs:
-      - https://github.com/mozilla-mobile/fenix/issues/20328
-    data_reviews:
-      - https://github.com/mozilla-mobile/fenix/issues/20328
-    data_sensitivity:
-      - interaction
-    notification_emails:
-      - android-probes@mozilla.com
-    expires: "2022-08-01"
   inactive_tabs_expanded:
     type: event
     description: |
diff --git a/app/src/main/java/org/mozilla/fenix/components/metrics/Event.kt b/app/src/main/java/org/mozilla/fenix/components/metrics/Event.kt
index df664cf8c..bfef18fa1 100644
--- a/app/src/main/java/org/mozilla/fenix/components/metrics/Event.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/metrics/Event.kt
@@ -203,7 +203,6 @@ sealed class Event {
     object TabsTraySaveToCollectionPressed : Event()
     object TabsTrayShareAllTabsPressed : Event()
     object TabsTrayCloseAllTabsPressed : Event()
-    object TabsTrayRecentlyClosedPressed : Event()
     object TabsTrayInactiveTabsExpanded : Event()
     object TabsTrayInactiveTabsCollapsed : Event()
     object TabsTrayAutoCloseDialogSeen : Event()
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
index c8dfe8ca2..bd090d2da 100644
--- a/app/src/main/java/org/mozilla/fenix/components/metrics/GleanMetricsService.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/metrics/GleanMetricsService.kt
@@ -614,9 +614,6 @@ private val Event.wrapper: EventWrapper<*>?
         is Event.TabsTrayCloseAllTabsPressed -> EventWrapper<NoExtraKeys>(
             { TabsTray.closeAllTabs.record(it) }
         )
-        is Event.TabsTrayRecentlyClosedPressed -> EventWrapper<NoExtraKeys>(
-            { TabsTray.inactiveTabsRecentlyClosed.record(it) }
-        )
         is Event.TabsTrayInactiveTabsExpanded -> EventWrapper<NoExtraKeys>(
             { TabsTray.inactiveTabsExpanded.record(it) }
         )
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayController.kt b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayController.kt
index f61f1e158..12b3b2feb 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayController.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayController.kt
@@ -205,8 +205,6 @@ class DefaultTabsTrayController(
         dismissTray()
 
         navController.navigate(R.id.recentlyClosedFragment)
-
-        metrics.track(Event.TabsTrayRecentlyClosedPressed)
     }
 
     /**
diff --git a/app/src/test/java/org/mozilla/fenix/components/metrics/GleanMetricsServiceTest.kt b/app/src/test/java/org/mozilla/fenix/components/metrics/GleanMetricsServiceTest.kt
index d3803fd94..fc8526d3c 100644
--- a/app/src/test/java/org/mozilla/fenix/components/metrics/GleanMetricsServiceTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/components/metrics/GleanMetricsServiceTest.kt
@@ -4,7 +4,6 @@
 
 package org.mozilla.fenix.components.metrics
 
-import io.mockk.MockKAnnotations
 import mozilla.components.service.glean.testing.GleanTestRule
 import mozilla.components.support.test.robolectric.testContext
 import org.junit.Assert.assertEquals
@@ -34,8 +33,6 @@ class GleanMetricsServiceTest {
 
     @Before
     fun setup() {
-        MockKAnnotations.init(this)
-
         gleanService = GleanMetricsService(testContext)
     }
 
@@ -286,10 +283,6 @@ class GleanMetricsServiceTest {
         assertFalse(TabsTray.closeAllTabs.testHasValue())
         gleanService.track(Event.TabsTrayCloseAllTabsPressed)
         assertTrue(TabsTray.closeAllTabs.testHasValue())
-
-        assertFalse(TabsTray.inactiveTabsRecentlyClosed.testHasValue())
-        gleanService.track(Event.TabsTrayRecentlyClosedPressed)
-        assertTrue(TabsTray.inactiveTabsRecentlyClosed.testHasValue())
     }
 
     @Test