Address PR #152 review comments

- Move pings.yaml from browser/components/downloads to browser/components/enterprisepolicies
  (it's a shared enterprise ping used by multiple components)
- Update metrics_index.py to reflect new pings.yaml location
- Align download metric field naming (extension, size_bytes) across both metrics
- Add data_sensitivity: highly_sensitive to enterprise metrics for consistency

All other review comments were already addressed in earlier rebased commits.

Author: gcp

browser/components/downloads/metrics.yaml

@@ -31,6 +31,8 @@ downloads:
 #ifdef MOZ_ENTERPRISE
   file_downloaded:
     type: event
+    data_sensitivity:
+      - highly_sensitive
     description: >
       Recorded when a file download completes successfully in enterprise builds.
       Contains security-relevant metadata for monitoring and analysis.
@@ -69,43 +71,45 @@ downloads:
         type: string
   security_download_completed:
     type: event
+    data_sensitivity:
+      - highly_sensitive
     description: >
-      Recorded when a file download completes successfully. Contains security-relevant
-      metadata for enterprise monitoring and analysis. Only collected when
-      MOZ_ENTERPRISE is defined.
+      Recorded when a file download completes successfully in enterprise builds.
+      Contains security-relevant metadata for monitoring and analysis.
+      Only collected when MOZ_ENTERPRISE is defined and enabled.
     bugs:
       - https://bugzilla.mozilla.org/show_bug.cgi?id=TBD
     data_reviews:
       - https://bugzilla.mozilla.org/show_bug.cgi?id=TBD
     notification_emails:
-      - [email protected]
+      - [email protected]
+      - [email protected]
     expires: never
     send_in_pings:
       - enterprise
     extra_keys:
       filename:
         description: >
-          The filename (leaf name only) of the downloaded file.
+          The filename (basename only) of the downloaded file.
         type: string
-      file_extension:
+      extension:
         description: >
           The file extension of the downloaded file (e.g., "pdf", "exe").
         type: string
       mime_type:
         description: >
           The MIME type of the downloaded file as reported by the server.
         type: string
-      file_size:
+      size_bytes:
         description: >
-          The size of the downloaded file in bytes. Capped at 2^53-1.
-        type: string
+          The size of the downloaded file in bytes.
+        type: quantity
       source_url_domain:
         description: >
-          The domain portion of the original download URL (e.g., "example.com").
-          Query parameters and paths are excluded for privacy.
+          The domain from which the file was downloaded.
         type: string
       is_private:
         description: >
-          Whether the download originated from a private browsing session.
+          Whether the download occurred in a private browsing session.
         type: boolean
 #endif

browser/components/enterprisepolicies/helpers/WebsiteFilter.sys.mjs

@@ -178,6 +178,7 @@ export let WebsiteFilter = {
     }
     return true;
   },
+  /* eslint-disable */
 #ifdef MOZ_ENTERPRISE
   _recordBlocklistDomainBrowsed(url) {
     const isEnabled = Services.prefs.getBoolPref(
@@ -241,4 +242,5 @@ export let WebsiteFilter = {
     }
   },
 #endif
+  /* eslint-enable */
 };

browser/components/enterprisepolicies/helpers/sample_enterprise_storage_encryption.json

@@ -3,4 +3,3 @@
     "EnterpriseStorageEncryption": true
   }
 }
-

browser/components/enterprisepolicies/metrics.yaml

@@ -1,37 +1,37 @@
-# 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/.
-
-# Adding a new metric? We have docs for that!
-# https://firefox-source-docs.mozilla.org/toolkit/components/glean/user/new_definitions_file.html
-
----
-$schema: moz://mozilla.org/schemas/glean/metrics/2-0-0
-$tags:
-  - 'Firefox :: Enterprise Policies'
-
-#ifdef MOZ_ENTERPRISE
-content_policy:
-  blocklist_domain_browsed:
-    type: event
-    data_sensitivity:
-      - highly_sensitive
-    description: >
-      Recorded when a domain blocked by policy is browsed.
-      Only collected when MOZ_ENTERPRISE is defined and enabled.
-    bugs:
-      - https://bugzilla.mozilla.org/show_bug.cgi?id=TBD
-    data_reviews:
-      - https://bugzilla.mozilla.org/show_bug.cgi?id=TBD
-    notification_emails:
-      - [email protected]
-      - [email protected]
-    expires: never
-    send_in_pings:
-      - enterprise
-    extra_keys:
-      url:
-        description: >
-          The blocked url that was browsed.
-        type: string
-#endif
+# 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/.
+
+# Adding a new metric? We have docs for that!
+# https://firefox-source-docs.mozilla.org/toolkit/components/glean/user/new_definitions_file.html
+
+---
+$schema: moz://mozilla.org/schemas/glean/metrics/2-0-0
+$tags:
+  - 'Firefox :: Enterprise Policies'
+
+#ifdef MOZ_ENTERPRISE
+content_policy:
+  blocklist_domain_browsed:
+    type: event
+    data_sensitivity:
+      - highly_sensitive
+    description: >
+      Recorded when a domain blocked by policy is browsed.
+      Only collected when MOZ_ENTERPRISE is defined and enabled.
+    bugs:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=TBD
+    data_reviews:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=TBD
+    notification_emails:
+      - [email protected]
+      - [email protected]
+    expires: never
+    send_in_pings:
+      - enterprise
+    extra_keys:
+      url:
+        description: >
+          The blocked url that was browsed.
+        type: string
+#endif

browser/components/downloads/pings.yaml renamed to browser/components/enterprisepolicies/pings.yaml

@@ -734,9 +734,9 @@ Download.prototype = {
       // Record the telemetry event
       Glean.downloads.securityDownloadCompleted.record({
         filename,
-        file_extension: fileExtension,
+        extension: fileExtension,
         mime_type: this.contentType || "",
-        file_size: String(this.target.size || 0),
+        size_bytes: this.target.size || 0,
         source_url_domain: sourceDomain,
         is_private: this.source.isPrivate || false,
       });

toolkit/components/downloads/DownloadCore.sys.mjs

@@ -221,7 +221,7 @@
 firefox_desktop_pings = [
     "browser/components/asrouter/pings.yaml",
     "browser/components/backup/pings.yaml",
-    "browser/components/downloads/pings.yaml",
+    "browser/components/enterprisepolicies/pings.yaml",
     "browser/components/newtab/pings.yaml",
     "browser/components/profiles/pings.yaml",
     "browser/components/search/pings.yaml",

toolkit/components/glean/metrics_index.py

@@ -90,6 +90,8 @@ printing:
 #ifdef MOZ_ENTERPRISE
   page_printed:
     type: event
+    data_sensitivity:
+      - highly_sensitive
     description: >
       Recorded when a page is printed in enterprise builds.
       Contains security-relevant metadata for monitoring and analysis.