Skip to content
This repository was archived by the owner on Jul 22, 2024. It is now read-only.

Commit f603662

Browse files
mdboomdaoshengmu
authored andcommitted
Update to new usage of Glean Gradle plugin
1 parent 9d848c4 commit f603662

File tree

4 files changed

+16
-5
lines changed

4 files changed

+16
-5
lines changed

app/build.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ apply plugin: 'kotlin-android'
88
apply plugin: 'kotlin-android-extensions'
99
apply plugin: "org.mozilla.telemetry.glean-gradle-plugin"
1010

11+
deps.telemetry.glean_unittests = "org.mozilla.telemetry:glean-forUnitTests:$project.ext.glean_version"
12+
1113
def getGitHash = { ->
1214
def stdout = new ByteArrayOutputStream()
1315
exec {

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
addRepos(repositories)
66
dependencies {
77
classpath 'com.android.tools.build:gradle:3.6.1'
8-
classpath "org.mozilla.telemetry:glean-gradle-plugin:$versions.telemetry"
8+
classpath "org.mozilla.components:tooling-glean-gradle:$versions.android_components"
99
classpath "$deps.kotlin.plugin"
1010

1111
// NOTE: Do not place your application dependencies here; they belong

docs/metrics.md

+11
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,23 @@ This means you might have to go searching through the dependency tree to get a f
1414

1515

1616
## baseline
17+
1718
This is a built-in ping that is assembled out of the box by the Glean SDK.
19+
1820
See the Glean SDK documentation for the [`baseline` ping](https://mozilla.github.io/glean/book/user/pings/baseline.html).
21+
1922
The following metrics are added to the ping:
2023

2124
| Name | Type | Description | Data reviews | Extras | Expiration |
2225
| --- | --- | --- | --- | --- | --- |
2326
| distribution.channel_name |[string](https://mozilla.github.io/glean/book/user/metrics/string.html) |The distribution channel name of this application. We use this field to recognize Firefox Reality is distributed to which channels, such as wavevr, oculusvr, etc. |[1](https://github.com/MozillaReality/FirefoxReality/pull/1854#issuecomment-546214568), [2](https://github.com/MozillaReality/FirefoxReality/pull/3199#issuecomment-617938749)||2020-11-01 |
2427

2528
## events
29+
2630
This is a built-in ping that is assembled out of the box by the Glean SDK.
31+
2732
See the Glean SDK documentation for the [`events` ping](https://mozilla.github.io/glean/book/user/pings/events.html).
33+
2834
The following metrics are added to the ping:
2935

3036
| Name | Type | Description | Data reviews | Extras | Expiration |
@@ -35,8 +41,11 @@ The following metrics are added to the ping:
3541
| firefox_account.sign_out |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user pressed the sign out button on the sync account page and was successfully signed out of FxA |[1](https://github.com/MozillaReality/FirefoxReality/pull/2327#issuecomment-559103837), [2](https://github.com/MozillaReality/FirefoxReality/pull/3199#issuecomment-617938749)||2020-11-01 |
3642

3743
## metrics
44+
3845
This is a built-in ping that is assembled out of the box by the Glean SDK.
46+
3947
See the Glean SDK documentation for the [`metrics` ping](https://mozilla.github.io/glean/book/user/pings/metrics.html).
48+
4049
The following metrics are added to the ping:
4150

4251
| Name | Type | Description | Data reviews | Extras | Expiration |
@@ -50,8 +59,10 @@ The following metrics are added to the ping:
5059
| url.query_type |[labeled_counter](https://mozilla.github.io/glean/book/user/metrics/labeled_counters.html) |Counting how many URLs are visited in a day, by input method. |[1](https://github.com/MozillaReality/FirefoxReality/pull/2241#issuecomment-557740258), [2](https://github.com/MozillaReality/FirefoxReality/pull/3199#issuecomment-617938749)|<ul><li>type_link</li><li>type_query</li><li>voice_query</li></ul>|2020-11-01 |
5160

5261
## session-end
62+
5363
This ping is sent at the end of a session (when Firefox Reality switches to the background). We usually send search and UI control metrics at the end of a session.
5464

65+
5566
The following metrics are added to the ping:
5667

5768
| Name | Type | Description | Data reviews | Extras | Expiration |

versions.gradle

+2-4
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ ext.deps = [:]
2424
def versions = [:]
2525
// GeckoView versions can be found here:
2626
// https://maven.mozilla.org/?prefix=maven2/org/mozilla/geckoview/
27-
versions.gecko_view = "78.0.20200514094044"
28-
versions.android_components = "28.0.1"
27+
versions.gecko_view = "78.0.20200507085231"
28+
versions.android_components = "37.0.0"
2929
// Note that android-components also depends on application-services,
3030
// and in fact is our main source of appservices-related functionality.
3131
// The version number below tracks the application-services version
@@ -51,7 +51,6 @@ versions.snakeyaml = "1.24"
5151
versions.gson = "2.8.5"
5252
versions.robolectric = "4.2.1"
5353
versions.work = "2.2.0"
54-
versions.telemetry = "24.1.0"
5554
ext.versions = versions
5655

5756
def deps = [:]
@@ -148,7 +147,6 @@ kotlin.coroutines_jdk8 = "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:$version
148147
deps.kotlin = kotlin
149148

150149
def telemetry = [:]
151-
telemetry.glean_unittests = "org.mozilla.telemetry:glean-forUnitTests:$versions.telemetry"
152150
deps.telemetry = telemetry
153151

154152
deps.constraint_layout = "androidx.constraintlayout:constraintlayout:$versions.constraint_layout"

0 commit comments

Comments
 (0)