For #6308: Remove unecessary telemetry & bump expiry date (#7793)

* For #6308: Remove unecessary telemetry

* For #6308: Bump expiry date on telemetry

app/src/main/java/org/mozilla/fenix/FenixApplication.kt

@@ -31,7 +31,6 @@ import mozilla.components.support.ktx.android.content.runOnlyInMainProcess
 import mozilla.components.support.locale.LocaleAwareApplication
 import mozilla.components.support.rusthttp.RustHttpConfig
 import mozilla.components.support.rustlog.RustLog
-import org.mozilla.fenix.GleanMetrics.ExperimentsMetrics
 import org.mozilla.fenix.components.Components
 import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.session.NotificationSessionObserver
@@ -122,16 +121,6 @@ open class FenixApplication : LocaleAwareApplication() {
             }
         }
 
-        // When the `fenix-test-2019-08-05` experiment is active, record its branch in Glean
-        // telemetry. This will be used to validate that the experiment system correctly enrolls
-        // clients and segments them into branches. Note that this will not take effect the first
-        // time the application has launched, since there won't be enough time for the experiments
-        // library to get a list of experiments. It will take effect the second time the
-        // application is launched.
-        Experiments.withExperiment("fenix-test-2019-08-05") { branchName ->
-            ExperimentsMetrics.activeExperiment.set(branchName)
-        }
-
         setupLeakCanary()
         if (settings().isTelemetryEnabled) {
             components.analytics.metrics.start()

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

@@ -116,12 +116,6 @@ private val Event.wrapper: EventWrapper<*>?
         is Event.FindInPageClosed -> EventWrapper<NoExtraKeys>(
             { FindInPage.closed.record(it) }
         )
-        is Event.FindInPageNext -> EventWrapper<NoExtraKeys>(
-            { FindInPage.nextResult.record(it) }
-        )
-        is Event.FindInPagePrevious -> EventWrapper<NoExtraKeys>(
-            { FindInPage.previousResult.record(it) }
-        )
         is Event.FindInPageSearchCommitted -> EventWrapper<NoExtraKeys>(
             { FindInPage.searchedPage.record(it) }
         )
@@ -365,9 +359,8 @@ private val Event.wrapper: EventWrapper<*>?
         is Event.PrivateBrowsingStaticShortcutPrivateTab -> EventWrapper<NoExtraKeys>(
             { PrivateBrowsingShortcut.staticShortcutPriv.record(it) }
         )
-        is Event.WhatsNewTapped -> EventWrapper(
-            { Events.whatsNewTapped.record(it) },
-            { Events.whatsNewTappedKeys.valueOf(it) }
+        is Event.WhatsNewTapped -> EventWrapper<NoExtraKeys>(
+            { Events.whatsNewTapped.record(it) }
         )
         is Event.TabMediaPlay -> EventWrapper<NoExtraKeys>(
             { Tab.mediaPlay.record(it) }

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

@@ -100,8 +100,6 @@ sealed class Event {
     object SearchWidgetVoiceSearchPressed : Event()
     object FindInPageOpened : Event()
     object FindInPageClosed : Event()
-    object FindInPageNext : Event()
-    object FindInPagePrevious : Event()
     object FindInPageSearchCommitted : Event()
     object PrivateBrowsingGarbageIconTapped : Event()
     object PrivateBrowsingSnackbarUndoTapped : Event()
@@ -140,6 +138,7 @@ sealed class Event {
     object CustomEngineAdded : Event()
     object CustomEngineDeleted : Event()
     object PrivateBrowsingShowSearchSuggestions : Event()
+    object WhatsNewTapped : Event()
 
     // Interaction events with extras
 
@@ -196,12 +195,6 @@ sealed class Event {
             get() = hashMapOf(Events.appOpenedKeys.source to source.name)
     }
 
-    data class WhatsNewTapped(val source: Source) : Event() {
-        enum class Source { ABOUT, HOME }
-        override val extras: Map<Events.whatsNewTappedKeys, String>?
-            get() = hashMapOf(Events.whatsNewTappedKeys.source to source.name)
-    }
-
     data class CollectionSaveButtonPressed(val fromScreen: String) : Event() {
         override val extras: Map<Collections.saveButtonKeys, String>?
             get() = mapOf(Collections.saveButtonKeys.fromScreen to fromScreen)
@@ -351,8 +344,6 @@ sealed class Event {
 }
 
 private fun Fact.toEvent(): Event? = when (Pair(component, item)) {
-    Component.FEATURE_FINDINPAGE to FindInPageFacts.Items.PREVIOUS -> Event.FindInPagePrevious
-    Component.FEATURE_FINDINPAGE to FindInPageFacts.Items.NEXT -> Event.FindInPageNext
     Component.FEATURE_FINDINPAGE to FindInPageFacts.Items.CLOSE -> Event.FindInPageClosed
     Component.FEATURE_FINDINPAGE to FindInPageFacts.Items.INPUT -> Event.FindInPageSearchCommitted
     Component.FEATURE_CONTEXTMENU to ContextMenuFacts.Items.ITEM -> {

app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt

@@ -536,7 +536,7 @@ class HomeFragment : Fragment() {
                     invokePendingDeleteJobs()
                     hideOnboardingIfNeeded()
                     WhatsNew.userViewedWhatsNew(context)
-                    context.metrics.track(Event.WhatsNewTapped(Event.WhatsNewTapped.Source.HOME))
+                    context.metrics.track(Event.WhatsNewTapped)
                     (activity as HomeActivity).openToBrowserAndLoad(
                         searchTermOrURL = SupportUtils.getWhatsNewUrl(context),
                         newTab = true,

app/src/main/java/org/mozilla/fenix/settings/about/AboutFragment.kt

@@ -151,7 +151,7 @@ class AboutFragment : Fragment(), AboutPageListener {
             is AboutItem.ExternalLink -> {
                 if (item.type == WHATS_NEW) {
                     WhatsNew.userViewedWhatsNew(requireContext())
-                    requireComponents.analytics.metrics.track(Event.WhatsNewTapped(Event.WhatsNewTapped.Source.ABOUT))
+                    requireComponents.analytics.metrics.track(Event.WhatsNewTapped)
                 }
 
                 openLinkInCustomTab(item.url)