-
-
Notifications
You must be signed in to change notification settings - Fork 4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ref(perf): Move out the span transactions table (#69771)
This one's gross! In short, we had a component called the `SpanTransactionsTable`. It was a transactions table with some conditional logic, to render different columns and fetch different data depending on what module was using it. The problem? The only module using it is the database module. So, I'm dumping this "dynamic" table, and replacing it with a normal table, the kind we have all over the place. This will make it easier to consolidate the code, and remove a few rarely-used utils like `extractRoute`. I'm also removing some cruft like the competing `endpoint` and `transaction` parameters that we don't use anymore, lifting up the data loading state, etc. - Move transactions table into the module - Lift up data fetching state - Static column order - Remove redundant wrapper - Simplify routing - Move out table cell renderer - Export testable component - Sorting
- Loading branch information
Showing
4 changed files
with
232 additions
and
271 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
184 changes: 184 additions & 0 deletions
184
static/app/views/performance/database/queryTransactionsTable.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,184 @@ | ||
| import {Fragment} from 'react'; | ||
| import {browserHistory} from 'react-router'; | ||
| import type {Location} from 'history'; | ||
| import * as qs from 'query-string'; | ||
|
|
||
| import type {GridColumnHeader} from 'sentry/components/gridEditable'; | ||
| import GridEditable, {COL_WIDTH_UNDEFINED} from 'sentry/components/gridEditable'; | ||
| import Link from 'sentry/components/links/link'; | ||
| import type {CursorHandler} from 'sentry/components/pagination'; | ||
| import Pagination from 'sentry/components/pagination'; | ||
| import {t} from 'sentry/locale'; | ||
| import type {Organization} from 'sentry/types'; | ||
| import type {EventsMetaType} from 'sentry/utils/discover/eventView'; | ||
| import {getFieldRenderer} from 'sentry/utils/discover/fieldRenderers'; | ||
| import type {Sort} from 'sentry/utils/discover/fields'; | ||
| import {useLocation} from 'sentry/utils/useLocation'; | ||
| import useOrganization from 'sentry/utils/useOrganization'; | ||
| import {normalizeUrl} from 'sentry/utils/withDomainRequired'; | ||
| import {renderHeadCell} from 'sentry/views/starfish/components/tableCells/renderHeadCell'; | ||
| import {OverflowEllipsisTextContainer} from 'sentry/views/starfish/components/textAlign'; | ||
| import type {SpanMetricsResponse} from 'sentry/views/starfish/types'; | ||
| import {SpanMetricsField} from 'sentry/views/starfish/types'; | ||
| import {QueryParameterNames} from 'sentry/views/starfish/views/queryParameters'; | ||
| import {DataTitles, getThroughputTitle} from 'sentry/views/starfish/views/spans/types'; | ||
|
|
||
| type Row = Pick< | ||
| SpanMetricsResponse, | ||
| | 'transaction' | ||
| | 'transaction.method' | ||
| | 'spm()' | ||
| | 'avg(span.self_time)' | ||
| | 'sum(span.self_time)' | ||
| | 'time_spent_percentage()' | ||
| >; | ||
|
|
||
| type Column = GridColumnHeader< | ||
| 'transaction' | 'spm()' | 'avg(span.self_time)' | 'time_spent_percentage()' | ||
| >; | ||
|
|
||
| const COLUMN_ORDER: Column[] = [ | ||
| { | ||
| key: 'transaction', | ||
| name: t('Found In'), | ||
| width: COL_WIDTH_UNDEFINED, | ||
| }, | ||
| { | ||
| key: 'spm()', | ||
| name: getThroughputTitle('db'), | ||
| width: COL_WIDTH_UNDEFINED, | ||
| }, | ||
| { | ||
| key: `avg(${SpanMetricsField.SPAN_SELF_TIME})`, | ||
| name: DataTitles.avg, | ||
| width: COL_WIDTH_UNDEFINED, | ||
| }, | ||
| { | ||
| key: 'time_spent_percentage()', | ||
| name: DataTitles.timeSpent, | ||
| width: COL_WIDTH_UNDEFINED, | ||
| }, | ||
| ]; | ||
|
|
||
| const SORTABLE_FIELDS = [ | ||
| 'avg(span.self_time)', | ||
| 'spm()', | ||
| 'time_spent_percentage()', | ||
| ] as const; | ||
|
|
||
| type ValidSort = Sort & { | ||
| field: (typeof SORTABLE_FIELDS)[number]; | ||
| }; | ||
|
|
||
| export function isAValidSort(sort: Sort): sort is ValidSort { | ||
| return (SORTABLE_FIELDS as unknown as string[]).includes(sort.field); | ||
| } | ||
|
|
||
| interface Props { | ||
| data: Row[]; | ||
| isLoading: boolean; | ||
| sort: ValidSort; | ||
| span: Pick<SpanMetricsResponse, SpanMetricsField.SPAN_GROUP | SpanMetricsField.SPAN_OP>; | ||
| error?: Error | null; | ||
| meta?: EventsMetaType; | ||
| pageLinks?: string; | ||
| } | ||
|
|
||
| export function QueryTransactionsTable({ | ||
| data, | ||
| isLoading, | ||
| error, | ||
| meta, | ||
| pageLinks, | ||
| sort, | ||
| span, | ||
| }: Props) { | ||
| const location = useLocation(); | ||
| const organization = useOrganization(); | ||
|
|
||
| const handleCursor: CursorHandler = (newCursor, pathname, query) => { | ||
| browserHistory.push({ | ||
| pathname, | ||
| query: {...query, [QueryParameterNames.TRANSACTIONS_CURSOR]: newCursor}, | ||
| }); | ||
| }; | ||
|
|
||
| return ( | ||
| <Fragment> | ||
| <GridEditable | ||
| aria-label={t('Transactions')} | ||
| isLoading={isLoading} | ||
| error={error} | ||
| data={data} | ||
| columnOrder={COLUMN_ORDER} | ||
| columnSortBy={[ | ||
| { | ||
| key: sort.field, | ||
| order: sort.kind, | ||
| }, | ||
| ]} | ||
| grid={{ | ||
| renderHeadCell: col => | ||
| renderHeadCell({ | ||
| column: col, | ||
| sort, | ||
| location, | ||
| sortParameterName: QueryParameterNames.TRANSACTIONS_SORT, | ||
| }), | ||
| renderBodyCell: (column, row) => | ||
| renderBodyCell(column, row, meta, span, location, organization), | ||
| }} | ||
| location={location} | ||
| /> | ||
|
|
||
| <Pagination pageLinks={pageLinks} onCursor={handleCursor} /> | ||
| </Fragment> | ||
| ); | ||
| } | ||
|
|
||
| function renderBodyCell( | ||
| column: Column, | ||
| row: Row, | ||
| meta: EventsMetaType | undefined, | ||
| span: Pick<SpanMetricsResponse, SpanMetricsField.SPAN_GROUP | SpanMetricsField.SPAN_OP>, | ||
| location: Location, | ||
| organization: Organization | ||
| ) { | ||
| if (column.key === 'transaction') { | ||
| const label = | ||
| row['transaction.method'] && !row.transaction.startsWith(row['transaction.method']) | ||
| ? `${row['transaction.method']} ${row.transaction}` | ||
| : row.transaction; | ||
|
|
||
| const pathname = normalizeUrl( | ||
| `/organizations/${organization.slug}/performance/database/spans/span/${encodeURIComponent(span[SpanMetricsField.SPAN_GROUP])}` | ||
| ); | ||
| const query: {[key: string]: string | undefined} = { | ||
| ...location.query, | ||
| transaction: row.transaction, | ||
| transactionMethod: row['transaction.method'], | ||
| }; | ||
|
|
||
| return ( | ||
| <OverflowEllipsisTextContainer> | ||
| <Link to={`${pathname}?${qs.stringify(query)}`}>{label}</Link> | ||
| </OverflowEllipsisTextContainer> | ||
| ); | ||
| } | ||
|
|
||
| if (!meta || !meta?.fields) { | ||
| return row[column.key]; | ||
| } | ||
|
|
||
| const renderer = getFieldRenderer(column.key, meta.fields, false); | ||
| const rendered = renderer( | ||
| {...row, 'span.op': span['span.op']}, | ||
| { | ||
| location, | ||
| organization, | ||
| unit: meta.units?.[column.key], | ||
| } | ||
| ); | ||
|
|
||
| return rendered; | ||
| } |
Oops, something went wrong.