tor-browser

commit cd411dbc377c50d249ad3986c401fd5d1bce60cc
parent 9057fd2d7217abee679157a92d93c4e1f9e3bd56
Author: Atila Butkovits <abutkovits@mozilla.com>
Date:   Thu, 30 Oct 2025 04:32:18 +0200

Revert "Bug 1997164 - Add profileGroupProfileCount to TargetingContextRecorder r=nimbus-reviewers,emcminn" for causing failures at test_targeting_context_metrics.py.

This reverts commit 9057fd2d7217abee679157a92d93c4e1f9e3bd56.

Revert "Bug 1997164 - Add targeting for number of profiles in a group r=nimbus-reviewers,omc-reviewers,emcminn"

This reverts commit 9b4be3fbfac08d4a974aaabdc8f7de66e3d4b667.

Diffstat:
M
browser/components/asrouter/docs/targeting-attributes.md
 | 
6
------
M
browser/components/asrouter/modules/ASRouterTargeting.sys.mjs
 | 
21
---------------------
M
toolkit/components/nimbus/lib/TargetingContextRecorder.sys.mjs
 | 
1
-
M
toolkit/components/nimbus/metrics.yaml
 | 
20
--------------------

4 files changed, 0 insertions(+), 48 deletions(-)
diff --git a/browser/components/asrouter/docs/targeting-attributes.md b/browser/components/asrouter/docs/targeting-attributes.md
@@ -29,7 +29,6 @@ Please note that some targeting attributes require stricter controls on the tele
 * [currentTabGroups](#currenttabgroups)
 * [currentTabInstalledAsWebApp](#currenttabinstalledaswebapp)
 * [currentProfileId](#currentprofileid)
-* [profileGroupProfileCount](#profileGroupProfileCount)
 * [defaultPDFHandler](#defaultpdfhandler)
 * [devToolsOpenedCount](#devtoolsopenedcount)
 * [distributionId](#distributionid)
@@ -1169,11 +1168,6 @@ Returns the stable profile group ID used for data reporting.
 
 The integer-valued identifier of the current selectable profile, as reported by `SelectableProfileService`, converted to a string.
 
-### `profileGroupProfileCount`
-
-The number of profiles in the current profile group or zero if either the
-feature is not enabled or the user has not created any profiles.
-
 ### `backupsInfo`
 
 Provides information about the backups a user has in the default directory.
diff --git a/browser/components/asrouter/modules/ASRouterTargeting.sys.mjs b/browser/components/asrouter/modules/ASRouterTargeting.sys.mjs
@@ -427,23 +427,6 @@ export const QueryCache = {
       FRECENT_SITES_UPDATE_INTERVAL,
       ClientID
     ),
-    profileGroupProfileCount: new CachedTargetingGetter(
-      "getProfileGroupProfileCount",
-      null,
-      FRECENT_SITES_UPDATE_INTERVAL,
-      {
-        getProfileGroupProfileCount() {
-          if (
-            !Services.prefs.getBoolPref("browser.profiles.enabled", false) ||
-            !Services.prefs.getBoolPref("browser.profiles.created", false)
-          ) {
-            return 0;
-          }
-
-          return lazy.SelectableProfileService.getProfileCount();
-        },
-      }
-    ),
     backupsInfo: new CachedTargetingGetter(
       "findBackupsInWellKnownLocations",
       null,
@@ -1335,10 +1318,6 @@ const TargetingGetters = {
     return lazy.SelectableProfileService.currentProfile.id.toString();
   },
 
-  get profileGroupProfileCount() {
-    return QueryCache.getters.profileGroupProfileCount.get();
-  },
-
   get buildId() {
     return parseInt(AppConstants.MOZ_BUILDID, 10);
   },
diff --git a/toolkit/components/nimbus/lib/TargetingContextRecorder.sys.mjs b/toolkit/components/nimbus/lib/TargetingContextRecorder.sys.mjs
@@ -159,7 +159,6 @@ export const ATTRIBUTE_TRANSFORMS = Object.freeze({
   ),
   primaryResolution: pick("height", "width"),
   profileAgeCreated: typeAssertions.quantity,
-  profileGroupProfileCount: typeAssertions.quantity,
   region: typeAssertions.string,
   totalBookmarksCount: typeAssertions.quantity,
   userMonthlyActivity: userMonthlyActivity =>
diff --git a/toolkit/components/nimbus/metrics.yaml b/toolkit/components/nimbus/metrics.yaml
@@ -32,7 +32,6 @@ nimbus_targeting_environment:
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1971552
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1967328
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1983122
-      - https://bugzilla.mozilla.org/show_bug.cgi?id=1997164
     data_reviews: &targeting_context_data_reviews
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1928107
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1937207
@@ -43,7 +42,6 @@ nimbus_targeting_environment:
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1971552
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1967328
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1983122
-      - https://bugzilla.mozilla.org/show_bug.cgi?id=1997164
     notification_emails: &targeting_context_notification_emails
       - beth@mozilla.com
       - project-nimbus@mozilla.com
@@ -96,7 +94,6 @@ nimbus_targeting_environment:
       - "nimbus.qa.pref-1"
       - "nimbus.qa.pref-2"
       - "security.sandbox.content.level"
-      - "toolkit.profile.created"
       - "trailhead.firstrun.didSeeAboutWelcome"
 
   attr_eval_errors:
@@ -139,7 +136,6 @@ nimbus_targeting_environment:
       - "os"
       - "primaryResolution"
       - "profileAgeCreated"
-      - "profileGroupProfileCount"
       - "region"
       - "totalBookmarksCount"
       - "userMonthlyActivity"
@@ -216,8 +212,6 @@ nimbus_targeting_environment:
           type: number
         security__sandbox__content__level:
           type: number
-        toolkit__profile__created:
-          type: boolean
         trailhead__firstrun__didSeeAboutWelcome:
           type: boolean
 
@@ -652,20 +646,6 @@ nimbus_targeting_context:
     type: quantity
     unit: seconds since UNIX epoch
 
-  profile_group_profile_count:
-    bugs: *targeting_context_bugs
-    data_reviews: *targeting_context_data_reviews
-    expires: *targeting_context_expiry
-    notification_emails: *targeting_context_notification_emails
-    send_in_pings: *targeting_context_pings
-    description: >
-      The number of profiles in the current profile group or zero if either the
-      feature is not enabled or the user has not created any profiles.
-    data_sensitivity:
-      - interaction
-    type: quantity
-    unit: profiles
-
   region:
     bugs: *targeting_context_bugs
     data_reviews: *targeting_context_data_reviews