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.

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

Fix: Trace Root transaction name #612

Merged
merged 2 commits into from
Dec 5, 2024
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
5 changes: 5 additions & 0 deletions .changeset/mean-games-fail.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@spotlightjs/overlay': patch
---

Added Trace root transaction name in Trace detail header
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type { Trace } from '../../../../../types';
import TraceIcon from '../../TraceIcon';
import { TraceRootTxnName } from './TraceRootTxnName';

type TraceDetailHeaderProps = {
trace: Trace;
Expand All @@ -9,7 +10,10 @@
return (
<div className="border-b-primary-700 bg-primary-950 flex items-center gap-x-2 border-b px-6 py-4">
<TraceIcon trace={trace} />
<h1 className="max-w-full flex-1 truncate text-2xl">{trace.rootTransactionName}</h1>
<h1 className="flex w-full flex-1 items-center truncate text-2xl">
Trace:&nbsp;&nbsp;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we really need the two &nbsp; spaces here? 😅

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah just to give some space between tag and "Trace:"

<TraceRootTxnName trace={trace} flowing />
</h1>

Check warning on line 16 in packages/overlay/src/integrations/sentry/components/explore/traces/TraceDetails/components/TraceDetailHeader.tsx

View check run for this annotation

Codecov / codecov/patch

packages/overlay/src/integrations/sentry/components/explore/traces/TraceDetails/components/TraceDetailHeader.tsx#L13-L16

Added lines #L13 - L16 were not covered by tests
</div>
);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import type { Trace } from '~/integrations/sentry/types';
import Tag from '~/ui/Tag';

export function TraceRootTxnName({ trace, flowing = false }: { trace: Trace; flowing?: boolean }) {
const method = String(
trace.rootTransaction?.contexts?.trace.data?.method || trace.rootTransaction?.request?.method || '',
);
const name =
method && trace.rootTransactionName.startsWith(method)
? trace.rootTransactionName.slice(method.length + 1)
: trace.rootTransactionName;
return <Tag tagKey={method} value={name} flowing={flowing} />;
}

Check warning on line 13 in packages/overlay/src/integrations/sentry/components/explore/traces/TraceDetails/components/TraceRootTxnName.tsx

View check run for this annotation

Codecov / codecov/patch

packages/overlay/src/integrations/sentry/components/explore/traces/TraceDetails/components/TraceRootTxnName.tsx#L5-L13

Added lines #L5 - L13 were not covered by tests
Original file line number Diff line number Diff line change
@@ -1,30 +1,18 @@
import { useState } from 'react';
import { Link } from 'react-router-dom';
import Badge from '~/ui/Badge';
import Tag from '~/ui/Tag';
import CardList from '../../../../../components/CardList';
import TimeSince from '../../../../../components/TimeSince';
import classNames from '../../../../../lib/classNames';
import { useSpotlightContext } from '../../../../../lib/useSpotlightContext';
import { useSentryHelpers } from '../../../data/useSentryHelpers';
import { useSentryTraces } from '../../../data/useSentryTraces';
import type { Trace } from '../../../types';
import { getDuration } from '../../../utils/duration';
import { truncateId } from '../../../utils/text';
import HiddenItemsButton from '../../HiddenItemsButton';
import { TraceRootTxnName } from './TraceDetails/components/TraceRootTxnName';
import TraceIcon from './TraceIcon';

function TransactionName({ trace }: { trace: Trace }) {
const method = String(
trace.rootTransaction?.contexts?.trace.data?.method || trace.rootTransaction?.request?.method || '',
);
const name =
method && trace.rootTransactionName.startsWith(method)
? trace.rootTransactionName.slice(method.length + 1)
: trace.rootTransactionName;
return <Tag tagKey={method} value={name} />;
}

export default function TraceList() {
const traceList = useSentryTraces();
const helpers = useSentryHelpers();
Expand Down Expand Up @@ -64,7 +52,7 @@
</div>
<TimeSince date={trace.start_timestamp} />
</div>
<TransactionName trace={trace} />
<TraceRootTxnName trace={trace} />

Check warning on line 55 in packages/overlay/src/integrations/sentry/components/explore/traces/TraceList.tsx

View check run for this annotation

Codecov / codecov/patch

packages/overlay/src/integrations/sentry/components/explore/traces/TraceList.tsx#L55

Added line #L55 was not covered by tests
<div className="flex flex-col truncate font-mono">
<div className="text-primary-300 flex space-x-2 text-sm">
<div
Expand Down
34 changes: 27 additions & 7 deletions packages/overlay/src/ui/Tag/Tag.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,30 @@
export type TagProps = { tagKey: string; value: string };
import classNames from '~/lib/classNames';

export default function Tag({ tagKey, value }: TagProps) {
return value ? (
<div className="border-primary-300 bg-primary-900 divide-x-primary-300 inline-flex divide-x overflow-hidden whitespace-nowrap rounded-full border font-mono text-sm">
{tagKey ? <div className="px-2 py-1 font-semibold">{tagKey}</div> : null}
<div className="bg-primary-800 rounded-full px-2 py-1">{value}</div>
export type TagProps = {
tagKey?: string;
value: string;
flowing?: boolean;
maxWidth?: string;
};

export default function Tag({ tagKey, value, flowing = false, maxWidth = '400px' }: TagProps) {
if (!value) return null;

return (
<div
className={classNames(
'border-primary-300 bg-primary-900 divide-x-primary-300 inline-flex divide-x overflow-hidden whitespace-nowrap rounded-full border font-mono text-sm',
flowing && 'max-w-full',
)}
>
{tagKey && <div className="px-2 py-1 font-semibold">{tagKey}</div>}
<div
title={value}
className={classNames('bg-primary-800 truncate px-2 py-1', flowing ? 'max-w-full' : 'max-w-none')}
style={{ maxWidth: flowing ? '100%' : maxWidth }}
>
{value}
</div>

Check warning on line 27 in packages/overlay/src/ui/Tag/Tag.tsx

View check run for this annotation

Codecov / codecov/patch

packages/overlay/src/ui/Tag/Tag.tsx#L10-L27

Added lines #L10 - L27 were not covered by tests
</div>
) : null;
);

Check warning on line 29 in packages/overlay/src/ui/Tag/Tag.tsx

View check run for this annotation

Codecov / codecov/patch

packages/overlay/src/ui/Tag/Tag.tsx#L29

Added line #L29 was not covered by tests
}
Loading