From f609c7335ab462b3e9ebec99cdc73150057b3207 Mon Sep 17 00:00:00 2001 From: Jan-Erik Rediger Date: Mon, 11 May 2020 11:53:23 +0200 Subject: [PATCH 1/2] Upgrade Glean to v29.1.0 --- buildSrc/src/main/java/Dependencies.kt | 2 +- docs/changelog.md | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index 208b7a64182..d7d892726da 100644 --- 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/docs/changelog.md b/docs/changelog.md index 7337fc3cf42..02c3b9d3451 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -26,6 +26,11 @@ permalink: /changelog/ * **browser-tabstray** * Added optional `itemDecoration` DividerItemDecoration parameter to `BrowserTabsTray` constructor to allow the clients to add their own dividers. This is used to ensure setting divider item decoration after setAdapter() is called. + +* **service-glean** + * Glean was updated to v29.1.0 + * ⚠️ **This is a breaking change**: glinter errors found during code generation will now return an error code. + * The minimum and maximum values of a timing distribution can now be controlled by the `time_unit` parameter. See [bug 1630997](https://bugzilla.mozilla.org/show_bug.cgi?id=1630997) for more details. # 40.0.0 From 321215304df372c25225da1073c563c7f6e2c41e Mon Sep 17 00:00:00 2001 From: Jan-Erik Rediger Date: Mon, 11 May 2020 13:57:51 +0200 Subject: [PATCH 2/2] Apply yamllint suggestions That mostly adds the missing document begin marker (`---`) and removes some trailing whitespace. --- .../browser/engine-gecko-beta/metrics.yaml | 1 + .../browser/engine-gecko-nightly/metrics.yaml | 1 + components/browser/engine-gecko/metrics.yaml | 1 + components/lib/crash/metrics.yaml | 11 +- components/support/migration/metrics.yaml | 15 +- components/support/migration/pings.yaml | 7 +- .../support/sync-telemetry/metrics.yaml | 184 +++++++++--------- components/support/sync-telemetry/pings.yaml | 41 ++-- samples/glean/metrics.yaml | 17 +- samples/glean/pings.yaml | 7 +- .../glean/samples-glean-library/metrics.yaml | 9 +- 11 files changed, 161 insertions(+), 133 deletions(-) diff --git a/components/browser/engine-gecko-beta/metrics.yaml b/components/browser/engine-gecko-beta/metrics.yaml index 30f951256f6..77741b9e465 100644 --- 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 index 30f951256f6..77741b9e465 100644 --- 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 index 30f951256f6..77741b9e465 100644 --- 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 index 415e94254ea..5ed391e3159 100644 --- a/components/lib/crash/metrics.yaml +++ b/components/lib/crash/metrics.yaml @@ -5,6 +5,7 @@ # 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 @@ -12,11 +13,13 @@ 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 index 7929e73b5c6..41312349e27 100644 --- 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: - - fenix-core@mozilla.com + - fenix-core@mozilla.com expires: 2020-10-01 lifetime: ping detected: diff --git a/components/support/migration/pings.yaml b/components/support/migration/pings.yaml index 35eb73ee891..2deb5fb9982 100644 --- 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: - - fenix-core@mozilla.com + - fenix-core@mozilla.com data_reviews: - - https://github.com/mozilla-mobile/android-components/pull/5483#issuecomment-573971458 + - https://github.com/mozilla-mobile/android-components/pull/5483#issuecomment-573971458 diff --git a/components/support/sync-telemetry/metrics.yaml b/components/support/sync-telemetry/metrics.yaml index 66ad7197aa8..6f45fb0dcb3 100644 --- a/components/support/sync-telemetry/metrics.yaml +++ b/components/support/sync-telemetry/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 @@ -8,9 +9,12 @@ sync: sync_uuid: type: uuid description: > - Unique identifier for this sync, used to correlate together individual pings for data types that - were synchronized together (history, bookmarks, logins). If a data type is synchronized by itself via - the legacy 'sync' API (as opposed to the Sync Manager), then this field will not be set on the corresponding ping. + Unique identifier for this sync, used to correlate together + individual pings for data types that were synchronized together + (history, bookmarks, logins). + If a data type is synchronized by itself via the legacy 'sync' API + (as opposed to the Sync Manager), + then this field will not be set on the corresponding ping. send_in_pings: - sync - history-sync @@ -31,8 +35,9 @@ sync: - unexpected - auth description: > - Records a global sync failure: either due to an authentication error, unexpected exception, - or other error that caused the sync to fail. Error strings are truncated and sanitized to omit + Records a global sync failure: either due to an authentication error, + unexpected exception, or other error that caused the sync to fail. + Error strings are truncated and sanitized to omit PII, like URLs and file system paths. send_in_pings: - sync @@ -45,7 +50,8 @@ sync: expires: never lifetime: ping -# `history-sync`, `logins-sync` and `bookmarks-sync` metrics all use the same structure, +# `history-sync`, `logins-sync` and `bookmarks-sync` metrics +# all use the same structure, # but must be specified individually. We can't define them once and use # `send_in_pings` because the stores might be synced in parallel, and we can't # guarantee that a ping for one store would be sent before the others. @@ -55,13 +61,13 @@ history_sync: description: > The user's hashed Firefox Account ID. send_in_pings: - - history-sync + - history-sync bugs: - - https://github.com/mozilla-mobile/android-components/pull/3092 + - https://github.com/mozilla-mobile/android-components/pull/3092 data_reviews: - - https://github.com/mozilla-mobile/android-components/pull/3092 + - https://github.com/mozilla-mobile/android-components/pull/3092 notification_emails: - - sync-core@mozilla.com + - sync-core@mozilla.com expires: never lifetime: ping started_at: @@ -70,13 +76,13 @@ history_sync: description: > Records when the history sync started. send_in_pings: - - history-sync + - history-sync bugs: - - https://github.com/mozilla-mobile/android-components/pull/3092 + - https://github.com/mozilla-mobile/android-components/pull/3092 data_reviews: - - https://github.com/mozilla-mobile/android-components/pull/3092 + - https://github.com/mozilla-mobile/android-components/pull/3092 notification_emails: - - sync-core@mozilla.com + - sync-core@mozilla.com expires: never lifetime: ping finished_at: @@ -86,21 +92,21 @@ history_sync: Records when the history sync finished. This includes the time to download, apply, and upload all records. send_in_pings: - - history-sync + - history-sync bugs: - - https://github.com/mozilla-mobile/android-components/pull/3092 + - https://github.com/mozilla-mobile/android-components/pull/3092 data_reviews: - - https://github.com/mozilla-mobile/android-components/pull/3092 + - https://github.com/mozilla-mobile/android-components/pull/3092 notification_emails: - - sync-core@mozilla.com + - sync-core@mozilla.com expires: never lifetime: ping incoming: type: labeled_counter labels: - - applied - - failed_to_apply - - reconciled + - applied + - failed_to_apply + - reconciled description: > Records incoming history record counts. `applied` is the number of incoming history pages that were successfully stored or updated in the @@ -108,33 +114,33 @@ history_sync: ignored due to errors. `reconciled` is the number of pages with new visits locally and remotely, and had their visits merged. send_in_pings: - - history-sync + - history-sync bugs: - - https://github.com/mozilla-mobile/android-components/pull/3092 + - https://github.com/mozilla-mobile/android-components/pull/3092 data_reviews: - - https://github.com/mozilla-mobile/android-components/pull/3092 + - https://github.com/mozilla-mobile/android-components/pull/3092 notification_emails: - - sync-core@mozilla.com + - sync-core@mozilla.com expires: never lifetime: ping outgoing: type: labeled_counter labels: - - uploaded - - failed_to_upload + - uploaded + - failed_to_upload description: > Records outgoing history record counts. `uploaded` is the number of records that were successfully sent to the server. `failed_to_upload` is the number of records that weren't uploaded, and will be retried on the next sync. send_in_pings: - - history-sync + - history-sync bugs: - - https://github.com/mozilla-mobile/android-components/pull/3092 + - https://github.com/mozilla-mobile/android-components/pull/3092 data_reviews: - - https://github.com/mozilla-mobile/android-components/pull/3092 + - https://github.com/mozilla-mobile/android-components/pull/3092 notification_emails: - - sync-core@mozilla.com + - sync-core@mozilla.com expires: never lifetime: ping outgoing_batches: @@ -145,33 +151,33 @@ history_sync: bytes) on the number of records that can fit into a single batch, and large syncs may require multiple batches. send_in_pings: - - history-sync + - history-sync bugs: - - https://github.com/mozilla-mobile/android-components/pull/3092 + - https://github.com/mozilla-mobile/android-components/pull/3092 data_reviews: - - https://github.com/mozilla-mobile/android-components/pull/3092 + - https://github.com/mozilla-mobile/android-components/pull/3092 notification_emails: - - sync-core@mozilla.com + - sync-core@mozilla.com expires: never lifetime: ping failure_reason: type: labeled_string labels: - - other - - unexpected - - auth + - other + - unexpected + - auth description: > Records why the history sync failed: either due to an authentication error, unexpected exception, or other error. The error strings are truncated and sanitized to omit PII, like URLs and file system paths. send_in_pings: - - history-sync + - history-sync bugs: - - https://github.com/mozilla-mobile/android-components/pull/3092 + - https://github.com/mozilla-mobile/android-components/pull/3092 data_reviews: - - https://github.com/mozilla-mobile/android-components/pull/3092 + - https://github.com/mozilla-mobile/android-components/pull/3092 notification_emails: - - sync-core@mozilla.com + - sync-core@mozilla.com expires: never lifetime: ping @@ -307,13 +313,13 @@ bookmarks_sync: description: > The user's hashed Firefox Account ID. send_in_pings: - - bookmarks-sync + - bookmarks-sync bugs: - - https://github.com/mozilla-mobile/android-components/pull/3092 + - https://github.com/mozilla-mobile/android-components/pull/3092 data_reviews: - - https://github.com/mozilla-mobile/android-components/pull/3092 + - https://github.com/mozilla-mobile/android-components/pull/3092 notification_emails: - - sync-core@mozilla.com + - sync-core@mozilla.com expires: never lifetime: ping started_at: @@ -322,13 +328,13 @@ bookmarks_sync: description: > Records when the bookmark sync started. send_in_pings: - - bookmarks-sync + - bookmarks-sync bugs: - - https://github.com/mozilla-mobile/android-components/pull/3092 + - https://github.com/mozilla-mobile/android-components/pull/3092 data_reviews: - - https://github.com/mozilla-mobile/android-components/pull/3092 + - https://github.com/mozilla-mobile/android-components/pull/3092 notification_emails: - - sync-core@mozilla.com + - sync-core@mozilla.com expires: never lifetime: ping finished_at: @@ -337,48 +343,48 @@ bookmarks_sync: description: > Records when the bookmark sync finished. send_in_pings: - - bookmarks-sync + - bookmarks-sync bugs: - - https://github.com/mozilla-mobile/android-components/pull/3092 + - https://github.com/mozilla-mobile/android-components/pull/3092 data_reviews: - - https://github.com/mozilla-mobile/android-components/pull/3092 + - https://github.com/mozilla-mobile/android-components/pull/3092 notification_emails: - - sync-core@mozilla.com + - sync-core@mozilla.com expires: never lifetime: ping incoming: type: labeled_counter labels: - - applied - - failed_to_apply - - reconciled + - applied + - failed_to_apply + - reconciled description: > Records incoming bookmark record counts. send_in_pings: - - bookmarks-sync + - bookmarks-sync bugs: - - https://github.com/mozilla-mobile/android-components/pull/3092 + - https://github.com/mozilla-mobile/android-components/pull/3092 data_reviews: - - https://github.com/mozilla-mobile/android-components/pull/3092 + - https://github.com/mozilla-mobile/android-components/pull/3092 notification_emails: - - sync-core@mozilla.com + - sync-core@mozilla.com expires: never lifetime: ping outgoing: type: labeled_counter labels: - - uploaded - - failed_to_upload + - uploaded + - failed_to_upload description: > Records outgoing bookmark record counts. send_in_pings: - - bookmarks-sync + - bookmarks-sync bugs: - - https://github.com/mozilla-mobile/android-components/pull/3092 + - https://github.com/mozilla-mobile/android-components/pull/3092 data_reviews: - - https://github.com/mozilla-mobile/android-components/pull/3092 + - https://github.com/mozilla-mobile/android-components/pull/3092 notification_emails: - - sync-core@mozilla.com + - sync-core@mozilla.com expires: never lifetime: ping outgoing_batches: @@ -386,54 +392,54 @@ bookmarks_sync: description: > Records the number of batches needed to upload all outgoing records. send_in_pings: - - bookmarks-sync + - bookmarks-sync bugs: - - https://github.com/mozilla-mobile/android-components/pull/3092 + - https://github.com/mozilla-mobile/android-components/pull/3092 data_reviews: - - https://github.com/mozilla-mobile/android-components/pull/3092 + - https://github.com/mozilla-mobile/android-components/pull/3092 notification_emails: - - sync-core@mozilla.com + - sync-core@mozilla.com expires: never lifetime: ping failure_reason: type: labeled_string labels: - - other - - unexpected - - auth + - other + - unexpected + - auth description: > Records bookmark sync failure reasons. send_in_pings: - - bookmarks-sync + - bookmarks-sync bugs: - - https://github.com/mozilla-mobile/android-components/pull/3092 + - https://github.com/mozilla-mobile/android-components/pull/3092 data_reviews: - - https://github.com/mozilla-mobile/android-components/pull/3092 + - https://github.com/mozilla-mobile/android-components/pull/3092 notification_emails: - - sync-core@mozilla.com + - sync-core@mozilla.com expires: never lifetime: ping remote_tree_problems: type: labeled_counter labels: - - orphans - - misparented_roots - - multiple_parents_by_children - - missing_parent_guids - - non_folder_parent_guids - - parent_child_disagreements - - missing_children + - orphans + - misparented_roots + - multiple_parents_by_children + - missing_parent_guids + - non_folder_parent_guids + - parent_child_disagreements + - missing_children description: > Records counts for structure problems and divergences in the remote bookmarks tree. These are documented in https://github.com/mozilla/dogear/blob/fbade15f2a4f11215e30b8f428a0a8df3defeaec/src/tree.rs#L1273-L1294. send_in_pings: - - bookmarks-sync + - bookmarks-sync bugs: - - https://github.com/mozilla-mobile/android-components/pull/3092 + - https://github.com/mozilla-mobile/android-components/pull/3092 data_reviews: - - https://github.com/mozilla-mobile/android-components/pull/3092 + - https://github.com/mozilla-mobile/android-components/pull/3092 notification_emails: - - sync-core@mozilla.com + - sync-core@mozilla.com expires: never lifetime: ping diff --git a/components/support/sync-telemetry/pings.yaml b/components/support/sync-telemetry/pings.yaml index 96780574b80..ef5192bff23 100644 --- a/components/support/sync-telemetry/pings.yaml +++ b/components/support/sync-telemetry/pings.yaml @@ -1,19 +1,27 @@ # 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 sync: description: > - A summary ping, sent every time a sync is performed. During each Sync one or more data types - could be synchronized, depending on which data types user configured to sync. Alongside with 'sync' ping - one or more individual data type specific pings will be sent. For example, if history and bookmarks - data types are configured to be synchronized, the following pings will be sent: 'sync', 'history-sync' - and 'bookmarks-sync'. Alternatively, if only history is configured to be synchronized then 'sync' and 'history-sync' - pings will be sent. In case of a "global failure" where none of the data type syncs could even start, - e.g. device is offline, only the 'sync' ping will be sent. - This ping doesn't include the `client_id` because it reports a hashed version of the user's Firefox Account ID. + A summary ping, sent every time a sync is performed. + During each Sync one or more data types could be synchronized, + depending on which data types user configured to sync. + Alongside with 'sync' ping one or more individual data type specific + pings will be sent. + For example, if history and bookmarks data types + are configured to be synchronized, the following pings will be sent: + 'sync', 'history-sync' and 'bookmarks-sync'. + Alternatively, if only history is configured to be synchronized + then 'sync' and 'history-sync' pings will be sent. + In case of a "global failure" where none of the data type syncs + could even start, e.g. device is offline, + only the 'sync' ping will be sent. + This ping doesn't include the `client_id` + because it reports a hashed version of the user's Firefox Account ID. include_client_id: false bugs: - https://github.com/mozilla-mobile/android-components/issues/5371 @@ -27,26 +35,27 @@ history-sync: because it reports a hashed version of the user's Firefox Account ID. include_client_id: false bugs: - - https://github.com/mozilla-mobile/android-components/pull/3092 + - https://github.com/mozilla-mobile/android-components/pull/3092 notification_emails: - - sync-core@mozilla.com + - sync-core@mozilla.com data_reviews: - - https://github.com/mozilla-mobile/android-components/pull/3092 + - https://github.com/mozilla-mobile/android-components/pull/3092 bookmarks-sync: description: > A ping sent for every bookmarks sync. It doesn't include the `client_id` because it reports a hashed version of the user's Firefox Account ID. include_client_id: false bugs: - - https://github.com/mozilla-mobile/android-components/pull/3092 + - https://github.com/mozilla-mobile/android-components/pull/3092 notification_emails: - - sync-core@mozilla.com + - sync-core@mozilla.com data_reviews: - - https://github.com/mozilla-mobile/android-components/pull/3092 + - https://github.com/mozilla-mobile/android-components/pull/3092 logins-sync: description: > - A ping sent for every logins/passwords sync. It doesn't include the `client_id` - because it reports a hashed version of the user's Firefox Account ID. + A ping sent for every logins/passwords sync. + It doesn't include the `client_id` because it reports + a hashed version of the user's Firefox Account ID. include_client_id: false bugs: - https://github.com/mozilla-mobile/android-components/issues/4556 diff --git a/samples/glean/metrics.yaml b/samples/glean/metrics.yaml index 8ba0f251d99..08bd3360afb 100644 --- a/samples/glean/metrics.yaml +++ b/samples/glean/metrics.yaml @@ -5,6 +5,7 @@ # 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 @@ -16,7 +17,7 @@ browser.engagement: bugs: - https://bugzilla.mozilla.org/123456789 data_reviews: - - N/A + - N/A notification_emails: - CHANGE-ME@example.com extra_keys: @@ -24,8 +25,8 @@ browser.engagement: description: "This is key one" key2: description: "This is key two" - expires: 2100-01-01 - + expires: 2100-01-01 + event_no_keys: type: event description: > @@ -33,7 +34,7 @@ browser.engagement: bugs: - https://bugzilla.mozilla.org/123456789 data_reviews: - - N/A + - N/A notification_emails: - CHANGE-ME@example.com expires: 2100-01-01 @@ -46,7 +47,7 @@ basic: bugs: - https://bugzilla.mozilla.org/123456789 data_reviews: - - N/A + - N/A notification_emails: - CHANGE-ME@example.com expires: 2100-01-01 @@ -62,7 +63,7 @@ test: bugs: - https://bugzilla.mozilla.org/123456789 data_reviews: - - N/A + - N/A notification_emails: - CHANGE-ME@example.com expires: 2100-01-01 @@ -77,7 +78,7 @@ test: bugs: - https://bugzilla.mozilla.org/123456789 data_reviews: - - N/A + - N/A notification_emails: - CHANGE-ME@example.com expires: 2100-01-01 @@ -91,7 +92,7 @@ test: bugs: - https://bugzilla.mozilla.org/1508948 data_reviews: - - N/A + - N/A notification_emails: - CHANGE-ME@example.com expires: 2100-01-01 diff --git a/samples/glean/pings.yaml b/samples/glean/pings.yaml index 52e7bd0bfc5..c467988c7c5 100644 --- a/samples/glean/pings.yaml +++ b/samples/glean/pings.yaml @@ -2,9 +2,10 @@ # 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/. -# This file defines the built-in pings that are recorded by glean telemetry. They are -# automatically converted to Kotlin code at build time using the `glean_parser` -# PyPI package. +# This file defines the built-in pings 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/pings/1-0-0 diff --git a/samples/glean/samples-glean-library/metrics.yaml b/samples/glean/samples-glean-library/metrics.yaml index 16131c0dcc7..c999c586cfb 100644 --- a/samples/glean/samples-glean-library/metrics.yaml +++ b/samples/glean/samples-glean-library/metrics.yaml @@ -2,9 +2,10 @@ # 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/. -# 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. +# This file defines the built-in pings 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 @@ -23,4 +24,4 @@ sample_metrics: - N/A notification_emails: - CHANGE-ME@example.com - expires: 2100-01-01 + expires: 2100-01-01