github/oneuptime
1
1
Fork 0
mirror of https://github.com/OneUptime/oneuptime.git synced 2026-04-06 00:32:12 +02:00
Code Issues 193 Packages Projects Releases Wiki Activity

Refactor getEvents function in SpanViewer.tsx to separate events and exceptions

Browse Source
This commit is contained in:
Simon Larsen
2024-04-23 13:44:46 +01:00
parent 47a718ad2a
commit 6dcc72e708
2 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
Dashboard/src/Components/Span/SpanViewer.tsx
View File

@@ -275,76 +275,77 @@ const SpanViewer: FunctionComponent<ComponentProps> = (
);
};
const getEventsContentElement: GetReactElementFunction = (): ReactElement => {
return getEvents(SpanEventType.Event);
}
const getEventsContentElement: GetReactElementFunction =
(): ReactElement => {
return getEvents(SpanEventType.Event);
};
type GetEventsFunction = (eventType: SpanEventType) => ReactElement;
const getEvents: GetEventsFunction=
(eventType: SpanEventType): ReactElement => {
const eventsToShow = span?.events?.filter((event: SpanEvent) => {
if(eventType === SpanEventType.Exception) {
const getEvents: GetEventsFunction = (
eventType: SpanEventType
): ReactElement => {
const eventsToShow: SpanEvent[] | undefined = span?.events?.filter(
(event: SpanEvent) => {
if (eventType === SpanEventType.Exception) {
// name of the event is exception
return event.name === SpanEventType.Exception;
}else{
return event.name !== SpanEventType.Exception;
}
});
if (!eventsToShow || eventsToShow.length === 0) {
if(eventType === SpanEventType.Exception) {
return <ErrorMessage error="No exceptions found for this span." />;
}else{
return <ErrorMessage error="No events found for this span." />;
}
return event.name !== SpanEventType.Exception;
}
);
return (
<AccordionGroup>
{eventsToShow.map((event: SpanEvent, index: number) => {
return (
<Accordion
titleClassName="text-sm"
title={
if (!eventsToShow || eventsToShow.length === 0) {
if (eventType === SpanEventType.Exception) {
return (
<ErrorMessage error="No exceptions found for this span." />
);
}
return <ErrorMessage error="No events found for this span." />;
}
return (
<AccordionGroup>
{eventsToShow.map((event: SpanEvent, index: number) => {
return (
<Accordion
titleClassName="text-sm"
title={
<div className="flex space-x-2">
<div className="flex space-x-2">
<div className="flex space-x-2">
<div className="rounded-md bg-indigo-500 text-white p-1 text-xs font-semibold">
Event: {index + 1}
<div className="rounded-md bg-indigo-500 text-white p-1 text-xs font-semibold">
{eventType}: {index + 1}
</div>
<div className="flex space-x-1">
<div className="mt-0.5 font-medium">
{event.name}
</div>
<div className="flex space-x-1">
<div className="mt-0.5 font-medium">
{event.name}
</div>
<div className="text-gray-500 mt-0.5">
{' '}
at{' '}
{SpanUtil.getSpanEventTimeAsString(
{
timelineStartTimeUnixNano:
props.traceStartTimeInUnixNano,
divisibilityFactor:
props.divisibilityFactor,
spanEventTimeUnixNano:
event.timeUnixNano!,
}
)}
</div>
<div className="text-gray-500 mt-0.5">
{' '}
at{' '}
{SpanUtil.getSpanEventTimeAsString(
{
timelineStartTimeUnixNano:
props.traceStartTimeInUnixNano,
divisibilityFactor:
props.divisibilityFactor,
spanEventTimeUnixNano:
event.timeUnixNano!,
}
)}
</div>
</div>
</div>
}
key={index}
>
{getEventContentElement(event)}
</Accordion>
);
})}
</AccordionGroup>
);
};
</div>
}
key={index}
>
{getEventContentElement(event)}
</Accordion>
);
})}
</AccordionGroup>
);
};
const getExceptionsContentElement: GetReactElementFunction =
(): ReactElement => {

1
Model/AnalyticsModels/Span.ts
View File

@@ -15,7 +15,6 @@ export enum SpanKind {
Internal = 'SPAN_KIND_INTERNAL',
}
export enum SpanEventType {
Exception = 'Exception',
Event = 'Event',