Merge mozilla-mobile#6936

6936: Upgrade Glean to v29.1.0 r=Dexterp37 a=badboy Co-authored-by: Jan-Erik Rediger <[email protected]>
psymoon · May 11, 2020 · 4fa5c91 · 4fa5c91
2 parents 7a60da6 + 3212153
commit 4fa5c91
Show file tree

Hide file tree

Showing 13 changed files with 167 additions and 134 deletions.
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
@@ -29,7 +29,7 @@ object Versions {
 
     const val mozilla_appservices = "0.58.2"
 
-    const val mozilla_glean = "28.0.0"
+    const val mozilla_glean = "29.1.0"
 
     const val material = "1.1.0"
     const val nearby = "17.0.0"

diff --git a/components/browser/engine-gecko-beta/metrics.yaml b/components/browser/engine-gecko-beta/metrics.yaml
@@ -6,6 +6,7 @@
 # sure the correct code is generated even though the GeckoView AAR file
 # reports an empty metrics.yaml file. The metric in this file is currently
 # disabled and not supposed to collect any data.
+---
 
 $schema: moz://mozilla.org/schemas/glean/metrics/1-0-0
 

diff --git a/components/browser/engine-gecko-nightly/metrics.yaml b/components/browser/engine-gecko-nightly/metrics.yaml
@@ -6,6 +6,7 @@
 # sure the correct code is generated even though the GeckoView AAR file
 # reports an empty metrics.yaml file. The metric in this file is currently
 # disabled and not supposed to collect any data.
+---
 
 $schema: moz://mozilla.org/schemas/glean/metrics/1-0-0
 

diff --git a/components/browser/engine-gecko/metrics.yaml b/components/browser/engine-gecko/metrics.yaml
@@ -6,6 +6,7 @@
 # sure the correct code is generated even though the GeckoView AAR file
 # reports an empty metrics.yaml file. The metric in this file is currently
 # disabled and not supposed to collect any data.
+---
 
 $schema: moz://mozilla.org/schemas/glean/metrics/1-0-0
 

diff --git a/components/lib/crash/metrics.yaml b/components/lib/crash/metrics.yaml
@@ -5,18 +5,21 @@
 # This file defines the metrics that are recorded by glean telemetry. They are
 # automatically converted to Kotlin code at build time using the `glean_parser`
 # PyPI package.
+---
 
 $schema: moz://mozilla.org/schemas/glean/metrics/1-0-0
 
 crash_metrics:
   crash_count:
     type: labeled_counter
     description: >
-      Counts the number of crashes that occur in the application.  This measures only the counts of
-      each crash in association with the labeled type of the crash. The labels correspond to the
-      types of crashes handled by lib-crash.
+      Counts the number of crashes that occur in the application.
+      This measures only the counts of each crash in association
+      with the labeled type of the crash.
+      The labels correspond to the types of crashes handled by lib-crash.
 
-      Deprecated: `native_code_crash` replaced by `fatal_native_code_crash` and `nonfatal_native_code_crash`
+      Deprecated: `native_code_crash` replaced by `fatal_native_code_crash`
+      and `nonfatal_native_code_crash`
     labels:
       - uncaught_exception
       - caught_exception

diff --git a/components/support/migration/metrics.yaml b/components/support/migration/metrics.yaml
@@ -1,6 +1,7 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+---
 
 $schema: moz://mozilla.org/schemas/glean/metrics/1-0-0
 
@@ -124,7 +125,8 @@ migration.history:
   migrated:
     type: labeled_counter
     description: >
-      Counters describing how history migration went; should add-up to 'migration.history.detected'.
+      Counters describing how history migration went;
+      should add-up to 'migration.history.detected'.
     labels:
       - succeeded
       - failed
@@ -229,18 +231,19 @@ migration.bookmarks:
   migrated:
     type: labeled_counter
     description: >
-      Counters describing how bookmark migration went; should add-up to 'migration.bookmarks.detected'.
+      Counters describing how bookmark migration went;
+      should add-up to 'migration.bookmarks.detected'.
     labels:
       - succeeded
       - failed
     send_in_pings:
-    - migration
+      - migration
     bugs:
-    - https://github.com/mozilla-mobile/fenix/issues/5888
+      - https://github.com/mozilla-mobile/fenix/issues/5888
     data_reviews:
-    - https://github.com/mozilla-mobile/android-components/pull/5483#issuecomment-573971458
+      - https://github.com/mozilla-mobile/android-components/pull/5483#issuecomment-573971458
     notification_emails:
-    - [email protected]
+      - [email protected]
     expires: 2020-10-01
     lifetime: ping
   detected:

diff --git a/components/support/migration/pings.yaml b/components/support/migration/pings.yaml
@@ -1,6 +1,7 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+---
 
 $schema: moz://mozilla.org/schemas/glean/pings/1-0-0
 
@@ -9,8 +10,8 @@ migration:
     A ping sent after a Fennec->Fenix migration was completed.
   include_client_id: true
   bugs:
-  - https://github.com/mozilla-mobile/fenix/issues/5888
+    - https://github.com/mozilla-mobile/fenix/issues/5888
   notification_emails:
-  - [email protected]
+    - [email protected]
   data_reviews:
-  - https://github.com/mozilla-mobile/android-components/pull/5483#issuecomment-573971458
+    - https://github.com/mozilla-mobile/android-components/pull/5483#issuecomment-573971458