feat(billing): Add continuous profiling to spend notifications user prefs page

Author: dashed

src/sentry/features/permanent.py

@@ -108,6 +108,9 @@ def register_permanent_features(manager: FeatureManager):
         "organizations:team-roles": True,
         # Enable the uptime monitoring features
         "organizations:uptime": True,
+        # Feature flag for continuous profiling billing-related features.
+        # Separate from organizations:continuous-profiling feature flag.
+        "organizations:continuous-profiling-billing": False,
         # Signals that the organization supports the on demand metrics prefill.
         "organizations:on-demand-metrics-prefill": False,
         # Metrics: Enable ingestion and storage of custom metrics. See custom-metrics for UI.

static/app/constants/index.tsx

@@ -256,7 +256,7 @@ export const DEFAULT_RELATIVE_PERIODS_PAGE_FILTER = {
 };
 
 // https://github.com/getsentry/relay/blob/master/relay-base-schema/src/data_category.rs
-export const DATA_CATEGORY_INFO = {
+export const DATA_CATEGORY_INFO: Record<DataCategoryExact, DataCategoryInfo> = {
   [DataCategoryExact.ERROR]: {
     name: DataCategoryExact.ERROR,
     apiName: 'error',
@@ -375,7 +375,7 @@ export const DATA_CATEGORY_INFO = {
     titleName: t('Profile Hours'),
     productName: t('Continuous Profiling'),
     uid: 17,
-    isBilledCategory: false, // TODO(Continuous Profiling GA): make true for launch to show spend notification toggle
+    isBilledCategory: true,
   },
   [DataCategoryExact.PROFILE_DURATION_UI]: {
     name: DataCategoryExact.PROFILE_DURATION_UI,
@@ -385,7 +385,7 @@ export const DATA_CATEGORY_INFO = {
     titleName: t('UI Profile Hours'),
     productName: t('UI Profiling'),
     uid: 25,
-    isBilledCategory: false, // TODO(Continuous Profiling GA): make true for launch to show spend notification toggle
+    isBilledCategory: true,
   },
   [DataCategoryExact.UPTIME]: {
     name: DataCategoryExact.UPTIME,

static/app/views/settings/account/notifications/notificationSettingsByType.spec.tsx

@@ -318,9 +318,13 @@ describe('NotificationSettingsByType', function () {
   });
 
   it('spend notifications on org with am3 with spend visibility notifications', async function () {
-    const organization = OrganizationFixture();
-    organization.features.push('spend-visibility-notifications');
-    organization.features.push('am3-tier');
+    const organization = OrganizationFixture({
+      features: [
+        'spend-visibility-notifications',
+        'am3-tier',
+        'continuous-profiling-billing',
+      ],
+    });
     renderComponent({
       notificationType: 'quota',
       organizations: [organization],
@@ -333,7 +337,8 @@ describe('NotificationSettingsByType', function () {
     expect(screen.getByText('Session Replays')).toBeInTheDocument();
     expect(screen.getByText('Attachments')).toBeInTheDocument();
     expect(screen.getByText('Spend Allocations')).toBeInTheDocument();
-    expect(screen.queryByText('Continuous Profiling')).not.toBeInTheDocument(); // TODO(Continuous Profiling GA): should be in document
+    expect(screen.getByText('Profile Hours', {exact: true})).toBeInTheDocument();
+    expect(screen.getByText('UI Profile Hours', {exact: true})).toBeInTheDocument();
     expect(screen.queryByText('Transactions')).not.toBeInTheDocument();
 
     const editSettingMock = MockApiClient.addMockResponse({
@@ -366,9 +371,13 @@ describe('NotificationSettingsByType', function () {
   });
 
   it('spend notifications on org with am3 and org without am3', async function () {
-    const organization = OrganizationFixture();
-    organization.features.push('spend-visibility-notifications');
-    organization.features.push('am3-tier');
+    const organization = OrganizationFixture({
+      features: [
+        'spend-visibility-notifications',
+        'am3-tier',
+        'continuous-profiling-billing',
+      ],
+    });
     const otherOrganization = OrganizationFixture();
     renderComponent({
       notificationType: 'quota',
@@ -383,13 +392,15 @@ describe('NotificationSettingsByType', function () {
     expect(screen.getByText('Attachments')).toBeInTheDocument();
     expect(screen.getByText('Spend Allocations')).toBeInTheDocument();
     expect(screen.getByText('Transactions')).toBeInTheDocument();
-    expect(screen.queryByText('Continuous Profiling')).not.toBeInTheDocument(); // TODO(Continuous Profiling GA): should be in document
+    expect(screen.getByText('Profile Hours', {exact: true})).toBeInTheDocument();
+    expect(screen.getByText('UI Profile Hours', {exact: true})).toBeInTheDocument();
   });
 
   it('spend notifications on org with am1 org only', async function () {
     const organization = OrganizationFixture();
     organization.features.push('spend-visibility-notifications');
     organization.features.push('am1-tier');
+    organization.features.push('continuous-profiling-billing');
     const otherOrganization = OrganizationFixture();
     renderComponent({
       notificationType: 'quota',
@@ -403,13 +414,15 @@ describe('NotificationSettingsByType', function () {
     expect(screen.getByText('Attachments')).toBeInTheDocument();
     expect(screen.getByText('Spend Allocations')).toBeInTheDocument();
     expect(screen.getByText('Transactions')).toBeInTheDocument();
-    expect(screen.queryByText('Continuous Profiling')).not.toBeInTheDocument();
+    expect(screen.queryByText('Profile Hours', {exact: true})).not.toBeInTheDocument();
+    expect(screen.queryByText('UI Profile Hours', {exact: true})).not.toBeInTheDocument();
     expect(screen.queryByText('Spans')).not.toBeInTheDocument();
   });
 
   it('spend notifications on org with am3 without spend visibility notifications', async function () {
-    const organization = OrganizationFixture();
-    organization.features.push('am3-tier');
+    const organization = OrganizationFixture({
+      features: ['am3-tier', 'continuous-profiling-billing'],
+    });
     renderComponent({
       notificationType: 'quota',
       organizations: [organization],
@@ -423,7 +436,8 @@ describe('NotificationSettingsByType', function () {
     expect(screen.getByText('Session Replays')).toBeInTheDocument();
     expect(screen.getByText('Attachments')).toBeInTheDocument();
     expect(screen.getByText('Spend Allocations')).toBeInTheDocument();
-    expect(screen.queryByText('Continuous Profiling')).not.toBeInTheDocument(); // TODO(Continuous Profiling GA): should be in document
+    expect(screen.getByText('Profile Hours', {exact: true})).toBeInTheDocument();
+    expect(screen.getByText('UI Profile Hours', {exact: true})).toBeInTheDocument();
     expect(screen.queryByText('Transactions')).not.toBeInTheDocument();
 
     const editSettingMock = MockApiClient.addMockResponse({
@@ -454,4 +468,32 @@ describe('NotificationSettingsByType', function () {
       })
     );
   });
+
+  it('should not show Profile Hours when continuous-profiling-billing is not enabled', async function () {
+    const organization = OrganizationFixture({
+      features: [
+        'spend-visibility-notifications',
+        'am3-tier',
+        // No continuous-profiling-billing feature
+      ],
+    });
+    renderComponent({
+      notificationType: 'quota',
+      organizations: [organization],
+    });
+
+    expect(await screen.getAllByText('Spend Notifications').length).toBe(2);
+
+    // These should be present
+    expect(screen.getByText('Errors')).toBeInTheDocument();
+    expect(screen.getByText('Spans')).toBeInTheDocument();
+    expect(screen.getByText('Session Replays')).toBeInTheDocument();
+    expect(screen.getByText('Attachments')).toBeInTheDocument();
+    expect(screen.getByText('Spend Allocations')).toBeInTheDocument();
+
+    // These should NOT be present
+    expect(screen.queryByText('Profile Hours', {exact: true})).not.toBeInTheDocument();
+    expect(screen.queryByText('UI Profile Hours', {exact: true})).not.toBeInTheDocument();
+    expect(screen.queryByText('Transactions')).not.toBeInTheDocument();
+  });
 });

static/app/views/settings/account/notifications/notificationSettingsByType.tsx

@@ -199,9 +199,15 @@ class NotificationSettingsByTypeV2 extends DeprecatedAsyncComponent<Props, State
       organization.features?.includes('am2-tier')
     );
 
+    // Check if any organization has the continuous-profiling-billing feature flag
+    const hasOrgWithContinuousProfilingBilling = organizations.some(organization =>
+      organization.features?.includes('continuous-profiling-billing')
+    );
+
     const excludeTransactions = hasOrgWithAm3 && !hasOrgWithoutAm3;
     const includeSpans = hasOrgWithAm3;
-    const includeProfileDuration = hasOrgWithAm2 || hasOrgWithAm3;
+    const includeProfileDuration =
+      (hasOrgWithAm2 || hasOrgWithAm3) && hasOrgWithContinuousProfilingBilling;
 
     // if a quota notification is not disabled, add in our dependent fields
     // but do not show the top level controller

static/app/views/settings/account/notifications/utils.tsx

@@ -56,6 +56,7 @@ export function getDocsLinkForEventType(
     case DataCategoryExact.MONITOR_SEAT:
       return 'https://docs.sentry.io/product/crons/';
     case DataCategoryExact.PROFILE_DURATION:
+    case DataCategoryExact.PROFILE_DURATION_UI:
       return 'https://docs.sentry.io/product/explore/profiling/';
     case DataCategoryExact.UPTIME:
       return 'https://docs.sentry.io/product/alerts/uptime-monitoring/';