@perses-dev/tracing-gantt-chart-plugin 0.12.1 → 0.13.0-beta.0

package/lib/cjs/TracingGanttChart/GanttTable/SpanIndents.js

@@ -39,17 +39,17 @@ function SpanIndents(props) {
     const theme = (0, _material.useTheme)();
     const handleToggleClick = (0, _react.useCallback)((e)=>{
         e.stopPropagation();
-        if (collapsedSpans.includes(span.spanId)) {
-            setCollapsedSpans(collapsedSpans.filter((spanId)=>spanId !== span.spanId));
-        } else {
-            setCollapsedSpans([
-                ...collapsedSpans,
-                span.spanId
-            ]);
-        }
+        setCollapsedSpans((prev)=>{
+            const next = new Set(prev);
+            if (next.has(span.spanId)) {
+                next.delete(span.spanId);
+            } else {
+                next.add(span.spanId);
+            }
+            return next;
+        });
     }, [
         span,
-        collapsedSpans,
         setCollapsedSpans
     ]);
     const handleIconMouseEnter = (0, _react.useCallback)(()=>{
@@ -75,7 +75,7 @@ function SpanIndents(props) {
                 },
                 onMouseEnter: ()=>setHoveredParent(span.parentSpanId ?? ''),
                 onMouseLeave: ()=>setHoveredParent(undefined),
-                children: i === spans.length - 1 && span.childSpans.length > 0 && (collapsedSpans.includes(span.spanId) ? /*#__PURE__*/ (0, _jsxruntime.jsx)(_ChevronRight.default, {
+                children: i === spans.length - 1 && span.childSpans.length > 0 && (collapsedSpans.has(span.spanId) ? /*#__PURE__*/ (0, _jsxruntime.jsx)(_ChevronRight.default, {
                     titleAccess: "expand",
                     onClick: handleToggleClick,
                     onMouseEnter: handleIconMouseEnter

package/lib/cjs/TracingGanttChart/MiniGanttChart/draw.js

@@ -20,6 +20,7 @@ Object.defineProperty(exports, "drawSpans", {
         return drawSpans;
     }
 });
+const _trace = require("../trace");
 const _utils = require("../utils");
 const MIN_BAR_HEIGHT = 1;
 const MAX_BAR_HEIGHT = 7;
@@ -39,11 +40,6 @@ function drawSpans(ctx, width, height, trace, spanColorGenerator) {
         ctx.rect(Math.round(relativeStart * width), Math.round(y), Math.max(_utils.minSpanWidthPx, Math.round(relativeDuration * width)), barHeight);
         ctx.fill();
         y += yChange;
-        for (const childSpan of span.childSpans){
-            drawSpan(childSpan);
-        }
     };
-    for (const rootSpan of trace.rootSpans){
-        drawSpan(rootSpan);
-    }
+    (0, _trace.forEachSpan)(trace.rootSpans, drawSpan);
 }

package/lib/cjs/TracingGanttChart/Search.js

@@ -0,0 +1,154 @@
+// Copyright The Perses Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: Object.getOwnPropertyDescriptor(all, name).get
+    });
+}
+_export(exports, {
+    get SearchBar () {
+        return SearchBar;
+    },
+    get useSpanSearch () {
+        return useSpanSearch;
+    }
+});
+const _jsxruntime = require("react/jsx-runtime");
+const _material = require("@mui/material");
+const _ChevronUp = /*#__PURE__*/ _interop_require_default(require("mdi-material-ui/ChevronUp"));
+const _ChevronDown = /*#__PURE__*/ _interop_require_default(require("mdi-material-ui/ChevronDown"));
+const _Close = /*#__PURE__*/ _interop_require_default(require("mdi-material-ui/Close"));
+const _react = require("react");
+const _Attributes = require("./DetailPane/Attributes");
+const _trace = require("./trace");
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+function SearchBar(props) {
+    const { search } = props;
+    const { searchQuery, setSearchQuery, matchingSpanIds, focusedMatchIndex, setFocusedMatchIndex } = search;
+    const hasQuery = searchQuery.length > 0;
+    const matchCount = matchingSpanIds.length;
+    const hasMatches = matchCount > 0;
+    function handlePrev() {
+        if (!hasMatches) return;
+        setFocusedMatchIndex((focusedMatchIndex - 1 + matchCount) % matchCount);
+    }
+    function handleNext() {
+        if (!hasMatches) return;
+        setFocusedMatchIndex((focusedMatchIndex + 1) % matchCount);
+    }
+    function handleKeyDown(e) {
+        if (e.key === 'Enter') {
+            e.preventDefault();
+            if (e.shiftKey) {
+                handlePrev();
+            } else {
+                handleNext();
+            }
+        }
+    }
+    return /*#__PURE__*/ (0, _jsxruntime.jsxs)(_material.Stack, {
+        direction: "row",
+        sx: {
+            alignItems: 'center',
+            gap: 0.5,
+            minWidth: 300
+        },
+        children: [
+            /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.TextField, {
+                size: "small",
+                placeholder: "Search spans...",
+                value: searchQuery,
+                onChange: (e)=>setSearchQuery(e.target.value),
+                onKeyDown: handleKeyDown,
+                slotProps: {
+                    input: {
+                        endAdornment: /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.InputAdornment, {
+                            position: "end",
+                            sx: {
+                                visibility: hasQuery ? 'visible' : 'hidden',
+                                whiteSpace: 'nowrap'
+                            },
+                            children: hasMatches ? `${focusedMatchIndex + 1}/${matchCount}` : '0/0'
+                        })
+                    }
+                },
+                sx: {
+                    minWidth: 200
+                }
+            }),
+            /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.IconButton, {
+                size: "small",
+                disabled: !hasMatches,
+                "aria-label": "Previous match",
+                onClick: handlePrev,
+                children: /*#__PURE__*/ (0, _jsxruntime.jsx)(_ChevronUp.default, {})
+            }),
+            /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.IconButton, {
+                size: "small",
+                disabled: !hasMatches,
+                "aria-label": "Next match",
+                onClick: handleNext,
+                children: /*#__PURE__*/ (0, _jsxruntime.jsx)(_ChevronDown.default, {})
+            }),
+            /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.IconButton, {
+                size: "small",
+                disabled: !hasQuery,
+                "aria-label": "Clear search",
+                onClick: ()=>setSearchQuery(''),
+                children: /*#__PURE__*/ (0, _jsxruntime.jsx)(_Close.default, {})
+            })
+        ]
+    });
+}
+function spanMatchesQuery(span, query) {
+    const attrMatches = (attr)=>attr.key.toLowerCase().includes(query) || (0, _Attributes.renderAttributeValue)(attr.value).toLowerCase().includes(query);
+    return span.resource.serviceName?.toLowerCase().includes(query) || span.name.toLowerCase().includes(query) || span.spanId.toLowerCase().includes(query) || span.attributes.some(attrMatches) || span.resource.attributes.some(attrMatches);
+}
+function useSpanSearch(trace) {
+    const [searchQuery, setSearchQueryRaw] = (0, _react.useState)('');
+    const [focusedMatchIndex, setFocusedMatchIndex] = (0, _react.useState)(0);
+    const matchingSpanIds = (0, _react.useMemo)(()=>{
+        if (searchQuery.length === 0) return [];
+        const query = searchQuery.toLowerCase();
+        const matches = [];
+        (0, _trace.forEachSpan)(trace.rootSpans, (span)=>{
+            if (spanMatchesQuery(span, query)) {
+                matches.push(span.spanId);
+            }
+        });
+        return matches;
+    }, [
+        searchQuery,
+        trace.rootSpans
+    ]);
+    const setSearchQuery = (0, _react.useCallback)((query)=>{
+        setSearchQueryRaw(query);
+        setFocusedMatchIndex(0);
+    }, []);
+    return {
+        searchQuery,
+        setSearchQuery,
+        matchingSpanIds,
+        focusedMatchIndex,
+        setFocusedMatchIndex
+    };
+}

package/lib/cjs/TracingGanttChart/TraceHeaderBar.js

@@ -0,0 +1,139 @@
+// Copyright The Perses Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "TraceHeaderBar", {
+    enumerable: true,
+    get: function() {
+        return TraceHeaderBar;
+    }
+});
+const _jsxruntime = require("react/jsx-runtime");
+const _material = require("@mui/material");
+const _Magnify = /*#__PURE__*/ _interop_require_default(require("mdi-material-ui/Magnify"));
+const _react = require("react");
+const _components = require("@perses-dev/components");
+const _utils = require("./utils");
+const _Search = require("./Search");
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+const DATE_FORMAT_OPTIONS = {
+    year: 'numeric',
+    month: 'long',
+    day: 'numeric',
+    hour: 'numeric',
+    minute: 'numeric',
+    second: 'numeric',
+    fractionalSecondDigits: 3,
+    timeZoneName: 'short'
+};
+function TraceHeaderBar(props) {
+    const { trace, search } = props;
+    const { dateFormatOptionsWithUserTimeZone } = (0, _components.useTimeZone)();
+    const dateFormatter = (0, _react.useMemo)(()=>{
+        const dateFormatOptions = dateFormatOptionsWithUserTimeZone(DATE_FORMAT_OPTIONS);
+        return new Intl.DateTimeFormat(undefined, dateFormatOptions);
+    }, [
+        dateFormatOptionsWithUserTimeZone
+    ]);
+    const [showSearch, setShowSearch] = (0, _react.useState)(false);
+    const rootSpan = trace.rootSpans[0];
+    if (!rootSpan) {
+        return /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Typography, {
+            children: "Trace contains no spans."
+        });
+    }
+    return /*#__PURE__*/ (0, _jsxruntime.jsxs)(_material.Stack, {
+        direction: "column",
+        sx: {
+            gap: 1
+        },
+        children: [
+            /*#__PURE__*/ (0, _jsxruntime.jsxs)(_material.Stack, {
+                direction: "row",
+                sx: {
+                    justifyContent: 'space-between'
+                },
+                children: [
+                    /*#__PURE__*/ (0, _jsxruntime.jsxs)(_material.Stack, {
+                        direction: "row",
+                        sx: {
+                            gap: 1,
+                            alignItems: 'center'
+                        },
+                        children: [
+                            /*#__PURE__*/ (0, _jsxruntime.jsxs)(_material.Typography, {
+                                variant: "h3",
+                                children: [
+                                    rootSpan.resource.serviceName,
+                                    ": ",
+                                    rootSpan.name,
+                                    " (",
+                                    (0, _utils.formatDuration)(trace.endTimeUnixMs - trace.startTimeUnixMs),
+                                    ")"
+                                ]
+                            }),
+                            /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.IconButton, {
+                                size: "small",
+                                onClick: ()=>setShowSearch((prev)=>!prev),
+                                "aria-label": "Toggle search",
+                                children: /*#__PURE__*/ (0, _jsxruntime.jsx)(_Magnify.default, {
+                                    fontSize: "small"
+                                })
+                            })
+                        ]
+                    }),
+                    /*#__PURE__*/ (0, _jsxruntime.jsxs)(_material.Typography, {
+                        variant: "h4",
+                        children: [
+                            /*#__PURE__*/ (0, _jsxruntime.jsxs)(_material.Typography, {
+                                component: "span",
+                                sx: {
+                                    px: 1
+                                },
+                                children: [
+                                    /*#__PURE__*/ (0, _jsxruntime.jsx)("strong", {
+                                        children: "Start:"
+                                    }),
+                                    " ",
+                                    dateFormatter.format(trace.startTimeUnixMs)
+                                ]
+                            }),
+                            /*#__PURE__*/ (0, _jsxruntime.jsxs)(_material.Typography, {
+                                component: "span",
+                                sx: {
+                                    px: 1
+                                },
+                                children: [
+                                    /*#__PURE__*/ (0, _jsxruntime.jsx)("strong", {
+                                        children: "Trace ID:"
+                                    }),
+                                    " ",
+                                    rootSpan.traceId
+                                ]
+                            })
+                        ]
+                    })
+                ]
+            }),
+            showSearch && /*#__PURE__*/ (0, _jsxruntime.jsx)(_Search.SearchBar, {
+                search: search
+            })
+        ]
+    });
+}

