diff --git a/app/metrics.yaml b/app/metrics.yaml index f6c1adaec..36849ef50 100644 --- a/app/metrics.yaml +++ b/app/metrics.yaml @@ -362,20 +362,6 @@ metrics: notification_emails: - fenix-core@mozilla.com expires: "2020-09-01" - total_uri_count: - type: string - lifetime: application - description: > - A counter of URIs visited by the user in the current session, including page reloads. This does not include background page requests and URIs from embedded pages or private browsing. - send_in_pings: - - metrics - bugs: - - https://github.com/mozilla-mobile/fenix/issues/4456 - data_reviews: - - https://github.com/mozilla-mobile/fenix/pull/6003 - notification_emails: - - fenix-core@mozilla.com - expires: "2020-09-01" toolbar_position: type: string lifetime: application diff --git a/app/src/main/java/org/mozilla/fenix/browser/UriOpenedObserver.kt b/app/src/main/java/org/mozilla/fenix/browser/UriOpenedObserver.kt index f0602494b..853a58fbf 100644 --- a/app/src/main/java/org/mozilla/fenix/browser/UriOpenedObserver.kt +++ b/app/src/main/java/org/mozilla/fenix/browser/UriOpenedObserver.kt @@ -14,7 +14,6 @@ import org.mozilla.fenix.components.metrics.Event import org.mozilla.fenix.components.metrics.MetricController import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.metrics -import org.mozilla.fenix.ext.settings class UriOpenedObserver( private val context: Context, @@ -62,7 +61,6 @@ class UriOpenedObserver( } else if (urlLoading != null && !session.private && temporaryFix.shouldSendEvent(session.url)) { temporaryFix.eventSentFor = session.url metrics.track(Event.UriOpened) - context.settings().totalUriCount += 1 } } } 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 6cbc8ae69..cf352e68a 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 @@ -532,8 +532,6 @@ class GleanMetricsService(private val context: Context) : MetricsService { gleanSetStartupMetrics = MainScope().launch { setStartupMetrics() } - - context.settings().totalUriCount = 0 } internal fun setStartupMetrics() { @@ -544,7 +542,6 @@ class GleanMetricsService(private val context: Context) : MetricsService { } mozillaProducts.set(MozillaProductDetector.getInstalledMozillaProducts(context)) adjustCampaign.set(context.settings().adjustCampaignId) - totalUriCount.set(context.settings().totalUriCount.toString()) toolbarPosition.set( if (context.settings().shouldUseBottomToolbar) { Event.ToolbarPositionChanged.Position.BOTTOM.name diff --git a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt index 4cbeeacd3..10fe36a63 100644 --- a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt +++ b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt @@ -410,11 +410,6 @@ class Settings private constructor( default = 0 ) - var totalUriCount by longPreference( - appContext.getPreferenceKey(R.string.pref_key_total_uri), - default = 0 - ) - fun addSearchWidgetInstalled(count: Int) { val key = appContext.getPreferenceKey(R.string.pref_key_search_widget_installed) val newValue = preferences.getInt(key, 0) + count diff --git a/app/src/main/res/values/preference_keys.xml b/app/src/main/res/values/preference_keys.xml index 5c667c290..1db8313a4 100644 --- a/app/src/main/res/values/preference_keys.xml +++ b/app/src/main/res/values/preference_keys.xml @@ -135,7 +135,5 @@ pref_key_adjust_campaign pref_key_testing_stage - pref_key_total_uri - pref_key_encryption_key_generated diff --git a/docs/metrics.md b/docs/metrics.md index cd50ce619..145ab1251 100644 --- a/docs/metrics.md +++ b/docs/metrics.md @@ -180,7 +180,6 @@ The following metrics are added to the ping: | metrics.mozilla_products |[string_list](https://mozilla.github.io/glean/book/user/metrics/string_list.html) |A list of all the Mozilla products installed on device. We currently scan for: Firefox, Firefox Beta, Firefox Aurora, Firefox Nightly, Firefox Fdroid, Firefox Lite, Reference Browser, Reference Browser Debug, Fenix, Focus, and Lockwise. |[1](https://github.com/mozilla-mobile/fenix/pull/1953/), [2](https://github.com/mozilla-mobile/fenix/pull/5216)||2020-09-01 | | metrics.search_count |[labeled_counter](https://mozilla.github.io/glean/book/user/metrics/labeled_counters.html) |The labels for this counter are `.`. If the search engine is bundled with Fenix `search-engine-name` will be the name of the search engine. If it's a custom search engine (defined: https://github.com/mozilla-mobile/fenix/issues/1607) the value will be `custom`. `source` will be: `action`, `suggestion`, `widget` or `shortcut` (depending on the source from which the search started). Also added the `other` option for the source but it should never enter on this case. |[1](https://github.com/mozilla-mobile/fenix/pull/1677), [2](https://github.com/mozilla-mobile/fenix/pull/5216), [3](https://github.com/mozilla-mobile/fenix/pull/7310)||2020-09-01 | | metrics.toolbar_position |[string](https://mozilla.github.io/glean/book/user/metrics/string.html) |A string that indicates the new position of the toolbar TOP or BOTTOM |[1](https://github.com/mozilla-mobile/fenix/pull/6608)||2020-09-01 | -| metrics.total_uri_count |[string](https://mozilla.github.io/glean/book/user/metrics/string.html) |A counter of URIs visited by the user in the current session, including page reloads. This does not include background page requests and URIs from embedded pages or private browsing. |[1](https://github.com/mozilla-mobile/fenix/pull/6003)||2020-09-01 | | search.default_engine.code |[string](https://mozilla.github.io/glean/book/user/metrics/string.html) |If the search engine is pre-loaded with Fenix this value will be the search engine identifier. If it's a custom search engine (defined: https://github.com/mozilla-mobile/fenix/issues/1607) the value will be "custom" |[1](https://github.com/mozilla-mobile/fenix/pull/1606), [2](https://github.com/mozilla-mobile/fenix/pull/5216)||2020-09-01 | | search.default_engine.name |[string](https://mozilla.github.io/glean/book/user/metrics/string.html) |If the search engine is pre-loaded with Fenix this value will be the search engine name. If it's a custom search engine (defined: https://github.com/mozilla-mobile/fenix/issues/1607) the value will be "custom" |[1](https://github.com/mozilla-mobile/fenix/pull/1606), [2](https://github.com/mozilla-mobile/fenix/pull/5216)||2020-09-01 | | search.default_engine.submission_url |[string](https://mozilla.github.io/glean/book/user/metrics/string.html) |If the search engine is pre-loaded with Fenix this value will be he base URL we use to build the search query for the search engine. For example: https://mysearchengine.com/?query=%s. If it's a custom search engine (defined: https://github.com/mozilla-mobile/fenix/issues/1607) the value will be "custom" |[1](https://github.com/mozilla-mobile/fenix/pull/1606), [2](https://github.com/mozilla-mobile/fenix/pull/5216)||2020-09-01 |