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
5 changes: 5 additions & 0 deletions .changeset/trace-viewer-cleanup.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@workflow/web-shared": patch
---

New trace viewer cleanup: fix `EventRow` crash on spans without `attributes.data`, drop dead `DetailPanel` + empty placeholder files, give time markers and segments stable keys, fix invalid `stroke-linejoin` JSX attribute, and replace the unsafe `Trace` cast with the real `TraceWithMeta` type.
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { Circle } from 'lucide-react';
import { useRef } from 'react';
import { cn } from '../../../lib/utils';
import type { Span } from '../../trace-viewer/types';
import type { Span } from '../types';
import { formatDuration } from '../../trace-viewer/util/timing';
import {
SleepIcon,
Expand DownExpand Up@@ -53,8 +53,9 @@ const EventRow = ({
onSelectSpan: (spanId: string) => void;
}) => {
const durationMs = getSpanDurationMs(span);
const isErrored =
(span.attributes.data as Record<string, unknown>).status === 'failed';
const workflowStatus = (span.attributes.data as Record<string, unknown>)
?.status as string | undefined;
const isErrored = span.status.code === 2 || workflowStatus === 'failed';
const { icon: Icon, className: tagClassName } = getEventStyle(
span.resource,
isErrored
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import { ArrowLeft, ArrowRight } from 'lucide-react';
import type { CSSProperties, ReactNode } from 'react';
import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { cn } from '../../../lib/utils';
import type { Span } from '../../trace-viewer/types';
import type { Span } from '../types';
import { formatDuration, getHighResInMs } from '../../trace-viewer/util/timing';
import { isSpanDimmedBySearch, type SpanSearchResult } from '../search';
import type { Segment, SegmentStatus, TimeMarker } from '../utils';
Expand DownExpand Up@@ -234,7 +234,7 @@ function SegmentBar({ segments }: { segments: VisibleSegment[] }): ReactNode {

return (
<div
key={`${seg.status}-${i}`}
key={i}
className={cn(
'absolute h-full rounded-[0.25rem]',
SEGMENT_CLASSES[seg.status]
Expand DownExpand Up@@ -421,7 +421,7 @@ export function TimelineHeader({
<div className="relative h-full flex-1">
{markers.map((m) => (
<span
key={`${m.position}-${m.label}`}
key={String(m.value)}
className="absolute bottom-1 font-mono text-xs font-normal leading-4 text-gray-900 whitespace-nowrap"
style={{ left: `${m.position * 100}%` }}
>
Expand DownExpand Up@@ -506,7 +506,7 @@ export function Timeline({
// Skip the "0s" origin marker since the left edge already implies it.
Math.abs(marker.value) > 0.000001 ? (
<div
key={`${marker.position}-${marker.label}`}
key={String(marker.value)}
className="absolute top-0 bottom-0 w-px bg-gray-alpha-300"
style={{ left: `${marker.position * 100}%` }}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ import {
useMemo,
useState,
} from 'react';
import type { Span } from '../trace-viewer/types';
import type { Span } from './types';

interface ActiveSpanContextValue {
activeSpanId: string | null;
Expand Down

This file was deleted.

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ const WorkflowIcon = () => {
<svg
data-testid="geist-icon"
height="16"
stroke-linejoin="round"
strokeLinejoin="round"
style={{ color: 'currentColor' }}
viewBox="0 0 16 16"
width="16"
Expand All@@ -21,7 +21,7 @@ const WebhookIcon = () => {
<svg
data-testid="geist-icon"
height="16"
stroke-linejoin="round"
strokeLinejoin="round"
viewBox="0 0 16 16"
width="16"
style={{ color: 'currentColor' }}
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { Span } from '../trace-viewer/types';
import type { Span } from './types';

const ATTR_FILTER_REGEX = /(?:^|\s)(?<pair>(?<key>[\w.]+):(?<value>\S*))/g;

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,8 +26,8 @@ import {
EntityDetailPanel,
type SelectedSpanInfo,
} from '../sidebar/entity-detail-panel';
import { useSidebarDataOptional } from '../sidebar/sidebar-data-context';
import type { Trace } from '../trace-viewer/types';
import { useSidebarData } from '../sidebar/sidebar-data-context';
import type { TraceWithMeta } from './types';
import { formatDuration, getHighResInMs } from '../trace-viewer/util/timing';
import { IconButton } from '../ui/icon-button';
import { Spinner } from '../ui/spinner';
Expand All@@ -46,12 +46,11 @@ import {
TooltipTrigger,
} from '../ui/tooltip';
import { ActiveSpanProvider, useActiveSpan } from './context';
import { DetailPanel } from './detail-panel';
import { searchSpans } from './search';
import { computeRootBounds, computeTimeMarkers } from './utils';

interface NewTraceViewerProps {
trace: Trace;
trace: TraceWithMeta;
onLoadMore?: () => void | Promise<void>;
hasMore?: boolean;
isLoadingMore?: boolean;
Expand DownExpand Up@@ -141,10 +140,10 @@ function useAnimatedViewport(initial: Viewport) {

function useSelectedSpanInfo(): SelectedSpanInfo | null {
const { activeSpan } = useActiveSpan();
const sidebar = useSidebarDataOptional();
const sidebar = useSidebarData();

return useMemo(() => {
if (!activeSpan || !sidebar) return null;
if (!activeSpan) return null;

const correlationId = activeSpan.spanId;
const rawEvents = correlationId
Expand DownExpand Up@@ -193,7 +192,7 @@ function NewTraceViewerContent({
const { activeSpan, activeSpanId, setActiveSpan, clearActiveSpan } =
useActiveSpan();

const sidebar = useSidebarDataOptional();
const sidebar = useSidebarData();
const selectedSpan = useSelectedSpanInfo();

const [searchQuery, setSearchQuery] = useState('');
Expand DownExpand Up@@ -674,7 +673,7 @@ function NewTraceViewerContent({
</div>

{/* Detail panel */}
{activeSpan && sidebar ? (
{activeSpan ? (
<aside className="flex flex-col h-full max-h-full bg-background-100 border-l border-gray-alpha-400 overflow-auto">
{/* Panel header */}
<div className="flex items-center justify-between gap-2 shrink-0 px-4 pt-3 pb-3">
Expand DownExpand Up@@ -750,12 +749,6 @@ function NewTraceViewerContent({
</ErrorBoundary>
</div>
</aside>
) : activeSpan ? (
<DetailPanel
span={activeSpan}
rootStart={root.startTime}
onClose={clearActiveSpan}
/>
) : null}
</div>
);
Expand Down
2 changes: 2 additions & 0 deletions packages/web-shared/src/components/new-trace-viewer/types.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
export type { Span, SpanEvent, Trace } from '../trace-viewer/types';
export type { TraceWithMeta } from '../../lib/trace-builder';
Empty file.
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { Span, SpanEvent } from '../trace-viewer/types';
import type { Span, SpanEvent } from './types';
import { formatDuration, getHighResInMs } from '../trace-viewer/util/timing';

// ---------------------------------------------------------------------------
Expand Down
6 changes: 2 additions & 4 deletions packages/web-shared/src/components/trace-viewer-new.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@ import {
type SidebarDataContextValue,
SidebarDataProvider,
} from './sidebar/sidebar-data-context';
import type { Trace } from './trace-viewer/types';

const NewTraceViewer = ({
run,
Expand All@@ -27,14 +26,13 @@ const NewTraceViewer = ({
isLoadingMore?: boolean;
loading?: boolean;
}) => {
const traceWithMeta: TraceWithMeta | undefined = useMemo(() => {
const trace: TraceWithMeta | undefined = useMemo(() => {
if (!run?.runId) {
return undefined;
}
return buildTrace(run, events, new Date());
// eslint-disable-next-line react-hooks/exhaustive-deps -- `new Date()` is intentionally not a dep
}, [run, events]);
const trace = traceWithMeta;

if (!trace || (loading && events.length === 0)) {
return <TraceViewerSkeleton />;
Expand All@@ -44,7 +42,7 @@ const NewTraceViewer = ({
<SidebarDataProvider value={sidebarData}>
<div className="relative w-full h-full flex">
<NewTraceViewerComponent
trace={trace as Trace}
trace={trace}
onLoadMore={onLoadMore}
hasMore={hasMore}
isLoadingMore={isLoadingMore}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Cleaning up trace viewer code by mitul-s · Pull Request #2252 · vercel/workflow · GitHub
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
5 changes: 5 additions & 0 deletions .changeset/trace-viewer-cleanup.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@workflow/web-shared": patch
---

New trace viewer cleanup: fix `EventRow` crash on spans without `attributes.data`, drop dead `DetailPanel` + empty placeholder files, give time markers and segments stable keys, fix invalid `stroke-linejoin` JSX attribute, and replace the unsafe `Trace` cast with the real `TraceWithMeta` type.
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { Circle } from 'lucide-react';
import { useRef } from 'react';
import { cn } from '../../../lib/utils';
import type { Span } from '../../trace-viewer/types';
import type { Span } from '../types';
import { formatDuration } from '../../trace-viewer/util/timing';
import {
SleepIcon,
Expand DownExpand Up@@ -53,8 +53,9 @@ const EventRow = ({
onSelectSpan: (spanId: string) => void;
}) => {
const durationMs = getSpanDurationMs(span);
const isErrored =
(span.attributes.data as Record<string, unknown>).status === 'failed';
const workflowStatus = (span.attributes.data as Record<string, unknown>)
?.status as string | undefined;
const isErrored = span.status.code === 2 || workflowStatus === 'failed';
const { icon: Icon, className: tagClassName } = getEventStyle(
span.resource,
isErrored
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import { ArrowLeft, ArrowRight } from 'lucide-react';
import type { CSSProperties, ReactNode } from 'react';
import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { cn } from '../../../lib/utils';
import type { Span } from '../../trace-viewer/types';
import type { Span } from '../types';
import { formatDuration, getHighResInMs } from '../../trace-viewer/util/timing';
import { isSpanDimmedBySearch, type SpanSearchResult } from '../search';
import type { Segment, SegmentStatus, TimeMarker } from '../utils';
Expand DownExpand Up@@ -234,7 +234,7 @@ function SegmentBar({ segments }: { segments: VisibleSegment[] }): ReactNode {

return (
<div
key={`${seg.status}-${i}`}
key={i}
className={cn(
'absolute h-full rounded-[0.25rem]',
SEGMENT_CLASSES[seg.status]
Expand DownExpand Up@@ -421,7 +421,7 @@ export function TimelineHeader({
<div className="relative h-full flex-1">
{markers.map((m) => (
<span
key={`${m.position}-${m.label}`}
key={String(m.value)}
className="absolute bottom-1 font-mono text-xs font-normal leading-4 text-gray-900 whitespace-nowrap"
style={{ left: `${m.position * 100}%` }}
>
Expand DownExpand Up@@ -506,7 +506,7 @@ export function Timeline({
// Skip the "0s" origin marker since the left edge already implies it.
Math.abs(marker.value) > 0.000001 ? (
<div
key={`${marker.position}-${marker.label}`}
key={String(marker.value)}
className="absolute top-0 bottom-0 w-px bg-gray-alpha-300"
style={{ left: `${marker.position * 100}%` }}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ import {
useMemo,
useState,
} from 'react';
import type { Span } from '../trace-viewer/types';
import type { Span } from './types';

interface ActiveSpanContextValue {
activeSpanId: string | null;
Expand Down

This file was deleted.

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ const WorkflowIcon = () => {
<svg
data-testid="geist-icon"
height="16"
stroke-linejoin="round"
strokeLinejoin="round"
style={{ color: 'currentColor' }}
viewBox="0 0 16 16"
width="16"
Expand All@@ -21,7 +21,7 @@ const WebhookIcon = () => {
<svg
data-testid="geist-icon"
height="16"
stroke-linejoin="round"
strokeLinejoin="round"
viewBox="0 0 16 16"
width="16"
style={{ color: 'currentColor' }}
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { Span } from '../trace-viewer/types';
import type { Span } from './types';

const ATTR_FILTER_REGEX = /(?:^|\s)(?<pair>(?<key>[\w.]+):(?<value>\S*))/g;

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,8 +26,8 @@ import {
EntityDetailPanel,
type SelectedSpanInfo,
} from '../sidebar/entity-detail-panel';
import { useSidebarDataOptional } from '../sidebar/sidebar-data-context';
import type { Trace } from '../trace-viewer/types';
import { useSidebarData } from '../sidebar/sidebar-data-context';
import type { TraceWithMeta } from './types';
import { formatDuration, getHighResInMs } from '../trace-viewer/util/timing';
import { IconButton } from '../ui/icon-button';
import { Spinner } from '../ui/spinner';
Expand All@@ -46,12 +46,11 @@ import {
TooltipTrigger,
} from '../ui/tooltip';
import { ActiveSpanProvider, useActiveSpan } from './context';
import { DetailPanel } from './detail-panel';
import { searchSpans } from './search';
import { computeRootBounds, computeTimeMarkers } from './utils';

interface NewTraceViewerProps {
trace: Trace;
trace: TraceWithMeta;
onLoadMore?: () => void | Promise<void>;
hasMore?: boolean;
isLoadingMore?: boolean;
Expand DownExpand Up@@ -141,10 +140,10 @@ function useAnimatedViewport(initial: Viewport) {

function useSelectedSpanInfo(): SelectedSpanInfo | null {
const { activeSpan } = useActiveSpan();
const sidebar = useSidebarDataOptional();
const sidebar = useSidebarData();

return useMemo(() => {
if (!activeSpan || !sidebar) return null;
if (!activeSpan) return null;

const correlationId = activeSpan.spanId;
const rawEvents = correlationId
Expand DownExpand Up@@ -193,7 +192,7 @@ function NewTraceViewerContent({
const { activeSpan, activeSpanId, setActiveSpan, clearActiveSpan } =
useActiveSpan();

const sidebar = useSidebarDataOptional();
const sidebar = useSidebarData();
const selectedSpan = useSelectedSpanInfo();

const [searchQuery, setSearchQuery] = useState('');
Expand DownExpand Up@@ -674,7 +673,7 @@ function NewTraceViewerContent({
</div>

{/* Detail panel */}
{activeSpan && sidebar ? (
{activeSpan ? (
<aside className="flex flex-col h-full max-h-full bg-background-100 border-l border-gray-alpha-400 overflow-auto">
{/* Panel header */}
<div className="flex items-center justify-between gap-2 shrink-0 px-4 pt-3 pb-3">
Expand DownExpand Up@@ -750,12 +749,6 @@ function NewTraceViewerContent({
</ErrorBoundary>
</div>
</aside>
) : activeSpan ? (
<DetailPanel
span={activeSpan}
rootStart={root.startTime}
onClose={clearActiveSpan}
/>
) : null}
</div>
);
Expand Down
2 changes: 2 additions & 0 deletions packages/web-shared/src/components/new-trace-viewer/types.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
export type { Span, SpanEvent, Trace } from '../trace-viewer/types';
export type { TraceWithMeta } from '../../lib/trace-builder';
Empty file.
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { Span, SpanEvent } from '../trace-viewer/types';
import type { Span, SpanEvent } from './types';
import { formatDuration, getHighResInMs } from '../trace-viewer/util/timing';

// ---------------------------------------------------------------------------
Expand Down
6 changes: 2 additions & 4 deletions packages/web-shared/src/components/trace-viewer-new.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@ import {
type SidebarDataContextValue,
SidebarDataProvider,
} from './sidebar/sidebar-data-context';
import type { Trace } from './trace-viewer/types';

const NewTraceViewer = ({
run,
Expand All@@ -27,14 +26,13 @@ const NewTraceViewer = ({
isLoadingMore?: boolean;
loading?: boolean;
}) => {
const traceWithMeta: TraceWithMeta | undefined = useMemo(() => {
const trace: TraceWithMeta | undefined = useMemo(() => {
if (!run?.runId) {
return undefined;
}
return buildTrace(run, events, new Date());
// eslint-disable-next-line react-hooks/exhaustive-deps -- `new Date()` is intentionally not a dep
}, [run, events]);
const trace = traceWithMeta;

if (!trace || (loading && events.length === 0)) {
return <TraceViewerSkeleton />;
Expand All@@ -44,7 +42,7 @@ const NewTraceViewer = ({
<SidebarDataProvider value={sidebarData}>
<div className="relative w-full h-full flex">
<NewTraceViewerComponent
trace={trace as Trace}
trace={trace}
onLoadMore={onLoadMore}
hasMore={hasMore}
isLoadingMore={isLoadingMore}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Cleaning up trace viewer code by mitul-s · Pull Request #2252 · vercel/workflow · GitHub
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
5 changes: 5 additions & 0 deletions .changeset/trace-viewer-cleanup.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@workflow/web-shared": patch
---

New trace viewer cleanup: fix `EventRow` crash on spans without `attributes.data`, drop dead `DetailPanel` + empty placeholder files, give time markers and segments stable keys, fix invalid `stroke-linejoin` JSX attribute, and replace the unsafe `Trace` cast with the real `TraceWithMeta` type.
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { Circle } from 'lucide-react';
import { useRef } from 'react';
import { cn } from '../../../lib/utils';
import type { Span } from '../../trace-viewer/types';
import type { Span } from '../types';
import { formatDuration } from '../../trace-viewer/util/timing';
import {
SleepIcon,
Expand DownExpand Up@@ -53,8 +53,9 @@ const EventRow = ({
onSelectSpan: (spanId: string) => void;
}) => {
const durationMs = getSpanDurationMs(span);
const isErrored =
(span.attributes.data as Record<string, unknown>).status === 'failed';
const workflowStatus = (span.attributes.data as Record<string, unknown>)
?.status as string | undefined;
const isErrored = span.status.code === 2 || workflowStatus === 'failed';
const { icon: Icon, className: tagClassName } = getEventStyle(
span.resource,
isErrored
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import { ArrowLeft, ArrowRight } from 'lucide-react';
import type { CSSProperties, ReactNode } from 'react';
import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { cn } from '../../../lib/utils';
import type { Span } from '../../trace-viewer/types';
import type { Span } from '../types';
import { formatDuration, getHighResInMs } from '../../trace-viewer/util/timing';
import { isSpanDimmedBySearch, type SpanSearchResult } from '../search';
import type { Segment, SegmentStatus, TimeMarker } from '../utils';
Expand DownExpand Up@@ -234,7 +234,7 @@ function SegmentBar({ segments }: { segments: VisibleSegment[] }): ReactNode {

return (
<div
key={`${seg.status}-${i}`}
key={i}
className={cn(
'absolute h-full rounded-[0.25rem]',
SEGMENT_CLASSES[seg.status]
Expand DownExpand Up@@ -421,7 +421,7 @@ export function TimelineHeader({
<div className="relative h-full flex-1">
{markers.map((m) => (
<span
key={`${m.position}-${m.label}`}
key={String(m.value)}
className="absolute bottom-1 font-mono text-xs font-normal leading-4 text-gray-900 whitespace-nowrap"
style={{ left: `${m.position * 100}%` }}
>
Expand DownExpand Up@@ -506,7 +506,7 @@ export function Timeline({
// Skip the "0s" origin marker since the left edge already implies it.
Math.abs(marker.value) > 0.000001 ? (
<div
key={`${marker.position}-${marker.label}`}
key={String(marker.value)}
className="absolute top-0 bottom-0 w-px bg-gray-alpha-300"
style={{ left: `${marker.position * 100}%` }}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ import {
useMemo,
useState,
} from 'react';
import type { Span } from '../trace-viewer/types';
import type { Span } from './types';

interface ActiveSpanContextValue {
activeSpanId: string | null;
Expand Down

This file was deleted.

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ const WorkflowIcon = () => {
<svg
data-testid="geist-icon"
height="16"
stroke-linejoin="round"
strokeLinejoin="round"
style={{ color: 'currentColor' }}
viewBox="0 0 16 16"
width="16"
Expand All@@ -21,7 +21,7 @@ const WebhookIcon = () => {
<svg
data-testid="geist-icon"
height="16"
stroke-linejoin="round"
strokeLinejoin="round"
viewBox="0 0 16 16"
width="16"
style={{ color: 'currentColor' }}
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { Span } from '../trace-viewer/types';
import type { Span } from './types';

const ATTR_FILTER_REGEX = /(?:^|\s)(?<pair>(?<key>[\w.]+):(?<value>\S*))/g;

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,8 +26,8 @@ import {
EntityDetailPanel,
type SelectedSpanInfo,
} from '../sidebar/entity-detail-panel';
import { useSidebarDataOptional } from '../sidebar/sidebar-data-context';
import type { Trace } from '../trace-viewer/types';
import { useSidebarData } from '../sidebar/sidebar-data-context';
import type { TraceWithMeta } from './types';
import { formatDuration, getHighResInMs } from '../trace-viewer/util/timing';
import { IconButton } from '../ui/icon-button';
import { Spinner } from '../ui/spinner';
Expand All@@ -46,12 +46,11 @@ import {
TooltipTrigger,
} from '../ui/tooltip';
import { ActiveSpanProvider, useActiveSpan } from './context';
import { DetailPanel } from './detail-panel';
import { searchSpans } from './search';
import { computeRootBounds, computeTimeMarkers } from './utils';

interface NewTraceViewerProps {
trace: Trace;
trace: TraceWithMeta;
onLoadMore?: () => void | Promise<void>;
hasMore?: boolean;
isLoadingMore?: boolean;
Expand DownExpand Up@@ -141,10 +140,10 @@ function useAnimatedViewport(initial: Viewport) {

function useSelectedSpanInfo(): SelectedSpanInfo | null {
const { activeSpan } = useActiveSpan();
const sidebar = useSidebarDataOptional();
const sidebar = useSidebarData();

return useMemo(() => {
if (!activeSpan || !sidebar) return null;
if (!activeSpan) return null;

const correlationId = activeSpan.spanId;
const rawEvents = correlationId
Expand DownExpand Up@@ -193,7 +192,7 @@ function NewTraceViewerContent({
const { activeSpan, activeSpanId, setActiveSpan, clearActiveSpan } =
useActiveSpan();

const sidebar = useSidebarDataOptional();
const sidebar = useSidebarData();
const selectedSpan = useSelectedSpanInfo();

const [searchQuery, setSearchQuery] = useState('');
Expand DownExpand Up@@ -674,7 +673,7 @@ function NewTraceViewerContent({
</div>

{/* Detail panel */}
{activeSpan && sidebar ? (
{activeSpan ? (
<aside className="flex flex-col h-full max-h-full bg-background-100 border-l border-gray-alpha-400 overflow-auto">
{/* Panel header */}
<div className="flex items-center justify-between gap-2 shrink-0 px-4 pt-3 pb-3">
Expand DownExpand Up@@ -750,12 +749,6 @@ function NewTraceViewerContent({
</ErrorBoundary>
</div>
</aside>
) : activeSpan ? (
<DetailPanel
span={activeSpan}
rootStart={root.startTime}
onClose={clearActiveSpan}
/>
) : null}
</div>
);
Expand Down
2 changes: 2 additions & 0 deletions packages/web-shared/src/components/new-trace-viewer/types.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
export type { Span, SpanEvent, Trace } from '../trace-viewer/types';
export type { TraceWithMeta } from '../../lib/trace-builder';
Empty file.
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { Span, SpanEvent } from '../trace-viewer/types';
import type { Span, SpanEvent } from './types';
import { formatDuration, getHighResInMs } from '../trace-viewer/util/timing';

// ---------------------------------------------------------------------------
Expand Down
6 changes: 2 additions & 4 deletions packages/web-shared/src/components/trace-viewer-new.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@ import {
type SidebarDataContextValue,
SidebarDataProvider,
} from './sidebar/sidebar-data-context';
import type { Trace } from './trace-viewer/types';

const NewTraceViewer = ({
run,
Expand All@@ -27,14 +26,13 @@ const NewTraceViewer = ({
isLoadingMore?: boolean;
loading?: boolean;
}) => {
const traceWithMeta: TraceWithMeta | undefined = useMemo(() => {
const trace: TraceWithMeta | undefined = useMemo(() => {
if (!run?.runId) {
return undefined;
}
return buildTrace(run, events, new Date());
// eslint-disable-next-line react-hooks/exhaustive-deps -- `new Date()` is intentionally not a dep
}, [run, events]);
const trace = traceWithMeta;

if (!trace || (loading && events.length === 0)) {
return <TraceViewerSkeleton />;
Expand All@@ -44,7 +42,7 @@ const NewTraceViewer = ({
<SidebarDataProvider value={sidebarData}>
<div className="relative w-full h-full flex">
<NewTraceViewerComponent
trace={trace as Trace}
trace={trace}
onLoadMore={onLoadMore}
hasMore={hasMore}
isLoadingMore={isLoadingMore}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Cleaning up trace viewer code by mitul-s · Pull Request #2252 · vercel/workflow · GitHub
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
5 changes: 5 additions & 0 deletions .changeset/trace-viewer-cleanup.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@workflow/web-shared": patch
---

New trace viewer cleanup: fix `EventRow` crash on spans without `attributes.data`, drop dead `DetailPanel` + empty placeholder files, give time markers and segments stable keys, fix invalid `stroke-linejoin` JSX attribute, and replace the unsafe `Trace` cast with the real `TraceWithMeta` type.
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { Circle } from 'lucide-react';
import { useRef } from 'react';
import { cn } from '../../../lib/utils';
import type { Span } from '../../trace-viewer/types';
import type { Span } from '../types';
import { formatDuration } from '../../trace-viewer/util/timing';
import {
SleepIcon,
Expand DownExpand Up@@ -53,8 +53,9 @@ const EventRow = ({
onSelectSpan: (spanId: string) => void;
}) => {
const durationMs = getSpanDurationMs(span);
const isErrored =
(span.attributes.data as Record<string, unknown>).status === 'failed';
const workflowStatus = (span.attributes.data as Record<string, unknown>)
?.status as string | undefined;
const isErrored = span.status.code === 2 || workflowStatus === 'failed';
const { icon: Icon, className: tagClassName } = getEventStyle(
span.resource,
isErrored
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import { ArrowLeft, ArrowRight } from 'lucide-react';
import type { CSSProperties, ReactNode } from 'react';
import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { cn } from '../../../lib/utils';
import type { Span } from '../../trace-viewer/types';
import type { Span } from '../types';
import { formatDuration, getHighResInMs } from '../../trace-viewer/util/timing';
import { isSpanDimmedBySearch, type SpanSearchResult } from '../search';
import type { Segment, SegmentStatus, TimeMarker } from '../utils';
Expand DownExpand Up@@ -234,7 +234,7 @@ function SegmentBar({ segments }: { segments: VisibleSegment[] }): ReactNode {

return (
<div
key={`${seg.status}-${i}`}
key={i}
className={cn(
'absolute h-full rounded-[0.25rem]',
SEGMENT_CLASSES[seg.status]
Expand DownExpand Up@@ -421,7 +421,7 @@ export function TimelineHeader({
<div className="relative h-full flex-1">
{markers.map((m) => (
<span
key={`${m.position}-${m.label}`}
key={String(m.value)}
className="absolute bottom-1 font-mono text-xs font-normal leading-4 text-gray-900 whitespace-nowrap"
style={{ left: `${m.position * 100}%` }}
>
Expand DownExpand Up@@ -506,7 +506,7 @@ export function Timeline({
// Skip the "0s" origin marker since the left edge already implies it.
Math.abs(marker.value) > 0.000001 ? (
<div
key={`${marker.position}-${marker.label}`}
key={String(marker.value)}
className="absolute top-0 bottom-0 w-px bg-gray-alpha-300"
style={{ left: `${marker.position * 100}%` }}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ import {
useMemo,
useState,
} from 'react';
import type { Span } from '../trace-viewer/types';
import type { Span } from './types';

interface ActiveSpanContextValue {
activeSpanId: string | null;
Expand Down

This file was deleted.

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ const WorkflowIcon = () => {
<svg
data-testid="geist-icon"
height="16"
stroke-linejoin="round"
strokeLinejoin="round"
style={{ color: 'currentColor' }}
viewBox="0 0 16 16"
width="16"
Expand All@@ -21,7 +21,7 @@ const WebhookIcon = () => {
<svg
data-testid="geist-icon"
height="16"
stroke-linejoin="round"
strokeLinejoin="round"
viewBox="0 0 16 16"
width="16"
style={{ color: 'currentColor' }}
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { Span } from '../trace-viewer/types';
import type { Span } from './types';

const ATTR_FILTER_REGEX = /(?:^|\s)(?<pair>(?<key>[\w.]+):(?<value>\S*))/g;

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,8 +26,8 @@ import {
EntityDetailPanel,
type SelectedSpanInfo,
} from '../sidebar/entity-detail-panel';
import { useSidebarDataOptional } from '../sidebar/sidebar-data-context';
import type { Trace } from '../trace-viewer/types';
import { useSidebarData } from '../sidebar/sidebar-data-context';
import type { TraceWithMeta } from './types';
import { formatDuration, getHighResInMs } from '../trace-viewer/util/timing';
import { IconButton } from '../ui/icon-button';
import { Spinner } from '../ui/spinner';
Expand All@@ -46,12 +46,11 @@ import {
TooltipTrigger,
} from '../ui/tooltip';
import { ActiveSpanProvider, useActiveSpan } from './context';
import { DetailPanel } from './detail-panel';
import { searchSpans } from './search';
import { computeRootBounds, computeTimeMarkers } from './utils';

interface NewTraceViewerProps {
trace: Trace;
trace: TraceWithMeta;
onLoadMore?: () => void | Promise<void>;
hasMore?: boolean;
isLoadingMore?: boolean;
Expand DownExpand Up@@ -141,10 +140,10 @@ function useAnimatedViewport(initial: Viewport) {

function useSelectedSpanInfo(): SelectedSpanInfo | null {
const { activeSpan } = useActiveSpan();
const sidebar = useSidebarDataOptional();
const sidebar = useSidebarData();

return useMemo(() => {
if (!activeSpan || !sidebar) return null;
if (!activeSpan) return null;

const correlationId = activeSpan.spanId;
const rawEvents = correlationId
Expand DownExpand Up@@ -193,7 +192,7 @@ function NewTraceViewerContent({
const { activeSpan, activeSpanId, setActiveSpan, clearActiveSpan } =
useActiveSpan();

const sidebar = useSidebarDataOptional();
const sidebar = useSidebarData();
const selectedSpan = useSelectedSpanInfo();

const [searchQuery, setSearchQuery] = useState('');
Expand DownExpand Up@@ -674,7 +673,7 @@ function NewTraceViewerContent({
</div>

{/* Detail panel */}
{activeSpan && sidebar ? (
{activeSpan ? (
<aside className="flex flex-col h-full max-h-full bg-background-100 border-l border-gray-alpha-400 overflow-auto">
{/* Panel header */}
<div className="flex items-center justify-between gap-2 shrink-0 px-4 pt-3 pb-3">
Expand DownExpand Up@@ -750,12 +749,6 @@ function NewTraceViewerContent({
</ErrorBoundary>
</div>
</aside>
) : activeSpan ? (
<DetailPanel
span={activeSpan}
rootStart={root.startTime}
onClose={clearActiveSpan}
/>
) : null}
</div>
);
Expand Down
2 changes: 2 additions & 0 deletions packages/web-shared/src/components/new-trace-viewer/types.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
export type { Span, SpanEvent, Trace } from '../trace-viewer/types';
export type { TraceWithMeta } from '../../lib/trace-builder';
Empty file.
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { Span, SpanEvent } from '../trace-viewer/types';
import type { Span, SpanEvent } from './types';
import { formatDuration, getHighResInMs } from '../trace-viewer/util/timing';

// ---------------------------------------------------------------------------
Expand Down
6 changes: 2 additions & 4 deletions packages/web-shared/src/components/trace-viewer-new.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@ import {
type SidebarDataContextValue,
SidebarDataProvider,
} from './sidebar/sidebar-data-context';
import type { Trace } from './trace-viewer/types';

const NewTraceViewer = ({
run,
Expand All@@ -27,14 +26,13 @@ const NewTraceViewer = ({
isLoadingMore?: boolean;
loading?: boolean;
}) => {
const traceWithMeta: TraceWithMeta | undefined = useMemo(() => {
const trace: TraceWithMeta | undefined = useMemo(() => {
if (!run?.runId) {
return undefined;
}
return buildTrace(run, events, new Date());
// eslint-disable-next-line react-hooks/exhaustive-deps -- `new Date()` is intentionally not a dep
}, [run, events]);
const trace = traceWithMeta;

if (!trace || (loading && events.length === 0)) {
return <TraceViewerSkeleton />;
Expand All@@ -44,7 +42,7 @@ const NewTraceViewer = ({
<SidebarDataProvider value={sidebarData}>
<div className="relative w-full h-full flex">
<NewTraceViewerComponent
trace={trace as Trace}
trace={trace}
onLoadMore={onLoadMore}
hasMore={hasMore}
isLoadingMore={isLoadingMore}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Cleaning up trace viewer code by mitul-s · Pull Request #2252 · vercel/workflow · GitHub
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
5 changes: 5 additions & 0 deletions .changeset/trace-viewer-cleanup.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@workflow/web-shared": patch
---

New trace viewer cleanup: fix `EventRow` crash on spans without `attributes.data`, drop dead `DetailPanel` + empty placeholder files, give time markers and segments stable keys, fix invalid `stroke-linejoin` JSX attribute, and replace the unsafe `Trace` cast with the real `TraceWithMeta` type.
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { Circle } from 'lucide-react';
import { useRef } from 'react';
import { cn } from '../../../lib/utils';
import type { Span } from '../../trace-viewer/types';
import type { Span } from '../types';
import { formatDuration } from '../../trace-viewer/util/timing';
import {
SleepIcon,
Expand DownExpand Up@@ -53,8 +53,9 @@ const EventRow = ({
onSelectSpan: (spanId: string) => void;
}) => {
const durationMs = getSpanDurationMs(span);
const isErrored =
(span.attributes.data as Record<string, unknown>).status === 'failed';
const workflowStatus = (span.attributes.data as Record<string, unknown>)
?.status as string | undefined;
const isErrored = span.status.code === 2 || workflowStatus === 'failed';
const { icon: Icon, className: tagClassName } = getEventStyle(
span.resource,
isErrored
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import { ArrowLeft, ArrowRight } from 'lucide-react';
import type { CSSProperties, ReactNode } from 'react';
import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { cn } from '../../../lib/utils';
import type { Span } from '../../trace-viewer/types';
import type { Span } from '../types';
import { formatDuration, getHighResInMs } from '../../trace-viewer/util/timing';
import { isSpanDimmedBySearch, type SpanSearchResult } from '../search';
import type { Segment, SegmentStatus, TimeMarker } from '../utils';
Expand DownExpand Up@@ -234,7 +234,7 @@ function SegmentBar({ segments }: { segments: VisibleSegment[] }): ReactNode {

return (
<div
key={`${seg.status}-${i}`}
key={i}
className={cn(
'absolute h-full rounded-[0.25rem]',
SEGMENT_CLASSES[seg.status]
Expand DownExpand Up@@ -421,7 +421,7 @@ export function TimelineHeader({
<div className="relative h-full flex-1">
{markers.map((m) => (
<span
key={`${m.position}-${m.label}`}
key={String(m.value)}
className="absolute bottom-1 font-mono text-xs font-normal leading-4 text-gray-900 whitespace-nowrap"
style={{ left: `${m.position * 100}%` }}
>
Expand DownExpand Up@@ -506,7 +506,7 @@ export function Timeline({
// Skip the "0s" origin marker since the left edge already implies it.
Math.abs(marker.value) > 0.000001 ? (
<div
key={`${marker.position}-${marker.label}`}
key={String(marker.value)}
className="absolute top-0 bottom-0 w-px bg-gray-alpha-300"
style={{ left: `${marker.position * 100}%` }}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ import {
useMemo,
useState,
} from 'react';
import type { Span } from '../trace-viewer/types';
import type { Span } from './types';

interface ActiveSpanContextValue {
activeSpanId: string | null;
Expand Down

This file was deleted.

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ const WorkflowIcon = () => {
<svg
data-testid="geist-icon"
height="16"
stroke-linejoin="round"
strokeLinejoin="round"
style={{ color: 'currentColor' }}
viewBox="0 0 16 16"
width="16"
Expand All@@ -21,7 +21,7 @@ const WebhookIcon = () => {
<svg
data-testid="geist-icon"
height="16"
stroke-linejoin="round"
strokeLinejoin="round"
viewBox="0 0 16 16"
width="16"
style={{ color: 'currentColor' }}
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { Span } from '../trace-viewer/types';
import type { Span } from './types';

const ATTR_FILTER_REGEX = /(?:^|\s)(?<pair>(?<key>[\w.]+):(?<value>\S*))/g;

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,8 +26,8 @@ import {
EntityDetailPanel,
type SelectedSpanInfo,
} from '../sidebar/entity-detail-panel';
import { useSidebarDataOptional } from '../sidebar/sidebar-data-context';
import type { Trace } from '../trace-viewer/types';
import { useSidebarData } from '../sidebar/sidebar-data-context';
import type { TraceWithMeta } from './types';
import { formatDuration, getHighResInMs } from '../trace-viewer/util/timing';
import { IconButton } from '../ui/icon-button';
import { Spinner } from '../ui/spinner';
Expand All@@ -46,12 +46,11 @@ import {
TooltipTrigger,
} from '../ui/tooltip';
import { ActiveSpanProvider, useActiveSpan } from './context';
import { DetailPanel } from './detail-panel';
import { searchSpans } from './search';
import { computeRootBounds, computeTimeMarkers } from './utils';

interface NewTraceViewerProps {
trace: Trace;
trace: TraceWithMeta;
onLoadMore?: () => void | Promise<void>;
hasMore?: boolean;
isLoadingMore?: boolean;
Expand DownExpand Up@@ -141,10 +140,10 @@ function useAnimatedViewport(initial: Viewport) {

function useSelectedSpanInfo(): SelectedSpanInfo | null {
const { activeSpan } = useActiveSpan();
const sidebar = useSidebarDataOptional();
const sidebar = useSidebarData();

return useMemo(() => {
if (!activeSpan || !sidebar) return null;
if (!activeSpan) return null;

const correlationId = activeSpan.spanId;
const rawEvents = correlationId
Expand DownExpand Up@@ -193,7 +192,7 @@ function NewTraceViewerContent({
const { activeSpan, activeSpanId, setActiveSpan, clearActiveSpan } =
useActiveSpan();

const sidebar = useSidebarDataOptional();
const sidebar = useSidebarData();
const selectedSpan = useSelectedSpanInfo();

const [searchQuery, setSearchQuery] = useState('');
Expand DownExpand Up@@ -674,7 +673,7 @@ function NewTraceViewerContent({
</div>

{/* Detail panel */}
{activeSpan && sidebar ? (
{activeSpan ? (
<aside className="flex flex-col h-full max-h-full bg-background-100 border-l border-gray-alpha-400 overflow-auto">
{/* Panel header */}
<div className="flex items-center justify-between gap-2 shrink-0 px-4 pt-3 pb-3">
Expand DownExpand Up@@ -750,12 +749,6 @@ function NewTraceViewerContent({
</ErrorBoundary>
</div>
</aside>
) : activeSpan ? (
<DetailPanel
span={activeSpan}
rootStart={root.startTime}
onClose={clearActiveSpan}
/>
) : null}
</div>
);
Expand Down
2 changes: 2 additions & 0 deletions packages/web-shared/src/components/new-trace-viewer/types.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
export type { Span, SpanEvent, Trace } from '../trace-viewer/types';
export type { TraceWithMeta } from '../../lib/trace-builder';
Empty file.
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { Span, SpanEvent } from '../trace-viewer/types';
import type { Span, SpanEvent } from './types';
import { formatDuration, getHighResInMs } from '../trace-viewer/util/timing';

// ---------------------------------------------------------------------------
Expand Down
6 changes: 2 additions & 4 deletions packages/web-shared/src/components/trace-viewer-new.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@ import {
type SidebarDataContextValue,
SidebarDataProvider,
} from './sidebar/sidebar-data-context';
import type { Trace } from './trace-viewer/types';

const NewTraceViewer = ({
run,
Expand All@@ -27,14 +26,13 @@ const NewTraceViewer = ({
isLoadingMore?: boolean;
loading?: boolean;
}) => {
const traceWithMeta: TraceWithMeta | undefined = useMemo(() => {
const trace: TraceWithMeta | undefined = useMemo(() => {
if (!run?.runId) {
return undefined;
}
return buildTrace(run, events, new Date());
// eslint-disable-next-line react-hooks/exhaustive-deps -- `new Date()` is intentionally not a dep
}, [run, events]);
const trace = traceWithMeta;

if (!trace || (loading && events.length === 0)) {
return <TraceViewerSkeleton />;
Expand All@@ -44,7 +42,7 @@ const NewTraceViewer = ({
<SidebarDataProvider value={sidebarData}>
<div className="relative w-full h-full flex">
<NewTraceViewerComponent
trace={trace as Trace}
trace={trace}
onLoadMore={onLoadMore}
hasMore={hasMore}
isLoadingMore={isLoadingMore}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Cleaning up trace viewer code by mitul-s · Pull Request #2252 · vercel/workflow · GitHub
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
5 changes: 5 additions & 0 deletions .changeset/trace-viewer-cleanup.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@workflow/web-shared": patch
---

New trace viewer cleanup: fix `EventRow` crash on spans without `attributes.data`, drop dead `DetailPanel` + empty placeholder files, give time markers and segments stable keys, fix invalid `stroke-linejoin` JSX attribute, and replace the unsafe `Trace` cast with the real `TraceWithMeta` type.
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { Circle } from 'lucide-react';
import { useRef } from 'react';
import { cn } from '../../../lib/utils';
import type { Span } from '../../trace-viewer/types';
import type { Span } from '../types';
import { formatDuration } from '../../trace-viewer/util/timing';
import {
SleepIcon,
Expand DownExpand Up@@ -53,8 +53,9 @@ const EventRow = ({
onSelectSpan: (spanId: string) => void;
}) => {
const durationMs = getSpanDurationMs(span);
const isErrored =
(span.attributes.data as Record<string, unknown>).status === 'failed';
const workflowStatus = (span.attributes.data as Record<string, unknown>)
?.status as string | undefined;
const isErrored = span.status.code === 2 || workflowStatus === 'failed';
const { icon: Icon, className: tagClassName } = getEventStyle(
span.resource,
isErrored
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import { ArrowLeft, ArrowRight } from 'lucide-react';
import type { CSSProperties, ReactNode } from 'react';
import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { cn } from '../../../lib/utils';
import type { Span } from '../../trace-viewer/types';
import type { Span } from '../types';
import { formatDuration, getHighResInMs } from '../../trace-viewer/util/timing';
import { isSpanDimmedBySearch, type SpanSearchResult } from '../search';
import type { Segment, SegmentStatus, TimeMarker } from '../utils';
Expand DownExpand Up@@ -234,7 +234,7 @@ function SegmentBar({ segments }: { segments: VisibleSegment[] }): ReactNode {

return (
<div
key={`${seg.status}-${i}`}
key={i}
className={cn(
'absolute h-full rounded-[0.25rem]',
SEGMENT_CLASSES[seg.status]
Expand DownExpand Up@@ -421,7 +421,7 @@ export function TimelineHeader({
<div className="relative h-full flex-1">
{markers.map((m) => (
<span
key={`${m.position}-${m.label}`}
key={String(m.value)}
className="absolute bottom-1 font-mono text-xs font-normal leading-4 text-gray-900 whitespace-nowrap"
style={{ left: `${m.position * 100}%` }}
>
Expand DownExpand Up@@ -506,7 +506,7 @@ export function Timeline({
// Skip the "0s" origin marker since the left edge already implies it.
Math.abs(marker.value) > 0.000001 ? (
<div
key={`${marker.position}-${marker.label}`}
key={String(marker.value)}
className="absolute top-0 bottom-0 w-px bg-gray-alpha-300"
style={{ left: `${marker.position * 100}%` }}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ import {
useMemo,
useState,
} from 'react';
import type { Span } from '../trace-viewer/types';
import type { Span } from './types';

interface ActiveSpanContextValue {
activeSpanId: string | null;
Expand Down

This file was deleted.

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ const WorkflowIcon = () => {
<svg
data-testid="geist-icon"
height="16"
stroke-linejoin="round"
strokeLinejoin="round"
style={{ color: 'currentColor' }}
viewBox="0 0 16 16"
width="16"
Expand All@@ -21,7 +21,7 @@ const WebhookIcon = () => {
<svg
data-testid="geist-icon"
height="16"
stroke-linejoin="round"
strokeLinejoin="round"
viewBox="0 0 16 16"
width="16"
style={{ color: 'currentColor' }}
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { Span } from '../trace-viewer/types';
import type { Span } from './types';

const ATTR_FILTER_REGEX = /(?:^|\s)(?<pair>(?<key>[\w.]+):(?<value>\S*))/g;

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,8 +26,8 @@ import {
EntityDetailPanel,
type SelectedSpanInfo,
} from '../sidebar/entity-detail-panel';
import { useSidebarDataOptional } from '../sidebar/sidebar-data-context';
import type { Trace } from '../trace-viewer/types';
import { useSidebarData } from '../sidebar/sidebar-data-context';
import type { TraceWithMeta } from './types';
import { formatDuration, getHighResInMs } from '../trace-viewer/util/timing';
import { IconButton } from '../ui/icon-button';
import { Spinner } from '../ui/spinner';
Expand All@@ -46,12 +46,11 @@ import {
TooltipTrigger,
} from '../ui/tooltip';
import { ActiveSpanProvider, useActiveSpan } from './context';
import { DetailPanel } from './detail-panel';
import { searchSpans } from './search';
import { computeRootBounds, computeTimeMarkers } from './utils';

interface NewTraceViewerProps {
trace: Trace;
trace: TraceWithMeta;
onLoadMore?: () => void | Promise<void>;
hasMore?: boolean;
isLoadingMore?: boolean;
Expand DownExpand Up@@ -141,10 +140,10 @@ function useAnimatedViewport(initial: Viewport) {

function useSelectedSpanInfo(): SelectedSpanInfo | null {
const { activeSpan } = useActiveSpan();
const sidebar = useSidebarDataOptional();
const sidebar = useSidebarData();

return useMemo(() => {
if (!activeSpan || !sidebar) return null;
if (!activeSpan) return null;

const correlationId = activeSpan.spanId;
const rawEvents = correlationId
Expand DownExpand Up@@ -193,7 +192,7 @@ function NewTraceViewerContent({
const { activeSpan, activeSpanId, setActiveSpan, clearActiveSpan } =
useActiveSpan();

const sidebar = useSidebarDataOptional();
const sidebar = useSidebarData();
const selectedSpan = useSelectedSpanInfo();

const [searchQuery, setSearchQuery] = useState('');
Expand DownExpand Up@@ -674,7 +673,7 @@ function NewTraceViewerContent({
</div>

{/* Detail panel */}
{activeSpan && sidebar ? (
{activeSpan ? (
<aside className="flex flex-col h-full max-h-full bg-background-100 border-l border-gray-alpha-400 overflow-auto">
{/* Panel header */}
<div className="flex items-center justify-between gap-2 shrink-0 px-4 pt-3 pb-3">
Expand DownExpand Up@@ -750,12 +749,6 @@ function NewTraceViewerContent({
</ErrorBoundary>
</div>
</aside>
) : activeSpan ? (
<DetailPanel
span={activeSpan}
rootStart={root.startTime}
onClose={clearActiveSpan}
/>
) : null}
</div>
);
Expand Down
2 changes: 2 additions & 0 deletions packages/web-shared/src/components/new-trace-viewer/types.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
export type { Span, SpanEvent, Trace } from '../trace-viewer/types';
export type { TraceWithMeta } from '../../lib/trace-builder';
Empty file.
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { Span, SpanEvent } from '../trace-viewer/types';
import type { Span, SpanEvent } from './types';
import { formatDuration, getHighResInMs } from '../trace-viewer/util/timing';

// ---------------------------------------------------------------------------
Expand Down
6 changes: 2 additions & 4 deletions packages/web-shared/src/components/trace-viewer-new.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@ import {
type SidebarDataContextValue,
SidebarDataProvider,
} from './sidebar/sidebar-data-context';
import type { Trace } from './trace-viewer/types';

const NewTraceViewer = ({
run,
Expand All@@ -27,14 +26,13 @@ const NewTraceViewer = ({
isLoadingMore?: boolean;
loading?: boolean;
}) => {
const traceWithMeta: TraceWithMeta | undefined = useMemo(() => {
const trace: TraceWithMeta | undefined = useMemo(() => {
if (!run?.runId) {
return undefined;
}
return buildTrace(run, events, new Date());
// eslint-disable-next-line react-hooks/exhaustive-deps -- `new Date()` is intentionally not a dep
}, [run, events]);
const trace = traceWithMeta;

if (!trace || (loading && events.length === 0)) {
return <TraceViewerSkeleton />;
Expand All@@ -44,7 +42,7 @@ const NewTraceViewer = ({
<SidebarDataProvider value={sidebarData}>
<div className="relative w-full h-full flex">
<NewTraceViewerComponent
trace={trace as Trace}
trace={trace}
onLoadMore={onLoadMore}
hasMore={hasMore}
isLoadingMore={isLoadingMore}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Cleaning up trace viewer code by mitul-s · Pull Request #2252 · vercel/workflow · GitHub
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
5 changes: 5 additions & 0 deletions .changeset/trace-viewer-cleanup.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@workflow/web-shared": patch
---

New trace viewer cleanup: fix `EventRow` crash on spans without `attributes.data`, drop dead `DetailPanel` + empty placeholder files, give time markers and segments stable keys, fix invalid `stroke-linejoin` JSX attribute, and replace the unsafe `Trace` cast with the real `TraceWithMeta` type.
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { Circle } from 'lucide-react';
import { useRef } from 'react';
import { cn } from '../../../lib/utils';
import type { Span } from '../../trace-viewer/types';
import type { Span } from '../types';
import { formatDuration } from '../../trace-viewer/util/timing';
import {
SleepIcon,
Expand DownExpand Up@@ -53,8 +53,9 @@ const EventRow = ({
onSelectSpan: (spanId: string) => void;
}) => {
const durationMs = getSpanDurationMs(span);
const isErrored =
(span.attributes.data as Record<string, unknown>).status === 'failed';
const workflowStatus = (span.attributes.data as Record<string, unknown>)
?.status as string | undefined;
const isErrored = span.status.code === 2 || workflowStatus === 'failed';
const { icon: Icon, className: tagClassName } = getEventStyle(
span.resource,
isErrored
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import { ArrowLeft, ArrowRight } from 'lucide-react';
import type { CSSProperties, ReactNode } from 'react';
import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { cn } from '../../../lib/utils';
import type { Span } from '../../trace-viewer/types';
import type { Span } from '../types';
import { formatDuration, getHighResInMs } from '../../trace-viewer/util/timing';
import { isSpanDimmedBySearch, type SpanSearchResult } from '../search';
import type { Segment, SegmentStatus, TimeMarker } from '../utils';
Expand DownExpand Up@@ -234,7 +234,7 @@ function SegmentBar({ segments }: { segments: VisibleSegment[] }): ReactNode {

return (
<div
key={`${seg.status}-${i}`}
key={i}
className={cn(
'absolute h-full rounded-[0.25rem]',
SEGMENT_CLASSES[seg.status]
Expand DownExpand Up@@ -421,7 +421,7 @@ export function TimelineHeader({
<div className="relative h-full flex-1">
{markers.map((m) => (
<span
key={`${m.position}-${m.label}`}
key={String(m.value)}
className="absolute bottom-1 font-mono text-xs font-normal leading-4 text-gray-900 whitespace-nowrap"
style={{ left: `${m.position * 100}%` }}
>
Expand DownExpand Up@@ -506,7 +506,7 @@ export function Timeline({
// Skip the "0s" origin marker since the left edge already implies it.
Math.abs(marker.value) > 0.000001 ? (
<div
key={`${marker.position}-${marker.label}`}
key={String(marker.value)}
className="absolute top-0 bottom-0 w-px bg-gray-alpha-300"
style={{ left: `${marker.position * 100}%` }}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ import {
useMemo,
useState,
} from 'react';
import type { Span } from '../trace-viewer/types';
import type { Span } from './types';

interface ActiveSpanContextValue {
activeSpanId: string | null;
Expand Down

This file was deleted.

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ const WorkflowIcon = () => {
<svg
data-testid="geist-icon"
height="16"
stroke-linejoin="round"
strokeLinejoin="round"
style={{ color: 'currentColor' }}
viewBox="0 0 16 16"
width="16"
Expand All@@ -21,7 +21,7 @@ const WebhookIcon = () => {
<svg
data-testid="geist-icon"
height="16"
stroke-linejoin="round"
strokeLinejoin="round"
viewBox="0 0 16 16"
width="16"
style={{ color: 'currentColor' }}
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { Span } from '../trace-viewer/types';
import type { Span } from './types';

const ATTR_FILTER_REGEX = /(?:^|\s)(?<pair>(?<key>[\w.]+):(?<value>\S*))/g;

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,8 +26,8 @@ import {
EntityDetailPanel,
type SelectedSpanInfo,
} from '../sidebar/entity-detail-panel';
import { useSidebarDataOptional } from '../sidebar/sidebar-data-context';
import type { Trace } from '../trace-viewer/types';
import { useSidebarData } from '../sidebar/sidebar-data-context';
import type { TraceWithMeta } from './types';
import { formatDuration, getHighResInMs } from '../trace-viewer/util/timing';
import { IconButton } from '../ui/icon-button';
import { Spinner } from '../ui/spinner';
Expand All@@ -46,12 +46,11 @@ import {
TooltipTrigger,
} from '../ui/tooltip';
import { ActiveSpanProvider, useActiveSpan } from './context';
import { DetailPanel } from './detail-panel';
import { searchSpans } from './search';
import { computeRootBounds, computeTimeMarkers } from './utils';

interface NewTraceViewerProps {
trace: Trace;
trace: TraceWithMeta;
onLoadMore?: () => void | Promise<void>;
hasMore?: boolean;
isLoadingMore?: boolean;
Expand DownExpand Up@@ -141,10 +140,10 @@ function useAnimatedViewport(initial: Viewport) {

function useSelectedSpanInfo(): SelectedSpanInfo | null {
const { activeSpan } = useActiveSpan();
const sidebar = useSidebarDataOptional();
const sidebar = useSidebarData();

return useMemo(() => {
if (!activeSpan || !sidebar) return null;
if (!activeSpan) return null;

const correlationId = activeSpan.spanId;
const rawEvents = correlationId
Expand DownExpand Up@@ -193,7 +192,7 @@ function NewTraceViewerContent({
const { activeSpan, activeSpanId, setActiveSpan, clearActiveSpan } =
useActiveSpan();

const sidebar = useSidebarDataOptional();
const sidebar = useSidebarData();
const selectedSpan = useSelectedSpanInfo();

const [searchQuery, setSearchQuery] = useState('');
Expand DownExpand Up@@ -674,7 +673,7 @@ function NewTraceViewerContent({
</div>

{/* Detail panel */}
{activeSpan && sidebar ? (
{activeSpan ? (
<aside className="flex flex-col h-full max-h-full bg-background-100 border-l border-gray-alpha-400 overflow-auto">
{/* Panel header */}
<div className="flex items-center justify-between gap-2 shrink-0 px-4 pt-3 pb-3">
Expand DownExpand Up@@ -750,12 +749,6 @@ function NewTraceViewerContent({
</ErrorBoundary>
</div>
</aside>
) : activeSpan ? (
<DetailPanel
span={activeSpan}
rootStart={root.startTime}
onClose={clearActiveSpan}
/>
) : null}
</div>
);
Expand Down
2 changes: 2 additions & 0 deletions packages/web-shared/src/components/new-trace-viewer/types.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
export type { Span, SpanEvent, Trace } from '../trace-viewer/types';
export type { TraceWithMeta } from '../../lib/trace-builder';
Empty file.
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { Span, SpanEvent } from '../trace-viewer/types';
import type { Span, SpanEvent } from './types';
import { formatDuration, getHighResInMs } from '../trace-viewer/util/timing';

// ---------------------------------------------------------------------------
Expand Down
6 changes: 2 additions & 4 deletions packages/web-shared/src/components/trace-viewer-new.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@ import {
type SidebarDataContextValue,
SidebarDataProvider,
} from './sidebar/sidebar-data-context';
import type { Trace } from './trace-viewer/types';

const NewTraceViewer = ({
run,
Expand All@@ -27,14 +26,13 @@ const NewTraceViewer = ({
isLoadingMore?: boolean;
loading?: boolean;
}) => {
const traceWithMeta: TraceWithMeta | undefined = useMemo(() => {
const trace: TraceWithMeta | undefined = useMemo(() => {
if (!run?.runId) {
return undefined;
}
return buildTrace(run, events, new Date());
// eslint-disable-next-line react-hooks/exhaustive-deps -- `new Date()` is intentionally not a dep
}, [run, events]);
const trace = traceWithMeta;

if (!trace || (loading && events.length === 0)) {
return <TraceViewerSkeleton />;
Expand All@@ -44,7 +42,7 @@ const NewTraceViewer = ({
<SidebarDataProvider value={sidebarData}>
<div className="relative w-full h-full flex">
<NewTraceViewerComponent
trace={trace as Trace}
trace={trace}
onLoadMore={onLoadMore}
hasMore={hasMore}
isLoadingMore={isLoadingMore}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Cleaning up trace viewer code by mitul-s · Pull Request #2252 · vercel/workflow · GitHub
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
5 changes: 5 additions & 0 deletions .changeset/trace-viewer-cleanup.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@workflow/web-shared": patch
---

New trace viewer cleanup: fix `EventRow` crash on spans without `attributes.data`, drop dead `DetailPanel` + empty placeholder files, give time markers and segments stable keys, fix invalid `stroke-linejoin` JSX attribute, and replace the unsafe `Trace` cast with the real `TraceWithMeta` type.
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { Circle } from 'lucide-react';
import { useRef } from 'react';
import { cn } from '../../../lib/utils';
import type { Span } from '../../trace-viewer/types';
import type { Span } from '../types';
import { formatDuration } from '../../trace-viewer/util/timing';
import {
SleepIcon,
Expand DownExpand Up@@ -53,8 +53,9 @@ const EventRow = ({
onSelectSpan: (spanId: string) => void;
}) => {
const durationMs = getSpanDurationMs(span);
const isErrored =
(span.attributes.data as Record<string, unknown>).status === 'failed';
const workflowStatus = (span.attributes.data as Record<string, unknown>)
?.status as string | undefined;
const isErrored = span.status.code === 2 || workflowStatus === 'failed';
const { icon: Icon, className: tagClassName } = getEventStyle(
span.resource,
isErrored
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import { ArrowLeft, ArrowRight } from 'lucide-react';
import type { CSSProperties, ReactNode } from 'react';
import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { cn } from '../../../lib/utils';
import type { Span } from '../../trace-viewer/types';
import type { Span } from '../types';
import { formatDuration, getHighResInMs } from '../../trace-viewer/util/timing';
import { isSpanDimmedBySearch, type SpanSearchResult } from '../search';
import type { Segment, SegmentStatus, TimeMarker } from '../utils';
Expand DownExpand Up@@ -234,7 +234,7 @@ function SegmentBar({ segments }: { segments: VisibleSegment[] }): ReactNode {

return (
<div
key={`${seg.status}-${i}`}
key={i}
className={cn(
'absolute h-full rounded-[0.25rem]',
SEGMENT_CLASSES[seg.status]
Expand DownExpand Up@@ -421,7 +421,7 @@ export function TimelineHeader({
<div className="relative h-full flex-1">
{markers.map((m) => (
<span
key={`${m.position}-${m.label}`}
key={String(m.value)}
className="absolute bottom-1 font-mono text-xs font-normal leading-4 text-gray-900 whitespace-nowrap"
style={{ left: `${m.position * 100}%` }}
>
Expand DownExpand Up@@ -506,7 +506,7 @@ export function Timeline({
// Skip the "0s" origin marker since the left edge already implies it.
Math.abs(marker.value) > 0.000001 ? (
<div
key={`${marker.position}-${marker.label}`}
key={String(marker.value)}
className="absolute top-0 bottom-0 w-px bg-gray-alpha-300"
style={{ left: `${marker.position * 100}%` }}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ import {
useMemo,
useState,
} from 'react';
import type { Span } from '../trace-viewer/types';
import type { Span } from './types';

interface ActiveSpanContextValue {
activeSpanId: string | null;
Expand Down

This file was deleted.

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ const WorkflowIcon = () => {
<svg
data-testid="geist-icon"
height="16"
stroke-linejoin="round"
strokeLinejoin="round"
style={{ color: 'currentColor' }}
viewBox="0 0 16 16"
width="16"
Expand All@@ -21,7 +21,7 @@ const WebhookIcon = () => {
<svg
data-testid="geist-icon"
height="16"
stroke-linejoin="round"
strokeLinejoin="round"
viewBox="0 0 16 16"
width="16"
style={{ color: 'currentColor' }}
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { Span } from '../trace-viewer/types';
import type { Span } from './types';

const ATTR_FILTER_REGEX = /(?:^|\s)(?<pair>(?<key>[\w.]+):(?<value>\S*))/g;

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,8 +26,8 @@ import {
EntityDetailPanel,
type SelectedSpanInfo,
} from '../sidebar/entity-detail-panel';
import { useSidebarDataOptional } from '../sidebar/sidebar-data-context';
import type { Trace } from '../trace-viewer/types';
import { useSidebarData } from '../sidebar/sidebar-data-context';
import type { TraceWithMeta } from './types';
import { formatDuration, getHighResInMs } from '../trace-viewer/util/timing';
import { IconButton } from '../ui/icon-button';
import { Spinner } from '../ui/spinner';
Expand All@@ -46,12 +46,11 @@ import {
TooltipTrigger,
} from '../ui/tooltip';
import { ActiveSpanProvider, useActiveSpan } from './context';
import { DetailPanel } from './detail-panel';
import { searchSpans } from './search';
import { computeRootBounds, computeTimeMarkers } from './utils';

interface NewTraceViewerProps {
trace: Trace;
trace: TraceWithMeta;
onLoadMore?: () => void | Promise<void>;
hasMore?: boolean;
isLoadingMore?: boolean;
Expand DownExpand Up@@ -141,10 +140,10 @@ function useAnimatedViewport(initial: Viewport) {

function useSelectedSpanInfo(): SelectedSpanInfo | null {
const { activeSpan } = useActiveSpan();
const sidebar = useSidebarDataOptional();
const sidebar = useSidebarData();

return useMemo(() => {
if (!activeSpan || !sidebar) return null;
if (!activeSpan) return null;

const correlationId = activeSpan.spanId;
const rawEvents = correlationId
Expand DownExpand Up@@ -193,7 +192,7 @@ function NewTraceViewerContent({
const { activeSpan, activeSpanId, setActiveSpan, clearActiveSpan } =
useActiveSpan();

const sidebar = useSidebarDataOptional();
const sidebar = useSidebarData();
const selectedSpan = useSelectedSpanInfo();

const [searchQuery, setSearchQuery] = useState('');
Expand DownExpand Up@@ -674,7 +673,7 @@ function NewTraceViewerContent({
</div>

{/* Detail panel */}
{activeSpan && sidebar ? (
{activeSpan ? (
<aside className="flex flex-col h-full max-h-full bg-background-100 border-l border-gray-alpha-400 overflow-auto">
{/* Panel header */}
<div className="flex items-center justify-between gap-2 shrink-0 px-4 pt-3 pb-3">
Expand DownExpand Up@@ -750,12 +749,6 @@ function NewTraceViewerContent({
</ErrorBoundary>
</div>
</aside>
) : activeSpan ? (
<DetailPanel
span={activeSpan}
rootStart={root.startTime}
onClose={clearActiveSpan}
/>
) : null}
</div>
);
Expand Down
2 changes: 2 additions & 0 deletions packages/web-shared/src/components/new-trace-viewer/types.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
export type { Span, SpanEvent, Trace } from '../trace-viewer/types';
export type { TraceWithMeta } from '../../lib/trace-builder';
Empty file.
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { Span, SpanEvent } from '../trace-viewer/types';
import type { Span, SpanEvent } from './types';
import { formatDuration, getHighResInMs } from '../trace-viewer/util/timing';

// ---------------------------------------------------------------------------
Expand Down
6 changes: 2 additions & 4 deletions packages/web-shared/src/components/trace-viewer-new.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@ import {
type SidebarDataContextValue,
SidebarDataProvider,
} from './sidebar/sidebar-data-context';
import type { Trace } from './trace-viewer/types';

const NewTraceViewer = ({
run,
Expand All@@ -27,14 +26,13 @@ const NewTraceViewer = ({
isLoadingMore?: boolean;
loading?: boolean;
}) => {
const traceWithMeta: TraceWithMeta | undefined = useMemo(() => {
const trace: TraceWithMeta | undefined = useMemo(() => {
if (!run?.runId) {
return undefined;
}
return buildTrace(run, events, new Date());
// eslint-disable-next-line react-hooks/exhaustive-deps -- `new Date()` is intentionally not a dep
}, [run, events]);
const trace = traceWithMeta;

if (!trace || (loading && events.length === 0)) {
return <TraceViewerSkeleton />;
Expand All@@ -44,7 +42,7 @@ const NewTraceViewer = ({
<SidebarDataProvider value={sidebarData}>
<div className="relative w-full h-full flex">
<NewTraceViewerComponent
trace={trace as Trace}
trace={trace}
onLoadMore={onLoadMore}
hasMore={hasMore}
isLoadingMore={isLoadingMore}
Expand Down
Loading