diff --git a/frontend/src/container/TraceDetail/SelectedSpanDetails/index.tsx b/frontend/src/container/TraceDetail/SelectedSpanDetails/index.tsx index 4f12c47470..ce7f3372a3 100644 --- a/frontend/src/container/TraceDetail/SelectedSpanDetails/index.tsx +++ b/frontend/src/container/TraceDetail/SelectedSpanDetails/index.tsx @@ -19,12 +19,17 @@ import { CardContainer, CustomSubText, styles } from './styles'; import Tags from './Tags'; function SelectedSpanDetails(props: SelectedSpanDetailsProps): JSX.Element { - const { tree, firstSpanStartTime } = props; - const { maxTime, minTime } = useSelector( (state) => state.globalTime, ); + const { + tree, + firstSpanStartTime, + traceStartTime = minTime, + traceEndTime = maxTime, + } = props; + const { id: traceId } = useParams(); const isDarkMode = useIsDarkMode(); @@ -74,7 +79,7 @@ function SelectedSpanDetails(props: SelectedSpanDetailsProps): JSX.Element { ]; const onLogsHandler = (): void => { - const query = getTraceToLogsQuery(traceId, minTime, maxTime); + const query = getTraceToLogsQuery(traceId, traceStartTime, traceEndTime); history.push( `${ROUTES.LOGS_EXPLORER}?${createQueryParams({ @@ -140,10 +145,14 @@ function SelectedSpanDetails(props: SelectedSpanDetailsProps): JSX.Element { interface SelectedSpanDetailsProps { tree?: ITraceTree; firstSpanStartTime: number; + traceStartTime?: number; + traceEndTime?: number; } SelectedSpanDetails.defaultProps = { tree: undefined, + traceStartTime: undefined, + traceEndTime: undefined, }; export interface ModalText { diff --git a/frontend/src/container/TraceDetail/index.tsx b/frontend/src/container/TraceDetail/index.tsx index 4b333e0dad..568ed3c4f4 100644 --- a/frontend/src/container/TraceDetail/index.tsx +++ b/frontend/src/container/TraceDetail/index.tsx @@ -48,6 +48,12 @@ function TraceDetail({ response }: TraceDetailProps): JSX.Element { [response], ); + const traceStartTime = useMemo(() => response[0].startTimestampMillis, [ + response, + ]); + + const traceEndTime = useMemo(() => response[0].endTimestampMillis, [response]); + const urlQuery = useUrlQuery(); const [spanId] = useState(urlQuery.get('spanId')); @@ -260,6 +266,8 @@ function TraceDetail({ response }: TraceDetailProps): JSX.Element {