ref(dashboards): Simplify TimeSeries field meta

static/app/utils/discover/fields.tsx

@@ -248,6 +248,8 @@ export const RATE_UNIT_TITLE: Record<RateUnit, string> = {
   [RateUnit.PER_HOUR]: 'Per Hour',
 };
 
+export type DataUnit = DurationUnit | SizeUnit | RateUnit | null;
+
 const getDocsAndOutputType = (key: AggregationKey) => {
   return {
     documentation: AGGREGATION_FIELDS[key].desc,

static/app/utils/timeSeries/scaleTimeSeriesData.spec.tsx

@@ -13,12 +13,8 @@ describe('scaleTimeSeriesData', () => {
         },
       ],
       meta: {
-        fields: {
-          user: 'string',
-        },
-        units: {
-          user: null,
-        },
+        type: 'string',
+        unit: null,
       },
     };
 
@@ -40,12 +36,8 @@ describe('scaleTimeSeriesData', () => {
         },
       ],
       meta: {
-        fields: {
-          'transaction.duration': 'duration',
-        },
-        units: {
-          'transaction.duration': 'second',
-        },
+        type: 'duration',
+        unit: DurationUnit.SECOND,
       },
     };
 
@@ -62,12 +54,8 @@ describe('scaleTimeSeriesData', () => {
         },
       ],
       meta: {
-        fields: {
-          'transaction.duration': 'duration',
-        },
-        units: {
-          'transaction.duration': 'second',
-        },
+        type: 'duration',
+        unit: DurationUnit.SECOND,
       },
     };
 
@@ -80,12 +68,8 @@ describe('scaleTimeSeriesData', () => {
         },
       ],
       meta: {
-        fields: {
-          'transaction.duration': 'duration',
-        },
-        units: {
-          'transaction.duration': 'millisecond',
-        },
+        type: 'duration',
+        unit: DurationUnit.MILLISECOND,
       },
     });
   });
@@ -100,12 +84,8 @@ describe('scaleTimeSeriesData', () => {
         },
       ],
       meta: {
-        fields: {
-          'file.size': 'size',
-        },
-        units: {
-          'file.size': 'mebibyte',
-        },
+        type: 'size',
+        unit: SizeUnit.MEBIBYTE,
       },
     };
 
@@ -118,12 +98,8 @@ describe('scaleTimeSeriesData', () => {
         },
       ],
       meta: {
-        fields: {
-          'file.size': 'size',
-        },
-        units: {
-          'file.size': 'byte',
-        },
+        type: 'size',
+        unit: SizeUnit.BYTE,
       },
     });
   });

static/app/utils/timeSeries/scaleTimeSeriesData.tsx

@@ -1,12 +1,7 @@
 import * as Sentry from '@sentry/react';
 import partialRight from 'lodash/partialRight';
 
-import type {
-  AggregationOutputType,
-  DurationUnit,
-  RateUnit,
-  SizeUnit,
-} from 'sentry/utils/discover/fields';
+import type {AggregationOutputType, DataUnit} from 'sentry/utils/discover/fields';
 import {convertDuration} from 'sentry/utils/unitConversion/convertDuration';
 import {convertRate} from 'sentry/utils/unitConversion/convertRate';
 import {convertSize} from 'sentry/utils/unitConversion/convertSize';
