Backed out changeset 4816ddcf03ba (bug 1883739) for causing failures in test_measurements.js CLOSED TREE

browser/components/backup/metrics.yaml HG: changed browser/components/backup/moz.build HG: changed browser/components/backup/tests/xpcshell/test_measurements.js HG: changed toolkit/components/telemetry/Scalars.yaml HG: removed
browser/components/backup/resources/PreferencesBackupResource.sys.mjs

Author: nerli1

browser/components/backup/BackupResources.sys.mjs

@@ -2,18 +2,14 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+import { CredentialsAndSecurityBackupResource } from "resource:///modules/backup/CredentialsAndSecurityBackupResource.sys.mjs";
+import { PlacesBackupResource } from "resource:///modules/backup/PlacesBackupResource.sys.mjs";
+
 /**
  * Classes exported here are registered as a resource that can be
  * backed up and restored in the BackupService.
  *
  * They must extend the BackupResource base class.
  */
-import { CredentialsAndSecurityBackupResource } from "resource:///modules/backup/CredentialsAndSecurityBackupResource.sys.mjs";
-import { PlacesBackupResource } from "resource:///modules/backup/PlacesBackupResource.sys.mjs";
-import { PreferencesBackupResource } from "resource:///modules/backup/PreferencesBackupResource.sys.mjs";
 
-export {
-  CredentialsAndSecurityBackupResource,
-  PlacesBackupResource,
-  PreferencesBackupResource,
-};
+export { CredentialsAndSecurityBackupResource, PlacesBackupResource };

browser/components/backup/metrics.yaml

@@ -94,20 +94,3 @@ browser.backup:
       - mconley@mozilla.com
     expires: never
     telemetry_mirror: BROWSER_BACKUP_SECURITY_DATA_SIZE
-
-  preferences_size:
-    type: quantity
-    unit: kilobyte
-    description: >
-      The total size of files relating to user preferences and permissions in the current profile
-      directory, in kilobytes.
-    bugs:
-      - https://bugzilla.mozilla.org/show_bug.cgi?id=1883739
-    data_reviews:
-      - https://bugzilla.mozilla.org/show_bug.cgi?id=1883739
-    data_sensitivity:
-      - technical
-    notification_emails:
-      - mconley@mozilla.com
-    expires: never
-    telemetry_mirror: BROWSER_BACKUP_PREFERENCES_SIZE

browser/components/backup/moz.build

@@ -17,5 +17,4 @@ EXTRA_JS_MODULES.backup += [
     "resources/BackupResource.sys.mjs",
     "resources/CredentialsAndSecurityBackupResource.sys.mjs",
     "resources/PlacesBackupResource.sys.mjs",
-    "resources/PreferencesBackupResource.sys.mjs",
 ]

browser/components/backup/resources/PreferencesBackupResource.sys.mjs

@@ -15,10 +15,6 @@ const { CredentialsAndSecurityBackupResource } = ChromeUtils.importESModule(
 const { PlacesBackupResource } = ChromeUtils.importESModule(
   "resource:///modules/backup/PlacesBackupResource.sys.mjs"
 );
-const { PreferencesBackupResource } = ChromeUtils.importESModule(
-  "resource:///modules/backup/PreferencesBackupResource.sys.mjs"
-);
-
 const { TelemetryTestUtils } = ChromeUtils.importESModule(
   "resource://testing-common/TelemetryTestUtils.sys.mjs"
 );
@@ -239,50 +235,3 @@ add_task(async function test_credentialsAndSecurityBackupResource() {
     await IOUtils.remove(tempPath);
   }
 });
-
-add_task(async function test_preferencesBackupResource() {
-  Services.fog.testResetFOG();
-
-  const EXPECTED_SETTINGS_KILOBYTES_SIZE = 405;
-  const tempDir = PathUtils.tempDir;
-  const mockFiles = new Map([
-    ["prefs.js", 20],
-    ["xulstore.json", 1],
-    ["permissions.sqlite", 100],
-    ["content-prefs.sqlite", 260],
-    ["containers.json", 1],
-    ["handlers.json", 1],
-    ["search.json.mozlz4", 1],
-    ["user.js", 2],
-    ["chrome/userChrome.css", 5],
-    ["chrome/userContent.css", 5],
-  ]);
-
-  for (let [mockFileName, mockFileSize] of mockFiles) {
-    let tempPath = PathUtils.joinRelative(tempDir, mockFileName);
-    await createKilobyteSizedFile(tempPath, mockFileSize);
-  }
-
-  let preferencesBackupResource = new PreferencesBackupResource();
-  await preferencesBackupResource.measure(tempDir);
-
-  let measurement = Glean.browserBackup.preferencesSize.testGetValue();
-  let scalars = TelemetryTestUtils.getProcessScalars("parent", false, false);
-
-  TelemetryTestUtils.assertScalar(
-    scalars,
-    "browser.backup.preferences_size",
-    measurement,
-    "Glean and telemetry measurements for settings data should be equal"
-  );
-  Assert.equal(
-    measurement,
-    EXPECTED_SETTINGS_KILOBYTES_SIZE,
-    "Should have collected the correct glean measurement for settings files"
-  );
-
-  for (let mockFileName of mockFiles.keys()) {
-    let tempPath = PathUtils.joinRelative(tempDir, mockFileName);
-    await IOUtils.remove(tempPath);
-  }
-});

browser/components/backup/tests/xpcshell/test_measurements.js

@@ -232,21 +232,6 @@ browser.backup:
       - 'firefox'
     record_in_processes:
       - 'main'
-  preferences_size:
-    bug_numbers:
-      - 1883739
-    description: >
-      The total size of files relating to user preferences and permissions in the current profile
-      directory, in kilobytes.
-    expires: never
-    kind: uint
-    notification_emails:
-      - mconley@mozilla.com
-    release_channel_collection: opt-out
-    products:
-      - 'firefox'
-    record_in_processes:
-      - 'main'
 
 # The following section contains the browser engagement scalars.
 browser.engagement: