Skip to content

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

[Feat]: exception ui page, request with both status codes (#341)

Aman Agarwalf622786a09cf
diff --git a/src/client/src/app/(auth)/login/page.tsx b/src/client/src/app/(auth)/login/page.tsx
index 6c98ae79..7735b807 100644
--- a/src/client/src/app/(auth)/login/page.tsx
+++ b/src/client/src/app/(auth)/login/page.tsx
@@ -1,5 +1,5 @@
import { Suspense } from "react";
-import { AuthForm } from "../../../components/(auth)/auth-form";
+import { AuthForm } from "@/components/(auth)/auth-form";
export default function Login() {
return (
diff --git a/src/client/src/app/(auth)/register/page.tsx b/src/client/src/app/(auth)/register/page.tsx
index 3f83ae35..f807218a 100644
--- a/src/client/src/app/(auth)/register/page.tsx
+++ b/src/client/src/app/(auth)/register/page.tsx
@@ -1,5 +1,5 @@
import { Suspense } from "react";
-import { AuthForm } from "../../../components/(auth)/auth-form";
+import { AuthForm } from "@/components/(auth)/auth-form";
export default function Register() {
return (
diff --git a/src/client/src/app/(playground)/dashboard/page.tsx b/src/client/src/app/(playground)/dashboard/page.tsx
index 823c8059..c32c4e82 100644
--- a/src/client/src/app/(playground)/dashboard/page.tsx
+++ b/src/client/src/app/(playground)/dashboard/page.tsx
@@ -1,5 +1,5 @@
"use client";
-import Filter from "../../../components/(playground)/filter";
+import Filter from "@/components/(playground)/filter";
import {
DashboardTypeFilter,
DashboardTypeGraphContainer,
diff --git a/src/client/src/app/(playground)/exceptions/list.tsx b/src/client/src/app/(playground)/exceptions/list.tsx
new file mode 100644
index 00000000..5170b7ca
--- /dev/null
+++ b/src/client/src/app/(playground)/exceptions/list.tsx
@@ -0,0 +1,39 @@
+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
new file mode 100644
index 00000000..f1ba2ed2
--- /dev/null
+++ b/src/client/src/app/(playground)/exceptions/page.tsx
@@ -0,0 +1,54 @@
+"use client";
+import { useCallback, useEffect } from "react";
+import { RequestProvider } 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";
+
+export default function RequestPage() {
+ const filter = useRootStore(getFilterDetails);
+ const pingStatus = useRootStore(getPingStatus);
+ const { data, fireRequest, isFetched, isLoading } = useFetchWrapper();
+ const fetchData = useCallback(async () => {
+ fireRequest({
+ body: JSON.stringify(omit(filter, ["selectedConfig"])),
+ requestType: "POST",
+ url: "/api/metrics/exception",
+ failureCb: (err?: string) => {
+ toast.error(err || `Cannot connect to server!`, {
+ id: "request-page",
+ });
+ },
+ });
+ }, [filter]);
+
+ useEffect(() => {
+ if (
+ filter.timeLimit.start &&
+ filter.timeLimit.end &&
+ pingStatus === "success"
+ )
+ fetchData();
+ }, [filter, fetchData, pingStatus]);
+
+ return (
+ <RequestProvider>
+ <RequestFilter
+ total={(data as any)?.total}
+ includeOnlySorting={["Timestamp"]}
+ />
+ <List
+ data={(data as any)?.records || []}
+ isFetched={isFetched || pingStatus !== "pending"}
+ isLoading={isLoading || pingStatus === "pending"}
+ />
+ <RequestDetails />
+ </RequestProvider>
+ );
+}
diff --git a/src/client/src/app/(playground)/openground/new/add-provider.tsx b/src/client/src/app/(playground)/openground/new/add-provider.tsx
index 8d8b9e25..22dec65b 100644
--- a/src/client/src/app/(playground)/openground/new/add-provider.tsx
+++ b/src/client/src/app/(playground)/openground/new/add-provider.tsx
@@ -7,7 +7,7 @@ import {
SheetTrigger,
} from "@/components/ui/sheet";
import { MouseEventHandler, ReactNode } from "react";
-import { providersConfig } from "../../../../constants/openground";
+import { providersConfig } from "@/constants/openground";
export default function AddProvider({
children,
diff --git a/src/client/src/app/(playground)/openground/new/providers.tsx b/src/client/src/app/(playground)/openground/new/providers.tsx
index 28ac15fe..6eb9667a 100644
--- a/src/client/src/app/(playground)/openground/new/providers.tsx
+++ b/src/client/src/app/(playground)/openground/new/providers.tsx
@@ -9,7 +9,7 @@ import {
import AddProvider from "./add-provider";
import { MouseEventHandler, useRef } from "react";
import { isNil } from "lodash";
-import { providersConfig } from "../../../../constants/openground";
+import { providersConfig } from "@/constants/openground";
import ProviderResponse from "./provider-response";
export default function ProvidersUI() {
diff --git a/src/client/src/app/(playground)/requests/list/index.tsx b/src/client/src/app/(playground)/requests/list.tsx
similarity index 86%
rename from src/client/src/app/(playground)/requests/list/index.tsx
rename to src/client/src/app/(playground)/requests/list.tsx
index 87434cb0..2a1110e0 100644
--- a/src/client/src/app/(playground)/requests/list/index.tsx
+++ b/src/client/src/app/(playground)/requests/list.tsx
@@ -1,7 +1,7 @@
import { fill } from "lodash";
import IntermediateState from "@/components/(playground)/intermediate-state";
-import RenderLoader from "./loader";
-import Trace from "./trace";
+import RenderLoader from "../../../components/(playground)/request/loader";
+import Trace from "@/components/(playground)/request/trace";
export default function List({
data,
diff --git a/src/client/src/app/(playground)/requests/page.tsx b/src/client/src/app/(playground)/requests/page.tsx
index b7e824c8..7b09260e 100644
--- a/src/client/src/app/(playground)/requests/page.tsx
+++ b/src/client/src/app/(playground)/requests/page.tsx
@@ -1,9 +1,9 @@
"use client";
import { useCallback, useEffect } from "react";
-import RequestFilter from "./request-filter";
-import { RequestProvider } from "./request-context";
+import RequestFilter from "@/components/(playground)/request/request-filter";
+import { RequestProvider } from "@/components/(playground)/request/request-context";
import useFetchWrapper from "@/utils/hooks/useFetchWrapper";
-import RequestDetails from "./request-details";
+import RequestDetails from "@/components/(playground)/request/request-details";
import { toast } from "sonner";
import { getFilterDetails } from "@/selectors/filter";
import { useRootStore } from "@/store";
@@ -38,7 +38,7 @@ export default function RequestPage() {
return (
<RequestProvider>
- <RequestFilter total={(data as any)?.total} />
+ <RequestFilter total={(data as any)?.total} supportDynamicFilters />
<List
data={(data as any)?.records || []}
isFetched={isFetched || pingStatus !== "pending"}
diff --git a/src/client/src/app/api/metrics/exception/route.ts b/src/client/src/app/api/metrics/exception/route.ts
new file mode 100644
index 00000000..aa6c7054
--- /dev/null
+++ b/src/client/src/app/api/metrics/exception/route.ts
@@ -0,0 +1,37 @@
+import { MetricParams, TimeLimit } from "@/lib/platform/common";
+import {
+ validateMetricsRequest,
+ validateMetricsRequestType,
+} from "@/helpers/platform";
+import { getRequests } from "@/lib/platform/request";
+
+export async function POST(request: Request) {
+ const formData = await request.json();
+ const timeLimit = formData.timeLimit as TimeLimit;
+ const limit = formData.limit || 10;
+ const offset = formData.offset || 0;
+ const selectedConfig = formData.selectedConfig || {};
+ const sorting = formData.sorting || {};
+
+ const params: MetricParams = {
+ timeLimit,
+ limit,
+ offset,
+ selectedConfig,
+ sorting,
+ statusCode: ["STATUS_CODE_ERROR"],
+ };
+
+ const validationParam = validateMetricsRequest(
+ params,
+ validateMetricsRequestType.GET_ALL
+ );
+
+ if (!validationParam.success)
+ return Response.json(validationParam.err, {
+ status: 400,
+ });
+
+ const res: any = await getRequests(params);
+ return Response.json(res);
+}
diff --git a/src/client/src/components/(playground)/filter/sorting.tsx b/src/client/src/components/(playground)/filter/sorting.tsx
index a86e9796..6faf20e8 100644
--- a/src/client/src/components/(playground)/filter/sorting.tsx
+++ b/src/client/src/components/(playground)/filter/sorting.tsx
@@ -27,7 +27,13 @@ const SORTING_TYPES = [
},
];
-export default function Sorting({ sorting }: { sorting: FilterSorting }) {
+export default function Sorting({
+ sorting,
+ includeOnlySorting,
+}: {
+ sorting: FilterSorting;
+ includeOnlySorting?: string[];
+}) {
const updateFilter = useRootStore(getUpdateFilter);
const onSortingChange = (type: string) => {
const updatedSorting: FilterSorting = { type, direction: "desc" };
@@ -38,6 +44,10 @@ export default function Sorting({ sorting }: { sorting: FilterSorting }) {
updateFilter("sorting", updatedSorting);
};
+ const sortingOptions = includeOnlySorting?.length
+ ? SORTING_TYPES.filter((i) => includeOnlySorting.includes(i.key))
+ : SORTING_TYPES;
+
return (
<DropdownMenu>
<DropdownMenuTrigger asChild>
@@ -49,7 +59,7 @@ export default function Sorting({ sorting }: { sorting: FilterSorting }) {
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent>
- {SORTING_TYPES.map(({ key, label }) => (
+ {sortingOptions.map(({ key, label }) => (
<DropdownMenuItem key={key} onClick={() => onSortingChange(key)}>
{label}
{key === sorting.type &&
diff --git a/src/client/src/app/(playground)/requests/list/loader.tsx b/src/client/src/components/(playground)/request/loader.tsx
similarity index 100%
rename from src/client/src/app/(playground)/requests/list/loader.tsx
rename to src/client/src/components/(playground)/request/loader.tsx
diff --git a/src/client/src/app/(playground)/requests/list/parent-trace.tsx b/src/client/src/components/(playground)/request/parent-trace.tsx
similarity index 100%
rename from src/client/src/app/(playground)/requests/list/parent-trace.tsx
rename to src/client/src/components/(playground)/request/parent-trace.tsx
diff --git a/src/client/src/app/(playground)/requests/request-context.tsx b/src/client/src/components/(playground)/request/request-context.tsx
similarity index 100%
rename from src/client/src/app/(playground)/requests/request-context.tsx
rename to src/client/src/components/(playground)/request/request-context.tsx
diff --git a/src/client/src/app/(playground)/requests/request-details.tsx b/src/client/src/components/(playground)/request/request-details.tsx
similarity index 71%
rename from src/client/src/app/(playground)/requests/request-details.tsx
rename to src/client/src/components/(playground)/request/request-details.tsx
index 4a84354b..af7f034d 100644
--- a/src/client/src/app/(playground)/requests/request-details.tsx
+++ b/src/client/src/components/(playground)/request/request-details.tsx
@@ -1,4 +1,4 @@
-import { useRequest } from "@/app/(playground)/requests/request-context";
+import { useRequest } from "@/components/(playground)/request/request-context";
import Image from "next/image";
import { round } from "lodash";
import { format } from "date-fns";
@@ -10,6 +10,7 @@ import {
ExternalLink,
LucideIcon,
PyramidIcon,
+ SquareTerminal,
} from "lucide-react";
import {
Sheet,
@@ -17,6 +18,7 @@ import {
SheetHeader,
SheetTitle,
} from "@/components/ui/sheet";
+import { JsonViewer } from "@textea/json-viewer";
const TagItem = ({
icon: IconComponent,
@@ -53,24 +55,36 @@ export default function RequestDetails() {
if (!request) return null;
const normalizedItem: TransformedTraceRow = normalizeTrace(request);
- const displayKeys = getRequestDetailsDisplayKeys(normalizedItem.type);
+ const isException = normalizedItem.statusCode === "STATUS_CODE_ERROR";
+ const displayKeys = getRequestDetailsDisplayKeys(
+ normalizedItem.type,
+ isException
+ );
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>
- <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>
+ {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 items-center mt-3">
- <PyramidIcon size="12" />
- <p className="ml-3 text-sm leading-none">
- {normalizedItem.provider || normalizedItem.system}
- </p>
+ ) : (
+ <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>
- </div>
+ )}
</SheetTitle>
</SheetHeader>
<div className="h-full w-full flex grow pb-8">
@@ -87,6 +101,11 @@ export default function RequestDetails() {
title="Request duration : "
value={`${round(normalizedItem.requestDuration, 4)}s`}
/>
+ <TagItem
+ icon={SquareTerminal}
+ title="Status Code : "
+ value={normalizedItem.statusCode}
+ />
{displayKeys.map(
(keyItem, index) =>
normalizedItem[keyItem] && (
@@ -177,6 +196,33 @@ export default function RequestDetails() {
/>
)}
{/* 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>
</div>
</div>
diff --git a/src/client/src/app/(playground)/requests/request-filter.tsx b/src/client/src/components/(playground)/request/request-filter.tsx
similarity index 91%
rename from src/client/src/app/(playground)/requests/request-filter.tsx
rename to src/client/src/components/(playground)/request/request-filter.tsx
index b4b9412e..1b1ff905 100644
--- a/src/client/src/app/(playground)/requests/request-filter.tsx
+++ b/src/client/src/components/(playground)/request/request-filter.tsx
@@ -1,6 +1,6 @@
-import RequestPagination from "@/components/(playground)/request-pagination";
+import RequestPagination from "@/components/(playground)/request/request-pagination";
import { ceil } from "lodash";
-import Filter from "../../../components/(playground)/filter";
+import Filter from "../filter";
import {
getFilterConfig,
getFilterDetails,
@@ -181,7 +181,15 @@ const DynamicFilters = ({
);
};
-export default function RequestFilter({ total }: { total: number }) {
+export default function RequestFilter({
+ total,
+ supportDynamicFilters = false,
+ includeOnlySorting,
+}: {
+ total: number;
+ supportDynamicFilters?: boolean;
+ includeOnlySorting?: string[];
+}) {
const [isVisibleFilters, setIsVisibileFilters] = useState<boolean>(false);
const filter = useRootStore(getFilterDetails);
const filterConfig = useRootStore(getFilterConfig);
@@ -224,6 +232,12 @@ export default function RequestFilter({ total }: { total: number }) {
return false;
}).length > 0;
+ useEffect(() => {
+ return () => {
+ updateFilter("page-change", "");
+ };
+ }, []);
+
return (
<div className="flex flex-col items-center w-full justify-between mb-4">
<div className="flex w-full gap-4">
@@ -237,8 +251,13 @@ export default function RequestFilter({ total }: { total: number }) {
onClickPageLimit={onClickPageLimit}
/>
)}
- {total > 0 && <Sorting sorting={filter.sorting} />}
- {showDynamicFilters && (
+ {total > 0 && (
+ <Sorting
+ sorting={filter.sorting}
+ includeOnlySorting={includeOnlySorting}
+ />
+ )}
+ {showDynamicFilters && supportDynamicFilters && (
<Button
variant="outline"
size="default"
@@ -252,11 +271,13 @@ export default function RequestFilter({ total }: { total: number }) {
</Button>
)}
</div>
- <DynamicFilters
- isVisibleFilters={isVisibleFilters}
- filter={filter}
- areFiltersApplied={areFiltersApplied}
- />
+ {supportDynamicFilters && (
+ <DynamicFilters
+ isVisibleFilters={isVisibleFilters}
+ filter={filter}
+ areFiltersApplied={areFiltersApplied}
+ />
+ )}
</div>
);
}
diff --git a/src/client/src/components/(playground)/request-pagination.tsx b/src/client/src/components/(playground)/request/request-pagination.tsx
similarity index 98%
rename from src/client/src/components/(playground)/request-pagination.tsx
rename to src/client/src/components/(playground)/request/request-pagination.tsx
index 6a035d75..977cd293 100644
--- a/src/client/src/components/(playground)/request-pagination.tsx
+++ b/src/client/src/components/(playground)/request/request-pagination.tsx
@@ -1,4 +1,4 @@
-import { MouseEventHandler, useRef, useState } from "react";
+import { MouseEventHandler } from "react";
import {
Pagination,
PaginationContent,
diff --git a/src/client/src/app/(playground)/requests/list/trace.tsx b/src/client/src/components/(playground)/request/trace.tsx
similarity index 63%
rename from src/client/src/app/(playground)/requests/list/trace.tsx
rename to src/client/src/components/(playground)/request/trace.tsx
index 3fcd255f..64ee7e2b 100644
--- a/src/client/src/app/(playground)/requests/list/trace.tsx
+++ b/src/client/src/components/(playground)/request/trace.tsx
@@ -1,14 +1,18 @@
import { format } from "date-fns";
import { isNil, round } from "lodash";
-import { useRequest } from "../request-context";
+import { useRequest } from "@/components/(playground)/request/request-context";
import { ReactNode } from "react";
-import { getRequestTableDisplayKeys, normalizeTrace } from "@/helpers/trace";
+import {
+ getDisplayKeysForException,
+ getRequestTableDisplayKeys,
+ normalizeTrace,
+} from "@/helpers/trace";
import {
TraceMapping,
TraceRow,
TransformedTraceRow,
} from "@/constants/traces";
-import { CalendarDays, Clock } from "lucide-react";
+import { CalendarDays, Clock, SquareTerminal } from "lucide-react";
import ParentTrace from "./parent-trace";
type RenderRowProps = {
@@ -31,7 +35,7 @@ const RowItem = ({
}) => {
return (
<div
- className={`flex ${containerClass} shrink-0 flex-1 relative h-full justify-center items-center p-2 space-x-2`}
+ 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" }}>
@@ -58,22 +62,37 @@ export default function Trace({ item, isLoading }: RenderRowProps) {
const onClick = () => !isLoading && updateRequest(item);
const normalizedItem: TransformedTraceRow = normalizeTrace(item);
- const requestDisplayItems = getRequestTableDisplayKeys(normalizedItem.type);
+ const isException = normalizedItem.statusCode === "STATUS_CODE_ERROR";
+ const requestDisplayItems = isException
+ ? getDisplayKeysForException()
+ : getRequestTableDisplayKeys(normalizedItem.type);
+
+ console.log(normalizedItem, item);
return (
<div className="flex flex-col">
- <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(normalizedItem.time, "MMM do, y HH:mm:ss a")}
- </p>
+ <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(normalizedItem.time, "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 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 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
diff --git a/src/client/src/components/(playground)/sidebar.tsx b/src/client/src/components/(playground)/sidebar.tsx
index 96ebb64f..84af2fe1 100644
--- a/src/client/src/components/(playground)/sidebar.tsx
+++ b/src/client/src/components/(playground)/sidebar.tsx
@@ -14,6 +14,7 @@ import {
FileJson2,
LayoutDashboard,
MonitorPlay,
+ ShieldAlert,
SquarePlay,
} from "lucide-react";
@@ -40,6 +41,11 @@ const SIDEBAR_ITEMS: SidebarItemProps[] = [
text: "Requests",
link: "/requests",
},
+ {
+ icon: <ShieldAlert className={ICON_CLASSES} />,
+ text: "Exceptions",
+ link: "/exceptions",
+ },
{
icon: <MonitorPlay className={ICON_CLASSES} />,
text: "Openground",
@@ -129,7 +135,7 @@ export default function Sidebar() {
<SidebarItem
key={`sidebar-top-${index}`}
className={`${
- item.link === pathname
+ pathname.startsWith(item.link || "")
? "text-white bg-primary dark:bg-primary dark:text-white"
: "text-stone-600 dark:text-white"
}`}
@@ -142,7 +148,7 @@ export default function Sidebar() {
<SidebarItem
key={`sidebar-bottom-${index}`}
className={`${
- item.link === pathname
+ pathname.startsWith(item.link || "")
? "text-white bg-primary dark:bg-primary dark:text-white"
: "text-stone-600 dark:text-white"
}`}
diff --git a/src/client/src/components/ui/tabs.tsx b/src/client/src/components/ui/tabs.tsx
index 0276dd1f..716db580 100644
--- a/src/client/src/components/ui/tabs.tsx
+++ b/src/client/src/components/ui/tabs.tsx
@@ -14,7 +14,7 @@ const TabsList = React.forwardRef<
<TabsPrimitive.List
ref={ref}
className={cn(
- "inline-flex h-10 items-center justify-center rounded-md bg-stone-100 p-1 text-stone-500 dark:bg-stone-800 dark:text-stone-400",
+ "inline-flex h-10 items-center justify-center rounded-md bg-stone-200/[0.5] p-1 text-stone-500 dark:bg-stone-800 dark:text-stone-400",
className
)}
{...props}
@@ -29,7 +29,7 @@ const TabsTrigger = React.forwardRef<
<TabsPrimitive.Trigger
ref={ref}
className={cn(
- "inline-flex items-center justify-center whitespace-nowrap rounded-sm px-3 py-1.5 text-sm font-medium transition-all focus-visible:outline-none disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-white data-[state=active]:text-stone-950 data-[state=active]:shadow-sm dark:data-[state=active]:bg-stone-950 dark:data-[state=active]:text-stone-50",
+ "inline-flex items-center justify-center whitespace-nowrap rounded-sm px-3 py-1.5 text-sm font-medium transition-all focus-visible:outline-none disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-primary data-[state=active]:text-stone-50 data-[state=active]:shadow-sm dark:data-[state=active]:bg-primary dark:data-[state=active]:text-stone-50",
className
)}
{...props}
diff --git a/src/client/src/constants/traces.ts b/src/client/src/constants/traces.ts
index a8b081af..a39f900a 100644
--- a/src/client/src/constants/traces.ts
+++ b/src/client/src/constants/traces.ts
@@ -17,6 +17,7 @@ import {
Fingerprint,
ImageIcon,
LucideIcon,
+ MessageSquareWarning,
PyramidIcon,
ScanSearch,
ShieldCheck,
@@ -36,8 +37,8 @@ export const TraceMapping: Record<
{
label: string;
type: TraceKeyType;
- path: string;
- prefix?: string;
+ path: string | string[];
+ prefix?: string | string[];
isRoot?: boolean;
offset?: number;
icon?: LucideIcon;
@@ -73,6 +74,47 @@ export const TraceMapping: Record<
isRoot: true,
},
+ statusCode: {
+ label: "Status Code",
+ type: "string",
+ path: "StatusCode",
+ isRoot: true,
+ },
+
+ // Exception
+ serviceName: {
+ label: "Service Name",
+ type: "string",
+ path: "ServiceName",
+ isRoot: true,
+ },
+ statusMessage: {
+ label: "Error Message",
+ type: "string",
+ path: "StatusMessage",
+ isRoot: true,
+ },
+ spanName: {
+ label: "Span Name",
+ type: "string",
+ path: "SpanName",
+ isRoot: true,
+ },
+ exceptionType: {
+ label: "Exception type",
+ type: "string",
+ path: ["Events.Attributes", "0", "exception.type"],
+ icon: MessageSquareWarning,
+ isRoot: true,
+ },
+ deploymentType: {
+ label: "Deployment type",
+ type: "string",
+ path: ["ResourceAttributes", "deployment.environment"],
+ icon: Container,
+ isRoot: true,
+ },
+
provider: {
label: "Provider",
type: "string",
diff --git a/src/client/src/helpers/platform.ts b/src/client/src/helpers/platform.ts
index 0ebc5f16..c5c57ee2 100644
--- a/src/client/src/helpers/platform.ts
+++ b/src/client/src/helpers/platform.ts
@@ -177,7 +177,7 @@ type FilterWhereConditionType = {
}>;
notOrEmpty?: { key: string }[];
notEmpty?: { key: string }[];
- statusCode?: string;
+ statusCode?: string[];
operationType?: OPERATION_TYPE;
};
@@ -253,8 +253,10 @@ export const getFilterWhereCondition = (
});
}
- const { statusCode = "STATUS_CODE_OK" } = filter;
- whereArray.push(`StatusCode='${statusCode}'`);
+ const { statusCode = ["STATUS_CODE_OK", "STATUS_CODE_UNSET"] } = filter;
+ whereArray.push(
+ `StatusCode IN (${statusCode.map((type) => `'${type}'`).join(", ")})`
+ );
if (filter.operationType) {
if (filter.operationType === "vectordb") {
diff --git a/src/client/src/helpers/trace.ts b/src/client/src/helpers/trace.ts
index 86bdc0b2..e766ad4a 100644
--- a/src/client/src/helpers/trace.ts
+++ b/src/client/src/helpers/trace.ts
@@ -4,7 +4,7 @@ import {
TraceRow,
TransformedTraceRow,
} from "@/constants/traces";
-import { round } from "lodash";
+import { get, round } from "lodash";
export const integerParser = (value: string, offset?: number) =>
parseInt((value || "0") as string, 10) * (offset || 1);
@@ -17,9 +17,9 @@ export const normalizeTrace = (item: TraceRow): TransformedTraceRow => {
(acc: TransformedTraceRow, traceKey: TraceMappingKeyType) => {
let value: unknown;
if (TraceMapping[traceKey].isRoot) {
- value = item[TraceMapping[traceKey].path as keyof TraceRow];
+ value = get(item, TraceMapping[traceKey].path);
} else {
- value = item.SpanAttributes[getTraceMappingKeyFullPath(traceKey)];
+ value = get(item.SpanAttributes, getTraceMappingKeyFullPath(traceKey));
}
if (value) {
@@ -34,7 +34,10 @@ export const normalizeTrace = (item: TraceRow): TransformedTraceRow => {
TraceMapping[traceKey].offset
).toFixed(10);
} else if (TraceMapping[traceKey].type === "round") {
- acc[traceKey] = round(value as number, TraceMapping[traceKey].offset).toFixed(10);
+ acc[traceKey] = round(
+ value as number,
+ TraceMapping[traceKey].offset
+ ).toFixed(10);
} else {
acc[traceKey] = value;
}
@@ -48,9 +51,51 @@ export const normalizeTrace = (item: TraceRow): TransformedTraceRow => {
);
};
-export const getTraceMappingKeyFullPath = (key: TraceMappingKeyType) => {
- if (!TraceMapping[key].prefix) return TraceMapping[key].path;
- return [TraceMapping[key].prefix, TraceMapping[key].path].join(".");
+export const getTraceMappingKeyFullPath = (
+ key: TraceMappingKeyType,
+ shouldReturnArray: boolean = false
+) => {
+ if (!TraceMapping[key].prefix) {
+ if (!shouldReturnArray) {
+ if (typeof TraceMapping[key].path !== "string") {
+ return (TraceMapping[key].path as string[]).join(".");
+ }
+ }
+ return TraceMapping[key].path;
+ }
+ if (shouldReturnArray) {
+ let returnArr: string[] = [];
+ if (typeof TraceMapping[key].prefix === "string") {
+ returnArr = returnArr.concat([TraceMapping[key].prefix as string]);
+ } else {
+ returnArr = returnArr.concat(TraceMapping[key].prefix as string[]);
+ }
+
+ if (typeof TraceMapping[key].path === "string") {
+ returnArr = returnArr.concat([TraceMapping[key].path as string]);
+ } else {
+ returnArr = returnArr.concat(TraceMapping[key].path as string[]);
+ }
+ return returnArr;
+ }
+
+ let returnString = "";
+ if (typeof TraceMapping[key].prefix === "string") {
+ returnString = TraceMapping[key].prefix as string;
+ } else {
+ returnString = (TraceMapping[key].prefix as string[]).join(".");
+ }
+
+ if (typeof TraceMapping[key].path === "string") {
+ returnString = [returnString, TraceMapping[key].path as string].join(".");
+ } else {
+ returnString = [
+ returnString,
+ (TraceMapping[key].path as string[]).join("."),
+ ].join(".");
+ }
+
+ return returnString;
};
export const getRequestTableDisplayKeys = (
@@ -67,7 +112,7 @@ export const getRequestTableDisplayKeys = (
"vectorCount",
];
case "framework":
- return ["applicationName", "provider", "endpoint", "owner", "repo", ""];
+ return ["applicationName", "provider", "endpoint", "owner", "repo"];
default:
return [
"applicationName",
@@ -80,10 +125,21 @@ export const getRequestTableDisplayKeys = (
}
};
+export const getDisplayKeysForException = (): TraceMappingKeyType[] => {
+ return ["serviceName", "spanName", "deploymentType", "exceptionType"];
+};
+
export const getRequestDetailsDisplayKeys = (
- type: string
+ type: string,
+ isException?: boolean
): TraceMappingKeyType[] => {
- let keys: TraceMappingKeyType[] = getRequestTableDisplayKeys(type);
+ let keys: TraceMappingKeyType[] = isException
+ ? getDisplayKeysForException()
+ : getRequestTableDisplayKeys(type);
+ if (isException) {
+ return keys.filter((i) => !["serviceName"].includes(i));
+ }
+
switch (type) {
case "vectordb":
keys = keys.concat(["environment", "type", "nResults", "endpoint"]);
diff --git a/src/client/src/lib/platform/common.ts b/src/client/src/lib/platform/common.ts
index de5a41cd..1ba33e8b 100644
--- a/src/client/src/lib/platform/common.ts
+++ b/src/client/src/lib/platform/common.ts
@@ -27,6 +27,7 @@ export interface MetricParams {
selectedConfig?: any;
sorting?: any;
operationType?: OPERATION_TYPE;
+ statusCode?: string[];
}
export type GPU_TYPE_KEY =
diff --git a/src/client/src/middleware.ts b/src/client/src/middleware.ts
index a789a1ed..a9ffd777 100644
--- a/src/client/src/middleware.ts
+++ b/src/client/src/middleware.ts
@@ -66,5 +66,6 @@ export const config = {
"/requests",
"/database-config",
"/openground",
+ "/exceptions",
],
};
diff --git a/src/client/src/store/filter.ts b/src/client/src/store/filter.ts
index 8bf2e5f3..e28a997a 100644
--- a/src/client/src/store/filter.ts
+++ b/src/client/src/store/filter.ts
@@ -15,6 +15,13 @@ export const TIME_RANGE_TYPE: Record<
export const DEFAULT_TIME_RANGE = "24H";
+const DEFAULT_LIMIT = 10;
+
+const DEFAULT_SORTING: FilterSorting = {
+ type: "Timestamp",
+ direction: "desc",
+};
+
export type FilterSorting = {
type: string;
direction: "asc" | "desc";
@@ -78,13 +85,10 @@ const INITIAL_FILTER_DETAILS: FilterType = {
type: DEFAULT_TIME_RANGE,
...getTimeLimitObject(DEFAULT_TIME_RANGE, ""),
},
- limit: 10,
+ limit: DEFAULT_LIMIT,
offset: 0,
selectedConfig: {},
- sorting: {
- type: "Timestamp",
- direction: "desc",
- },
+ sorting: DEFAULT_SORTING,
};
export type FilterStore = {
@@ -112,11 +116,19 @@ export const filterStoreSlice: FilterStore = lens((setStore, getStore) => ({
case "offset":
// Its already handled in the set(object, key, value); line
break;
+ case "page-change":
+ set(object, "offset", 0);
+ set(object, "limit", DEFAULT_LIMIT);
+ set(object, "sorting", DEFAULT_SORTING);
+ break;
default:
break;
}
- set(object, key, value);
+ if (key !== "page-change") {
+ set(object, key, value);
+ }
+
setStore({
details: {
...getStore().details,