diff --git a/src/graphql/query/trace.ts b/src/graphql/query/trace.ts index 8bed410d..034854f8 100644 --- a/src/graphql/query/trace.ts +++ b/src/graphql/query/trace.ts @@ -19,7 +19,7 @@ import { Traces, TraceSpans, TraceTagKeys, TraceTagValues, TraceSpansFromColdSta export const queryTraces = `query queryTraces(${Traces.variable}) {${Traces.query}}`; -export const queryTrace = `query queryTrace(${TraceSpans.variable}) {${TraceSpans.query}}`; +export const querySpans = `query queryTrace(${TraceSpans.variable}) {${TraceSpans.query}}`; export const queryTraceTagKeys = `query queryTraceTagKeys(${TraceTagKeys.variable}) {${TraceTagKeys.query}}`; diff --git a/src/layout/components/NavBar.vue b/src/layout/components/NavBar.vue index 2cbccb94..a0c3787e 100644 --- a/src/layout/components/NavBar.vue +++ b/src/layout/components/NavBar.vue @@ -259,19 +259,6 @@ limitations under the License. --> appStore.setMaxRange(dates); } - function handleRecordsTTL(params: { - value: number; - superDataset: number; - coldValue: number; - coldSuperDataset: number; - }) { - const gap = dayToMS(params.value); - const superDatasetGap = dayToMS(params.superDataset); - const coldValueGap = dayToMS(params.coldValue); - const coldSuperDatasetGap = dayToMS(params.coldSuperDataset); - // const dates: Date[] = [new Date(new Date().getTime() - gap), new Date()]; - } - function dayToMS(day: number) { return (day + 1) * 24 * 60 * 60 * 1000; } diff --git a/src/store/modules/trace.ts b/src/store/modules/trace.ts index 9c257b39..023716c1 100644 --- a/src/store/modules/trace.ts +++ b/src/store/modules/trace.ts @@ -23,6 +23,7 @@ import { useAppStoreWithOut } from "@/store/modules/app"; import { useSelectorStore } from "@/store/modules/selectors"; import { QueryOrders } from "@/views/dashboard/data"; import { EndpointsTopNDefault } from "../data"; +import { useDuration } from "@/hooks/useDuration"; interface TraceState { services: Service[]; instances: Instance[]; @@ -35,6 +36,7 @@ interface TraceState { selectorStore: Recordable; selectedSpan: Recordable; } +const { getDurationTime } = useDuration(); export const traceStore = defineStore({ id: "trace", @@ -47,7 +49,7 @@ export const traceStore = defineStore({ currentTrace: {}, selectedSpan: {}, conditions: { - queryDuration: useAppStoreWithOut().durationTime, + queryDuration: getDurationTime(), traceState: "ALL", queryOrder: QueryOrders[0].value, paging: { pageNum: 1, pageSize: 20 }, @@ -73,7 +75,7 @@ export const traceStore = defineStore({ this.traceList = []; this.currentTrace = {}; this.conditions = { - queryDuration: useAppStoreWithOut().durationTime, + queryDuration: getDurationTime(), paging: { pageNum: 1, pageSize: 20 }, traceState: "ALL", queryOrder: QueryOrders[0].value, @@ -166,7 +168,15 @@ export const traceStore = defineStore({ return response; }, async getTraceSpans(params: { traceId: string }) { - const response = await graphql.query("queryTrace").params(params); + const appStore = useAppStoreWithOut(); + let response; + if (appStore.coldStageMode) { + response = await graphql + .query("queryTraceSpansFromColdStage") + .params({ ...params, duration: this.conditions.queryDuration }); + } else { + response = await graphql.query("querySpans").params(params); + } if (response.errors) { return response; } diff --git a/src/views/dashboard/related/trace/Filter.vue b/src/views/dashboard/related/trace/Filter.vue index 7b5963a0..ceb03584 100644 --- a/src/views/dashboard/related/trace/Filter.vue +++ b/src/views/dashboard/related/trace/Filter.vue @@ -302,12 +302,12 @@ limitations under the License. --> }, ); watch( - () => appStore.durationTime, + () => appStore.coldStageMode, () => { - duration.value = appStore.durationTime; - if (dashboardStore.entity === EntityType[1].value) { - init(); - } + durationRow.value = InitializationDurationRow; + setDurationRow(durationRow.value); + duration.value = getDurationTime(); + init(); }, ); // Event widget associate with trace widget