For #6577 - Remove the `total_uri_count` Glean StringMetricType
This was added as a duplicate to an already existing `total_uri_count` CounterMetricType in #4456.master
parent
5b28ad68b7
commit
ad1144c722
|
@ -362,20 +362,6 @@ metrics:
|
||||||
notification_emails:
|
notification_emails:
|
||||||
- fenix-core@mozilla.com
|
- fenix-core@mozilla.com
|
||||||
expires: "2020-09-01"
|
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:
|
toolbar_position:
|
||||||
type: string
|
type: string
|
||||||
lifetime: application
|
lifetime: application
|
||||||
|
|
|
@ -14,7 +14,6 @@ import org.mozilla.fenix.components.metrics.Event
|
||||||
import org.mozilla.fenix.components.metrics.MetricController
|
import org.mozilla.fenix.components.metrics.MetricController
|
||||||
import org.mozilla.fenix.ext.components
|
import org.mozilla.fenix.ext.components
|
||||||
import org.mozilla.fenix.ext.metrics
|
import org.mozilla.fenix.ext.metrics
|
||||||
import org.mozilla.fenix.ext.settings
|
|
||||||
|
|
||||||
class UriOpenedObserver(
|
class UriOpenedObserver(
|
||||||
private val context: Context,
|
private val context: Context,
|
||||||
|
@ -62,7 +61,6 @@ class UriOpenedObserver(
|
||||||
} else if (urlLoading != null && !session.private && temporaryFix.shouldSendEvent(session.url)) {
|
} else if (urlLoading != null && !session.private && temporaryFix.shouldSendEvent(session.url)) {
|
||||||
temporaryFix.eventSentFor = session.url
|
temporaryFix.eventSentFor = session.url
|
||||||
metrics.track(Event.UriOpened)
|
metrics.track(Event.UriOpened)
|
||||||
context.settings().totalUriCount += 1
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -532,8 +532,6 @@ class GleanMetricsService(private val context: Context) : MetricsService {
|
||||||
gleanSetStartupMetrics = MainScope().launch {
|
gleanSetStartupMetrics = MainScope().launch {
|
||||||
setStartupMetrics()
|
setStartupMetrics()
|
||||||
}
|
}
|
||||||
|
|
||||||
context.settings().totalUriCount = 0
|
|
||||||
}
|
}
|
||||||
|
|
||||||
internal fun setStartupMetrics() {
|
internal fun setStartupMetrics() {
|
||||||
|
@ -544,7 +542,6 @@ class GleanMetricsService(private val context: Context) : MetricsService {
|
||||||
}
|
}
|
||||||
mozillaProducts.set(MozillaProductDetector.getInstalledMozillaProducts(context))
|
mozillaProducts.set(MozillaProductDetector.getInstalledMozillaProducts(context))
|
||||||
adjustCampaign.set(context.settings().adjustCampaignId)
|
adjustCampaign.set(context.settings().adjustCampaignId)
|
||||||
totalUriCount.set(context.settings().totalUriCount.toString())
|
|
||||||
toolbarPosition.set(
|
toolbarPosition.set(
|
||||||
if (context.settings().shouldUseBottomToolbar) {
|
if (context.settings().shouldUseBottomToolbar) {
|
||||||
Event.ToolbarPositionChanged.Position.BOTTOM.name
|
Event.ToolbarPositionChanged.Position.BOTTOM.name
|
||||||
|
|
|
@ -410,11 +410,6 @@ class Settings private constructor(
|
||||||
default = 0
|
default = 0
|
||||||
)
|
)
|
||||||
|
|
||||||
var totalUriCount by longPreference(
|
|
||||||
appContext.getPreferenceKey(R.string.pref_key_total_uri),
|
|
||||||
default = 0
|
|
||||||
)
|
|
||||||
|
|
||||||
fun addSearchWidgetInstalled(count: Int) {
|
fun addSearchWidgetInstalled(count: Int) {
|
||||||
val key = appContext.getPreferenceKey(R.string.pref_key_search_widget_installed)
|
val key = appContext.getPreferenceKey(R.string.pref_key_search_widget_installed)
|
||||||
val newValue = preferences.getInt(key, 0) + count
|
val newValue = preferences.getInt(key, 0) + count
|
||||||
|
|
|
@ -135,7 +135,5 @@
|
||||||
<string name="pref_key_adjust_campaign" translatable="false">pref_key_adjust_campaign</string>
|
<string name="pref_key_adjust_campaign" translatable="false">pref_key_adjust_campaign</string>
|
||||||
<string name="pref_key_testing_stage" translatable="false">pref_key_testing_stage</string>
|
<string name="pref_key_testing_stage" translatable="false">pref_key_testing_stage</string>
|
||||||
|
|
||||||
<string name="pref_key_total_uri" translatable="false">pref_key_total_uri</string>
|
|
||||||
|
|
||||||
<string name="pref_key_encryption_key_generated" translatable="false">pref_key_encryption_key_generated</string>
|
<string name="pref_key_encryption_key_generated" translatable="false">pref_key_encryption_key_generated</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue