Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
80 changes: 52 additions & 28 deletions static/app/components/profiling/profilingTransactionHovercard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import {
generateProfileSummaryRouteWithQuery,
} from 'sentry/utils/profiling/routes';
import {useLocation} from 'sentry/utils/useLocation';
import {profilesRouteWithQuery} from 'sentry/views/performance/transactionSummary/transactionProfiles/utils';

import {Button} from '../button';
import Link from '../links/link';
Expand All @@ -37,50 +38,73 @@ export function ProfilingTransactionHovercard(props: ProfilingTransactionHoverca
const {project, transaction, organization} = props;
const {query} = useLocation();

const linkToSummary = generateProfileSummaryRouteWithQuery({
if (!organization.features.includes('continuous-profiling-compat')) {
const linkToSummary = generateProfileSummaryRouteWithQuery({
query,
orgSlug: organization.slug,
projectSlug: project.slug,
transaction,
});

const triggerLink = (
<Link
to={linkToSummary}
onClick={() =>
trackAnalytics('profiling_views.go_to_transaction', {
organization,
source: 'transaction_hovercard.trigger',
})
}
>
{transaction}
</Link>
);

return (
<StyledHovercard
delay={250}
header={
<Flex justify="space-between" align="center">
<TextTruncateOverflow>{transaction}</TextTruncateOverflow>
<Button to={linkToSummary} size="xs">
{t('View Profiles')}
</Button>
</Flex>
}
body={
<ProfilingTransactionHovercardBody
transaction={transaction}
project={project}
organization={organization}
/>
}
showUnderline
>
{triggerLink}
</StyledHovercard>
);
}

const linkToSummary = profilesRouteWithQuery({
query,
orgSlug: organization.slug,
projectSlug: project.slug,
projectID: project.id,
transaction,
});

const triggerLink = (
return (
<Link
to={linkToSummary}
onClick={() =>
trackAnalytics('profiling_views.go_to_transaction', {
organization,
source: 'transaction_hovercard.trigger',
source: 'profiling.landing.transaction_table',
})
}
>
{transaction}
</Link>
);

return (
<StyledHovercard
delay={250}
header={
<Flex justify="space-between" align="center">
<TextTruncateOverflow>{transaction}</TextTruncateOverflow>
<Button to={linkToSummary} size="xs">
{t('View Profiles')}
</Button>
</Flex>
}
body={
<ProfilingTransactionHovercardBody
transaction={transaction}
project={project}
organization={organization}
/>
}
showUnderline
>
{triggerLink}
</StyledHovercard>
);
}

export function ProfilingTransactionHovercardBody({
Expand Down
1 change: 1 addition & 0 deletions static/app/utils/analytics/profilingAnalyticsEvents.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ type ProfilingEventSource =
| 'profiling.global_suspect_functions'
| 'profiling.issue.function_regression.list'
| 'profiling.issue.function_regression.transactions'
| 'profiling.landing.transaction_table'
| 'profiling_transaction.suspect_functions_table'
| 'profiling_transaction.slowest_functions_table'
| 'profiling_transaction.regressed_functions_table'
Expand Down
8 changes: 7 additions & 1 deletion static/app/utils/profiling/hooks/useProfileEvents.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export interface UseProfileEventsOptions<F extends string = ProfilingFieldType>
fields: readonly F[];
referrer: string;
sort: Sort<F>;
continuousProfilingCompat?: boolean;
cursor?: string;
datetime?: PageFilters['datetime'];
enabled?: boolean;
Expand All @@ -29,6 +30,7 @@ export function useProfileEvents<F extends string>({
referrer,
query,
sort,
continuousProfilingCompat,
cursor,
enabled = true,
refetchOnMount = true,
Expand All @@ -38,7 +40,11 @@ export function useProfileEvents<F extends string>({
const organization = useOrganization();
const {selection} = usePageFilters();

query = `has:profile.id ${query ? `(${query})` : ''}`;
if (continuousProfilingCompat) {
query = `(has:profile.id OR (has:profiler.id has:thread.id)) ${query ? `(${query})` : ''}`;
} else {
query = `has:profile.id ${query ? `(${query})` : ''}`;
}

const path = `/organizations/${organization.slug}/events/`;
const endpointOptions = {
Expand Down
3 changes: 3 additions & 0 deletions static/app/views/profiling/content.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,9 @@ function ProfilingContent({location}: ProfilingContentProps) {
query,
sort,
referrer: 'api.profiling.landing-table',
continuousProfilingCompat: organization.features.includes(
'continuous-profiling-compat'
),
});

const transactionsError =
Expand Down