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

feat(explore): Linking to spans in traceview from all tables #78984

Merged
merged 4 commits into from
Oct 15, 2024
Merged

feat(explore): Linking to spans in traceview from all tables #78984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d48cae3
feat(explore): Linking to spans in traceview from all tables
Oct 10, 2024
d8efc77
feat(explore): Fixing links to transactions
Oct 10, 2024
f7f361c
feat(new-trace): Minor iterations
Oct 11, 2024
a6082d3
feat(explore): Iterating on PR suggestions.
Oct 11, 2024
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
7 changes: 6 additions & 1 deletion static/app/utils/discover/urls.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,12 @@ export function generateLinkToEventInTraceView({
eventId,
transactionName,
eventView,
targetId,
demo,
source,
type = 'performance',
}: {
eventId: string;
eventId: string | undefined;
location: Location;
organization: Organization;
projectSlug: string;
Expand All @@ -67,6 +68,9 @@ export function generateLinkToEventInTraceView({
isHomepage?: boolean;
source?: string;
spanId?: string;
// targetId represents the span id of the transaction. It will replace eventId once all links
// to trace view are updated to use spand ids of transactions instead of event ids.
targetId?: string;
transactionName?: string;
type?: 'performance' | 'discover';
}) {
Expand All @@ -90,6 +94,7 @@ export function generateLinkToEventInTraceView({
dateSelection,
timestamp: normalizedTimestamp,
eventId,
targetId,
spanId,
demo,
location,
Expand Down
1 change: 0 additions & 1 deletion static/app/views/explore/tables/aggregatesTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ export function AggregatesTable({}: AggregatesTableProps) {
)}
<FieldRenderer
column={columns[j]}
dataset={dataset}
data={row}
unit={meta?.units?.[field]}
meta={meta}
Expand Down
11 changes: 3 additions & 8 deletions static/app/views/explore/tables/fieldRenderer.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import {OrganizationFixture} from 'sentry-fixture/organization';
import {render, screen} from 'sentry-test/reactTestingLibrary';

import EventView from 'sentry/utils/discover/eventView';
import {DiscoverDatasets} from 'sentry/utils/discover/types';

import {FieldRenderer} from './fieldRenderer';

Expand All @@ -15,6 +14,7 @@ const mockedEventData = {
trace: 'traceId',
'span.op': 'test_op',
'transaction.id': 'transactionId',
'transaction.span_id': 'transactionSpanId',
};

describe('FieldRenderer tests', function () {
Expand Down Expand Up @@ -46,7 +46,6 @@ describe('FieldRenderer tests', function () {
<FieldRenderer
column={eventView.getColumns()[3]}
data={mockedEventData}
dataset={DiscoverDatasets.SPANS_INDEXED}
meta={{}}
/>,
{organization}
Expand All @@ -60,7 +59,6 @@ describe('FieldRenderer tests', function () {
<FieldRenderer
column={eventView.getColumns()[0]}
data={mockedEventData}
dataset={DiscoverDatasets.SPANS_INDEXED}
meta={{}}
/>,
{organization}
Expand All @@ -69,7 +67,7 @@ describe('FieldRenderer tests', function () {
expect(screen.getByText('spanId')).toBeInTheDocument();
expect(screen.getByRole('link')).toHaveAttribute(
'href',
`/organizations/org-slug/performance/trace/traceId/?eventId=transactionId&node=span-spanId&node=txn-transactionId&source=traces&statsPeriod=14d&timestamp=1727964900`
`/organizations/org-slug/performance/trace/traceId/?node=span-spanId&node=txn-transactionSpanId&source=traces&statsPeriod=14d&targetId=transactionSpanId&timestamp=1727964900`
);
});

Expand All @@ -78,7 +76,6 @@ describe('FieldRenderer tests', function () {
<FieldRenderer
column={eventView.getColumns()[4]}
data={mockedEventData}
dataset={DiscoverDatasets.SPANS_INDEXED}
meta={{}}
/>,
{organization}
Expand All @@ -87,7 +84,7 @@ describe('FieldRenderer tests', function () {
expect(screen.getByText('transactionId')).toBeInTheDocument();
expect(screen.getByRole('link')).toHaveAttribute(
'href',
`/organizations/org-slug/performance/trace/traceId/?eventId=transactionId&source=traces&statsPeriod=14d&timestamp=1727964900`
`/organizations/org-slug/performance/trace/traceId/?source=traces&statsPeriod=14d&targetId=transactionSpanId&timestamp=1727964900`
);
});

Expand All @@ -96,7 +93,6 @@ describe('FieldRenderer tests', function () {
<FieldRenderer
column={eventView.getColumns()[2]}
data={mockedEventData}
dataset={DiscoverDatasets.SPANS_INDEXED}
meta={{}}
/>,
{organization}
Expand All @@ -114,7 +110,6 @@ describe('FieldRenderer tests', function () {
<FieldRenderer
column={eventView.getColumns()[1]}
data={mockedEventData}
dataset={DiscoverDatasets.SPANS_INDEXED}
meta={{}}
/>,
{organization}
Expand Down
8 changes: 3 additions & 5 deletions static/app/views/explore/tables/fieldRenderer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import type {TableDataRow} from 'sentry/utils/discover/discoverQuery';
import type {EventData, MetaType} from 'sentry/utils/discover/eventView';
import EventView from 'sentry/utils/discover/eventView';
import {getFieldRenderer} from 'sentry/utils/discover/fieldRenderers';
import {DiscoverDatasets} from 'sentry/utils/discover/types';
import {generateLinkToEventInTraceView} from 'sentry/utils/discover/urls';
import {MutableSearch} from 'sentry/utils/tokenizeSearch';
import {useLocation} from 'sentry/utils/useLocation';
Expand All @@ -22,12 +21,11 @@ import {useUserQuery} from '../hooks/useUserQuery';
interface FieldProps {
column: TableColumn<keyof TableDataRow>;
data: EventData;
dataset: DiscoverDatasets;
meta: MetaType;
unit?: string;
}

export function FieldRenderer({data, dataset, meta, unit, column}: FieldProps) {
export function FieldRenderer({data, meta, unit, column}: FieldProps) {
const location = useLocation();
const organization = useOrganization();
const [userQuery, setUserQuery] = useUserQuery();
Expand Down Expand Up @@ -67,8 +65,8 @@ export function FieldRenderer({data, dataset, meta, unit, column}: FieldProps) {
projectSlug: data.project,
traceSlug: data.trace,
timestamp: data.timestamp,
eventId:
dataset === DiscoverDatasets.SPANS_INDEXED ? data['transaction.id'] : undefined,
targetId: data['transaction.span_id'],
eventId: undefined,
organization,
location,
spanId,
Expand Down
3 changes: 1 addition & 2 deletions static/app/views/explore/tables/spansTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export function SpansTable({}: SpansTableProps) {
...fields,
'project',
'trace',
'transaction.id',
'transaction.span_id',
'span_id',
'timestamp',
];
Expand Down Expand Up @@ -122,7 +122,6 @@ export function SpansTable({}: SpansTableProps) {
<TableBodyCell key={j}>
<FieldRenderer
column={columns[j]}
dataset={dataset}
data={row}
unit={meta?.units?.[field]}
meta={meta}
Expand Down
6 changes: 3 additions & 3 deletions static/app/views/performance/newTraceDetails/traceApi/useTrace.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ export function getTraceQueryParams(
filters?: Partial<PageFilters>,
options: {limit?: number; timestamp?: number} = {}
): {
eventId: string | undefined;
limit: number;
targetId: string | undefined;
timestamp: string | undefined;
useSpans: number;
demo?: string | undefined;
Expand All @@ -58,7 +58,7 @@ export function getTraceQueryParams(
limit = parseInt(limit, 10);
}

const eventId = decodeScalar(normalizedParams.eventId);
const targetId = decodeScalar(normalizedParams.targetId ?? normalizedParams.eventId);
Abdkhan14 marked this conversation as resolved.
Show resolved Hide resolved

if (timestamp) {
limit = limit ?? DEFAULT_TIMESTAMP_LIMIT;
Expand All @@ -83,7 +83,7 @@ export function getTraceQueryParams(
demo,
limit,
timestamp: timestamp?.toString(),
eventId,
targetId,
useSpans: 1,
};
for (const key in queryParams) {
Expand Down
8 changes: 6 additions & 2 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 @@ -1113,7 +1113,9 @@ export class TraceTree extends TraceTreeEventDispatcher {

return TraceTree.Find(start, node => {
if (type === 'txn' && isTransactionNode(node)) {
return node.value.event_id === id;
// A transaction itself is a span and we are starting to treat it as such.
// Hence we check for both event_id and span_id.
return node.value.event_id === id || node.value.span_id === id;
}
if (type === 'span' && isSpanNode(node)) {
return node.value.span_id === id;
Expand Down Expand Up @@ -1170,7 +1172,9 @@ export class TraceTree extends TraceTreeEventDispatcher {
): TraceTreeNode<TraceTree.NodeValue> | null {
return TraceTree.Find(start, node => {
if (isTransactionNode(node)) {
return node.value.event_id === eventId;
// A transaction itself is a span and we are starting to treat it as such.
// Hence we check for both event_id and span_id.
return node.value.event_id === eventId || node.value.span_id === eventId;
}
if (isSpanNode(node)) {
return node.value.span_id === eventId;
Expand Down
2 changes: 1 addition & 1 deletion static/app/views/performance/newTraceDetails/useTraceScrollToPath.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export function useTraceScrollToPath(
const queryParams = qs.parse(location.search);

scrollToNode = {
eventId: queryParams.eventId as string | undefined,
eventId: (queryParams.eventId ?? queryParams.targetId) as string | undefined,
path: decodeScrollQueue(queryParams.node) as TraceTree.NodePath[] | undefined,
};
}
Expand Down
7 changes: 6 additions & 1 deletion static/app/views/performance/traceDetails/utils.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export function getTraceDetailsUrl({
timestamp,
spanId,
eventId,
targetId,
demo,
location,
source,
Expand All @@ -35,6 +36,9 @@ export function getTraceDetailsUrl({
eventId?: string;
source?: string;
spanId?: string;
// targetId represents the span id of the transaction. It will replace eventId once all links
// to trace view are updated to use spand ids of transactions instead of event ids.
targetId?: string;
timestamp?: string | number;
}): LocationDescriptorObject {
const {start, end, statsPeriod} = dateSelection;
Expand All @@ -59,7 +63,7 @@ export function getTraceDetailsUrl({

if (organization.features.includes('trace-view-v1')) {
if (spanId) {
queryParams.node = [`span-${spanId}`, `txn-${eventId}`];
queryParams.node = [`span-${spanId}`, `txn-${targetId ?? eventId}`];
}
return {
pathname: normalizeUrl(
Expand All @@ -69,6 +73,7 @@ export function getTraceDetailsUrl({
...queryParams,
timestamp: getTimeStampFromTableDateField(timestamp),
eventId,
targetId,
demo,
source,
},
Expand Down
Loading