Skip to content
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions static/app/components/events/groupingInfo/groupingInfo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ export default function GroupingInfo({
projectSlug,
});

const variants = groupInfo
? Object.values(groupInfo).sort((a, b) => {
const variants = groupInfo?.variants
? Object.values(groupInfo.variants).sort((a, b) => {
// Sort contributing variants before non-contributing ones
if (a.contributes && !b.contributes) {
return -1;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,16 @@ describe('EventGroupingInfo', () => {
groupingInfoRequest = MockApiClient.addMockResponse({
url: `/projects/org-slug/project-slug/events/${event.id}/grouping-info/`,
body: {
app: {
contributes: true,
description: 'variant description',
hash: '123',
hashMismatch: false,
key: 'key',
type: EventGroupVariantType.CHECKSUM,
grouping_config: 'default:XXXX',
variants: {
app: {
contributes: true,
description: 'variant description',
hash: '123',
hashMismatch: false,
key: 'key',
type: EventGroupVariantType.CHECKSUM,
},
},
},
});
Expand Down
13 changes: 3 additions & 10 deletions static/app/components/events/groupingInfo/groupingSummary.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,15 @@ export function GroupInfoSummary({
group,
projectSlug,
});
const groupedBy = groupInfo
? Object.values(groupInfo)
const groupedBy = groupInfo?.variants
? Object.values(groupInfo.variants)
.filter(variant => variant.contributes && variant.description !== null)
.map(variant => variant.description!)
.sort((a, b) => a.toLowerCase().localeCompare(b.toLowerCase()))
.join(', ')
: t('nothing');

const groupingConfig =
showGroupingConfig && groupInfo
? (
Object.values(groupInfo).find(
variant => 'config' in variant && variant.config?.id
) as any
)?.config?.id
: null;
const groupingConfig = showGroupingConfig && groupInfo?.grouping_config;

if (isPending && !hasPerformanceGrouping) {
return (
Expand Down
51 changes: 33 additions & 18 deletions static/app/components/events/groupingInfo/useEventGroupingInfo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ import type {Group} from 'sentry/types/group';
import {useApiQuery} from 'sentry/utils/queryClient';
import useOrganization from 'sentry/utils/useOrganization';

type EventGroupingInfoResponse = Record<string, EventGroupVariant>;
type EventGroupingInfoResponse = {
grouping_config: string | null;
variants: Record<string, EventGroupVariant>;
};

function generatePerformanceGroupInfo({
event,
Expand All @@ -27,21 +30,24 @@ function generatePerformanceGroupInfo({

return group
? {
[group.issueType]: {
contributes: true,
description: t('performance problem'),
hash: event.occurrence?.fingerprint[0] || '',
hashMismatch: false,
hint: null,
key: group.issueType,
type: EventGroupVariantType.PERFORMANCE_PROBLEM,
evidence: {
op: evidenceData?.op,
parent_span_ids: evidenceData?.parentSpanIds,
cause_span_ids: evidenceData?.causeSpanIds,
offender_span_ids: evidenceData?.offenderSpanIds,
desc: t('performance problem'),
fingerprint: hash,
grouping_config: null,
variants: {
[group.issueType]: {
contributes: true,
description: t('performance problem'),
hash: event.occurrence?.fingerprint[0] || '',
hashMismatch: false,
hint: null,
key: group.issueType,
type: EventGroupVariantType.PERFORMANCE_PROBLEM,
evidence: {
op: evidenceData?.op,
parent_span_ids: evidenceData?.parentSpanIds,
cause_span_ids: evidenceData?.causeSpanIds,
offender_span_ids: evidenceData?.offenderSpanIds,
desc: t('performance problem'),
fingerprint: hash,
},
},
},
}
Expand All @@ -63,12 +69,21 @@ export function useEventGroupingInfo({

const {data, isPending, isError, isSuccess} = useApiQuery<EventGroupingInfoResponse>(
[`/projects/${organization.slug}/${projectSlug}/events/${event.id}/grouping-info/`],
{enabled: !hasPerformanceGrouping, staleTime: Infinity}
{
enabled: !hasPerformanceGrouping,
staleTime: Infinity,
}
);

const groupInfo = hasPerformanceGrouping
? generatePerformanceGroupInfo({group, event})
: (data ?? null);

return {groupInfo, isPending, isError, isSuccess, hasPerformanceGrouping};
return {
groupInfo,
isPending,
isError,
isSuccess,
hasPerformanceGrouping,
};
}
Loading