Skip to content

Commit 909c985

Browse files
DominikB2014DominikB2014
authored
ref(insights): replace useMetrics with useSpans (#95579)
1 parent 3819575 commit 909c985

28 files changed

+76
-198
lines changed

‎static/app/views/insights/browser/webVitals/components/webVitalsDetailPanel.spec.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ describe('WebVitalsDetailPanel', function () {
6060
expect.anything(),
6161
expect.objectContaining({
6262
query: expect.objectContaining({
63-
dataset: 'metrics',
63+
dataset: 'spans',
6464
field: [
6565
'p75(measurements.lcp)',
6666
'p75(measurements.fcp)',
@@ -80,7 +80,7 @@ describe('WebVitalsDetailPanel', function () {
8080
expect.anything(),
8181
expect.objectContaining({
8282
query: expect.objectContaining({
83-
dataset: 'metrics',
83+
dataset: 'spans',
8484
field: [
8585
'performance_score(measurements.score.lcp)',
8686
'performance_score(measurements.score.fcp)',
@@ -113,7 +113,7 @@ describe('WebVitalsDetailPanel', function () {
113113
expect.anything(),
114114
expect.objectContaining({
115115
query: expect.objectContaining({
116-
dataset: 'metrics',
116+
dataset: 'spans',
117117
field: [
118118
'project.id',
119119
'project',

‎static/app/views/insights/browser/webVitals/queries/rawWebVitalsQueries/useProjectRawWebVitalsQuery.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import type {Tag} from 'sentry/types/group';
22
import {MutableSearch} from 'sentry/utils/tokenizeSearch';
33
import {DEFAULT_QUERY_FILTER} from 'sentry/views/insights/browser/webVitals/settings';
44
import type {BrowserType} from 'sentry/views/insights/browser/webVitals/utils/queryParameterDecoders/browserType';
5-
import {useMetrics} from 'sentry/views/insights/common/queries/useDiscover';
5+
import {useSpans} from 'sentry/views/insights/common/queries/useDiscover';
66
import {SpanMetricsField, type SubregionCode} from 'sentry/views/insights/types';
77

88
type Props = {
@@ -32,7 +32,7 @@ export const useProjectRawWebVitalsQuery = ({
3232
search.addDisjunctionFilterValues(SpanMetricsField.BROWSER_NAME, browserTypes);
3333
}
3434

35-
return useMetrics(
35+
return useSpans(
3636
{
3737
search: [DEFAULT_QUERY_FILTER, search.formatString()].join(' ').trim(),
3838
limit: 50,

‎static/app/views/insights/browser/webVitals/queries/storedScoreQueries/getWebVitalScoresFromTableDataRow.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ import type {
22
ProjectScore,
33
WebVitals,
44
} from 'sentry/views/insights/browser/webVitals/types';
5-
import type {MetricsResponse} from 'sentry/views/insights/types';
5+
import type {EAPSpanResponse} from 'sentry/views/insights/types';
66

77
type PerformanceScores = Pick<
8-
MetricsResponse,
8+
EAPSpanResponse,
99
| 'performance_score(measurements.score.cls)'
1010
| 'performance_score(measurements.score.fcp)'
1111
| 'performance_score(measurements.score.inp)'
@@ -14,7 +14,7 @@ type PerformanceScores = Pick<
1414
>;
1515

1616
type CountScores = Pick<
17-
MetricsResponse,
17+
EAPSpanResponse,
1818
| 'count_scores(measurements.score.cls)'
1919
| 'count_scores(measurements.score.fcp)'
2020
| 'count_scores(measurements.score.inp)'

‎static/app/views/insights/browser/webVitals/queries/storedScoreQueries/useProjectWebVitalsScoresQuery.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {MutableSearch} from 'sentry/utils/tokenizeSearch';
44
import {DEFAULT_QUERY_FILTER} from 'sentry/views/insights/browser/webVitals/settings';
55
import type {WebVitals} from 'sentry/views/insights/browser/webVitals/types';
66
import type {BrowserType} from 'sentry/views/insights/browser/webVitals/utils/queryParameterDecoders/browserType';
7-
import {useMetrics} from 'sentry/views/insights/common/queries/useDiscover';
7+
import {useSpans} from 'sentry/views/insights/common/queries/useDiscover';
88
import {SpanIndexedField, type SubregionCode} from 'sentry/views/insights/types';
99

1010
type Props = {
@@ -37,7 +37,7 @@ export const useProjectWebVitalsScoresQuery = ({
3737
search.addDisjunctionFilterValues(SpanIndexedField.USER_GEO_SUBREGION, subregions);
3838
}
3939

40-
const result = useMetrics(
40+
const result = useSpans(
4141
{
4242
cursor: '',
4343
limit: 50,

‎static/app/views/insights/browser/webVitals/queries/storedScoreQueries/useTransactionWebVitalsScoresQuery.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import type {
99
} from 'sentry/views/insights/browser/webVitals/types';
1010
import type {BrowserType} from 'sentry/views/insights/browser/webVitals/utils/queryParameterDecoders/browserType';
1111
import {useWebVitalsSort} from 'sentry/views/insights/browser/webVitals/utils/useWebVitalsSort';
12-
import {useMetrics} from 'sentry/views/insights/common/queries/useDiscover';
12+
import {useSpans} from 'sentry/views/insights/common/queries/useDiscover';
1313
import {
14-
type MetricsProperty,
14+
type EAPSpanProperty,
1515
SpanIndexedField,
1616
type SubregionCode,
1717
} from 'sentry/views/insights/types';
@@ -44,7 +44,7 @@ export const useTransactionWebVitalsScoresQuery = ({
4444
const sort = useWebVitalsSort({sortName, defaultSort});
4545

4646
const totalOpportunityScoreField =
47-
'opportunity_score(measurements.score.total)' satisfies MetricsProperty;
47+
'opportunity_score(measurements.score.total)' satisfies EAPSpanProperty;
4848

4949
if (sort !== undefined) {
5050
if (sort.field === 'avg(measurements.score.total)') {
@@ -66,7 +66,7 @@ export const useTransactionWebVitalsScoresQuery = ({
6666
search.addDisjunctionFilterValues(SpanIndexedField.USER_GEO_SUBREGION, subregions);
6767
}
6868

69-
const {data, isPending, ...rest} = useMetrics(
69+
const {data, isPending, ...rest} = useSpans(
7070
{
7171
limit: limit ?? 50,
7272
search: [DEFAULT_QUERY_FILTER, search.formatString()].join(' ').trim(),

‎static/app/views/insights/browser/webVitals/views/pageOverview.spec.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ describe('PageOverview', function () {
7070
expect.anything(),
7171
expect.objectContaining({
7272
query: expect.objectContaining({
73-
dataset: 'metrics',
73+
dataset: 'spans',
7474
field: [
7575
'p75(measurements.lcp)',
7676
'p75(measurements.fcp)',
@@ -90,7 +90,7 @@ describe('PageOverview', function () {
9090
expect.anything(),
9191
expect.objectContaining({
9292
query: expect.objectContaining({
93-
dataset: 'metrics',
93+
dataset: 'spans',
9494
field: [
9595
'performance_score(measurements.score.lcp)',
9696
'performance_score(measurements.score.fcp)',

‎static/app/views/insights/browser/webVitals/views/webVitalsLandingPage.spec.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ describe('WebVitalsLandingPage', function () {
7474
expect.anything(),
7575
expect.objectContaining({
7676
query: expect.objectContaining({
77-
dataset: 'metrics',
77+
dataset: 'spans',
7878
field: [
7979
'project.id',
8080
'project',
@@ -105,7 +105,7 @@ describe('WebVitalsLandingPage', function () {
105105
expect.anything(),
106106
expect.objectContaining({
107107
query: expect.objectContaining({
108-
dataset: 'metrics',
108+
dataset: 'spans',
109109
field: [
110110
'p75(measurements.lcp)',
111111
'p75(measurements.fcp)',
@@ -125,7 +125,7 @@ describe('WebVitalsLandingPage', function () {
125125
expect.anything(),
126126
expect.objectContaining({
127127
query: expect.objectContaining({
128-
dataset: 'metrics',
128+
dataset: 'spans',
129129
field: [
130130
'performance_score(measurements.score.lcp)',
131131
'performance_score(measurements.score.fcp)',

‎static/app/views/insights/cache/components/samplePanel.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ import type {
4242
SpanQueryFilters,
4343
} from 'sentry/views/insights/types';
4444
import {
45-
MetricsFields,
4645
ModuleName,
4746
SpanFields,
4847
SpanFunction,
@@ -314,7 +313,7 @@ export function CacheSamplePanel() {
314313
/>
315314

316315
<MetricReadout
317-
title={DataTitles[`avg(${MetricsFields.TRANSACTION_DURATION})`]}
316+
title={DataTitles['avg(transaction.duration)']}
318317
value={
319318
transactionDurationData?.[0]?.[`avg(${SpanFields.SPAN_DURATION})`]
320319
}

‎static/app/views/insights/cache/components/tables/transactionsTable.tsx

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,15 @@ import {renderHeadCell} from 'sentry/views/insights/common/components/tableCells
2222
import {QueryParameterNames} from 'sentry/views/insights/common/views/queryParameters';
2323
import {DataTitles} from 'sentry/views/insights/common/views/spans/types';
2424
import {
25-
MetricsFields,
26-
type MetricsResponse,
25+
type EAPSpanResponse,
2726
ModuleName,
27+
SpanFields,
2828
SpanFunction,
2929
SpanMetricsField,
3030
type SpanMetricsResponse,
3131
} from 'sentry/views/insights/types';
3232

3333
const {CACHE_MISS_RATE, EPM} = SpanFunction;
34-
const {TRANSACTION_DURATION, SPAN_DURATION} = MetricsFields;
3534
const {CACHE_ITEM_SIZE} = SpanMetricsField;
3635

3736
type Row = Pick<
@@ -44,7 +43,7 @@ type Row = Pick<
4443
| 'sum(span.self_time)'
4544
| 'avg(cache.item_size)'
4645
> &
47-
Pick<MetricsResponse, 'avg(span.duration)'>;
46+
Pick<EAPSpanResponse, 'avg(span.duration)'>;
4847

4948
type Column = GridColumnHeader<
5049
| 'transaction'
@@ -78,8 +77,8 @@ const COLUMN_ORDER: Column[] = [
7877
width: COL_WIDTH_UNDEFINED,
7978
},
8079
{
81-
key: `avg(${SPAN_DURATION})`,
82-
name: DataTitles[`avg(${TRANSACTION_DURATION})`],
80+
key: `avg(${SpanFields.SPAN_DURATION})`,
81+
name: DataTitles['avg(transaction.duration)'],
8382
width: COL_WIDTH_UNDEFINED,
8483
},
8584
{

‎static/app/views/insights/cache/views/cacheLandingPage.spec.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import type {Organization} from 'sentry/types/organization';
1414
import {useLocation} from 'sentry/utils/useLocation';
1515
import usePageFilters from 'sentry/utils/usePageFilters';
1616
import {useReleaseStats} from 'sentry/utils/useReleaseStats';
17+
import {SAMPLING_MODE} from 'sentry/views/explore/hooks/useProgressiveQuery';
1718
import {CacheLandingPage} from 'sentry/views/insights/cache/views/cacheLandingPage';
1819

1920
jest.mock('sentry/utils/useLocation');
@@ -144,7 +145,8 @@ describe('CacheLandingPage', function () {
144145
expect.objectContaining({
145146
method: 'GET',
146147
query: {
147-
dataset: 'metrics',
148+
dataset: 'spans',
149+
sampling: SAMPLING_MODE.NORMAL,
148150
environment: [],
149151
field: ['avg(span.duration)', 'transaction'],
150152
per_page: 50,
@@ -204,7 +206,8 @@ describe('CacheLandingPage', function () {
204206
expect.objectContaining({
205207
method: 'GET',
206208
query: {
207-
dataset: 'metrics',
209+
dataset: 'spans',
210+
sampling: SAMPLING_MODE.NORMAL,
208211
environment: [],
209212
field: ['avg(span.duration)', 'transaction'],
210213
noPagination: true,

0 commit comments

Comments
 (0)