Skip to content

Same agent Smaller bill. The tools and infrastructure to get more work from your AI. Fewer tokens. Less compute. Lower cost.

[Fix]: Request UI and Exception UI fix for displaying trace details (#561)

Aman Agarwal07805596d0c5
diff --git a/docker-compose.yml b/docker-compose.yml
index 1d7ddf0a..9059bc64 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,6 @@
services:
clickhouse:
- image: clickhouse/clickhouse-server:24.2.2
+ image: clickhouse/clickhouse-server:24.4.1
container_name: clickhouse
environment:
CLICKHOUSE_PASSWORD: ${OPENLIT_DB_PASSWORD:-OPENLIT}
diff --git a/src/client/package-lock.json b/src/client/package-lock.json
index 45d57660..257d6f43 100644
--- a/src/client/package-lock.json
+++ b/src/client/package-lock.json
@@ -1,13 +1,12 @@
{
"name": "openlit",
-
- "version": "1.11.10",
+ "version": "1.12.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "openlit",
- "version": "1.11.10",
+ "version": "1.12.0",
"dependencies": {
"@anthropic-ai/sdk": "^0.21.1",
"@clickhouse/client": "^1.1.0",
@@ -16,6 +15,7 @@
"@mui/material": "^5.15.21",
"@next-auth/prisma-adapter": "^1.0.7",
"@prisma/client": "^5.15.0",
+ "@radix-ui/react-accordion": "^1.2.1",
"@radix-ui/react-checkbox": "^1.1.0",
"@radix-ui/react-collapsible": "^1.1.0",
"@radix-ui/react-dialog": "^1.0.5",
@@ -2071,6 +2071,206 @@
"@babel/runtime": "^7.13.10"
}
},
+ "node_modules/@radix-ui/react-accordion": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/@radix-ui/react-accordion/-/react-accordion-1.2.1.tgz",
+ "integrity": "sha512-bg/l7l5QzUjgsh8kjwDFommzAshnUsuVMV5NM56QVCm+7ZckYdd9P/ExR8xG/Oup0OajVxNLaHJ1tb8mXk+nzQ==",
+ "dependencies": {
+ "@radix-ui/primitive": "1.1.0",
+ "@radix-ui/react-collapsible": "1.1.1",
+ "@radix-ui/react-collection": "1.1.0",
+ "@radix-ui/react-compose-refs": "1.1.0",
+ "@radix-ui/react-context": "1.1.1",
+ "@radix-ui/react-direction": "1.1.0",
+ "@radix-ui/react-id": "1.1.0",
+ "@radix-ui/react-primitive": "2.0.0",
+ "@radix-ui/react-use-controllable-state": "1.1.0"
+ },
+ "peerDependencies": {
+ "@types/react": "*",
+ "@types/react-dom": "*",
+ "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+ "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ },
+ "@types/react-dom": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@radix-ui/react-accordion/node_modules/@radix-ui/primitive": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.0.tgz",
+ "integrity": "sha512-4Z8dn6Upk0qk4P74xBhZ6Hd/w0mPEzOOLxy4xiPXOXqjF7jZS0VAKk7/x/H6FyY2zCkYJqePf1G5KmkmNJ4RBA=="
+ },
+ "node_modules/@radix-ui/react-accordion/node_modules/@radix-ui/react-collection": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.1.0.tgz",
+ "integrity": "sha512-GZsZslMJEyo1VKm5L1ZJY8tGDxZNPAoUeQUIbKeJfoi7Q4kmig5AsgLMYYuyYbfjd8fBmFORAIwYAkXMnXZgZw==",
+ "dependencies": {
+ "@radix-ui/react-compose-refs": "1.1.0",
+ "@radix-ui/react-context": "1.1.0",
+ "@radix-ui/react-primitive": "2.0.0",
+ "@radix-ui/react-slot": "1.1.0"
+ },
+ "peerDependencies": {
+ "@types/react": "*",
+ "@types/react-dom": "*",
+ "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+ "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ },
+ "@types/react-dom": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@radix-ui/react-accordion/node_modules/@radix-ui/react-collection/node_modules/@radix-ui/react-context": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.0.tgz",
+ "integrity": "sha512-OKrckBy+sMEgYM/sMmqmErVn0kZqrHPJze+Ql3DzYsDDp0hl0L62nx/2122/Bvps1qz645jlcu2tD9lrRSdf8A==",
+ "peerDependencies": {
+ "@types/react": "*",
+ "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@radix-ui/react-accordion/node_modules/@radix-ui/react-compose-refs": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.0.tgz",
+ "integrity": "sha512-b4inOtiaOnYf9KWyO3jAeeCG6FeyfY6ldiEPanbUjWd+xIk5wZeHa8yVwmrJ2vderhu/BQvzCrJI0lHd+wIiqw==",
+ "peerDependencies": {
+ "@types/react": "*",
+ "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@radix-ui/react-accordion/node_modules/@radix-ui/react-context": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.1.tgz",
+ "integrity": "sha512-UASk9zi+crv9WteK/NU4PLvOoL3OuE6BWVKNF6hPRBtYBDXQ2u5iu3O59zUlJiTVvkyuycnqrztsHVJwcK9K+Q==",
+ "peerDependencies": {
+ "@types/react": "*",
+ "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@radix-ui/react-accordion/node_modules/@radix-ui/react-direction": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@radix-ui/react-direction/-/react-direction-1.1.0.tgz",
+ "integrity": "sha512-BUuBvgThEiAXh2DWu93XsT+a3aWrGqolGlqqw5VU1kG7p/ZH2cuDlM1sRLNnY3QcBS69UIz2mcKhMxDsdewhjg==",
+ "peerDependencies": {
+ "@types/react": "*",
+ "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@radix-ui/react-accordion/node_modules/@radix-ui/react-id": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.1.0.tgz",
+ "integrity": "sha512-EJUrI8yYh7WOjNOqpoJaf1jlFIH2LvtgAl+YcFqNCa+4hj64ZXmPkAKOFs/ukjz3byN6bdb/AVUqHkI8/uWWMA==",
+ "dependencies": {
+ "@radix-ui/react-use-layout-effect": "1.1.0"
+ },
+ "peerDependencies": {
+ "@types/react": "*",
+ "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@radix-ui/react-accordion/node_modules/@radix-ui/react-primitive": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.0.0.tgz",
+ "integrity": "sha512-ZSpFm0/uHa8zTvKBDjLFWLo8dkr4MBsiDLz0g3gMUwqgLHz9rTaRRGYDgvZPtBJgYCBKXkS9fzmoySgr8CO6Cw==",
+ "dependencies": {
+ "@radix-ui/react-slot": "1.1.0"
+ },
+ "peerDependencies": {
+ "@types/react": "*",
+ "@types/react-dom": "*",
+ "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+ "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ },
+ "@types/react-dom": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@radix-ui/react-accordion/node_modules/@radix-ui/react-use-callback-ref": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.0.tgz",
+ "integrity": "sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw==",
+ "peerDependencies": {
+ "@types/react": "*",
+ "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@radix-ui/react-accordion/node_modules/@radix-ui/react-use-controllable-state": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.1.0.tgz",
+ "integrity": "sha512-MtfMVJiSr2NjzS0Aa90NPTnvTSg6C/JLCV7ma0W6+OMV78vd8OyRpID+Ng9LxzsPbLeuBnWBA1Nq30AtBIDChw==",
+ "dependencies": {
+ "@radix-ui/react-use-callback-ref": "1.1.0"
+ },
+ "peerDependencies": {
+ "@types/react": "*",
+ "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@radix-ui/react-accordion/node_modules/@radix-ui/react-use-layout-effect": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.0.tgz",
+ "integrity": "sha512-+FPE0rOdziWSrH9athwI1R0HDVbWlEhd+FR+aSDk4uWGmSJ9Z54sdZVDQPZAinJhJXwfT+qnj969mCsT2gfm5w==",
+ "peerDependencies": {
+ "@types/react": "*",
+ "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ }
+ }
+ },
"node_modules/@radix-ui/react-arrow": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.0.3.tgz",
@@ -2278,15 +2478,15 @@
}
},
"node_modules/@radix-ui/react-collapsible": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/@radix-ui/react-collapsible/-/react-collapsible-1.1.0.tgz",
- "integrity": "sha512-zQY7Epa8sTL0mq4ajSJpjgn2YmCgyrG7RsQgLp3C0LQVkG7+Tf6Pv1CeNWZLyqMjhdPkBa5Lx7wYBeSu7uCSTA==",
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/@radix-ui/react-collapsible/-/react-collapsible-1.1.1.tgz",
+ "integrity": "sha512-1///SnrfQHJEofLokyczERxQbWfCGQlQ2XsCZMucVs6it+lq9iw4vXy+uDn1edlb58cOZOWSldnfPAYcT4O/Yg==",
"dependencies": {
"@radix-ui/primitive": "1.1.0",
"@radix-ui/react-compose-refs": "1.1.0",
- "@radix-ui/react-context": "1.1.0",
+ "@radix-ui/react-context": "1.1.1",
"@radix-ui/react-id": "1.1.0",
- "@radix-ui/react-presence": "1.1.0",
+ "@radix-ui/react-presence": "1.1.1",
"@radix-ui/react-primitive": "2.0.0",
"@radix-ui/react-use-controllable-state": "1.1.0",
"@radix-ui/react-use-layout-effect": "1.1.0"
@@ -2326,9 +2526,9 @@
}
},
"node_modules/@radix-ui/react-collapsible/node_modules/@radix-ui/react-context": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.0.tgz",
- "integrity": "sha512-OKrckBy+sMEgYM/sMmqmErVn0kZqrHPJze+Ql3DzYsDDp0hl0L62nx/2122/Bvps1qz645jlcu2tD9lrRSdf8A==",
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.1.tgz",
+ "integrity": "sha512-UASk9zi+crv9WteK/NU4PLvOoL3OuE6BWVKNF6hPRBtYBDXQ2u5iu3O59zUlJiTVvkyuycnqrztsHVJwcK9K+Q==",
"peerDependencies": {
"@types/react": "*",
"react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
@@ -2357,9 +2557,9 @@
}
},
"node_modules/@radix-ui/react-collapsible/node_modules/@radix-ui/react-presence": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.1.0.tgz",
- "integrity": "sha512-Gq6wuRN/asf9H/E/VzdKoUtT8GC9PQc9z40/vEr0VCJ4u5XvvhWIrSsCB6vD2/cH7ugTdSfYq9fLJCcM00acrQ==",
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.1.1.tgz",
+ "integrity": "sha512-IeFXVi4YS1K0wVZzXNrbaaUvIJ3qdY+/Ih4eHFhWA9SwGR9UDX7Ck8abvL57C4cv3wwMvUE0OG69Qc3NCcTe/A==",
"dependencies": {
"@radix-ui/react-compose-refs": "1.1.0",
"@radix-ui/react-use-layout-effect": "1.1.0"
diff --git a/src/client/package.json b/src/client/package.json
index 4bdadf49..8bd983d3 100644
--- a/src/client/package.json
+++ b/src/client/package.json
@@ -1,6 +1,6 @@
{
"name": "openlit",
- "version": "1.11.10",
+ "version": "1.12.0",
"private": true,
"scripts": {
"dev": "next dev",
@@ -17,6 +17,7 @@
"@mui/material": "^5.15.21",
"@next-auth/prisma-adapter": "^1.0.7",
"@prisma/client": "^5.15.0",
+ "@radix-ui/react-accordion": "^1.2.1",
"@radix-ui/react-checkbox": "^1.1.0",
"@radix-ui/react-collapsible": "^1.1.0",
"@radix-ui/react-dialog": "^1.0.5",
diff --git a/src/client/src/app/(playground)/dashboard/dashboard-type.tsx b/src/client/src/app/(playground)/dashboard/dashboard-type.tsx
index b66167af..a2ceac09 100644
--- a/src/client/src/app/(playground)/dashboard/dashboard-type.tsx
+++ b/src/client/src/app/(playground)/dashboard/dashboard-type.tsx
@@ -1,10 +1,11 @@
import { useRootStore } from "@/store";
-import { getDashboardType, setDashboardType } from "@/selectors/dashboard";
+import { getDashboardType, setPageData } from "@/selectors/page";
import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs";
-import { DASHBOARD_TYPE_OBJECT } from "@/store/dashboard";
+import { DASHBOARD_TYPE_OBJECT } from "@/store/page";
import LLMDashboard from "./llm";
import GPUDashboard from "./gpu";
import VectorDashboard from "./vector";
+import { objectKeys } from "@/utils/object";
const DashboardLabels: any = {
llm: "LLM",
@@ -14,12 +15,16 @@ const DashboardLabels: any = {
export function DashboardTypeFilter() {
const dashboardType = useRootStore(getDashboardType);
- const updateDashboardType = useRootStore(setDashboardType);
+ const updateDashboardType = useRootStore(setPageData);
+ const changeDashboardType = (value: string) => {
+ updateDashboardType("dashboard", "type", value);
+ };
+
return (
- <Tabs defaultValue={dashboardType} onValueChange={updateDashboardType}>
- <TabsList>
- {Object.keys(DASHBOARD_TYPE_OBJECT).map((key) => (
- <TabsTrigger key={key} value={key}>
+ <Tabs defaultValue={dashboardType} onValueChange={changeDashboardType}>
+ <TabsList className="p-0 h-[30px]">
+ {objectKeys(DASHBOARD_TYPE_OBJECT).map((key) => (
+ <TabsTrigger key={key} value={key} className="py-1.5 text-xs">
{DashboardLabels[key as any]}
</TabsTrigger>
))}
diff --git a/src/client/src/app/(playground)/dashboard/llm/requests-per-time.tsx b/src/client/src/app/(playground)/dashboard/llm/requests-per-time.tsx
index a1ebe949..7b8d5dbb 100644
--- a/src/client/src/app/(playground)/dashboard/llm/requests-per-time.tsx
+++ b/src/client/src/app/(playground)/dashboard/llm/requests-per-time.tsx
@@ -13,7 +13,7 @@ import { useRootStore } from "@/store";
import { getFilterDetails } from "@/selectors/filter";
import { getPingStatus } from "@/selectors/database-config";
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
-import { COLORS } from "../../../../../colors";
+import { COLORS } from "../../../../../styles/colors";
import IntermediateState from "@/components/(playground)/intermediate-state";
import { toast } from "sonner";
import { getFilterParamsForDashboard } from "@/helpers/filter";
diff --git a/src/client/src/app/(playground)/dashboard/llm/token-charts.tsx b/src/client/src/app/(playground)/dashboard/llm/token-charts.tsx
index 52b3c021..5df9b999 100644
--- a/src/client/src/app/(playground)/dashboard/llm/token-charts.tsx
+++ b/src/client/src/app/(playground)/dashboard/llm/token-charts.tsx
@@ -20,7 +20,7 @@ import { getPingStatus } from "@/selectors/database-config";
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
import { Badge } from "@/components/ui/badge";
import { ScrollArea, ScrollBar } from "@/components/ui/scroll-area";
-import { COLORS } from "../../../../../colors";
+import { COLORS } from "../../../../../styles/colors";
import IntermediateState from "@/components/(playground)/intermediate-state";
import { getFilterParamsForDashboard } from "@/helpers/filter";
diff --git a/src/client/src/app/(playground)/exceptions/list.tsx b/src/client/src/app/(playground)/exceptions/list.tsx
deleted file mode 100644
index 5170b7ca..00000000
--- a/src/client/src/app/(playground)/exceptions/list.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import { fill } from "lodash";
-import IntermediateState from "@/components/(playground)/intermediate-state";
-import Exception from "@/components/(playground)/request/trace";
-import RenderLoader from "@/components/(playground)/request/loader";
-
-export default function List({
- data,
- isFetched,
- isLoading,
-}: {
- data: any[];
- isFetched: boolean;
- isLoading: boolean;
-}) {
- return (
- <div className="flex flex-col flex-1 w-full relative overflow-hidden">
- <div className="overflow-auto h-full">
- <div
- className={`flex flex-col w-full h-full text-sm text-left relative gap-4 ${
- isFetched && isLoading ? "animate-pulse" : ""
- }`}
- >
- {(!isFetched || (isLoading && !data?.length)) &&
- fill(new Array(5), 1).map((_, index) => (
- <RenderLoader key={`item-loader-${index}`} />
- ))}
- {data.map((item, index) => (
- <Exception
- key={`item-${index}`}
- item={item}
- isLoading={isLoading}
- />
- ))}
- {!data?.length && !isLoading && <IntermediateState type="nodata" />}
- </div>
- </div>
- </div>
- );
-}
diff --git a/src/client/src/app/(playground)/exceptions/page.tsx b/src/client/src/app/(playground)/exceptions/page.tsx
index f1ba2ed2..0403b851 100644
--- a/src/client/src/app/(playground)/exceptions/page.tsx
+++ b/src/client/src/app/(playground)/exceptions/page.tsx
@@ -1,20 +1,35 @@
"use client";
import { useCallback, useEffect } from "react";
-import { RequestProvider } from "@/components/(playground)/request/request-context";
+import {
+ RequestProvider,
+ useRequest,
+} from "@/components/(playground)/request/request-context";
import useFetchWrapper from "@/utils/hooks/useFetchWrapper";
import { toast } from "sonner";
import { getFilterDetails } from "@/selectors/filter";
import { useRootStore } from "@/store";
import { getPingStatus } from "@/selectors/database-config";
-import RequestFilter from "@/components/(playground)/request/request-filter";
import { omit } from "lodash";
-import List from "./list";
import RequestDetails from "@/components/(playground)/request/request-details";
+import { normalizeTrace } from "@/helpers/trace";
+import DataTable from "@/components/data-table/table";
+import { columns } from "@/components/(playground)/exceptions/columns";
+import { getVisibilityColumnsOfPage } from "@/selectors/page";
+import TracesFilter from "@/components/(playground)/filter/traces-filter";
-export default function RequestPage() {
+function ExceptionPage() {
const filter = useRootStore(getFilterDetails);
+ const [, updateRequest] = useRequest();
+
+ const onClick = (item: any) => {
+ !isLoading && updateRequest(item);
+ };
const pingStatus = useRootStore(getPingStatus);
const { data, fireRequest, isFetched, isLoading } = useFetchWrapper();
+ const visibilityColumns = useRootStore((state) =>
+ getVisibilityColumnsOfPage(state, "exception")
+ );
+
const fetchData = useCallback(async () => {
fireRequest({
body: JSON.stringify(omit(filter, ["selectedConfig"])),
@@ -37,18 +52,33 @@ export default function RequestPage() {
fetchData();
}, [filter, fetchData, pingStatus]);
+ const normalizedData = ((data as any)?.records || []).map(normalizeTrace);
+
return (
- <RequestProvider>
- <RequestFilter
+ <>
+ <TracesFilter
total={(data as any)?.total}
includeOnlySorting={["Timestamp"]}
+ pageName={"exception"}
+ columns={columns}
/>
- <List
- data={(data as any)?.records || []}
+ <DataTable
+ columns={columns}
+ data={normalizedData}
isFetched={isFetched || pingStatus !== "pending"}
isLoading={isLoading || pingStatus === "pending"}
+ visibilityColumns={visibilityColumns}
+ onClick={onClick}
/>
<RequestDetails />
+ </>
+ );
+}
+
+export default function Page() {
+ return (
+ <RequestProvider>
+ <ExceptionPage />
</RequestProvider>
);
}
diff --git a/src/client/src/app/(playground)/requests/list.tsx b/src/client/src/app/(playground)/requests/list.tsx
deleted file mode 100644
index 2a1110e0..00000000
--- a/src/client/src/app/(playground)/requests/list.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import { fill } from "lodash";
-import IntermediateState from "@/components/(playground)/intermediate-state";
-import RenderLoader from "../../../components/(playground)/request/loader";
-import Trace from "@/components/(playground)/request/trace";
-
-export default function List({
- data,
- isFetched,
- isLoading,
-}: {
- data: any[];
- isFetched: boolean;
- isLoading: boolean;
-}) {
- return (
- <div className="flex flex-col flex-1 w-full relative overflow-hidden">
- <div className="overflow-auto h-full">
- <div
- className={`flex flex-col w-full h-full text-sm text-left relative gap-4 ${
- isFetched && isLoading ? "animate-pulse" : ""
- }`}
- >
- {(!isFetched || (isLoading && !data?.length)) &&
- fill(new Array(5), 1).map((_, index) => (
- <RenderLoader key={`item-loader-${index}`} />
- ))}
- {data.map((item, index) => (
- <Trace key={`item-${index}`} item={item} isLoading={isLoading} />
- ))}
- {!data?.length && !isLoading && <IntermediateState type="nodata" />}
- </div>
- </div>
- </div>
- );
-}
diff --git a/src/client/src/app/(playground)/requests/page.tsx b/src/client/src/app/(playground)/requests/page.tsx
index 7b09260e..792bbebb 100644
--- a/src/client/src/app/(playground)/requests/page.tsx
+++ b/src/client/src/app/(playground)/requests/page.tsx
@@ -1,17 +1,32 @@
"use client";
import { useCallback, useEffect } from "react";
-import RequestFilter from "@/components/(playground)/request/request-filter";
-import { RequestProvider } from "@/components/(playground)/request/request-context";
+import {
+ RequestProvider,
+ useRequest,
+} from "@/components/(playground)/request/request-context";
import useFetchWrapper from "@/utils/hooks/useFetchWrapper";
import RequestDetails from "@/components/(playground)/request/request-details";
import { toast } from "sonner";
import { getFilterDetails } from "@/selectors/filter";
import { useRootStore } from "@/store";
import { getPingStatus } from "@/selectors/database-config";
-import List from "./list";
+import DataTable from "@/components/data-table/table";
+import { columns } from "@/components/(playground)/request/columns";
+import { normalizeTrace } from "@/helpers/trace";
+import { getVisibilityColumnsOfPage } from "@/selectors/page";
+import TracesFilter from "@/components/(playground)/filter/traces-filter";
+
+function RequestPage() {
+ const [, updateRequest] = useRequest();
+
+ const onClick = (item: any) => {
+ !isLoading && updateRequest(item);
+ };
-export default function RequestPage() {
const filter = useRootStore(getFilterDetails);
+ const visibilityColumns = useRootStore((state) =>
+ getVisibilityColumnsOfPage(state, "request")
+ );
const pingStatus = useRootStore(getPingStatus);
const { data, fireRequest, isFetched, isLoading } = useFetchWrapper();
const fetchData = useCallback(async () => {
@@ -36,15 +51,33 @@ export default function RequestPage() {
fetchData();
}, [filter, fetchData, pingStatus]);
+ const normalizedData = ((data as any)?.records || []).map(normalizeTrace);
+
return (
- <RequestProvider>
- <RequestFilter total={(data as any)?.total} supportDynamicFilters />
- <List
- data={(data as any)?.records || []}
+ <>
+ <TracesFilter
+ total={(data as any)?.total}
+ supportDynamicFilters
+ pageName="request"
+ columns={columns}
+ />
+ <DataTable
+ columns={columns}
+ data={normalizedData}
isFetched={isFetched || pingStatus !== "pending"}
isLoading={isLoading || pingStatus === "pending"}
+ visibilityColumns={visibilityColumns}
+ onClick={onClick}
/>
<RequestDetails />
+ </>
+ );
+}
+
+export default function Page() {
+ return (
+ <RequestProvider>
+ <RequestPage />
</RequestProvider>
);
}
diff --git a/src/client/src/app/api/metrics/request/span/[id]/heirarchy/route.ts b/src/client/src/app/api/metrics/request/span/[id]/heirarchy/route.ts
new file mode 100644
index 00000000..9658aaad
--- /dev/null
+++ b/src/client/src/app/api/metrics/request/span/[id]/heirarchy/route.ts
@@ -0,0 +1,14 @@
+import { getHeirarchyViaSpanId } from "@/lib/platform/request";
+
+export async function GET(_: Request, context: any) {
+ const { id } = context.params || {};
+
+ if (!id) {
+ return Response.json("No span id provided", {
+ status: 400,
+ });
+ }
+
+ const res: any = await getHeirarchyViaSpanId(id);
+ return Response.json(res);
+}
diff --git a/src/client/src/app/api/metrics/request/span/[id]/route.ts b/src/client/src/app/api/metrics/request/span/[id]/route.ts
new file mode 100644
index 00000000..25ab12ba
--- /dev/null
+++ b/src/client/src/app/api/metrics/request/span/[id]/route.ts
@@ -0,0 +1,13 @@
+import { getRequestViaSpanId } from "@/lib/platform/request";
+
+export async function GET(_: Request, context: any) {
+ const { id } = context.params || {};
+
+ if (!id)
+ return Response.json("No span id provided", {
+ status: 400,
+ });
+
+ const res: any = await getRequestViaSpanId(id);
+ return Response.json(res);
+}
diff --git a/src/client/src/app/api/metrics/request/parent-span/[id]/route.ts b/src/client/src/app/api/metrics/request/trace/[id]/route.ts
similarity index 63%
rename from src/client/src/app/api/metrics/request/parent-span/[id]/route.ts
rename to src/client/src/app/api/metrics/request/trace/[id]/route.ts
index 06e1e29e..5320b585 100644
--- a/src/client/src/app/api/metrics/request/parent-span/[id]/route.ts
+++ b/src/client/src/app/api/metrics/request/trace/[id]/route.ts
@@ -1,4 +1,4 @@
-import { getRequestViaParentSpanId } from "@/lib/platform/request";
+import { getRequestViaTraceId } from "@/lib/platform/request";
export async function GET(_: Request, context: any) {
const { id } = context.params || {};
@@ -8,6 +8,6 @@ export async function GET(_: Request, context: any) {
status: 400,
});
- const res: any = await getRequestViaParentSpanId(id);
+ const res: any = await getRequestViaTraceId(id);
return Response.json(res);
}
diff --git a/src/client/src/app/not-found.tsx b/src/client/src/app/not-found.tsx
new file mode 100644
index 00000000..c3632361
--- /dev/null
+++ b/src/client/src/app/not-found.tsx
@@ -0,0 +1,11 @@
+import Link from 'next/link'
+
+export default function NotFound() {
+ return (
+ <div>
+ <h2>Not Found</h2>
+ <p>Could not find requested resource</p>
+ <Link href="/">Return Home</Link>
+ </div>
+ )
+}
\ No newline at end of file
diff --git a/src/client/src/components/(playground)/exceptions/columns.tsx b/src/client/src/components/(playground)/exceptions/columns.tsx
new file mode 100644
index 00000000..24b493c2
--- /dev/null
+++ b/src/client/src/components/(playground)/exceptions/columns.tsx
@@ -0,0 +1,94 @@
+import { Columns } from "@/components/data-table/columns";
+import { Badge } from "@/components/ui/badge";
+import {
+ TraceMapping,
+ TraceMappingKeyType,
+ TransformedTraceRow,
+} from "@/constants/traces";
+import { CalendarDays } from "lucide-react";
+
+export const columns: Columns<TraceMappingKeyType, TransformedTraceRow> = {
+ id: {
+ header: () => TraceMapping.id.label,
+ cell: ({ row }) => (
+ <Badge
+ variant="outline"
+ className="rounded-md text-stone-700 dark:text-stone-300 block overflow-hidden text-ellipsis"
+ title={row.id}
+ >
+ {row.id}
+ </Badge>
+ ),
+ enableHiding: false,
+ },
+ time: {
+ header: () => TraceMapping.time.label,
+ cell: ({ row }) => {
+ return (
+ <div className="flex space-x-2 items-center" title={row.time}>
+ <CalendarDays size="16" />
+ <span className="truncate font-medium">{row.time}</span>
+ </div>
+ );
+ },
+ enableHiding: false,
+ },
+ spanName: {
+ header: () => TraceMapping.spanName.label,
+ cell: ({ row }) => {
+ return (
+ <div className="block items-center overflow-hidden text-ellipsis" title={row.spanName}>
+ {row.spanName}
+ </div>
+ );
+ },
+ enableHiding: true,
+ },
+ requestDuration: {
+ header: () => TraceMapping.requestDuration.label,
+ cell: ({ row }) => {
+ const value = `${parseFloat(row.requestDuration).toFixed(3)}${
+ TraceMapping.requestDuration.valueSuffix
+ }`;
+ return (
+ <div className="block items-center overflow-hidden text-ellipsis" title={value}>
+ {value}
+ </div>
+ );
+ },
+ enableHiding: true,
+ },
+ serviceName: {
+ header: () => TraceMapping.serviceName.label,
+ cell: ({ row }) => {
+ return (
+ <div className="block items-center overflow-hidden text-ellipsis" title={row.serviceName}>
+ {row.serviceName}
+ </div>
+ );
+ },
+ enableHiding: true,
+ },
+ deploymentType: {
+ header: () => TraceMapping.deploymentType.label,
+ cell: ({ row }) => {
+ return (
+ <div className="block items-center overflow-hidden text-ellipsis" title={row.deploymentType}>
+ {row.deploymentType}
+ </div>
+ );
+ },
+ enableHiding: true,
+ },
+ exceptionType: {
+ header: () => TraceMapping.exceptionType.label,
+ cell: ({ row }) => {
+ return (
+ <div className="block items-center overflow-hidden text-ellipsis" title={row.exceptionType}>
+ {row.exceptionType}
+ </div>
+ );
+ },
+ enableHiding: true,
+ },
+};
diff --git a/src/client/src/components/(playground)/filter/combo-dropdown.tsx b/src/client/src/components/(playground)/filter/combo-dropdown.tsx
index 27eb1626..e23aa42d 100644
--- a/src/client/src/components/(playground)/filter/combo-dropdown.tsx
+++ b/src/client/src/components/(playground)/filter/combo-dropdown.tsx
@@ -48,15 +48,15 @@ export default function ComboDropdown({
<Button
variant="outline"
size="default"
- className="text-stone-500 hover:text-stone-600 dark:text-stone-400 dark:hover:text-stone-300 dark:bg-stone-800 dark:hover:bg-stone-900"
+ className="text-stone-500 hover:text-stone-600 dark:text-stone-400 dark:hover:text-stone-300 dark:bg-stone-800 dark:hover:bg-stone-900 h-auto py-1 text-xs"
>
- <PlusCircleIcon className="mr-2 h-4 w-4" />
+ <PlusCircleIcon className="mr-2 h-3 w-3" />
{title}
{selectedValues?.length ? (
<>
<Separator
orientation="vertical"
- className="mx-2 h-4 bg-stone-300 dark:bg-stone-600"
+ className="mx-2 h-3 bg-stone-300 dark:bg-stone-600"
/>
<Badge
variant="secondary"
@@ -68,7 +68,7 @@ export default function ComboDropdown({
{selectedValues.length > 2 ? (
<Badge
variant="secondary"
- className="rounded-sm px-1 font-normal"
+ className="rounded-sm px-1 font-normal py-0"
>
{selectedValues.length} selected
</Badge>
@@ -79,7 +79,7 @@ export default function ComboDropdown({
<Badge
variant="secondary"
key={option.value}
- className="rounded-sm px-1 font-normal capitalize"
+ className="rounded-sm px-1 py-0 font-normal capitalize max-w-[100px] text-ellipsis overflow-hidden inline-block"
>
{option.label}
</Badge>
diff --git a/src/client/src/components/(playground)/filter/index.tsx b/src/client/src/components/(playground)/filter/index.tsx
index d9af69f8..906b05ea 100644
--- a/src/client/src/components/(playground)/filter/index.tsx
+++ b/src/client/src/components/(playground)/filter/index.tsx
@@ -35,9 +35,9 @@ const Filter = ({ className = "" }: { className?: string }) => {
return (
<div className={`flex grow gap-4 ${className}`}>
<Tabs defaultValue={filter.timeLimit.type} onValueChange={handleChange}>
- <TabsList>
+ <TabsList className="p-0 h-[30px]">
{TIME_RANGE_TABS.map(({ label, key }) => (
- <TabsTrigger key={key} value={key}>
+ <TabsTrigger key={key} value={key} className="py-1.5 text-xs">
{label}
</TabsTrigger>
))}
diff --git a/src/client/src/components/(playground)/filter/slider-with-value.tsx b/src/client/src/components/(playground)/filter/slider-with-value.tsx
index 8419917f..f89bc5ae 100644
--- a/src/client/src/components/(playground)/filter/slider-with-value.tsx
+++ b/src/client/src/components/(playground)/filter/slider-with-value.tsx
@@ -31,9 +31,9 @@ export default function SlideWithValue({
const stepValue = step || maxValue / 1000;
return (
- <div className="flex items-center shrink-0 w-96 px-4 ml-4 border border-stone-200 dark:border-0 dark:bg-stone-800 rounded-md text-stone-500 gap-2">
+ <div className="flex items-center shrink-0 w-96 pl-3 pr-2 border border-stone-200 dark:border-0 dark:bg-stone-800 rounded-md text-stone-500 gap-2">
<div className="flex items-center justify-between shrink-0">
- <Label htmlFor={type}>{label}</Label>
+ <Label htmlFor={type} className="text-xs">{label}</Label>
</div>
<Slider
id={type}
@@ -50,7 +50,7 @@ export default function SlideWithValue({
step={stepValue}
value={value}
onChange={onInputValueChange}
- className="border-0 text-right p-0 bg-transparent dark:bg-transparent"
+ className="border-0 text-right p-0 bg-transparent dark:bg-transparent h-auto"
type="number"
/>
</div>
diff --git a/src/client/src/components/(playground)/filter/sorting.tsx b/src/client/src/components/(playground)/filter/sorting.tsx
index 6faf20e8..41120587 100644
--- a/src/client/src/components/(playground)/filter/sorting.tsx
+++ b/src/client/src/components/(playground)/filter/sorting.tsx
@@ -52,10 +52,10 @@ export default function Sorting({
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button
- className="text-stone-500 hover:text-stone-600 dark:text-stone-400 dark:hover:text-stone-300 dark:bg-stone-800 dark:hover:bg-stone-900 aspect-square p-2.5 relative"
+ className="text-stone-500 hover:text-stone-600 dark:text-stone-400 dark:hover:text-stone-300 dark:bg-stone-800 dark:hover:bg-stone-900 aspect-square p-1 h-[30px] relative"
variant="outline"
>
- <ArrowDownUpIcon />
+ <ArrowDownUpIcon className="w-3 h-3" />
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent>
@@ -64,9 +64,9 @@ export default function Sorting({
{label}
{key === sorting.type &&
(sorting.direction === "asc" ? (
- <ArrowUpIcon className="h-4 w-4 ml-auto" />
+ <ArrowUpIcon className="h-3 w-3 ml-auto" />
) : (
- <ArrowDownIcon className="h-4 w-4 ml-auto" />
+ <ArrowDownIcon className="h-3 w-3 ml-auto" />
))}
</DropdownMenuItem>
))}
diff --git a/src/client/src/components/(playground)/request/request-filter.tsx b/src/client/src/components/(playground)/filter/traces-filter.tsx
similarity index 69%
rename from src/client/src/components/(playground)/request/request-filter.tsx
rename to src/client/src/components/(playground)/filter/traces-filter.tsx
index 0fb87470..4edc0cb0 100644
--- a/src/client/src/components/(playground)/request/request-filter.tsx
+++ b/src/client/src/components/(playground)/filter/traces-filter.tsx
@@ -1,6 +1,6 @@
-import RequestPagination from "@/components/(playground)/request/request-pagination";
+import TracesPagination from "@/components/(playground)/filter/traces-pagination";
import { ceil } from "lodash";
-import Filter from "../filter";
+import Filter from ".";
import {
getFilterConfig,
getFilterDetails,
@@ -8,9 +8,9 @@ import {
getUpdateConfig,
} from "@/selectors/filter";
import { useRootStore } from "@/store";
-import Sorting from "@/components/(playground)/filter/sorting";
-import ComboDropdown from "@/components/(playground)/filter/combo-dropdown";
-import SlideWithValue from "@/components/(playground)/filter/slider-with-value";
+import Sorting from "./sorting";
+import ComboDropdown from "./combo-dropdown";
+import SlideWithValue from "./slider-with-value";
import { Button } from "@/components/ui/button";
import { SlidersHorizontal } from "lucide-react";
@@ -21,6 +21,9 @@ import { toast } from "sonner";
import { FilterConfig, FilterType } from "@/store/filter";
import { usePostHog } from "posthog-js/react";
import { CLIENT_EVENTS } from "@/constants/events";
+import VisibilityColumns from "./visibility-columns";
+import { PAGE } from "@/store/page";
+import { Columns } from "@/components/data-table/columns";
const DynamicFilters = ({
isVisibleFilters,
@@ -111,8 +114,8 @@ const DynamicFilters = ({
const clearFilterStore = () => {
setSelectedFilterValues({});
- updateFilter("selectedConfig", {});
posthog?.capture(CLIENT_EVENTS.TRACE_FILTER_CLEARED);
+ updateFilter("selectedConfig", {}, { clearFilter: true });
};
return (
@@ -121,79 +124,89 @@ const DynamicFilters = ({
isVisibleFilters ? "h-auto mt-4" : "h-0 mt-0"
}`}
>
- {filterConfig?.traceTypes?.length ? (
- <ComboDropdown
- options={filterConfig?.traceTypes.map((p) => ({
- label: p,
- value: p,
- }))}
- title="Types"
- type="traceTypes"
- updateSelectedValues={updateSelectedValues}
- selectedValues={selectedFilterValues.traceTypes}
- clearItem={clearFilter}
- />
- ) : null}
- {filterConfig?.models?.length ? (
- <ComboDropdown
- options={filterConfig?.models.map((m) => ({ label: m, value: m }))}
- title="Models"
- type="models"
- updateSelectedValues={updateSelectedValues}
- selectedValues={selectedFilterValues.models}
- clearItem={clearFilter}
- />
- ) : null}
- {filterConfig?.providers?.length ? (
- <ComboDropdown
- options={filterConfig?.providers.map((p) => ({ label: p, value: p }))}
- title="Providers"
- type="providers"
- updateSelectedValues={updateSelectedValues}
- selectedValues={selectedFilterValues.providers}
- clearItem={clearFilter}
- />
- ) : null}
- {filterConfig?.maxCost ? (
- <SlideWithValue
- label="Max Cost"
- value={selectedFilterValues.maxCost || 0}
- maxValue={filterConfig.maxCost}
- onChange={updateSelectedValues}
- type="maxCost"
- />
- ) : null}
- <div className="grow" />
- {areFiltersApplied && (
+ <div className="flex grow gap-3 overflow-auto">
+ {filterConfig?.traceTypes?.length ? (
+ <ComboDropdown
+ options={filterConfig?.traceTypes.map((p) => ({
+ label: p,
+ value: p,
+ }))}
+ title="Types"
+ type="traceTypes"
+ updateSelectedValues={updateSelectedValues}
+ selectedValues={selectedFilterValues.traceTypes}
+ clearItem={clearFilter}
+ />
+ ) : null}
+ {filterConfig?.models?.length ? (
+ <ComboDropdown
+ options={filterConfig?.models.map((m) => ({ label: m, value: m }))}
+ title="Models"
+ type="models"
+ updateSelectedValues={updateSelectedValues}
+ selectedValues={selectedFilterValues.models}
+ clearItem={clearFilter}
+ />
+ ) : null}
+ {filterConfig?.providers?.length ? (
+ <ComboDropdown
+ options={filterConfig?.providers.map((p) => ({
+ label: p,
+ value: p,
+ }))}
+ title="Providers"
+ type="providers"
+ updateSelectedValues={updateSelectedValues}
+ selectedValues={selectedFilterValues.providers}
+ clearItem={clearFilter}
+ />
+ ) : null}
+ {filterConfig?.maxCost ? (
+ <SlideWithValue
+ label="Max Cost"
+ value={selectedFilterValues.maxCost || 0}
+ maxValue={filterConfig.maxCost}
+ onChange={updateSelectedValues}
+ type="maxCost"
+ />
+ ) : null}
+ </div>
+ <div className="flex shrink-0 gap-3">
+ {areFiltersApplied && (
+ <Button
+ variant="ghost"
+ size="default"
+ className="text-stone-500 hover:text-stone-600 dark:text-stone-400 dark:hover:text-stone-300 py-1.5 px-2 relative h-auto text-xs"
+ onClick={clearFilterStore}
+ >
+ Clear Filters
+ </Button>
+ )}
<Button
- variant="ghost"
+ variant="outline"
size="default"
- className="text-stone-500 hover:text-stone-600 dark:text-stone-400 dark:hover:text-stone-300 p-2.5 relative"
- onClick={clearFilterStore}
+ className="text-stone-500 hover:text-stone-600 dark:text-stone-400 dark:hover:text-stone-300 dark:bg-stone-800 dark:hover:bg-stone-900 py-1.5 px-2 relative h-auto text-xs"
+ onClick={updateFilterStore}
>
- Clear Filters
+ Apply Filters
</Button>
- )}
- <Button
- variant="outline"
- size="default"
- className="text-stone-500 hover:text-stone-600 dark:text-stone-400 dark:hover:text-stone-300 dark:bg-stone-800 dark:hover:bg-stone-900 p-2.5 relative"
- onClick={updateFilterStore}
- >
- Apply Filters
- </Button>
+ </div>
</div>
);
};
-export default function RequestFilter({
+export default function TracesFilter({
total,
supportDynamicFilters = false,
includeOnlySorting,
+ pageName,
+ columns,
}: {
total: number;
supportDynamicFilters?: boolean;
includeOnlySorting?: string[];
+ pageName: PAGE;
+ columns: Columns<any, any>;
}) {
const [isVisibleFilters, setIsVisibileFilters] = useState<boolean>(false);
const filter = useRootStore(getFilterDetails);
@@ -248,7 +261,7 @@ export default function RequestFilter({
<div className="flex w-full gap-4">
<Filter />
{filterConfig && total > 0 && (
- <RequestPagination
+ <TracesPagination
currentPage={filter.offset / filter.limit + 1}
currentSize={filter.limit}
totalPage={ceil((total || 0) / filter.limit)}
@@ -256,6 +269,7 @@ export default function RequestFilter({
onClickPageLimit={onClickPageLimit}
/>
)}
+ <VisibilityColumns columns={columns} pageName={pageName} />
{total > 0 && (
<Sorting
sorting={filter.sorting}
@@ -266,10 +280,10 @@ export default function RequestFilter({
<Button
variant="outline"
size="default"
- className="text-stone-500 hover:text-stone-600 dark:text-stone-400 dark:hover:text-stone-300 dark:bg-stone-800 dark:hover:bg-stone-900 aspect-square p-2.5 relative"
+ className="text-stone-500 hover:text-stone-600 dark:text-stone-400 dark:hover:text-stone-300 dark:bg-stone-800 dark:hover:bg-stone-900 aspect-square p-1 h-[30px] relative"
onClick={toggleIsVisibleFilters}
>
- <SlidersHorizontal />
+ <SlidersHorizontal className="w-3 h-3" />
{areFiltersApplied && (
<span className="w-1 h-1 bg-primary absolute top-1 right-1 rounded-full" />
)}
diff --git a/src/client/src/components/(playground)/request/request-pagination.tsx b/src/client/src/components/(playground)/filter/traces-pagination.tsx
similarity index 90%
rename from src/client/src/components/(playground)/request/request-pagination.tsx
rename to src/client/src/components/(playground)/filter/traces-pagination.tsx
index 977cd293..e1b27071 100644
--- a/src/client/src/components/(playground)/request/request-pagination.tsx
+++ b/src/client/src/components/(playground)/filter/traces-pagination.tsx
@@ -24,7 +24,7 @@ type PaginationProps = {
const PageSizes = [10, 25, 50];
-export default function RequestPagination(props: PaginationProps) {
+export default function TracesPagination(props: PaginationProps) {
const onClickAction: MouseEventHandler = (ev) => {
const { action } = (ev.currentTarget as HTMLButtonElement).dataset;
if (action === "previous") {
@@ -43,9 +43,9 @@ export default function RequestPagination(props: PaginationProps) {
props.totalPage === 0 || props.currentPage === props.totalPage;
return (
- <div className="flex gap-4">
+ <div className="flex gap-4 self-start">
<div className="flex align-end justify-center">
- <p className="text-xs shrink-0 mr-3 self-center text-stone-950 dark:text-stone-100">
+ <p className="text-xs shrink-0 mr-1 self-center text-stone-950 dark:text-stone-100">
Size :{" "}
</p>
<div className="w-[100px]">
@@ -55,7 +55,7 @@ export default function RequestPagination(props: PaginationProps) {
>
<SelectTrigger
id="model"
- className="items-center [&_[data-description]]:hidden text-stone-950 dark:text-stone-100"
+ className="items-center [&_[data-description]]:hidden text-stone-950 dark:text-stone-100 h-auto py-1"
>
<SelectValue
placeholder={`${props.currentSize}`}
@@ -84,7 +84,7 @@ export default function RequestPagination(props: PaginationProps) {
<PaginationContent>
<PaginationItem>
<PaginationPrevious
- className={`${
+ className={`py-1 h-auto ${
firstPage
? "pointer-events-none cursor-not-allowed text-stone-400"
: "text-stone-950 dark:text-stone-100"
@@ -101,7 +101,7 @@ export default function RequestPagination(props: PaginationProps) {
</PaginationItem>
<PaginationItem>
<PaginationNext
- className={`${
+ className={`py-1 h-auto ${
lastPage
? "pointer-events-none cursor-not-allowed text-stone-400"
: "text-stone-950 dark:text-stone-100"
diff --git a/src/client/src/components/(playground)/filter/visibility-columns.tsx b/src/client/src/components/(playground)/filter/visibility-columns.tsx
new file mode 100644
index 00000000..3bcdc488
--- /dev/null
+++ b/src/client/src/components/(playground)/filter/visibility-columns.tsx
@@ -0,0 +1,66 @@
+import { Columns } from "@/components/data-table/columns";
+import { Button } from "@/components/ui/button";
+import { Checkbox } from "@/components/ui/checkbox";
+import {
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu";
+import { TraceMapping, TraceMappingKeyType } from "@/constants/traces";
+import { getVisibilityColumnsOfPage, setPageData } from "@/selectors/page";
+import { useRootStore } from "@/store";
+import { PAGE, REQUEST_VISIBILITY_COLUMNS } from "@/store/page";
+import { objectEntries } from "@/utils/object";
+import { EyeIcon } from "lucide-react";
+
+export default function VisibilityColumns({
+ columns,
+ pageName,
+}: {
+ columns: Columns<any, any>;
+ pageName: PAGE;
+}) {
+ const updateFilter = useRootStore(setPageData);
+ const visibilityColumns = useRootStore((state) =>
+ getVisibilityColumnsOfPage(state, pageName)
+ );
+ const onVisibilityChange = (key: TraceMappingKeyType, value: boolean) => {
+ updateFilter(pageName, `visibilityColumns.${key}`, value);
+ };
+
+ return (
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <Button
+ className="text-stone-500 hover:text-stone-600 dark:text-stone-400 dark:hover:text-stone-300 dark:bg-stone-800 dark:hover:bg-stone-900 aspect-square p-1 h-[30px] relative"
+ variant="outline"
+ >
+ <EyeIcon className="w-3 h-3" />
+ </Button>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent>
+ {objectEntries(columns).map(([key, value]) => (
+ <DropdownMenuItem
+ key={key}
+ onClick={() =>
+ onVisibilityChange(
+ key as TraceMappingKeyType,
+ !visibilityColumns[key as keyof REQUEST_VISIBILITY_COLUMNS]
+ )
+ }
+ disabled={!value?.enableHiding}
+ className="gap-3"
+ >
+ <Checkbox
+ checked={
+ visibilityColumns[key as keyof REQUEST_VISIBILITY_COLUMNS]
+ }
+ />
+ {TraceMapping[key as TraceMappingKeyType].label}
+ </DropdownMenuItem>
+ ))}
+ </DropdownMenuContent>
+ </DropdownMenu>
+ );
+}
diff --git a/src/client/src/components/(playground)/intermediate-state.tsx b/src/client/src/components/(playground)/intermediate-state.tsx
index 6aa60cd6..441a9199 100644
--- a/src/client/src/components/(playground)/intermediate-state.tsx
+++ b/src/client/src/components/(playground)/intermediate-state.tsx
@@ -11,7 +11,7 @@ export default function IntermediateState(props: IntermediateState) {
props.children
) : (
<div
- className={`flex w-full items-center justify-center p-4 text-sm text-stone-500 ${
+ className={`flex w-full items-center justify-center p-3 text-sm text-stone-500 ${
props.classNames || ""
}`}
>
@@ -21,7 +21,7 @@ export default function IntermediateState(props: IntermediateState) {
if (props.type === "nodata")
return (
<div
- className={`flex w-full items-center justify-center p-4 text-sm text-stone-500 ${
+ className={`flex w-full items-center justify-center p-3 text-sm text-stone-500 ${
props.classNames || ""
}`}
>
diff --git a/src/client/src/components/(playground)/pie-chart-card.tsx b/src/client/src/components/(playground)/pie-chart-card.tsx
index f301d915..e0b05f7b 100644
--- a/src/client/src/components/(playground)/pie-chart-card.tsx
+++ b/src/client/src/components/(playground)/pie-chart-card.tsx
@@ -5,7 +5,7 @@ import { getFilterDetails } from "@/selectors/filter";
import { getPingStatus } from "@/selectors/database-config";
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
import { PieChart, Pie, Sector, ResponsiveContainer } from "recharts";
-import { COLORS } from "../../../colors";
+import { COLORS } from "../../../styles/colors";
import IntermediateState from "./intermediate-state";
import { Skeleton } from "../ui/skeleton";
import { getFilterParamsForDashboard } from "@/helpers/filter";
diff --git a/src/client/src/components/(playground)/request/columns.tsx b/src/client/src/components/(playground)/request/columns.tsx
new file mode 100644
index 00000000..34eb5abb
--- /dev/null
+++ b/src/client/src/components/(playground)/request/columns.tsx
@@ -0,0 +1,138 @@
+import { Columns } from "@/components/data-table/columns";
+import { Badge } from "@/components/ui/badge";
+import {
+ TraceMapping,
+ TraceMappingKeyType,
+ TransformedTraceRow,
+} from "@/constants/traces";
+import { CalendarDays } from "lucide-react";
+
+export const columns: Columns<TraceMappingKeyType, TransformedTraceRow> = {
+ id: {
+ header: () => TraceMapping.id.label,
+ cell: ({ row }) => (
+ <Badge
+ variant="outline"
+ className="rounded-md text-stone-700 dark:text-stone-300 block overflow-hidden text-ellipsis"
+ title={row.id}
+ >
+ {row.id}
+ </Badge>
+ ),
+ enableHiding: false,
+ },
+ time: {
+ header: () => TraceMapping.time.label,
+ cell: ({ row }) => {
+ return (
+ <div className="flex space-x-2 items-center" title={row.time}>
+ <CalendarDays size="16" />
+ <span className="truncate font-medium">{row.time}</span>
+ </div>
+ );
+ },
+ enableHiding: false,
+ },
+ spanName: {
+ header: () => TraceMapping.spanName.label,
+ cell: ({ row }) => {
+ return (
+ <div className="truncate" title={row.spanName}>
+ {row.spanName}
+ </div>
+ );
+ },
+ },
+ requestDuration: {
+ header: () => TraceMapping.requestDuration.label,
+ cell: ({ row }) => {
+ const value = `${parseFloat(row.requestDuration).toFixed(3)}${
+ TraceMapping.requestDuration.valueSuffix
+ }`;
+ return (
+ <div className="truncate" title={value}>
+ {value}
+ </div>
+ );
+ },
+ enableHiding: true,
+ },
+ serviceName: {
+ header: () => TraceMapping.serviceName.label,
+ cell: ({ row }) => {
+ return (
+ <div className="truncate" title={row.serviceName}>
+ {row.serviceName}
+ </div>
+ );
+ },
+ enableHiding: true,
+ },
+ applicationName: {
+ header: () => TraceMapping.applicationName.label,
+ cell: ({ row }) => {
+ return (
+ <div className="truncate" title={row.applicationName}>
+ {row.applicationName}
+ </div>
+ );
+ },
+ enableHiding: true,
+ },
+ cost: {
+ header: () => TraceMapping.cost.label,
+ cell: ({ row }) => {
+ const value = `${TraceMapping.cost.valuePrefix}${row.cost}`;
+ return (
+ <div className="truncate" title={value}>
+ {value}
+ </div>
+ );
+ },
+ enableHiding: true,
+ },
+ totalTokens: {
+ header: () => TraceMapping.totalTokens.label,
+ cell: ({ row }) => {
+ return (
+ <div className="truncate" title={row.totalTokens}>
+ {row.totalTokens}
+ </div>
+ );
+ },
+ enableHiding: true,
+ },
+ model: {
+ header: () => TraceMapping.model.label,
+ cell: ({ row }) => {
+ return (
+ <div className="truncate" title={row.model}>
+ {row.model}
+ </div>
+ );
+ },
+ enableHiding: true,
+ },
+ system: {
+ header: () => TraceMapping.system.label,
+ cell: ({ row }) => {
+ return (
+ <div className="truncate" title={row.system}>
+ {row.system}
+ </div>
+ );
+ },
+ enableHiding: true,
+ },
+ vectorCount: {
+ header: () => TraceMapping.vectorCount.label,
+ cell: ({ row }) => {
+ return (
+ <div className="truncate" title={row.vectorCount}>
+ {row.vectorCount}
+ </div>
+ );
+ },
+ enableHiding: true,
+ },
+};
diff --git a/src/client/src/components/(playground)/request/heirarchy-display.tsx b/src/client/src/components/(playground)/request/heirarchy-display.tsx
new file mode 100644
index 00000000..cfd50293
--- /dev/null
+++ b/src/client/src/components/(playground)/request/heirarchy-display.tsx
@@ -0,0 +1,128 @@
+import { useRequest } from "./request-context";
+
+import React, { useEffect } from "react";
+import { TangentIcon } from "lucide-react";
+import {
+ findSpanInHierarchyLodash,
+ getNormalizedTraceAttribute,
+} from "@/helpers/trace";
+import { TraceHeirarchySpan, TraceMapping } from "@/constants/traces";
+import useFetchWrapper from "@/utils/hooks/useFetchWrapper";
+import { toast } from "sonner";
+
+interface TreeNodeProps {
+ span: TraceHeirarchySpan;
+ level: number;
+}
+
+export function TreeNode({ span, level }: TreeNodeProps) {
+ const [request, updateRequest] = useRequest();
+ const onClick = () => {
+ if (request?.spanId !== span.SpanId) {
+ updateRequest({
+ spanId: span.SpanId,
+ });
+ }
+ return;
+ };
+
+ const spacingParent = level * 20 + 10;
+
+ return (
+ <>
+ <div
+ className={`flex justify-start p-1 font-normal hover:bg-stone-300 dark:hover:bg-stone-800 rounded-xs items-start cursor-pointer relative ${
+ request?.spanId === span.SpanId
+ ? "bg-stone-300 dark:bg-stone-800"
+ : ""
+ }`}
+ onClick={onClick}
+ style={{
+ paddingLeft: `${spacingParent}px`,
+ }}
+ >
+ {level > 0 && (
+ <div
+ className="absolute w-[10px] h-[1px] bg-stone-800 dark:bg-stone-300 z-10"
+ style={{
+ left: `${spacingParent - 15}px`,
+ top: "15px",
+ }}
+ />
+ )}
+ <TangentIcon className={`mr-2 h-4 w-4 shrink-0 mt-1`} />
+ <div className="flex flex-col grow text-left overflow-hidden">
+ <span className="block text-ellipsis overflow-hidden text-sm">
+ {span.SpanName}
+ </span>
+ <span className="text-xs">
+ (
+ {parseFloat(
+ getNormalizedTraceAttribute(
+ "requestDuration",
+ span.Duration
+ ) as string
+ ).toFixed(2)}
+ {TraceMapping.requestDuration.valueSuffix})
+ </span>
+ </div>
+ </div>
+ {span.children && span.children.length > 0 && (
+ <div className="flex flex-col w-full relative">
+ <div
+ className="absolute w-[1px] h-full bg-stone-800 dark:bg-stone-300 z-10"
+ style={{
+ left: `${spacingParent + 5}px`,
+ top: "-15px",
+ }}
+ />
+ {span.children.map((child) => (
+ <TreeNode key={child.SpanId} span={child} level={level + 1} />
+ ))}
+ </div>
+ )}
+ </>
+ );
+}
+
+export default function HeirarchyDisplay() {
+ const [request] = useRequest();
+ const { data, fireRequest, isLoading } = useFetchWrapper();
+
+ const typedData =
+ (data as { record: TraceHeirarchySpan; err?: string }) || {};
+
+ useEffect(() => {
+ if (
+ !findSpanInHierarchyLodash(typedData.record || {}, request?.spanId) &&
+ request?.spanId &&
+ !isLoading
+ ) {
+ fireRequest({
+ requestType: "GET",
+ url: `/api/metrics/request/span/${request?.spanId}/heirarchy`,
+ failureCb: (err?: string) => {
+ toast.error(err || `Cannot connect to server!`, {
+ id: "heirarchy-fetch",
+ });
+ },
+ });
+ }
+ }, [request, typedData, isLoading]);
+
+ const { record } = typedData;
+ if (isLoading || typedData.err || !record) {
+ return null;
+ }
+
+ return (
+ <div className="absolute left-0 -translate-x-full w-2/3 bg-stone-100 dark:bg-stone-900 border border-stone-200 border-t-0 dark:border-stone-900 border-r-0 text-stone-800 dark:text-stone-300 flex flex-col max-h-1/2">
+ <p className="flex-row bg-stone-950 px-4 py-3 items-center space-y-0 text-lg font-bold leading-7 text-stone-200">
+ Span Heirarchy
+ </p>
+ <div className="flex flex-col p-2 overflow-y-auto">
+ <TreeNode span={record} level={0} />
+ </div>
+ </div>
+ );
+}
diff --git a/src/client/src/components/(playground)/request/parent-trace.tsx b/src/client/src/components/(playground)/request/parent-trace.tsx
deleted file mode 100644
index 731e827b..00000000
--- a/src/client/src/components/(playground)/request/parent-trace.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-import { useCallback, useEffect, useState } from "react";
-import { TraceRow } from "@/constants/traces";
-import { ScanLine, ScanText } from "lucide-react";
-import {
- Collapsible,
- CollapsibleContent,
- CollapsibleTrigger,
-} from "@/components/ui/collapsible";
-import useFetchWrapper from "@/utils/hooks/useFetchWrapper";
-import { toast } from "sonner";
-import Trace from "./trace";
-import RenderLoader from "./loader";
-
-export default function ParentTrace({
- parentSpanId,
-}: {
- parentSpanId: string;
-}) {
- const [isOpened, setIsOpened] = useState(false);
- const { data, fireRequest, isFetched, isLoading } = useFetchWrapper();
- const fetchData = useCallback(async () => {
- fireRequest({
- requestType: "GET",
- url: `/api/metrics/request/parent-span/${parentSpanId}`,
- responseDataKey: "record.[0]",
- failureCb: (err?: string) => {
- toast.error(err || `Cannot connect to server!`, {
- id: "request-page",
- });
- },
- });
- }, [parentSpanId]);
-
- const onOpenChange = (open?: boolean) => {
- setIsOpened(!!open);
- };
-
- useEffect(() => {
- if (isOpened && !isFetched) fetchData();
- }, [isOpened, isFetched]);
-
- return (
- <Collapsible
- className="py-1 px-4 bg-stone-100 dark:bg-stone-800/[0.6] rounded-b border border-t-0 dark:border-stone-800"
- onOpenChange={onOpenChange}
- >
- <>
- <CollapsibleTrigger className="flex gap-4 w-full items-center py-2 text-stone-500 dark:text-stone-400">
- Parent Span Trace
- {isOpened ? (
- <ScanLine className="w-4" />
- ) : (
- <ScanText className="w-4" />
- )}
- </CollapsibleTrigger>
- <CollapsibleContent className="pb-3">
- {!isFetched || isLoading ? (
- <RenderLoader />
- ) : !(data as any) && !isLoading ? (
- <div className={`flex w-full items-center text-sm text-stone-500`}>
- No trace for parent exists
- </div>
- ) : (
- <Trace
- item={data as any as TraceRow}
- isLoading={isLoading || !isFetched}
- />
- )}
- </CollapsibleContent>
- </>
- </Collapsible>
- );
-}
diff --git a/src/client/src/components/(playground)/request/request-context.tsx b/src/client/src/components/(playground)/request/request-context.tsx
index 2b5f6453..feb7f1f7 100644
--- a/src/client/src/components/(playground)/request/request-context.tsx
+++ b/src/client/src/components/(playground)/request/request-context.tsx
@@ -1,8 +1,8 @@
-import { TraceRow } from "@/constants/traces";
+import { TransformedTraceRow } from "@/constants/traces";
import { noop } from "@/utils/noop";
import { ReactNode, createContext, useContext, useState } from "react";
-type RequestProps = TraceRow | null;
+type RequestProps = TransformedTraceRow | null;
type RequestUpdateProps = (value: any) => void | typeof noop;
diff --git a/src/client/src/components/(playground)/request/request-details.tsx b/src/client/src/components/(playground)/request/request-details.tsx
index 164d97f1..b718122a 100644
--- a/src/client/src/components/(playground)/request/request-details.tsx
+++ b/src/client/src/components/(playground)/request/request-details.tsx
@@ -1,154 +1,267 @@
import { useRequest } from "@/components/(playground)/request/request-context";
import Image from "next/image";
-import { round } from "lodash";
-import { format } from "date-fns";
-import { getRequestDetailsDisplayKeys, normalizeTrace } from "@/helpers/trace";
-import { TraceMapping, TransformedTraceRow } from "@/constants/traces";
+import { isArray, isNil, isPlainObject } from "lodash";
import {
- CalendarDays,
- Clock,
- ExternalLink,
- LucideIcon,
- PyramidIcon,
- SquareTerminal,
-} from "lucide-react";
+ CODE_ITEM_DISPLAY_KEYS,
+ getNormalizedTraceAttribute,
+ normalizeTrace,
+} from "@/helpers/trace";
+import {
+ ReverseTraceMapping,
+ TraceMapping,
+ TraceRow,
+ TransformedTraceRow,
+} from "@/constants/traces";
+import { ExternalLink, X } from "lucide-react";
import {
Sheet,
SheetContent,
SheetHeader,
SheetTitle,
} from "@/components/ui/sheet";
-import { JsonViewer } from "@textea/json-viewer";
+import { objectEntries, objectKeys } from "@/utils/object";
+import { Button } from "@/components/ui/button";
+import { Separator } from "@/components/ui/separator";
+import { Badge } from "@/components/ui/badge";
+import { ValueOf } from "@/utils/types";
+import JsonViewer from "@/components/common/json-viewer";
+import { useCallback, useEffect, useState } from "react";
+import useFetchWrapper from "@/utils/hooks/useFetchWrapper";
+import { toast } from "sonner";
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
+import HeirarchyDisplay from "./heirarchy-display";
-const TagItem = ({
- icon: IconComponent,
- title,
- value,
-}: {
- icon?: LucideIcon;
- title: string;
- value: any;
-}) => (
- <div className="flex items-center justify-center space-x-1 px-3 py-1 rounded-full text-xs bg-primary text-white font-medium">
- {IconComponent && <IconComponent className="h-3" />}
- <span>{title}</span>
- <span>{value}</span>
- </div>
-);
+const InfoPill = ({ title, value }: { title: string; value: any }) => {
+ return (
+ <Button
+ variant="outline"
+ size="default"
+ className="text-stone-500 bg-stone-300 dark:text-stone-300 dark:bg-stone-800 cursor-default px-2 py-1 h-auto overflow-hidden"
+ >
+ <span className="text-xs bg-transparent">{title}</span>
+ <Separator
+ orientation="vertical"
+ className="mx-1 h-4 bg-stone-300 dark:bg-stone-600"
+ />
+ <Badge
+ variant="secondary"
+ className="rounded-sm px-1 font-normal bg-transparent py-0 block ellipsis overflow-hidden whitespace-normal"
+ >
+ {value}
+ </Badge>
+ </Button>
+ );
+};
const CodeItem = ({ label, text }: { label: string; text: string }) => (
- <div className="flex flex-col space-y-3 mt-4">
- <span className="text-sm text-stone-500 font-medium">{label} : </span>
- <code className="text-sm inline-flex text-left items-center bg-stone-950 text-stone-200 rounded-md p-4 whitespace-pre-wrap">
- {text}
+ <div className="flex flex-col space-y-3 mt-4 group p-4 w-full">
+ <span className="text-sm text-stone-500 font-medium dark:text-stone-300">
+ {label} :
+ </span>
+ <code className="text-sm inline-flex text-left items-center bg-stone-300 text-stone-700 rounded-md p-4 group-hover:text-stone-900 cursor-pointer dark:bg-stone-800 dark:text-stone-200 dark:group-hover:text-stone-100">
+ <JsonViewer value={text} />
</code>
</div>
);
+const ContentDataItem = ({
+ dataKey,
+ dataValue,
+}: {
+ dataKey: string;
+ dataValue?: string;
+}) => (
+ <div
+ className={`grid ${
+ dataValue ? "grid-cols-2" : ""
+ } px-4 py-2 group cursor-pointer dark:bg-stone-700 dark:border-stone-800 dark:last:border-stone-800 odd:bg-stone-200/[0.4] even:bg-stone-200/[0.8] dark:odd:bg-stone-700/[0.4] dark:even:bg-stone-700/[0.8]`}
+ >
+ <div className="break-all pr-2 text-stone-500 dark:text-stone-300">
+ {dataKey}
+ </div>
+ {!(isNil(dataValue) || dataValue === "") && (
+ <div className="break-all pl-2 group-hover:text-stone-950 dark:group-hover:text-stone-100">
+ <JsonViewer value={dataValue} />
+ </div>
+ )}
+ </div>
+);
+
+const TabsContentData = ({
+ dataKey,
+ dataValue,
+}: {
+ dataKey: string;
+ dataValue: Record<string, any> | string[] | Record<string, any>[];
+}) => {
+ return isArray(dataValue)
+ ? dataValue.map((datumValue, index) => (
+ <section key={`${dataKey}-${index}`}>
+ {index !== 0 ? (
+ <div className="py-1 px-2 dark:bg-stone-800"></div>
+ ) : null}
+ {isPlainObject(datumValue) ? (
+ objectEntries(datumValue).map(([key, value]) => (
+ <ContentDataItem
+ key={key.toString()}
+ dataKey={key.toString()}
+ dataValue={value}
+ />
+ ))
+ ) : (
+ <ContentDataItem dataKey={datumValue} />
+ )}
+ </section>
+ ))
+ : objectEntries(dataValue).map(([key, value]) => (
+ <ContentDataItem key={key} dataKey={key} dataValue={value} />
+ ));
+};
+
export default function RequestDetails() {
+ const [isOpen, setIsOpen] = useState(false);
const [request, updateRequest] = useRequest();
+ const { data, fireRequest, isLoading } = useFetchWrapper();
- const onClose = (open: boolean) => {
- if (!open) updateRequest(null);
+ const onClose = () => {
+ updateRequest(null);
+ setIsOpen(false);
};
- if (!request) return null;
+ const fetchData = useCallback(async () => {
+ setIsOpen(true);
+ fireRequest({
+ requestType: "GET",
+ url: `/api/metrics/request/span/${request?.spanId}`,
+ failureCb: (err?: string) => {
+ toast.error(err || `Cannot connect to server!`, {
+ id: "request-page",
+ });
+ },
+ });
+ }, [request]);
- const normalizedItem: TransformedTraceRow = normalizeTrace(request);
- const isException = normalizedItem.statusCode === "STATUS_CODE_ERROR";
- const displayKeys = getRequestDetailsDisplayKeys(
- normalizedItem.type,
- isException
- );
+ useEffect(() => {
+ if (request?.spanId) {
+ fetchData();
+ }
+ }, [fetchData, request]);
+
+ useEffect(() => {
+ if (isOpen) {
+ // Pushing the change to the end of the call stack
+ const timer = setTimeout(() => {
+ document.body.style.pointerEvents = "";
+ }, 0);
+
+ return () => clearTimeout(timer);
+ } else {
+ document.body.style.pointerEvents = "auto";
+ }
+ }, [isOpen]);
- const date = new Date(`${normalizedItem.time}Z`);
+ const isFetchingData =
+ !(data as { record?: TraceRow })?.record?.TraceId || isLoading;
+
+ const normalizedItem: TransformedTraceRow | null = isFetchingData
+ ? null
+ : normalizeTrace((data as { record: TraceRow }).record);
+
+ const tabKeys: string[] = [];
+ const reducedData = isFetchingData
+ ? { arrays: [], objects: [], values: [] }
+ : objectEntries((data as { record: TraceRow }).record || {}).reduce(
+ (
+ acc: {
+ arrays: [keyof TraceRow, ValueOf<TraceRow>][];
+ objects: [keyof TraceRow, ValueOf<TraceRow>][];
+ values: [keyof TraceRow, ValueOf<TraceRow>][];
+ },
+ [key, value]
+ ) => {
+ if (isPlainObject(value)) {
+ if (objectKeys(value as object).length > 0) {
+ acc.objects.push([key, value]);
+ tabKeys.push(key);
+ }
+ } else if (isArray(value)) {
+ if (value.length > 0) {
+ acc.arrays.push([key, value]);
+ tabKeys.push(key);
+ }
+ } else {
+ acc.values.push([key, value]);
+ }
+
+ return acc;
+ },
+ { arrays: [], objects: [], values: [] }
+ );
return (
- <Sheet open onOpenChange={onClose}>
- <SheetContent className="max-w-none sm:max-w-none w-1/2 bg-stone-200 dark:bg-stone-200">
- <SheetHeader>
- <SheetTitle>
- {isException ? (
- <div className="flex flex-col text-stone-800">
- <div className="flex items-center text-2xl font-bold leading-7">
- <p className="capitalize">{normalizedItem.serviceName}</p>
- </div>
- </div>
- ) : (
- <div className="flex flex-col text-stone-800">
- <div className="flex items-center text-2xl font-bold leading-7">
- <p className="capitalize">{normalizedItem.applicationName}</p>
- </div>
- <div className="flex items-center mt-3">
- <PyramidIcon size="12" />
- <p className="ml-3 text-sm leading-none">
- {normalizedItem.provider || normalizedItem.system}
- </p>
- </div>
- </div>
- )}
+ <Sheet open={isOpen}>
+ <SheetContent
+ className="max-w-none sm:max-w-none w-2/5 p-0 gap-0 flex flex-col border-l border-stone-200 dark:border-stone-800 top-[57px] h-auto"
+ displayOverlay={false}
+ displayClose={false}
+ >
+ <SheetHeader className="flex-row bg-stone-950 px-4 py-3 items-center space-y-0">
+ <SheetTitle className="text-stone-200 text-2xl font-bold leading-7 capitalize grow pr-3">
+ {isFetchingData || !normalizedItem
+ ? "..."
+ : normalizedItem.spanName}
</SheetTitle>
+ <X
+ className="text-stone-200 shrink-0 mt-0 space-y-0 cursor-pointer"
+ onClick={onClose}
+ />
</SheetHeader>
- <div className="h-full w-full flex grow pb-8">
- <div className="flex h-full w-full flex-col overflow-y-scroll">
- <div className="relative py-6 flex-1 flex flex-col gap-3">
- <div className="flex items-start flex-wrap gap-3">
- <TagItem
- icon={CalendarDays}
- title="Request Time : "
- value={format(date, "MMM do, y HH:mm:ss a")}
- />
- <TagItem
- icon={Clock}
- title="Request duration : "
- value={`${round(normalizedItem.requestDuration, 4)}s`}
- />
- <TagItem
- icon={SquareTerminal}
- title="Status Code : "
- value={normalizedItem.statusCode}
- />
- {displayKeys.map(
- (keyItem, index) =>
- normalizedItem[keyItem] && (
- <TagItem
- key={`${keyItem}-${index}`}
- icon={TraceMapping[keyItem].icon}
- title={`${TraceMapping[keyItem].label} : `}
- value={normalizedItem[keyItem]}
- />
- )
- )}
- </div>
-
- {/* Prompts */}
- {normalizedItem.prompt && (
- <CodeItem
- label={TraceMapping["prompt"].label}
- text={normalizedItem.prompt}
- />
- )}
- {normalizedItem.revisedPrompt && (
- <CodeItem
- label={TraceMapping["revisedPrompt"].label}
- text={normalizedItem.revisedPrompt}
- />
- )}
- {normalizedItem.response && (
- <CodeItem
- label={TraceMapping["response"].label}
- text={normalizedItem.response}
- />
+ {isFetchingData || !normalizedItem ? (
+ <div className="flex flex-col items-center justify-center h-full text-3xl">
+ ...
+ </div>
+ ) : (
+ <div className="flex flex-col gap-0 overflow-y-scroll bg-stone-100 dark:bg-stone-900 grow pb-4">
+ <div className="flex items-start flex-wrap gap-1 p-4 bg-stone-200 dark:bg-stone-100/[0.15]">
+ {reducedData.values.map(([key, value]) => {
+ const reverseKey = ReverseTraceMapping[key];
+ const normalizedValue = `${
+ reverseKey ? TraceMapping[reverseKey].valuePrefix || "" : ""
+ }${
+ reverseKey
+ ? getNormalizedTraceAttribute(reverseKey, value)
+ : value
+ }${
+ reverseKey ? TraceMapping[reverseKey].valueSuffix || "" : ""
+ }`;
+ return (
+ !isNil(value) &&
+ value.toString().length > 0 && (
+ <InfoPill
+ key={key}
+ title={reverseKey ? TraceMapping[reverseKey].label : key}
+ value={normalizedValue}
+ />
+ )
+ );
+ })}
+ {CODE_ITEM_DISPLAY_KEYS.map(
+ (key) =>
+ normalizedItem[key] && (
+ <CodeItem
+ key={key}
+ label={TraceMapping[key].label}
+ text={normalizedItem[key]}
+ />
+ )
)}
- {/* Prompts */}
-
{/* Image */}
{normalizedItem.image && normalizedItem.imageSize && (
<a
href={normalizedItem.image}
target="_blank"
rel="noopener noreferrer"
- className="flex items-center justify-center aspect-h-1 aspect-w-1 w-full overflow-hidden rounded-md bg-stone-100 lg:aspect-none lg:h-80 mt-4 group relative p-4 text-center text-stone-500"
+ className="flex items-center justify-center aspect-h-1 aspect-w-1 w-full overflow-hidden rounded-md bg-stone-100 lg:aspect-none lg:h-80 mt-4 group relative p-4 text-center text-stone-500 shrink-0"
>
<Image
src={normalizedItem.image}
@@ -160,74 +273,60 @@ export default function RequestDetails() {
10
)}
/>
- <span className="flex items-center justify-center opacity-0 group-hover:opacity-100 absolute top-0 left-0 w-full h-full text-primary bg-stone-100">
+ <span className="flex items-center justify-center opacity-0 group-hover:opacity-100 absolute top-0 left-0 w-full h-full text-primary bg-stone-100/[0.1]">
<ExternalLink className="w-6 h-6 ml-2 shrink-0" />
</span>
</a>
)}
{/* Image */}
-
- {/* Vector */}
- {normalizedItem.statement && (
- <CodeItem
- label={TraceMapping["statement"].label}
- text={normalizedItem.statement}
- />
- )}
-
- {normalizedItem.whereDocument && (
- <CodeItem
- label={TraceMapping["whereDocument"].label}
- text={normalizedItem.whereDocument}
- />
- )}
-
- {normalizedItem.filter && (
- <CodeItem
- label={TraceMapping["filter"].label}
- text={normalizedItem.filter}
- />
- )}
- {/* Vector */}
-
- {/* Framework */}
- {normalizedItem.retrievalSource && (
- <CodeItem
- label={TraceMapping["retrievalSource"].label}
- text={normalizedItem.retrievalSource}
- />
- )}
- {/* Framework */}
-
- {/* Exception */}
- {normalizedItem.statusMessage && (
- <CodeItem
- label={TraceMapping["statusMessage"].label}
- text={normalizedItem.statusMessage}
- />
- )}
- {/* Exception */}
-
- {/* Request full trace to explore */}
- <div className="flex flex-col space-y-3 mt-4">
- <span className="text-sm text-stone-500 font-medium">
- Request Trace :{" "}
- </span>
- <code className="text-sm inline-flex text-left items-center bg-stone-950 text-stone-200 rounded-md p-4">
- <JsonViewer
- value={request}
- className="overflow-auto p-3 h-[400px] w-full !rounded-none"
- enableClipboard={false}
- displayDataTypes={false}
- displaySize={false}
- theme="dark"
- />
- </code>
- </div>
- {/* Request full trace to explore */}
</div>
+
+ <Tabs className="" defaultValue={tabKeys[0].toString()}>
+ <TabsList className="h-auto flex overflow-auto justify-start w-full rounded-none pt-2 bg-transparent dark:bg-transparent px-0">
+ {tabKeys.map((key) => {
+ return (
+ <TabsTrigger
+ value={key.toString()}
+ key={key.toString()}
+ className="data-[state=active]:bg-transparent dark:data-[state=active]:bg-transparent data-[state=active]:text-primary dark:data-[state=active]:text-primary data-[state=active]:border-primary dark:data-[state=active]:border-primary border-b border-transparent data-[state=active]:shadow-none rounded-none px-4"
+ >
+ {key}
+ </TabsTrigger>
+ );
+ })}
+ </TabsList>
+ {reducedData.objects.map(([key, value]) => {
+ return (
+ <TabsContent
+ value={key.toString()}
+ key={key.toString()}
+ className="mt-0"
+ >
+ <TabsContentData
+ dataKey={key}
+ dataValue={value as Record<string, any>}
+ />
+ </TabsContent>
+ );
+ })}
+ {reducedData.arrays.map(([key, value]) => {
+ return (
+ <TabsContent
+ value={key.toString()}
+ key={key.toString()}
+ className="mt-0"
+ >
+ <TabsContentData
+ dataKey={key}
+ dataValue={value as string[] | Record<string, any>[]}
+ />
+ </TabsContent>
+ );
+ })}
+ </Tabs>
</div>
- </div>
+ )}
+ <HeirarchyDisplay />
</SheetContent>
</Sheet>
);
diff --git a/src/client/src/components/(playground)/request/trace.tsx b/src/client/src/components/(playground)/request/trace.tsx
deleted file mode 100644
index 939f7f8e..00000000
--- a/src/client/src/components/(playground)/request/trace.tsx
+++ /dev/null
@@ -1,135 +0,0 @@
-import { format } from "date-fns";
-import { isNil, round } from "lodash";
-import { useRequest } from "@/components/(playground)/request/request-context";
-import { ReactNode } from "react";
-import {
- getDisplayKeysForException,
- getRequestTableDisplayKeys,
- normalizeTrace,
-} from "@/helpers/trace";
-import {
- TraceMapping,
- TraceRow,
- TransformedTraceRow,
-} from "@/constants/traces";
-import { CalendarDays, Clock, SquareTerminal } from "lucide-react";
-import ParentTrace from "./parent-trace";
-
-type RenderRowProps = {
- item: TraceRow;
- isLoading?: boolean;
-};
-
-const RowItem = ({
- containerClass = "",
- icon,
- label,
- text,
- textClass = "",
-}: {
- containerClass?: string;
- icon?: ReactNode;
- label: string;
- text: string;
- textClass?: string;
-}) => {
- return (
- <div
- className={`flex ${containerClass} shrink-0 flex-1 relative h-full items-center p-2 gap-2 overflow-hidden`}
- >
- {icon && (
- <div className="flex self-start" style={{ marginTop: "2px" }}>
- {icon}
- </div>
- )}
- <div className="flex flex-col w-full justify-center space-y-1">
- <span
- className={`leading-none text-ellipsis pb-2 overflow-hidden whitespace-nowrap ${textClass}`}
- >
- {text}
- </span>
- <span className="text-xs text-ellipsis overflow-hidden whitespace-nowrap text-stone-500 dark:text-stone-500">
- {label}
- </span>
- </div>
- </div>
- );
-};
-
-export default function Trace({ item, isLoading }: RenderRowProps) {
- const [request, updateRequest] = useRequest();
-
- const onClick = () => !isLoading && updateRequest(item);
-
- const normalizedItem: TransformedTraceRow = normalizeTrace(item);
- const isException = normalizedItem.statusCode === "STATUS_CODE_ERROR";
- const requestDisplayItems = isException
- ? getDisplayKeysForException()
- : getRequestTableDisplayKeys(normalizedItem.type);
-
- const date = new Date(`${normalizedItem.time}Z`);
-
- return (
- <div className="flex flex-col">
- <div className="flex w-full justify-between">
- <div className="flex items-center rounded-t py-1 px-3 z-0 self-start bg-stone-200 dark:bg-stone-800 text-stone-500 dark:text-stone-400 font-medium">
- <div className="flex items-center pr-3">
- <CalendarDays size="16" />
- <p className="text-xs leading-none ml-2">
- {format(date, "MMM do, y HH:mm:ss a")}
- </p>
- </div>
- <div className="flex items-center pl-3 border-l border-stone-200">
- <Clock size="16" />
- <p className="text-xs leading-none ml-2">
- {round(normalizedItem.requestDuration, 4)}s
- </p>
- </div>
- </div>
- <div className="flex items-center rounded-t py-1 px-3 z-0 self-end bg-stone-200 dark:bg-stone-800 text-stone-500 dark:text-stone-400 font-medium">
- <div className="flex items-center pr-3">
- <SquareTerminal size="16" />
- <p className="text-xs leading-none ml-2">
- {normalizedItem.statusCode}
- </p>
- </div>
- </div>
- </div>
- <div
- className={`flex items-stretch h-16 relative items-center px-3 cursor-pointer dark:text-stone-100 text-stone-950 ${
- request?.TraceId === normalizedItem.id
- ? "bg-stone-200 dark:bg-stone-950"
- : "border border-stone-200 dark:border-stone-800"
- } ${normalizedItem.parentSpanId ? "rounded-b-0" : "rounded-b"}`}
- onClick={onClick}
- >
- {requestDisplayItems.map((keyItem, index) => {
- if (!keyItem || isNil(normalizedItem[keyItem]))
- return (
- <RowItem
- key={`empty-${index}`}
- containerClass={index <= 1 ? "w-3/12" : "w-1.5/12"}
- label={""}
- text={""}
- textClass={index === 0 ? "font-medium" : "text-sm"}
- />
- );
- const IconElement = TraceMapping[keyItem].icon;
- return (
- <RowItem
- key={`${keyItem}-${index}`}
- containerClass={index <= 1 ? "w-3/12" : "w-1.5/12"}
- label={TraceMapping[keyItem].label}
- text={normalizedItem[keyItem]}
- icon={IconElement && <IconElement size="16" />}
- textClass={index === 0 ? "font-medium" : "text-sm"}
- />
- );
- })}
- </div>
- {normalizedItem.parentSpanId ? (
- <ParentTrace parentSpanId={normalizedItem.parentSpanId} />
- ) : null}
- </div>
- );
-}
diff --git a/src/client/src/components/common/json-viewer.tsx b/src/client/src/components/common/json-viewer.tsx
new file mode 100644
index 00000000..f5371863
--- /dev/null
+++ b/src/client/src/components/common/json-viewer.tsx
@@ -0,0 +1,55 @@
+import { jsonParse } from "@/utils/json";
+import {
+ JsonViewer,
+ JsonViewerProps,
+ defineEasyType,
+} from "@textea/json-viewer";
+import { isInteger } from "lodash";
+
+const integerType = defineEasyType<string>({
+ is: (value) => {
+ const changedValue = parseInt(value as string, 10);
+ return isInteger(changedValue);
+ },
+ type: "number",
+ colorKey: "base0C",
+ Renderer: (props) => parseInt(props.value, 10),
+});
+
+const objectType = defineEasyType<string>({
+ is: (value) => {
+ if (!/^\[|\{/.test(value as string)) {
+ return false;
+ }
+ return jsonParse(value as string);
+ },
+ type: "object",
+ colorKey: "base0E",
+ Renderer: (props) => props.value,
+});
+
+const booleanType = defineEasyType<string>({
+ is: (value) => {
+ return value === "true" || value === "false";
+ },
+ type: "bool",
+ colorKey: "base0E",
+ Renderer: (props) => {
+ return `${!!(props.value === "true")}`;
+ },
+});
+
+export default function JSONViewer(props: JsonViewerProps) {
+ return (
+ <JsonViewer
+ value={props.value}
+ className={`bg-transparent dark:bg-transparent text-success dark:text-success ${props.className}`}
+ enableClipboard={props.enableClipboard || true}
+ displayDataTypes={props.displayDataTypes || false}
+ displaySize={props.displaySize || false}
+ rootName={props.rootName || false}
+ valueTypes={[integerType, objectType, booleanType]}
+ maxDisplayLength={20}
+ />
+ );
+}
diff --git a/src/client/src/components/data-table/columns.tsx b/src/client/src/components/data-table/columns.tsx
new file mode 100644
index 00000000..865a2dbc
--- /dev/null
+++ b/src/client/src/components/data-table/columns.tsx
@@ -0,0 +1,12 @@
+import { ReactNode } from "react";
+
+export type Columns<T extends string, TransformedT> = Partial<
+ Record<
+ T,
+ {
+ header: () => ReactNode;
+ cell: ({ row }: { row: TransformedT }) => ReactNode;
+ enableHiding?: boolean;
+ }
+ >
+>;
diff --git a/src/client/src/components/data-table/table.tsx b/src/client/src/components/data-table/table.tsx
new file mode 100644
index 00000000..adf52dd6
--- /dev/null
+++ b/src/client/src/components/data-table/table.tsx
@@ -0,0 +1,138 @@
+import IntermediateState from "@/components/(playground)/intermediate-state";
+import { CSSProperties, ReactNode } from "react";
+import { fill } from "lodash";
+import { objectEntries } from "@/utils/object";
+import { Columns } from "./columns";
+import { noop } from "@/utils/noop";
+
+const RowWrapper = ({
+ children,
+ className = "",
+ onClick,
+ style,
+}: {
+ children: ReactNode;
+ className?: string;
+ onClick?: (item: any) => void;
+ style?: CSSProperties;
+}) => (
+ <div className={`grid w-full ${className}`} onClick={onClick} style={style}>
+ {children}
+ </div>
+);
+
+const ColumnRowItem = ({
+ children,
+ className = "",
+ style,
+}: {
+ children: ReactNode;
+ className?: string;
+ style?: CSSProperties;
+}) => {
+ return (
+ <div
+ className={` flex-shrink-0 border-b dark:border-stone-800 py-2 px-3 overflow-hidden ${className}`}
+ style={style}
+ >
+ {children}
+ </div>
+ );
+};
+
+const RenderLoader = ({
+ columns,
+ style,
+}: {
+ columns: string[];
+ style?: CSSProperties;
+}) =>
+ fill(new Array(5), 1).map((_, index) => (
+ <RowWrapper
+ key={`loader-row-${index}`}
+ className={`animate-pulse`}
+ style={style}
+ >
+ {columns.map((_, index) => (
+ <ColumnRowItem
+ key={`loader-column-${index}`}
+ className="group-last-of-type:border-b-0 cursor-pointer py-4"
+ >
+ <div className="h-2 w-2/3 bg-stone-200 rounded" />
+ </ColumnRowItem>
+ ))}
+ </RowWrapper>
+ ));
+
+export default function Table({
+ columns,
+ data,
+ isFetched,
+ isLoading,
+ visibilityColumns,
+ onClick,
+}: {
+ columns: Columns<any, any>;
+ data: any[];
+ isFetched: boolean;
+ isLoading: boolean;
+ visibilityColumns: Record<string, boolean>;
+ onClick?: (item: any) => void;
+}) {
+ const visibleColumns = objectEntries(visibilityColumns)
+ .filter(([, value]) => value)
+ .map(([keys]) => keys);
+ const noData = !data?.length && !isLoading;
+
+ const style: CSSProperties = {
+ gridTemplateColumns: `repeat(${visibleColumns.length}, minmax(0, 1fr))`,
+ };
+
+ const onClickHandler = (rowItem: any) =>
+ typeof onClick === "function" ? onClick(rowItem) : noop();
+ return (
+ <div className="flex flex-col w-full overflow-auto border dark:border-stone-800 rounded-md">
+ <RowWrapper className={`sticky top-0 z-10`} style={style}>
+ {visibleColumns.map((column) => (
+ <ColumnRowItem
+ key={column}
+ className={`group-last-of-type:border-b-0 bg-stone-100 text-stone-500 dark:bg-stone-900 dark:text-stone-500 text-sm`}
+ >
+ {columns[column]?.header()}
+ </ColumnRowItem>
+ ))}
+ </RowWrapper>
+ <div
+ className={`flex flex-col w-full ${
+ isFetched && isLoading ? "animate-pulse" : ""
+ }`}
+ >
+ {(!isFetched || (isLoading && !data?.length)) && (
+ <RenderLoader columns={visibleColumns} style={style} />
+ )}
+ {data?.map((rowItem) => {
+ return (
+ <RowWrapper
+ key={rowItem.id}
+ className={`group text-sm text-stone-700 dark:text-stone-300`}
+ onClick={() => onClickHandler(rowItem)}
+ style={style}
+ >
+ {visibleColumns.map((column) => (
+ <ColumnRowItem
+ key={`${column}-${rowItem.id}`}
+ className={`group-last-of-type:border-b-0 group-hover:bg-stone-100 dark:group-hover:bg-stone-800 cursor-pointer`}
+ >
+ {columns[column]?.cell({
+ row: rowItem,
+ })}
+ </ColumnRowItem>
+ ))}
+ </RowWrapper>
+ );
+ })}
+ {noData && <IntermediateState type="nodata" />}
+ </div>
+ </div>
+ );
+}
diff --git a/src/client/src/components/ui/accordion.tsx b/src/client/src/components/ui/accordion.tsx
new file mode 100644
index 00000000..24c788c2
--- /dev/null
+++ b/src/client/src/components/ui/accordion.tsx
@@ -0,0 +1,58 @@
+"use client"
+
+import * as React from "react"
+import * as AccordionPrimitive from "@radix-ui/react-accordion"
+import { ChevronDown } from "lucide-react"
+
+import { cn } from "@/lib/utils"
+
+const Accordion = AccordionPrimitive.Root
+
+const AccordionItem = React.forwardRef<
+ React.ElementRef<typeof AccordionPrimitive.Item>,
+ React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Item>
+>(({ className, ...props }, ref) => (
+ <AccordionPrimitive.Item
+ ref={ref}
+ className={cn("border-b", className)}
+ {...props}
+ />
+))
+AccordionItem.displayName = "AccordionItem"
+
+const AccordionTrigger = React.forwardRef<
+ React.ElementRef<typeof AccordionPrimitive.Trigger>,
+ React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Trigger>
+>(({ className, children, ...props }, ref) => (
+ <AccordionPrimitive.Header className="flex">
+ <AccordionPrimitive.Trigger
+ ref={ref}
+ className={cn(
+ "flex flex-1 items-center justify-between py-4 font-medium transition-all hover:underline [&[data-state=open]>svg]:rotate-180",
+ className
+ )}
+ {...props}
+ >
+ {children}
+ <ChevronDown className="h-4 w-4 shrink-0 transition-transform duration-200" />
+ </AccordionPrimitive.Trigger>
+ </AccordionPrimitive.Header>
+))
+AccordionTrigger.displayName = AccordionPrimitive.Trigger.displayName
+
+const AccordionContent = React.forwardRef<
+ React.ElementRef<typeof AccordionPrimitive.Content>,
+ React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Content>
+>(({ className, children, ...props }, ref) => (
+ <AccordionPrimitive.Content
+ ref={ref}
+ className="overflow-hidden text-sm transition-all data-[state=closed]:animate-accordion-up data-[state=open]:animate-accordion-down"
+ {...props}
+ >
+ <div className={cn("pb-4 pt-0", className)}>{children}</div>
+ </AccordionPrimitive.Content>
+))
+
+AccordionContent.displayName = AccordionPrimitive.Content.displayName
+
+export { Accordion, AccordionItem, AccordionTrigger, AccordionContent }
diff --git a/src/client/src/components/ui/date-range-picker.tsx b/src/client/src/components/ui/date-range-picker.tsx
index cb70e36e..2ef8d057 100644
--- a/src/client/src/components/ui/date-range-picker.tsx
+++ b/src/client/src/components/ui/date-range-picker.tsx
@@ -42,7 +42,7 @@ export function DatePickerWithRange({
id="date"
variant={"outline"}
className={cn(
- "justify-start text-left font-normal dark:bg-stone-900 dark:text-stone-100 text-xs",
+ "justify-start text-left font-normal dark:bg-stone-900 dark:text-stone-100 text-xs px-2 py-1 self-start h-auto",
!date && "text-muted-foreground"
)}
>
diff --git a/src/client/src/components/ui/sheet.tsx b/src/client/src/components/ui/sheet.tsx
index 1929c2a1..b4c957e2 100644
--- a/src/client/src/components/ui/sheet.tsx
+++ b/src/client/src/components/ui/sheet.tsx
@@ -1,140 +1,160 @@
-"use client"
+"use client";
-import * as React from "react"
-import * as SheetPrimitive from "@radix-ui/react-dialog"
-import { cva, type VariantProps } from "class-variance-authority"
-import { X } from "lucide-react"
+import * as React from "react";
+import * as SheetPrimitive from "@radix-ui/react-dialog";
+import { cva, type VariantProps } from "class-variance-authority";
+import { X } from "lucide-react";
-import { cn } from "@/lib/utils"
+import { cn } from "@/lib/utils";
-const Sheet = SheetPrimitive.Root
+const Sheet = SheetPrimitive.Root;
-const SheetTrigger = SheetPrimitive.Trigger
+const SheetTrigger = SheetPrimitive.Trigger;
-const SheetClose = SheetPrimitive.Close
+const SheetClose = SheetPrimitive.Close;
-const SheetPortal = SheetPrimitive.Portal
+const SheetPortal = SheetPrimitive.Portal;
const SheetOverlay = React.forwardRef<
- React.ElementRef<typeof SheetPrimitive.Overlay>,
- React.ComponentPropsWithoutRef<typeof SheetPrimitive.Overlay>
+ React.ElementRef<typeof SheetPrimitive.Overlay>,
+ React.ComponentPropsWithoutRef<typeof SheetPrimitive.Overlay>
>(({ className, ...props }, ref) => (
- <SheetPrimitive.Overlay
- className={cn(
- "fixed inset-0 z-50 bg-black/80 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",
- className
- )}
- {...props}
- ref={ref}
- />
-))
-SheetOverlay.displayName = SheetPrimitive.Overlay.displayName
+ <SheetPrimitive.Overlay
+ className={cn(
+ "fixed inset-0 z-50 bg-black/80 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",
+ className
+ )}
+ {...props}
+ ref={ref}
+ />
+));
+SheetOverlay.displayName = SheetPrimitive.Overlay.displayName;
const sheetVariants = cva(
- "fixed z-50 gap-4 bg-white p-6 shadow-lg transition ease-in-out data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:duration-300 data-[state=open]:duration-500 dark:bg-stone-950",
- {
- variants: {
- side: {
- top: "inset-x-0 top-0 border-b data-[state=closed]:slide-out-to-top data-[state=open]:slide-in-from-top",
- bottom:
- "inset-x-0 bottom-0 border-t data-[state=closed]:slide-out-to-bottom data-[state=open]:slide-in-from-bottom",
- left: "inset-y-0 left-0 h-full w-3/4 border-r data-[state=closed]:slide-out-to-left data-[state=open]:slide-in-from-left sm:max-w-sm",
- right:
- "inset-y-0 right-0 h-full w-3/4 border-l data-[state=closed]:slide-out-to-right data-[state=open]:slide-in-from-right sm:max-w-sm",
- },
- },
- defaultVariants: {
- side: "right",
- },
- }
-)
+ "fixed z-50 gap-4 bg-white p-6 shadow-lg transition ease-in-out data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:duration-300 data-[state=open]:duration-500 dark:bg-stone-950",
+ {
+ variants: {
+ side: {
+ top: "inset-x-0 top-0 border-b data-[state=closed]:slide-out-to-top data-[state=open]:slide-in-from-top",
+ bottom:
+ "inset-x-0 bottom-0 border-t data-[state=closed]:slide-out-to-bottom data-[state=open]:slide-in-from-bottom",
+ left: "inset-y-0 left-0 h-full w-3/4 border-r data-[state=closed]:slide-out-to-left data-[state=open]:slide-in-from-left sm:max-w-sm",
+ right:
+ "inset-y-0 right-0 h-full w-3/4 border-l data-[state=closed]:slide-out-to-right data-[state=open]:slide-in-from-right sm:max-w-sm",
+ },
+ },
+ defaultVariants: {
+ side: "right",
+ },
+ }
+);
interface SheetContentProps
- extends React.ComponentPropsWithoutRef<typeof SheetPrimitive.Content>,
- VariantProps<typeof sheetVariants> {}
+ extends React.ComponentPropsWithoutRef<typeof SheetPrimitive.Content>,
+ VariantProps<typeof sheetVariants> {
+ displayOverlay?: boolean;
+ displayClose?: boolean;
+}
const SheetContent = React.forwardRef<
- React.ElementRef<typeof SheetPrimitive.Content>,
- SheetContentProps
->(({ side = "right", className, children, ...props }, ref) => (
- <SheetPortal>
- <SheetOverlay />
- <SheetPrimitive.Content
- ref={ref}
- className={cn(sheetVariants({ side }), className)}
- {...props}
- >
- {children}
- <SheetPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-white transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-stone-950 focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-stone-100 dark:ring-offset-stone-950 dark:focus:ring-stone-300 dark:data-[state=open]:bg-stone-800">
- <X className="h-4 w-4" />
- <span className="sr-only">Close</span>
- </SheetPrimitive.Close>
- </SheetPrimitive.Content>
- </SheetPortal>
-))
-SheetContent.displayName = SheetPrimitive.Content.displayName
+ React.ElementRef<typeof SheetPrimitive.Content>,
+ SheetContentProps
+>(
+ (
+ {
+ side = "right",
+ className,
+ children,
+ displayOverlay = true,
+ displayClose = true,
+ ...props
+ },
+ ref
+ ) => (
+ <SheetPortal>
+ {displayOverlay && <SheetOverlay />}
+ <SheetPrimitive.Content
+ ref={ref}
+ className={cn(sheetVariants({ side }), className)}
+ {...props}
+ >
+ {children}
+ {displayClose && (
+ <SheetPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-white transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-stone-950 focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-stone-100 dark:ring-offset-stone-950 dark:focus:ring-stone-300 dark:data-[state=open]:bg-stone-800">
+ <X className="h-4 w-4" />
+ <span className="sr-only">Close</span>
+ </SheetPrimitive.Close>
+ )}
+ </SheetPrimitive.Content>
+ </SheetPortal>
+ )
+);
+SheetContent.displayName = SheetPrimitive.Content.displayName;
const SheetHeader = ({
- className,
- ...props
+ className,
+ ...props
}: React.HTMLAttributes<HTMLDivElement>) => (
- <div
- className={cn(
- "flex flex-col space-y-2 text-center sm:text-left",
- className
- )}
- {...props}
- />
-)
-SheetHeader.displayName = "SheetHeader"
+ <div
+ className={cn(
+ "flex flex-col space-y-2 text-center sm:text-left",
+ className
+ )}
+ {...props}
+ />
+);
+SheetHeader.displayName = "SheetHeader";
const SheetFooter = ({
- className,
- ...props
+ className,
+ ...props
}: React.HTMLAttributes<HTMLDivElement>) => (
- <div
- className={cn(
- "flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2",
- className
- )}
- {...props}
- />
-)
-SheetFooter.displayName = "SheetFooter"
+ <div
+ className={cn(
+ "flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2",
+ className
+ )}
+ {...props}
+ />
+);
+SheetFooter.displayName = "SheetFooter";
const SheetTitle = React.forwardRef<
- React.ElementRef<typeof SheetPrimitive.Title>,
- React.ComponentPropsWithoutRef<typeof SheetPrimitive.Title>
+ React.ElementRef<typeof SheetPrimitive.Title>,
+ React.ComponentPropsWithoutRef<typeof SheetPrimitive.Title>
>(({ className, ...props }, ref) => (
- <SheetPrimitive.Title
- ref={ref}
- className={cn("text-lg font-semibold text-stone-950 dark:text-stone-50", className)}
- {...props}
- />
-))
-SheetTitle.displayName = SheetPrimitive.Title.displayName
+ <SheetPrimitive.Title
+ ref={ref}
+ className={cn(
+ "text-lg font-semibold text-stone-950 dark:text-stone-50",
+ className
+ )}
+ {...props}
+ />
+));
+SheetTitle.displayName = SheetPrimitive.Title.displayName;
const SheetDescription = React.forwardRef<
- React.ElementRef<typeof SheetPrimitive.Description>,
- React.ComponentPropsWithoutRef<typeof SheetPrimitive.Description>
+ React.ElementRef<typeof SheetPrimitive.Description>,
+ React.ComponentPropsWithoutRef<typeof SheetPrimitive.Description>
>(({ className, ...props }, ref) => (
- <SheetPrimitive.Description
- ref={ref}
- className={cn("text-sm text-stone-500 dark:text-stone-400", className)}
- {...props}
- />
-))
-SheetDescription.displayName = SheetPrimitive.Description.displayName
+ <SheetPrimitive.Description
+ ref={ref}
+ className={cn("text-sm text-stone-500 dark:text-stone-400", className)}
+ {...props}
+ />
+));
+SheetDescription.displayName = SheetPrimitive.Description.displayName;
export {
- Sheet,
- SheetPortal,
- SheetOverlay,
- SheetTrigger,
- SheetClose,
- SheetContent,
- SheetHeader,
- SheetFooter,
- SheetTitle,
- SheetDescription,
-}
+ Sheet,
+ SheetPortal,
+ SheetOverlay,
+ SheetTrigger,
+ SheetClose,
+ SheetContent,
+ SheetHeader,
+ SheetFooter,
+ SheetTitle,
+ SheetDescription,
+};
diff --git a/src/client/src/constants/traces.ts b/src/client/src/constants/traces.ts
index a3f6340a..e16e971c 100644
--- a/src/client/src/constants/traces.ts
+++ b/src/client/src/constants/traces.ts
@@ -13,6 +13,7 @@ import {
DoorClosed,
Factory,
FileAudio2,
+ FileCog,
FileStack,
Fingerprint,
ImageIcon,
@@ -26,14 +27,75 @@ import {
TicketCheck,
TicketPlus,
} from "lucide-react";
+import { objectKeys } from "@/utils/object";
+import { isArray } from "lodash";
-export const SpanAttributesGenAIPrefix = "gen_ai";
-export const SpanAttributesDBPrefix = "db";
+const SpanAttributesGenAIPrefix = "gen_ai";
+const SpanAttributesDBPrefix = "db";
-export type TraceKeyType = "string" | "integer" | "float" | "round";
+type TraceKeyType = "string" | "integer" | "float" | "round" | "date";
+
+export type TraceMappingKeyType =
+ | "time"
+ | "requestDuration"
+ | "id"
+ | "parentSpanId"
+ | "statusCode"
+ | "serviceName"
+ | "statusMessage"
+ | "spanId"
+ | "spanName"
+ | "exceptionType"
+ | "deploymentType"
+ | "provider"
+ | "applicationName"
+ | "environment"
+ | "type"
+ | "endpoint"
+ | "temperature"
+ | "cost"
+ | "promptTokens"
+ | "completionTokens"
+ | "totalTokens"
+ | "maxTokens"
+ | "audioVoice"
+ | "audioFormat"
+ | "audioSpeed"
+ | "image"
+ | "imageSize"
+ | "imageQuality"
+ | "imageStyle"
+ | "model"
+ | "prompt"
+ | "finishReason"
+ | "response"
+ | "randomSeed"
+ | "revisedPrompt"
+ | "embeddingFormat"
+ | "embeddingDimension"
+ | "trainingFile"
+ | "validationFile"
+ | "fineTuneBatchSize"
+ | "learningRateMultiplier"
+ | "fineTuneNEpochs"
+ | "fineTuneModelSuffix"
+ | "finetuneJobStatus"
+ | "operation"
+ | "system"
+ | "documentsCount"
+ | "idsCount"
+ | "vectorCount"
+ | "statement"
+ | "nResults"
+ | "collectionName"
+ | "whereDocument"
+ | "filter"
+ | "owner"
+ | "repo"
+ | "retrievalSource";
export const TraceMapping: Record<
- string,
+ TraceMappingKeyType,
{
label: string;
type: TraceKeyType;
@@ -43,21 +105,24 @@ export const TraceMapping: Record<
offset?: number;
icon?: LucideIcon;
defaultValue?: string | number | boolean;
+ valuePrefix?: string;
+ valueSuffix?: string;
}
> = {
// Root Key
time: {
label: "Time",
- type: "string",
+ type: "date",
path: "Timestamp",
isRoot: true,
},
requestDuration: {
label: "Request Duration",
- type: "integer",
+ type: "float",
path: "Duration",
isRoot: true,
offset: 10e-10,
+ valueSuffix: "s",
},
id: {
@@ -87,6 +152,7 @@ export const TraceMapping: Record<
type: "string",
path: "ServiceName",
isRoot: true,
+ icon: FileCog,
},
statusMessage: {
label: "Error Message",
@@ -94,6 +160,12 @@ export const TraceMapping: Record<
path: "StatusMessage",
isRoot: true,
},
+ spanId: {
+ label: "Span Id",
+ type: "string",
+ path: "SpanId",
+ isRoot: true,
+ },
spanName: {
label: "Span Name",
type: "string",
@@ -165,6 +237,7 @@ export const TraceMapping: Record<
icon: CircleDollarSign,
offset: 10,
defaultValue: "-",
+ valuePrefix: "$",
},
promptTokens: {
@@ -285,6 +358,12 @@ export const TraceMapping: Record<
path: "request.seed",
prefix: SpanAttributesGenAIPrefix,
},
+ revisedPrompt: {
+ label: "Revised Prompt",
+ type: "string",
+ path: ["SpanAttributes", "gen_ai.content.revised_prompt"],
+ isRoot: true,
+ },
// Embedding
@@ -437,9 +516,24 @@ export const TraceMapping: Record<
},
};
-export type TraceMappingKeyType = keyof typeof TraceMapping;
+function getReverseTraceMapping(): Record<string, TraceMappingKeyType> {
+ return objectKeys(TraceMapping).reduce(
+ (acc: Record<string, TraceMappingKeyType>, key) => {
+ const path: string = isArray(TraceMapping[key].path)
+ ? (TraceMapping[key].path as string[]).join(",")
+ : (TraceMapping[key].path as string);
+ acc[path] = key;
+ return acc;
+ },
+ {}
+ );
+}
-export type TransformedTraceRow = Record<keyof typeof TraceMapping, any>;
+/**
+ * This Reverse Trace Mapping is for getting the mapping from path of a key in the trace request to the mapping key in the TraceMapping object in order to
+ */
+export const ReverseTraceMapping = getReverseTraceMapping();
+export type TransformedTraceRow = Record<TraceMappingKeyType, any>;
export const SPAN_KIND = {
SPAN_KIND_INTERNAL: "SPAN_KIND_INTERNAL", // Defines exceptions
@@ -474,3 +568,9 @@ export interface TraceRow {
Attributes: Record<string, string>;
}[];
}
+export interface TraceHeirarchySpan {
+ SpanId: string;
+ SpanName: string;
+ Duration: number;
+ children?: TraceHeirarchySpan[];
+}
diff --git a/src/client/src/helpers/trace.ts b/src/client/src/helpers/trace.ts
index e766ad4a..1ccfb97e 100644
--- a/src/client/src/helpers/trace.ts
+++ b/src/client/src/helpers/trace.ts
@@ -1,10 +1,13 @@
import {
+ TraceHeirarchySpan,
TraceMapping,
TraceMappingKeyType,
TraceRow,
TransformedTraceRow,
} from "@/constants/traces";
-import { get, round } from "lodash";
+import { objectKeys } from "@/utils/object";
+import { format } from "date-fns";
+import { find, get, round } from "lodash";
export const integerParser = (value: string, offset?: number) =>
parseInt((value || "0") as string, 10) * (offset || 1);
@@ -12,8 +15,37 @@ export const integerParser = (value: string, offset?: number) =>
export const floatParser = (value: string, offset?: number) =>
parseFloat((value || "0") as string) * (offset || 1);
+export const getNormalizedTraceAttribute = (
+ traceKey: TraceMappingKeyType,
+ traceValue: unknown
+) => {
+ if (traceValue) {
+ if (TraceMapping[traceKey].type === "integer") {
+ return integerParser(traceValue as string, TraceMapping[traceKey].offset);
+ } else if (TraceMapping[traceKey].type === "float") {
+ return floatParser(
+ (traceValue || "0") as string,
+ TraceMapping[traceKey].offset
+ ).toFixed(10);
+ } else if (TraceMapping[traceKey].type === "round") {
+ return round(traceValue as number, TraceMapping[traceKey].offset).toFixed(
+ 10
+ );
+ } else if (TraceMapping[traceKey].type === "date") {
+ const date = new Date(
+ `${traceValue}${(traceValue as string).endsWith("Z") ? "" : "Z"}`
+ );
+ return format(date, "MMM do, y HH:mm:ss a");
+ } else {
+ return traceValue;
+ }
+ } else {
+ return TraceMapping[traceKey].defaultValue;
+ }
+};
+
export const normalizeTrace = (item: TraceRow): TransformedTraceRow => {
- return Object.keys(TraceMapping).reduce(
+ return objectKeys(TraceMapping).reduce(
(acc: TransformedTraceRow, traceKey: TraceMappingKeyType) => {
let value: unknown;
if (TraceMapping[traceKey].isRoot) {
@@ -22,32 +54,10 @@ export const normalizeTrace = (item: TraceRow): TransformedTraceRow => {
value = get(item.SpanAttributes, getTraceMappingKeyFullPath(traceKey));
}
- if (value) {
- if (TraceMapping[traceKey].type === "integer") {
- acc[traceKey] = integerParser(
- value as string,
- TraceMapping[traceKey].offset
- );
- } else if (TraceMapping[traceKey].type === "float") {
- acc[traceKey] = floatParser(
- (value || "0") as string,
- TraceMapping[traceKey].offset
- ).toFixed(10);
- } else if (TraceMapping[traceKey].type === "round") {
- acc[traceKey] = round(
- value as number,
- TraceMapping[traceKey].offset
- ).toFixed(10);
- } else {
- acc[traceKey] = value;
- }
- } else {
- acc[traceKey] = TraceMapping[traceKey].defaultValue;
- }
-
+ acc[traceKey] = getNormalizedTraceAttribute(traceKey, value);
return acc;
},
- {}
+ {} as TransformedTraceRow
);
};
@@ -98,71 +108,60 @@ export const getTraceMappingKeyFullPath = (
return returnString;
};
-export const getRequestTableDisplayKeys = (
- type: string
-): TraceMappingKeyType[] => {
- switch (type) {
- case "vectordb":
- return [
- "applicationName",
- "system",
- "operation",
- "documentsCount",
- "idsCount",
- "vectorCount",
- ];
- case "framework":
- return ["applicationName", "provider", "endpoint", "owner", "repo"];
- default:
- return [
- "applicationName",
- "provider",
- "model",
- "cost",
- "promptTokens",
- "totalTokens",
- ];
- }
-};
+export const CODE_ITEM_DISPLAY_KEYS: TraceMappingKeyType[] = [
+ "prompt",
+ "revisedPrompt",
+ "response",
+ /* Vector */
+ "statement",
+ "whereDocument",
+ "filter",
+ /* Framework */
+ "retrievalSource",
+ /* Exception */
+ "statusMessage"
+];
+
+export const buildHierarchy = (data: any[]) => {
+ // Create a map for quick lookup of nodes by SpanId
+ const nodeMap = new Map();
+ data.forEach((item) => {
+ nodeMap.set(item.SpanId, { ...item, children: [] });
+ });
+
+ let root = null;
-export const getDisplayKeysForException = (): TraceMappingKeyType[] => {
- return ["serviceName", "spanName", "deploymentType", "exceptionType"];
+ // Build the hierarchy
+ data.forEach((item) => {
+ const node = nodeMap.get(item.SpanId);
+ if (item.ParentSpanId === "") {
+ // Root node found
+ root = node;
+ } else if (nodeMap.has(item.ParentSpanId)) {
+ // Link the node to its parent
+ const parent = nodeMap.get(item.ParentSpanId);
+ parent.children.push(node);
+ }
+ });
+
+ return root; // Returns the hierarchical tree
};
-export const getRequestDetailsDisplayKeys = (
- type: string,
- isException?: boolean
-): TraceMappingKeyType[] => {
- let keys: TraceMappingKeyType[] = isException
- ? getDisplayKeysForException()
- : getRequestTableDisplayKeys(type);
- if (isException) {
- return keys.filter((i) => !["serviceName"].includes(i));
+export function findSpanInHierarchyLodash(
+ hierarchy: TraceHeirarchySpan,
+ targetSpanId: string
+): TraceHeirarchySpan | undefined {
+ // Check current span
+ if (hierarchy.SpanId === targetSpanId) {
+ return hierarchy;
}
- switch (type) {
- case "vectordb":
- keys = keys.concat(["environment", "type", "nResults", "endpoint"]);
- break;
- case "framework":
- keys = keys.concat(["environment", "type"]);
- break;
- default:
- keys = keys.concat([
- "environment",
- "type",
- "audioVoice",
- "audioFormat",
- "audioSpeed",
- "imageSize",
- "imageQuality",
- "imageStyle",
- "endpoint",
- ]);
- break;
+ // Search in children if they exist
+ if (hierarchy.children?.length) {
+ return find(hierarchy.children, (child) => {
+ return findSpanInHierarchyLodash(child, targetSpanId);
+ }) as TraceHeirarchySpan | undefined;
}
- return keys.filter(
- (i) => !["applicationName", "provider", "system"].includes(i)
- );
-};
+ return undefined;
+}
diff --git a/src/client/src/lib/platform/request.ts b/src/client/src/lib/platform/request.ts
index f6a08565..95eaac87 100644
--- a/src/client/src/lib/platform/request.ts
+++ b/src/client/src/lib/platform/request.ts
@@ -1,5 +1,5 @@
import { MetricParams, dataCollector, OTEL_TRACES_TABLE_NAME } from "./common";
-import { getTraceMappingKeyFullPath } from "@/helpers/trace";
+import { buildHierarchy, getTraceMappingKeyFullPath } from "@/helpers/trace";
import {
dateTruncGroupingLogic,
getFilterPreviousParams,
@@ -165,13 +165,91 @@ export async function getRequests(params: MetricParams) {
};
}
-export async function getRequestViaParentSpanId(parentSpanId: string) {
+export async function getRequestViaSpanId(spanId: string) {
const query = `SELECT * FROM ${OTEL_TRACES_TABLE_NAME}
- WHERE SpanId='${parentSpanId}'`;
+ WHERE SpanId='${spanId}'`;
const { data, err } = await dataCollector({ query });
return {
err,
- record: data,
+ record: (data as unknown[])?.[0],
+ };
+}
+
+export async function getRequestViaTraceId(traceId: string) {
+ const query = `SELECT * FROM ${OTEL_TRACES_TABLE_NAME} WHERE ${getTraceMappingKeyFullPath(
+ "id"
+ )}='${traceId}'`;
+
+ const { data, err } = await dataCollector({ query });
+ return {
+ err,
+ record: (data as unknown[])?.[0],
+ };
+}
+
+export async function getHeirarchyViaSpanId(spanId: string) {
+ const commonQuery = (
+ dir: "upward" | "downward",
+ id: string
+ ) => `WITH RECURSIVE trace_hierarchy AS (
+ SELECT
+ ${getTraceMappingKeyFullPath("id")},
+ ${getTraceMappingKeyFullPath("parentSpanId")},
+ ${getTraceMappingKeyFullPath("spanId")},
+ ${getTraceMappingKeyFullPath("spanName")},
+ ${getTraceMappingKeyFullPath("requestDuration")},
+ 0 AS level
+ FROM
+ ${OTEL_TRACES_TABLE_NAME}
+ WHERE
+ SpanId = '${id}' -- Starting SpanId
+
+ UNION ALL
+
+ SELECT
+ ot.${getTraceMappingKeyFullPath("id")},
+ ot.${getTraceMappingKeyFullPath("parentSpanId")},
+ ot.${getTraceMappingKeyFullPath("spanId")},
+ ot.${getTraceMappingKeyFullPath("spanName")},
+ ot.${getTraceMappingKeyFullPath("requestDuration")},
+ th.level + 1 AS level
+ FROM
+ ${OTEL_TRACES_TABLE_NAME} ot
+ INNER JOIN
+ trace_hierarchy th
+ ON
+ ${
+ dir === "upward"
+ ? `ot.${getTraceMappingKeyFullPath(
+ "spanId"
+ )} = th.${getTraceMappingKeyFullPath("parentSpanId")}`
+ : `ot.${getTraceMappingKeyFullPath(
+ "parentSpanId"
+ )} = th.${getTraceMappingKeyFullPath("spanId")}`
+ }
+ )
+ SELECT *
+ FROM trace_hierarchy
+ ORDER BY level DESC;`;
+
+ const { data: upwardData, err: upwardErr } = await dataCollector({
+ query: commonQuery("upward", spanId),
+ });
+
+ if ((upwardData as any[])?.[0]?.SpanId) {
+ const { data: downwardData, err: downwardErr } = await dataCollector({
+ query: commonQuery("downward", (upwardData as any[])?.[0]?.SpanId),
+ });
+
+ return {
+ err: upwardErr || downwardErr,
+ record: buildHierarchy(downwardData as any[]),
+ };
+ }
+
+ return {
+ err: "Error in fetching heirarchy",
+ record: [],
};
}
diff --git a/src/client/src/selectors/dashboard.ts b/src/client/src/selectors/dashboard.ts
deleted file mode 100644
index d0fbdc06..00000000
--- a/src/client/src/selectors/dashboard.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { RootStore } from "@/store";
-
-export const getDashboardType = (state: RootStore) => state.dashboard.type;
-
-export const setDashboardType = (state: RootStore) => state.dashboard.setType;
diff --git a/src/client/src/selectors/page.ts b/src/client/src/selectors/page.ts
new file mode 100644
index 00000000..20d69bfc
--- /dev/null
+++ b/src/client/src/selectors/page.ts
@@ -0,0 +1,13 @@
+import { RootStore } from "@/store";
+import { PAGE, REQUEST_VISIBILITY_COLUMNS } from "@/store/page";
+
+export const getDashboardType = (state: RootStore) => state.page.dashboard.type;
+
+export const getVisibilityColumnsOfPage = (state: RootStore, pageName: PAGE) =>
+ (
+ state.page[pageName] as {
+ visibilityColumns: Partial<REQUEST_VISIBILITY_COLUMNS>;
+ }
+ ).visibilityColumns;
+
+export const setPageData = (state: RootStore) => state.page.setData;
diff --git a/src/client/src/store/dashboard.ts b/src/client/src/store/dashboard.ts
deleted file mode 100644
index d64453c8..00000000
--- a/src/client/src/store/dashboard.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-"use client";
-import { ValueOf } from "@/utils/types";
-import { lens } from "@dhmk/zustand-lens";
-
-export const DASHBOARD_TYPE_OBJECT: Record<"llm" | "vector" | "gpu", string> = {
- llm: "llm",
- vector: "vector",
- gpu: "gpu",
-};
-
-export type DASHBOARD_TYPE = ValueOf<typeof DASHBOARD_TYPE_OBJECT>;
-
-export type DashboardStore = {
- type?: DASHBOARD_TYPE;
- setType: (t: DASHBOARD_TYPE) => void;
-};
-
-export const dashboardStoreSlice: DashboardStore = lens((setStore) => ({
- type: DASHBOARD_TYPE_OBJECT.llm,
- setType: (type) =>
- setStore(() => ({
- type,
- })),
-}));
diff --git a/src/client/src/store/filter.ts b/src/client/src/store/filter.ts
index 79ccb837..8410c476 100644
--- a/src/client/src/store/filter.ts
+++ b/src/client/src/store/filter.ts
@@ -26,7 +26,7 @@ export const TIME_RANGE_TYPE: Record<
export const DEFAULT_TIME_RANGE = "24H";
-const DEFAULT_LIMIT = 10;
+const DEFAULT_LIMIT = 25;
const DEFAULT_SORTING: FilterSorting = {
type: "Timestamp",
@@ -151,7 +151,10 @@ export const filterStoreSlice: FilterStore = lens((setStore, getStore) => ({
setStore({
details: {
...merge(getStore().details, object),
- selectedConfig: resetConfig ? {} : getStore().details.selectedConfig,
+ selectedConfig:
+ resetConfig || extraParams?.clearFilter
+ ? {}
+ : getStore().details.selectedConfig,
},
config: resetConfig ? undefined : getStore().config,
});
diff --git a/src/client/src/store/index.ts b/src/client/src/store/index.ts
index e14247cd..3e418ba0 100644
--- a/src/client/src/store/index.ts
+++ b/src/client/src/store/index.ts
@@ -5,14 +5,14 @@ import { DatabaseStore, databaseConfigStoreSlice } from "./database-config";
import { withLenses } from "@dhmk/zustand-lens";
import { devtools } from "zustand/middleware";
import { OpengroundStore, opengroundStoreSlice } from "./openground";
-import { DashboardStore, dashboardStoreSlice } from "./dashboard";
+import { PageStore, pageStoreSlice } from "./page";
export type RootStore = {
user: UserStore;
filter: FilterStore;
databaseConfig: DatabaseStore;
openground: OpengroundStore;
- dashboard: DashboardStore;
+ page: PageStore;
};
export const useRootStore = create<RootStore>()(
@@ -22,7 +22,7 @@ export const useRootStore = create<RootStore>()(
filter: filterStoreSlice,
databaseConfig: databaseConfigStoreSlice,
openground: opengroundStoreSlice,
- dashboard: dashboardStoreSlice,
+ page: pageStoreSlice,
})
)
);
diff --git a/src/client/src/store/page.ts b/src/client/src/store/page.ts
new file mode 100644
index 00000000..373cbbb9
--- /dev/null
+++ b/src/client/src/store/page.ts
@@ -0,0 +1,69 @@
+"use client";
+import { ValueOf } from "@/utils/types";
+import { lens } from "@dhmk/zustand-lens";
+import { cloneDeep, set } from "lodash";
+
+export const DASHBOARD_TYPE_OBJECT: Record<"llm" | "vector" | "gpu", string> = {
+ llm: "llm",
+ vector: "vector",
+ gpu: "gpu",
+};
+
+export type DASHBOARD_TYPE = ValueOf<typeof DASHBOARD_TYPE_OBJECT>;
+
+export type REQUEST_VISIBILITY_COLUMNS = Record<
+ "id" | "time" | "requestDuration" | "spanName" | "serviceName",
+ boolean
+>;
+
+export type PAGE = "dashboard" | "request" | "exception";
+
+export type PageStore = {
+ dashboard: {
+ type: DASHBOARD_TYPE;
+ };
+ request: {
+ visibilityColumns: Partial<REQUEST_VISIBILITY_COLUMNS>;
+ };
+ exception: {
+ visibilityColumns: Partial<REQUEST_VISIBILITY_COLUMNS>;
+ };
+ setData: (p: PAGE, keyPath: string, value: unknown) => void;
+};
+
+export const pageStoreSlice: PageStore = lens((setStore, getStore) => ({
+ dashboard: {
+ type: DASHBOARD_TYPE_OBJECT.llm,
+ },
+ request: {
+ visibilityColumns: {
+ id: true,
+ time: true,
+ requestDuration: true,
+ spanName: true,
+ serviceName: true,
+ },
+ },
+ exception: {
+ visibilityColumns: {
+ id: true,
+ time: true,
+ spanName: true,
+ deploymentType: true,
+ exceptionType: true,
+ },
+ },
+ setData: (page, keyPath, value) => {
+ const store = getStore();
+ let pageObject = cloneDeep(store[page as keyof typeof store]);
+
+ set(pageObject, keyPath, value);
+
+ setStore({
+ ...store,
+ [page]: {
+ ...pageObject,
+ },
+ });
+ },
+}));
diff --git a/src/client/src/utils/object.ts b/src/client/src/utils/object.ts
index 9ba1157d..76afe04a 100644
--- a/src/client/src/utils/object.ts
+++ b/src/client/src/utils/object.ts
@@ -1,3 +1,5 @@
+import { isPlainObject, mapValues, reduce } from "lodash";
+
export function objectKeys<T extends object>(object: T): Array<keyof T> {
return Object.keys(object) as Array<keyof T>;
}
@@ -7,3 +9,36 @@ export function objectEntries<T extends object>(
): Array<[keyof T, T[keyof T]]> {
return Object.entries(object) as Array<[keyof T, T[keyof T]]>;
}
+
+type Flattened<T> = { [K: string]: any };
+
+/**
+ * Flattens the inner keys of an object while maintaining the top-level hierarchy.
+ *
+ * @param obj - The object to be flattened.
+ * @returns A new object with top-level keys preserved and inner keys flattened.
+ */
+export function flattenObjectToFirstLevel<T extends object>(
+ obj: T
+): Flattened<T> {
+ const flatten = (prefix: string, obj: any): Flattened<T> => {
+ return reduce(
+ obj,
+ (acc, value, key) => {
+ const newKey = prefix ? `${prefix}.${key}` : key;
+ if (isPlainObject(value)) {
+ return { ...acc, ...flatten(newKey, value) };
+ }
+ return { ...acc, [newKey]: value };
+ },
+ {} as Flattened<T>
+ );
+ };
+
+ return mapValues(obj, (value) => {
+ if (isPlainObject(value)) {
+ return flatten("", value);
+ }
+ return value;
+ });
+}
diff --git a/src/client/colors.ts b/src/client/styles/colors.ts
similarity index 100%
rename from src/client/colors.ts
rename to src/client/styles/colors.ts
diff --git a/src/client/tailwind.config.ts b/src/client/tailwind.config.ts
index 5b3c96bf..fb05fdce 100644
--- a/src/client/tailwind.config.ts
+++ b/src/client/tailwind.config.ts
@@ -1,5 +1,5 @@
import type { Config } from "tailwindcss";
-import { COLORS } from "./colors";
+import { COLORS } from "./styles/colors";
const config = {
darkMode: ["class"],
@@ -24,20 +24,36 @@ const config = {
},
keyframes: {
"accordion-down": {
- from: { height: "0" },
- to: { height: "var(--radix-accordion-content-height)" },
+ from: {
+ height: "0",
+ },
+ to: {
+ height: "var(--radix-accordion-content-height)",
+ },
},
"accordion-up": {
- from: { height: "var(--radix-accordion-content-height)" },
- to: { height: "0" },
+ from: {
+ height: "var(--radix-accordion-content-height)",
+ },
+ to: {
+ height: "0",
+ },
},
"collapsible-down": {
- from: { height: "0" },
- to: { height: "var(--radix-collapsible-content-height)" },
+ from: {
+ height: "0",
+ },
+ to: {
+ height: "var(--radix-collapsible-content-height)",
+ },
},
"collapsible-up": {
- from: { height: "var(--radix-collapsible-content-height)" },
- to: { height: "0" },
+ from: {
+ height: "var(--radix-collapsible-content-height)",
+ },
+ to: {
+ height: "0",
+ },
},
},
animation: {
diff --git a/src/dev-docker-compose.yml b/src/dev-docker-compose.yml
index 12f6714e..9974a979 100644
--- a/src/dev-docker-compose.yml
+++ b/src/dev-docker-compose.yml
@@ -1,6 +1,6 @@
services:
clickhouse:
- image: clickhouse/clickhouse-server:24.2.2
+ image: clickhouse/clickhouse-server:24.4.1
container_name: clickhouse
environment:
CLICKHOUSE_PASSWORD: ${OPENLIT_DB_PASSWORD:-OPENLIT}