ref(insights): Refactor Resource Summary + Landing charts into separate modules #89612
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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,73 @@ | ||
| import type {PageFilters} from 'sentry/types/core'; | ||
| import {EMPTY_OPTION_VALUE, MutableSearch} from 'sentry/utils/tokenizeSearch'; | ||
| import {getResourceTypeFilter} from 'sentry/views/insights/browser/common/queries/useResourcesQuery'; | ||
| import {DEFAULT_RESOURCE_TYPES} from 'sentry/views/insights/browser/resources/settings'; | ||
| import { | ||
| BrowserStarfishFields, | ||
| useResourceModuleFilters, | ||
| } from 'sentry/views/insights/browser/resources/utils/useResourceFilters'; | ||
| import {useSpanMetricsSeries} from 'sentry/views/insights/common/queries/useDiscoverSeries'; | ||
| import type {ModuleFilters} from 'sentry/views/insights/common/views/spans/types'; | ||
| import {SpanMetricsField} from 'sentry/views/insights/types'; | ||
|
|
||
| const {SPAN_SELF_TIME, NORMALIZED_DESCRIPTION, SPAN_DOMAIN} = SpanMetricsField; | ||
| const {SPAN_DOMAIN: STARFISH_SPAN_DOMAIN, USER_GEO_SUBREGION} = BrowserStarfishFields; | ||
|
There was a problem hiding this comment. had to alias There was a problem hiding this comment.
There was a problem hiding this comment. @DominikB2014 Oops, should have looked into the enums... updated! |
||
|
|
||
| const SPAN_FILTER_KEYS = ['span_operation', SPAN_DOMAIN, 'action']; | ||
|
|
||
| const buildDiscoverQueryConditions = (appliedFilters: ModuleFilters) => { | ||
| const result = Object.keys(appliedFilters) | ||
| .filter(key => SPAN_FILTER_KEYS.includes(key)) | ||
| // @ts-expect-error TS(7053): Element implicitly has an 'any' type because expre... Remove this comment to see the full error message | ||
| .filter(key => Boolean(appliedFilters[key])) | ||
| .map(key => { | ||
| // @ts-expect-error TS(7053): Element implicitly has an 'any' type because expre... Remove this comment to see the full error message | ||
| const value = appliedFilters[key]; | ||
| if (key === SPAN_DOMAIN && value === EMPTY_OPTION_VALUE) { | ||
| return [`!has:${SPAN_DOMAIN}`]; | ||
| } | ||
| return `${key}:${value}`; | ||
| }); | ||
|
|
||
| result.push(`has:${NORMALIZED_DESCRIPTION}`); | ||
|
|
||
| return result.join(' '); | ||
billyvg marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| }; | ||
|
|
||
| interface Props { | ||
| pageFilters?: PageFilters; | ||
| } | ||
|
|
||
| export function useResourceLandingSeries(props?: Props) { | ||
| const filters = useResourceModuleFilters(); | ||
|
|
||
| const spanTimeChartsFilters: ModuleFilters = { | ||
| 'span.op': `[${DEFAULT_RESOURCE_TYPES.join(',')}]`, | ||
| ...(filters[STARFISH_SPAN_DOMAIN] | ||
| ? {[STARFISH_SPAN_DOMAIN]: filters[STARFISH_SPAN_DOMAIN]} | ||
| : {}), | ||
| }; | ||
|
|
||
| const extraQuery = [ | ||
| ...getResourceTypeFilter(undefined, DEFAULT_RESOURCE_TYPES), | ||
| ...(filters[USER_GEO_SUBREGION] | ||
| ? [`user.geo.subregion:[${filters[USER_GEO_SUBREGION].join(',')}]`] | ||
billyvg marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| : []), | ||
| ]; | ||
|
|
||
| let query: string = buildDiscoverQueryConditions(spanTimeChartsFilters); | ||
|
|
||
| if (extraQuery) { | ||
| query += ` ${extraQuery.join(' ')}`; | ||
| } | ||
billyvg marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| return useSpanMetricsSeries( | ||
| { | ||
| search: new MutableSearch(query), | ||
| yAxis: ['epm()', `avg(${SPAN_SELF_TIME})`], | ||
| transformAliasToInputFormat: true, | ||
| }, | ||
| 'api.starfish.span-time-charts', | ||
| props.pageFilters | ||
|
Check failure on line 71 in static/app/views/insights/common/components/widgets/hooks/useResourceLandingSeries.tsx
|
||
| ); | ||
| } | ||
This file contains hidden or 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,54 @@ | ||
| import type {PageFilters} from 'sentry/types/core'; | ||
| import {MutableSearch} from 'sentry/utils/tokenizeSearch'; | ||
| import {Referrer} from 'sentry/views/insights/browser/resources/referrer'; | ||
| import {useResourceModuleFilters} from 'sentry/views/insights/browser/resources/utils/useResourceFilters'; | ||
| import {useSpanMetricsSeries} from 'sentry/views/insights/common/queries/useDiscoverSeries'; | ||
| import {SpanMetricsField} from 'sentry/views/insights/types'; | ||
|
|
||
| const { | ||
| SPAN_SELF_TIME, | ||
| HTTP_RESPONSE_CONTENT_LENGTH, | ||
| HTTP_DECODED_RESPONSE_CONTENT_LENGTH, | ||
| HTTP_RESPONSE_TRANSFER_SIZE, | ||
| RESOURCE_RENDER_BLOCKING_STATUS, | ||
| } = SpanMetricsField; | ||
|
|
||
| interface Props { | ||
| groupId?: string; | ||
| pageFilters?: PageFilters; | ||
| } | ||
|
|
||
| export function useResourceSummarySeries({pageFilters, groupId}: Props) { | ||
| const filters = useResourceModuleFilters(); | ||
|
|
||
| const mutableSearch = MutableSearch.fromQueryObject({ | ||
| 'span.group': groupId, | ||
| ...(filters[RESOURCE_RENDER_BLOCKING_STATUS] | ||
| ? { | ||
| [RESOURCE_RENDER_BLOCKING_STATUS]: filters[RESOURCE_RENDER_BLOCKING_STATUS], | ||
| } | ||
| : {}), | ||
| ...(filters[SpanMetricsField.USER_GEO_SUBREGION] | ||
| ? { | ||
| [SpanMetricsField.USER_GEO_SUBREGION]: `[${filters[SpanMetricsField.USER_GEO_SUBREGION].join(',')}]`, | ||
| } | ||
| : {}), | ||
| }); | ||
|
|
||
| return useSpanMetricsSeries( | ||
| { | ||
| search: mutableSearch, | ||
| yAxis: [ | ||
| `epm()`, | ||
| `avg(${SPAN_SELF_TIME})`, | ||
| `avg(${HTTP_RESPONSE_CONTENT_LENGTH})`, | ||
| `avg(${HTTP_DECODED_RESPONSE_CONTENT_LENGTH})`, | ||
| `avg(${HTTP_RESPONSE_TRANSFER_SIZE})`, | ||
billyvg marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| ], | ||
| enabled: Boolean(groupId), | ||
| transformAliasToInputFormat: true, | ||
| }, | ||
| Referrer.RESOURCE_SUMMARY_CHARTS, | ||
| pageFilters | ||
| ); | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All 3 charts shared the data fetching code, but in the new charts only the AverageSeries chart has this code since it is the only chart that uses these series (IIUC).