@@ -24,19 +19,19 @@ import {
 
 export function scaleTimeSeriesData(
   timeSeries: Readonly<TimeSeries>,
-  destinationUnit: DurationUnit | SizeUnit | RateUnit | null
+  destinationUnit: DataUnit
 ): TimeSeries {
   // TODO: Instead of a fallback, allow this to be `null`, which might happen
   const sourceType =
-    (timeSeries.meta?.fields[timeSeries.field] as AggregationOutputType) ??
+    (timeSeries.meta?.type as AggregationOutputType) ??
     (FALLBACK_TYPE as AggregationOutputType);
 
   // Don't bother trying to convert numbers, dates, etc.
   if (!isAUnitConvertibleFieldType(sourceType)) {
     return timeSeries;
   }
 
-  const sourceUnit = timeSeries.meta?.units?.[timeSeries.field] ?? null;
+  const sourceUnit = timeSeries.meta?.unit;
 
   if (!destinationUnit || sourceUnit === destinationUnit) {
     return timeSeries;
@@ -87,12 +82,8 @@ export function scaleTimeSeriesData(
     }),
     meta: {
       ...timeSeries.meta,
-      fields: {
-        [timeSeries.field]: sourceType,
-      },
-      units: {
-        [timeSeries.field]: destinationUnit,
-      },
+      type: sourceType,
+      unit: destinationUnit,
     },
   };
 }

static/app/utils/timeSeries/splitSeriesIntoCompleteAndIncomplete.spec.tsx

@@ -1,5 +1,7 @@
 import {resetMockDate, setMockDate} from 'sentry-test/utils';
 
+import {DurationUnit} from '../discover/fields';
+
 import {splitSeriesIntoCompleteAndIncomplete} from './splitSeriesIntoCompleteAndIncomplete';
 
 describe('splitSeriesIntoCompleteAndIncomplete', () => {
@@ -29,12 +31,8 @@ describe('splitSeriesIntoCompleteAndIncomplete', () => {
         },
       ],
       meta: {
-        fields: {
-          'p99(span.duration)': 'duration',
-        },
-        units: {
-          'p99(span.duration)': 'millisecond',
-        },
+        type: 'duration',
+        unit: DurationUnit.MILLISECOND,
       },
     };
 
@@ -83,12 +81,8 @@ describe('splitSeriesIntoCompleteAndIncomplete', () => {
         },
       ],
       meta: {
-        fields: {
-          'p99(span.duration)': 'duration',
-        },
-        units: {
-          'p99(span.duration)': 'millisecond',
-        },
+        type: 'duration',
+        unit: DurationUnit.MILLISECOND,
       },
     };
 
@@ -145,12 +139,8 @@ describe('splitSeriesIntoCompleteAndIncomplete', () => {
         },
       ],
       meta: {
-        fields: {
-          'p99(span.duration)': 'duration',
-        },
-        units: {
-          'p99(span.duration)': 'millisecond',
-        },
+        type: 'duration',
+        unit: DurationUnit.MILLISECOND,
       },
     };
 
@@ -214,12 +204,8 @@ describe('splitSeriesIntoCompleteAndIncomplete', () => {
         },
       ],
       meta: {
-        fields: {
-          'p99(span.duration)': 'duration',
-        },
-        units: {
-          'p99(span.duration)': 'millisecond',
-        },
+        type: 'duration',
+        unit: DurationUnit.MILLISECOND,
       },
     };
 

static/app/views/dashboards/widgetCard/chart.tsx

@@ -39,7 +39,7 @@ import {
   tooltipFormatter,
 } from 'sentry/utils/discover/charts';
 import type {EventsMetaType, MetaType} from 'sentry/utils/discover/eventView';
