diff --git a/probe_scraper/glean_checks.py b/probe_scraper/glean_checks.py index f7048bef..47b523d4 100644 --- a/probe_scraper/glean_checks.py +++ b/probe_scraper/glean_checks.py @@ -16,148 +16,6 @@ from .scrapers.git_scraper import Commit -# Ugly hack to skip certain metrics which we know aren't duplicated, -# but show up duplicated due to them being moved from one -# to the other application/library. -SKIP_METRICS = { - "gecko.version": ["gecko", "pine", "firefox-desktop"], - "gecko.build_id": ["gecko", "pine", "firefox-desktop"], - "broken_site_report.breakage_category": ["gecko", "fenix", "firefox-desktop"], - "broken_site_report.description": ["gecko", "fenix", "firefox-desktop"], - "broken_site_report.url": ["gecko", "fenix", "firefox-desktop"], - "broken_site_report.browser_info.app.default_locales": [ - "gecko", - "fenix", - "firefox-desktop", - ], - "broken_site_report.browser_info.app.default_useragent_string": [ - "gecko", - "fenix", - "firefox-desktop", - ], - "broken_site_report.browser_info.app.fission_enabled": [ - "gecko", - "fenix", - "firefox-desktop", - ], - "broken_site_report.browser_info.graphics.device_pixel_ratio": [ - "gecko", - "fenix", - "firefox-desktop", - ], - "broken_site_report.browser_info.graphics.devices_json": [ - "gecko", - "fenix", - "firefox-desktop", - ], - "broken_site_report.browser_info.graphics.drivers_json": [ - "gecko", - "fenix", - "firefox-desktop", - ], - "broken_site_report.browser_info.graphics.features_json": [ - "gecko", - "fenix", - "firefox-desktop", - ], - "broken_site_report.browser_info.graphics.has_touch_screen": [ - "gecko", - "fenix", - "firefox-desktop", - ], - "broken_site_report.browser_info.graphics.monitors_json": [ - "gecko", - "fenix", - "firefox-desktop", - ], - "broken_site_report.browser_info.prefs.cookie_behavior": [ - "gecko", - "fenix", - "firefox-desktop", - ], - "broken_site_report.browser_info.prefs.global_privacy_control_enabled": [ - "gecko", - "fenix", - "firefox-desktop", - ], - "broken_site_report.browser_info.prefs.installtrigger_enabled": [ - "gecko", - "fenix", - "firefox-desktop", - ], - "broken_site_report.browser_info.prefs.opaque_response_blocking": [ - "gecko", - "fenix", - "firefox-desktop", - ], - "broken_site_report.browser_info.prefs.resist_fingerprinting_enabled": [ - "gecko", - "fenix", - "firefox-desktop", - ], - "broken_site_report.browser_info.prefs.software_webrender": [ - "gecko", - "fenix", - "firefox-desktop", - ], - "broken_site_report.browser_info.system.memory": [ - "gecko", - "fenix", - "firefox-desktop", - ], - "broken_site_report.tab_info.languages": ["gecko", "fenix", "firefox-desktop"], - "broken_site_report.tab_info.useragent_string": [ - "gecko", - "fenix", - "firefox-desktop", - ], - "broken_site_report.tab_info.antitracking.block_list": [ - "gecko", - "fenix", - "firefox-desktop", - ], - "broken_site_report.tab_info.antitracking.btp_has_purged_site": [ - "gecko", - "fenix", - "firefox-desktop", - ], - "broken_site_report.tab_info.antitracking.has_mixed_active_content_blocked": [ - "gecko", - "fenix", - "firefox-desktop", - ], - "broken_site_report.tab_info.antitracking.has_mixed_display_content_blocked": [ - "gecko", - "fenix", - "firefox-desktop", - ], - "broken_site_report.tab_info.antitracking.has_tracking_content_blocked": [ - "gecko", - "fenix", - "firefox-desktop", - ], - "broken_site_report.tab_info.antitracking.is_private_browsing": [ - "gecko", - "fenix", - "firefox-desktop", - ], - "broken_site_report.tab_info.frameworks.fastclick": [ - "gecko", - "fenix", - "firefox-desktop", - ], - "broken_site_report.tab_info.frameworks.marfeel": [ - "gecko", - "fenix", - "firefox-desktop", - ], - "broken_site_report.tab_info.frameworks.mobify": [ - "gecko", - "fenix", - "firefox-desktop", - ], -} - def _metric_sort_key(metric: Dict[str, Any]): return ( @@ -281,24 +139,6 @@ def check_for_duplicate_metrics(repositories, metrics_by_repo, emails): duplicate_sources = {} for k, v in metric_sources.items(): - # Exempt cases when one of the sources is Geckoview Streaming to - # avoid false positive duplication accross app channels. - # Temporarily exempt cases when one of the sources is server compat library - # to avoid raising alarm for metrics defined in fxa's custom ping. - v = [ - dep - for dep in v - if ( - "engine-gecko" not in dep - and "glean-server-metrics-compat" not in dep - ) - ] - - if k in SKIP_METRICS.keys(): - potential_deps = SKIP_METRICS[k] - if any([dep for dep in potential_deps if dep in v]): - continue - if len(v) > 1: duplicate_sources[k] = v diff --git a/repositories.yaml b/repositories.yaml index 8e6fc182..6473f5c0 100644 --- a/repositories.yaml +++ b/repositories.yaml @@ -93,23 +93,6 @@ libraries: variants: - v1_name: sync dependency_name: org.mozilla.appservices:syncmanager - - library_name: engine-gecko - description: GeckoView metrics - notification_emails: - - aplacitelli@mozilla.com - - android-components-team@mozilla.com - - geckoview-team@mozilla.com - url: https://github.com/mozilla/gecko-dev - metrics_files: [] - variants: - - v1_name: engine-gecko - branch: release - dependency_name: org.mozilla.components:browser-engine-gecko - - v1_name: engine-gecko-beta - branch: beta - dependency_name: org.mozilla.components:browser-engine-gecko-beta - - v1_name: engine-gecko-nightly - dependency_name: org.mozilla.components:browser-engine-gecko-nightly - library_name: logins-store description: >- @@ -722,22 +705,16 @@ applications: - v1_name: firefox-android-release app_id: org.mozilla.firefox app_channel: release - additional_dependencies: - - org.mozilla.components:browser-engine-gecko description: >- Release channel of Firefox for Android. - v1_name: firefox-android-beta app_id: org.mozilla.firefox_beta app_channel: beta - additional_dependencies: - - org.mozilla.components:browser-engine-gecko-beta description: >- Beta channel of Firefox for Android. - v1_name: fenix app_id: org.mozilla.fenix app_channel: nightly - additional_dependencies: - - org.mozilla.components:browser-engine-gecko-beta description: >- Nightly channel of Firefox for Android. Prior to June 2020, this app_id was used for the beta channel @@ -745,15 +722,11 @@ applications: - v1_name: fenix-nightly app_id: org.mozilla.fenix.nightly app_channel: nightly - additional_dependencies: - - org.mozilla.components:browser-engine-gecko-nightly description: >- Nightly channel of Firefox Preview. - v1_name: firefox-android-nightly app_id: org.mozilla.fennec.aurora app_channel: nightly - additional_dependencies: - - org.mozilla.components:browser-engine-gecko-beta description: >- Nightly channel of Firefox for Android users migrated to Fenix; delisted in June 2020.