feat(errors): Add error upsampling aggregation functions with feature flag

yuvmen · yuvmen · commit 3dfca4c330ca · 2025-07-18T13:44:06.000-07:00
Allow projects with error upsampling to use new sample_count(), sample_eps() and
sample_epm() function columns in Discover, returning the non extrapolated versions of these functions.
diff --git a/src/sentry/api/bases/organization_events.py b/src/sentry/api/bases/organization_events.py
@@ -435,26 +435,24 @@ def handle_error_upsampling(self, project_ids: Sequence[int], results: dict[str,
             data = results.get("data", [])
             fields_meta = results.get("meta", {}).get("fields", {})
 
-            for result in data:
-                if "count" in result:
-                    result["count()"] = result["count"]
-                    del result["count"]
-                if "eps" in result:
-                    result["eps()"] = result["eps"]
-                    del result["eps"]
-                if "epm" in result:
-                    result["epm()"] = result["epm"]
-                    del result["epm"]
-
-            if "count" in fields_meta:
-                fields_meta["count()"] = fields_meta["count"]
-                del fields_meta["count"]
-            if "eps" in fields_meta:
-                fields_meta["eps()"] = fields_meta["eps"]
-                del fields_meta["eps"]
-            if "epm" in fields_meta:
-                fields_meta["epm()"] = fields_meta["epm"]
-                del fields_meta["epm"]
+            upsampling_affected_functions = [
+                "count",
+                "eps",
+                "epm",
+                "sample_count",
+                "sample_eps",
+                "sample_epm",
+            ]
+            for function in upsampling_affected_functions:
+                for result in data:
+                    if function in result:
+                        result[f"{function}()"] = result[function]
+                        del result[function]
+
+            for function in upsampling_affected_functions:
+                if function in fields_meta:
+                    fields_meta[f"{function}()"] = fields_meta[function]
+                    del fields_meta[function]
 
     def handle_issues(
         self, results: Sequence[Any], project_ids: Sequence[int], organization: Organization
diff --git a/src/sentry/api/helpers/error_upsampling.py b/src/sentry/api/helpers/error_upsampling.py
@@ -55,12 +55,16 @@ def transform_query_columns_for_error_upsampling(query_columns: Sequence[str]) -
 
         if column_lower == "count()":
             transformed_columns.append("upsampled_count() as count")
-
         elif column_lower == "eps()":
             transformed_columns.append("upsampled_eps() as eps")
-
         elif column_lower == "epm()":
             transformed_columns.append("upsampled_epm() as epm")
+        elif column_lower == "sample_count()":
+            transformed_columns.append("count() as sample_count")
+        elif column_lower == "sample_eps()":
+            transformed_columns.append("eps() as sample_eps")
+        elif column_lower == "sample_epm()":
+            transformed_columns.append("epm() as sample_epm")
         else:
             transformed_columns.append(column)
 
diff --git a/src/sentry/features/temporary.py b/src/sentry/features/temporary.py
@@ -558,6 +558,8 @@ def register_temporary_features(manager: FeatureManager):
     # Adds additional filters and a new section to issue alert rules.
     manager.add("projects:alert-filters", ProjectFeature, FeatureHandlerStrategy.INTERNAL, default=True)
     manager.add("projects:discard-transaction", ProjectFeature, FeatureHandlerStrategy.INTERNAL, api_expose=False)
+    # Enable error upsampling
+    manager.add("projects:error-upsampling", ProjectFeature, FeatureHandlerStrategy.FLAGPOLE, default=False, api_expose=True)
     # Enable calculating a severity score for events which create a new group
     manager.add("projects:first-event-severity-calculation", ProjectFeature, FeatureHandlerStrategy.INTERNAL, api_expose=False)
     # Enable similarity embeddings API call
diff --git a/static/app/utils/discover/fields.tsx b/static/app/utils/discover/fields.tsx
@@ -357,6 +357,24 @@ export const AGGREGATIONS = {
     isSortable: true,
     multiPlotType: 'area',
   },
+  [AggregationKey.UPSAMPLED_COUNT]: {
+    ...getDocsAndOutputType(AggregationKey.UPSAMPLED_COUNT),
+    parameters: [],
+    isSortable: true,
+    multiPlotType: 'area',
+  },
+  [AggregationKey.UPSAMPLED_EPS]: {
+    ...getDocsAndOutputType(AggregationKey.UPSAMPLED_EPS),
+    parameters: [],
+    isSortable: true,
+    multiPlotType: 'area',
+  },
+  [AggregationKey.UPSAMPLED_EPM]: {
+    ...getDocsAndOutputType(AggregationKey.UPSAMPLED_EPM),
+    parameters: [],
+    isSortable: true,
+    multiPlotType: 'area',
+  },
   [AggregationKey.FAILURE_COUNT]: {
     ...getDocsAndOutputType(AggregationKey.FAILURE_COUNT),
     parameters: [],
@@ -817,6 +835,38 @@ export const ERRORS_AGGREGATION_FUNCTIONS = [
   AggregationKey.COUNT_UNIQUE,
   AggregationKey.EPS,
   AggregationKey.EPM,
+];
+
+export const ERROR_UPSAMPLING_AGGREGATION_FUNCTIONS = [
+  AggregationKey.UPSAMPLED_COUNT,
+  AggregationKey.UPSAMPLED_EPS,
+  AggregationKey.UPSAMPLED_EPM,
+];
+
+export const TRANSACTIONS_AGGREGATION_FUNCTIONS = [
+  AggregationKey.COUNT,
+  AggregationKey.COUNT_IF,
+  AggregationKey.COUNT_UNIQUE,
+  AggregationKey.COUNT_MISERABLE,
+  AggregationKey.COUNT_WEB_VITALS,
+  AggregationKey.EPS,
+  AggregationKey.EPM,
+  AggregationKey.FAILURE_COUNT,
+  AggregationKey.MIN,
+  AggregationKey.MAX,
+  AggregationKey.SUM,
+  AggregationKey.ANY,
+  AggregationKey.P50,
+  AggregationKey.P75,
+  AggregationKey.P90,
+  AggregationKey.P95,
+  AggregationKey.P99,
+  AggregationKey.P100,
+  AggregationKey.PERCENTILE,
+  AggregationKey.AVG,
+  AggregationKey.APDEX,
+  AggregationKey.USER_MISERY,
+  AggregationKey.FAILURE_RATE,
   AggregationKey.LAST_SEEN,
 ];
 
diff --git a/static/app/utils/fields/index.ts b/static/app/utils/fields/index.ts
@@ -227,6 +227,9 @@ export enum AggregationKey {
   COUNT_WEB_VITALS = 'count_web_vitals',
   EPS = 'eps',
   EPM = 'epm',
+  UPSAMPLED_COUNT = 'upsampled_count',
+  UPSAMPLED_EPS = 'upsampled_eps',
+  UPSAMPLED_EPM = 'upsampled_epm',
   FAILURE_COUNT = 'failure_count',
   MIN = 'min',
   MAX = 'max',
@@ -507,6 +510,24 @@ export const AGGREGATION_FIELDS: Record<AggregationKey, FieldDefinition> = {
     valueType: FieldValueType.NUMBER,
     parameters: [],
   },
+  [AggregationKey.UPSAMPLED_COUNT]: {
+    desc: t('Upsampled count'),
+    kind: FieldKind.FUNCTION,
+    valueType: FieldValueType.INTEGER,
+    parameters: [],
+  },
+  [AggregationKey.UPSAMPLED_EPS]: {
+    desc: t('Upsampled EPS'),
+    kind: FieldKind.FUNCTION,
+    valueType: FieldValueType.NUMBER,
+    parameters: [],
+  },
+  [AggregationKey.UPSAMPLED_EPM]: {
+    desc: t('Upsampled EPM'),
+    kind: FieldKind.FUNCTION,
+    valueType: FieldValueType.NUMBER,
+    parameters: [],
+  },
   [AggregationKey.FAILURE_RATE]: {
     desc: t('Failed event percentage based on transaction.status'),
     kind: FieldKind.FUNCTION,
diff --git a/static/app/views/dashboards/datasetConfig/transactions.tsx b/static/app/views/dashboards/datasetConfig/transactions.tsx
@@ -12,16 +12,19 @@ import {defined} from 'sentry/utils';
 import type {CustomMeasurementCollection} from 'sentry/utils/customMeasurements/customMeasurements';
 import type {EventsTableData, TableData} from 'sentry/utils/discover/discoverQuery';
 import {
+  getAggregations,
   type QueryFieldValue,
   SPAN_OP_BREAKDOWN_FIELDS,
   TRANSACTION_FIELDS,
+  TRANSACTIONS_AGGREGATION_FUNCTIONS,
 } from 'sentry/utils/discover/fields';
 import type {
   DiscoverQueryExtras,
   DiscoverQueryRequestParams,
 } from 'sentry/utils/discover/genericDiscoverQuery';
 import {doDiscoverQuery} from 'sentry/utils/discover/genericDiscoverQuery';
 import {DiscoverDatasets} from 'sentry/utils/discover/types';
+import {AggregationKey} from 'sentry/utils/fields';
 import {getMeasurements} from 'sentry/utils/measurements/measurements';
 import {MEPState} from 'sentry/utils/performance/contexts/metricsEnhancedSetting';
 import {
@@ -135,6 +138,7 @@ function getEventsTableFieldOptions(
   customMeasurements?: CustomMeasurementCollection
 ) {
   const measurements = getMeasurements();
+  const aggregates = getAggregations(DiscoverDatasets.TRANSACTIONS);
 
   return generateFieldOptions({
     organization,
@@ -147,6 +151,13 @@ function getEventsTableFieldOptions(
         functions,
       })
     ),
+    aggregations: Object.keys(aggregates)
+      .filter(key => TRANSACTIONS_AGGREGATION_FUNCTIONS.includes(key as AggregationKey))
+      .reduce((obj, key) => {
+        // @ts-expect-error TS(7053): Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
+        obj[key] = aggregates[key];
+        return obj;
+      }, {}),
     fieldKeys: TRANSACTION_FIELDS,
   });
 }
diff --git a/static/app/views/discover/table/columnEditModal.tsx b/static/app/views/discover/table/columnEditModal.tsx
@@ -11,14 +11,17 @@ import {DISCOVER2_DOCS_URL} from 'sentry/constants';
 import {t, tct} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {Organization} from 'sentry/types/organization';
+import type {Project} from 'sentry/types/project';
 import {trackAnalytics} from 'sentry/utils/analytics';
 import type {CustomMeasurementCollection} from 'sentry/utils/customMeasurements/customMeasurements';
 import {
   type Column,
   ERROR_FIELDS,
+  ERROR_UPSAMPLING_AGGREGATION_FUNCTIONS,
   ERRORS_AGGREGATION_FUNCTIONS,
   getAggregations,
   TRANSACTION_FIELDS,
+  TRANSACTIONS_AGGREGATION_FUNCTIONS,
 } from 'sentry/utils/discover/fields';
 import {DiscoverDatasets} from 'sentry/utils/discover/types';
 import {AggregationKey, FieldKey} from 'sentry/utils/fields';
@@ -35,6 +38,7 @@ type Props = {
   organization: Organization;
   customMeasurements?: CustomMeasurementCollection;
   dataset?: DiscoverDatasets;
+  selectedProjects?: Project[];
   spanOperationBreakdownKeys?: string[];
 } & ModalRenderProps;
 
@@ -52,6 +56,7 @@ function ColumnEditModal(props: Props) {
     closeModal,
     customMeasurements,
     dataset,
+    selectedProjects,
   } = props;
 
   // Only run once for each organization.id.
@@ -73,19 +78,32 @@ function ColumnEditModal(props: Props) {
 
   if (dataset === DiscoverDatasets.ERRORS) {
     const aggregations = getAggregations(DiscoverDatasets.ERRORS);
+
+    // Check if any selected projects have error upsampling enabled
+    const hasErrorUpsampling =
+      selectedProjects?.some((project: Project) =>
+        project.features.includes('error-upsampling')
+      ) ?? false;
+
+    // Include upsampling functions if any project has the feature enabled
+    const allowedAggregations = hasErrorUpsampling
+      ? [...ERRORS_AGGREGATION_FUNCTIONS, ...ERROR_UPSAMPLING_AGGREGATION_FUNCTIONS]
+      : ERRORS_AGGREGATION_FUNCTIONS;
+
     fieldOptions = generateFieldOptions({
       organization,
       tagKeys,
       fieldKeys: ERROR_FIELDS,
       aggregations: Object.keys(aggregations)
-        .filter(key => ERRORS_AGGREGATION_FUNCTIONS.includes(key as AggregationKey))
+        .filter(key => allowedAggregations.includes(key as AggregationKey))
         .reduce((obj, key) => {
           // @ts-expect-error TS(7053): Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
           obj[key] = aggregations[key];
           return obj;
         }, {}),
     });
   } else if (dataset === DiscoverDatasets.TRANSACTIONS) {
+    const aggregations = getAggregations(DiscoverDatasets.TRANSACTIONS);
     fieldOptions = generateFieldOptions({
       organization,
       tagKeys,
@@ -97,6 +115,13 @@ function ColumnEditModal(props: Props) {
           functions,
         })
       ),
+      aggregations: Object.keys(aggregations)
+        .filter(key => TRANSACTIONS_AGGREGATION_FUNCTIONS.includes(key as AggregationKey))
+        .reduce((obj, key) => {
+          // @ts-expect-error TS(7053): Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
+          obj[key] = aggregations[key];
+          return obj;
+        }, {}),
       fieldKeys: TRANSACTION_FIELDS,
     });
   } else {
diff --git a/static/app/views/discover/table/tableView.tsx b/static/app/views/discover/table/tableView.tsx
@@ -16,6 +16,7 @@ import Truncate from 'sentry/components/truncate';
 import {IconStack} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import type {Organization} from 'sentry/types/organization';
+import type {Project} from 'sentry/types/project';
 import {trackAnalytics} from 'sentry/utils/analytics';
 import {browserHistory} from 'sentry/utils/browserHistory';
 import type {CustomMeasurementCollection} from 'sentry/utils/customMeasurements/customMeasurements';
@@ -530,6 +531,10 @@ function TableView(props: TableViewProps) {
       dataset,
     } = props;
 
+    const selectedProjects = eventView
+      .getFullSelectedProjects(projects)
+      .filter((project): project is Project => project !== undefined);
+
     openModal(
       modalProps => (
         <ColumnEditModal
@@ -541,6 +546,7 @@ function TableView(props: TableViewProps) {
           onApply={handleUpdateColumns}
           customMeasurements={customMeasurements}
           dataset={dataset}
+          selectedProjects={selectedProjects}
         />
       ),
       {modalCss: modalCss(theme), closeEvents: 'escape-key'}
