ref(metrics): Rename session and transaction metric enum (#32314)

static/app/components/modals/addDashboardWidgetModal.tsx

@@ -132,9 +132,9 @@ const newIssueQuery: WidgetQuery = {
 
 const newMetricsQuery: WidgetQuery = {
   name: '',
-  fields: [`sum(${SessionMetric.SENTRY_SESSIONS_SESSION})`],
+  fields: [`sum(${SessionMetric.SESSION})`],
   columns: [],
-  aggregates: [`sum(${SessionMetric.SENTRY_SESSIONS_SESSION})`],
+  aggregates: [`sum(${SessionMetric.SESSION})`],
   conditions: '',
   orderby: '',
 };

static/app/utils/metrics/fields.tsx

@@ -5,67 +5,67 @@ import {MetricsOperation, MetricsType} from 'sentry/types';
 import {ColumnType} from '../discover/fields';
 
 export enum SessionMetric {
-  SENTRY_SESSIONS_SESSION = 'sentry.sessions.session',
-  SENTRY_SESSIONS_SESSION_DURATION = 'sentry.sessions.session.duration',
-  SENTRY_SESSIONS_SESSION_ERROR = 'sentry.sessions.session.error',
-  SENTRY_SESSIONS_USER = 'sentry.sessions.user',
+  SESSION = 'sentry.sessions.session',
+  SESSION_DURATION = 'sentry.sessions.session.duration',
+  SESSION_ERROR = 'sentry.sessions.session.error',
+  USER = 'sentry.sessions.user',
 }
 
 export enum TransactionMetric {
-  SENTRY_TRANSACTIONS_MEASUREMENTS_FP = 'sentry.transactions.measurements.fp',
-  SENTRY_TRANSACTIONS_MEASUREMENTS_FCP = 'sentry.transactions.measurements.fcp',
-  SENTRY_TRANSACTIONS_MEASUREMENTS_LCP = 'sentry.transactions.measurements.lcp',
-  SENTRY_TRANSACTIONS_MEASUREMENTS_FID = 'sentry.transactions.measurements.fid',
-  SENTRY_TRANSACTIONS_MEASUREMENTS_CLS = 'sentry.transactions.measurements.cls',
-  SENTRY_TRANSACTIONS_MEASUREMENTS_TTFB = 'sentry.transactions.measurements.ttfb',
-  SENTRY_TRANSACTIONS_MEASUREMENTS_TTFB_REQUESTTIME = 'sentry.transactions.measurements.ttfb.requesttime',
-  SENTRY_TRANSACTIONS_MEASUREMENTS_APP_START_COLD = 'sentry.transactions.measurements.app_start_cold',
-  SENTRY_TRANSACTIONS_MEASUREMENTS_APP_START_WARM = 'sentry.transactions.measurements.app_start_warm',
-  SENTRY_TRANSACTIONS_MEASUREMENTS_FRAMES_TOTAL = 'sentry.transactions.measurements.frames_total',
-  SENTRY_TRANSACTIONS_MEASUREMENTS_FRAMES_SLOW = 'sentry.transactions.measurements.frames_slow',
-  SENTRY_TRANSACTIONS_MEASUREMENTS_FRAMES_FROZEN = 'sentry.transactions.measurements.frames_frozen',
-  SENTRY_TRANSACTIONS_MEASUREMENTS_FRAMES_SLOW_RATE = 'sentry.transactions.measurements.frames_slow_rate',
-  SENTRY_TRANSACTIONS_MEASUREMENTS_FRAMES_FROZEN_RATE = 'sentry.transactions.measurements.frames_frozen_rate',
-  SENTRY_TRANSACTIONS_MEASUREMENTS_STALL_COUNT = 'sentry.transactions.measurements.stall_count',
-  SENTRY_TRANSACTIONS_MEASUREMENTS_STALL_TOTAL_TIME = 'sentry.transactions.measurements.stall_total_time',
-  SENTRY_TRANSACTIONS_MEASUREMENTS_STALL_LONGEST_TIME = 'sentry.transactions.measurements.stall_longest_time',
-  SENTRY_TRANSACTIONS_MEASUREMENTS_STALL_PERCENTAGE = 'sentry.transactions.measurements.stall_percentage',
-  SENTRY_TRANSACTIONS_TRANSACTION_DURATION = 'sentry.transactions.transaction.duration',
-  SENTRY_TRANSACTIONS_USER = 'sentry.transactions.user',
-  SENTRY_TRANSACTIONS_TRANSACTION = 'transaction',
+  MEASUREMENTS_FP = 'sentry.transactions.measurements.fp',
+  MEASUREMENTS_FCP = 'sentry.transactions.measurements.fcp',
+  MEASUREMENTS_LCP = 'sentry.transactions.measurements.lcp',
+  MEASUREMENTS_FID = 'sentry.transactions.measurements.fid',
+  MEASUREMENTS_CLS = 'sentry.transactions.measurements.cls',
+  MEASUREMENTS_TTFB = 'sentry.transactions.measurements.ttfb',
+  MEASUREMENTS_TTFB_REQUESTTIME = 'sentry.transactions.measurements.ttfb.requesttime',
+  MEASUREMENTS_APP_START_COLD = 'sentry.transactions.measurements.app_start_cold',
+  MEASUREMENTS_APP_START_WARM = 'sentry.transactions.measurements.app_start_warm',
+  MEASUREMENTS_FRAMES_TOTAL = 'sentry.transactions.measurements.frames_total',
+  MEASUREMENTS_FRAMES_SLOW = 'sentry.transactions.measurements.frames_slow',
+  MEASUREMENTS_FRAMES_FROZEN = 'sentry.transactions.measurements.frames_frozen',
+  MEASUREMENTS_FRAMES_SLOW_RATE = 'sentry.transactions.measurements.frames_slow_rate',
+  MEASUREMENTS_FRAMES_FROZEN_RATE = 'sentry.transactions.measurements.frames_frozen_rate',
+  MEASUREMENTS_STALL_COUNT = 'sentry.transactions.measurements.stall_count',
+  MEASUREMENTS_STALL_TOTAL_TIME = 'sentry.transactions.measurements.stall_total_time',
+  MEASUREMENTS_STALL_LONGEST_TIME = 'sentry.transactions.measurements.stall_longest_time',
+  MEASUREMENTS_STALL_PERCENTAGE = 'sentry.transactions.measurements.stall_percentage',
+  TRANSACTION_DURATION = 'sentry.transactions.transaction.duration',
+  USER = 'sentry.transactions.user',
+  TRANSACTION = 'transaction',
 }
 
 export const METRIC_TO_COLUMN_TYPE: Readonly<
   Record<SessionMetric | TransactionMetric, ColumnType>
 > = {
   // Session metrics
-  [SessionMetric.SENTRY_SESSIONS_USER]: 'integer',
-  [SessionMetric.SENTRY_SESSIONS_SESSION_ERROR]: 'integer',
-  [SessionMetric.SENTRY_SESSIONS_SESSION_DURATION]: 'duration',
-  [SessionMetric.SENTRY_SESSIONS_SESSION]: 'integer',
+  [SessionMetric.USER]: 'integer',
+  [SessionMetric.SESSION_ERROR]: 'integer',
+  [SessionMetric.SESSION_DURATION]: 'duration',
+  [SessionMetric.SESSION]: 'integer',
 
   // Transaction metrics
-  [TransactionMetric.SENTRY_TRANSACTIONS_USER]: 'integer',
-  [TransactionMetric.SENTRY_TRANSACTIONS_TRANSACTION]: 'string',
-  [TransactionMetric.SENTRY_TRANSACTIONS_TRANSACTION_DURATION]: 'duration',
-  [TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_FP]: 'duration',
-  [TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_FCP]: 'duration',
-  [TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_LCP]: 'duration',
-  [TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_FID]: 'duration',
-  [TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_CLS]: 'number',
-  [TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_TTFB]: 'duration',
-  [TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_TTFB_REQUESTTIME]: 'duration',
-  [TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_APP_START_COLD]: 'duration',
-  [TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_APP_START_WARM]: 'duration',
-  [TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_FRAMES_TOTAL]: 'integer',
-  [TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_FRAMES_SLOW]: 'integer',
-  [TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_FRAMES_FROZEN]: 'integer',
-  [TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_FRAMES_SLOW_RATE]: 'percentage',
-  [TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_FRAMES_FROZEN_RATE]: 'percentage',
-  [TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_STALL_COUNT]: 'integer',
-  [TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_STALL_TOTAL_TIME]: 'duration',
-  [TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_STALL_LONGEST_TIME]: 'duration',
-  [TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_STALL_PERCENTAGE]: 'percentage',
+  [TransactionMetric.USER]: 'integer',
+  [TransactionMetric.TRANSACTION]: 'string',
+  [TransactionMetric.TRANSACTION_DURATION]: 'duration',
+  [TransactionMetric.MEASUREMENTS_FP]: 'duration',
+  [TransactionMetric.MEASUREMENTS_FCP]: 'duration',
+  [TransactionMetric.MEASUREMENTS_LCP]: 'duration',
+  [TransactionMetric.MEASUREMENTS_FID]: 'duration',
+  [TransactionMetric.MEASUREMENTS_CLS]: 'number',
+  [TransactionMetric.MEASUREMENTS_TTFB]: 'duration',
+  [TransactionMetric.MEASUREMENTS_TTFB_REQUESTTIME]: 'duration',
+  [TransactionMetric.MEASUREMENTS_APP_START_COLD]: 'duration',
+  [TransactionMetric.MEASUREMENTS_APP_START_WARM]: 'duration',
+  [TransactionMetric.MEASUREMENTS_FRAMES_TOTAL]: 'integer',
+  [TransactionMetric.MEASUREMENTS_FRAMES_SLOW]: 'integer',
+  [TransactionMetric.MEASUREMENTS_FRAMES_FROZEN]: 'integer',
+  [TransactionMetric.MEASUREMENTS_FRAMES_SLOW_RATE]: 'percentage',
+  [TransactionMetric.MEASUREMENTS_FRAMES_FROZEN_RATE]: 'percentage',
+  [TransactionMetric.MEASUREMENTS_STALL_COUNT]: 'integer',
+  [TransactionMetric.MEASUREMENTS_STALL_TOTAL_TIME]: 'duration',
+  [TransactionMetric.MEASUREMENTS_STALL_LONGEST_TIME]: 'duration',
+  [TransactionMetric.MEASUREMENTS_STALL_PERCENTAGE]: 'percentage',
 };
 
 export const METRICS_OPERATIONS: Readonly<
@@ -76,60 +76,60 @@ export const METRICS_OPERATIONS: Readonly<
 > = {
   sum: {
     metricsTypes: ['counter'],
-    defaultValue: SessionMetric.SENTRY_SESSIONS_SESSION,
+    defaultValue: SessionMetric.SESSION,
   },
   count_unique: {
     metricsTypes: ['set'],
-    defaultValue: SessionMetric.SENTRY_SESSIONS_USER,
+    defaultValue: SessionMetric.USER,
   },
   avg: {
     metricsTypes: ['distribution'],
-    defaultValue: TransactionMetric.SENTRY_TRANSACTIONS_TRANSACTION_DURATION,
+    defaultValue: TransactionMetric.TRANSACTION_DURATION,
   },
   count: {
     metricsTypes: ['distribution'],
-    defaultValue: TransactionMetric.SENTRY_TRANSACTIONS_TRANSACTION_DURATION,
+    defaultValue: TransactionMetric.TRANSACTION_DURATION,
   },
   max: {
     metricsTypes: ['distribution'],
-    defaultValue: TransactionMetric.SENTRY_TRANSACTIONS_TRANSACTION_DURATION,
+    defaultValue: TransactionMetric.TRANSACTION_DURATION,
   },
   p50: {
     metricsTypes: ['distribution'],
-    defaultValue: TransactionMetric.SENTRY_TRANSACTIONS_TRANSACTION_DURATION,
+    defaultValue: TransactionMetric.TRANSACTION_DURATION,
   },
   p75: {
     metricsTypes: ['distribution'],
-    defaultValue: TransactionMetric.SENTRY_TRANSACTIONS_TRANSACTION_DURATION,
+    defaultValue: TransactionMetric.TRANSACTION_DURATION,
   },
   p95: {
     metricsTypes: ['distribution'],
-    defaultValue: TransactionMetric.SENTRY_TRANSACTIONS_TRANSACTION_DURATION,
+    defaultValue: TransactionMetric.TRANSACTION_DURATION,
   },
   p99: {
     metricsTypes: ['distribution'],
-    defaultValue: TransactionMetric.SENTRY_TRANSACTIONS_TRANSACTION_DURATION,
+    defaultValue: TransactionMetric.TRANSACTION_DURATION,
   },
 };
 
 // This is not the full map, just what we need for performance table.
 // In the future we might want something more generic that strips the aggregate functions.
 const DISCOVER_FIELD_TO_METRIC = {
-  'count_unique(user)': `count_unique(${TransactionMetric.SENTRY_TRANSACTIONS_USER})`,
-  'tpm()': `count(${TransactionMetric.SENTRY_TRANSACTIONS_TRANSACTION_DURATION})`,
-  'p75(measurements.fcp)': `p75(${TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_FCP})`,
-  'p75(measurements.lcp)': `p75(${TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_LCP})`,
-  'p75(measurements.fid)': `p75(${TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_FID})`,
-  'p75(measurements.cls)': `p75(${TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_CLS})`,
-  'p50()': `p50(${TransactionMetric.SENTRY_TRANSACTIONS_TRANSACTION_DURATION})`,
-  'p95()': `p95(${TransactionMetric.SENTRY_TRANSACTIONS_TRANSACTION_DURATION})`,
-  'p50(transaction.duration)': `p50(${TransactionMetric.SENTRY_TRANSACTIONS_TRANSACTION_DURATION})`,
-  'p75(transaction.duration)': `p75(${TransactionMetric.SENTRY_TRANSACTIONS_TRANSACTION_DURATION})`,
-  'p95(transaction.duration)': `p95(${TransactionMetric.SENTRY_TRANSACTIONS_TRANSACTION_DURATION})`,
-  'p75(measurements.app_start_cold)': `p75(${TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_APP_START_COLD})`,
-  'p75(measurements.app_start_warm)': `p75(${TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_APP_START_WARM})`,
-  'p75(measurements.frames_slow_rate)': `p75(${TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_FRAMES_SLOW_RATE})`,
-  'p75(measurements.frames_frozen_rate)': `p75(${TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_FRAMES_FROZEN_RATE})`,
+  'count_unique(user)': `count_unique(${TransactionMetric.USER})`,
+  'tpm()': `count(${TransactionMetric.TRANSACTION_DURATION})`,
+  'p75(measurements.fcp)': `p75(${TransactionMetric.MEASUREMENTS_FCP})`,
+  'p75(measurements.lcp)': `p75(${TransactionMetric.MEASUREMENTS_LCP})`,
+  'p75(measurements.fid)': `p75(${TransactionMetric.MEASUREMENTS_FID})`,
+  'p75(measurements.cls)': `p75(${TransactionMetric.MEASUREMENTS_CLS})`,
+  'p50()': `p50(${TransactionMetric.TRANSACTION_DURATION})`,
+  'p95()': `p95(${TransactionMetric.TRANSACTION_DURATION})`,
+  'p50(transaction.duration)': `p50(${TransactionMetric.TRANSACTION_DURATION})`,
+  'p75(transaction.duration)': `p75(${TransactionMetric.TRANSACTION_DURATION})`,
+  'p95(transaction.duration)': `p95(${TransactionMetric.TRANSACTION_DURATION})`,
+  'p75(measurements.app_start_cold)': `p75(${TransactionMetric.MEASUREMENTS_APP_START_COLD})`,
+  'p75(measurements.app_start_warm)': `p75(${TransactionMetric.MEASUREMENTS_APP_START_WARM})`,
+  'p75(measurements.frames_slow_rate)': `p75(${TransactionMetric.MEASUREMENTS_FRAMES_SLOW_RATE})`,
+  'p75(measurements.frames_frozen_rate)': `p75(${TransactionMetric.MEASUREMENTS_FRAMES_FROZEN_RATE})`,
 
   // TODO(metrics):
   // transaction.op

static/app/views/dashboardsV2/widgetBuilder/widgetBuilder.tsx

@@ -115,9 +115,9 @@ const QUERIES: Record<DataSet, WidgetQuery> = {
   },
   [DataSet.METRICS]: {
     name: '',
-    fields: [`sum(${SessionMetric.SENTRY_SESSIONS_SESSION})`],
+    fields: [`sum(${SessionMetric.SESSION})`],
     columns: [],
-    aggregates: [`sum(${SessionMetric.SENTRY_SESSIONS_SESSION})`],
+    aggregates: [`sum(${SessionMetric.SESSION})`],
     conditions: '',
     orderby: '',
   },

static/app/views/performance/landing/widgets/widgetDefinitions.tsx

@@ -102,7 +102,7 @@ export const WIDGET_DEFINITIONS: ({
     title: t('Worst LCP Web Vitals'),
     titleTooltip: getTermHelp(organization, PERFORMANCE_TERM.LCP),
     fields: isMetricsData
-      ? [`count(${TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_LCP})`]
+      ? [`count(${TransactionMetric.MEASUREMENTS_LCP})`]
       : ['measurements.lcp'],
     vitalStops: {
       poor: 4000,
@@ -114,7 +114,7 @@ export const WIDGET_DEFINITIONS: ({
     title: t('Worst FCP Web Vitals'),
     titleTooltip: getTermHelp(organization, PERFORMANCE_TERM.FCP),
     fields: isMetricsData
-      ? [`count(${TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_FCP})`]
+      ? [`count(${TransactionMetric.MEASUREMENTS_FCP})`]
       : ['measurements.fcp'],
     vitalStops: {
       poor: 3000,
@@ -126,7 +126,7 @@ export const WIDGET_DEFINITIONS: ({
     title: t('Worst FID Web Vitals'),
     titleTooltip: getTermHelp(organization, PERFORMANCE_TERM.FID),
     fields: isMetricsData
-      ? [`count(${TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_FID})`]
+      ? [`count(${TransactionMetric.MEASUREMENTS_FID})`]
       : ['measurements.fid'],
     vitalStops: {
       poor: 300,
@@ -138,7 +138,7 @@ export const WIDGET_DEFINITIONS: ({
     title: t('Worst CLS Web Vitals'),
     titleTooltip: getTermHelp(organization, PERFORMANCE_TERM.CLS),
     fields: isMetricsData
-      ? [`count(${TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_CLS})`]
+      ? [`count(${TransactionMetric.MEASUREMENTS_CLS})`]
       : ['measurements.cls'],
     vitalStops: {
       poor: 0.25,
@@ -150,7 +150,7 @@ export const WIDGET_DEFINITIONS: ({
     title: t('Transactions Per Minute'),
     titleTooltip: getTermHelp(organization, PERFORMANCE_TERM.TPM),
     fields: isMetricsData
-      ? [`count(${TransactionMetric.SENTRY_TRANSACTIONS_TRANSACTION_DURATION})`]
+      ? [`count(${TransactionMetric.TRANSACTION_DURATION})`]
       : ['tpm()'],
     dataType: GenericPerformanceWidgetDataType.area,
     chartColor: WIDGET_PALETTE[1],
@@ -166,7 +166,7 @@ export const WIDGET_DEFINITIONS: ({
     title: t('p50 Duration'),
     titleTooltip: getTermHelp(organization, PERFORMANCE_TERM.P50),
     fields: isMetricsData
-      ? [`p50(${TransactionMetric.SENTRY_TRANSACTIONS_TRANSACTION_DURATION})`]
+      ? [`p50(${TransactionMetric.TRANSACTION_DURATION})`]
       : ['p50(transaction.duration)'],
     dataType: GenericPerformanceWidgetDataType.area,
     chartColor: WIDGET_PALETTE[3],
@@ -175,7 +175,7 @@ export const WIDGET_DEFINITIONS: ({
     title: t('p75 Duration'),
     titleTooltip: getTermHelp(organization, PERFORMANCE_TERM.P75),
     fields: isMetricsData
-      ? [`p75(${TransactionMetric.SENTRY_TRANSACTIONS_TRANSACTION_DURATION})`]
+      ? [`p75(${TransactionMetric.TRANSACTION_DURATION})`]
       : ['p75(transaction.duration)'],
     dataType: GenericPerformanceWidgetDataType.area,
     chartColor: WIDGET_PALETTE[3],
@@ -184,7 +184,7 @@ export const WIDGET_DEFINITIONS: ({
     title: t('p95 Duration'),
     titleTooltip: getTermHelp(organization, PERFORMANCE_TERM.P95),
     fields: isMetricsData
-      ? [`p95(${TransactionMetric.SENTRY_TRANSACTIONS_TRANSACTION_DURATION})`]
+      ? [`p95(${TransactionMetric.TRANSACTION_DURATION})`]
       : ['p95(transaction.duration)'],
     dataType: GenericPerformanceWidgetDataType.area,
     chartColor: WIDGET_PALETTE[3],
@@ -193,7 +193,7 @@ export const WIDGET_DEFINITIONS: ({
     title: t('p99 Duration'),
     titleTooltip: getTermHelp(organization, PERFORMANCE_TERM.P99),
     fields: isMetricsData
-      ? [`p99(${TransactionMetric.SENTRY_TRANSACTIONS_TRANSACTION_DURATION})`]
+      ? [`p99(${TransactionMetric.TRANSACTION_DURATION})`]
       : ['p99(transaction.duration)'],
     dataType: GenericPerformanceWidgetDataType.area,
     chartColor: WIDGET_PALETTE[3],
@@ -202,7 +202,7 @@ export const WIDGET_DEFINITIONS: ({
     title: t('p75 LCP'),
     titleTooltip: getTermHelp(organization, PERFORMANCE_TERM.P75),
     fields: isMetricsData
-      ? [`p75(${TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_LCP})`]
+      ? [`p75(${TransactionMetric.MEASUREMENTS_LCP})`]
       : ['p75(measurements.lcp)'],
     dataType: GenericPerformanceWidgetDataType.area,
     chartColor: WIDGET_PALETTE[1],
@@ -211,7 +211,7 @@ export const WIDGET_DEFINITIONS: ({
     title: t('Failure Rate'),
     titleTooltip: getTermHelp(organization, PERFORMANCE_TERM.FAILURE_RATE),
     fields: isMetricsData
-      ? [`count(${TransactionMetric.SENTRY_TRANSACTIONS_TRANSACTION_DURATION})`]
+      ? [`count(${TransactionMetric.TRANSACTION_DURATION})`]
       : ['failure_rate()'],
     dataType: GenericPerformanceWidgetDataType.area,
     chartColor: WIDGET_PALETTE[2],
@@ -227,7 +227,7 @@ export const WIDGET_DEFINITIONS: ({
     title: t('Cold Startup Time'),
     titleTooltip: getTermHelp(organization, PERFORMANCE_TERM.APP_START_COLD),
     fields: isMetricsData
-      ? [`p75(${TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_APP_START_COLD})`]
+      ? [`p75(${TransactionMetric.MEASUREMENTS_APP_START_COLD})`]
       : ['p75(measurements.app_start_cold)'],
     dataType: GenericPerformanceWidgetDataType.area,
     chartColor: WIDGET_PALETTE[4],
@@ -236,7 +236,7 @@ export const WIDGET_DEFINITIONS: ({
     title: t('Warm Startup Time'),
     titleTooltip: getTermHelp(organization, PERFORMANCE_TERM.APP_START_WARM),
     fields: isMetricsData
-      ? [`p75(${TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_APP_START_WARM})`]
+      ? [`p75(${TransactionMetric.MEASUREMENTS_APP_START_WARM})`]
       : ['p75(measurements.app_start_warm)'],
     dataType: GenericPerformanceWidgetDataType.area,
     chartColor: WIDGET_PALETTE[3],
@@ -245,7 +245,7 @@ export const WIDGET_DEFINITIONS: ({
     title: t('Slow Frames'),
     titleTooltip: getTermHelp(organization, PERFORMANCE_TERM.SLOW_FRAMES),
     fields: isMetricsData
-      ? [`p75(${TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_FRAMES_SLOW_RATE})`]
+      ? [`p75(${TransactionMetric.MEASUREMENTS_FRAMES_SLOW_RATE})`]
       : ['p75(measurements.frames_slow_rate)'],
     dataType: GenericPerformanceWidgetDataType.area,
     chartColor: WIDGET_PALETTE[0],
@@ -254,7 +254,7 @@ export const WIDGET_DEFINITIONS: ({
     title: t('Frozen Frames'),
     titleTooltip: getTermHelp(organization, PERFORMANCE_TERM.FROZEN_FRAMES),
     fields: isMetricsData
-      ? [`p75(${TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_FRAMES_FROZEN_RATE})`]
+      ? [`p75(${TransactionMetric.MEASUREMENTS_FRAMES_FROZEN_RATE})`]
       : ['p75(measurements.frames_frozen_rate)'],
     dataType: GenericPerformanceWidgetDataType.area,
     chartColor: WIDGET_PALETTE[5],
@@ -305,7 +305,7 @@ export const WIDGET_DEFINITIONS: ({
     title: t('Most Slow Frames'),
     titleTooltip: getTermHelp(organization, PERFORMANCE_TERM.SLOW_FRAMES),
     fields: isMetricsData
-      ? [`avg(${TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_FRAMES_SLOW})`]
+      ? [`avg(${TransactionMetric.MEASUREMENTS_FRAMES_SLOW})`]
       : ['avg(measurements.frames_slow)'],
     dataType: GenericPerformanceWidgetDataType.line_list,
     chartColor: WIDGET_PALETTE[0],
@@ -314,7 +314,7 @@ export const WIDGET_DEFINITIONS: ({
     title: t('Most Frozen Frames'),
     titleTooltip: getTermHelp(organization, PERFORMANCE_TERM.FROZEN_FRAMES),
     fields: isMetricsData
-      ? [`avg(${TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_FRAMES_FROZEN})`]
+      ? [`avg(${TransactionMetric.MEASUREMENTS_FRAMES_FROZEN})`]
       : ['avg(measurements.frames_frozen)'],
     dataType: GenericPerformanceWidgetDataType.line_list,
     chartColor: WIDGET_PALETTE[0],

static/app/views/performance/transactionSummary/transactionOverview/durationChart/index.tsx

@@ -154,7 +154,7 @@ function DurationChart({
       DurationFunctionField.P95,
       DurationFunctionField.P99,
       'max',
-    ]).map(v => `${v}(${TransactionMetric.SENTRY_TRANSACTIONS_TRANSACTION_DURATION})`);
+    ]).map(v => `${v}(${TransactionMetric.TRANSACTION_DURATION})`);
 
     return (
       <Fragment>

static/app/views/performance/transactionSummary/transactionOverview/sidebarCharts.tsx

@@ -366,9 +366,7 @@ function SidebarChartsContainer({
   };
 
   if (isMetricsData) {
-    const fields = [
-      `count(${TransactionMetric.SENTRY_TRANSACTIONS_TRANSACTION_DURATION})`,
-    ];
+    const fields = [`count(${TransactionMetric.TRANSACTION_DURATION})`];
 
     chartOptions.tooltip.nameFormatter = (name: string) => {
       return name === 'failure_rate()' ? fields[0] : name;

static/app/views/performance/trends/utils.tsx

@@ -32,11 +32,11 @@ import {
 } from './types';
 
 export const trendParameterToMetricsField: Record<string, TransactionMetric> = {
-  [TrendColumnField.DURATION]: TransactionMetric.SENTRY_TRANSACTIONS_TRANSACTION_DURATION,
-  [TrendColumnField.LCP]: TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_LCP,
-  [TrendColumnField.FCP]: TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_FCP,
-  [TrendColumnField.FID]: TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_FID,
-  [TrendColumnField.CLS]: TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_CLS,
+  [TrendColumnField.DURATION]: TransactionMetric.TRANSACTION_DURATION,
+  [TrendColumnField.LCP]: TransactionMetric.MEASUREMENTS_LCP,
+  [TrendColumnField.FCP]: TransactionMetric.MEASUREMENTS_FCP,
+  [TrendColumnField.FID]: TransactionMetric.MEASUREMENTS_FID,
+  [TrendColumnField.CLS]: TransactionMetric.MEASUREMENTS_CLS,
 };
 
 export const DEFAULT_TRENDS_STATS_PERIOD = '14d';

static/app/views/performance/vitalDetail/utils.tsx

@@ -145,10 +145,10 @@ export function getMaxOfSeries(series: Series[]) {
 }
 
 export const vitalToMetricsField: Record<string, TransactionMetric> = {
-  [WebVital.LCP]: TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_LCP,
-  [WebVital.FCP]: TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_FCP,
-  [WebVital.FID]: TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_FID,
-  [WebVital.CLS]: TransactionMetric.SENTRY_TRANSACTIONS_MEASUREMENTS_CLS,
+  [WebVital.LCP]: TransactionMetric.MEASUREMENTS_LCP,
+  [WebVital.FCP]: TransactionMetric.MEASUREMENTS_FCP,
+  [WebVital.FID]: TransactionMetric.MEASUREMENTS_FID,
+  [WebVital.CLS]: TransactionMetric.MEASUREMENTS_CLS,
 };
 
 export const vitalSupportedBrowsers: Partial<Record<WebVital, Browser[]>> = {

tests/js/spec/actionCreators/metrics.spec.tsx

@@ -18,14 +18,14 @@ describe('Metrics ActionCreator', function () {
 
   describe('doMetricsRequest', function () {
     const options = {
-      field: [SessionMetric.SENTRY_SESSIONS_SESSION],
+      field: [SessionMetric.SESSION],
       orgSlug,
       cursor: undefined,
       environment: [],
       groupBy: ['session.status'],
       interval: '1h',
       limit: 5,
-      orderBy: SessionMetric.SENTRY_SESSIONS_SESSION,
+      orderBy: SessionMetric.SESSION,
       project: [TestStubs.Project().id],
       query: 'release:123',
       statsPeriod: '14d',
@@ -95,7 +95,7 @@ describe('Metrics ActionCreator', function () {
     it('ignores falsy fields and groupBys', function () {
       doMetricsRequest(api, {
         ...options,
-        field: [SessionMetric.SENTRY_SESSIONS_SESSION, ''],
+        field: [SessionMetric.SESSION, ''],
         groupBy: ['session.status', ''],
       });
       expect(mock).toHaveBeenCalledTimes(1);
@@ -127,12 +127,7 @@ describe('Metrics ActionCreator', function () {
     });
 
     it('fetches api and updates store', async function () {
-      fetchMetricsTags(
-        api,
-        orgSlug,
-        [1],
-        [`sum(${SessionMetric.SENTRY_SESSIONS_SESSION})`]
-      );
+      fetchMetricsTags(api, orgSlug, [1], [`sum(${SessionMetric.SESSION})`]);
 
       await waitFor(() => expect(MetricsTagStore.reset).toHaveBeenCalledTimes(1));
 

tests/js/spec/components/dashboards/widgetQueriesForm.spec.tsx

@@ -115,7 +115,7 @@ describe('WidgetQueriesForm', function () {
   });
 
   it('does not show metrics tags in orderby', function () {
-    const field = `sum(${SessionMetric.SENTRY_SESSIONS_SESSION})`;
+    const field = `sum(${SessionMetric.SESSION})`;
     mountWithTheme(
       <TestComponent
         widgetType={WidgetType.METRICS}