From 6e4393a199b8d3355dcb1196ab5d03413e55d7d9 Mon Sep 17 00:00:00 2001 From: Codrut Topliceanu <60002907+codrut-topliceanu@users.noreply.github.com> Date: Tue, 10 Nov 2020 00:24:46 +0200 Subject: [PATCH] For #15720 - Remove unused telemetry (#15887) --- app/metrics.yaml | 150 ------------------ .../mozilla/fenix/components/metrics/Event.kt | 9 -- .../components/metrics/GleanMetricsService.kt | 32 +--- .../intent/NotificationsIntentProcessor.kt | 9 +- .../OnboardingWhatsNewViewHolder.kt | 3 - .../fenix/search/SearchDialogFragment.kt | 5 - .../account/AccountSettingsFragment.kt | 5 - .../settings/account/TurnOnSyncFragment.kt | 2 - 8 files changed, 2 insertions(+), 213 deletions(-) diff --git a/app/metrics.yaml b/app/metrics.yaml index 1a48b2ad26..8002047611 100644 --- a/app/metrics.yaml +++ b/app/metrics.yaml @@ -433,21 +433,6 @@ onboarding: - fenix-core@mozilla.com - erichards@mozilla.com expires: "2021-08-01" - whats_new: - type: event - description: - The onboarding What\'s New card was tapped. - bugs: - - https://github.com/mozilla-mobile/fenix/issues/10824 - data_reviews: - - https://github.com/mozilla-mobile/fenix/pull/11867 - - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068 - data_sensitivity: - - interaction - notification_emails: - - fenix-core@mozilla.com - - erichards@mozilla.com - expires: "2021-08-01" pref_toggled_theme_picker: type: event description: @@ -1659,67 +1644,6 @@ activation: no_lint: - USER_LIFETIME_EXPIRATION -qr_scanner: - opened: - type: event - description: | - A user opened the QR scanner - bugs: - - https://github.com/mozilla-mobile/fenix/issues/1857 - data_reviews: - - https://github.com/mozilla-mobile/fenix/pull/2524#issuecomment-492739967 - - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068 - data_sensitivity: - - interaction - notification_emails: - - fenix-core@mozilla.com - expires: "2021-08-01" - prompt_displayed: - type: event - description: | - A user scanned a QR code, causing a confirmation prompt to display asking - if they want to navigate to the page - bugs: - - https://github.com/mozilla-mobile/fenix/issues/1857 - data_reviews: - - https://github.com/mozilla-mobile/fenix/pull/2524#issuecomment-492739967 - - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068 - data_sensitivity: - - interaction - notification_emails: - - fenix-core@mozilla.com - expires: "2021-08-01" - navigation_allowed: - type: event - description: | - A user tapped "allow" on the prompt, directing the user to the website - scanned - bugs: - - https://github.com/mozilla-mobile/fenix/issues/1857 - data_reviews: - - https://github.com/mozilla-mobile/fenix/pull/2524#issuecomment-492739967 - - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068 - data_sensitivity: - - interaction - notification_emails: - - fenix-core@mozilla.com - expires: "2021-08-01" - navigation_denied: - type: event - description: | - A user tapped "deny" on the prompt, putting the user back to the scanning - view - bugs: - - https://github.com/mozilla-mobile/fenix/issues/1857 - data_reviews: - - https://github.com/mozilla-mobile/fenix/pull/2524#issuecomment-492739967 - - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068 - data_sensitivity: - - interaction - notification_emails: - - fenix-core@mozilla.com - expires: "2021-08-01" - error_page: visited_error: type: event @@ -1858,22 +1782,6 @@ sync_auth: notification_emails: - fenix-core@mozilla.com expires: "2021-08-01" - auto_login: - type: event - description: | - User signed into FxA via an account shared from another locally installed - Mozilla application (e.g. Fennec) - bugs: - - https://github.com/mozilla-mobile/fenix/issues/4971 - data_reviews: - - https://github.com/mozilla-mobile/fenix/pull/4931#issuecomment-529740300 - - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068 - data_sensitivity: - - technical - - interaction - notification_emails: - - fenix-core@mozilla.com - expires: "2021-08-01" recovered: type: event description: | @@ -1936,20 +1844,6 @@ sync_account: notification_emails: - fenix-core@mozilla.com expires: "2021-08-01" - closed: - type: event - description: | - A user closed the sync account page - bugs: - - https://github.com/mozilla-mobile/fenix/issues/1190 - data_reviews: - - https://github.com/mozilla-mobile/fenix/pull/2745#issuecomment-494918532 - - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068 - data_sensitivity: - - interaction - notification_emails: - - fenix-core@mozilla.com - expires: "2021-08-01" sync_now: type: event description: | @@ -2592,21 +2486,6 @@ search_widget: expires: "2021-08-01" private_browsing_mode: - garbage_icon: - type: event - description: | - A user pressed the garbage can icon on the private browsing home page, - deleting all private tabs. - bugs: - - https://github.com/mozilla-mobile/fenix/issues/4658 - data_reviews: - - https://github.com/mozilla-mobile/fenix/pull/4968 - - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068 - data_sensitivity: - - interaction - notification_emails: - - fenix-core@mozilla.com - expires: "2021-08-01" snackbar_undo: type: event description: | @@ -2636,35 +2515,6 @@ private_browsing_mode: notification_emails: - fenix-core@mozilla.com expires: "2021-08-01" - notification_open: - type: event - description: | - A user pressed the private browsing mode notification's "Open" button. - bugs: - - https://github.com/mozilla-mobile/fenix/issues/4658 - data_reviews: - - https://github.com/mozilla-mobile/fenix/pull/4968 - - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068 - data_sensitivity: - - interaction - notification_emails: - - fenix-core@mozilla.com - expires: "2021-08-01" - notification_delete: - type: event - description: | - A user pressed the private browsing mode notification's "Delete and Open" - button. - bugs: - - https://github.com/mozilla-mobile/fenix/issues/4658 - data_reviews: - - https://github.com/mozilla-mobile/fenix/pull/4968 - - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068 - data_sensitivity: - - interaction - notification_emails: - - fenix-core@mozilla.com - expires: "2021-08-01" contextual_hint.tracking_protection: display: 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 39cc5b48cf..7ccea3b962 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 @@ -52,10 +52,6 @@ sealed class Event { object CustomTabsActionTapped : Event() object CustomTabsMenuOpened : Event() object UriOpened : Event() - object QRScannerOpened : Event() - object QRScannerPromptDisplayed : Event() - object QRScannerNavigationAllowed : Event() - object QRScannerNavigationDenied : Event() object SyncAuthOpened : Event() object SyncAuthClosed : Event() object SyncAuthSignUp : Event() @@ -70,7 +66,6 @@ sealed class Event { object SyncAuthFromSharedReuse : Event() object SyncAuthFromSharedCopy : Event() object SyncAccountOpened : Event() - object SyncAccountClosed : Event() object SyncAccountSyncNow : Event() object SendTab : Event() object SignInToSendTab : Event() @@ -98,11 +93,8 @@ sealed class Event { object FindInPageOpened : Event() object FindInPageClosed : Event() object FindInPageSearchCommitted : Event() - object PrivateBrowsingGarbageIconTapped : Event() object PrivateBrowsingSnackbarUndoTapped : Event() object PrivateBrowsingNotificationTapped : Event() - object PrivateBrowsingNotificationOpenTapped : Event() - object PrivateBrowsingNotificationDeleteAndOpenTapped : Event() object PrivateBrowsingCreateShortcut : Event() object PrivateBrowsingAddShortcutCFR : Event() object PrivateBrowsingCancelCFR : Event() @@ -157,7 +149,6 @@ sealed class Event { object OnboardingManualSignIn : Event() object OnboardingPrivacyNotice : Event() object OnboardingPrivateBrowsing : Event() - object OnboardingWhatsNew : Event() object OnboardingFinish : Event() object ChangedToDefaultBrowser : 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 89101ff0b8..b624e29063 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 @@ -38,7 +38,6 @@ import org.mozilla.fenix.GleanMetrics.Preferences import org.mozilla.fenix.GleanMetrics.PrivateBrowsingMode import org.mozilla.fenix.GleanMetrics.PrivateBrowsingShortcut import org.mozilla.fenix.GleanMetrics.ProgressiveWebApp -import org.mozilla.fenix.GleanMetrics.QrScanner import org.mozilla.fenix.GleanMetrics.ReaderMode import org.mozilla.fenix.GleanMetrics.SearchDefaultEngine import org.mozilla.fenix.GleanMetrics.SearchShortcuts @@ -229,18 +228,6 @@ private val Event.wrapper: EventWrapper<*>? is Event.UriOpened -> EventWrapper( { Events.totalUriCount.add(1) } ) - is Event.QRScannerOpened -> EventWrapper( - { QrScanner.opened.record(it) } - ) - is Event.QRScannerPromptDisplayed -> EventWrapper( - { QrScanner.promptDisplayed.record(it) } - ) - is Event.QRScannerNavigationAllowed -> EventWrapper( - { QrScanner.navigationAllowed.record(it) } - ) - is Event.QRScannerNavigationDenied -> EventWrapper( - { QrScanner.navigationDenied.record(it) } - ) is Event.ErrorPageVisited -> EventWrapper( { ErrorPage.visitedError.record(it) }, { ErrorPage.visitedErrorKeys.valueOf(it) } @@ -269,9 +256,6 @@ private val Event.wrapper: EventWrapper<*>? is Event.SyncAuthOtherExternal -> EventWrapper( { SyncAuth.otherExternal.record(it) } ) - is Event.SyncAuthFromSharedReuse, Event.SyncAuthFromSharedCopy -> EventWrapper( - { SyncAuth.autoLogin.record(it) } - ) is Event.SyncAuthRecovered -> EventWrapper( { SyncAuth.recovered.record(it) } ) @@ -284,9 +268,6 @@ private val Event.wrapper: EventWrapper<*>? is Event.SyncAccountOpened -> EventWrapper( { SyncAccount.opened.record(it) } ) - is Event.SyncAccountClosed -> EventWrapper( - { SyncAccount.closed.record(it) } - ) is Event.SyncAccountSyncNow -> EventWrapper( { SyncAccount.syncNow.record(it) } ) @@ -375,21 +356,12 @@ private val Event.wrapper: EventWrapper<*>? is Event.SearchWidgetVoiceSearchPressed -> EventWrapper( { SearchWidget.voiceButton.record(it) } ) - is Event.PrivateBrowsingGarbageIconTapped -> EventWrapper( - { PrivateBrowsingMode.garbageIcon.record(it) } - ) is Event.PrivateBrowsingSnackbarUndoTapped -> EventWrapper( { PrivateBrowsingMode.snackbarUndo.record(it) } ) is Event.PrivateBrowsingNotificationTapped -> EventWrapper( { PrivateBrowsingMode.notificationTapped.record(it) } ) - is Event.PrivateBrowsingNotificationOpenTapped -> EventWrapper( - { PrivateBrowsingMode.notificationOpen.record(it) } - ) - is Event.PrivateBrowsingNotificationDeleteAndOpenTapped -> EventWrapper( - { PrivateBrowsingMode.notificationDelete.record(it) } - ) is Event.PrivateBrowsingCreateShortcut -> EventWrapper( { PrivateBrowsingShortcut.createShortcut.record(it) } ) @@ -582,9 +554,6 @@ private val Event.wrapper: EventWrapper<*>? { Events.tabCounterMenuAction.record(it) }, { Events.tabCounterMenuActionKeys.valueOf(it) } ) - is Event.OnboardingWhatsNew -> EventWrapper( - { Onboarding.whatsNew.record(it) } - ) is Event.OnboardingPrivateBrowsing -> EventWrapper( { Onboarding.prefToggledPrivateBrowsing.record(it) } ) @@ -708,6 +677,7 @@ private val Event.wrapper: EventWrapper<*>? is Event.AddonInstalled -> null is Event.SearchWidgetInstalled -> null is Event.ChangedToDefaultBrowser -> null + is Event.SyncAuthFromSharedReuse, Event.SyncAuthFromSharedCopy -> null } class GleanMetricsService( diff --git a/app/src/main/java/org/mozilla/fenix/home/intent/NotificationsIntentProcessor.kt b/app/src/main/java/org/mozilla/fenix/home/intent/NotificationsIntentProcessor.kt index 06aefa23fd..80a94d3d1c 100644 --- a/app/src/main/java/org/mozilla/fenix/home/intent/NotificationsIntentProcessor.kt +++ b/app/src/main/java/org/mozilla/fenix/home/intent/NotificationsIntentProcessor.kt @@ -7,7 +7,6 @@ package org.mozilla.fenix.home.intent import android.content.Intent import androidx.navigation.NavController import org.mozilla.fenix.HomeActivity -import org.mozilla.fenix.components.metrics.Event import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.sessionsOfType @@ -22,16 +21,10 @@ class NotificationsIntentProcessor( override fun process(intent: Intent, navController: NavController, out: Intent): Boolean { return if (intent.extras?.getBoolean(HomeActivity.EXTRA_DELETE_PRIVATE_TABS) == true) { out.putExtra(HomeActivity.EXTRA_DELETE_PRIVATE_TABS, false) - activity.components.analytics.metrics.track(Event.PrivateBrowsingNotificationDeleteAndOpenTapped) activity.components.core.sessionManager.run { sessionsOfType(private = true).forEach { remove(it) } } true - } else if (intent.extras?.getBoolean(HomeActivity.EXTRA_OPENED_FROM_NOTIFICATION) == true) { - activity.components.analytics.metrics.track(Event.PrivateBrowsingNotificationOpenTapped) - true - } else { - false - } + } else intent.extras?.getBoolean(HomeActivity.EXTRA_OPENED_FROM_NOTIFICATION) == true } } diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingWhatsNewViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingWhatsNewViewHolder.kt index e6cd4567c8..d7fcd90553 100644 --- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingWhatsNewViewHolder.kt +++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingWhatsNewViewHolder.kt @@ -8,9 +8,7 @@ import android.view.View import androidx.recyclerview.widget.RecyclerView import kotlinx.android.synthetic.main.onboarding_whats_new.view.* import org.mozilla.fenix.R -import org.mozilla.fenix.components.metrics.Event import org.mozilla.fenix.ext.addUnderline -import org.mozilla.fenix.ext.components import org.mozilla.fenix.home.sessioncontrol.OnboardingInteractor class OnboardingWhatsNewViewHolder( @@ -27,7 +25,6 @@ class OnboardingWhatsNewViewHolder( view.get_answers.addUnderline() view.get_answers.setOnClickListener { interactor.onWhatsNewGetAnswersClicked() - view.context.components.analytics.metrics.track(Event.OnboardingWhatsNew) } } diff --git a/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt b/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt index 34786fed0f..4b7f140669 100644 --- a/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt @@ -212,11 +212,9 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler { toolbarView.view.clearFocus() if (requireContext().settings().shouldShowCameraPermissionPrompt) { - requireComponents.analytics.metrics.track(Event.QRScannerOpened) qrFeature.get()?.scan(R.id.search_wrapper) } else { if (requireContext().isPermissionGranted(Manifest.permission.CAMERA)) { - requireComponents.analytics.metrics.track(Event.QRScannerOpened) qrFeature.get()?.scan(R.id.search_wrapper) } else { interactor.onCameraPermissionsNeeded() @@ -357,11 +355,9 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler { ) setMessage(spannable) setNegativeButton(R.string.qr_scanner_dialog_negative) { dialog: DialogInterface, _ -> - requireComponents.analytics.metrics.track(Event.QRScannerNavigationDenied) dialog.cancel() } setPositiveButton(R.string.qr_scanner_dialog_positive) { dialog: DialogInterface, _ -> - requireComponents.analytics.metrics.track(Event.QRScannerNavigationAllowed) (activity as HomeActivity) .openToBrowserAndLoad( searchTermOrURL = result, @@ -372,7 +368,6 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler { } create() }.show() - requireComponents.analytics.metrics.track(Event.QRScannerPromptDisplayed) } } ) diff --git a/app/src/main/java/org/mozilla/fenix/settings/account/AccountSettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/account/AccountSettingsFragment.kt index 570ec64b4c..655d76e659 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/account/AccountSettingsFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/account/AccountSettingsFragment.kt @@ -84,11 +84,6 @@ class AccountSettingsFragment : PreferenceFragmentCompat() { requireComponents.analytics.metrics.track(Event.SyncAccountOpened) } - override fun onDestroy() { - super.onDestroy() - requireComponents.analytics.metrics.track(Event.SyncAccountClosed) - } - @ExperimentalCoroutinesApi override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/app/src/main/java/org/mozilla/fenix/settings/account/TurnOnSyncFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/account/TurnOnSyncFragment.kt index fae8243782..27734d9450 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/account/TurnOnSyncFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/account/TurnOnSyncFragment.kt @@ -43,11 +43,9 @@ class TurnOnSyncFragment : Fragment(), AccountObserver { private val paringClickListener = View.OnClickListener { if (requireContext().settings().shouldShowCameraPermissionPrompt) { - requireComponents.analytics.metrics.track(Event.QRScannerOpened) navigateToPairFragment() } else { if (requireContext().isPermissionGranted(Manifest.permission.CAMERA)) { - requireComponents.analytics.metrics.track(Event.QRScannerOpened) navigateToPairFragment() } else { interactor.onCameraPermissionsNeeded()