-import type {AggregationOutputType} from 'sentry/utils/discover/fields';
+import type {AggregationOutputType, DataUnit} from 'sentry/utils/discover/fields';
 import {
   aggregateOutputType,
   getAggregateArg,
@@ -225,7 +225,10 @@ class WidgetCardChart extends Component<WidgetCardChartProps> {
           key={i}
           field={field}
           value={value}
-          meta={meta}
+          meta={{
+            type: meta.fields?.[field] ?? null,
+            unit: (meta.units?.[field] as DataUnit) ?? null,
+          }}
           thresholds={widget.thresholds ?? undefined}
           preferredPolarity="-"
         />

static/app/views/dashboards/widgets/bigNumberWidget/bigNumberWidgetVisualization.spec.tsx

@@ -1,6 +1,7 @@
 import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
 import {textWithMarkupMatcher} from 'sentry-test/utils';
 
+import {DurationUnit, RateUnit} from 'sentry/utils/discover/fields';
 import {BigNumberWidgetVisualization} from 'sentry/views/dashboards/widgets/bigNumberWidget/bigNumberWidgetVisualization';
 
 import {Widget} from '../widget/widget';
@@ -23,10 +24,8 @@ describe('BigNumberWidgetVisualization', () => {
               value={Infinity}
               field="count()"
               meta={{
-                fields: {
-                  'count()': 'number',
-                },
-                units: {},
+                type: 'number',
+                unit: null,
               }}
             />
           }
@@ -42,12 +41,8 @@ describe('BigNumberWidgetVisualization', () => {
           value={'2024-10-17T16:08:07+00:00'}
           field="max(timestamp)"
           meta={{
-            fields: {
-              'max(timestamp)': 'date',
-            },
-            units: {
-              'max(timestamp)': null,
-            },
+            type: 'date',
+            unit: null,
           }}
         />
       );
@@ -61,10 +56,8 @@ describe('BigNumberWidgetVisualization', () => {
           value={'/api/0/fetch'}
           field="any(transaction)"
           meta={{
-            fields: {
-              'max(timestamp)': 'string',
-            },
-            units: {},
+            type: 'string',
+            unit: null,
           }}
         />
       );
@@ -78,12 +71,8 @@ describe('BigNumberWidgetVisualization', () => {
           value={17.28}
           field="p95(span.duration)"
           meta={{
-            fields: {
-              'p95(span.duration)': 'duration',
-            },
-            units: {
-              'p95(span.duration)': 'milliseconds',
-            },
+            type: 'duration',
+            unit: DurationUnit.MILLISECOND,
           }}
         />
       );
@@ -97,12 +86,8 @@ describe('BigNumberWidgetVisualization', () => {
           value={178451214}
           field="count()"
           meta={{
-            fields: {
-              'count()': 'integer',
-            },
-            units: {
-              'count()': null,
-            },
+            type: 'integer',
+            unit: null,
           }}
         />
       );
@@ -119,10 +104,8 @@ describe('BigNumberWidgetVisualization', () => {
           field="count()"
           maximumValue={100000000}
           meta={{
-            fields: {
-              'count()': 'integer',
-            },
-            units: {},
+            type: 'integer',
+            unit: null,
           }}
         />
       );
@@ -139,12 +122,8 @@ describe('BigNumberWidgetVisualization', () => {
           previousPeriodValue={0.1728139}
           field="http_response_code_rate(500)"
           meta={{
-            fields: {
-              'http_response_code_rate(500)': 'percentage',
-            },
-            units: {
-              'http_response_code_rate(500)': null,
-            },
+            type: 'percentage',
+            unit: null,
           }}
         />
       );
@@ -161,12 +140,8 @@ describe('BigNumberWidgetVisualization', () => {
           value={14.227123}
           field="eps()"
           meta={{
-            fields: {
-              'eps()': 'rate',
-            },
-            units: {
-              'eps()': '1/second',
-            },
+            type: 'rate',
+            unit: RateUnit.PER_SECOND,
           }}
           thresholds={{
             max_values: {
@@ -190,12 +165,8 @@ describe('BigNumberWidgetVisualization', () => {
           value={135} //  2.25/s
           field="mystery_error_rate()"
           meta={{
-            fields: {
-              'mystery_error_rate()': 'rate',
-            },
-            units: {
-              'mystery_error_rate()': '1/minute',
-            },
+            type: 'rate',
+            unit: RateUnit.PER_MINUTE,
           }}
           thresholds={{
             max_values: {
@@ -216,12 +187,8 @@ describe('BigNumberWidgetVisualization', () => {
           value={135}
           field="mystery_error_rate()"
           meta={{
-            fields: {
-              'mystery_error_rate()': 'rate',
-            },
-            units: {
-              'mystery_error_rate()': '1/second',
-            },
+            type: 'rate',
+            unit: RateUnit.PER_SECOND,
           }}
           thresholds={{
             max_values: {