Просмотр исходного кода

ref(metrics): Move CustomMetricsEventData to components (#72188)

Move to `components/metrics` folder, as it is used in multiple places.
ArthurKnaus 9 месяцев назад
Родитель
Сommit
e1d65ca4c9

+ 1 - 1
static/app/components/events/eventEntries.tsx

@@ -6,6 +6,7 @@ import {EventEvidence} from 'sentry/components/events/eventEvidence';
 import EventReplay from 'sentry/components/events/eventReplay';
 import EventReplay from 'sentry/components/events/eventReplay';
 import {ActionableItems} from 'sentry/components/events/interfaces/crashContent/exception/actionableItems';
 import {ActionableItems} from 'sentry/components/events/interfaces/crashContent/exception/actionableItems';
 import {actionableItemsEnabled} from 'sentry/components/events/interfaces/crashContent/exception/useActionableItems';
 import {actionableItemsEnabled} from 'sentry/components/events/interfaces/crashContent/exception/useActionableItems';
+import {CustomMetricsEventData} from 'sentry/components/metrics/customMetricsEventData';
 import {t} from 'sentry/locale';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import {space} from 'sentry/styles/space';
 import type {
 import type {
@@ -19,7 +20,6 @@ import type {
 import {EntryType, EventOrGroupType} from 'sentry/types/event';
 import {EntryType, EventOrGroupType} from 'sentry/types/event';
 import {isNotSharedOrganization} from 'sentry/types/utils';
 import {isNotSharedOrganization} from 'sentry/types/utils';
 import {isEmptyObject} from 'sentry/utils/object/isEmptyObject';
 import {isEmptyObject} from 'sentry/utils/object/isEmptyObject';
-import {CustomMetricsEventData} from 'sentry/views/metrics/customMetricsEventData';
 
 
 import {EventContexts} from './contexts';
 import {EventContexts} from './contexts';
 import {EventDevice} from './device';
 import {EventDevice} from './device';

+ 1 - 1
static/app/components/events/interfaces/spans/newTraceDetailsSpanDetails.tsx

@@ -12,6 +12,7 @@ import SpanSummaryButton from 'sentry/components/events/interfaces/spans/spanSum
 import FileSize from 'sentry/components/fileSize';
 import FileSize from 'sentry/components/fileSize';
 import ExternalLink from 'sentry/components/links/externalLink';
 import ExternalLink from 'sentry/components/links/externalLink';
 import LoadingIndicator from 'sentry/components/loadingIndicator';
 import LoadingIndicator from 'sentry/components/loadingIndicator';
+import {CustomMetricsEventData} from 'sentry/components/metrics/customMetricsEventData';
 import Pill from 'sentry/components/pill';
 import Pill from 'sentry/components/pill';
 import Pills from 'sentry/components/pills';
 import Pills from 'sentry/components/pills';
 import {TransactionToProfileButton} from 'sentry/components/profiling/transactionToProfileButton';
 import {TransactionToProfileButton} from 'sentry/components/profiling/transactionToProfileButton';
@@ -29,7 +30,6 @@ import getDynamicText from 'sentry/utils/getDynamicText';
 import {safeURL} from 'sentry/utils/url/safeURL';
 import {safeURL} from 'sentry/utils/url/safeURL';
 import {useLocation} from 'sentry/utils/useLocation';
 import {useLocation} from 'sentry/utils/useLocation';
 import useProjects from 'sentry/utils/useProjects';
 import useProjects from 'sentry/utils/useProjects';
-import {CustomMetricsEventData} from 'sentry/views/metrics/customMetricsEventData';
 import {IssueList} from 'sentry/views/performance/newTraceDetails/traceDrawer/details/issues/issues';
 import {IssueList} from 'sentry/views/performance/newTraceDetails/traceDrawer/details/issues/issues';
 import {TraceDrawerComponents} from 'sentry/views/performance/newTraceDetails/traceDrawer/details/styles';
 import {TraceDrawerComponents} from 'sentry/views/performance/newTraceDetails/traceDrawer/details/styles';
 import type {
 import type {

+ 1 - 1
static/app/components/events/interfaces/spans/spanDetail.tsx

@@ -12,6 +12,7 @@ import FileSize from 'sentry/components/fileSize';
 import ExternalLink from 'sentry/components/links/externalLink';
 import ExternalLink from 'sentry/components/links/externalLink';
 import Link from 'sentry/components/links/link';
 import Link from 'sentry/components/links/link';
 import LoadingIndicator from 'sentry/components/loadingIndicator';
 import LoadingIndicator from 'sentry/components/loadingIndicator';
+import {CustomMetricsEventData} from 'sentry/components/metrics/customMetricsEventData';
 import {
 import {
   ErrorDot,
   ErrorDot,
   ErrorLevel,
   ErrorLevel,
@@ -44,7 +45,6 @@ import type {
 } from 'sentry/utils/performance/quickTrace/types';
 } from 'sentry/utils/performance/quickTrace/types';
 import {useLocation} from 'sentry/utils/useLocation';
 import {useLocation} from 'sentry/utils/useLocation';
 import useProjects from 'sentry/utils/useProjects';
 import useProjects from 'sentry/utils/useProjects';
-import {CustomMetricsEventData} from 'sentry/views/metrics/customMetricsEventData';
 import {spanDetailsRouteWithQuery} from 'sentry/views/performance/transactionSummary/transactionSpans/spanDetails/utils';
 import {spanDetailsRouteWithQuery} from 'sentry/views/performance/transactionSummary/transactionSpans/spanDetails/utils';
 import {transactionSummaryRouteWithQuery} from 'sentry/views/performance/transactionSummary/utils';
 import {transactionSummaryRouteWithQuery} from 'sentry/views/performance/transactionSummary/utils';
 import {getPerformanceDuration} from 'sentry/views/performance/utils/getPerformanceDuration';
 import {getPerformanceDuration} from 'sentry/views/performance/utils/getPerformanceDuration';

+ 1 - 1
static/app/views/metrics/customMetricsEventData.spec.tsx → static/app/components/metrics/customMetricsEventData.spec.tsx

@@ -4,11 +4,11 @@ import {render, screen} from 'sentry-test/reactTestingLibrary';
 import {textWithMarkupMatcher} from 'sentry-test/utils';
 import {textWithMarkupMatcher} from 'sentry-test/utils';
 
 
 import type {MetricsSummary} from 'sentry/components/events/interfaces/spans/types';
 import type {MetricsSummary} from 'sentry/components/events/interfaces/spans/types';
+import {CustomMetricsEventData} from 'sentry/components/metrics/customMetricsEventData';
 import type {
 import type {
   MetricsQueryApiResponse,
   MetricsQueryApiResponse,
   MetricsQueryApiResponseLastMeta,
   MetricsQueryApiResponseLastMeta,
 } from 'sentry/types/metrics';
 } from 'sentry/types/metrics';
-import {CustomMetricsEventData} from 'sentry/views/metrics/customMetricsEventData';
 
 
 const organization = OrganizationFixture({features: ['custom-metrics']});
 const organization = OrganizationFixture({features: ['custom-metrics']});
 
 

+ 7 - 4
static/app/views/metrics/customMetricsEventData.tsx → static/app/components/metrics/customMetricsEventData.tsx

@@ -14,7 +14,11 @@ import {normalizeDateTimeString} from 'sentry/components/organizations/pageFilte
 import {IconInfo} from 'sentry/icons';
 import {IconInfo} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import {space} from 'sentry/styles/space';
-import type {MetricsQueryApiResponseLastMeta, MetricType, MRI} from 'sentry/types';
+import type {
+  MetricsQueryApiResponseLastMeta,
+  MetricType,
+  MRI,
+} from 'sentry/types/metrics';
 import {defined} from 'sentry/utils';
 import {defined} from 'sentry/utils';
 import {getDefaultAggregate, getMetricsUrl} from 'sentry/utils/metrics';
 import {getDefaultAggregate, getMetricsUrl} from 'sentry/utils/metrics';
 import {hasCustomMetrics} from 'sentry/utils/metrics/features';
 import {hasCustomMetrics} from 'sentry/utils/metrics/features';
@@ -28,12 +32,11 @@ import useOrganization from 'sentry/utils/useOrganization';
 import {MetricChart} from 'sentry/views/metrics/chart/chart';
 import {MetricChart} from 'sentry/views/metrics/chart/chart';
 import type {Series} from 'sentry/views/metrics/chart/types';
 import type {Series} from 'sentry/views/metrics/chart/types';
 import {getChartTimeseries} from 'sentry/views/metrics/widget';
 import {getChartTimeseries} from 'sentry/views/metrics/widget';
-import {getSampleChartSymbol} from 'sentry/views/starfish/views/spanSummaryPage/sampleList/durationChart/getSampleChartSymbol';
-
 import {
 import {
   type SectionCardKeyValueList,
   type SectionCardKeyValueList,
   TraceDrawerComponents,
   TraceDrawerComponents,
-} from '../performance/newTraceDetails/traceDrawer/details/styles';
+} from 'sentry/views/performance/newTraceDetails/traceDrawer/details/styles';
+import {getSampleChartSymbol} from 'sentry/views/starfish/views/spanSummaryPage/sampleList/durationChart/getSampleChartSymbol';
 
 
 function flattenMetricsSummary(
 function flattenMetricsSummary(
   metricsSummary: MetricsSummary
   metricsSummary: MetricsSummary

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

@@ -4,12 +4,12 @@ import {EventContexts} from 'sentry/components/events/contexts';
 import {SpanProfileDetails} from 'sentry/components/events/interfaces/spans/spanProfileDetails';
 import {SpanProfileDetails} from 'sentry/components/events/interfaces/spans/spanProfileDetails';
 import {getSpanOperation} from 'sentry/components/events/interfaces/spans/utils';
 import {getSpanOperation} from 'sentry/components/events/interfaces/spans/utils';
 import ProjectBadge from 'sentry/components/idBadge/projectBadge';
 import ProjectBadge from 'sentry/components/idBadge/projectBadge';
+import {CustomMetricsEventData} from 'sentry/components/metrics/customMetricsEventData';
 import {Tooltip} from 'sentry/components/tooltip';
 import {Tooltip} from 'sentry/components/tooltip';
 import {t} from 'sentry/locale';
 import {t} from 'sentry/locale';
 import type {Organization, Project} from 'sentry/types';
 import type {Organization, Project} from 'sentry/types';
 import {useLocation} from 'sentry/utils/useLocation';
 import {useLocation} from 'sentry/utils/useLocation';
 import useProjects from 'sentry/utils/useProjects';
 import useProjects from 'sentry/utils/useProjects';
-import {CustomMetricsEventData} from 'sentry/views/metrics/customMetricsEventData';
 import type {TraceTreeNodeDetailsProps} from 'sentry/views/performance/newTraceDetails/traceDrawer/tabs/traceTreeNodeDetails';
 import type {TraceTreeNodeDetailsProps} from 'sentry/views/performance/newTraceDetails/traceDrawer/tabs/traceTreeNodeDetails';
 import type {
 import type {
   TraceTree,
   TraceTree,

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

@@ -9,6 +9,7 @@ import ProjectBadge from 'sentry/components/idBadge/projectBadge';
 import type {LazyRenderProps} from 'sentry/components/lazyRender';
 import type {LazyRenderProps} from 'sentry/components/lazyRender';
 import LoadingError from 'sentry/components/loadingError';
 import LoadingError from 'sentry/components/loadingError';
 import LoadingIndicator from 'sentry/components/loadingIndicator';
 import LoadingIndicator from 'sentry/components/loadingIndicator';
+import {CustomMetricsEventData} from 'sentry/components/metrics/customMetricsEventData';
 import {Tooltip} from 'sentry/components/tooltip';
 import {Tooltip} from 'sentry/components/tooltip';
 import {t} from 'sentry/locale';
 import {t} from 'sentry/locale';
 import type {EventTransaction} from 'sentry/types/event';
 import type {EventTransaction} from 'sentry/types/event';
@@ -17,7 +18,6 @@ import type {Project} from 'sentry/types/project';
 import {MutableSearch} from 'sentry/utils/tokenizeSearch';
 import {MutableSearch} from 'sentry/utils/tokenizeSearch';
 import {useLocation} from 'sentry/utils/useLocation';
 import {useLocation} from 'sentry/utils/useLocation';
 import useProjects from 'sentry/utils/useProjects';
 import useProjects from 'sentry/utils/useProjects';
-import {CustomMetricsEventData} from 'sentry/views/metrics/customMetricsEventData';
 import {Referrer} from 'sentry/views/performance/newTraceDetails/referrers';
 import {Referrer} from 'sentry/views/performance/newTraceDetails/referrers';
 import {useTransaction} from 'sentry/views/performance/newTraceDetails/traceApi/useTransaction';
 import {useTransaction} from 'sentry/views/performance/newTraceDetails/traceApi/useTransaction';
 import {CacheMetrics} from 'sentry/views/performance/newTraceDetails/traceDrawer/details/transaction/sections/cacheMetrics';
 import {CacheMetrics} from 'sentry/views/performance/newTraceDetails/traceDrawer/details/transaction/sections/cacheMetrics';

+ 1 - 1
static/app/views/performance/traceDetails/traceViewDetailPanel.tsx

@@ -36,6 +36,7 @@ import FileSize from 'sentry/components/fileSize';
 import ProjectBadge from 'sentry/components/idBadge/projectBadge';
 import ProjectBadge from 'sentry/components/idBadge/projectBadge';
 import Link from 'sentry/components/links/link';
 import Link from 'sentry/components/links/link';
 import LoadingIndicator from 'sentry/components/loadingIndicator';
 import LoadingIndicator from 'sentry/components/loadingIndicator';
+import {CustomMetricsEventData} from 'sentry/components/metrics/customMetricsEventData';
 import {
 import {
   ErrorDot,
   ErrorDot,
   ErrorLevel,
   ErrorLevel,
@@ -63,7 +64,6 @@ import {useLocation} from 'sentry/utils/useLocation';
 import useOrganization from 'sentry/utils/useOrganization';
 import useOrganization from 'sentry/utils/useOrganization';
 import useProjects from 'sentry/utils/useProjects';
 import useProjects from 'sentry/utils/useProjects';
 import {isCustomMeasurement} from 'sentry/views/dashboards/utils';
 import {isCustomMeasurement} from 'sentry/views/dashboards/utils';
-import {CustomMetricsEventData} from 'sentry/views/metrics/customMetricsEventData';
 import {ProfileGroupProvider} from 'sentry/views/profiling/profileGroupProvider';
 import {ProfileGroupProvider} from 'sentry/views/profiling/profileGroupProvider';
 import {ProfileContext, ProfilesProvider} from 'sentry/views/profiling/profilesProvider';
 import {ProfileContext, ProfilesProvider} from 'sentry/views/profiling/profilesProvider';
 import DetailPanel from 'sentry/views/starfish/components/detailPanel';
 import DetailPanel from 'sentry/views/starfish/components/detailPanel';