From c106d892857bef791bbaca26d11db44869ddc78c Mon Sep 17 00:00:00 2001 From: ValentinTimisica Date: Thu, 16 Jan 2020 11:49:18 +0200 Subject: [PATCH] For #7751: Remove 'SearchWithCustomEngine' telemetry event --- app/metrics.yaml | 11 --------- .../components/metrics/GleanMetricsService.kt | 3 --- .../fenix/components/metrics/Metrics.kt | 1 - .../mozilla/fenix/search/SearchController.kt | 23 ------------------- docs/metrics.md | 1 - 5 files changed, 39 deletions(-) diff --git a/app/metrics.yaml b/app/metrics.yaml index 91f5afe52..ffae3de4d 100644 --- a/app/metrics.yaml +++ b/app/metrics.yaml @@ -1684,17 +1684,6 @@ user_specified_search_engines: notification_emails: - fenix-core@mozilla.com expires: "2020-03-01" - search_with_custom_engine: - type: event - description: > - A user performed a search with a custom search engine - bugs: - - https://github.com/mozilla-mobile/fenix/issues/5586 - data_reviews: - - https://github.com/mozilla-mobile/fenix/pull/6918 - notification_emails: - - fenix-core@mozilla.com - expires: "2020-03-01" search_suggestions: enable_in_private: 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 7d7902659..1e6b18d22 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 @@ -459,9 +459,6 @@ private val Event.wrapper: EventWrapper<*>? is Event.CustomEngineDeleted -> EventWrapper( { UserSpecifiedSearchEngines.customEngineDeleted.record(it) } ) - is Event.SearchWithCustomEngine -> EventWrapper( - { UserSpecifiedSearchEngines.searchWithCustomEngine.record(it) } - ) // Don't record other events in Glean: is Event.AddBookmark -> null is Event.OpenedBookmark -> null diff --git a/app/src/main/java/org/mozilla/fenix/components/metrics/Metrics.kt b/app/src/main/java/org/mozilla/fenix/components/metrics/Metrics.kt index 2c71055e1..6aa75d613 100644 --- a/app/src/main/java/org/mozilla/fenix/components/metrics/Metrics.kt +++ b/app/src/main/java/org/mozilla/fenix/components/metrics/Metrics.kt @@ -139,7 +139,6 @@ sealed class Event { object ViewLoginPassword : Event() object CustomEngineAdded : Event() object CustomEngineDeleted : Event() - object SearchWithCustomEngine : Event() object PrivateBrowsingShowSearchSuggestions : Event() // Interaction events with extras diff --git a/app/src/main/java/org/mozilla/fenix/search/SearchController.kt b/app/src/main/java/org/mozilla/fenix/search/SearchController.kt index 2e4dc8fac..98e6b988d 100644 --- a/app/src/main/java/org/mozilla/fenix/search/SearchController.kt +++ b/app/src/main/java/org/mozilla/fenix/search/SearchController.kt @@ -18,7 +18,6 @@ import org.mozilla.fenix.components.metrics.Event.PerformedSearch.SearchAccessPo import org.mozilla.fenix.components.metrics.Event.PerformedSearch.SearchAccessPoint.NONE import org.mozilla.fenix.components.metrics.Event.PerformedSearch.SearchAccessPoint.SUGGESTION import org.mozilla.fenix.components.metrics.MetricsUtils -import org.mozilla.fenix.components.searchengine.CustomSearchEngineStore import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.metrics import org.mozilla.fenix.ext.nav @@ -72,13 +71,6 @@ class DefaultSearchController( } event?.let { context.metrics.track(it) } - if (CustomSearchEngineStore.isCustomSearchEngine( - context, - store.state.searchEngineSource.searchEngine.identifier - ) - ) { - context.components.analytics.metrics.track(Event.SearchWithCustomEngine) - } } } @@ -107,13 +99,6 @@ class DefaultSearchController( ) context.metrics.track(Event.EnteredUrl(false)) - if (CustomSearchEngineStore.isCustomSearchEngine( - context, - store.state.searchEngineSource.searchEngine.identifier - ) - ) { - context.components.analytics.metrics.track(Event.SearchWithCustomEngine) - } } override fun handleSearchTermsTapped(searchTerms: String) { @@ -138,14 +123,6 @@ class DefaultSearchController( ) } event?.let { context.metrics.track(it) } - - if (CustomSearchEngineStore.isCustomSearchEngine( - context, - store.state.searchEngineSource.searchEngine.identifier - ) - ) { - context.components.analytics.metrics.track(Event.SearchWithCustomEngine) - } } override fun handleSearchShortcutEngineSelected(searchEngine: SearchEngine) { diff --git a/docs/metrics.md b/docs/metrics.md index bc6733c5d..6bad02d4d 100644 --- a/docs/metrics.md +++ b/docs/metrics.md @@ -158,7 +158,6 @@ The following metrics are added to the ping: | tracking_protection.panel_settings |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user opened tracking protection settings from the panel. |[1](https://github.com/mozilla-mobile/fenix/pull/5414#issuecomment-532847188)||2020-03-01 | | user_specified_search_engines.custom_engine_added |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user added a new custom search engine |[1](https://github.com/mozilla-mobile/fenix/pull/6918)||2020-03-01 | | user_specified_search_engines.custom_engine_deleted |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user deleted a custom search engine |[1](https://github.com/mozilla-mobile/fenix/pull/6918)||2020-03-01 | -| user_specified_search_engines.search_with_custom_engine |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user performed a search with a custom search engine |[1](https://github.com/mozilla-mobile/fenix/pull/6918)||2020-03-01 | ## metrics This is a built-in ping that is assembled out of the box by the Glean SDK.