Remove skip metric hacks, remove engine-gecko

probe_scraper/glean_checks.py

@@ -16,14 +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"],
-}
-
 
 def _metric_sort_key(metric: Dict[str, Any]):
     return (
@@ -147,15 +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.
-            v = [dep for dep in v if "engine-gecko" 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
 

repositories.yaml

@@ -63,23 +63,6 @@ libraries:
     variants:
       - v1_name: sync
         dependency_name: org.mozilla.appservices:syncmanager
-  - library_name: engine-gecko
-    description: GeckoView metrics
-    notification_emails:
-      - [email protected]
-      - [email protected]
-      - [email protected]
-    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: >-
@@ -434,38 +417,28 @@ 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
           of Firefox Preview.
       - 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.