chore: remove usage of updatedTimeRef in dashboard provider

frontend/src/container/DashboardContainer/DashboardDescription/__tests__/DashboardDescription.test.tsx

@@ -193,7 +193,6 @@ describe('Dashboard landing page actions header tests', () => {
 			setPanelMap: jest.fn(),
 			setLayouts: jest.fn(),
 			setSelectedDashboard: jest.fn(),
-			updatedTimeRef: { current: null },
 			updateLocalStorageDashboardVariables: jest.fn(),
 			dashboardQueryRangeCalled: false,
 			setDashboardQueryRangeCalled: jest.fn(),

frontend/src/hooks/dashboard/useUpdateDashboard.tsx

@@ -1,6 +1,5 @@
 import { useMutation, UseMutationResult } from 'react-query';
 import update from 'api/v1/dashboards/id/update';
-import dayjs from 'dayjs';
 import { useDashboard } from 'providers/Dashboard/Dashboard';
 import { useErrorModal } from 'providers/ErrorModalProvider';
 import { SuccessResponseV2 } from 'types/api';
@@ -9,12 +8,12 @@ import { Props } from 'types/api/dashboard/update';
 import APIError from 'types/api/error';
 
 export const useUpdateDashboard = (): UseUpdateDashboard => {
-	const { updatedTimeRef } = useDashboard();
+	const { setSelectedDashboard } = useDashboard();
 	const { showErrorModal } = useErrorModal();
 	return useMutation(update, {
 		onSuccess: (data) => {
 			if (data.data) {
-				updatedTimeRef.current = dayjs(data.data.updatedAt);
+				setSelectedDashboard(data.data);
 			}
 		},
 		onError: (error) => {

frontend/src/providers/Dashboard/Dashboard.tsx

@@ -18,7 +18,7 @@ import { Modal } from 'antd';
 import getDashboard from 'api/v1/dashboards/id/get';
 import locked from 'api/v1/dashboards/id/lock';
 import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
-import dayjs, { Dayjs } from 'dayjs';
+import dayjs from 'dayjs';
 import { useTransformDashboardVariables } from 'hooks/dashboard/useTransformDashboardVariables';
 import useTabVisibility from 'hooks/useTabFocus';
 import { getUpdatedLayout } from 'lib/dashboard/getUpdatedLayout';
@@ -68,7 +68,6 @@ export const DashboardContext = createContext<IDashboardContext>({
 
 	setLayouts: () => {},
 	setSelectedDashboard: () => {},
-	updatedTimeRef: {} as React.MutableRefObject<Dayjs | null>,
 	updateLocalStorageDashboardVariables: () => {},
 	dashboardQueryRangeCalled: false,
 	setDashboardQueryRangeCalled: () => {},
@@ -138,13 +137,11 @@ export function DashboardProvider({
 		transformDashboardVariables,
 	} = useTransformDashboardVariables(dashboardId);
 
-	const updatedTimeRef = useRef<Dayjs | null>(null); // Using ref to store the updated time
 	const modalRef = useRef<any>(null);
 
 	const isVisible = useTabVisibility();
 
 	const { t } = useTranslation(['dashboard']);
-	const dashboardRef = useRef<Dashboard>();
 
 	const [isDashboardFetching, setIsDashboardFetching] = useState<boolean>(false);
 
@@ -185,98 +182,92 @@ export function DashboardProvider({
 				if (variables) {
 					initializeDefaultVariables(variables, getUrlVariables, updateUrlVariable);
 				}
+			},
+		},
+	);
 
-				const updatedDate = dayjs(updatedDashboardData?.updatedAt);
+	// Handle dashboard data updates in a useEffect so that selectedDashboard state
+	// is always current when comparing timestamps (avoids stale closure issues in onSuccess)
+	useEffect(() => {
+		if (!dashboardResponse.data?.data) {
+			return;
+		}
 
-				setIsDashboardLocked(updatedDashboardData?.locked || false);
+		const updatedDashboardData = transformDashboardVariables(
+			dashboardResponse.data.data,
+		);
+		const updatedDate = dayjs(updatedDashboardData?.updatedAt);
 
-				// on first render
-				if (updatedTimeRef.current === null) {
+		setIsDashboardLocked(updatedDashboardData?.locked || false);
+
+		// on first render
+		if (!selectedDashboard) {
+			setSelectedDashboard(updatedDashboardData);
+			setLayouts(sortLayout(getUpdatedLayout(updatedDashboardData?.data.layout)));
+			setPanelMap(defaultTo(updatedDashboardData?.data?.panelMap, {}));
+			return;
+		}
+
+		if (
+			updatedDate.isAfter(dayjs(selectedDashboard.updatedAt)) &&
+			isVisible &&
+			selectedDashboard.id === updatedDashboardData?.id
+		) {
+			// show modal when state is out of sync
+			const modal = onModal.confirm({
+				centered: true,
+				title: t('dashboard_has_been_updated'),
+				content: t('do_you_want_to_refresh_the_dashboard'),
+				onOk() {
 					setSelectedDashboard(updatedDashboardData);
 
-					updatedTimeRef.current = updatedDate;
+					const { maxTime, minTime } = getMinMaxForSelectedTime(
+						globalTime.selectedTime,
+						globalTime.minTime,
+						globalTime.maxTime,
+					);
 
-					dashboardRef.current = updatedDashboardData;
+					dispatch({
+						type: UPDATE_TIME_INTERVAL,
+						payload: {
+							maxTime,
+							minTime,
+							selectedTime: globalTime.selectedTime,
+						},
+					});
 
 					setLayouts(
 						sortLayout(getUpdatedLayout(updatedDashboardData?.data.layout)),
 					);
 
-					setPanelMap(defaultTo(updatedDashboardData?.data?.panelMap, {}));
-				}
+					setPanelMap(defaultTo(updatedDashboardData?.data.panelMap, {}));
+				},
+			});
 
-				if (
-					updatedTimeRef.current !== null &&
-					updatedDate.isAfter(updatedTimeRef.current) &&
-					isVisible &&
-					dashboardRef.current?.id === updatedDashboardData?.id
-				) {
-					// show modal when state is out of sync
-					const modal = onModal.confirm({
-						centered: true,
-						title: t('dashboard_has_been_updated'),
-						content: t('do_you_want_to_refresh_the_dashboard'),
-						onOk() {
-							setSelectedDashboard(updatedDashboardData);
+			modalRef.current = modal;
+		} else {
+			// normal flow
+			if (!isEqual(selectedDashboard, updatedDashboardData)) {
+				setSelectedDashboard(updatedDashboardData);
+			}
 
-							const { maxTime, minTime } = getMinMaxForSelectedTime(
-								globalTime.selectedTime,
-								globalTime.minTime,
-								globalTime.maxTime,
-							);
+			if (
+				!isEqual(
+					[omitBy(layouts, (value): boolean => isUndefined(value))[0]],
+					updatedDashboardData?.data.layout,
+				)
+			) {
+				setLayouts(sortLayout(getUpdatedLayout(updatedDashboardData?.data.layout)));
 
-							dispatch({
-								type: UPDATE_TIME_INTERVAL,
-								payload: {
-									maxTime,
-									minTime,
-									selectedTime: globalTime.selectedTime,
-								},
-							});
-
-							dashboardRef.current = updatedDashboardData;
-
-							updatedTimeRef.current = dayjs(updatedDashboardData?.updatedAt);
-
-							setLayouts(
-								sortLayout(getUpdatedLayout(updatedDashboardData?.data.layout)),
-							);
-
-							setPanelMap(defaultTo(updatedDashboardData?.data.panelMap, {}));
-						},
-					});
-
-					modalRef.current = modal;
-				} else {
-					// normal flow
-					updatedTimeRef.current = dayjs(updatedDashboardData?.updatedAt);
-
-					dashboardRef.current = updatedDashboardData;
-
-					if (!isEqual(selectedDashboard, updatedDashboardData)) {
-						setSelectedDashboard(updatedDashboardData);
-					}
-
-					if (
-						!isEqual(
-							[omitBy(layouts, (value): boolean => isUndefined(value))[0]],
-							updatedDashboardData?.data.layout,
-						)
-					) {
-						setLayouts(
-							sortLayout(getUpdatedLayout(updatedDashboardData?.data.layout)),
-						);
-
-						setPanelMap(defaultTo(updatedDashboardData?.data.panelMap, {}));
-					}
-				}
-			},
-		},
-	);
+				setPanelMap(defaultTo(updatedDashboardData?.data.panelMap, {}));
+			}
+		}
+		// eslint-disable-next-line react-hooks/exhaustive-deps
+	}, [dashboardResponse.data]);
 
 	useEffect(() => {
 		// make the call on tab visibility only if the user is on dashboard / widget page
-		if (isVisible && updatedTimeRef.current && !!dashboardId) {
+		if (isVisible && !!selectedDashboard && !!dashboardId) {
 			dashboardResponse.refetch();
 		}
 		// eslint-disable-next-line react-hooks/exhaustive-deps
@@ -331,7 +322,6 @@ export function DashboardProvider({
 			setLayouts,
 			setPanelMap,
 			setSelectedDashboard,
-			updatedTimeRef,
 			updateLocalStorageDashboardVariables,
 			dashboardQueryRangeCalled,
 			setDashboardQueryRangeCalled,

frontend/src/providers/Dashboard/types.ts

@@ -1,6 +1,5 @@
 import { Layout } from 'react-grid-layout';
 import { UseQueryResult } from 'react-query';
-import dayjs from 'dayjs';
 import { SuccessResponseV2 } from 'types/api';
 import { Dashboard } from 'types/api/dashboard/getAll';
 
@@ -22,7 +21,6 @@ export interface IDashboardContext {
 	setSelectedDashboard: React.Dispatch<
 		React.SetStateAction<Dashboard | undefined>
 	>;
-	updatedTimeRef: React.MutableRefObject<dayjs.Dayjs | null>;
 	updateLocalStorageDashboardVariables: (
 		id: string,
 		selectedValue:

pkg/telemetrytraces/const.go

@@ -1,50 +1,6 @@
 package telemetrytraces
 
-import (
-	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
-)
-
-const (
-
-	// Internal Columns
-	SpanTimestampBucketStartColumn = "ts_bucket_start"
-	SpanResourceFingerPrintColumn  = "resource_fingerprint"
-
-	// Intrinsic Columns
-	SpanTimestampColumn        = "timestamp"
-	SpanTraceIDColumn          = "trace_id"
-	SpanSpanIDColumn           = "span_id"
-	SpanTraceStateColumn       = "trace_state"
-	SpanParentSpanIDColumn     = "parent_span_id"
-	SpanFlagsColumn            = "flags"
-	SpanNameColumn             = "name"
-	SpanKindColumn             = "kind"
-	SpanKindStringColumn       = "kind_string"
-	SpanDurationNanoColumn     = "duration_nano"
-	SpanStatusCodeColumn       = "status_code"
-	SpanStatusMessageColumn    = "status_message"
-	SpanStatusCodeStringColumn = "status_code_string"
-	SpanEventsColumn           = "events"
-	SpanLinksColumn            = "links"
-
-	// Calculated Columns
-	SpanResponseStatusCodeColumn = "response_status_code"
-	SpanExternalHTTPURLColumn    = "external_http_url"
-	SpanHTTPURLColumn            = "http_url"
-	SpanExternalHTTPMethodColumn = "external_http_method"
-	SpanHTTPMethodColumn         = "http_method"
-	SpanHTTPHostColumn           = "http_host"
-	SpanDBNameColumn             = "db_name"
-	SpanDBOperationColumn        = "db_operation"
-	SpanHasErrorColumn           = "has_error"
-	SpanIsRemoteColumn           = "is_remote"
-
-	// Contextual Columns
-	SpanAttributesStringColumn = "attributes_string"
-	SpanAttributesNumberColumn = "attributes_number"
-	SpanAttributesBoolColumn   = "attributes_bool"
-	SpanResourcesStringColumn  = "resources_string"
-)
+import "github.com/SigNoz/signoz/pkg/types/telemetrytypes"
 
 var (
 	IntrinsicFields = map[string]telemetrytypes.TelemetryFieldKey{

pkg/telemetrytraces/statement_builder.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"log/slog"
+	"slices"
 	"strings"
 
 	"github.com/SigNoz/signoz/pkg/errors"
@@ -13,6 +14,7 @@ import (
 	qbtypes "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
 	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
 	"github.com/huandu/go-sqlbuilder"
+	"golang.org/x/exp/maps"
 )
 
 var (
@@ -72,6 +74,41 @@ func (b *traceQueryStatementBuilder) Build(
 		return nil, err
 	}
 
+	/*
+		Adding a tech debt note here:
+		This piece of code is a hot fix and should be removed once we close issue: engineering-pod/issues/3622
+	*/
+	/*
+		-------------------------------- Start of tech debt ----------------------------
+	*/
+	if requestType == qbtypes.RequestTypeRaw {
+
+		selectedFields := query.SelectFields
+
+		if len(selectedFields) == 0 {
+			sortedKeys := maps.Keys(DefaultFields)
+			slices.Sort(sortedKeys)
+			for _, key := range sortedKeys {
+				selectedFields = append(selectedFields, DefaultFields[key])
+			}
+			query.SelectFields = selectedFields
+		}
+
+		selectFieldKeys := []string{}
+		for _, field := range selectedFields {
+			selectFieldKeys = append(selectFieldKeys, field.Name)
+		}
+
+		for _, x := range []string{"timestamp", "span_id", "trace_id"} {
+			if !slices.Contains(selectFieldKeys, x) {
+				query.SelectFields = append(query.SelectFields, DefaultFields[x])
+			}
+		}
+	}
+	/*
+		-------------------------------- End of tech debt ----------------------------
+	*/
+
 	query = b.adjustKeys(ctx, keys, query, requestType)
 
 	// Check if filter contains trace_id(s) and optimize time range if needed
@@ -274,53 +311,13 @@ func (b *traceQueryStatementBuilder) buildListQuery(
 		cteArgs = append(cteArgs, args)
 	}
 
-	sb.SelectMore(SpanTimestampColumn)
-	sb.SelectMore(SpanTraceIDColumn)
-	sb.SelectMore(SpanSpanIDColumn)
-	// By default select all
-	if len(query.SelectFields) == 0 {
-		// Select all intrinsic columns
-		sb.SelectMore(SpanTraceStateColumn)
-		sb.SelectMore(SpanParentSpanIDColumn)
-		sb.SelectMore(SpanFlagsColumn)
-		sb.SelectMore(SpanNameColumn)
-		sb.SelectMore(SpanKindColumn)
-		sb.SelectMore(SpanKindStringColumn)
-		sb.SelectMore(SpanDurationNanoColumn)
-		sb.SelectMore(SpanStatusCodeColumn)
-		sb.SelectMore(SpanStatusMessageColumn)
-		sb.SelectMore(SpanStatusCodeStringColumn)
-		sb.SelectMore(SpanEventsColumn)
-		sb.SelectMore(SpanLinksColumn)
-
-		// select all calculated columns
-		sb.SelectMore(SpanResponseStatusCodeColumn)
-		sb.SelectMore(SpanExternalHTTPURLColumn)
-		sb.SelectMore(SpanHTTPURLColumn)
-		sb.SelectMore(SpanExternalHTTPMethodColumn)
-		sb.SelectMore(SpanHTTPMethodColumn)
-		sb.SelectMore(SpanHTTPHostColumn)
-		sb.SelectMore(SpanDBNameColumn)
-		sb.SelectMore(SpanDBOperationColumn)
-		sb.SelectMore(SpanHasErrorColumn)
-		sb.SelectMore(SpanIsRemoteColumn)
-
-		// select all contextual columns
-		sb.SelectMore(SpanAttributesStringColumn)
-		sb.SelectMore(SpanAttributesNumberColumn)
-		sb.SelectMore(SpanAttributesBoolColumn)
-		sb.SelectMore(SpanResourcesStringColumn)
-	} else {
-		for _, field := range query.SelectFields {
-			if field.Name == SpanTimestampColumn || field.Name == SpanTraceIDColumn || field.Name == SpanSpanIDColumn {
-				continue
-			}
-			colExpr, err := b.fm.ColumnExpressionFor(ctx, &field, keys)
-			if err != nil {
-				return nil, err
-			}
-			sb.SelectMore(colExpr)
+	// TODO: should we deprecate `SelectFields` and return everything from a span like we do for logs?
+	for _, field := range query.SelectFields {
+		colExpr, err := b.fm.ColumnExpressionFor(ctx, &field, keys)
+		if err != nil {
+			return nil, err
 		}
+		sb.SelectMore(colExpr)
 	}
 
 	// From table