Skip to content

Commit e1d65ca

Browse files
authored
ref(metrics): Move CustomMetricsEventData to components (#72188)
Move to `components/metrics` folder, as it is used in multiple places.
1 parent 905ef91 commit e1d65ca

File tree

8 files changed

+14
-11
lines changed

8 files changed

+14
-11
lines changed

static/app/components/events/eventEntries.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {EventEvidence} from 'sentry/components/events/eventEvidence';
66
import EventReplay from 'sentry/components/events/eventReplay';
77
import {ActionableItems} from 'sentry/components/events/interfaces/crashContent/exception/actionableItems';
88
import {actionableItemsEnabled} from 'sentry/components/events/interfaces/crashContent/exception/useActionableItems';
9+
import {CustomMetricsEventData} from 'sentry/components/metrics/customMetricsEventData';
910
import {t} from 'sentry/locale';
1011
import {space} from 'sentry/styles/space';
1112
import type {
@@ -19,7 +20,6 @@ import type {
1920
import {EntryType, EventOrGroupType} from 'sentry/types/event';
2021
import {isNotSharedOrganization} from 'sentry/types/utils';
2122
import {isEmptyObject} from 'sentry/utils/object/isEmptyObject';
22-
import {CustomMetricsEventData} from 'sentry/views/metrics/customMetricsEventData';
2323

2424
import {EventContexts} from './contexts';
2525
import {EventDevice} from './device';

static/app/components/events/interfaces/spans/newTraceDetailsSpanDetails.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import SpanSummaryButton from 'sentry/components/events/interfaces/spans/spanSum
1212
import FileSize from 'sentry/components/fileSize';
1313
import ExternalLink from 'sentry/components/links/externalLink';
1414
import LoadingIndicator from 'sentry/components/loadingIndicator';
15+
import {CustomMetricsEventData} from 'sentry/components/metrics/customMetricsEventData';
1516
import Pill from 'sentry/components/pill';
1617
import Pills from 'sentry/components/pills';
1718
import {TransactionToProfileButton} from 'sentry/components/profiling/transactionToProfileButton';
@@ -29,7 +30,6 @@ import getDynamicText from 'sentry/utils/getDynamicText';
2930
import {safeURL} from 'sentry/utils/url/safeURL';
3031
import {useLocation} from 'sentry/utils/useLocation';
3132
import useProjects from 'sentry/utils/useProjects';
32-
import {CustomMetricsEventData} from 'sentry/views/metrics/customMetricsEventData';
3333
import {IssueList} from 'sentry/views/performance/newTraceDetails/traceDrawer/details/issues/issues';
3434
import {TraceDrawerComponents} from 'sentry/views/performance/newTraceDetails/traceDrawer/details/styles';
3535
import type {

static/app/components/events/interfaces/spans/spanDetail.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import FileSize from 'sentry/components/fileSize';
1212
import ExternalLink from 'sentry/components/links/externalLink';
1313
import Link from 'sentry/components/links/link';
1414
import LoadingIndicator from 'sentry/components/loadingIndicator';
15+
import {CustomMetricsEventData} from 'sentry/components/metrics/customMetricsEventData';
1516
import {
1617
ErrorDot,
1718
ErrorLevel,
@@ -44,7 +45,6 @@ import type {
4445
} from 'sentry/utils/performance/quickTrace/types';
4546
import {useLocation} from 'sentry/utils/useLocation';
4647
import useProjects from 'sentry/utils/useProjects';
47-
import {CustomMetricsEventData} from 'sentry/views/metrics/customMetricsEventData';
4848
import {spanDetailsRouteWithQuery} from 'sentry/views/performance/transactionSummary/transactionSpans/spanDetails/utils';
4949
import {transactionSummaryRouteWithQuery} from 'sentry/views/performance/transactionSummary/utils';
5050
import {getPerformanceDuration} from 'sentry/views/performance/utils/getPerformanceDuration';

static/app/views/metrics/customMetricsEventData.spec.tsx renamed to static/app/components/metrics/customMetricsEventData.spec.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import {render, screen} from 'sentry-test/reactTestingLibrary';
44
import {textWithMarkupMatcher} from 'sentry-test/utils';
55

66
import type {MetricsSummary} from 'sentry/components/events/interfaces/spans/types';
7+
import {CustomMetricsEventData} from 'sentry/components/metrics/customMetricsEventData';
78
import type {
89
MetricsQueryApiResponse,
910
MetricsQueryApiResponseLastMeta,
1011
} from 'sentry/types/metrics';
11-
import {CustomMetricsEventData} from 'sentry/views/metrics/customMetricsEventData';
1212

1313
const organization = OrganizationFixture({features: ['custom-metrics']});
1414

static/app/views/metrics/customMetricsEventData.tsx renamed to static/app/components/metrics/customMetricsEventData.tsx

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@ import {normalizeDateTimeString} from 'sentry/components/organizations/pageFilte
1414
import {IconInfo} from 'sentry/icons';
1515
import {t} from 'sentry/locale';
1616
import {space} from 'sentry/styles/space';
17-
import type {MetricsQueryApiResponseLastMeta, MetricType, MRI} from 'sentry/types';
17+
import type {
18+
MetricsQueryApiResponseLastMeta,
19+
MetricType,
20+
MRI,
21+
} from 'sentry/types/metrics';
1822
import {defined} from 'sentry/utils';
1923
import {getDefaultAggregate, getMetricsUrl} from 'sentry/utils/metrics';
2024
import {hasCustomMetrics} from 'sentry/utils/metrics/features';
@@ -28,12 +32,11 @@ import useOrganization from 'sentry/utils/useOrganization';
2832
import {MetricChart} from 'sentry/views/metrics/chart/chart';
2933
import type {Series} from 'sentry/views/metrics/chart/types';
3034
import {getChartTimeseries} from 'sentry/views/metrics/widget';
31-
import {getSampleChartSymbol} from 'sentry/views/starfish/views/spanSummaryPage/sampleList/durationChart/getSampleChartSymbol';
32-
3335
import {
3436
type SectionCardKeyValueList,
3537
TraceDrawerComponents,
36-
} from '../performance/newTraceDetails/traceDrawer/details/styles';
38+
} from 'sentry/views/performance/newTraceDetails/traceDrawer/details/styles';
39+
import {getSampleChartSymbol} from 'sentry/views/starfish/views/spanSummaryPage/sampleList/durationChart/getSampleChartSymbol';
3740

3841
function flattenMetricsSummary(
3942
metricsSummary: MetricsSummary

static/app/views/performance/newTraceDetails/traceDrawer/details/span/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import {EventContexts} from 'sentry/components/events/contexts';
44
import {SpanProfileDetails} from 'sentry/components/events/interfaces/spans/spanProfileDetails';
55
import {getSpanOperation} from 'sentry/components/events/interfaces/spans/utils';
66
import ProjectBadge from 'sentry/components/idBadge/projectBadge';
7+
import {CustomMetricsEventData} from 'sentry/components/metrics/customMetricsEventData';
78
import {Tooltip} from 'sentry/components/tooltip';
89
import {t} from 'sentry/locale';
910
import type {Organization, Project} from 'sentry/types';
1011
import {useLocation} from 'sentry/utils/useLocation';
1112
import useProjects from 'sentry/utils/useProjects';
12-
import {CustomMetricsEventData} from 'sentry/views/metrics/customMetricsEventData';
1313
import type {TraceTreeNodeDetailsProps} from 'sentry/views/performance/newTraceDetails/traceDrawer/tabs/traceTreeNodeDetails';
1414
import type {
1515
TraceTree,

static/app/views/performance/newTraceDetails/traceDrawer/details/transaction/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import ProjectBadge from 'sentry/components/idBadge/projectBadge';
99
import type {LazyRenderProps} from 'sentry/components/lazyRender';
1010
import LoadingError from 'sentry/components/loadingError';
1111
import LoadingIndicator from 'sentry/components/loadingIndicator';
12+
import {CustomMetricsEventData} from 'sentry/components/metrics/customMetricsEventData';
1213
import {Tooltip} from 'sentry/components/tooltip';
1314
import {t} from 'sentry/locale';
1415
import type {EventTransaction} from 'sentry/types/event';
@@ -17,7 +18,6 @@ import type {Project} from 'sentry/types/project';
1718
import {MutableSearch} from 'sentry/utils/tokenizeSearch';
1819
import {useLocation} from 'sentry/utils/useLocation';
1920
import useProjects from 'sentry/utils/useProjects';
20-
import {CustomMetricsEventData} from 'sentry/views/metrics/customMetricsEventData';
2121
import {Referrer} from 'sentry/views/performance/newTraceDetails/referrers';
2222
import {useTransaction} from 'sentry/views/performance/newTraceDetails/traceApi/useTransaction';
2323
import {CacheMetrics} from 'sentry/views/performance/newTraceDetails/traceDrawer/details/transaction/sections/cacheMetrics';

static/app/views/performance/traceDetails/traceViewDetailPanel.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ import FileSize from 'sentry/components/fileSize';
3636
import ProjectBadge from 'sentry/components/idBadge/projectBadge';
3737
import Link from 'sentry/components/links/link';
3838
import LoadingIndicator from 'sentry/components/loadingIndicator';
39+
import {CustomMetricsEventData} from 'sentry/components/metrics/customMetricsEventData';
3940
import {
4041
ErrorDot,
4142
ErrorLevel,
@@ -63,7 +64,6 @@ import {useLocation} from 'sentry/utils/useLocation';
6364
import useOrganization from 'sentry/utils/useOrganization';
6465
import useProjects from 'sentry/utils/useProjects';
6566
import {isCustomMeasurement} from 'sentry/views/dashboards/utils';
66-
import {CustomMetricsEventData} from 'sentry/views/metrics/customMetricsEventData';
6767
import {ProfileGroupProvider} from 'sentry/views/profiling/profileGroupProvider';
6868
import {ProfileContext, ProfilesProvider} from 'sentry/views/profiling/profilesProvider';
6969
import DetailPanel from 'sentry/views/starfish/components/detailPanel';

0 commit comments

Comments
 (0)