Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ref: add threadId to continuous profile link #74730

Merged
merged 1 commit into from
Jul 24, 2024
Merged

ref: add threadId to continuous profile link #74730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/views/performance/newTraceDetails/traceApi/useTransaction.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ import type {
} from 'sentry/views/performance/newTraceDetails/traceModels/traceTree';

interface UseTransactionProps {
node: TraceTreeNode<TraceTree.Transaction>;
node: TraceTreeNode<TraceTree.Transaction> | null;
organization: Organization;
}

export function useTransaction(props: UseTransactionProps) {
return useApiQuery<EventTransaction>(
[
`/organizations/${props.organization.slug}/events/${props.node.value.project_slug}:${props.node.value.event_id}/`,
`/organizations/${props.organization.slug}/events/${props.node?.value?.project_slug}:${props?.node?.value.event_id}/`,
{
query: {
referrer: 'trace-details-summary',
Expand Down
14 changes: 7 additions & 7 deletions static/app/views/performance/newTraceDetails/traceDrawer/details/span/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,12 @@ export function SpanNodeDetails({
}: TraceTreeNodeDetailsProps<TraceTreeNode<TraceTree.Span>>) {
const location = useLocation();
const {projects} = useProjects();
const {event} = node.value;
const issues = useMemo(() => {
return [...node.errors, ...node.performance_issues];
}, [node.errors, node.performance_issues]);
const project = projects.find(proj => proj.slug === event?.projectSlug);
const profileId = event?.contexts?.profile?.profile_id ?? null;

const project = projects.find(proj => proj.slug === node.value.event?.projectSlug);
const profileId = node.value.event?.contexts?.profile?.profile_id ?? null;

return (
<TraceDrawerComponents.DetailContainer>
Expand All @@ -91,10 +91,10 @@ export function SpanNodeDetails({
project={project}
onTabScrollToNode={onTabScrollToNode}
/>
{event.projectSlug ? (
{node.value.event.projectSlug ? (
<ProfilesProvider
orgSlug={organization.slug}
projectSlug={event.projectSlug}
projectSlug={node.value.event.projectSlug}
profileId={profileId || ''}
>
<ProfileContext.Consumer>
Expand Down Expand Up @@ -129,9 +129,9 @@ export function SpanNodeDetails({
startTimestamp={node.value.start_timestamp}
/>
</TraceDrawerComponents.SectionCardGroup>
<EventContexts event={event} />
<EventContexts event={node.value.event} />
{organization.features.includes('profiling') ? (
<SpanProfileDetails span={node.value} event={event} />
<SpanProfileDetails span={node.value} event={node.value.event} />
) : null}
</ProfileGroupProvider>
)}
Expand Down
23 changes: 22 additions & 1 deletion static/app/views/performance/newTraceDetails/traceDrawer/details/styles.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import {
isTransactionNode,
} from 'sentry/views/performance/newTraceDetails/guards';
import {traceAnalytics} from 'sentry/views/performance/newTraceDetails/traceAnalytics';
import {useTransaction} from 'sentry/views/performance/newTraceDetails/traceApi/useTransaction';
import {makeTraceContinuousProfilingLink} from 'sentry/views/performance/newTraceDetails/traceDrawer/traceProfilingLink';
import type {
MissingInstrumentationNode,
Expand Down Expand Up @@ -329,6 +330,21 @@ const ValueTd = styled('td')`
position: relative;
`;

function getThreadIdFromNode(
node: TraceTreeNode<TraceTree.NodeValue>,
transaction: EventTransaction | undefined
): string | undefined {
if (isSpanNode(node) && node.value.data['thread.id']) {
return node.value.data['thread.id'];
}

if (transaction) {
return transaction.context?.trace?.data?.['thread.id'];
}

return undefined;
}

function NodeActions(props: {
node: TraceTreeNode<any>;
onTabScrollToNode: (
Expand Down Expand Up @@ -409,12 +425,17 @@ function NodeActions(props: {
return '';
}, [props]);

const params = useParams<{traceSlug?: string}>();
const {data: transaction} = useTransaction({
node: isTransactionNode(props.node) ? props.node : null,
organization,
});

const params = useParams<{traceSlug?: string}>();
const profileLink = makeTraceContinuousProfilingLink(props.node, profilerId, {
orgSlug: props.organization.slug,
projectSlug: props.node.metadata.project_slug ?? '',
traceId: params.traceSlug ?? '',
threadId: getThreadIdFromNode(props.node, transaction),
});

return (
Expand Down
3 changes: 3 additions & 0 deletions static/app/views/performance/newTraceDetails/traceDrawer/traceProfilingLink.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ describe('traceProfilingLink', () => {
projectSlug: 'project',
orgSlug: '',
traceId: '',
threadId: '0',
})
).toBeNull();
});
Expand All @@ -47,6 +48,7 @@ describe('traceProfilingLink', () => {
projectSlug: '',
orgSlug: 'sentry',
traceId: '',
threadId: '0',
})
).toBeNull();
});
Expand Down Expand Up @@ -84,6 +86,7 @@ describe('traceProfilingLink', () => {
projectSlug: 'project',
orgSlug: 'sentry',
traceId: 'trace',
threadId: '0',
}
);

Expand Down
11 changes: 8 additions & 3 deletions static/app/views/performance/newTraceDetails/traceDrawer/traceProfilingLink.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ export function makeTraceContinuousProfilingLink(
options: {
orgSlug: string;
projectSlug: string;
threadId: string | undefined;
traceId: string;
},
query: Location['query'] = {}
Expand Down Expand Up @@ -94,15 +95,19 @@ export function makeTraceContinuousProfilingLink(
return null;
}

const queryWithSpanIdAndTraceId: Record<string, string> = {
const queryWithEventData: Record<string, string> = {
...query,
eventId,
traceId: options.traceId,
};

if (typeof options.threadId === 'string') {
queryWithEventData.tid = options.threadId;
}

const spanId = getNodeId(node);
if (spanId) {
queryWithSpanIdAndTraceId.spanId = spanId;
queryWithEventData.spanId = spanId;
}

return generateContinuousProfileFlamechartRouteWithQuery(
Expand All @@ -111,6 +116,6 @@ export function makeTraceContinuousProfilingLink(
profilerId,
start.toISOString(),
end.toISOString(),
queryWithSpanIdAndTraceId
queryWithEventData
);
}
15 changes: 8 additions & 7 deletions static/app/views/performance/newTraceDetails/traceModels/traceTree.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,12 @@ import {TraceType} from '../traceType';
type ArgumentTypes<F> = F extends (...args: infer A) => any ? A : never;

export declare namespace TraceTree {
interface RawSpan extends RawSpanType {}
interface Transaction extends TraceFullDetailed {
profiler_id: string;
sdk_name: string;
}
interface Span extends RawSpanType {
interface Span extends RawSpan {
childTransactions: TraceTreeNode<TraceTree.Transaction>[];
event: EventTransaction;
measurements?: Record<string, Measurement>;
Expand All @@ -138,14 +139,14 @@ export declare namespace TraceTree {
timestamp: number;
type: 'missing_instrumentation';
}
interface SiblingAutogroup extends RawSpanType {
interface SiblingAutogroup extends RawSpan {
autogrouped_by: {
description: string;
op: string;
};
}

interface ChildrenAutogroup extends RawSpanType {
interface ChildrenAutogroup extends RawSpan {
autogrouped_by: {
op: string;
};
Expand Down Expand Up @@ -861,7 +862,7 @@ export class TraceTree {
static FromSpans(
parent: TraceTreeNode<TraceTree.NodeValue>,
data: Event,
spans: RawSpanType[],
spans: TraceTree.RawSpan[],
options: {sdk: string | undefined} | undefined
): [TraceTreeNode<TraceTree.NodeValue>, [number, number] | null] {
parent.invalidate(parent);
Expand All @@ -872,7 +873,7 @@ export class TraceTree {

const parentIsSpan = isSpanNode(parent);
const lookuptable: Record<
RawSpanType['span_id'],
TraceTree.RawSpan['span_id'],
TraceTreeNode<TraceTree.Span | TraceTree.Transaction>
> = {};

Expand Down Expand Up @@ -2483,7 +2484,7 @@ export function computeAutogroupedBarSegments(

// Returns a list of errors related to the txn with ids matching the span id
function getRelatedSpanErrorsFromTransaction(
span: RawSpanType,
span: TraceTree.RawSpan,
node?: TraceTreeNode<TraceTree.NodeValue>
): TraceErrorType[] {
if (!node || !node.value || !isTransactionNode(node)) {
Expand All @@ -2505,7 +2506,7 @@ function getRelatedSpanErrorsFromTransaction(

// Returns a list of performance errors related to the txn with ids matching the span id
function getRelatedPerformanceIssuesFromTransaction(
span: RawSpanType,
span: TraceTree.RawSpan,
node?: TraceTreeNode<TraceTree.NodeValue>
): TraceTree.TracePerformanceIssue[] {
if (!node || !node.value || !isTransactionNode(node)) {
Expand Down
Loading