From 0b83014a97fbd5711d6e4f189c3970df1dc84d50 Mon Sep 17 00:00:00 2001 From: Stanca Serban Date: Thu, 18 Apr 2024 20:45:58 +0300 Subject: [PATCH] Backed out changeset 1f57e3ccfcd7 (bug 1884256) for GIFFT related python failures. CLOSED TREE --- browser/components/shopping/metrics.yaml | 10 ------- toolkit/components/extensions/metrics.yaml | 30 ++++++++++--------- .../glean_parser_ext/run_glean_parser.py | 15 +--------- toolkit/mozapps/extensions/metrics.yaml | 3 -- 4 files changed, 17 insertions(+), 41 deletions(-) diff --git a/browser/components/shopping/metrics.yaml b/browser/components/shopping/metrics.yaml index 61be0c29854e..b1869e859a12 100644 --- a/browser/components/shopping/metrics.yaml +++ b/browser/components/shopping/metrics.yaml @@ -29,8 +29,6 @@ shopping.settings: send_in_pings: - metrics telemetry_mirror: SHOPPING_NIMBUS_DISABLED - no_lint: - - GIFFT_NON_PING_LIFETIME component_opted_out: type: boolean @@ -51,8 +49,6 @@ shopping.settings: send_in_pings: - metrics telemetry_mirror: SHOPPING_COMPONENT_OPTED_OUT - no_lint: - - GIFFT_NON_PING_LIFETIME has_onboarded: type: boolean @@ -74,8 +70,6 @@ shopping.settings: send_in_pings: - metrics telemetry_mirror: SHOPPING_HAS_ONBOARDED - no_lint: - - GIFFT_NON_PING_LIFETIME disabled_ads: type: boolean @@ -96,8 +90,6 @@ shopping.settings: send_in_pings: - metrics telemetry_mirror: SHOPPING_DISABLED_ADS - no_lint: - - GIFFT_NON_PING_LIFETIME auto_open_user_disabled: type: boolean @@ -118,8 +110,6 @@ shopping.settings: send_in_pings: - metrics telemetry_mirror: SHOPPING_AUTO_OPEN_USER_DISABLED - no_lint: - - GIFFT_NON_PING_LIFETIME shopping: surface_displayed: diff --git a/toolkit/components/extensions/metrics.yaml b/toolkit/components/extensions/metrics.yaml index bb062683dc3d..6d36dae614bd 100644 --- a/toolkit/components/extensions/metrics.yaml +++ b/toolkit/components/extensions/metrics.yaml @@ -58,8 +58,6 @@ extensions: data_sensitivity: - technical telemetry_mirror: EXTENSIONS_STARTUPCACHE_LOAD_TIME - no_lint: - - GIFFT_NON_PING_LIFETIME startup_cache_read_errors: type: labeled_counter @@ -77,8 +75,6 @@ extensions: data_sensitivity: - technical telemetry_mirror: EXTENSIONS_STARTUPCACHE_READ_ERRORS - no_lint: - - GIFFT_NON_PING_LIFETIME startup_cache_write_bytelength: type: quantity @@ -96,8 +92,6 @@ extensions: data_sensitivity: - technical telemetry_mirror: EXTENSIONS_STARTUPCACHE_WRITE_BYTELENGTH - no_lint: - - GIFFT_NON_PING_LIFETIME process_event: type: labeled_counter @@ -136,6 +130,7 @@ extensions.apis.dnr: expires: 138 description: | Amount of data read from the DNR startup cache file. + lifetime: application notification_emails: - addons-dev-internal@mozilla.com bugs: @@ -154,6 +149,7 @@ extensions.apis.dnr: expires: 138 description: | Amount of time it takes to read data into the DNR startup cache file. + lifetime: application notification_emails: - addons-dev-internal@mozilla.com bugs: @@ -172,6 +168,7 @@ extensions.apis.dnr: expires: 138 description: | Amount of data written to the DNR startup cache file. + lifetime: application notification_emails: - addons-dev-internal@mozilla.com bugs: @@ -190,6 +187,7 @@ extensions.apis.dnr: expires: 138 description: | Amount of time it takes to write data into the DNR startup cache file. + lifetime: application notification_emails: - addons-dev-internal@mozilla.com bugs: @@ -223,8 +221,6 @@ extensions.apis.dnr: - hit - miss telemetry_mirror: EXTENSIONS_APIS_DNR_STARTUP_CACHE_ENTRIES - no_lint: - - GIFFT_NON_PING_LIFETIME validate_rules_time: type: timing_distribution @@ -233,6 +229,7 @@ extensions.apis.dnr: description: | Amount of time it takes to validate DNR rules of individual ruleset when dynamic or static rulesets have been loaded from disk. + lifetime: application notification_emails: - addons-dev-internal@mozilla.com bugs: @@ -251,6 +248,7 @@ extensions.apis.dnr: expires: 138 description: | Amount of time it takes to evaluate DNR rules for one network request. + lifetime: application notification_emails: - addons-dev-internal@mozilla.com bugs: @@ -380,8 +378,6 @@ extensions.quarantined_domains: data_sensitivity: - technical telemetry_mirror: EXTENSIONS_QUARANTINEDDOMAINS_LISTSIZE - no_lint: - - GIFFT_NON_PING_LIFETIME listhash: type: string @@ -400,8 +396,6 @@ extensions.quarantined_domains: data_sensitivity: - technical telemetry_mirror: EXTENSIONS_QUARANTINEDDOMAINS_LISTHASH - no_lint: - - GIFFT_NON_PING_LIFETIME remotehash: type: string @@ -423,8 +417,6 @@ extensions.quarantined_domains: data_sensitivity: - technical telemetry_mirror: EXTENSIONS_QUARANTINEDDOMAINS_REMOTEHASH - no_lint: - - GIFFT_NON_PING_LIFETIME extensions.counters: @@ -496,6 +488,7 @@ extensions.timing: description: | Amount of time it takes to load a WebExtensions background page, from when the build function is called to when the page has finished processing the onload event. + lifetime: application notification_emails: - addons-dev-internal@mozilla.com bugs: @@ -513,6 +506,7 @@ extensions.timing: expires: never description: | Amount of time it takes for a BrowserAction popup to open. + lifetime: application notification_emails: - addons-dev-internal@mozilla.com bugs: @@ -538,6 +532,7 @@ extensions.timing: expires: never description: | Amount of time it takes for content scripts from a WebExtension to be injected into a window. + lifetime: application notification_emails: - addons-dev-internal@mozilla.com bugs: @@ -560,6 +555,7 @@ extensions.timing: description: | Amount of time (keyed by addon id) that an event page has been running before being suspended, or the entire addon shutdown. + lifetime: application notification_emails: - addons-dev-internal@mozilla.com bugs: @@ -577,6 +573,7 @@ extensions.timing: description: | Amount of time it takes for a WebExtension to start up, from when the startup function is called to when the startup promise resolves. + lifetime: application notification_emails: - addons-dev-internal@mozilla.com bugs: @@ -594,6 +591,7 @@ extensions.timing: expires: never description: | Amount of time it takes for a PageAction popup to open. + lifetime: application notification_emails: - addons-dev-internal@mozilla.com bugs: @@ -619,6 +617,7 @@ extensions.timing: expires: 128 description: | Amount of time it takes to perform a get via storage.local using the JSONFile backend. + lifetime: application notification_emails: - addons-dev-internal@mozilla.com bugs: @@ -644,6 +643,7 @@ extensions.timing: expires: 128 description: | Amount of time it takes to perform a set via storage.local using the JSONFile backend. + lifetime: application notification_emails: - addons-dev-internal@mozilla.com bugs: @@ -669,6 +669,7 @@ extensions.timing: expires: never description: | Amount of time it takes to perform a get via storage.local using the IndexedDB backend. + lifetime: application notification_emails: - addons-dev-internal@mozilla.com bugs: @@ -694,6 +695,7 @@ extensions.timing: expires: never description: | Amount of time it takes to perform a set via storage.local using the Indexed backend. + lifetime: application notification_emails: - addons-dev-internal@mozilla.com bugs: diff --git a/toolkit/components/glean/build_scripts/glean_parser_ext/run_glean_parser.py b/toolkit/components/glean/build_scripts/glean_parser_ext/run_glean_parser.py index 436cca974c8c..bc9f09f0d3d5 100644 --- a/toolkit/components/glean/build_scripts/glean_parser_ext/run_glean_parser.py +++ b/toolkit/components/glean/build_scripts/glean_parser_ext/run_glean_parser.py @@ -12,7 +12,7 @@ import cpp import jinja2 import jog import rust -from glean_parser import lint, metrics, parser, translate, util +from glean_parser import lint, parser, translate, util from mozbuild.util import FileAvoidWrite, memoize from util import generate_metric_ids @@ -189,19 +189,6 @@ def output_gifft_map(output_fd, probe_type, all_objs, cpp_fd): file=sys.stderr, ) sys.exit(1) - # We only support mirrors for lifetime: ping - # If you understand and are okay with how Legacy Telemetry has no - # mechanism to which to mirror non-ping lifetimes, - # you may use `no_lint: [GIFFT_NON_PING_LIFETIME]` - elif ( - metric.lifetime != metrics.Lifetime.ping - and "GIFFT_NON_PING_LIFETIME" not in metric.no_lint - ): - print( - f"Glean lifetime semantics are not mirrored. {category_name}.{metric.name}'s lifetime of {metric.lifetime} is not supported.", - file=sys.stderr, - ) - sys.exit(1) env = jinja2.Environment( loader=jinja2.PackageLoader("run_glean_parser", "templates"), diff --git a/toolkit/mozapps/extensions/metrics.yaml b/toolkit/mozapps/extensions/metrics.yaml index 5cbb2883423c..d5935ae436f8 100644 --- a/toolkit/mozapps/extensions/metrics.yaml +++ b/toolkit/mozapps/extensions/metrics.yaml @@ -343,9 +343,6 @@ blocklist: - rwu@mozilla.com expires: 132 telemetry_mirror: BLOCKLIST_MLBF_SOURCE - no_lint: - - GIFFT_NON_PING_LIFETIME - mlbf_generation_time: type: datetime description: >