feat(rules)!: drop frontend source URL fallback for related logs/traces and generator URL

Always derive the host portion of the rule generator URL and the
related_logs / related_traces annotations from SIGNOZ_ALERTMANAGER_SIGNOZ_EXTERNAL__URL.
Self-hosted deployments that have not set the env var will see the
default (http://localhost:8080) in alert notifications, which makes the
need to configure it surface clearly. Revert this commit to restore the
prior fallback behavior.

Refs SigNoz/engineering-pod#5055

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

.github/CODEOWNERS

@@ -118,9 +118,6 @@ go.mod @therealpandey
 
 /tests/integration/ @therealpandey
 
-# e2e tests
-/tests/e2e/ @AshwinBhatkal
-
 # Flagger Owners
 
 /pkg/flagger/ @therealpandey
@@ -165,7 +162,3 @@ go.mod @therealpandey
 /frontend/src/lib/dashboard/ @SigNoz/pulse-frontend
 /frontend/src/lib/dashboardVariables/ @SigNoz/pulse-frontend
 /frontend/src/components/NewSelect/ @SigNoz/pulse-frontend
-
-## Dashboard V2
-/frontend/src/pages/DashboardPageV2/ @SigNoz/pulse-frontend
-/frontend/src/pages/DashboardsListPageV2/ @SigNoz/pulse-frontend

cmd/community/server.go

@@ -3,6 +3,7 @@ package main
 import (
 	"context"
 	"log/slog"
+	"net/url"
 
 	"github.com/spf13/cobra"
 
@@ -118,8 +119,8 @@ func runServer(ctx context.Context, config signoz.Config, logger *slog.Logger) e
 		func(_ sqlstore.SQLStore, _ global.Global, _ zeus.Zeus, _ gateway.Gateway, _ licensing.Licensing, _ serviceaccount.Module, _ cloudintegration.Config) (cloudintegration.Module, error) {
 			return implcloudintegration.NewModule(), nil
 		},
-		func(c cache.Cache, am alertmanager.Alertmanager, ss sqlstore.SQLStore, ts telemetrystore.TelemetryStore, ms telemetrytypes.MetadataStore, p prometheus.Prometheus, og organization.Getter, rsh rulestatehistory.Module, q querier.Querier, qp queryparser.QueryParser) factory.NamedMap[factory.ProviderFactory[ruler.Ruler, ruler.Config]] {
-			return factory.MustNewNamedMap(signozruler.NewFactory(c, am, ss, ts, ms, p, og, rsh, q, qp, nil, nil))
+		func(c cache.Cache, am alertmanager.Alertmanager, ss sqlstore.SQLStore, ts telemetrystore.TelemetryStore, ms telemetrytypes.MetadataStore, p prometheus.Prometheus, og organization.Getter, rsh rulestatehistory.Module, q querier.Querier, qp queryparser.QueryParser, externalURL *url.URL) factory.NamedMap[factory.ProviderFactory[ruler.Ruler, ruler.Config]] {
+			return factory.MustNewNamedMap(signozruler.NewFactory(c, am, ss, ts, ms, p, og, rsh, q, qp, externalURL, nil, nil))
 		},
 	)
 	if err != nil {

cmd/enterprise/server.go

@@ -3,6 +3,7 @@ package main
 import (
 	"context"
 	"log/slog"
+	"net/url"
 	"time"
 
 	"github.com/spf13/cobra"
@@ -181,8 +182,8 @@ func runServer(ctx context.Context, config signoz.Config, logger *slog.Logger) e
 
 			return implcloudintegration.NewModule(pkgcloudintegration.NewStore(sqlStore), global, zeus, gateway, licensing, serviceAccount, cloudProvidersMap, config)
 		},
-		func(c cache.Cache, am alertmanager.Alertmanager, ss sqlstore.SQLStore, ts telemetrystore.TelemetryStore, ms telemetrytypes.MetadataStore, p prometheus.Prometheus, og organization.Getter, rsh rulestatehistory.Module, q querier.Querier, qp queryparser.QueryParser) factory.NamedMap[factory.ProviderFactory[ruler.Ruler, ruler.Config]] {
-			return factory.MustNewNamedMap(signozruler.NewFactory(c, am, ss, ts, ms, p, og, rsh, q, qp, eerules.PrepareTaskFunc, eerules.TestNotification))
+		func(c cache.Cache, am alertmanager.Alertmanager, ss sqlstore.SQLStore, ts telemetrystore.TelemetryStore, ms telemetrytypes.MetadataStore, p prometheus.Prometheus, og organization.Getter, rsh rulestatehistory.Module, q querier.Querier, qp queryparser.QueryParser, externalURL *url.URL) factory.NamedMap[factory.ProviderFactory[ruler.Ruler, ruler.Config]] {
+			return factory.MustNewNamedMap(signozruler.NewFactory(c, am, ss, ts, ms, p, og, rsh, q, qp, externalURL, eerules.PrepareTaskFunc, eerules.TestNotification))
 		},
 	)
 	if err != nil {

ee/query-service/rules/manager.go

@@ -39,6 +39,7 @@ func PrepareTaskFunc(opts baserules.PrepareTaskOptions) (baserules.Task, error)
 			baserules.WithQueryParser(opts.ManagerOpts.QueryParser),
 			baserules.WithMetadataStore(opts.ManagerOpts.MetadataStore),
 			baserules.WithRuleStateHistoryModule(opts.ManagerOpts.RuleStateHistoryModule),
+			baserules.WithExternalURL(opts.ManagerOpts.ExternalURL),
 		)
 
 		if err != nil {
@@ -63,6 +64,7 @@ func PrepareTaskFunc(opts baserules.PrepareTaskOptions) (baserules.Task, error)
 			baserules.WithQueryParser(opts.ManagerOpts.QueryParser),
 			baserules.WithMetadataStore(opts.ManagerOpts.MetadataStore),
 			baserules.WithRuleStateHistoryModule(opts.ManagerOpts.RuleStateHistoryModule),
+			baserules.WithExternalURL(opts.ManagerOpts.ExternalURL),
 		)
 
 		if err != nil {
@@ -87,6 +89,7 @@ func PrepareTaskFunc(opts baserules.PrepareTaskOptions) (baserules.Task, error)
 			baserules.WithQueryParser(opts.ManagerOpts.QueryParser),
 			baserules.WithMetadataStore(opts.ManagerOpts.MetadataStore),
 			baserules.WithRuleStateHistoryModule(opts.ManagerOpts.RuleStateHistoryModule),
+			baserules.WithExternalURL(opts.ManagerOpts.ExternalURL),
 		)
 		if err != nil {
 			return task, err
@@ -146,6 +149,7 @@ func TestNotification(opts baserules.PrepareTestRuleOptions) (int, error) {
 			baserules.WithSQLStore(opts.SQLStore),
 			baserules.WithQueryParser(opts.ManagerOpts.QueryParser),
 			baserules.WithMetadataStore(opts.ManagerOpts.MetadataStore),
+			baserules.WithExternalURL(opts.ManagerOpts.ExternalURL),
 		)
 
 		if err != nil {
@@ -167,6 +171,7 @@ func TestNotification(opts baserules.PrepareTestRuleOptions) (int, error) {
 			baserules.WithSQLStore(opts.SQLStore),
 			baserules.WithQueryParser(opts.ManagerOpts.QueryParser),
 			baserules.WithMetadataStore(opts.ManagerOpts.MetadataStore),
+			baserules.WithExternalURL(opts.ManagerOpts.ExternalURL),
 		)
 
 		if err != nil {
@@ -186,6 +191,7 @@ func TestNotification(opts baserules.PrepareTestRuleOptions) (int, error) {
 			baserules.WithSQLStore(opts.SQLStore),
 			baserules.WithQueryParser(opts.ManagerOpts.QueryParser),
 			baserules.WithMetadataStore(opts.ManagerOpts.MetadataStore),
+			baserules.WithExternalURL(opts.ManagerOpts.ExternalURL),
 		)
 		if err != nil {
 			slog.Error("failed to prepare a new anomaly rule for test", "name", alertname, errors.Attr(err))

frontend/plugins/rules/no-antd-components.mjs

@@ -18,7 +18,6 @@ const BANNED_COMPONENTS = {
 		'Use @signozhq/ui/typography Typography instead of antd Typography.',
 	Switch: 'Use @signozhq/ui/switch Switch instead of antd Switch.',
 	Badge: 'Use @signozhq/ui/badge instead of antd Badge.',
-	Progress: 'Use @signozhq/ui/progress instead of antd Progress.',
 };
 
 export default {

frontend/src/components/CeleryOverview/CeleryOverviewTable/CeleryOverviewTable.styles.scss

@@ -51,6 +51,13 @@
 				background: var(--l1-background);
 			}
 
+			.progress-container {
+				.ant-progress-bg {
+					height: 8px !important;
+					border-radius: 4px;
+				}
+			}
+
 			.ant-table-tbody > tr:hover > td {
 				background: color-mix(in srgb, var(--l1-foreground) 4%, transparent);
 			}

frontend/src/components/CeleryOverview/CeleryOverviewTable/CeleryOverviewTable.tsx

@@ -9,13 +9,13 @@ import {
 	Flex,
 	Input,
 	InputRef,
+	Progress,
 	Space,
 	Spin,
 	TableColumnsType,
 	TableColumnType,
 	Tooltip,
 } from 'antd';
-import { Progress } from '@signozhq/ui/progress';
 import { Typography } from '@signozhq/ui/typography';
 import type { FilterDropdownProps } from 'antd/lib/table/interface';
 import logEvent from 'api/common/logEvent';
@@ -59,7 +59,7 @@ function ProgressRender(item: string | number): JSX.Element {
 			<Progress
 				percent={percent}
 				strokeLinecap="butt"
-				showInfo
+				size="small"
 				strokeColor={((): string => {
 					const cpuPercent = percent;
 					if (cpuPercent >= 90) {

frontend/src/components/Logs/TableView/useLogsTableColumns.tsx

@@ -69,8 +69,6 @@ export function useLogsTableColumns({
 					id: 'timestamp',
 					header: 'Timestamp',
 					accessorFn: (log): unknown => log.timestamp,
-					canBeHidden: false,
-					enableRemove: false,
 					width: { default: 170, min: 170 },
 					cell: ({ value }): ReactElement => {
 						const ts = value as string | number;
@@ -94,7 +92,6 @@ export function useLogsTableColumns({
 					header: 'Body',
 					accessorFn: (log): string => getBodyDisplayString(log.body),
 					canBeHidden: false,
-					enableRemove: false,
 					width: { default: '100%', min: 300 },
 					cell: ({ value, isActive }): ReactElement => (
 						<TanStackTable.Text

frontend/src/components/LogsFormatOptionsMenu/__tests__/LogsFormatOptionsMenu.test.tsx

@@ -62,7 +62,6 @@ describe('LogsFormatOptionsMenu (unit)', () => {
 						onSearch: jest.fn(),
 						onSelect: jest.fn(),
 						onRemove: jest.fn(),
-						onReorder: jest.fn(),
 					},
 				}}
 			/>,

frontend/src/components/TanStackTableView/TanStackTable.tsx

@@ -308,7 +308,9 @@ function TanStackTableInner<TData>(
 	});
 
 	const hasSingleColumn = useMemo(
-		() => effectiveColumns.filter((c) => !c.pin).length <= 1,
+		() =>
+			effectiveColumns.filter((c) => !c.pin && c.enableRemove !== false).length <=
+			1,
 		[effectiveColumns],
 	);
 

frontend/src/container/AlertHistory/Statistics/TopContributorsCard/TopContributorsCard.styles.scss

@@ -45,10 +45,6 @@
 	.contributors-row {
 		height: 80px;
 	}
-	.top-contributors-progress {
-		--progress-background: transparent;
-	}
-
 	&__content {
 		.ant-table {
 			&-cell {

frontend/src/container/AlertHistory/Statistics/TopContributorsCard/TopContributorsRows.tsx

@@ -1,7 +1,6 @@
 import { HTMLAttributes } from 'react';
 import { Color } from '@signozhq/design-tokens';
-import { Table, TableColumnsType as ColumnsType } from 'antd';
-import { Progress } from '@signozhq/ui/progress';
+import { Progress, Table, TableColumnsType as ColumnsType } from 'antd';
 import logEvent from 'api/common/logEvent';
 import { ConditionalAlertPopover } from 'container/AlertHistory/AlertPopover/AlertPopover';
 import AlertLabels from 'pages/AlertDetails/AlertHeader/AlertLabels/AlertLabels';
@@ -52,8 +51,8 @@ function TopContributorsRows({
 					<Progress
 						percent={(count / totalCurrentTriggers) * 100}
 						showInfo={false}
+						trailColor="rgba(255, 255, 255, 0)"
 						strokeColor={Color.BG_ROBIN_500}
-						className="top-contributors-progress"
 					/>
 				</ConditionalAlertPopover>
 			),

frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/DomainDetails.styles.scss

@@ -141,9 +141,12 @@
 
 			.progress-container {
 				width: 158px;
+				.ant-progress {
+					margin: 0;
 
-				span {
-					font-weight: 600;
+					.ant-progress-text {
+						font-weight: 600;
+					}
 				}
 			}
 

frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/components/DomainMetrics.tsx

@@ -1,8 +1,7 @@
 import { useMemo } from 'react';
 import { useQueries } from 'react-query';
 import { Color } from '@signozhq/design-tokens';
-import { Skeleton, Tooltip } from 'antd';
-import { Progress } from '@signozhq/ui/progress';
+import { Progress, Skeleton, Tooltip } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import { ENTITY_VERSION_V5 } from 'constants/app';
 import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
@@ -137,11 +136,12 @@ function DomainMetrics({
 							<Tooltip title={formattedDomainMetricsData.errorRate}>
 								{formattedDomainMetricsData.errorRate !== '-' ? (
 									<Progress
+										status="active"
 										percent={Number(
 											Number(formattedDomainMetricsData.errorRate).toFixed(2),
 										)}
 										strokeLinecap="butt"
-										showInfo
+										size="small"
 										strokeColor={((): string => {
 											const errorRatePercent = Number(
 												Number(formattedDomainMetricsData.errorRate).toFixed(2),

frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/components/EndPointMetrics.tsx

@@ -1,8 +1,7 @@
 import { useMemo } from 'react';
 import { UseQueryResult } from 'react-query';
 import { Color } from '@signozhq/design-tokens';
-import { Skeleton, Tooltip } from 'antd';
-import { Progress } from '@signozhq/ui/progress';
+import { Progress, Skeleton, Tooltip } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import {
 	getDisplayValue,
@@ -81,9 +80,10 @@ function EndPointMetrics({
 							<Tooltip title={metricsData?.errorRate}>
 								{metricsData?.errorRate !== '-' ? (
 									<Progress
+										status="active"
 										percent={Number(Number(metricsData?.errorRate ?? 0).toFixed(2))}
 										strokeLinecap="butt"
-										showInfo
+										size="small"
 										strokeColor={((): string => {
 											const errorRatePercent = Number(
 												Number(metricsData?.errorRate ?? 0).toFixed(2),

frontend/src/container/ApiMonitoring/utils.tsx

@@ -1,7 +1,6 @@
 import { ReactNode } from 'react';
 import { Color } from '@signozhq/design-tokens';
-import { TableColumnType as ColumnType, Tag, Tooltip } from 'antd';
-import { Progress } from '@signozhq/ui/progress';
+import { Progress, TableColumnType as ColumnType, Tag, Tooltip } from 'antd';
 import { convertFiltersToExpressionWithExistingQuery } from 'components/QueryBuilderV2/utils';
 import {
 	FiltersType,
@@ -258,9 +257,10 @@ export const columnsConfig: ColumnType<APIDomainsRowData>[] = [
 				errorRate === 'n/a' || errorRate === '-' ? 0 : errorRate;
 			return (
 				<Progress
+					status="active"
 					percent={Number((errorRateValue as number).toFixed(2))}
 					strokeLinecap="butt"
-					showInfo
+					size="small"
 					strokeColor={((): string => {
 						const errorRatePercent = Number((errorRateValue as number).toFixed(2));
 						if (errorRatePercent >= 90) {
@@ -1022,13 +1022,14 @@ export const getEndPointsColumnsConfig = (
 		className: `column`,
 		render: (errorRate: number | string): React.ReactNode => (
 			<Progress
+				status="active"
 				percent={Number(
 					(
 						(errorRate === 'n/a' || errorRate === '-' ? 0 : errorRate) as number
 					).toFixed(1),
 				)}
 				strokeLinecap="butt"
-				showInfo
+				size="small"
 				strokeColor={((): string => {
 					const errorRatePercent = Number((errorRate as number).toFixed(1));
 					if (errorRatePercent >= 90) {
@@ -2513,9 +2514,10 @@ export const dependentServicesColumns: ColumnType<DependentServicesData>[] = [
 		render: (errorPercentage: number | string): React.ReactNode =>
 			errorPercentage !== '-' ? (
 				<Progress
+					status="active"
 					percent={Number((errorPercentage as number).toFixed(2))}
 					strokeLinecap="butt"
-					showInfo
+					size="small"
 					strokeColor={((): string => {
 						const errorPercentagePercent = Number(
 							(errorPercentage as number).toFixed(2),
@@ -3020,13 +3022,14 @@ export const getAllEndpointsWidgetData = (
 		),
 		F1: (errorRate: any): ReactNode => (
 			<Progress
+				status="active"
 				percent={Number(
 					(
 						(errorRate === 'n/a' || errorRate === '-' ? 0 : errorRate) as number
 					).toFixed(2),
 				)}
 				strokeLinecap="butt"
-				showInfo
+				size="small"
 				strokeColor={((): string => {
 					const errorRatePercent = Number(
 						(

frontend/src/container/Home/StepsProgress/StepsProgress.styles.scss

@@ -39,5 +39,7 @@
 
 	width: 100% !important;
 
-	--progress-width: 100%;
+	.ant-progress-steps-outer {
+		width: 100% !important;
+	}
 }

frontend/src/container/Home/StepsProgress/StepsProgress.tsx

@@ -1,4 +1,4 @@
-import { Progress } from '@signozhq/ui/progress';
+import { Progress } from 'antd';
 
 import { ChecklistItem } from '../HomeChecklist/HomeChecklist';
 
@@ -15,7 +15,9 @@ function StepsProgress({
 
 	const totalChecklistItems = checklistItems.length;
 
-	const progress = (completedChecklistItems.length / totalChecklistItems) * 100;
+	const progress = Math.round(
+		(completedChecklistItems.length / totalChecklistItems) * 100,
+	);
 
 	return (
 		<div className="steps-progress-container">

frontend/src/container/InfraMonitoringHosts/constants.tsx

@@ -1,7 +1,6 @@
 import React from 'react';
 import { Color } from '@signozhq/design-tokens';
-import { Tag } from 'antd';
-import { Progress } from '@signozhq/ui/progress';
+import { Progress, Tag } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import {
 	getHostLists,
@@ -80,8 +79,8 @@ export const hostDetailsMetadataConfig: K8sDetailsMetadataConfig<HostData>[] = [
 		render: (value): React.ReactNode => (
 			<Progress
 				percent={Number(Number(value).toFixed(1))}
+				size="small"
 				strokeColor={getProgressColor(Number(value))}
-				showInfo
 			/>
 		),
 	},
@@ -91,8 +90,8 @@ export const hostDetailsMetadataConfig: K8sDetailsMetadataConfig<HostData>[] = [
 		render: (value): React.ReactNode => (
 			<Progress
 				percent={Number(Number(value).toFixed(1))}
+				size="small"
 				strokeColor={getMemoryProgressColor(Number(value))}
-				showInfo
 			/>
 		),
 	},

frontend/src/container/InfraMonitoringHosts/table.module.scss

@@ -60,6 +60,11 @@
 	& > div {
 		width: 100%;
 	}
+
+	:global(.ant-progress-bg) {
+		height: 8px !important;
+		border-radius: 4px;
+	}
 }
 
 .progressBar {

frontend/src/container/InfraMonitoringK8s/EntityDetailsUtils/entityDetails.styles.scss

@@ -103,8 +103,12 @@
 			.progress-container {
 				width: 158px;
 
-				span {
-					font-weight: 600;
+				.ant-progress {
+					margin: 0;
+
+					.ant-progress-text {
+						font-weight: 600;
+					}
 				}
 			}
 
@@ -288,6 +292,10 @@
 			}
 
 			.progress-container {
+				.ant-progress-bg {
+					height: 8px !important;
+					border-radius: 4px;
+				}
 			}
 
 			.ant-table-tbody > tr:hover > td {

frontend/src/container/InfraMonitoringK8s/components/EntityProgressBar.tsx

@@ -1,4 +1,4 @@
-import { Progress } from '@signozhq/ui/progress';
+import { Progress } from 'antd';
 import TanStackTable from 'components/TanStackTableView';
 import {
 	getMemoryProgressColor,
@@ -53,6 +53,7 @@ export function EntityProgressBar({
 			<Progress
 				percent={percentage}
 				strokeLinecap="butt"
+				size="small"
 				status="normal"
 				strokeColor={getStrokeColor(type, value)}
 				className={styles.progressBar}

frontend/src/container/LiveLogs/LiveLogsList/index.tsx

@@ -16,6 +16,7 @@ import { useLogsTableColumns } from 'components/Logs/TableView/useLogsTableColum
 import OverlayScrollbar from 'components/OverlayScrollbar/OverlayScrollbar';
 import type { TanStackTableHandle } from 'components/TanStackTableView';
 import TanStackTable from 'components/TanStackTableView';
+import { useHiddenColumnIds } from 'components/TanStackTableView/useColumnStore';
 import { CARD_BODY_STYLE } from 'constants/card';
 import { LOCALSTORAGE } from 'constants/localStorage';
 import { OptionFormatTypes } from 'constants/optionsFormatTypes';
@@ -23,11 +24,13 @@ import { QueryParams } from 'constants/query';
 import { InfinityWrapperStyled } from 'container/LogsExplorerList/styles';
 import { convertKeysToColumnFields } from 'container/LogsExplorerList/utils';
 import { useOptionsMenu } from 'container/OptionsMenu';
+import { defaultLogsSelectedColumns } from 'container/OptionsMenu/constants';
 import { useCopyLogLink } from 'hooks/logs/useCopyLogLink';
 import useLogDetailHandlers from 'hooks/logs/useLogDetailHandlers';
 import useScrollToLog from 'hooks/logs/useScrollToLog';
 import { useIsDarkMode } from 'hooks/useDarkMode';
 import { useEventSource } from 'providers/EventSource';
+import { usePreferenceContext } from 'providers/preferences/context/PreferenceContextProvider';
 // interfaces
 import { ILog } from 'types/api/logs/log';
 import { DataSource, StringOperators } from 'types/common/queryBuilder';
@@ -51,6 +54,9 @@ function LiveLogsList({
 	const { isConnectionLoading } = useEventSource();
 
 	const { activeLogId } = useCopyLogLink();
+	const { logs: logsPreferences } = usePreferenceContext();
+	const hiddenColumnIds = useHiddenColumnIds(LOCALSTORAGE.LOGS_LIST_COLUMNS);
+	const hasReconciledHiddenColumnsRef = useRef(false);
 
 	const {
 		activeLog,
@@ -66,7 +72,7 @@ function LiveLogsList({
 		[logs],
 	);
 
-	const { options, config } = useOptionsMenu({
+	const { options } = useOptionsMenu({
 		storageKey: LOCALSTORAGE.LOGS_LIST_OPTIONS,
 		dataSource: DataSource.LOGS,
 		aggregateOperator: StringOperators.NOOP,
@@ -77,7 +83,16 @@ function LiveLogsList({
 		[formattedLogs, activeLogId],
 	);
 
-	const selectedFields = convertKeysToColumnFields(options.selectColumns);
+	const selectedFields = convertKeysToColumnFields([
+		...defaultLogsSelectedColumns,
+		...options.selectColumns,
+	]);
+
+	const syncedSelectedColumns = useMemo(
+		() =>
+			options.selectColumns.filter(({ name }) => !hiddenColumnIds.includes(name)),
+		[options.selectColumns, hiddenColumnIds],
+	);
 
 	const logsColumns = useLogsTableColumns({
 		fields: selectedFields,
@@ -85,6 +100,30 @@ function LiveLogsList({
 		appendTo: 'end',
 	});
 
+	useEffect(() => {
+		if (hasReconciledHiddenColumnsRef.current) {
+			return;
+		}
+
+		hasReconciledHiddenColumnsRef.current = true;
+
+		if (syncedSelectedColumns.length === options.selectColumns.length) {
+			return;
+		}
+
+		logsPreferences.updateColumns(syncedSelectedColumns);
+	}, [logsPreferences, options.selectColumns.length, syncedSelectedColumns]);
+
+	const handleColumnRemove = useCallback(
+		(columnId: string) => {
+			const updatedColumns = options.selectColumns.filter(
+				({ name }) => name !== columnId,
+			);
+			logsPreferences.updateColumns(updatedColumns);
+		},
+		[options.selectColumns, logsPreferences],
+	);
+
 	const makeOnLogCopy = useCallback(
 		(log: ILog) =>
 			(event: MouseEvent<HTMLElement>): void => {
@@ -198,7 +237,7 @@ function LiveLogsList({
 							ref={ref as React.Ref<TanStackTableHandle>}
 							columns={logsColumns}
 							columnStorageKey={LOCALSTORAGE.LOGS_LIST_COLUMNS}
-							onColumnRemove={config?.addColumn?.onRemove}
+							onColumnRemove={handleColumnRemove}
 							plainTextCellLineClamp={options.maxLines}
 							cellTypographySize={options.fontSize}
 							data={formattedLogs}

frontend/src/container/LogsExplorerList/index.tsx

@@ -18,19 +18,21 @@ import OverlayScrollbar from 'components/OverlayScrollbar/OverlayScrollbar';
 import Spinner from 'components/Spinner';
 import type { TanStackTableHandle } from 'components/TanStackTableView';
 import TanStackTable from 'components/TanStackTableView';
-import type { TableColumnDef } from 'components/TanStackTableView/types';
+import { useHiddenColumnIds } from 'components/TanStackTableView/useColumnStore';
 import { CARD_BODY_STYLE } from 'constants/card';
 import { LOCALSTORAGE } from 'constants/localStorage';
 import { QueryParams } from 'constants/query';
 import EmptyLogsSearch from 'container/EmptyLogsSearch/EmptyLogsSearch';
 import { LogsLoading } from 'container/LogsLoading/LogsLoading';
 import { useOptionsMenu } from 'container/OptionsMenu';
+import { defaultLogsSelectedColumns } from 'container/OptionsMenu/constants';
 import { FontSize } from 'container/OptionsMenu/types';
 import { useCopyLogLink } from 'hooks/logs/useCopyLogLink';
 import useLogDetailHandlers from 'hooks/logs/useLogDetailHandlers';
 import useScrollToLog from 'hooks/logs/useScrollToLog';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import { useIsDarkMode } from 'hooks/useDarkMode';
+import { usePreferenceContext } from 'providers/preferences/context/PreferenceContextProvider';
 import APIError from 'types/api/error';
 // interfaces
 import { ILog } from 'types/api/logs/log';
@@ -67,6 +69,10 @@ function LogsExplorerList({
 	const [, setCopy] = useCopyToClipboard();
 	const isDarkMode = useIsDarkMode();
 	const { activeLogId } = useCopyLogLink();
+	const { logs: logsPreferences } = usePreferenceContext();
+	const hiddenColumnIds = useHiddenColumnIds(LOCALSTORAGE.LOGS_LIST_COLUMNS);
+	const hasReconciledHiddenColumnsRef = useRef(false);
+
 	const {
 		activeLog,
 		onAddToQuery,
@@ -75,7 +81,7 @@ function LogsExplorerList({
 		handleCloseLogDetail,
 	} = useLogDetailHandlers();
 
-	const { options, config } = useOptionsMenu({
+	const { options } = useOptionsMenu({
 		storageKey: LOCALSTORAGE.LOGS_LIST_OPTIONS,
 		dataSource: DataSource.LOGS,
 		aggregateOperator:
@@ -91,15 +97,28 @@ function LogsExplorerList({
 	);
 
 	const selectedFields = useMemo(
-		() => convertKeysToColumnFields(options.selectColumns),
-		[options.selectColumns],
+		() =>
+			convertKeysToColumnFields([
+				...defaultLogsSelectedColumns,
+				...options.selectColumns,
+			]),
+		[options],
 	);
 
-	const handleColumnOrderChange = useCallback(
-		(cols: TableColumnDef<ILog>[]): void => {
-			config?.addColumn?.onReorder(cols.map((c) => c.id));
+	const syncedSelectedColumns = useMemo(
+		() =>
+			options.selectColumns.filter(({ name }) => !hiddenColumnIds.includes(name)),
+		[options.selectColumns, hiddenColumnIds],
+	);
+
+	const handleColumnRemove = useCallback(
+		(columnId: string) => {
+			const updatedColumns = options.selectColumns.filter(
+				({ name }) => name !== columnId,
+			);
+			logsPreferences.updateColumns(updatedColumns);
 		},
-		[config],
+		[options.selectColumns, logsPreferences],
 	);
 
 	const logsColumns = useLogsTableColumns({
@@ -142,6 +161,20 @@ function LogsExplorerList({
 		}
 	}, [isLoading, isFetching, isError, logs.length]);
 
+	useEffect(() => {
+		if (hasReconciledHiddenColumnsRef.current) {
+			return;
+		}
+
+		hasReconciledHiddenColumnsRef.current = true;
+
+		if (syncedSelectedColumns.length === options.selectColumns.length) {
+			return;
+		}
+
+		logsPreferences.updateColumns(syncedSelectedColumns);
+	}, [logsPreferences, options.selectColumns.length, syncedSelectedColumns]);
+
 	const getItemContent = useCallback(
 		(_: number, log: ILog): JSX.Element => {
 			if (options.format === 'raw') {
@@ -204,8 +237,7 @@ function LogsExplorerList({
 					ref={ref as React.Ref<TanStackTableHandle>}
 					columns={logsColumns}
 					columnStorageKey={LOCALSTORAGE.LOGS_LIST_COLUMNS}
-					onColumnRemove={config?.addColumn?.onRemove}
-					onColumnOrderChange={handleColumnOrderChange}
+					onColumnRemove={handleColumnRemove}
 					plainTextCellLineClamp={options.maxLines}
 					cellTypographySize={options.fontSize}
 					data={logs}

frontend/src/container/MetricsExplorer/Summary/Summary.styles.scss

@@ -142,6 +142,13 @@
 				}
 			}
 
+			.progress-container {
+				.ant-progress-bg {
+					height: 8px !important;
+					border-radius: 4px;
+				}
+			}
+
 			.ant-table-tbody > tr:hover > td {
 				background: color-mix(in srgb, var(--l1-foreground) 4%, transparent);
 			}

frontend/src/container/OptionsMenu/__test__/ensureLogsRequiredColumns.test.ts

@@ -1,79 +0,0 @@
-import { TelemetryFieldKey } from 'api/v5/v5';
-
-import {
-	defaultLogsSelectedColumns,
-	ensureLogsRequiredColumns,
-} from '../constants';
-
-const TIMESTAMP = defaultLogsSelectedColumns.find(
-	(c) => c.name === 'timestamp',
-);
-const BODY = defaultLogsSelectedColumns.find((c) => c.name === 'body');
-
-if (!TIMESTAMP || !BODY) {
-	throw new Error('defaults missing timestamp/body — test fixture invalid');
-}
-
-const ATTR_A: TelemetryFieldKey = {
-	name: 'service.name',
-	signal: 'logs',
-	fieldContext: 'resource',
-	fieldDataType: 'string',
-};
-const ATTR_B: TelemetryFieldKey = {
-	name: 'severity_text',
-	signal: 'logs',
-	fieldContext: 'log',
-	fieldDataType: 'string',
-};
-
-describe('ensureLogsRequiredColumns', () => {
-	it('prepends both timestamp + body to an empty list', () => {
-		expect(ensureLogsRequiredColumns([])).toStrictEqual([TIMESTAMP, BODY]);
-	});
-
-	it('prepends only `body` when `timestamp` is already present', () => {
-		expect(ensureLogsRequiredColumns([TIMESTAMP, ATTR_A])).toStrictEqual([
-			BODY,
-			TIMESTAMP,
-			ATTR_A,
-		]);
-	});
-
-	it('prepends only `timestamp` when `body` is already present', () => {
-		expect(ensureLogsRequiredColumns([BODY, ATTR_A])).toStrictEqual([
-			TIMESTAMP,
-			BODY,
-			ATTR_A,
-		]);
-	});
-
-	it('returns the same array when both are present (no duplicates, original order preserved)', () => {
-		const input = [TIMESTAMP, BODY, ATTR_A, ATTR_B];
-		expect(ensureLogsRequiredColumns(input)).toBe(input);
-	});
-
-	it('preserves a non-default order when both are present', () => {
-		const input = [ATTR_A, BODY, ATTR_B, TIMESTAMP];
-		expect(ensureLogsRequiredColumns(input)).toStrictEqual(input);
-	});
-
-	it('prepends both when neither is present in a list of user attributes', () => {
-		expect(ensureLogsRequiredColumns([ATTR_A, ATTR_B])).toStrictEqual([
-			TIMESTAMP,
-			BODY,
-			ATTR_A,
-			ATTR_B,
-		]);
-	});
-
-	it('does not duplicate if a required column appears twice in the input', () => {
-		// Tolerant of malformed input — invariant only adds *missing* required
-		// columns; it does not deduplicate existing entries (that's a separate
-		// concern, not its job).
-		const input = [BODY, BODY, ATTR_A];
-		const result = ensureLogsRequiredColumns(input);
-		expect(result.filter((c) => c.name === 'timestamp')).toHaveLength(1);
-		expect(result[0]).toStrictEqual(TIMESTAMP);
-	});
-});

frontend/src/container/OptionsMenu/constants.ts

@@ -35,32 +35,6 @@ export const defaultLogsSelectedColumns: TelemetryFieldKey[] = [
 	},
 ];
 
-const LOGS_REQUIRED_COLUMNS = ['timestamp', 'body'] as const;
-
-/**
- * Always-on invariant: every logs selectColumns array must contain `body` and
- * `timestamp`. Applied at both loader and writer boundaries so the picker, the
- * table, and persisted state can never diverge into a "missing required
- * column" state.
- */
-export function ensureLogsRequiredColumns(
-	columns: TelemetryFieldKey[],
-): TelemetryFieldKey[] {
-	const missing = LOGS_REQUIRED_COLUMNS.filter(
-		(name) => !columns.some((c) => c.name === name),
-	);
-	if (missing.length === 0) {
-		return columns;
-	}
-	const defaultsByName = new Map(
-		defaultLogsSelectedColumns.map((c) => [c.name, c]),
-	);
-	const prepended = missing
-		.map((name) => defaultsByName.get(name))
-		.filter((c): c is TelemetryFieldKey => c !== undefined);
-	return [...prepended, ...columns];
-}
-
 export const defaultTraceSelectedColumns: TelemetryFieldKey[] = [
 	{
 		name: 'service.name',

frontend/src/container/OptionsMenu/types.ts

@@ -40,6 +40,5 @@ export type OptionsMenuConfig = {
 		isFetching: boolean;
 		value: TelemetryFieldKey[];
 		onRemove: (key: string) => void;
-		onReorder: (orderedIds: string[]) => void;
 	};
 };

frontend/src/container/OptionsMenu/useOptionsMenu.ts

@@ -187,6 +187,30 @@ const useOptionsMenu = ({
 			searchedAttributesDataV5?.data.data.keys || {},
 		).flat();
 		if (searchedAttributesDataList.length) {
+			if (dataSource === DataSource.LOGS) {
+				const logsSelectedColumns: TelemetryFieldKey[] =
+					defaultLogsSelectedColumns.map((e) => ({
+						...e,
+						name: e.name,
+						signal: e.signal as SignalType,
+						fieldContext: e.fieldContext as FieldContext,
+						fieldDataType: e.fieldDataType as FieldDataType,
+					}));
+				return [
+					...logsSelectedColumns,
+					...searchedAttributesDataList
+						.filter((attribute) => attribute.name !== 'body')
+						// eslint-disable-next-line sonarjs/no-identical-functions
+						.map((e) => ({
+							...e,
+							name: e.name,
+							signal: e.signal as SignalType,
+							fieldContext: e.fieldContext as FieldContext,
+							fieldDataType: e.fieldDataType as FieldDataType,
+						})),
+				];
+			}
+			// eslint-disable-next-line sonarjs/no-identical-functions
 			return searchedAttributesDataList.map((e) => ({
 				...e,
 				name: e.name,
@@ -273,9 +297,24 @@ const useOptionsMenu = ({
 				return [...acc, column];
 			}, [] as TelemetryFieldKey[]);
 
+			const optionsData: OptionsQuery = {
+				...defaultOptionsQuery,
+				selectColumns: newSelectedColumns,
+				format: preferences?.formatting?.format || defaultOptionsQuery.format,
+				maxLines: preferences?.formatting?.maxLines || defaultOptionsQuery.maxLines,
+				fontSize: preferences?.formatting?.fontSize || defaultOptionsQuery.fontSize,
+			};
+
 			updateColumns(newSelectedColumns);
+			handleRedirectWithOptionsData(optionsData);
 		},
-		[searchedAttributeKeys, selectedColumnKeys, preferences, updateColumns],
+		[
+			searchedAttributeKeys,
+			selectedColumnKeys,
+			preferences,
+			handleRedirectWithOptionsData,
+			updateColumns,
+		],
 	);
 
 	const handleRemoveSelectedColumn = useCallback(
@@ -288,12 +327,27 @@ const useOptionsMenu = ({
 				notifications.error({
 					message: 'There must be at least one selected column',
 				});
-				return;
+			} else {
+				const optionsData: OptionsQuery = {
+					...defaultOptionsQuery,
+					selectColumns: newSelectedColumns || [],
+					format: preferences?.formatting?.format || defaultOptionsQuery.format,
+					maxLines:
+						preferences?.formatting?.maxLines || defaultOptionsQuery.maxLines,
+					fontSize:
+						preferences?.formatting?.fontSize || defaultOptionsQuery.fontSize,
+				};
+				updateColumns(newSelectedColumns || []);
+				handleRedirectWithOptionsData(optionsData);
 			}
-
-			updateColumns(newSelectedColumns || []);
 		},
-		[dataSource, notifications, preferences, updateColumns],
+		[
+			dataSource,
+			notifications,
+			preferences,
+			handleRedirectWithOptionsData,
+			updateColumns,
+		],
 	);
 
 	const handleFormatChange = useCallback(
@@ -360,18 +414,6 @@ const useOptionsMenu = ({
 		setSearchText(value);
 	}, []);
 
-	const reorderSelectColumns = useCallback(
-		(orderedIds: string[]): void => {
-			const current = preferences?.columns ?? [];
-			const byName = new Map(current.map((f) => [f.name, f]));
-			const reordered = orderedIds
-				.map((id) => byName.get(id))
-				.filter((f): f is TelemetryFieldKey => f !== undefined);
-			updateColumns(reordered);
-		},
-		[preferences, updateColumns],
-	);
-
 	const handleFocus = (): void => {
 		setIsFocused(true);
 	};
@@ -394,7 +436,6 @@ const useOptionsMenu = ({
 				onSelect: handleSelectColumns,
 				onRemove: handleRemoveSelectedColumn,
 				onSearch: handleSearchAttribute,
-				onReorder: reorderSelectColumns,
 			},
 			format: {
 				value: preferences?.formatting?.format || defaultOptionsQuery.format,
@@ -416,7 +457,6 @@ const useOptionsMenu = ({
 			handleSelectColumns,
 			handleRemoveSelectedColumn,
 			handleSearchAttribute,
-			reorderSelectColumns,
 			handleFormatChange,
 			handleMaxLinesChange,
 			handleFontSizeChange,

frontend/src/container/PaginatedTraceFlamegraph/PaginatedTraceFlamegraph.styles.scss

@@ -87,7 +87,12 @@
 
 					.service-progress-indicator {
 						width: fit-content;
-						--progress-width: 30px;
+						margin-inline-end: 0px !important;
+						margin-bottom: 0px !important;
+
+						.ant-progress-inner {
+							width: 30px;
+						}
 					}
 
 					.percent-value {

frontend/src/container/PaginatedTraceFlamegraph/PaginatedTraceFlamegraph.tsx

@@ -1,7 +1,6 @@
 import { useEffect, useMemo, useState } from 'react';
 import { useParams } from 'react-router-dom';
-import { Skeleton, Tooltip } from 'antd';
-import { Progress } from '@signozhq/ui/progress';
+import { Progress, Skeleton, Tooltip } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import { AxiosError } from 'axios';
 import Spinner from 'components/Spinner';

frontend/src/container/TopNav/DateTimeSelectionV2/__tests__/DateTimeSelectionV2.edge-cases.test.tsx

@@ -1,258 +0,0 @@
-import {
-	act,
-	fireEvent,
-	render,
-	screen,
-	waitFor,
-} from '@testing-library/react';
-
-import DateTimeSelection from '../index';
-import {
-	__resetSearchParamsGetter,
-	__setSearchParamsGetterForTest,
-} from '../utils/getUnstableCurrentSearchParams';
-import { queryClient, TestWrapper } from './testUtils';
-
-const mockSafeNavigate = jest.fn();
-jest.mock('hooks/useSafeNavigate', () => ({
-	useSafeNavigate: (): { safeNavigate: jest.Mock } => ({
-		safeNavigate: mockSafeNavigate,
-	}),
-}));
-
-jest.mock('container/NewExplorerCTA', () => ({
-	__esModule: true,
-	default: (): null => null,
-}));
-
-jest.mock('components/CustomTimePicker/CustomTimePicker', () => ({
-	__esModule: true,
-	default: ({
-		onSelect,
-	}: {
-		onSelect: (value: string) => void;
-	}): JSX.Element => (
-		<div data-testid="custom-time-picker">
-			<button
-				type="button"
-				data-testid="select-15m"
-				onClick={(): void => onSelect('15m')}
-			>
-				15m
-			</button>
-			<button
-				type="button"
-				data-testid="select-1h"
-				onClick={(): void => onSelect('1h')}
-			>
-				1h
-			</button>
-			<button
-				type="button"
-				data-testid="select-6h"
-				onClick={(): void => onSelect('6h')}
-			>
-				6h
-			</button>
-			<button
-				type="button"
-				data-testid="select-custom"
-				onClick={(): void => onSelect('custom')}
-			>
-				Custom
-			</button>
-		</div>
-	),
-}));
-
-describe('DateTimeSelectionV2 - Edge Cases', () => {
-	let currentSearchParams: URLSearchParams;
-
-	beforeEach(() => {
-		jest.clearAllMocks();
-		mockSafeNavigate.mockClear();
-		queryClient.clear();
-	});
-
-	afterEach(() => {
-		__resetSearchParamsGetter();
-	});
-
-	describe('Fresh Params at Navigation Time (Core Fix)', () => {
-		it('should read params at navigation time, not render time', async () => {
-			currentSearchParams = new URLSearchParams('relativeTime=30m');
-			__setSearchParamsGetterForTest(() => currentSearchParams);
-
-			render(
-				<TestWrapper
-					initialSearchParams="relativeTime=30m"
-					onUrlUpdate={(event): void => {
-						currentSearchParams = event.searchParams;
-					}}
-				>
-					<DateTimeSelection showAutoRefresh />
-				</TestWrapper>,
-			);
-
-			await waitFor(() => {
-				expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
-			});
-
-			currentSearchParams = new URLSearchParams(
-				'relativeTime=30m&externalParam=addedLater',
-			);
-
-			mockSafeNavigate.mockClear();
-
-			act(() => {
-				fireEvent.click(screen.getByTestId('select-1h'));
-			});
-
-			await waitFor(() => {
-				expect(mockSafeNavigate).toHaveBeenCalled();
-			});
-
-			const navigatedUrl = mockSafeNavigate.mock.calls[
-				mockSafeNavigate.mock.calls.length - 1
-			][0] as string;
-
-			expect(navigatedUrl).toContain('relativeTime=1h');
-			expect(navigatedUrl).toContain('externalParam=addedLater');
-		});
-
-		it('should preserve multiple externally added params', async () => {
-			currentSearchParams = new URLSearchParams('relativeTime=30m');
-			__setSearchParamsGetterForTest(() => currentSearchParams);
-
-			render(
-				<TestWrapper initialSearchParams="relativeTime=30m">
-					<DateTimeSelection showAutoRefresh />
-				</TestWrapper>,
-			);
-
-			await waitFor(() => {
-				expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
-			});
-
-			currentSearchParams = new URLSearchParams(
-				'relativeTime=30m&yAxisUnit=bytes&groupBy=host&view=table',
-			);
-
-			mockSafeNavigate.mockClear();
-
-			act(() => {
-				fireEvent.click(screen.getByTestId('select-6h'));
-			});
-
-			await waitFor(() => {
-				expect(mockSafeNavigate).toHaveBeenCalled();
-			});
-
-			const navigatedUrl = mockSafeNavigate.mock.calls[
-				mockSafeNavigate.mock.calls.length - 1
-			][0] as string;
-
-			expect(navigatedUrl).toContain('relativeTime=6h');
-			expect(navigatedUrl).toContain('yAxisUnit=bytes');
-			expect(navigatedUrl).toContain('groupBy=host');
-			expect(navigatedUrl).toContain('view=table');
-		});
-	});
-
-	describe('Empty and Special Values', () => {
-		it('should handle empty URL params gracefully', async () => {
-			currentSearchParams = new URLSearchParams('');
-			__setSearchParamsGetterForTest(() => currentSearchParams);
-
-			render(
-				<TestWrapper initialSearchParams="">
-					<DateTimeSelection showAutoRefresh />
-				</TestWrapper>,
-			);
-
-			await waitFor(() => {
-				expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
-			});
-
-			mockSafeNavigate.mockClear();
-
-			act(() => {
-				fireEvent.click(screen.getByTestId('select-15m'));
-			});
-
-			await waitFor(() => {
-				expect(mockSafeNavigate).toHaveBeenCalled();
-			});
-
-			const navigatedUrl = mockSafeNavigate.mock.calls[
-				mockSafeNavigate.mock.calls.length - 1
-			][0] as string;
-
-			expect(navigatedUrl).toContain('relativeTime=15m');
-		});
-
-		it('should handle special characters in preserved params', async () => {
-			currentSearchParams = new URLSearchParams(
-				'relativeTime=30m&filter=name%3D%22test%22',
-			);
-			__setSearchParamsGetterForTest(() => currentSearchParams);
-
-			render(
-				<TestWrapper initialSearchParams="relativeTime=30m&filter=name%3D%22test%22">
-					<DateTimeSelection showAutoRefresh />
-				</TestWrapper>,
-			);
-
-			await waitFor(() => {
-				expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
-			});
-
-			mockSafeNavigate.mockClear();
-
-			act(() => {
-				fireEvent.click(screen.getByTestId('select-1h'));
-			});
-
-			await waitFor(() => {
-				expect(mockSafeNavigate).toHaveBeenCalled();
-			});
-
-			const navigatedUrl = mockSafeNavigate.mock.calls[
-				mockSafeNavigate.mock.calls.length - 1
-			][0] as string;
-
-			expect(navigatedUrl).toContain('relativeTime=1h');
-			expect(navigatedUrl).toContain('filter=');
-		});
-
-		it('should not navigate when selecting custom (opens picker instead)', async () => {
-			currentSearchParams = new URLSearchParams('relativeTime=30m');
-			__setSearchParamsGetterForTest(() => currentSearchParams);
-
-			render(
-				<TestWrapper initialSearchParams="relativeTime=30m">
-					<DateTimeSelection showAutoRefresh />
-				</TestWrapper>,
-			);
-
-			await waitFor(() => {
-				expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
-			});
-
-			mockSafeNavigate.mockClear();
-
-			act(() => {
-				fireEvent.click(screen.getByTestId('select-custom'));
-			});
-
-			await new Promise((resolve) => setTimeout(resolve, 100));
-
-			const customNavigationCalls = mockSafeNavigate.mock.calls.filter((call) => {
-				const url = call[0] as string;
-				return url.includes('startTime=') || url.includes('endTime=');
-			});
-
-			expect(customNavigationCalls).toHaveLength(0);
-		});
-	});
-});

frontend/src/container/TopNav/DateTimeSelectionV2/__tests__/DateTimeSelectionV2.modal-mode.test.tsx

@@ -1,180 +0,0 @@
-import {
-	act,
-	fireEvent,
-	render,
-	screen,
-	waitFor,
-} from '@testing-library/react';
-
-import DateTimeSelection from '../index';
-import {
-	__resetSearchParamsGetter,
-	__setSearchParamsGetterForTest,
-} from '../utils/getUnstableCurrentSearchParams';
-import { queryClient, TestWrapper } from './testUtils';
-
-const mockSafeNavigate = jest.fn();
-jest.mock('hooks/useSafeNavigate', () => ({
-	useSafeNavigate: (): { safeNavigate: jest.Mock } => ({
-		safeNavigate: mockSafeNavigate,
-	}),
-}));
-
-jest.mock('container/NewExplorerCTA', () => ({
-	__esModule: true,
-	default: (): null => null,
-}));
-
-let mockOnCustomDateHandler: ((range: [unknown, unknown]) => void) | null =
-	null;
-let mockOnValidCustomDateChange: ((data: { timeStr: string }) => void) | null =
-	null;
-
-jest.mock('components/CustomTimePicker/CustomTimePicker', () => ({
-	__esModule: true,
-	default: ({
-		onSelect,
-		onCustomDateHandler,
-		onValidCustomDateChange,
-	}: {
-		onSelect: (value: string) => void;
-		onCustomDateHandler?: (range: [unknown, unknown]) => void;
-		onValidCustomDateChange?: (data: { timeStr: string }) => void;
-	}): JSX.Element => {
-		mockOnCustomDateHandler = onCustomDateHandler || null;
-		mockOnValidCustomDateChange = onValidCustomDateChange || null;
-
-		return (
-			<div data-testid="custom-time-picker">
-				<button
-					type="button"
-					data-testid="select-1h"
-					onClick={(): void => onSelect('1h')}
-				>
-					1h
-				</button>
-			</div>
-		);
-	},
-}));
-
-describe('DateTimeSelectionV2 - Modal Mode', () => {
-	let currentSearchParams: URLSearchParams;
-
-	beforeEach(() => {
-		jest.clearAllMocks();
-		mockSafeNavigate.mockClear();
-		queryClient.clear();
-		mockOnCustomDateHandler = null;
-		mockOnValidCustomDateChange = null;
-	});
-
-	afterEach(() => {
-		__resetSearchParamsGetter();
-	});
-
-	it('should call onTimeChange instead of navigating for relative time', async () => {
-		currentSearchParams = new URLSearchParams('relativeTime=30m');
-		__setSearchParamsGetterForTest(() => currentSearchParams);
-
-		const mockOnTimeChange = jest.fn();
-
-		render(
-			<TestWrapper initialSearchParams="relativeTime=30m">
-				<DateTimeSelection
-					showAutoRefresh
-					isModalTimeSelection
-					onTimeChange={mockOnTimeChange}
-				/>
-			</TestWrapper>,
-		);
-
-		await waitFor(() => {
-			expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
-		});
-
-		mockSafeNavigate.mockClear();
-
-		act(() => {
-			fireEvent.click(screen.getByTestId('select-1h'));
-		});
-
-		await waitFor(() => {
-			expect(mockOnTimeChange).toHaveBeenCalledWith('1h');
-		});
-
-		expect(mockSafeNavigate).not.toHaveBeenCalled();
-	});
-
-	it('should call onTimeChange with custom and timestamps for custom date', async () => {
-		currentSearchParams = new URLSearchParams('relativeTime=30m');
-		__setSearchParamsGetterForTest(() => currentSearchParams);
-
-		const mockOnTimeChange = jest.fn();
-
-		render(
-			<TestWrapper initialSearchParams="relativeTime=30m">
-				<DateTimeSelection
-					showAutoRefresh
-					isModalTimeSelection
-					onTimeChange={mockOnTimeChange}
-				/>
-			</TestWrapper>,
-		);
-
-		await waitFor(() => {
-			expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
-		});
-
-		const startMoment = { toDate: (): Date => new Date(1700000000000) };
-		const endMoment = { toDate: (): Date => new Date(1700003600000) };
-
-		mockSafeNavigate.mockClear();
-
-		act(() => {
-			mockOnCustomDateHandler?.([startMoment, endMoment]);
-		});
-
-		await waitFor(() => {
-			expect(mockOnTimeChange).toHaveBeenCalledWith(
-				'custom',
-				[1700000000000, 1700003600000],
-			);
-		});
-
-		expect(mockSafeNavigate).not.toHaveBeenCalled();
-	});
-
-	it('should call onTimeChange for valid custom date string in modal', async () => {
-		currentSearchParams = new URLSearchParams('relativeTime=30m');
-		__setSearchParamsGetterForTest(() => currentSearchParams);
-
-		const mockOnTimeChange = jest.fn();
-
-		render(
-			<TestWrapper initialSearchParams="relativeTime=30m">
-				<DateTimeSelection
-					showAutoRefresh
-					isModalTimeSelection
-					onTimeChange={mockOnTimeChange}
-				/>
-			</TestWrapper>,
-		);
-
-		await waitFor(() => {
-			expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
-		});
-
-		mockSafeNavigate.mockClear();
-
-		act(() => {
-			mockOnValidCustomDateChange?.({ timeStr: '4h' });
-		});
-
-		await waitFor(() => {
-			expect(mockOnTimeChange).toHaveBeenCalledWith('4h');
-		});
-
-		expect(mockSafeNavigate).not.toHaveBeenCalled();
-	});
-});

frontend/src/container/TopNav/DateTimeSelectionV2/__tests__/DateTimeSelectionV2.regression.test.tsx

@@ -1,207 +0,0 @@
-// eslint-disable-next-line no-restricted-imports
-import { Provider } from 'react-redux';
-import { MemoryRouter, Route } from 'react-router-dom';
-import { NuqsTestingAdapter } from 'nuqs/adapters/testing';
-import { QueryClient, QueryClientProvider } from 'react-query';
-import {
-	act,
-	fireEvent,
-	render,
-	screen,
-	waitFor,
-} from '@testing-library/react';
-import { parseAsString, useQueryState } from 'nuqs';
-import { AppContext } from 'providers/App/App';
-import TimezoneProvider from 'providers/Timezone';
-import { QueryBuilderProvider } from 'providers/QueryBuilder';
-import configureStore from 'redux-mock-store';
-import thunk from 'redux-thunk';
-import store from 'store';
-import { getAppContextMock } from 'tests/test-utils';
-import { CompatRouter } from 'react-router-dom-v5-compat';
-
-import DateTimeSelection from '../index';
-import {
-	__resetSearchParamsGetter,
-	__setSearchParamsGetterForTest,
-} from '../utils/getUnstableCurrentSearchParams';
-
-const queryClient = new QueryClient({
-	defaultOptions: {
-		queries: { refetchOnWindowFocus: false, retry: false },
-		mutations: { retry: false },
-	},
-});
-
-const mockStore = configureStore([thunk]);
-
-const mockSafeNavigate = jest.fn();
-jest.mock('hooks/useSafeNavigate', () => ({
-	useSafeNavigate: (): { safeNavigate: jest.Mock } => ({
-		safeNavigate: mockSafeNavigate,
-	}),
-}));
-
-jest.mock('components/CustomTimePicker/CustomTimePicker', () => ({
-	__esModule: true,
-	default: ({
-		onSelect,
-	}: {
-		onSelect: (value: string) => void;
-	}): JSX.Element => (
-		<div data-testid="custom-time-picker">
-			<button
-				type="button"
-				data-testid="select-1h"
-				onClick={(): void => onSelect('1h')}
-			>
-				1h
-			</button>
-		</div>
-	),
-}));
-
-jest.mock('container/NewExplorerCTA', () => ({
-	__esModule: true,
-	default: (): null => null,
-}));
-
-function NuqsParamSetter({ paramValue }: { paramValue: string }): JSX.Element {
-	const [, setYAxisUnit] = useQueryState(
-		'yAxisUnit',
-		parseAsString.withDefault(''),
-	);
-
-	return (
-		<button
-			type="button"
-			data-testid="set-nuqs-param"
-			onClick={(): void => {
-				setYAxisUnit(paramValue);
-			}}
-		>
-			Set yAxisUnit
-		</button>
-	);
-}
-
-interface WrapperProps {
-	children: React.ReactNode;
-	initialSearchParams?: string;
-	initialPath?: string;
-	onUrlUpdate?: (event: { searchParams: URLSearchParams }) => void;
-}
-
-function TestWrapper({
-	children,
-	initialSearchParams = '',
-	initialPath = '/services',
-	onUrlUpdate,
-}: WrapperProps): JSX.Element {
-	const initialEntry = initialSearchParams
-		? `${initialPath}?${initialSearchParams}`
-		: initialPath;
-
-	const mockedStore = mockStore({
-		...store.getState(),
-		app: {
-			...store.getState().app,
-			role: 'ADMIN',
-			user: {
-				userId: 'test-user-id',
-				email: 'test@signoz.io',
-				name: 'TestUser',
-				profilePictureURL: '',
-				accessJwt: '',
-				refreshJwt: '',
-			},
-			isLoggedIn: true,
-		},
-	});
-
-	return (
-		<MemoryRouter initialEntries={[initialEntry]}>
-			<CompatRouter>
-				<NuqsTestingAdapter
-					searchParams={initialSearchParams}
-					onUrlUpdate={onUrlUpdate}
-				>
-					<QueryClientProvider client={queryClient}>
-						<Provider store={mockedStore}>
-							<AppContext.Provider value={getAppContextMock('ADMIN')}>
-								<TimezoneProvider>
-									<QueryBuilderProvider>
-										<Route path="*">{children}</Route>
-									</QueryBuilderProvider>
-								</TimezoneProvider>
-							</AppContext.Provider>
-						</Provider>
-					</QueryClientProvider>
-				</NuqsTestingAdapter>
-			</CompatRouter>
-		</MemoryRouter>
-	);
-}
-
-describe('REGRESSION: DateTimeSelectionV2 preserves nuqs query params on time change', () => {
-	let currentSearchParams: URLSearchParams;
-
-	beforeEach(() => {
-		jest.clearAllMocks();
-		mockSafeNavigate.mockClear();
-		queryClient.clear();
-
-		// Initialize with test's initial search params
-		currentSearchParams = new URLSearchParams('relativeTime=30m');
-		__setSearchParamsGetterForTest(() => currentSearchParams);
-	});
-
-	afterEach(() => {
-		__resetSearchParamsGetter();
-	});
-
-	it('should preserve yAxisUnit param set via nuqs when changing time selection', async () => {
-		render(
-			<TestWrapper
-				initialSearchParams="relativeTime=30m"
-				onUrlUpdate={(event): void => {
-					// Sync nuqs URL updates to our mock getter
-					// This simulates how window.location.search would be updated in real browser
-					currentSearchParams = event.searchParams;
-				}}
-			>
-				<NuqsParamSetter paramValue="bytes" />
-				<DateTimeSelection showAutoRefresh />
-			</TestWrapper>,
-		);
-
-		await waitFor(() => {
-			expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
-		});
-
-		act(() => {
-			fireEvent.click(screen.getByTestId('set-nuqs-param'));
-		});
-
-		await waitFor(() => {
-			expect(currentSearchParams.get('yAxisUnit')).toBe('bytes');
-		});
-
-		mockSafeNavigate.mockClear();
-
-		act(() => {
-			fireEvent.click(screen.getByTestId('select-1h'));
-		});
-
-		await waitFor(() => {
-			expect(mockSafeNavigate).toHaveBeenCalled();
-		});
-
-		const navigatedUrl = mockSafeNavigate.mock.calls[
-			mockSafeNavigate.mock.calls.length - 1
-		][0] as string;
-
-		expect(navigatedUrl).toContain('relativeTime=1h');
-		expect(navigatedUrl).toContain('yAxisUnit=bytes');
-	});
-});

frontend/src/container/TopNav/DateTimeSelectionV2/__tests__/DateTimeSelectionV2.routes.test.tsx

@@ -1,133 +0,0 @@
-import { render, screen, waitFor } from '@testing-library/react';
-import ROUTES from 'constants/routes';
-
-import DateTimeSelection from '../index';
-import {
-	__resetSearchParamsGetter,
-	__setSearchParamsGetterForTest,
-} from '../utils/getUnstableCurrentSearchParams';
-import { queryClient, TestWrapper } from './testUtils';
-
-const mockSafeNavigate = jest.fn();
-jest.mock('hooks/useSafeNavigate', () => ({
-	useSafeNavigate: (): { safeNavigate: jest.Mock } => ({
-		safeNavigate: mockSafeNavigate,
-	}),
-}));
-
-jest.mock('container/NewExplorerCTA', () => ({
-	__esModule: true,
-	default: (): null => null,
-}));
-
-jest.mock('components/CustomTimePicker/CustomTimePicker', () => ({
-	__esModule: true,
-	default: (): JSX.Element => <div data-testid="custom-time-picker" />,
-}));
-
-describe('DateTimeSelectionV2 - Route-Specific Behavior', () => {
-	let currentSearchParams: URLSearchParams;
-
-	beforeEach(() => {
-		jest.clearAllMocks();
-		mockSafeNavigate.mockClear();
-		queryClient.clear();
-	});
-
-	afterEach(() => {
-		__resetSearchParamsGetter();
-	});
-
-	describe('Alert Pages', () => {
-		it('should set default time for alert overview when no time params', async () => {
-			currentSearchParams = new URLSearchParams('otherParam=value');
-			__setSearchParamsGetterForTest(() => currentSearchParams);
-
-			render(
-				<TestWrapper
-					initialSearchParams="otherParam=value"
-					initialPath={ROUTES.ALERT_OVERVIEW}
-				>
-					<DateTimeSelection showAutoRefresh defaultRelativeTime="6h" />
-				</TestWrapper>,
-			);
-
-			await waitFor(() => {
-				expect(mockSafeNavigate).toHaveBeenCalled();
-			});
-
-			const navigatedUrl = mockSafeNavigate.mock.calls[0][0] as string;
-			expect(navigatedUrl).toContain('relativeTime=6h');
-			expect(navigatedUrl).toContain('otherParam=value');
-		});
-
-		it('should set default time for alert history when no time params', async () => {
-			currentSearchParams = new URLSearchParams('filter=active');
-			__setSearchParamsGetterForTest(() => currentSearchParams);
-
-			render(
-				<TestWrapper
-					initialSearchParams="filter=active"
-					initialPath={ROUTES.ALERT_HISTORY}
-				>
-					<DateTimeSelection showAutoRefresh defaultRelativeTime="6h" />
-				</TestWrapper>,
-			);
-
-			await waitFor(() => {
-				expect(mockSafeNavigate).toHaveBeenCalled();
-			});
-
-			const navigatedUrl = mockSafeNavigate.mock.calls[0][0] as string;
-			expect(navigatedUrl).toContain('relativeTime=6h');
-		});
-
-		it('should NOT override existing time params on alert pages', async () => {
-			currentSearchParams = new URLSearchParams('relativeTime=1h&filter=active');
-			__setSearchParamsGetterForTest(() => currentSearchParams);
-
-			render(
-				<TestWrapper
-					initialSearchParams="relativeTime=1h&filter=active"
-					initialPath={ROUTES.ALERT_OVERVIEW}
-				>
-					<DateTimeSelection showAutoRefresh defaultRelativeTime="6h" />
-				</TestWrapper>,
-			);
-
-			await waitFor(() => {
-				expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
-			});
-
-			const calls = mockSafeNavigate.mock.calls;
-			if (calls.length > 0) {
-				const lastUrl = calls[calls.length - 1][0] as string;
-				expect(lastUrl).toContain('relativeTime=1h');
-			}
-		});
-	});
-
-	describe('disableUrlSync Behavior', () => {
-		it('should not sync URL on mount when disableUrlSync is true', async () => {
-			currentSearchParams = new URLSearchParams('');
-			__setSearchParamsGetterForTest(() => currentSearchParams);
-
-			render(
-				<TestWrapper initialSearchParams="" initialPath="/services">
-					<DateTimeSelection showAutoRefresh disableUrlSync />
-				</TestWrapper>,
-			);
-
-			await waitFor(() => {
-				expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
-			});
-
-			const syncCalls = mockSafeNavigate.mock.calls.filter((call) => {
-				const url = call[0] as string;
-				return url.includes('relativeTime=') && !url.includes('services?');
-			});
-
-			expect(syncCalls).toHaveLength(0);
-		});
-	});
-});

frontend/src/container/TopNav/DateTimeSelectionV2/__tests__/DateTimeSelectionV2.time-selection.test.tsx

@@ -1,353 +0,0 @@
-import {
-	act,
-	fireEvent,
-	render,
-	screen,
-	waitFor,
-} from '@testing-library/react';
-
-import DateTimeSelection from '../index';
-import {
-	__resetSearchParamsGetter,
-	__setSearchParamsGetterForTest,
-} from '../utils/getUnstableCurrentSearchParams';
-import { queryClient, TestWrapper, createMockMoment } from './testUtils';
-
-const mockSafeNavigate = jest.fn();
-jest.mock('hooks/useSafeNavigate', () => ({
-	useSafeNavigate: (): { safeNavigate: jest.Mock } => ({
-		safeNavigate: mockSafeNavigate,
-	}),
-}));
-
-jest.mock('container/NewExplorerCTA', () => ({
-	__esModule: true,
-	default: (): null => null,
-}));
-
-let mockOnCustomDateHandler: ((range: [unknown, unknown]) => void) | null =
-	null;
-let mockOnValidCustomDateChange: ((data: { timeStr: string }) => void) | null =
-	null;
-
-jest.mock('components/CustomTimePicker/CustomTimePicker', () => ({
-	__esModule: true,
-	default: ({
-		onSelect,
-		onCustomDateHandler,
-		onValidCustomDateChange,
-	}: {
-		onSelect: (value: string) => void;
-		onCustomDateHandler?: (range: [unknown, unknown]) => void;
-		onValidCustomDateChange?: (data: { timeStr: string }) => void;
-	}): JSX.Element => {
-		mockOnCustomDateHandler = onCustomDateHandler || null;
-		mockOnValidCustomDateChange = onValidCustomDateChange || null;
-
-		return (
-			<div data-testid="custom-time-picker">
-				<button
-					type="button"
-					data-testid="select-15m"
-					onClick={(): void => onSelect('15m')}
-				>
-					15m
-				</button>
-				<button
-					type="button"
-					data-testid="select-1h"
-					onClick={(): void => onSelect('1h')}
-				>
-					1h
-				</button>
-				<button
-					type="button"
-					data-testid="select-6h"
-					onClick={(): void => onSelect('6h')}
-				>
-					6h
-				</button>
-			</div>
-		);
-	},
-}));
-
-describe('DateTimeSelectionV2 - Time Selection', () => {
-	let currentSearchParams: URLSearchParams;
-
-	beforeEach(() => {
-		jest.clearAllMocks();
-		mockSafeNavigate.mockClear();
-		queryClient.clear();
-		mockOnCustomDateHandler = null;
-		mockOnValidCustomDateChange = null;
-	});
-
-	afterEach(() => {
-		__resetSearchParamsGetter();
-	});
-
-	describe('Relative Time', () => {
-		it('should update relativeTime and remove startTime/endTime', async () => {
-			currentSearchParams = new URLSearchParams(
-				'startTime=1000&endTime=2000&otherParam=keep',
-			);
-			__setSearchParamsGetterForTest(() => currentSearchParams);
-
-			render(
-				<TestWrapper initialSearchParams="startTime=1000&endTime=2000&otherParam=keep">
-					<DateTimeSelection showAutoRefresh />
-				</TestWrapper>,
-			);
-
-			await waitFor(() => {
-				expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
-			});
-
-			mockSafeNavigate.mockClear();
-
-			act(() => {
-				fireEvent.click(screen.getByTestId('select-15m'));
-			});
-
-			await waitFor(() => {
-				expect(mockSafeNavigate).toHaveBeenCalled();
-			});
-
-			const navigatedUrl = mockSafeNavigate.mock.calls[
-				mockSafeNavigate.mock.calls.length - 1
-			][0] as string;
-
-			expect(navigatedUrl).toContain('relativeTime=15m');
-			expect(navigatedUrl).not.toContain('startTime=');
-			expect(navigatedUrl).not.toContain('endTime=');
-			expect(navigatedUrl).toContain('otherParam=keep');
-		});
-
-		it('should remove activeLogId param on time change', async () => {
-			currentSearchParams = new URLSearchParams(
-				'relativeTime=30m&activeLogId=log123',
-			);
-			__setSearchParamsGetterForTest(() => currentSearchParams);
-
-			render(
-				<TestWrapper initialSearchParams="relativeTime=30m&activeLogId=log123">
-					<DateTimeSelection showAutoRefresh />
-				</TestWrapper>,
-			);
-
-			await waitFor(() => {
-				expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
-			});
-
-			mockSafeNavigate.mockClear();
-
-			act(() => {
-				fireEvent.click(screen.getByTestId('select-1h'));
-			});
-
-			await waitFor(() => {
-				expect(mockSafeNavigate).toHaveBeenCalled();
-			});
-
-			const navigatedUrl = mockSafeNavigate.mock.calls[
-				mockSafeNavigate.mock.calls.length - 1
-			][0] as string;
-
-			expect(navigatedUrl).toContain('relativeTime=1h');
-			expect(navigatedUrl).not.toContain('activeLogId');
-		});
-
-		it('should update compositeQuery with new ID when present', async () => {
-			const compositeQuery = encodeURIComponent(
-				JSON.stringify({ id: 'old-id', builder: { queryData: [] } }),
-			);
-			currentSearchParams = new URLSearchParams(
-				`relativeTime=30m&compositeQuery=${compositeQuery}`,
-			);
-			__setSearchParamsGetterForTest(() => currentSearchParams);
-
-			render(
-				<TestWrapper
-					initialSearchParams={`relativeTime=30m&compositeQuery=${compositeQuery}`}
-				>
-					<DateTimeSelection showAutoRefresh />
-				</TestWrapper>,
-			);
-
-			await waitFor(() => {
-				expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
-			});
-
-			mockSafeNavigate.mockClear();
-
-			act(() => {
-				fireEvent.click(screen.getByTestId('select-6h'));
-			});
-
-			await waitFor(() => {
-				expect(mockSafeNavigate).toHaveBeenCalled();
-			});
-
-			const navigatedUrl = mockSafeNavigate.mock.calls[
-				mockSafeNavigate.mock.calls.length - 1
-			][0] as string;
-
-			expect(navigatedUrl).toContain('compositeQuery=');
-			expect(navigatedUrl).not.toContain('old-id');
-		});
-
-		it('should preserve all non-time URL params', async () => {
-			currentSearchParams = new URLSearchParams(
-				'relativeTime=30m&param1=a&param2=b&param3=c',
-			);
-			__setSearchParamsGetterForTest(() => currentSearchParams);
-
-			render(
-				<TestWrapper initialSearchParams="relativeTime=30m&param1=a&param2=b&param3=c">
-					<DateTimeSelection showAutoRefresh />
-				</TestWrapper>,
-			);
-
-			await waitFor(() => {
-				expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
-			});
-
-			mockSafeNavigate.mockClear();
-
-			act(() => {
-				fireEvent.click(screen.getByTestId('select-1h'));
-			});
-
-			await waitFor(() => {
-				expect(mockSafeNavigate).toHaveBeenCalled();
-			});
-
-			const navigatedUrl = mockSafeNavigate.mock.calls[
-				mockSafeNavigate.mock.calls.length - 1
-			][0] as string;
-
-			expect(navigatedUrl).toContain('relativeTime=1h');
-			expect(navigatedUrl).toContain('param1=a');
-			expect(navigatedUrl).toContain('param2=b');
-			expect(navigatedUrl).toContain('param3=c');
-		});
-	});
-
-	describe('Custom Date Range', () => {
-		it('should set startTime/endTime and remove relativeTime', async () => {
-			currentSearchParams = new URLSearchParams('relativeTime=30m&keepThis=yes');
-			__setSearchParamsGetterForTest(() => currentSearchParams);
-
-			render(
-				<TestWrapper initialSearchParams="relativeTime=30m&keepThis=yes">
-					<DateTimeSelection showAutoRefresh />
-				</TestWrapper>,
-			);
-
-			await waitFor(() => {
-				expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
-			});
-
-			const startMoment = createMockMoment(1700000000000);
-			const endMoment = createMockMoment(1700003600000);
-
-			mockSafeNavigate.mockClear();
-
-			act(() => {
-				mockOnCustomDateHandler?.([startMoment, endMoment]);
-			});
-
-			await waitFor(() => {
-				expect(mockSafeNavigate).toHaveBeenCalled();
-			});
-
-			const navigatedUrl = mockSafeNavigate.mock.calls[
-				mockSafeNavigate.mock.calls.length - 1
-			][0] as string;
-
-			expect(navigatedUrl).toContain('startTime=1700000000000');
-			expect(navigatedUrl).toContain('endTime=1700003600000');
-			expect(navigatedUrl).not.toContain('relativeTime=');
-			expect(navigatedUrl).toContain('keepThis=yes');
-		});
-
-		it('should update compositeQuery when present for custom date', async () => {
-			const compositeQuery = encodeURIComponent(
-				JSON.stringify({ id: 'old-id', builder: { queryData: [] } }),
-			);
-			currentSearchParams = new URLSearchParams(
-				`relativeTime=30m&compositeQuery=${compositeQuery}`,
-			);
-			__setSearchParamsGetterForTest(() => currentSearchParams);
-
-			render(
-				<TestWrapper
-					initialSearchParams={`relativeTime=30m&compositeQuery=${compositeQuery}`}
-				>
-					<DateTimeSelection showAutoRefresh />
-				</TestWrapper>,
-			);
-
-			await waitFor(() => {
-				expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
-			});
-
-			const startMoment = createMockMoment(1700000000000);
-			const endMoment = createMockMoment(1700003600000);
-
-			mockSafeNavigate.mockClear();
-
-			act(() => {
-				mockOnCustomDateHandler?.([startMoment, endMoment]);
-			});
-
-			await waitFor(() => {
-				expect(mockSafeNavigate).toHaveBeenCalled();
-			});
-
-			const navigatedUrl = mockSafeNavigate.mock.calls[
-				mockSafeNavigate.mock.calls.length - 1
-			][0] as string;
-
-			expect(navigatedUrl).toContain('compositeQuery=');
-			expect(navigatedUrl).not.toContain('old-id');
-		});
-	});
-
-	describe('Valid Custom Date String', () => {
-		it('should handle shorthand date format and preserve params', async () => {
-			currentSearchParams = new URLSearchParams('relativeTime=30m&filter=active');
-			__setSearchParamsGetterForTest(() => currentSearchParams);
-
-			render(
-				<TestWrapper initialSearchParams="relativeTime=30m&filter=active">
-					<DateTimeSelection showAutoRefresh />
-				</TestWrapper>,
-			);
-
-			await waitFor(() => {
-				expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
-			});
-
-			mockSafeNavigate.mockClear();
-
-			act(() => {
-				mockOnValidCustomDateChange?.({ timeStr: '2h' });
-			});
-
-			await waitFor(() => {
-				expect(mockSafeNavigate).toHaveBeenCalled();
-			});
-
-			const navigatedUrl = mockSafeNavigate.mock.calls[
-				mockSafeNavigate.mock.calls.length - 1
-			][0] as string;
-
-			expect(navigatedUrl).toContain('relativeTime=2h');
-			expect(navigatedUrl).toContain('filter=active');
-			expect(navigatedUrl).not.toContain('startTime=');
-			expect(navigatedUrl).not.toContain('endTime=');
-		});
-	});
-});

frontend/src/container/TopNav/DateTimeSelectionV2/__tests__/testUtils.tsx

@@ -1,95 +0,0 @@
-// eslint-disable-next-line no-restricted-imports
-import { Provider } from 'react-redux';
-import { MemoryRouter, Route } from 'react-router-dom';
-import { NuqsTestingAdapter } from 'nuqs/adapters/testing';
-import { QueryClient, QueryClientProvider } from 'react-query';
-import { AppContext } from 'providers/App/App';
-import TimezoneProvider from 'providers/Timezone';
-import { QueryBuilderProvider } from 'providers/QueryBuilder';
-import configureStore from 'redux-mock-store';
-import thunk from 'redux-thunk';
-import store from 'store';
-import { getAppContextMock } from 'tests/test-utils';
-import { CompatRouter } from 'react-router-dom-v5-compat';
-
-export const queryClient = new QueryClient({
-	defaultOptions: {
-		queries: { refetchOnWindowFocus: false, retry: false },
-		mutations: { retry: false },
-	},
-});
-
-export const mockStore = configureStore([thunk]);
-
-interface WrapperProps {
-	children: React.ReactNode;
-	initialSearchParams?: string;
-	initialPath?: string;
-	onUrlUpdate?: (event: { searchParams: URLSearchParams }) => void;
-}
-
-export function TestWrapper({
-	children,
-	initialSearchParams = '',
-	initialPath = '/services',
-	onUrlUpdate,
-}: WrapperProps): JSX.Element {
-	const initialEntry = initialSearchParams
-		? `${initialPath}?${initialSearchParams}`
-		: initialPath;
-
-	const mockedStore = mockStore({
-		...store.getState(),
-		app: {
-			...store.getState().app,
-			role: 'ADMIN',
-			user: {
-				userId: 'test-user-id',
-				email: 'test@signoz.io',
-				name: 'TestUser',
-				profilePictureURL: '',
-				accessJwt: '',
-				refreshJwt: '',
-			},
-			isLoggedIn: true,
-		},
-	});
-
-	return (
-		<MemoryRouter initialEntries={[initialEntry]}>
-			<CompatRouter>
-				<NuqsTestingAdapter
-					searchParams={initialSearchParams}
-					onUrlUpdate={onUrlUpdate}
-				>
-					<QueryClientProvider client={queryClient}>
-						<Provider store={mockedStore}>
-							<AppContext.Provider value={getAppContextMock('ADMIN')}>
-								<TimezoneProvider>
-									<QueryBuilderProvider>
-										<Route path="*">{children}</Route>
-									</QueryBuilderProvider>
-								</TimezoneProvider>
-							</AppContext.Provider>
-						</Provider>
-					</QueryClientProvider>
-				</NuqsTestingAdapter>
-			</CompatRouter>
-		</MemoryRouter>
-	);
-}
-
-export function createMockMoment(timestamp: number): {
-	toDate: () => Date;
-	toISOString: () => string;
-	format: () => string;
-	toString: () => string;
-} {
-	const date = new Date(timestamp);
-	return {
-		toDate: (): Date => date,
-		toISOString: (): string => date.toISOString(),
-		format: (): string => date.toISOString(),
-		toString: (): string => date.toString(),
-	};
-}

frontend/src/container/TopNav/DateTimeSelectionV2/index.tsx

@@ -2,7 +2,7 @@ import { useCallback, useEffect, useState } from 'react';
 // eslint-disable-next-line no-restricted-imports
 import { connect, useDispatch, useSelector } from 'react-redux';
 import { RouteComponentProps, withRouter } from 'react-router-dom';
-import { useNavigationType } from 'react-router-dom-v5-compat';
+import { useNavigationType, useSearchParams } from 'react-router-dom-v5-compat';
 import { RefreshCw, Undo } from '@signozhq/icons';
 import { Button } from 'antd';
 import getLocalStorageKey from 'api/browser/localstorage/get';
@@ -20,6 +20,7 @@ import {
 } from 'store/globalTime';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import { useSafeNavigate } from 'hooks/useSafeNavigate';
+import useUrlQuery from 'hooks/useUrlQuery';
 import { isValidShortHandDateTimeFormat } from 'lib/getMinMax';
 import getTimeString from 'lib/getTimeString';
 import { cloneDeep, isObject } from 'lodash-es';
@@ -53,7 +54,6 @@ import {
 	Time,
 	TimeRange,
 } from './types';
-import { getUnstableCurrentSearchParams } from './utils/getUnstableCurrentSearchParams';
 
 import './DateTimeSelectionV2.styles.scss';
 
@@ -90,12 +90,10 @@ function DateTimeSelection({
 	const [hasSelectedTimeError, setHasSelectedTimeError] = useState(false);
 	const [isOpen, setIsOpen] = useState<boolean>(false);
 
-	const currentSearchParams = getUnstableCurrentSearchParams();
-	const searchStartTime = currentSearchParams.get(QueryParams.startTime);
-	const searchEndTime = currentSearchParams.get(QueryParams.endTime);
-	const relativeTimeFromUrl = currentSearchParams.get(QueryParams.relativeTime);
-	const hasTimeParamsInUrl =
-		(searchStartTime && searchEndTime) || relativeTimeFromUrl;
+	const urlQuery = useUrlQuery();
+	const searchStartTime = urlQuery.get('startTime');
+	const searchEndTime = urlQuery.get('endTime');
+	const relativeTimeFromUrl = urlQuery.get(QueryParams.relativeTime);
 
 	// Prioritize props for initial modal time, fallback to URL params
 	let initialModalStartTime = 0;
@@ -117,6 +115,8 @@ function DateTimeSelection({
 	);
 	const [modalEndTime, setModalEndTime] = useState<number>(initialModalEndTime);
 
+	const [searchParams] = useSearchParams();
+
 	// Effect to update modal time state when props change
 	useEffect(() => {
 		if (modalInitialStartTime !== undefined) {
@@ -323,15 +323,14 @@ function DateTimeSelection({
 				return;
 			}
 
-			const urlQuery = getUnstableCurrentSearchParams();
-			urlQuery.delete(QueryParams.startTime);
-			urlQuery.delete(QueryParams.endTime);
+			urlQuery.delete('startTime');
+			urlQuery.delete('endTime');
 
 			urlQuery.set(QueryParams.relativeTime, value);
 			// Remove Hidden Filters from URL query parameters on time change
 			urlQuery.delete(QueryParams.activeLogId);
 
-			if (urlQuery.has(QueryParams.compositeQuery)) {
+			if (searchParams.has(QueryParams.compositeQuery)) {
 				const updatedCompositeQuery = getUpdatedCompositeQuery();
 				urlQuery.set(QueryParams.compositeQuery, updatedCompositeQuery);
 			}
@@ -350,6 +349,8 @@ function DateTimeSelection({
 			getUpdatedCompositeQuery,
 			updateLocalStorageForRoutes,
 			updateTimeInterval,
+			urlQuery,
+			searchParams,
 		],
 	);
 
@@ -413,7 +414,6 @@ function DateTimeSelection({
 
 				updateLocalStorageForRoutes(JSON.stringify({ startTime, endTime }));
 
-				const urlQuery = getUnstableCurrentSearchParams();
 				urlQuery.set(
 					QueryParams.startTime,
 					startTime?.toDate().getTime().toString(),
@@ -421,7 +421,7 @@ function DateTimeSelection({
 				urlQuery.set(QueryParams.endTime, endTime?.toDate().getTime().toString());
 				urlQuery.delete(QueryParams.relativeTime);
 
-				if (urlQuery.has(QueryParams.compositeQuery)) {
+				if (searchParams.has(QueryParams.compositeQuery)) {
 					const updatedCompositeQuery = getUpdatedCompositeQuery();
 					urlQuery.set(QueryParams.compositeQuery, updatedCompositeQuery);
 				}
@@ -441,9 +441,8 @@ function DateTimeSelection({
 		updateTimeInterval(dateTimeStr);
 		updateLocalStorageForRoutes(dateTimeStr);
 
-		const urlQuery = getUnstableCurrentSearchParams();
-		urlQuery.delete(QueryParams.startTime);
-		urlQuery.delete(QueryParams.endTime);
+		urlQuery.delete('startTime');
+		urlQuery.delete('endTime');
 
 		urlQuery.set(QueryParams.relativeTime, dateTimeStr);
 
@@ -596,12 +595,13 @@ function DateTimeSelection({
 
 		// set the default relative time for alert history and overview pages if relative time is not specified
 		if (
-			!hasTimeParamsInUrl &&
+			(!urlQuery.has(QueryParams.startTime) ||
+				!urlQuery.has(QueryParams.endTime)) &&
+			!urlQuery.has(QueryParams.relativeTime) &&
 			(currentRoute === ROUTES.ALERT_OVERVIEW ||
 				currentRoute === ROUTES.ALERT_HISTORY)
 		) {
 			updateTimeInterval(defaultRelativeTime);
-			const urlQuery = getUnstableCurrentSearchParams();
 			urlQuery.set(QueryParams.relativeTime, defaultRelativeTime);
 			const generatedUrl = `${location.pathname}?${urlQuery.toString()}`;
 			safeNavigate(generatedUrl);
@@ -625,10 +625,9 @@ function DateTimeSelection({
 			updateTimeInterval(updatedTime, [preStartTime, preEndTime]);
 		}
 
-		const urlQuery = getUnstableCurrentSearchParams();
 		if (updatedTime !== 'custom') {
-			urlQuery.delete(QueryParams.startTime);
-			urlQuery.delete(QueryParams.endTime);
+			urlQuery.delete('startTime');
+			urlQuery.delete('endTime');
 			urlQuery.set(QueryParams.relativeTime, updatedTime);
 		} else {
 			const startTime = preStartTime.toString();

frontend/src/container/TopNav/DateTimeSelectionV2/utils/getUnstableCurrentSearchParams.ts

@@ -1,34 +0,0 @@
-/**
- * This was introduced to fix a sync bug between Nuqs and react-router-dom
- *
- * We are using the wrong adapter for nuqs because the correct one only supports v6/v7,
- * and we are at version v5. This causes the nuqs/react-router-dom to be out of sync.
- *
- * We can revert this commit once we migrate react-router-dom to v6, or once we migrate
- * to DateTimeSelectionV3
- */
-
-/**
- * This was created to help testing the regression introduced between nuqs/react-router-dom
- */
-type SearchParamsGetter = () => URLSearchParams;
-let getter: SearchParamsGetter = (): URLSearchParams =>
-	new URLSearchParams(window.location.search);
-
-/**
- * This function will return a fresh instance of URLSearchParams every time it's called.
- *
- * DO NOT USE IT FOR useEffect/useCallback dependencies, use Nuqs instead.
- */
-export function getUnstableCurrentSearchParams(): URLSearchParams {
-	return getter();
-}
-
-// Testing helpers
-export function __setSearchParamsGetterForTest(fn: SearchParamsGetter): void {
-	getter = fn;
-}
-
-export function __resetSearchParamsGetter(): void {
-	getter = (): URLSearchParams => new URLSearchParams(window.location.search);
-}

frontend/src/container/TracesExplorer/ListView/index.tsx

@@ -30,7 +30,10 @@ import { useGetQueryRange } from 'hooks/queryBuilder/useGetQueryRange';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import { Pagination } from 'hooks/queryPagination';
 import { getDefaultPaginationConfig } from 'hooks/queryPagination/utils';
+import useDragColumns from 'hooks/useDragColumns';
+import { getDraggedColumns } from 'hooks/useDragColumns/utils';
 import useUrlQueryData from 'hooks/useUrlQueryData';
+import { RowData } from 'lib/query/createTableColumnsFromQuery';
 import { ArrowUp10, Minus } from '@signozhq/icons';
 import { useTimezone } from 'providers/Timezone';
 import { AppState } from 'store/reducers';
@@ -82,6 +85,10 @@ function ListView({
 		},
 	});
 
+	const { draggedColumns, onDragColumns } = useDragColumns<RowData>(
+		LOCALSTORAGE.TRACES_LIST_COLUMNS,
+	);
+
 	const { queryData: paginationQueryData } = useUrlQueryData<Pagination>(
 		QueryParams.pagination,
 	);
@@ -93,19 +100,6 @@ function ListView({
 		[stagedQuery, orderBy],
 	);
 
-	// TEMP — remove after traces moves to TanStack table.
-	// - Drag updates selectColumns; raw queryKey would churn on reorder.
-	// - Trace API fetches only listed columns → add/remove must refetch.
-	// - Sorted-name signature: stable on reorder, changes on add/remove.
-	const selectColumnsSignature = useMemo(
-		() =>
-			(options?.selectColumns ?? [])
-				.map((c) => c.name)
-				.sort()
-				.join(','),
-		[options?.selectColumns],
-	);
-
 	const queryKey = useMemo(
 		() => [
 			REACT_QUERY_KEY.GET_QUERY_RANGE,
@@ -115,7 +109,7 @@ function ListView({
 			stagedQuery,
 			panelType,
 			paginationConfig,
-			selectColumnsSignature,
+			options?.selectColumns,
 			orderBy,
 		],
 		[
@@ -123,7 +117,7 @@ function ListView({
 			panelType,
 			globalSelectedTime,
 			paginationConfig,
-			selectColumnsSignature,
+			options?.selectColumns,
 			maxTime,
 			minTime,
 			orderBy,
@@ -188,14 +182,13 @@ function ListView({
 
 	const { formatTimezoneAdjustedTimestamp } = useTimezone();
 
-	const columns = useMemo(
-		() =>
-			getListColumns(
-				options?.selectColumns || [],
-				formatTimezoneAdjustedTimestamp,
-			),
-		[options?.selectColumns, formatTimezoneAdjustedTimestamp],
-	);
+	const columns = useMemo(() => {
+		const updatedColumns = getListColumns(
+			options?.selectColumns || [],
+			formatTimezoneAdjustedTimestamp,
+		);
+		return getDraggedColumns(updatedColumns, draggedColumns);
+	}, [options?.selectColumns, formatTimezoneAdjustedTimestamp, draggedColumns]);
 
 	const transformedQueryTableData = useMemo(
 		() => transformDataWithDate(queryTableData) || [],
@@ -203,16 +196,9 @@ function ListView({
 	);
 
 	const handleDragColumn = useCallback(
-		(fromIndex: number, toIndex: number): void => {
-			const reordered = [...columns];
-			const [moved] = reordered.splice(fromIndex, 1);
-			reordered.splice(toIndex, 0, moved);
-			const orderedIds = reordered
-				.map((c) => String(('dataIndex' in c && c.dataIndex) || c.key || ''))
-				.filter(Boolean);
-			config?.addColumn?.onReorder(orderedIds);
-		},
-		[columns, config],
+		(fromIndex: number, toIndex: number) =>
+			onDragColumns(columns, fromIndex, toIndex),
+		[columns, onDragColumns],
 	);
 
 	const handleOrderChange = useCallback((value: string) => {

frontend/src/lib/history.ts

@@ -1,15 +1,4 @@
 import { createBrowserHistory } from 'history';
 import { getBasePath } from 'utils/basePath';
 
-const history = createBrowserHistory({ basename: getBasePath() });
-
-let inAppPushCount = 0;
-history.listen((_, action) => {
-	if (action === 'PUSH') {
-		inAppPushCount += 1;
-	}
-});
-
-export const hasInAppHistory = (): boolean => inAppPushCount > 0;
-
-export default history;
+export default createBrowserHistory({ basename: getBasePath() });

frontend/src/pages/DashboardPageV2/index.tsx

@@ -1,8 +0,0 @@
-function DashboardPageV2(): JSX.Element {
-	return (
-		<div>
-			<h1>Dashboard Page V2</h1>
-		</div>
-	);
-}
-export default DashboardPageV2;

frontend/src/pages/DashboardsListPageV2/index.tsx

@@ -1,9 +0,0 @@
-function DashboardsListPageV2(): JSX.Element {
-	return (
-		<div>
-			<h1>Dashboards List Page V2</h1>
-		</div>
-	);
-}
-
-export default DashboardsListPageV2;

frontend/src/pages/LogsExplorer/index.tsx

@@ -3,6 +3,7 @@ import { useQueryClient } from 'react-query';
 import * as Sentry from '@sentry/react';
 import getLocalStorageKey from 'api/browser/localstorage/get';
 import setLocalStorageApi from 'api/browser/localstorage/set';
+import { TelemetryFieldKey } from 'api/v5/v5';
 import cx from 'classnames';
 import ExplorerCard from 'components/ExplorerCard/ExplorerCard';
 import QueryCancelledPlaceholder from 'components/QueryCancelledPlaceholder';
@@ -14,6 +15,12 @@ import { PANEL_TYPES } from 'constants/queryBuilder';
 import { usePageActions } from 'container/AIAssistant/pageActions/usePageActions';
 import LogExplorerQuerySection from 'container/LogExplorerQuerySection';
 import LogsExplorerViewsContainer from 'container/LogsExplorerViews';
+import {
+	defaultLogsSelectedColumns,
+	defaultOptionsQuery,
+	URL_OPTIONS,
+} from 'container/OptionsMenu/constants';
+import { OptionsQuery } from 'container/OptionsMenu/types';
 import LeftToolbarActions from 'container/QueryBuilder/components/ToolbarActions/LeftToolbarActions';
 import RightToolbarActions from 'container/QueryBuilder/components/ToolbarActions/RightToolbarActions';
 import Toolbar from 'container/Toolbar/Toolbar';
@@ -24,9 +31,11 @@ import {
 	useHandleExplorerTabChange,
 } from 'hooks/useHandleExplorerTabChange';
 import { useIsAIAssistantEnabled } from 'hooks/useIsAIAssistantEnabled';
-import { defaultTo, isEmpty, isNull } from 'lodash-es';
+import useUrlQueryData from 'hooks/useUrlQueryData';
+import { defaultTo, isEmpty, isEqual, isNull } from 'lodash-es';
 import ErrorBoundaryFallback from 'pages/ErrorBoundaryFallback/ErrorBoundaryFallback';
 import { EventSourceProvider } from 'providers/EventSource';
+import { usePreferenceContext } from 'providers/preferences/context/PreferenceContextProvider';
 import { Warning } from 'types/api';
 import { DataSource } from 'types/common/queryBuilder';
 import {
@@ -53,6 +62,8 @@ function LogsExplorer(): JSX.Element {
 	const [selectedView, setSelectedView] = useState<ExplorerViews>(
 		() => panelTypeToExplorerView[panelTypesFromUrl],
 	);
+	const { logs } = usePreferenceContext();
+	const { preferences } = logs;
 
 	const [showFilters, setShowFilters] = useState<boolean>(() => {
 		const localStorageValue = getLocalStorageKey(
@@ -171,6 +182,116 @@ function LogsExplorer(): JSX.Element {
 		setShowFilters((prev) => !prev);
 	};
 
+	const { redirectWithQuery: redirectWithOptionsData } =
+		useUrlQueryData<OptionsQuery>(URL_OPTIONS, defaultOptionsQuery);
+
+	// Get and parse stored columns from localStorage
+	const logListOptionsFromLocalStorage = useMemo(() => {
+		const data = getLocalStorageKey(LOCALSTORAGE.LOGS_LIST_OPTIONS);
+
+		if (!data) {
+			return null;
+		}
+
+		try {
+			return JSON.parse(data);
+		} catch {
+			return null;
+		}
+	}, []);
+
+	// Check if the columns have the required columns (timestamp, body)
+	const hasRequiredColumns = useCallback(
+		(columns?: TelemetryFieldKey[] | null): boolean => {
+			if (!columns?.length) {
+				return false;
+			}
+
+			const hasTimestamp = columns.some((col) => col.name === 'timestamp');
+			const hasBody = columns.some((col) => col.name === 'body');
+
+			return hasTimestamp && hasBody;
+		},
+		[],
+	);
+
+	// Merge the columns with the required columns (timestamp, body) if missing
+	const mergeWithRequiredColumns = useCallback(
+		(columns: TelemetryFieldKey[]): TelemetryFieldKey[] => [
+			// Add required columns (timestamp, body) if missing
+			...(!hasRequiredColumns(columns) ? defaultLogsSelectedColumns : []),
+			...columns,
+		],
+		[hasRequiredColumns],
+	);
+
+	// Migrate the options query to the new format
+	const migrateOptionsQuery = useCallback(
+		(query: OptionsQuery): OptionsQuery => {
+			// Skip if already migrated
+			if (query.version) {
+				return query;
+			}
+
+			if (logListOptionsFromLocalStorage?.version) {
+				return logListOptionsFromLocalStorage;
+			}
+
+			// Case 1: we have localStorage columns
+			if (logListOptionsFromLocalStorage?.selectColumns?.length > 0) {
+				return {
+					...query,
+					version: 1,
+					selectColumns: mergeWithRequiredColumns(
+						logListOptionsFromLocalStorage.selectColumns,
+					),
+				};
+			}
+
+			// Case 2: No query columns in localStorage in but query has columns
+			if (query.selectColumns.length > 0) {
+				return {
+					...query,
+					version: 1,
+					selectColumns: mergeWithRequiredColumns(query.selectColumns),
+				};
+			}
+
+			// Case 3: No columns anywhere, use defaults
+			return {
+				...query,
+				version: 1,
+				selectColumns: defaultLogsSelectedColumns,
+			};
+		},
+		[mergeWithRequiredColumns, logListOptionsFromLocalStorage],
+	);
+
+	useEffect(() => {
+		if (!preferences) {
+			return;
+		}
+		const migratedQuery = migrateOptionsQuery({
+			selectColumns: preferences.columns || defaultLogsSelectedColumns,
+			maxLines: preferences.formatting?.maxLines || defaultOptionsQuery.maxLines,
+			format: preferences.formatting?.format || defaultOptionsQuery.format,
+			fontSize: preferences.formatting?.fontSize || defaultOptionsQuery.fontSize,
+			version: preferences.formatting?.version,
+		});
+		// Only redirect if the query was actually modified
+		if (
+			!isEqual(migratedQuery, {
+				selectColumns: preferences?.columns,
+				maxLines: preferences?.formatting?.maxLines,
+				format: preferences?.formatting?.format,
+				fontSize: preferences?.formatting?.fontSize,
+				version: preferences?.formatting?.version,
+			})
+		) {
+			redirectWithOptionsData(migratedQuery);
+		}
+	}, [migrateOptionsQuery, preferences, redirectWithOptionsData]);
+
 	const toolbarViews = useMemo(
 		() => ({
 			list: {

frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/TraceDetailsHeader.tsx

@@ -16,7 +16,7 @@ import { LOCALSTORAGE } from 'constants/localStorage';
 import ROUTES from 'constants/routes';
 import { convertTimeToRelevantUnit } from 'container/TraceDetail/utils';
 import dayjs from 'dayjs';
-import history, { hasInAppHistory } from 'lib/history';
+import history from 'lib/history';
 import {
 	ArrowLeft,
 	CalendarClock,
@@ -96,7 +96,13 @@ function TraceDetailsHeader({
 	}, [traceID]);
 
 	const handlePreviousBtnClick = useCallback((): void => {
-		if (hasInAppHistory()) {
+		const isSpaNavigate =
+			document.referrer &&
+			// oxlint-disable-next-line signoz/no-raw-absolute-path
+			new URL(document.referrer).origin === window.location.origin;
+		const hasBackHistory = window.history.length > 1;
+
+		if (isSpaNavigate && hasBackHistory) {
 			history.goBack();
 		} else {
 			history.push(ROUTES.TRACES_EXPLORER);
@@ -124,7 +130,6 @@ function TraceDetailsHeader({
 							size="md"
 							className={styles.backBtn}
 							onClick={handlePreviousBtnClick}
-							aria-label="Back"
 						>
 							<ArrowLeft size={14} />
 						</Button>

frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/__tests__/TraceDetailsHeader.test.tsx

@@ -1,60 +0,0 @@
-import { fireEvent, screen } from '@testing-library/react';
-import ROUTES from 'constants/routes';
-import { render } from 'tests/test-utils';
-
-import TraceDetailsHeader from '../TraceDetailsHeader';
-
-const mockGoBack = jest.fn();
-const mockPush = jest.fn();
-const mockHasInAppHistory = jest.fn();
-
-jest.mock('lib/history', () => ({
-	__esModule: true,
-	default: {
-		goBack: (): void => mockGoBack(),
-		push: (path: string): void => mockPush(path),
-		replace: jest.fn(),
-		location: { pathname: '/', search: '' },
-		listen: (): (() => void) => (): void => undefined,
-	},
-	hasInAppHistory: (): boolean => mockHasInAppHistory(),
-}));
-
-const baseProps = {
-	filterMetadata: {
-		startTime: 0,
-		endTime: 1,
-		traceId: 'trace-123',
-	},
-	onFilteredSpansChange: jest.fn(),
-	isDataLoaded: false,
-};
-
-describe('TraceDetailsHeader – back button', () => {
-	beforeEach(() => {
-		mockGoBack.mockClear();
-		mockPush.mockClear();
-		mockHasInAppHistory.mockReset();
-	});
-
-	it('calls history.goBack() when there is in-app SPA history', () => {
-		mockHasInAppHistory.mockReturnValue(true);
-		render(<TraceDetailsHeader {...baseProps} />);
-
-		fireEvent.click(screen.getByRole('button', { name: /back/i }));
-
-		expect(mockGoBack).toHaveBeenCalledTimes(1);
-		expect(mockPush).not.toHaveBeenCalled();
-	});
-
-	it('pushes to the traces explorer route when there is no in-app SPA history', () => {
-		mockHasInAppHistory.mockReturnValue(false);
-		render(<TraceDetailsHeader {...baseProps} />);
-
-		fireEvent.click(screen.getByRole('button', { name: /back/i }));
-
-		expect(mockPush).toHaveBeenCalledTimes(1);
-		expect(mockPush).toHaveBeenCalledWith(ROUTES.TRACES_EXPLORER);
-		expect(mockGoBack).not.toHaveBeenCalled();
-	});
-});

frontend/src/providers/preferences/__tests__/PreferencesProvider.integration.test.tsx

@@ -108,9 +108,7 @@ describe('PreferencesProvider integration', () => {
 				},
 			);
 
-			// Loader's ensureLogsRequiredColumns prepends timestamp + body, so the
-			// 1 column in localStorage becomes 3 in preferences.
-			expect(Number(screen.getByTestId('logs-columns-len').textContent)).toBe(3);
+			expect(Number(screen.getByTestId('logs-columns-len').textContent)).toBe(1);
 		});
 
 		it('direct mode updateColumns persists to localStorage', async () => {
@@ -128,11 +126,8 @@ describe('PreferencesProvider integration', () => {
 			const stored = getLocalStorageJSON<LogsLocalOptions>(
 				LOCALSTORAGE.LOGS_LIST_OPTIONS,
 			);
-			// Writer's ensureLogsRequiredColumns prepends `body` when only
-			// `timestamp` was passed in (defaults.slice(0,1) is just timestamp).
 			expect(stored?.selectColumns).toStrictEqual([
-				defaultLogsSelectedColumns[1] as TelemetryFieldKey, // body
-				defaultLogsSelectedColumns[0] as TelemetryFieldKey, // timestamp
+				defaultLogsSelectedColumns[0] as TelemetryFieldKey,
 			]);
 		});
 
@@ -188,9 +183,7 @@ describe('PreferencesProvider integration', () => {
 				value: originalLocation,
 			});
 
-			// Loader's ensureLogsRequiredColumns prepends timestamp + body, so the
-			// URL's 1 column becomes 3 in preferences.
-			expect(Number(screen.getByTestId('logs-columns-len').textContent)).toBe(3);
+			expect(Number(screen.getByTestId('logs-columns-len').textContent)).toBe(1);
 		});
 
 		it('updateFormatting persists to localStorage in direct mode', async () => {

frontend/src/providers/preferences/__tests__/logsUpdaterConfig.test.ts

@@ -1,10 +1,7 @@
 import { TelemetryFieldKey } from 'api/v5/v5';
 import { LOCALSTORAGE } from 'constants/localStorage';
 import { LogViewMode } from 'container/LogsTable';
-import {
-	defaultLogsSelectedColumns,
-	defaultOptionsQuery,
-} from 'container/OptionsMenu/constants';
+import { defaultOptionsQuery } from 'container/OptionsMenu/constants';
 import { FontSize } from 'container/OptionsMenu/types';
 import {
 	FormattingOptions,
@@ -88,21 +85,18 @@ describe('logsUpdaterConfig', () => {
 
 		logsUpdater.updateColumns(newColumns, PreferenceMode.DIRECT);
 
-		// Writer guards body+timestamp via ensureLogsRequiredColumns invariant
-		const guardedColumns = [...defaultLogsSelectedColumns, ...newColumns];
-
 		// Should update URL
 		expect(redirectWithOptionsData).toHaveBeenCalledWith({
 			...defaultOptionsQuery,
 			...mockPreferences.formatting,
-			selectColumns: guardedColumns,
+			selectColumns: newColumns,
 		});
 
-		// Should update localStorage with the guarded shape
+		// Should update localStorage
 		const storedData = JSON.parse(
 			mockLocalStorage[LOCALSTORAGE.LOGS_LIST_OPTIONS],
 		);
-		expect(storedData.selectColumns).toStrictEqual(guardedColumns);
+		expect(storedData.selectColumns).toStrictEqual(newColumns);
 		expect(storedData.maxLines).toBe(1); // Should preserve other fields
 
 		// Should not update saved view preferences

frontend/src/providers/preferences/__tests__/usePreferenceLoader.test.tsx

@@ -1,5 +1,4 @@
 import { renderHook, waitFor } from '@testing-library/react';
-import { defaultLogsSelectedColumns } from 'container/OptionsMenu/constants';
 import { DataSource } from 'types/common/queryBuilder';
 
 import logsLoaderConfig from '../configs/logsLoaderConfig';
@@ -61,9 +60,9 @@ describe('usePreferenceLoader', () => {
 			expect(result.current.loading).toBe(false);
 		});
 
-		// Loader wraps with ensureLogsRequiredColumns — body+timestamp always prepended
+		// Should have loaded from local storage (highest priority)
 		expect(result.current.preferences).toStrictEqual({
-			columns: [...defaultLogsSelectedColumns, { name: 'local-column' }],
+			columns: [{ name: 'local-column' }],
 			formatting: { maxLines: 5, format: 'table', fontSize: 'medium', version: 1 },
 		});
 		expect(result.current.error).toBeNull();

frontend/src/providers/preferences/configs/logsUpdaterConfig.ts

@@ -3,10 +3,7 @@ import getLocalStorageKey from 'api/browser/localstorage/get';
 import setLocalStorageKey from 'api/browser/localstorage/set';
 import { TelemetryFieldKey } from 'api/v5/v5';
 import { LOCALSTORAGE } from 'constants/localStorage';
-import {
-	defaultOptionsQuery,
-	ensureLogsRequiredColumns,
-} from 'container/OptionsMenu/constants';
+import { defaultOptionsQuery } from 'container/OptionsMenu/constants';
 import { FontSize, OptionsQuery } from 'container/OptionsMenu/types';
 
 import { FormattingOptions, PreferenceMode, Preferences } from '../types';
@@ -21,12 +18,11 @@ const getLogsUpdaterConfig = (
 	updateFormatting: (newFormatting: FormattingOptions, mode: string) => void;
 } => ({
 	updateColumns: (newColumns: TelemetryFieldKey[], mode: string): void => {
-		const guardedColumns = ensureLogsRequiredColumns(newColumns);
 		if (mode === PreferenceMode.SAVED_VIEW) {
 			setSavedViewPreferences((prev) => {
 				if (!prev) {
 					return {
-						columns: guardedColumns,
+						columns: newColumns,
 						formatting: {
 							maxLines: 1,
 							format: 'table',
@@ -38,7 +34,7 @@ const getLogsUpdaterConfig = (
 
 				return {
 					...prev,
-					columns: guardedColumns,
+					columns: newColumns,
 				};
 			});
 		}
@@ -48,14 +44,14 @@ const getLogsUpdaterConfig = (
 			redirectWithOptionsData({
 				...defaultOptionsQuery,
 				...preferences?.formatting,
-				selectColumns: guardedColumns,
+				selectColumns: newColumns,
 			});
 
 			// Also update local storage
 			const local = JSON.parse(
 				getLocalStorageKey(LOCALSTORAGE.LOGS_LIST_OPTIONS) || '{}',
 			);
-			local.selectColumns = guardedColumns;
+			local.selectColumns = newColumns;
 			setLocalStorageKey(LOCALSTORAGE.LOGS_LIST_OPTIONS, JSON.stringify(local));
 		}
 	},

frontend/src/providers/preferences/loader/usePreferenceLoader.ts

@@ -1,6 +1,5 @@
 import { useEffect, useState } from 'react';
 import { TelemetryFieldKey } from 'api/v5/v5';
-import { ensureLogsRequiredColumns } from 'container/OptionsMenu/constants';
 import { has } from 'lodash-es';
 import { DataSource } from 'types/common/queryBuilder';
 
@@ -52,11 +51,7 @@ function logsPreferencesLoader(): {
 	columns: TelemetryFieldKey[];
 	formatting: FormattingOptions;
 } {
-	const result = preferencesLoader<{
-		columns: TelemetryFieldKey[];
-		formatting: FormattingOptions;
-	}>(logsLoaderConfig);
-	return { ...result, columns: ensureLogsRequiredColumns(result.columns) };
+	return preferencesLoader(logsLoaderConfig);
 }
 
 function tracesPreferencesLoader(): {

frontend/src/providers/preferences/sync/usePreferenceSync.ts

@@ -1,10 +1,7 @@
 /* eslint-disable sonarjs/cognitive-complexity */
 import { useEffect, useState } from 'react';
 import { TelemetryFieldKey } from 'api/v5/v5';
-import {
-	defaultLogsSelectedColumns,
-	ensureLogsRequiredColumns,
-} from 'container/OptionsMenu/constants';
+import { defaultLogsSelectedColumns } from 'container/OptionsMenu/constants';
 import { defaultSelectedColumns as defaultTracesSelectedColumns } from 'container/TracesExplorer/ListView/configs';
 import { useGetAllViews } from 'hooks/saveViews/useGetAllViews';
 import { DataSource } from 'types/common/queryBuilder';
@@ -57,10 +54,9 @@ export function usePreferenceSync({
 		let columns: TelemetryFieldKey[] = [];
 		let formatting: FormattingOptions | undefined;
 		if (dataSource === DataSource.LOGS) {
-			columns = ensureLogsRequiredColumns(
+			columns =
 				updateExtraDataSelectColumns(parsedExtraData?.selectColumns) ||
-					defaultLogsSelectedColumns,
-			);
+				defaultLogsSelectedColumns;
 			formatting = {
 				maxLines: parsedExtraData?.maxLines ?? 1,
 				format: parsedExtraData?.format ?? 'table',

pkg/modules/logspipeline/impllogspipeline/module.go

@@ -1,50 +0,0 @@
-package impllogspipeline
-
-import (
-	"context"
-
-	"github.com/SigNoz/signoz/pkg/modules/logspipeline"
-	"github.com/SigNoz/signoz/pkg/sqlstore"
-	"github.com/SigNoz/signoz/pkg/valuer"
-)
-
-const elementType = "log_pipelines"
-
-type module struct {
-	sqlStore sqlstore.SQLStore
-}
-
-func NewModule(sqlStore sqlstore.SQLStore) logspipeline.Module {
-	return &module{sqlStore: sqlStore}
-}
-
-func (m *module) Collect(ctx context.Context, orgID valuer.UUID) (map[string]any, error) {
-	subq := m.sqlStore.BunDB().NewSelect().
-		TableExpr("agent_config_version").
-		ColumnExpr("MAX(version)").
-		Where("org_id = ?", orgID).
-		Where("element_type = ?", elementType)
-
-	var result struct {
-		Total   int `bun:"total"`
-		Enabled int `bun:"enabled_count"`
-	}
-	err := m.sqlStore.BunDB().NewSelect().
-		TableExpr("agent_config_element AS e").
-		Join("JOIN agent_config_version AS v ON v.id = e.version_id").
-		Join("JOIN pipelines AS p ON p.id = e.element_id").
-		Where("v.org_id = ?", orgID).
-		Where("v.element_type = ?", elementType).
-		Where("v.version = (?)", subq).
-		ColumnExpr("COUNT(*) AS total").
-		ColumnExpr("SUM(CASE WHEN p.enabled THEN 1 ELSE 0 END) AS enabled_count").
-		Scan(ctx, &result)
-	if err != nil {
-		return nil, err
-	}
-
-	return map[string]any{
-		"logs_pipeline.total.count":   result.Total,
-		"logs_pipeline.enabled.count": result.Enabled,
-	}, nil
-}

pkg/modules/logspipeline/logspipeline.go

@@ -1,7 +0,0 @@
-package logspipeline
-
-import "github.com/SigNoz/signoz/pkg/statsreporter"
-
-type Module interface {
-	statsreporter.StatsCollector
-}

pkg/query-service/rules/base_rule.go

@@ -4,6 +4,8 @@ import (
 	"context"
 	"fmt"
 	"log/slog"
+	"net/url"
+	"strings"
 	"sync"
 	"time"
 
@@ -23,7 +25,7 @@ type BaseRule struct {
 	id             string
 	name           string
 	orgID          valuer.UUID
-	source         string
+	externalURL    *url.URL
 	handledRestart bool
 
 	// Type of the rule
@@ -138,6 +140,15 @@ func WithRuleStateHistoryModule(module rulestatehistory.Module) RuleOption {
 	}
 }
 
+// WithExternalURL injects the alertmanager external URL
+// (SIGNOZ_ALERTMANAGER_SIGNOZ_EXTERNAL__URL) which is used as the host for
+// related logs/traces links and the rule generator URL in alert notifications.
+func WithExternalURL(externalURL *url.URL) RuleOption {
+	return func(r *BaseRule) {
+		r.externalURL = externalURL
+	}
+}
+
 func NewBaseRule(id string, orgID valuer.UUID, p *ruletypes.PostableRule, opts ...RuleOption) (*BaseRule, error) {
 	threshold, err := p.RuleCondition.Thresholds.GetRuleThreshold()
 	if err != nil {
@@ -152,7 +163,6 @@ func NewBaseRule(id string, orgID valuer.UUID, p *ruletypes.PostableRule, opts .
 		id:                id,
 		orgID:             orgID,
 		name:              p.AlertName,
-		source:            p.Source,
 		typ:               p.AlertType,
 		ruleCondition:     p.RuleCondition,
 		evalWindow:        p.EvalWindow,
@@ -241,7 +251,18 @@ func (r *BaseRule) Annotations() ruletypes.Labels       { return r.annotations }
 func (r *BaseRule) PreferredChannels() []string         { return r.preferredChannels }
 
 func (r *BaseRule) GeneratorURL() string {
-	return ruletypes.PrepareRuleGeneratorURL(r.ID(), r.source)
+	return fmt.Sprintf("%s/alerts/edit?ruleId=%s", r.ExternalURLHost(), r.ID())
+}
+
+// ExternalURLHost returns the configured alertmanager external URL
+// (SIGNOZ_ALERTMANAGER_SIGNOZ_EXTERNAL__URL), trimmed of any trailing slash.
+// It is used as the host portion of rule-related URLs (generator URL and
+// related logs/traces links) in alert notifications.
+func (r *BaseRule) ExternalURLHost() string {
+	if r.externalURL == nil {
+		return ""
+	}
+	return strings.TrimRight(r.externalURL.String(), "/")
 }
 
 func (r *BaseRule) SelectedQuery(ctx context.Context) string {

pkg/query-service/rules/base_rule_test.go

@@ -3,6 +3,7 @@ package rules
 import (
 	"context"
 	"fmt"
+	"net/url"
 	"testing"
 	"time"
 
@@ -723,6 +724,68 @@ func TestBaseRule_FilterNewSeries(t *testing.T) {
 	}
 }
 
+func TestBaseRule_ExternalURLHost(t *testing.T) {
+	mustParse := func(raw string) *url.URL {
+		u, err := url.Parse(raw)
+		require.NoError(t, err)
+		return u
+	}
+
+	tests := []struct {
+		name        string
+		externalURL *url.URL
+		want        string
+	}{
+		{name: "nil URL returns empty", externalURL: nil, want: ""},
+		{name: "default value returned as-is", externalURL: mustParse("http://localhost:8080"), want: "http://localhost:8080"},
+		{name: "configured https host", externalURL: mustParse("https://signoz.example.com"), want: "https://signoz.example.com"},
+		{name: "configured host with port", externalURL: mustParse("http://signoz.internal:3301"), want: "http://signoz.internal:3301"},
+		{name: "trailing slash is trimmed", externalURL: mustParse("https://signoz.example.com/"), want: "https://signoz.example.com"},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			r := &BaseRule{externalURL: tc.externalURL}
+			require.Equal(t, tc.want, r.ExternalURLHost())
+		})
+	}
+}
+
+func TestBaseRule_GeneratorURL(t *testing.T) {
+	mustParse := func(raw string) *url.URL {
+		u, err := url.Parse(raw)
+		require.NoError(t, err)
+		return u
+	}
+
+	tests := []struct {
+		name        string
+		ruleID      string
+		externalURL *url.URL
+		want        string
+	}{
+		{
+			name:        "configured external URL",
+			ruleID:      "abc",
+			externalURL: mustParse("https://signoz.example.com"),
+			want:        "https://signoz.example.com/alerts/edit?ruleId=abc",
+		},
+		{
+			name:        "default external URL is used as-is",
+			ruleID:      "abc",
+			externalURL: mustParse("http://localhost:8080"),
+			want:        "http://localhost:8080/alerts/edit?ruleId=abc",
+		},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			r := &BaseRule{id: tc.ruleID, externalURL: tc.externalURL}
+			require.Equal(t, tc.want, r.GeneratorURL())
+		})
+	}
+}
+
 // labelsKey creates a deterministic string key from a labels map
 // This is used to group series by their unique label combinations
 func labelsKey(lbls []*qbtypes.Label) string {

pkg/query-service/rules/manager.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"log/slog"
+	"net/url"
 	"sort"
 	"strings"
 	"sync"
@@ -80,6 +81,11 @@ type ManagerOptions struct {
 
 	EvalDelay valuer.TextDuration
 
+	// ExternalURL is the alertmanager external URL
+	// (SIGNOZ_ALERTMANAGER_SIGNOZ_EXTERNAL__URL). Rules use it as the host for
+	// generator URLs and related logs/traces links in alert notifications.
+	ExternalURL *url.URL
+
 	RuleStateHistoryModule rulestatehistory.Module
 
 	PrepareTaskFunc     func(opts PrepareTaskOptions) (Task, error)
@@ -155,6 +161,7 @@ func defaultPrepareTaskFunc(opts PrepareTaskOptions) (Task, error) {
 			WithQueryParser(opts.ManagerOpts.QueryParser),
 			WithMetadataStore(opts.ManagerOpts.MetadataStore),
 			WithRuleStateHistoryModule(opts.ManagerOpts.RuleStateHistoryModule),
+			WithExternalURL(opts.ManagerOpts.ExternalURL),
 		)
 		if err != nil {
 			return task, err
@@ -178,6 +185,7 @@ func defaultPrepareTaskFunc(opts PrepareTaskOptions) (Task, error) {
 			WithQueryParser(opts.ManagerOpts.QueryParser),
 			WithMetadataStore(opts.ManagerOpts.MetadataStore),
 			WithRuleStateHistoryModule(opts.ManagerOpts.RuleStateHistoryModule),
+			WithExternalURL(opts.ManagerOpts.ExternalURL),
 		)
 		if err != nil {
 			return task, err

pkg/query-service/rules/test_notification.go

@@ -54,6 +54,7 @@ func defaultTestNotification(opts PrepareTestRuleOptions) (int, error) {
 			WithSQLStore(opts.SQLStore),
 			WithQueryParser(opts.ManagerOpts.QueryParser),
 			WithMetadataStore(opts.ManagerOpts.MetadataStore),
+			WithExternalURL(opts.ManagerOpts.ExternalURL),
 		)
 
 		if err != nil {
@@ -75,6 +76,7 @@ func defaultTestNotification(opts PrepareTestRuleOptions) (int, error) {
 			WithSQLStore(opts.SQLStore),
 			WithQueryParser(opts.ManagerOpts.QueryParser),
 			WithMetadataStore(opts.ManagerOpts.MetadataStore),
+			WithExternalURL(opts.ManagerOpts.ExternalURL),
 		)
 
 		if err != nil {

pkg/query-service/rules/threshold_rule.go

@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"log/slog"
-	"net/url"
 	"reflect"
 	"time"
 
@@ -55,17 +54,6 @@ func NewThresholdRule(
 	}, nil
 }
 
-func (r *ThresholdRule) hostFromSource() string {
-	parsedURL, err := url.Parse(r.source)
-	if err != nil {
-		return ""
-	}
-	if parsedURL.Port() != "" {
-		return fmt.Sprintf("%s://%s:%s", parsedURL.Scheme, parsedURL.Hostname(), parsedURL.Port())
-	}
-	return fmt.Sprintf("%s://%s", parsedURL.Scheme, parsedURL.Hostname())
-}
-
 func (r *ThresholdRule) Type() ruletypes.RuleType {
 	return ruletypes.RuleTypeThreshold
 }
@@ -350,15 +338,15 @@ func (r *ThresholdRule) Eval(ctx context.Context, ts time.Time) (int, error) {
 		switch r.typ {
 		case ruletypes.AlertTypeTraces:
 			link := r.prepareLinksToTraces(ctx, ts, smpl.Metric)
-			if link != "" && r.hostFromSource() != "" {
-				r.logger.InfoContext(ctx, "adding traces link to annotations", slog.String("annotation.link", fmt.Sprintf("%s/traces-explorer?%s", r.hostFromSource(), link)))
-				annotations = append(annotations, ruletypes.Label{Name: "related_traces", Value: fmt.Sprintf("%s/traces-explorer?%s", r.hostFromSource(), link)})
+			if link != "" && r.ExternalURLHost() != "" {
+				r.logger.InfoContext(ctx, "adding traces link to annotations", slog.String("annotation.link", fmt.Sprintf("%s/traces-explorer?%s", r.ExternalURLHost(), link)))
+				annotations = append(annotations, ruletypes.Label{Name: "related_traces", Value: fmt.Sprintf("%s/traces-explorer?%s", r.ExternalURLHost(), link)})
 			}
 		case ruletypes.AlertTypeLogs:
 			link := r.prepareLinksToLogs(ctx, ts, smpl.Metric)
-			if link != "" && r.hostFromSource() != "" {
-				r.logger.InfoContext(ctx, "adding logs link to annotations", slog.String("annotation.link", fmt.Sprintf("%s/logs/logs-explorer?%s", r.hostFromSource(), link)))
-				annotations = append(annotations, ruletypes.Label{Name: "related_logs", Value: fmt.Sprintf("%s/logs/logs-explorer?%s", r.hostFromSource(), link)})
+			if link != "" && r.ExternalURLHost() != "" {
+				r.logger.InfoContext(ctx, "adding logs link to annotations", slog.String("annotation.link", fmt.Sprintf("%s/logs/logs-explorer?%s", r.ExternalURLHost(), link)))
+				annotations = append(annotations, ruletypes.Label{Name: "related_logs", Value: fmt.Sprintf("%s/logs/logs-explorer?%s", r.ExternalURLHost(), link)})
 			}
 		}
 

pkg/ruler/signozruler/provider.go

@@ -2,6 +2,7 @@ package signozruler
 
 import (
 	"context"
+	"net/url"
 
 	"github.com/SigNoz/signoz/pkg/alertmanager"
 	"github.com/SigNoz/signoz/pkg/alertmanager/alertmanagerstore/sqlalertmanagerstore"
@@ -41,6 +42,7 @@ func NewFactory(
 	ruleStateHistoryModule rulestatehistory.Module,
 	querier querier.Querier,
 	queryParser queryparser.QueryParser,
+	externalURL *url.URL,
 	prepareTaskFunc func(rules.PrepareTaskOptions) (rules.Task, error),
 	prepareTestRuleFunc func(rules.PrepareTestRuleOptions) (int, error),
 ) factory.ProviderFactory[ruler.Ruler, ruler.Config] {
@@ -57,6 +59,7 @@ func NewFactory(
 			Logger:                 providerSettings.Logger,
 			Cache:                  cache,
 			EvalDelay:              valuer.MustParseTextDuration(config.EvalDelay.String()),
+			ExternalURL:            externalURL,
 			PrepareTaskFunc:        prepareTaskFunc,
 			PrepareTestRuleFunc:    prepareTestRuleFunc,
 			Alertmanager:           alertmanager,

pkg/signoz/module.go

@@ -19,8 +19,6 @@ import (
 	"github.com/SigNoz/signoz/pkg/modules/inframonitoring/implinframonitoring"
 	"github.com/SigNoz/signoz/pkg/modules/llmpricingrule"
 	"github.com/SigNoz/signoz/pkg/modules/llmpricingrule/impllmpricingrule"
-	"github.com/SigNoz/signoz/pkg/modules/logspipeline"
-	"github.com/SigNoz/signoz/pkg/modules/logspipeline/impllogspipeline"
 	"github.com/SigNoz/signoz/pkg/modules/metricsexplorer"
 	"github.com/SigNoz/signoz/pkg/modules/metricsexplorer/implmetricsexplorer"
 	"github.com/SigNoz/signoz/pkg/modules/organization"
@@ -87,7 +85,6 @@ type Modules struct {
 	Promote          promote.Module
 	ServiceAccount   serviceaccount.Module
 	CloudIntegration cloudintegration.Module
-	LogsPipeline     logspipeline.Module
 	RuleStateHistory rulestatehistory.Module
 	TraceDetail      tracedetail.Module
 	SpanMapper       spanmapper.Module
@@ -146,7 +143,6 @@ func NewModules(
 		InfraMonitoring:  implinframonitoring.NewModule(telemetryStore, telemetryMetadataStore, querier, providerSettings, config.InfraMonitoring),
 		Promote:          implpromote.NewModule(telemetryMetadataStore, telemetryStore),
 		ServiceAccount:   serviceAccount,
-		LogsPipeline:     impllogspipeline.NewModule(sqlstore),
 		RuleStateHistory: implrulestatehistory.NewModule(implrulestatehistory.NewStore(telemetryStore, telemetryMetadataStore, providerSettings.Logger)),
 		CloudIntegration: cloudIntegrationModule,
 		TraceDetail:      impltracedetail.NewModule(impltracedetail.NewTraceStore(telemetryStore), providerSettings, config.TraceDetail),

pkg/signoz/signoz.go

@@ -3,6 +3,7 @@ package signoz
 import (
 	"context"
 	"log/slog"
+	"net/url"
 
 	"github.com/SigNoz/signoz/pkg/alertmanager"
 	"github.com/SigNoz/signoz/pkg/alertmanager/alertmanagerstore/sqlalertmanagerstore"
@@ -113,7 +114,7 @@ func New(
 	meterReporterProviderFactories func(context.Context, factory.ProviderSettings, flagger.Flagger, licensing.Licensing, telemetrystore.TelemetryStore, retention.Getter, organization.Getter, zeus.Zeus) (factory.NamedMap[factory.ProviderFactory[meterreporter.Reporter, meterreporter.Config]], string),
 	querierHandlerCallback func(factory.ProviderSettings, querier.Querier, analytics.Analytics) querier.Handler,
 	cloudIntegrationCallback func(sqlstore.SQLStore, global.Global, zeus.Zeus, gateway.Gateway, licensing.Licensing, serviceaccount.Module, cloudintegration.Config) (cloudintegration.Module, error),
-	rulerProviderFactories func(cache.Cache, alertmanager.Alertmanager, sqlstore.SQLStore, telemetrystore.TelemetryStore, telemetrytypes.MetadataStore, prometheus.Prometheus, organization.Getter, rulestatehistory.Module, querier.Querier, queryparser.QueryParser) factory.NamedMap[factory.ProviderFactory[ruler.Ruler, ruler.Config]],
+	rulerProviderFactories func(cache.Cache, alertmanager.Alertmanager, sqlstore.SQLStore, telemetrystore.TelemetryStore, telemetrytypes.MetadataStore, prometheus.Prometheus, organization.Getter, rulestatehistory.Module, querier.Querier, queryparser.QueryParser, *url.URL) factory.NamedMap[factory.ProviderFactory[ruler.Ruler, ruler.Config]],
 ) (*SigNoz, error) {
 	// Initialize instrumentation
 	instrumentation, err := instrumentation.New(ctx, config.Instrumentation, version.Info, "signoz")
@@ -467,7 +468,7 @@ func New(
 	modules := NewModules(sqlstore, tokenizer, emailing, providerSettings, orgGetter, alertmanager, analytics, querier, telemetrystore, telemetryMetadataStore, authNs, authz, cache, queryParser, config, dashboard, userGetter, userRoleStore, serviceAccount, cloudIntegrationModule, retentionGetter, flagger, tagModule)
 
 	// Initialize ruler from the variant-specific provider factories
-	rulerInstance, err := factory.NewProviderFromNamedMap(ctx, providerSettings, config.Ruler, rulerProviderFactories(cache, alertmanager, sqlstore, telemetrystore, telemetryMetadataStore, prometheus, orgGetter, modules.RuleStateHistory, querier, queryParser), "signoz")
+	rulerInstance, err := factory.NewProviderFromNamedMap(ctx, providerSettings, config.Ruler, rulerProviderFactories(cache, alertmanager, sqlstore, telemetrystore, telemetryMetadataStore, prometheus, orgGetter, modules.RuleStateHistory, querier, queryParser, config.Alertmanager.Signoz.ExternalURL), "signoz")
 	if err != nil {
 		return nil, err
 	}
@@ -497,7 +498,6 @@ func New(
 		modules.AuthDomain,
 		serviceAccount,
 		cloudIntegrationModule,
-		modules.LogsPipeline,
 	}
 
 	// Initialize stats reporter from the available stats reporter provider factories

pkg/types/ruletypes/alerting.go

@@ -2,10 +2,7 @@ package ruletypes
 
 import (
 	"encoding/json"
-	"fmt"
-	"net/url"
 	"sort"
-	"strings"
 	"time"
 
 	qbtypes "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
@@ -191,35 +188,3 @@ func (rc *RuleCondition) String() string {
 	return string(data)
 }
 
-// PrepareRuleGeneratorURL creates an appropriate url for the rule. The URL is
-// sent in Slack messages as well as to other systems and allows backtracking
-// to the rule definition from the third party systems.
-func PrepareRuleGeneratorURL(ruleID string, source string) string {
-	if source == "" {
-		return source
-	}
-
-	// check if source is a valid url
-	parsedSource, err := url.Parse(source)
-	if err != nil {
-		return ""
-	}
-	// since we capture window.location when a new rule is created
-	// we end up with rulesource host:port/alerts/new. in this case
-	// we want to replace new with rule id parameter
-
-	hasNew := strings.LastIndex(source, "new")
-	if hasNew > -1 {
-		ruleURL := fmt.Sprintf("%sedit?ruleId=%s", source[0:hasNew], ruleID)
-		return ruleURL
-	}
-
-	// The source contains the encoded query, start and end time
-	// and other parameters. We don't want to include them in the generator URL
-	// mainly to keep the URL short and lower the alert body contents
-	// The generator URL with /alerts/edit?ruleId= is enough
-	if parsedSource.Port() != "" {
-		return fmt.Sprintf("%s://%s:%s/alerts/edit?ruleId=%s", parsedSource.Scheme, parsedSource.Hostname(), parsedSource.Port(), ruleID)
-	}
-	return fmt.Sprintf("%s://%s/alerts/edit?ruleId=%s", parsedSource.Scheme, parsedSource.Hostname(), ruleID)
-}