package/lib/cjs/TracingGanttChart/TracingGanttChart.js

@@ -29,10 +29,10 @@ const _GanttTable = require("./GanttTable/GanttTable");
 const _GanttTableProvider = require("./GanttTable/GanttTableProvider");
 const _ResizableDivider = require("./GanttTable/ResizableDivider");
 const _trace = require("./trace");
-const _TraceDetails = require("./TraceDetails");
+const _TraceHeaderBar = require("./TraceHeaderBar");
+const _Search = require("./Search");
 function TracingGanttChart(props) {
     const { options, customLinks, trace: otlpTrace } = props;
-    const theme = (0, _material.useTheme)();
     const trace = (0, _react.useMemo)(()=>{
         try {
             return (0, _trace.getTraceModel)(otlpTrace);
@@ -47,11 +47,13 @@ function TracingGanttChart(props) {
         endTimeUnixMs: trace.endTimeUnixMs
     });
     const [selectedSpan, setSelectedSpan] = (0, _react.useState)(()=>options.selectedSpanId ? trace.spanById.get(options.selectedSpanId) : undefined);
+    const search = (0, _Search.useSpanSearch)(trace);
     const ganttChart = (0, _react.useRef)(null);
     // tableWidth only comes to effect if the detail pane is visible.
     // setTableWidth() is only called by <ResizableDivider />
     const [tableWidth, setTableWidth] = (0, _react.useState)(0.82);
     const gap = 2;
+    const spacing = ganttChart.current ? parseFloat(getComputedStyle(ganttChart.current).columnGap) || 0 : 0;
     return /*#__PURE__*/ (0, _jsxruntime.jsxs)(_material.Stack, {
         ref: ganttChart,
         direction: "row",
@@ -67,8 +69,9 @@ function TracingGanttChart(props) {
                     gap
                 },
                 children: [
-                    /*#__PURE__*/ (0, _jsxruntime.jsx)(_TraceDetails.TraceDetails, {
-                        trace: trace
+                    /*#__PURE__*/ (0, _jsxruntime.jsx)(_TraceHeaderBar.TraceHeaderBar, {
+                        trace: trace,
+                        search: search
                     }),
                     /*#__PURE__*/ (0, _jsxruntime.jsx)(_MiniGanttChart.MiniGanttChart, {
                         options: options,
@@ -83,7 +86,9 @@ function TracingGanttChart(props) {
                             trace: trace,
                             viewport: viewport,
                             selectedSpan: selectedSpan,
-                            onSpanClick: setSelectedSpan
+                            onSpanClick: setSelectedSpan,
+                            matchingSpanIds: search.matchingSpanIds,
+                            focusedSpanId: search.matchingSpanIds[search.focusedMatchIndex]
                         })
                     })
                 ]
@@ -92,12 +97,13 @@ function TracingGanttChart(props) {
                 children: [
                     /*#__PURE__*/ (0, _jsxruntime.jsx)(_ResizableDivider.ResizableDivider, {
                         parentRef: ganttChart,
-                        spacing: parseInt(theme.spacing(gap)),
+                        spacing: spacing,
                         onMove: setTableWidth
                     }),
                     /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Box, {
                         style: {
-                            width: `${(1 - tableWidth) * 100}%`
+                            width: `${(1 - tableWidth) * 100}%`,
+                            minWidth: `${(1 - tableWidth) * 100}%`
                         },
                         sx: {
                             overflow: 'auto'

package/lib/cjs/TracingGanttChart/trace.js

@@ -14,9 +14,17 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "getTraceModel", {
-    enumerable: true,
-    get: function() {
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: Object.getOwnPropertyDescriptor(all, name).get
+    });
+}
+_export(exports, {
+    get forEachSpan () {
+        return forEachSpan;
+    },
+    get getTraceModel () {
         return getTraceModel;
     }
 });
@@ -72,6 +80,13 @@ function getTraceModel(trace) {
         endTimeUnixMs
     };
 }
+function forEachSpan(spans, fn) {
+    for (const span of spans){
+        if (fn(span) !== false) {
+            forEachSpan(span.childSpans, fn);
+        }
+    }
+}
 function parseResource(resource) {
     let serviceName = 'unknown';
     for (const attr of resource?.attributes ?? []){