chore(hooks): replace husky with worktree-safe .githooks installed automatically

Husky wired hook installation to pnpm install, which go-only contributors
never run. The installer is plain shell so both the Makefile and the frontend
postinstall can call it, and each check is gated on staged paths so neither
side needs the other's toolchain.

.githooks/commit-msg

@@ -1,7 +1,12 @@
 #!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
 
-cd frontend && pnpm run commitlint --edit $1
+set -e
+
+if [ -d frontend/node_modules ] && command -v pnpm >/dev/null 2>&1; then
+	(cd frontend && pnpm run commitlint --edit "$1")
+else
+	echo "commit-msg: frontend dependencies not installed, skipping commitlint" >&2
+fi
 
 branch="$(git rev-parse --abbrev-ref HEAD)"
 

.githooks/install

@@ -0,0 +1,30 @@
+#!/bin/sh
+# Installs dispatcher stubs into the repository's hooks directory. Safe to run
+# repeatedly; invoked automatically from the Makefile and from the frontend
+# postinstall so no manual setup is required.
+
+set -e
+
+git rev-parse --git-dir >/dev/null 2>&1 || exit 0
+
+# core.hooksPath shadows the hooks directory git would otherwise use, and an
+# absolute value leaks one worktree's path into every other worktree.
+if [ -n "$(git config --get core.hooksPath 2>/dev/null || true)" ]; then
+	git config --unset-all core.hooksPath 2>/dev/null || true
+fi
+
+# Resolves to the common directory for linked worktrees, which is where git
+# looks for hooks regardless of which worktree the commit happens in.
+hooks_dir="$(git rev-parse --git-path hooks)"
+mkdir -p "$hooks_dir"
+
+for hook in pre-commit commit-msg; do
+	cat >"$hooks_dir/$hook" <<EOF
+#!/bin/sh
+# Generated by .githooks/install.
+root="\$(git rev-parse --show-toplevel)"
+[ -x "\$root/.githooks/$hook" ] || exit 0
+exec "\$root/.githooks/$hook" "\$@"
+EOF
+	chmod +x "$hooks_dir/$hook"
+done

.githooks/pre-commit

@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -e
+
+staged_go_files=$(git diff --cached --name-only --diff-filter=ACM -- '*.go')
+if [ -n "$staged_go_files" ]; then
+	if command -v gofmt >/dev/null 2>&1; then
+		echo "$staged_go_files" | xargs gofmt -l -w
+		echo "$staged_go_files" | xargs git add
+	else
+		echo "pre-commit: gofmt not found, skipping go formatting" >&2
+	fi
+fi
+
+staged_web_files=$(git diff --cached --name-only --diff-filter=ACM -- 'frontend/*')
+if [ -n "$staged_web_files" ]; then
+	if [ -d frontend/node_modules ] && command -v pnpm >/dev/null 2>&1; then
+		cd frontend && pnpm lint-staged
+	else
+		echo "pre-commit: frontend dependencies not installed, skipping lint-staged" >&2
+	fi
+fi

Makefile

@@ -35,6 +35,13 @@ DOCKERFILE_ENTERPRISE 			= $(SRC)/cmd/enterprise/Dockerfile
 DOCKER_REGISTRY_ENTERPRISE 		?= docker.io/signoz/signoz
 JS_BUILD_CONTEXT 				= $(SRC)/frontend
 
+##############################################################
+# git hooks
+##############################################################
+# Hooks live outside the working tree, so they cannot be checked in. Expanded
+# while this file is parsed, which wires them up on any make invocation.
+GITHOOKS_INSTALL := $(shell sh $(SRC)/.githooks/install >/dev/null 2>&1 || true)
+
 ##############################################################
 # directories
 ##############################################################

frontend/.husky/pre-commit

@@ -1,4 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-cd frontend && pnpm lint-staged

frontend/package.json

@@ -20,8 +20,7 @@
     "jest": "jest",
     "jest:coverage": "jest --coverage",
     "jest:watch": "jest --watch",
-    "postinstall": "pnpm i18n:generate-hash && (is-ci || pnpm husky:configure)  && node scripts/update-registry.cjs",
-    "husky:configure": "cd .. && husky install frontend/.husky && cd frontend && chmod ug+x .husky/*",
+    "postinstall": "pnpm i18n:generate-hash && (is-ci || sh ../.githooks/install) && node scripts/update-registry.cjs",
     "commitlint": "commitlint --edit $1",
     "test": "jest",
     "test:changedsince": "jest --changedSince=main --coverage --silent",
@@ -186,7 +185,6 @@
     "@typescript/native-preview": "7.0.0-dev.20260430.1",
     "eslint-plugin-sonarjs": "4.0.2",
     "glob": "^13.0.6",
-    "husky": "^7.0.4",
     "is-ci": "^3.0.1",
     "jest-environment-jsdom": "29.7.0",
     "jest-styled-components": "^7.2.0",

frontend/pnpm-lock.yaml

@@ -440,9 +440,6 @@ importers:
       glob:
         specifier: ^13.0.6
         version: 13.0.6
-      husky:
-        specifier: ^7.0.4
-        version: 7.0.4
       is-ci:
         specifier: ^3.0.1
         version: 3.0.1
@@ -5529,11 +5526,6 @@ packages:
     resolution: {integrity: sha512-eKCa6bwnJhvxj14kZk5NCPc6Hb6BdsU9DZcOnmQKSnO1VKrfV0zCvtttPZUsBvjmNDn8rpcJfpwSYnHBjc95MQ==}
     engines: {node: '>=18.18.0'}
 
-  husky@7.0.4:
-    resolution: {integrity: sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ==}
-    engines: {node: '>=12'}
-    hasBin: true
-
   hyphenate-style-name@1.0.4:
     resolution: {integrity: sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ==}
 
@@ -14636,8 +14628,6 @@ snapshots:
 
   human-signals@8.0.1: {}
 
-  husky@7.0.4: {}
-
   hyphenate-style-name@1.0.4: {}
 
   i18next-browser-languagedetector@6.1.8:

frontend/src/components/ChangelogModal/__test__/ChangelogRenderer.test.tsx

@@ -8,19 +8,12 @@ import {
 
 import ChangelogRenderer from '../components/ChangelogRenderer';
 
-// Mock react-markdown to render children as plain text and a sample
-// anchor through the `components.a` override
+// Mock react-markdown to just render children as plain text
 jest.mock(
 	'react-markdown',
 	() =>
-		function ReactMarkdown({ children, components }: any) {
-			const Anchor = components?.a;
-			return (
-				<div>
-					{children}
-					{Anchor && <Anchor href="https://signoz.io/docs">docs</Anchor>}
-				</div>
-			);
+		function ReactMarkdown({ children }: any) {
+			return <div>{children}</div>;
 		},
 );
 
@@ -69,14 +62,4 @@ describe('ChangelogRenderer', () => {
 		expect(screen.getByAltText('Media')).toBeInTheDocument();
 		expect(screen.getByText('Description for feature 1')).toBeInTheDocument();
 	});
-
-	it('renders markdown links that open in a new tab', () => {
-		render(<ChangelogRenderer changelog={mockChangelog} />);
-		const links = screen.getAllByRole('link', { name: 'docs' });
-		expect(links.length).toBeGreaterThan(0);
-		links.forEach((link) => {
-			expect(link).toHaveAttribute('target', '_blank');
-			expect(link).toHaveAttribute('rel', 'noopener noreferrer');
-		});
-	});
 });

frontend/src/components/ChangelogModal/components/ChangelogRenderer.tsx

@@ -13,19 +13,6 @@ interface Props {
 	changelog: ChangelogSchema;
 }
 
-interface LinkProps {
-	href?: string;
-	children?: React.ReactNode;
-}
-
-function Link({ href, children }: LinkProps): JSX.Element {
-	return (
-		<a href={href} target="_blank" rel="noopener noreferrer">
-			{children}
-		</a>
-	);
-}
-
 function renderMedia(media: Media): JSX.Element | null {
 	if (SupportedImageTypes.includes(media.ext)) {
 		return (
@@ -75,9 +62,7 @@ function ChangelogRenderer({ changelog }: Props): JSX.Element {
 							<div key={feature.id}>
 								<div className="changelog-renderer-section-title">{feature.title}</div>
 								{feature.media && renderMedia(feature.media)}
-								<ReactMarkdown components={{ a: Link }}>
-									{feature.description}
-								</ReactMarkdown>
+								<ReactMarkdown>{feature.description}</ReactMarkdown>
 							</div>
 						))}
 					</div>
@@ -86,9 +71,7 @@ function ChangelogRenderer({ changelog }: Props): JSX.Element {
 					<div className="changelog-renderer-bug-fixes">
 						<div className="changelog-renderer-section-title">Bug Fixes</div>
 						{changelog.bug_fixes && (
-							<ReactMarkdown components={{ a: Link }}>
-								{changelog.bug_fixes}
-							</ReactMarkdown>
+							<ReactMarkdown>{changelog.bug_fixes}</ReactMarkdown>
 						)}
 					</div>
 				)}
@@ -96,9 +79,7 @@ function ChangelogRenderer({ changelog }: Props): JSX.Element {
 					<div className="changelog-renderer-maintenance">
 						<div className="changelog-renderer-section-title">Maintenance</div>
 						{changelog.maintenance && (
-							<ReactMarkdown components={{ a: Link }}>
-								{changelog.maintenance}
-							</ReactMarkdown>
+							<ReactMarkdown>{changelog.maintenance}</ReactMarkdown>
 						)}
 					</div>
 				)}

frontend/src/components/LogDetail/LogDetail.interfaces.ts

@@ -19,7 +19,6 @@ export type LogDetailProps = {
 	onScrollToLog?: (logId: string) => void;
 	handleOpenInExplorer?: MouseEventHandler;
 	getContainer?: DrawerProps['getContainer'];
-	onApplyLogFilter?: (expression: string) => void;
 } & Pick<AddToQueryHOCProps, 'onAddToQuery'> &
 	Partial<Pick<ActionItemProps, 'onClickActionItem'>> &
 	Pick<DrawerProps, 'onClose'>;

frontend/src/components/LogDetail/LogDetailsHeader/LogDetailsHeader.tsx

@@ -16,7 +16,6 @@ import {
 	Link,
 } from '@signozhq/icons';
 import { useTimezone } from 'providers/Timezone';
-import { normalizeTimeToMs } from 'utils/timeUtils';
 import { ILog } from 'types/api/logs/log';
 import { MouseEvent, MouseEventHandler } from 'react';
 import { useCopyToClipboard } from 'react-use';
@@ -68,11 +67,6 @@ function LogDetailsHeader({
 		},
 	];
 
-	const rawTimestamp = log.date ?? log.timestamp;
-	const displayTimestamp = Number.isNaN(Number(rawTimestamp))
-		? rawTimestamp
-		: normalizeTimeToMs(rawTimestamp);
-
 	return (
 		<div className={styles.header} data-log-detail-ignore="true">
 			<div className={styles.leftSection}>
@@ -82,7 +76,7 @@ function LogDetailsHeader({
 					data-testid="log-details-header-timestamp"
 				>
 					{formatTimezoneAdjustedTimestamp(
-						displayTimestamp,
+						log.date ?? log.timestamp,
 						DATE_TIME_FORMATS.DASH_DATETIME,
 					)}
 				</Typography.Text>

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

@@ -18,9 +18,10 @@ jest.mock('periscope/components/DataViewer', () => ({
 	DataViewer: (): JSX.Element => <div data-testid="overview-data-viewer" />,
 }));
 
-// Force v2 for these tests regardless of route.
-jest.mock('../useIsLogDetailsV2', () => ({
-	useIsLogDetailsV2: (): boolean => true,
+// The flag to be removed later
+jest.mock('../constants', () => ({
+	...jest.requireActual('../constants'),
+	isLogDetailsV2: true,
 }));
 
 const mockLog: ILog = {

frontend/src/components/LogDetail/constants.ts

@@ -1,3 +1,10 @@
+import getLocalStorage from 'api/browser/localstorage/get';
+import { LOCALSTORAGE } from 'constants/localStorage';
+
+// Temp feature flag before actual roll-out
+export const isLogDetailsV2 =
+	getLocalStorage(LOCALSTORAGE.LOG_DETAILS_V2) === 'true';
+
 export const VIEW_TYPES = {
 	OVERVIEW: 'OVERVIEW',
 	JSON: 'JSON',

frontend/src/components/LogDetail/index.tsx

@@ -51,12 +51,11 @@ import { ILogBody } from 'types/api/logs/log';
 import { Query, TagFilter } from 'types/api/queryBuilder/queryBuilderData';
 import { DataSource, StringOperators } from 'types/common/queryBuilder';
 
-import { RESOURCE_KEYS, VIEW_TYPES, VIEWS } from './constants';
+import { isLogDetailsV2, RESOURCE_KEYS, VIEW_TYPES, VIEWS } from './constants';
 import { LogDetailInnerProps, LogDetailProps } from './LogDetail.interfaces';
 import LogDetailsHeader from './LogDetailsHeader/LogDetailsHeader';
 import { useLogNavigation } from './LogDetailsHeader/useLogNavigation';
 import LogHighlights from './LogHighlights/LogHighlights';
-import { useIsLogDetailsV2 } from './useIsLogDetailsV2';
 
 import './LogDetails.styles.scss';
 
@@ -75,7 +74,6 @@ function LogDetailInner({
 	onScrollToLog,
 	handleOpenInExplorer,
 	getContainer,
-	onApplyLogFilter,
 }: LogDetailInnerProps): JSX.Element {
 	const initialContextQuery = useInitialQuery(log);
 	const [contextQuery, setContextQuery] = useState<Query | undefined>(
@@ -94,8 +92,6 @@ function LogDetailInner({
 	const [isEdit, setIsEdit] = useState<boolean>(false);
 	const { stagedQuery } = useQueryBuilder();
 
-	const isLogDetailsV2 = useIsLogDetailsV2();
-
 	// Handle clicks outside to close drawer, except on explicitly ignored regions
 	useEffect(() => {
 		const handleClickOutside = (e: MouseEvent): void => {
@@ -104,7 +100,6 @@ function LogDetailInner({
 			// Don't close if clicking on drawer content, overlays, or portal elements
 			if (
 				target.closest('[data-log-detail-ignore="true"]') ||
-				target.closest('.log-detail-drawer') ||
 				target.closest('.cm-tooltip-autocomplete') ||
 				target.closest('.drawer-popover') ||
 				target.closest('.query-status-popover') ||
@@ -520,7 +515,6 @@ function LogDetailInner({
 						selectedOptions={options}
 						listViewPanelSelectedFields={listViewPanelSelectedFields}
 						handleChangeSelectedView={handleChangeSelectedView}
-						onApplyLogFilter={onApplyLogFilter}
 					/>
 				)}
 				{!isLogDetailsV2 && selectedView === VIEW_TYPES.JSON && (

frontend/src/components/LogDetail/useIsLogDetailsV2.ts

@@ -1,11 +0,0 @@
-import ROUTES from 'constants/routes';
-import { useLocation } from 'react-router-dom';
-
-export function useIsLogDetailsV2(): boolean {
-	const { pathname } = useLocation();
-	return (
-		pathname === ROUTES.LOGS_EXPLORER ||
-		pathname.startsWith(ROUTES.INFRASTRUCTURE_MONITORING_BASE) ||
-		pathname.startsWith(`${ROUTES.ALL_DASHBOARD}/`)
-	);
-}

frontend/src/constants/localStorage.ts

@@ -13,6 +13,7 @@ export enum LOCALSTORAGE {
 	TRACES_LIST_COLUMNS = 'TRACES_LIST_COLUMNS',
 	LOGS_LIST_COLUMNS = 'LOGS_LIST_COLUMNS',
 	LOGS_LIST_COLUMN_SIZING = 'LOGS_LIST_COLUMN_SIZING',
+	LOG_DETAILS_V2 = 'LOG_DETAILS_V2',
 	LOGGED_IN_USER_NAME = 'LOGGED_IN_USER_NAME',
 	LOGGED_IN_USER_EMAIL = 'LOGGED_IN_USER_EMAIL',
 	CHAT_SUPPORT = 'CHAT_SUPPORT',

frontend/src/container/GridCardLayout/__tests__/useResolveQuery.test.tsx

@@ -1,91 +0,0 @@
-import { renderHook } from '@testing-library/react';
-import { PANEL_TYPES } from 'constants/queryBuilder';
-import MockQueryClientProvider from 'providers/test/MockQueryClientProvider';
-import { Query } from 'types/api/queryBuilder/queryBuilderData';
-
-import useUpdatedQuery from '../useResolveQuery';
-
-const mockGetSubstituteVars = jest.fn();
-const mockDynamicVariables: unknown[] = [];
-
-jest.mock('api/dashboard/substitute_vars', () => ({
-	getSubstituteVars: (...args: unknown[]): unknown =>
-		mockGetSubstituteVars(...args),
-}));
-
-jest.mock('api/v5/v5', () => ({
-	prepareQueryRangePayloadV5: (): { queryPayload: unknown } => ({
-		queryPayload: { start: 0, end: 1 },
-	}),
-}));
-
-jest.mock(
-	'lib/newQueryBuilder/queryBuilderMappers/mapQueryDataFromApi',
-	() => ({
-		mapQueryDataFromApi: (): Query => ({ resolved: true }) as unknown as Query,
-	}),
-);
-
-jest.mock('hooks/dashboard/useDashboardVariablesByType', () => ({
-	useDashboardVariablesByType: (): unknown[] => mockDynamicVariables,
-}));
-
-jest.mock('react-redux', () => ({
-	...jest.requireActual('react-redux'),
-	useSelector: (): unknown => ({
-		selectedTime: 'GLOBAL_TIME',
-	}),
-}));
-
-const QUERY = { builder: { queryData: [] } } as unknown as Query;
-
-const WIDGET_CONFIG = {
-	query: QUERY,
-	panelTypes: PANEL_TYPES.TIME_SERIES,
-	timePreferance: 'GLOBAL_TIME' as const,
-};
-
-describe('useResolveQuery', () => {
-	beforeEach(() => {
-		jest.clearAllMocks();
-		mockDynamicVariables.length = 0;
-	});
-
-	it('skips the substitute_vars round-trip when there are no variables', async () => {
-		const { result } = renderHook(() => useUpdatedQuery(), {
-			wrapper: MockQueryClientProvider,
-		});
-
-		const resolved = await result.current.getUpdatedQuery({
-			widgetConfig: WIDGET_CONFIG,
-		});
-
-		expect(mockGetSubstituteVars).not.toHaveBeenCalled();
-		expect(resolved).toBe(QUERY);
-	});
-
-	it('resolves through substitute_vars when the dashboard has variables', async () => {
-		mockGetSubstituteVars.mockResolvedValue({
-			httpStatusCode: 200,
-			data: { compositeQuery: {} },
-		});
-
-		const { result } = renderHook(() => useUpdatedQuery(), {
-			wrapper: MockQueryClientProvider,
-		});
-
-		const resolved = await result.current.getUpdatedQuery({
-			widgetConfig: WIDGET_CONFIG,
-			dashboardData: {
-				data: {
-					variables: {
-						env: { name: 'env', selectedValue: 'prod' },
-					},
-				},
-			},
-		});
-
-		expect(mockGetSubstituteVars).toHaveBeenCalledTimes(1);
-		expect(resolved).toStrictEqual({ resolved: true });
-	});
-});

frontend/src/container/GridCardLayout/useResolveQuery.ts

@@ -2,7 +2,6 @@ import { useCallback } from 'react';
 import { useMutation } from 'react-query';
 // eslint-disable-next-line no-restricted-imports
 import { useSelector } from 'react-redux';
-import { isEmpty } from 'lodash-es';
 import { getSubstituteVars } from 'api/dashboard/substitute_vars';
 import { prepareQueryRangePayloadV5 } from 'api/v5/v5';
 import { PANEL_TYPES } from 'constants/queryBuilder';
@@ -47,21 +46,13 @@ function useUpdatedQuery(): UseUpdatedQueryResult {
 			widgetConfig,
 			dashboardData,
 		}: UseUpdatedQueryOptions): Promise<Query> => {
-			const variables = getDashboardVariables(dashboardData?.data?.variables);
-
-			// `/substitute_vars` only rewrites `$variable` references, so on surfaces with no
-			// dashboard behind them (APM, Celery, API monitoring) the round-trip is a no-op.
-			if (isEmpty(variables) && isEmpty(dashboardDynamicVariables)) {
-				return widgetConfig.query;
-			}
-
 			// Prepare query payload with resolved variables
 			const { queryPayload } = prepareQueryRangePayloadV5({
 				query: widgetConfig.query,
 				graphType: getGraphType(widgetConfig.panelTypes),
 				selectedTime: widgetConfig.timePreferance,
 				globalSelectedInterval,
-				variables,
+				variables: getDashboardVariables(dashboardData?.data?.variables),
 				originalGraphType: widgetConfig.panelTypes,
 				dynamicVariables: dashboardDynamicVariables,
 			});

frontend/src/container/InfraMonitoringK8sV2/Base/K8sExpandedRow.tsx

@@ -37,7 +37,7 @@ import { useInfraMonitoringFontSize } from './useInfraMonitoringTablePreferences
 import styles from './K8sExpandedRow.module.scss';
 import { buildExpressionFromGroupMeta } from './utils';
 import { logInfraColumnSortedEvent } from 'container/InfraMonitoringK8sV2/Base/events';
-import { getUnstableCurrentSearchParams } from 'utils/getUnstableCurrentSearchParams';
+import { getUnstableCurrentSearchParams } from 'container/TopNav/DateTimeSelectionV2/utils/getUnstableCurrentSearchParams';
 import { QueryParams } from 'constants/query';
 
 const EXPANDED_ROW_LIMIT = 10;

frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityLogs/EntityLogs.tsx

@@ -82,7 +82,6 @@ function EntityLogsContent({
 	const { activeLog, selectedTab, handleSetActiveLog, handleCloseLogDetail } =
 		useLogDetailHandlers();
 
-	// TODO: Move away from using onAddToQuery after old drawer cleanup
 	const onAddToQuery = useCallback(
 		(fieldKey: string, fieldValue: string, operator: string): void => {
 			handleCloseLogDetail();
@@ -105,21 +104,6 @@ function EntityLogsContent({
 		[userExpression, querySearchOnRun, handleCloseLogDetail, category],
 	);
 
-	const onApplyLogFilter = useCallback(
-		(expression: string): void => {
-			handleCloseLogDetail();
-
-			const newUser = userExpression.trim()
-				? `${userExpression} AND ${expression}`
-				: expression;
-
-			querySearchOnRun(newUser);
-
-			logInfraDrawerFilterCustomizedEvent(category, 'logs', newUser, 'logs');
-		},
-		[userExpression, querySearchOnRun, handleCloseLogDetail, category],
-	);
-
 	const {
 		logs,
 		loadMoreLogs,
@@ -344,7 +328,6 @@ function EntityLogsContent({
 						selectedTab={selectedTab}
 						onAddToQuery={onAddToQuery}
 						onClickActionItem={onAddToQuery}
-						onApplyLogFilter={onApplyLogFilter}
 						onScrollToLog={handleScrollToLog}
 						handleOpenInExplorer={(e) => handleOpenInExplorer(e, activeLog)}
 						getContainer={(): HTMLElement =>

frontend/src/container/LLMObservability/Overview/Overview.tsx

@@ -9,11 +9,7 @@ function Overview(): JSX.Element {
 
 	return (
 		<div className={styles.overview} data-testid="llm-observability-overview">
-			<DashboardContainer
-				dashboard={dashboard}
-				refetch={refetch}
-				canEditDashboardOverride={false}
-			/>
+			<DashboardContainer dashboard={dashboard} refetch={refetch} />
 		</div>
 	);
 }

frontend/src/container/LLMObservability/Overview/json/dashboard.json

@@ -1,7 +1,7 @@
 {
   "id": "llm-observability-overview",
   "orgId": "",
-  "locked": false,
+  "locked": true,
   "name": "AI Observability Overview",
   "schemaVersion": "v6",
   "source": "system",
@@ -1146,4 +1146,4 @@
       }
     ]
   }
-}
+}

frontend/src/container/LogDetailedView/Overview.tsx

@@ -13,7 +13,7 @@ import { ChangeViewFunctionType } from 'container/ExplorerOptions/types';
 import { OptionsQuery } from 'container/OptionsMenu/types';
 import { useIsDarkMode } from 'hooks/useDarkMode';
 import { ChevronDown, ChevronRight, Search } from '@signozhq/icons';
-import { useIsLogDetailsV2 } from 'components/LogDetail/useIsLogDetailsV2';
+import { isLogDetailsV2 } from 'components/LogDetail/constants';
 import { DataViewer } from 'periscope/components/DataViewer';
 import { IField } from 'types/api/logs/fields';
 import { ILog } from 'types/api/logs/log';
@@ -23,9 +23,9 @@ import { useLogAttributeActions } from './hooks/useLogAttributeActions';
 import TableView from './TableView';
 import {
 	aggregateAttributesResourcesToObject,
-	buildPrettyViewData,
 	getBodyDisplayString,
 	getSanitizedLogBody,
+	parseJsonStringBody,
 	removeEscapeCharacters,
 } from './utils';
 
@@ -41,7 +41,6 @@ interface OverviewProps {
 	selectedOptions: OptionsQuery;
 	listViewPanelSelectedFields?: IField[] | null;
 	handleChangeSelectedView?: ChangeViewFunctionType;
-	onApplyLogFilter?: (expression: string) => void;
 }
 
 type Props = OverviewProps &
@@ -56,7 +55,6 @@ function Overview({
 	selectedOptions,
 	listViewPanelSelectedFields,
 	handleChangeSelectedView,
-	onApplyLogFilter,
 }: Props): JSX.Element {
 	const [isWrapWord, setIsWrapWord] = useState<boolean>(true);
 	const [isSearchVisible, setIsSearchVisible] = useState<boolean>(true);
@@ -69,14 +67,15 @@ function Overview({
 	const { actions, visibleActions } = useLogAttributeActions({
 		handleChangeSelectedView,
 		isListViewPanel,
-		onApplyLogFilter,
 	});
 
-	const isLogDetailsV2 = useIsLogDetailsV2();
-
 	if (isLogDetailsV2) {
 		const raw = aggregateAttributesResourcesToObject(logData);
-		const prettyData = buildPrettyViewData(raw);
+		const prettyData = Object.fromEntries(
+			Object.entries({ ...raw, body: parseJsonStringBody(raw.body) }).filter(
+				([, value]) => value !== undefined,
+			),
+		);
 		return (
 			<div className="overview-container">
 				<DataViewer

frontend/src/container/LogDetailedView/constants.ts

@@ -1,6 +1,6 @@
 export enum LogAttributeBucket {
 	ATTRIBUTES = 'attributes',
-	RESOURCES = 'resource',
+	RESOURCES = 'resources',
 	SCOPE = 'scope',
 }
 

frontend/src/container/LogDetailedView/hooks/useLogAttributeActions.tsx

@@ -1,7 +1,6 @@
 import { useCallback, useMemo } from 'react';
 import { useLocation } from 'react-router-dom';
 import { CircleMinus, CirclePlus, Layers, RefreshCw } from '@signozhq/icons';
-import { convertFiltersToExpression } from 'components/QueryBuilderV2/utils';
 import { FeatureKeys } from 'constants/features';
 import { QueryParams } from 'constants/query';
 import ROUTES from 'constants/routes';
@@ -16,7 +15,6 @@ import {
 	VisibleActionsConfig,
 } from 'periscope/components/PrettyView/PrettyView';
 import { useAppContext } from 'providers/App/App';
-import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
 
 import { LogDetailsAction } from '../constants';
 import {
@@ -29,7 +27,6 @@ import {
 interface UseLogAttributeActionsParams {
 	handleChangeSelectedView?: ChangeViewFunctionType;
 	isListViewPanel?: boolean;
-	onApplyLogFilter?: (expression: string) => void;
 }
 
 interface UseLogAttributeActionsResult {
@@ -53,7 +50,6 @@ const ALL_LEAF_ACTIONS = [
 export function useLogAttributeActions({
 	handleChangeSelectedView,
 	isListViewPanel = false,
-	onApplyLogFilter,
 }: UseLogAttributeActionsParams): UseLogAttributeActionsResult {
 	const { pathname } = useLocation();
 	const { stagedQuery, updateQueriesData } = useQueryBuilder();
@@ -69,6 +65,9 @@ export function useLogAttributeActions({
 
 	const filterFor = useCallback(
 		(context: FieldContext, isFilterIn: boolean): void => {
+			if (!stagedQuery) {
+				return;
+			}
 			const target = buildLogFilterTarget(
 				context.fieldKeyPath,
 				context.fieldValue,
@@ -78,29 +77,6 @@ export function useLogAttributeActions({
 				? target.filterInOperator
 				: target.filterOutOperator;
 
-			// Non-explorer surfaces (infra monitoring, etc.) apply a ready v5
-			// expression fragment to their own query.
-			if (onApplyLogFilter) {
-				const base = {
-					filters: { items: [], op: 'AND' },
-				} as unknown as IBuilderQuery;
-				const nextFilters = getFilterQueryData(
-					base,
-					target,
-					context.fieldValue,
-					operator,
-				).filters ?? { items: [], op: 'AND' };
-				const { expression } = convertFiltersToExpression(nextFilters);
-				if (expression) {
-					onApplyLogFilter(expression);
-				}
-				return;
-			}
-
-			if (!stagedQuery) {
-				return;
-			}
-
 			const updatedQuery = updateQueriesData(
 				stagedQuery,
 				'queryData',
@@ -123,7 +99,6 @@ export function useLogAttributeActions({
 			updateQueriesData,
 			viewName,
 			handleChangeSelectedView,
-			onApplyLogFilter,
 		],
 	);
 
@@ -204,25 +179,20 @@ export function useLogAttributeActions({
 			buildLogFilterTarget(fieldKeyPath, undefined, isBodyJsonQueryEnabled)
 				.isRestricted;
 
-		// The using surface must provide an apply path.
-		const canApplyFilter = !!handleChangeSelectedView || !!onApplyLogFilter;
-
 		return [
 			{
 				key: LogDetailsAction.FILTER_IN,
 				label: 'Filter for value',
 				icon: <CirclePlus size={12} />,
 				onClick: (context): void => filterFor(context, true),
-				shouldHide: (_key, fieldKeyPath): boolean =>
-					!canApplyFilter || isRestricted(fieldKeyPath),
+				shouldHide: (_key, fieldKeyPath): boolean => isRestricted(fieldKeyPath),
 			},
 			{
 				key: LogDetailsAction.FILTER_OUT,
 				label: 'Filter out value',
 				icon: <CircleMinus size={12} />,
 				onClick: (context): void => filterFor(context, false),
-				shouldHide: (_key, fieldKeyPath): boolean =>
-					!canApplyFilter || isRestricted(fieldKeyPath),
+				shouldHide: (_key, fieldKeyPath): boolean => isRestricted(fieldKeyPath),
 			},
 			{
 				key: LogDetailsAction.GROUP_BY,
@@ -230,10 +200,8 @@ export function useLogAttributeActions({
 				icon: <Layers size={12} />,
 				onClick: groupBy,
 				shouldHide: (_key, fieldKeyPath): boolean =>
-					!handleChangeSelectedView ||
 					!buildLogFilterTarget(fieldKeyPath, undefined, isBodyJsonQueryEnabled)
-						.groupBySupported ||
-					isOldExplorerOrLive,
+						.groupBySupported || isOldExplorerOrLive,
 			},
 			{
 				key: LogDetailsAction.REPLACE_FILTER,
@@ -241,9 +209,7 @@ export function useLogAttributeActions({
 				icon: <RefreshCw size={12} />,
 				onClick: replaceFilter,
 				shouldHide: (_key, fieldKeyPath): boolean =>
-					!handleChangeSelectedView ||
-					isRestricted(fieldKeyPath) ||
-					isOldExplorerOrLive,
+					isRestricted(fieldKeyPath) || isOldExplorerOrLive,
 			},
 		];
 	}, [
@@ -252,8 +218,6 @@ export function useLogAttributeActions({
 		replaceFilter,
 		isBodyJsonQueryEnabled,
 		isOldExplorerOrLive,
-		handleChangeSelectedView,
-		onApplyLogFilter,
 	]);
 
 	const visibleActions = useMemo<VisibleActionsConfig>(

frontend/src/container/LogDetailedView/logAttributeActions.utils.test.ts

@@ -33,7 +33,7 @@ describe('buildLogFilterTarget', () => {
 
 		it('maps `resources` with Resource type', () => {
 			expect(
-				buildLogFilterTarget(['resource', 'service.name'], 'api', true),
+				buildLogFilterTarget(['resources', 'service.name'], 'api', true),
 			).toMatchObject({
 				fieldKey: 'service.name',
 				metricsType: MetricsType.Resource,
@@ -53,30 +53,6 @@ describe('buildLogFilterTarget', () => {
 		});
 	});
 
-	describe('nested attribute values (parsed JSON)', () => {
-		it('marks a sub-field of a parsed attribute copy-only (restricted, no group-by)', () => {
-			const t = buildLogFilterTarget(['attributes', 'payload', 'x'], 1, true);
-			expect(t.isRestricted).toBe(true);
-			expect(t.groupBySupported).toBe(false);
-			expect(t.groupByKey).toBeUndefined();
-		});
-
-		it('leaves a top-level attribute (depth 2) filterable', () => {
-			const t = buildLogFilterTarget(['attributes', 'payload'], 'v', true);
-			expect(t.isRestricted).toBe(false);
-			expect(t.groupBySupported).toBe(true);
-		});
-
-		it('does not restrict nested resource/scope values', () => {
-			expect(
-				buildLogFilterTarget(['resource', 'k8s', 'pod'], 'p', true).isRestricted,
-			).toBe(false);
-			expect(
-				buildLogFilterTarget(['scope', 'a', 'b'], 'v', true).isRestricted,
-			).toBe(false);
-		});
-	});
-
 	describe('restricted fields (timestamp / id)', () => {
 		it.each(['timestamp', 'id'])(
 			'marks %s restricted with no group-by',
@@ -89,30 +65,6 @@ describe('buildLogFilterTarget', () => {
 		);
 	});
 
-	describe('group-by-restricted fields (trace_id)', () => {
-		it('allows filtering but not group-by on top-level trace_id', () => {
-			const t = buildLogFilterTarget(['trace_id'], 'abc123', true);
-			expect(t.isRestricted).toBe(false);
-			expect(t.filterInOperator).toBe('=');
-			expect(t.groupBySupported).toBe(false);
-			expect(t.groupByKey).toBeUndefined();
-		});
-
-		it.each([
-			['resource', ['resource', 'trace_id']],
-			['attributes', ['attributes', 'trace_id']],
-		])(
-			'blocks group-by on a %s field named trace_id, keeping filter',
-			(_bucket, path) => {
-				const t = buildLogFilterTarget(path as string[], 'abc123', true);
-				expect(t.isRestricted).toBe(false);
-				expect(t.filterInOperator).toBe('=');
-				expect(t.groupBySupported).toBe(false);
-				expect(t.groupByKey).toBeUndefined();
-			},
-		);
-	});
-
 	describe('body scalars', () => {
 		it('maps a top-level body scalar to body.<key> with =/!=, groupable when json body on', () => {
 			const t = buildLogFilterTarget(['body', 'message'], 'hello', true);

frontend/src/container/LogDetailedView/logAttributeActions.utils.ts

@@ -5,10 +5,7 @@ import {
 	QUERY_BUILDER_FUNCTIONS,
 } from 'constants/antlrQueryConstants';
 import { OPERATORS as QUERY_BUILDER_OPERATORS } from 'constants/queryBuilder';
-import {
-	RESTRICTED_GROUP_BY_FIELDS,
-	RESTRICTED_SELECTED_FIELDS,
-} from 'container/LogsFilters/config';
+import { RESTRICTED_SELECTED_FIELDS } from 'container/LogsFilters/config';
 import { MetricsType } from 'container/MetricsApplication/constant';
 import { getOperatorValue } from 'container/QueryBuilder/filters/QueryBuilderSearch/utils';
 import { chooseAutocompleteFromCustomValue } from 'lib/newQueryBuilder/chooseAutocompleteFromCustomValue';
@@ -86,24 +83,15 @@ export const buildLogFilterTarget = (
 	if (root !== 'body') {
 		const fieldKey =
 			fieldKeyPath.length > 1 ? fieldKeyPath.slice(1).join('.') : String(root);
-		// Temporarily removing filter/group-by support for nested attributes.
-		// This will be removed once backend starts to support these actions.
-		const isNestedAttributeValue =
-			root === LogAttributeBucket.ATTRIBUTES && fieldKeyPath.length > 2;
-
-		const isRestricted =
-			RESTRICTED_SELECTED_FIELDS.includes(fieldKey) || isNestedAttributeValue;
-
-		const groupBySupported =
-			!isRestricted && !RESTRICTED_GROUP_BY_FIELDS.includes(fieldKey);
+		const isRestricted = RESTRICTED_SELECTED_FIELDS.includes(fieldKey);
 		return {
 			fieldKey,
 			filterInOperator: OPERATORS['='],
 			filterOutOperator: OPERATORS['!='],
 			dataType: getDataTypes(value),
 			metricsType: metricsTypeForRoot(root),
-			groupBySupported,
-			groupByKey: groupBySupported ? fieldKey : undefined,
+			groupBySupported: !isRestricted,
+			groupByKey: isRestricted ? undefined : fieldKey,
 			isRestricted,
 		};
 	}

frontend/src/container/LogDetailedView/util.test.ts

@@ -3,79 +3,45 @@ import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
 
 import {
 	aggregateAttributesResourcesToObject,
-	buildPrettyViewData,
 	flattenObject,
 	getDataTypes,
 	getSanitizedLogBody,
-	parseJsonStringValue,
+	parseJsonStringBody,
 	recursiveParseJSON,
 } from './utils';
 
-describe('parseJsonStringValue', () => {
+describe('parseJsonStringBody', () => {
 	it('parses a JSON-object string into an object', () => {
-		expect(parseJsonStringValue('{"a":1,"b":{"c":2}}')).toStrictEqual({
+		expect(parseJsonStringBody('{"a":1,"b":{"c":2}}')).toStrictEqual({
 			a: 1,
 			b: { c: 2 },
 		});
 	});
 
 	it('parses a JSON-array string into an array', () => {
-		expect(parseJsonStringValue('[1,2,3]')).toStrictEqual([1, 2, 3]);
+		expect(parseJsonStringBody('[1,2,3]')).toStrictEqual([1, 2, 3]);
 	});
 
 	it('returns a plain (non-JSON) string unchanged', () => {
-		expect(parseJsonStringValue('plain log line')).toBe('plain log line');
+		expect(parseJsonStringBody('plain log line')).toBe('plain log line');
 	});
 
 	it('returns a string that is not object/array-looking unchanged', () => {
-		expect(parseJsonStringValue('42')).toBe('42');
+		expect(parseJsonStringBody('42')).toBe('42');
 	});
 
 	it('returns an invalid JSON string unchanged', () => {
-		expect(parseJsonStringValue('{not valid}')).toBe('{not valid}');
+		expect(parseJsonStringBody('{not valid}')).toBe('{not valid}');
 	});
 
-	it('returns an already-object value unchanged (same reference)', () => {
-		const value = { message: 'hi', a: 1 };
-		expect(parseJsonStringValue(value)).toBe(value);
+	it('returns an already-object body unchanged (same reference)', () => {
+		const body = { message: 'hi', a: 1 };
+		expect(parseJsonStringBody(body)).toBe(body);
 	});
 
-	it('leaves a value larger than the 128KB parse guard as a string', () => {
+	it('leaves a body larger than the 128KB parse guard as a string', () => {
 		const huge = `{"x":"${'a'.repeat(130 * 1024)}"}`;
-		expect(parseJsonStringValue(huge)).toBe(huge);
-	});
-});
-
-describe('buildPrettyViewData', () => {
-	const baseRaw = {
-		id: 'log-1',
-		timestamp: 1234,
-		body: 'hello',
-		attributes: {},
-		resource: {},
-		scope: {},
-	} as any;
-
-	it('parses a JSON-string body into a tree', () => {
-		const result = buildPrettyViewData({ ...baseRaw, body: '{"a":1}' });
-		expect(result.body).toStrictEqual({ a: 1 });
-	});
-
-	it('parses attribute values that are JSON strings, leaves others as-is', () => {
-		const result = buildPrettyViewData({
-			...baseRaw,
-			attributes: { payload: '{"x":1}', name: 'cart', count: 3 },
-		});
-		expect(result.attributes).toStrictEqual({
-			payload: { x: 1 },
-			name: 'cart',
-			count: 3,
-		});
-	});
-
-	it('drops undefined fields so they do not render as empty rows', () => {
-		const result = buildPrettyViewData({ ...baseRaw, trace_id: undefined });
-		expect('trace_id' in result).toBe(false);
+		expect(parseJsonStringBody(huge)).toBe(huge);
 	});
 });
 
@@ -99,7 +65,7 @@ describe('aggregateAttributesResourcesToObject', () => {
 			'http.method': 'GET',
 			retries: 3,
 		});
-		expect(result.resource).toStrictEqual({ 'service.name': 'cart' });
+		expect(result.resources).toStrictEqual({ 'service.name': 'cart' });
 		expect(result.scope).toStrictEqual({ lib: 'otel' });
 		expect(result.body).toBe('hello');
 		expect(result.id).toBe('log-1');

frontend/src/container/LogDetailedView/utils.tsx

@@ -276,7 +276,7 @@ export const aggregateAttributesResourcesToObject = (
 		traceFlags: logData.traceFlags,
 		traceId: logData.traceId,
 		attributes: {},
-		resource: {},
+		resources: {},
 		scope: {},
 		severity_text: logData.severity_text,
 		severity_number: logData.severity_number,
@@ -290,8 +290,8 @@ export const aggregateAttributesResourcesToObject = (
 			outputJson.attributes = outputJson.attributes || {};
 			Object.assign(outputJson.attributes, logData[key as keyof ILog]);
 		} else if (key.startsWith('resources_')) {
-			outputJson.resource = outputJson.resource || {};
-			Object.assign(outputJson.resource, logData[key as keyof ILog]);
+			outputJson.resources = outputJson.resources || {};
+			Object.assign(outputJson.resources, logData[key as keyof ILog]);
 		} else if (key.startsWith('scope_string')) {
 			outputJson.scope = outputJson.scope || {};
 			Object.assign(outputJson.scope, logData[key as keyof ILog]);
@@ -315,57 +315,30 @@ export const aggregateAttributesResourcesToString = (logData: ILog): string => {
 	}
 };
 
-const MAX_JSON_PARSE_BYTES = 128 * 1024;
+const MAX_JSON_BODY_PARSE_BYTES = 128 * 1024;
 
-// A JSON-encoded object/array string is parsed so DataViewer renders it as a tree
-// instead of one escaped string; non-JSON / plain-text values are returned unchanged.
+// A JSON-encoded object/array `body` is parsed so DataViewer renders it as a
+// tree instead of one escaped string; plain-text bodies are returned unchanged.
 // Guarded against very large payloads.
-export const parseJsonStringValue = (value: unknown): unknown => {
-	if (typeof value !== 'string') {
-		return value;
+export const parseJsonStringBody = (body: ILog['body']): ILog['body'] => {
+	if (typeof body !== 'string') {
+		return body;
 	}
-	const trimmed = value.trim();
+	const trimmed = body.trim();
 	const looksLikeJson = trimmed.startsWith('{') || trimmed.startsWith('[');
-	if (!looksLikeJson || trimmed.length > MAX_JSON_PARSE_BYTES) {
-		return value;
+	if (!looksLikeJson || trimmed.length > MAX_JSON_BODY_PARSE_BYTES) {
+		return body;
 	}
 	try {
 		const parsed = JSON.parse(trimmed);
-		return parsed !== null && typeof parsed === 'object' ? parsed : value;
+		return parsed !== null && typeof parsed === 'object'
+			? (parsed as ILogBody)
+			: body;
 	} catch {
-		return value;
+		return body;
 	}
 };
 
-// Parse each attribute value that's a stringified JSON string into an object
-// Non-JSON values are left unchanged.
-const parseAttributeJsonValues = (
-	attributes: Record<string, unknown>,
-): Record<string, unknown> => {
-	const parsed: Record<string, unknown> = {};
-	Object.keys(attributes).forEach((key) => {
-		parsed[key] = parseJsonStringValue(attributes[key]);
-	});
-	return parsed;
-};
-
-export const buildPrettyViewData = (
-	raw: ILogAggregateAttributesResources,
-): Record<string, unknown> => {
-	const prettyData: Record<string, unknown> = { ...raw };
-	prettyData.body = parseJsonStringValue(raw.body);
-	prettyData.attributes = parseAttributeJsonValues(raw.attributes);
-
-	// drop undefined fields so they don't render as empty rows
-	Object.keys(prettyData).forEach((key) => {
-		if (prettyData[key] === undefined) {
-			delete prettyData[key];
-		}
-	});
-
-	return prettyData;
-};
-
 const isFloat = (num: number): boolean => num % 1 !== 0;
 
 const isBooleanString = (str: string): boolean =>

frontend/src/container/LogsFilters/config.ts

@@ -2,9 +2,6 @@ import { blue, red } from '@ant-design/colors';
 
 export const RESTRICTED_SELECTED_FIELDS = ['timestamp', 'id'];
 
-// Fields that can be filtered on but not grouped by in the log details view.
-export const RESTRICTED_GROUP_BY_FIELDS = ['body', 'trace_id'];
-
 export const ICON_STYLE = {
 	PLUS: { color: blue[5] },
 	CLOSE: { color: red[5] },

frontend/src/container/MetricsApplication/Tabs/Overview.tsx

@@ -124,9 +124,6 @@ function Application(): JSX.Element {
 				start: minTime,
 				end: maxTime,
 			}),
-		// the time range is part of the key, so without this every window change blanks the
-		// operations list and the widgets below are rebuilt with an empty `operation in []`
-		keepPreviousData: true,
 	});
 
 	const selectedTraceTags: string = JSON.stringify(

frontend/src/container/QueryTable/Drilldown/__tests__/useBaseAggregateOptions.test.tsx

@@ -1,88 +0,0 @@
-import { renderHook, waitFor } from '@testing-library/react';
-import { Query } from 'types/api/queryBuilder/queryBuilderData';
-
-import useBaseAggregateOptions from '../useBaseAggregateOptions';
-
-const mockGetUpdatedQuery = jest.fn();
-const mockNotificationsError = jest.fn();
-
-jest.mock('container/GridCardLayout/useResolveQuery', () => ({
-	__esModule: true,
-	default: (): unknown => ({
-		getUpdatedQuery: mockGetUpdatedQuery,
-		isLoading: false,
-	}),
-}));
-
-jest.mock('hooks/useNotifications', () => ({
-	useNotifications: (): unknown => ({
-		notifications: { error: mockNotificationsError },
-	}),
-}));
-
-jest.mock('providers/Dashboard/store/useDashboardStore', () => ({
-	useDashboardStore: (): unknown => ({ dashboardData: undefined }),
-}));
-
-jest.mock('hooks/dashboard/useContextVariables', () => ({
-	__esModule: true,
-	default: (): unknown => ({ processedVariables: {} }),
-}));
-
-jest.mock('hooks/useSafeNavigate', () => ({
-	useSafeNavigate: (): unknown => ({ safeNavigate: jest.fn() }),
-}));
-
-jest.mock('react-router-dom', () => ({
-	...jest.requireActual('react-router-dom'),
-	useLocation: (): { pathname: string } => ({ pathname: '/services/socky-api' }),
-}));
-
-const QUERY = {
-	builder: {
-		queryData: [{ queryName: 'A', dataSource: 'traces', aggregations: [] }],
-	},
-} as unknown as Query;
-
-const AGGREGATE_DATA = { queryName: 'A', filters: [] };
-
-const renderOptions = (): ReturnType<typeof renderHook> =>
-	renderHook(() =>
-		useBaseAggregateOptions({
-			query: QUERY,
-			onClose: jest.fn(),
-			subMenu: '',
-			setSubMenu: jest.fn(),
-			aggregateData: AGGREGATE_DATA,
-			fieldVariables: {},
-		}),
-	);
-
-describe('useBaseAggregateOptions', () => {
-	beforeEach(() => {
-		jest.clearAllMocks();
-	});
-
-	it('notifies and keeps the unresolved query when variable resolution fails', async () => {
-		mockGetUpdatedQuery.mockRejectedValue(
-			new Error('syntax errors in expression'),
-		);
-
-		renderOptions();
-
-		await waitFor(() =>
-			expect(mockNotificationsError).toHaveBeenCalledWith({
-				message: 'Unable to resolve variables',
-			}),
-		);
-	});
-
-	it('does not notify when variable resolution succeeds', async () => {
-		mockGetUpdatedQuery.mockResolvedValue(QUERY);
-
-		renderOptions();
-
-		await waitFor(() => expect(mockGetUpdatedQuery).toHaveBeenCalled());
-		expect(mockNotificationsError).not.toHaveBeenCalled();
-	});
-});

frontend/src/container/QueryTable/Drilldown/useBaseAggregateOptions.tsx

@@ -6,7 +6,6 @@ import { PANEL_TYPES } from 'constants/queryBuilder';
 import useUpdatedQuery from 'container/GridCardLayout/useResolveQuery';
 import { processContextLinks } from 'container/NewWidget/RightContainer/ContextLinks/utils';
 import useContextVariables from 'hooks/dashboard/useContextVariables';
-import { useNotifications } from 'hooks/useNotifications';
 import ContextMenu from 'periscope/components/ContextMenu';
 import { useDashboardStore } from 'providers/Dashboard/store/useDashboardStore';
 import { ContextLinksData } from 'types/api/dashboard/getAll';
@@ -51,25 +50,23 @@ const useBaseAggregateOptions = ({
 	const { getUpdatedQuery, isLoading: isResolveQueryLoading } =
 		useUpdatedQuery();
 	const { dashboardData } = useDashboardStore();
-	const { notifications } = useNotifications();
 
 	useEffect(() => {
 		if (!aggregateData) {
 			return;
 		}
-		getUpdatedQuery({
-			widgetConfig: {
-				query,
-				panelTypes: panelType || PANEL_TYPES.TIME_SERIES,
-				timePreferance: 'GLOBAL_TIME',
-			},
-			dashboardData,
-		})
-			.then(setResolvedQuery)
-			.catch(() => {
-				setResolvedQuery(query);
-				notifications.error({ message: 'Unable to resolve variables' });
+		const resolveQuery = async (): Promise<void> => {
+			const updatedQuery = await getUpdatedQuery({
+				widgetConfig: {
+					query,
+					panelTypes: panelType || PANEL_TYPES.TIME_SERIES,
+					timePreferance: 'GLOBAL_TIME',
+				},
+				dashboardData,
 			});
+			setResolvedQuery(updatedQuery);
+		};
+		resolveQuery();
 		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [query, aggregateData, panelType]);
 

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

@@ -10,7 +10,7 @@ import DateTimeSelection from '../index';
 import {
 	__resetSearchParamsGetter,
 	__setSearchParamsGetterForTest,
-} from 'utils/getUnstableCurrentSearchParams';
+} from '../utils/getUnstableCurrentSearchParams';
 import { queryClient, TestWrapper } from './testUtils';
 
 const mockSafeNavigate = jest.fn();

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

@@ -10,7 +10,7 @@ import DateTimeSelection from '../index';
 import {
 	__resetSearchParamsGetter,
 	__setSearchParamsGetterForTest,
-} from 'utils/getUnstableCurrentSearchParams';
+} from '../utils/getUnstableCurrentSearchParams';
 import { queryClient, TestWrapper } from './testUtils';
 
 const mockSafeNavigate = jest.fn();

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

@@ -24,7 +24,7 @@ import DateTimeSelection from '../index';
 import {
 	__resetSearchParamsGetter,
 	__setSearchParamsGetterForTest,
-} from 'utils/getUnstableCurrentSearchParams';
+} from '../utils/getUnstableCurrentSearchParams';
 
 const queryClient = new QueryClient({
 	defaultOptions: {

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

@@ -5,7 +5,7 @@ import DateTimeSelection from '../index';
 import {
 	__resetSearchParamsGetter,
 	__setSearchParamsGetterForTest,
-} from 'utils/getUnstableCurrentSearchParams';
+} from '../utils/getUnstableCurrentSearchParams';
 import { queryClient, TestWrapper } from './testUtils';
 
 const mockSafeNavigate = jest.fn();

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

@@ -10,7 +10,7 @@ import DateTimeSelection from '../index';
 import {
 	__resetSearchParamsGetter,
 	__setSearchParamsGetterForTest,
-} from 'utils/getUnstableCurrentSearchParams';
+} from '../utils/getUnstableCurrentSearchParams';
 import { queryClient, TestWrapper, createMockMoment } from './testUtils';
 
 const mockSafeNavigate = jest.fn();

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

@@ -54,7 +54,7 @@ import {
 	Time,
 	TimeRange,
 } from './types';
-import { getUnstableCurrentSearchParams } from 'utils/getUnstableCurrentSearchParams';
+import { getUnstableCurrentSearchParams } from './utils/getUnstableCurrentSearchParams';
 
 import './DateTimeSelectionV2.styles.scss';
 

frontend/src/pages/DashboardPageV2/DashboardContainer/DashboardPageToolbar/DashboardActions/DashboardActions.tsx

@@ -189,8 +189,7 @@ function DashboardActions({
 				onClick: (): void => void handleClone(),
 			});
 		}
-
-		if (canEditDashboard && (isAuthor || user.role === USER_ROLES.ADMIN)) {
+		if (isAuthor || user.role === USER_ROLES.ADMIN) {
 			dashboardGroup.push({
 				key: 'lock',
 				label: isDashboardLocked ? 'Unlock dashboard' : 'Lock dashboard',

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelsAndSectionsLayout/Panel/__tests__/useViewPanel.addons.test.tsx

@@ -46,11 +46,23 @@ beforeAll(() => {
 });
 
 // jest.config maps the real hook to a no-op mock; this suite needs real navigation.
-jest.mock('hooks/useSafeNavigate', () =>
-	jest
-		.requireActual('tests/browser-history-safe-navigate')
-		.createBrowserHistorySafeNavigateMock(),
-);
+jest.mock('hooks/useSafeNavigate', () => {
+	const { useHistory } = jest.requireActual('react-router-dom');
+	return {
+		useSafeNavigate: (): unknown => {
+			const history = useHistory();
+			return {
+				safeNavigate: (to: string, opts?: { replace?: boolean }): void => {
+					if (opts?.replace) {
+						history.replace(to);
+					} else {
+						history.push(to);
+					}
+				},
+			};
+		},
+	};
+});
 
 jest.mock('api/querySuggestions/getKeySuggestions', () => ({
 	getKeySuggestions: jest
@@ -192,12 +204,9 @@ function Harness(): JSX.Element {
 	);
 }
 
-const INITIAL_ROUTE = '/dashboard/dash-1';
-
 const renderHarness = (): void => {
-	window.history.replaceState(null, '', INITIAL_ROUTE);
 	render(
-		<MemoryRouter initialEntries={[INITIAL_ROUTE]}>
+		<MemoryRouter initialEntries={['/dashboard/dash-1']}>
 			<CompatRouter>
 				<QueryClientProvider client={new QueryClient()}>
 					<ReduxProvider store={configureStore([])(appStore.getState())}>

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelsAndSectionsLayout/Panel/__tests__/useViewPanel.promql.test.tsx

@@ -16,11 +16,23 @@ import ViewPanelModal from '../ViewPanelModal/ViewPanelModal';
 import { useViewPanel } from '../hooks/useViewPanel';
 
 // jest.config maps the real hook to a no-op mock; this suite needs real navigation.
-jest.mock('hooks/useSafeNavigate', () =>
-	jest
-		.requireActual('tests/browser-history-safe-navigate')
-		.createBrowserHistorySafeNavigateMock(),
-);
+jest.mock('hooks/useSafeNavigate', () => {
+	const { useHistory } = jest.requireActual('react-router-dom');
+	return {
+		useSafeNavigate: (): unknown => {
+			const history = useHistory();
+			return {
+				safeNavigate: (to: string, opts?: { replace?: boolean }): void => {
+					if (opts?.replace) {
+						history.replace(to);
+					} else {
+						history.push(to);
+					}
+				},
+			};
+		},
+	};
+});
 
 jest.mock(
 	'pages/DashboardPageV2/DashboardContainer/hooks/usePanelQuery',
@@ -138,12 +150,9 @@ function Harness(): JSX.Element {
 	);
 }
 
-const INITIAL_ROUTE = '/dashboard/dash-1';
-
 const renderHarness = (): void => {
-	window.history.replaceState(null, '', INITIAL_ROUTE);
 	render(
-		<MemoryRouter initialEntries={[INITIAL_ROUTE]}>
+		<MemoryRouter initialEntries={['/dashboard/dash-1']}>
 			<CompatRouter>
 				<QueryClientProvider client={new QueryClient()}>
 					<ReduxProvider store={configureStore([])(appStore.getState())}>

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelsAndSectionsLayout/Panel/__tests__/useViewPanel.test.tsx

@@ -14,11 +14,23 @@ import { useViewPanelMode } from '../ViewPanelModal/useViewPanelMode';
 import { useViewPanel } from '../hooks/useViewPanel';
 
 // jest.config maps the real hook to a no-op mock; this suite needs real navigation.
-jest.mock('hooks/useSafeNavigate', () =>
-	jest
-		.requireActual('tests/browser-history-safe-navigate')
-		.createBrowserHistorySafeNavigateMock(),
-);
+jest.mock('hooks/useSafeNavigate', () => {
+	const { useHistory } = jest.requireActual('react-router-dom');
+	return {
+		useSafeNavigate: (): unknown => {
+			const history = useHistory();
+			return {
+				safeNavigate: (to: string, opts?: { replace?: boolean }): void => {
+					if (opts?.replace) {
+						history.replace(to);
+					} else {
+						history.push(to);
+					}
+				},
+			};
+		},
+	};
+});
 
 jest.mock(
 	'pages/DashboardPageV2/DashboardContainer/hooks/usePanelQuery',
@@ -172,12 +184,9 @@ function Harness(): JSX.Element {
 	);
 }
 
-const INITIAL_ROUTE = '/dashboard/dash-1';
-
 const renderHarness = (): void => {
-	window.history.replaceState(null, '', INITIAL_ROUTE);
 	render(
-		<MemoryRouter initialEntries={[INITIAL_ROUTE]}>
+		<MemoryRouter initialEntries={['/dashboard/dash-1']}>
 			<CompatRouter>
 				<QueryBuilderProvider>
 					<Harness />

frontend/src/pages/DashboardPageV2/DashboardContainer/index.tsx

@@ -19,20 +19,11 @@ import { resolveDashboardImage } from 'pages/DashboardPageV2/DashboardContainer/
 interface DashboardContainerProps {
 	dashboard: DashboardtypesGettableDashboardV2DTO;
 	refetch: () => void;
-	/**
-	 * @deprecated
-	 * `canEditDashboardOverride` is a temporary solution to allow the dashboard to be view only.
-	 * This is only used for LLM Observability.
-	 * It will be removed in the future.
-	 *  TODO: @Ashwin / @Abhi — remove when the final solution is implemented.
-	 */
-	canEditDashboardOverride?: boolean;
 }
 
 function DashboardContainer({
 	dashboard,
 	refetch,
-	canEditDashboardOverride,
 }: DashboardContainerProps): JSX.Element {
 	const spec = dashboard.spec;
 	const image = resolveDashboardImage(dashboard.image);
@@ -54,11 +45,10 @@ function DashboardContainer({
 	// Seed during render (not an effect) so the first Panel render already sees the id —
 	// useDashboardFetchRequired throws on a missing id. setEditContext self-guards.
 	const setEditContext = useDashboardStore((s) => s.setEditContext);
-
 	setEditContext({
 		dashboardId: dashboard.id,
 		isLocked,
-		canEditDashboard: canEditDashboardOverride ?? canEditDashboard,
+		canEditDashboard,
 		refetch,
 	});
 

frontend/src/providers/QueryBuilder.tsx

@@ -37,6 +37,7 @@ import { OptionsQuery } from 'container/OptionsMenu/types';
 import { useGetCompositeQueryParam } from 'hooks/queryBuilder/useGetCompositeQueryParam';
 import { updateStepInterval } from 'hooks/queryBuilder/useStepInterval';
 import { useSafeNavigate } from 'hooks/useSafeNavigate';
+import useUrlQuery from 'hooks/useUrlQuery';
 import { createIdFromObjectFields } from 'lib/createIdFromObjectFields';
 import { createNewBuilderItemName } from 'lib/newQueryBuilder/createNewBuilderItemName';
 import { getOperatorsBySourceAndPanelType } from 'lib/newQueryBuilder/getOperatorsBySourceAndPanelType';
@@ -65,7 +66,6 @@ import {
 } from 'types/common/queryBuilder';
 import { sanitizeOrderByForExplorer } from 'utils/sanitizeOrderBy';
 import { v4 as uuid } from 'uuid';
-import { getUnstableCurrentSearchParams } from 'utils/getUnstableCurrentSearchParams';
 
 export const QueryBuilderContext = createContext<QueryBuilderContextType>({
 	currentQuery: initialQueriesMap.metrics,
@@ -105,6 +105,7 @@ export const QueryBuilderContext = createContext<QueryBuilderContextType>({
 export function QueryBuilderProvider({
 	children,
 }: PropsWithChildren): JSX.Element {
+	const urlQuery = useUrlQuery();
 	const location = useLocation();
 
 	const currentPathnameRef = useRef<string | null>(location.pathname);
@@ -121,7 +122,7 @@ export function QueryBuilderProvider({
 		null,
 	);
 
-	const panelTypeQueryParams = getUnstableCurrentSearchParams().get(
+	const panelTypeQueryParams = urlQuery.get(
 		QueryParams.panelTypes,
 	) as PANEL_TYPES | null;
 
@@ -975,7 +976,6 @@ export function QueryBuilderProvider({
 				unit: query.unit || initialQueryState.unit,
 			};
 
-			const urlQuery = getUnstableCurrentSearchParams();
 			const pagination = urlQuery.get(QueryParams.pagination);
 
 			if (pagination) {
@@ -1014,7 +1014,7 @@ export function QueryBuilderProvider({
 
 			safeNavigate(generatedUrl, { newTab });
 		},
-		[location.pathname, safeNavigate],
+		[location.pathname, safeNavigate, urlQuery],
 	);
 
 	const handleSetConfig = useCallback(

frontend/src/tests/browser-history-safe-navigate.ts

@@ -1,54 +0,0 @@
-// Mock factory for suites that need `useSafeNavigate` to navigate for real.
-//
-// `jest.config.ts` maps every `hooks/useSafeNavigate` import to the no-op
-// `__tests__/safeNavigateMock.ts`, so a suite that drives navigation has to opt
-// out with its own `jest.mock`.
-//
-// In production `safeNavigate` goes through `createBrowserHistory`, which writes
-// `window.location` as well as notifying the router. `MemoryRouter` never touches
-// `window`, so anything reading `getUnstableCurrentSearchParams()` sees an empty
-// search and drops the params the test just navigated with. This mock writes both.
-//
-// The `jest.mock` factory is hoisted above imports, so require it inside:
-//
-//   jest.mock('hooks/useSafeNavigate', () =>
-//     jest
-//       .requireActual('tests/browser-history-safe-navigate')
-//       .createBrowserHistorySafeNavigateMock(),
-//   );
-
-import type { History } from 'history';
-
-interface SafeNavigateOptions {
-	replace?: boolean;
-}
-
-interface UseSafeNavigateModule {
-	useSafeNavigate: () => {
-		safeNavigate: (to: string, options?: SafeNavigateOptions) => void;
-	};
-}
-
-export function createBrowserHistorySafeNavigateMock(): UseSafeNavigateModule {
-	const { useHistory } = jest.requireActual<{ useHistory: () => History }>(
-		'react-router-dom',
-	);
-
-	return {
-		useSafeNavigate: () => {
-			const history = useHistory();
-
-			return {
-				safeNavigate: (to: string, options?: SafeNavigateOptions): void => {
-					if (options?.replace) {
-						window.history.replaceState(null, '', to);
-						history.replace(to);
-					} else {
-						window.history.pushState(null, '', to);
-						history.push(to);
-					}
-				},
-			};
-		},
-	};
-}

frontend/src/types/api/logs/log.ts

@@ -41,6 +41,6 @@ type OmitAttributesResources = Pick<
 
 export type ILogAggregateAttributesResources = OmitAttributesResources & {
 	attributes: Record<string, never>;
-	resource: Record<string, never>;
+	resources: Record<string, never>;
 	scope: Record<string, never>;
 };

pkg/alertmanager/alertmanagernotify/googlechat/googlechat.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"log/slog"
 	"net/http"
+	"net/url"
 	"unicode/utf8"
 
 	"github.com/SigNoz/signoz/pkg/alertmanager/alertmanagertemplate"
@@ -185,7 +186,18 @@ func (n *Notifier) Notify(ctx context.Context, alerts ...*types.Alert) (bool, er
 		}
 	}
 
-	resp, err := notify.PostJSON(ctx, n.client, n.conf.WebhookURL.String(), buf) //nolint:bodyclose
+	// Thread same-rule alerts together: threadKey is a stable hash of the
+	// alert group key. Changing a rule's grouping starts a new thread.
+	u, err := url.Parse(n.conf.WebhookURL.String())
+	if err != nil {
+		return false, errors.WrapInternalf(err, errors.CodeInternal, "parse google chat webhook url")
+	}
+	q := u.Query()
+	q.Set("threadKey", key.Hash())
+	q.Set("messageReplyOption", "REPLY_MESSAGE_FALLBACK_TO_NEW_THREAD")
+	u.RawQuery = q.Encode()
+
+	resp, err := notify.PostJSON(ctx, n.client, u.String(), buf) //nolint:bodyclose
 	if err != nil {
 		return true, notify.RedactURL(err)
 	}

pkg/alertmanager/alertmanagernotify/googlechat/googlechat_test.go

@@ -245,7 +245,7 @@ func TestGoogleChatMessageSizeLimit(t *testing.T) {
 	assert.LessOrEqual(t, bodyLen, maxMessageBytes, "posted body must be within the size limit")
 }
 
-func TestGoogleChatWebhookURLVerbatim(t *testing.T) {
+func TestGoogleChatThreading(t *testing.T) {
 	var query url.Values
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		query = r.URL.Query()
@@ -253,11 +253,25 @@ func TestGoogleChatWebhookURLVerbatim(t *testing.T) {
 	}))
 	defer server.Close()
 
-	n := newTestNotifier(t, server.URL+"?key=abc&token=xyz", "T", "")
-	_, err := n.Notify(newTestContext(), newTestAlerts("X")...)
-	require.NoError(t, err)
+	cases := []struct{ name, groupKey string }{
+		{"rule a", "{ruleId=\"aaa\"}"},
+		{"rule b", "{ruleId=\"bbb\"}"},
+	}
+	seen := map[string]string{}
+	for _, c := range cases {
+		t.Run(c.name, func(t *testing.T) {
+			n := newTestNotifier(t, server.URL, "T", "")
+			ctx := notify.WithGroupKey(context.Background(), c.groupKey)
+			_, err := n.Notify(ctx, newTestAlerts("X")...)
+			require.NoError(t, err)
 
-	assert.Equal(t, url.Values{"key": {"abc"}, "token": {"xyz"}}, query, "configured webhook URL must be posted verbatim, with no params added")
+			assert.Equal(t, "REPLY_MESSAGE_FALLBACK_TO_NEW_THREAD", query.Get("messageReplyOption"))
+			threadKey := query.Get("threadKey")
+			assert.Equal(t, notify.Key(c.groupKey).Hash(), threadKey, "threadKey must be the group key hash")
+			seen[c.name] = threadKey
+		})
+	}
+	assert.NotEqual(t, seen["rule a"], seen["rule b"], "distinct group keys must yield distinct threadKeys")
 }
 
 func TestGoogleChatCustomTemplateMarkdown(t *testing.T) {

pkg/modules/cloudintegration/implcloudintegration/fs/definitions/aws/lambda/assets/dashboards/overview.json

@@ -51,28 +51,6 @@
           },
           "name": "Region"
         }
-      },
-      {
-        "kind": "ListVariable",
-        "spec": {
-          "display": {
-            "name": "FunctionName",
-            "description": "Name of the Lambda function"
-          },
-          "allowAllValue": true,
-          "allowMultiple": true,
-          "customAllValue": "",
-          "capturingRegexp": "",
-          "sort": "none",
-          "plugin": {
-            "kind": "signoz/DynamicVariable",
-            "spec": {
-              "name": "FunctionName",
-              "signal": "metrics"
-            }
-          },
-          "name": "FunctionName"
-        }
       }
     ],
     "panels": {
@@ -140,7 +118,7 @@
                     ],
                     "disabled": false,
                     "filter": {
-                      "expression": "(cloud.account.id = $Account AND cloud.region = $Region AND FunctionName EXISTS AND Resource NOT EXISTS) AND FunctionName IN $FunctionName"
+                      "expression": "(cloud.account.id = $Account AND cloud.region = $Region AND FunctionName EXISTS AND Resource NOT EXISTS)"
                     },
                     "groupBy": [
                       {
@@ -240,7 +218,7 @@
                     ],
                     "disabled": false,
                     "filter": {
-                      "expression": "(cloud.account.id = $Account AND cloud.region = $Region AND FunctionName EXISTS AND Resource NOT EXISTS) AND FunctionName IN $FunctionName"
+                      "expression": "(cloud.account.id = $Account AND cloud.region = $Region AND FunctionName EXISTS AND Resource NOT EXISTS)"
                     },
                     "groupBy": [
                       {
@@ -340,7 +318,7 @@
                     ],
                     "disabled": false,
                     "filter": {
-                      "expression": "(cloud.account.id = $Account AND cloud.region = $Region AND FunctionName EXISTS AND Resource NOT EXISTS) AND FunctionName IN $FunctionName"
+                      "expression": "(cloud.account.id = $Account AND cloud.region = $Region AND FunctionName EXISTS AND Resource NOT EXISTS)"
                     },
                     "groupBy": [
                       {
@@ -440,7 +418,7 @@
                     ],
                     "disabled": false,
                     "filter": {
-                      "expression": "(cloud.account.id = $Account AND cloud.region = $Region AND FunctionName EXISTS AND Resource NOT EXISTS) AND FunctionName IN $FunctionName"
+                      "expression": "(cloud.account.id = $Account AND cloud.region = $Region AND FunctionName EXISTS AND Resource NOT EXISTS)"
                     },
                     "groupBy": [
                       {
@@ -540,7 +518,7 @@
                     ],
                     "disabled": false,
                     "filter": {
-                      "expression": "(cloud.account.id = $Account AND cloud.region = $Region AND FunctionName EXISTS AND Resource NOT EXISTS) AND FunctionName IN $FunctionName"
+                      "expression": "(cloud.account.id = $Account AND cloud.region = $Region AND FunctionName EXISTS AND Resource NOT EXISTS)"
                     },
                     "groupBy": [
                       {
@@ -640,7 +618,7 @@
                     ],
                     "disabled": false,
                     "filter": {
-                      "expression": "(cloud.account.id = $Account AND cloud.region = $Region AND FunctionName EXISTS AND Resource NOT EXISTS) AND FunctionName IN $FunctionName"
+                      "expression": "(cloud.account.id = $Account AND cloud.region = $Region AND FunctionName EXISTS AND Resource NOT EXISTS)"
                     },
                     "groupBy": [
                       {
@@ -740,7 +718,7 @@
                     ],
                     "disabled": false,
                     "filter": {
-                      "expression": "(cloud.account.id = $Account AND cloud.region = $Region AND FunctionName EXISTS AND Resource NOT EXISTS) AND FunctionName IN $FunctionName"
+                      "expression": "(cloud.account.id = $Account AND cloud.region = $Region AND FunctionName EXISTS AND Resource NOT EXISTS)"
                     },
                     "groupBy": [
                       {
@@ -853,4 +831,4 @@
     "refreshInterval": "",
     "links": []
   }
-}
+}

pkg/signoz/provider.go

@@ -242,7 +242,6 @@ func NewSQLMigrationProviderFactories(
 		sqlmigration.NewRestructureAuthDomainConfigFactory(sqlstore),
 		sqlmigration.NewFixSavedViewSelectFieldsFactory(sqlstore),
 		sqlmigration.NewDeleteOrphanUserRolesFactory(),
-		sqlmigration.NewMigrateLambdaDashboardsFactory(),
 	)
 }
 

pkg/sqlmigration/116_migrate_lambda_dashboards.go

@@ -1,160 +0,0 @@
-package sqlmigration
-
-import (
-	"bytes"
-	"context"
-	"embed"
-	"encoding/json"
-	"time"
-
-	"github.com/SigNoz/signoz/pkg/factory"
-	"github.com/uptrace/bun"
-	"github.com/uptrace/bun/migrate"
-)
-
-//go:embed 116_migrate_lambda_dashboards
-var lambdaDashboardFiles embed.FS
-
-// These values mirror the cloud integration and dashboard packages but are duplicated
-// here so this migration keeps targeting and writing the same rows even if those
-// constants are later renamed or changed.
-const (
-	lambdaDashboardFile = "116_migrate_lambda_dashboards/aws/lambda/overview.json"
-
-	lambdaDashboardSlug               = "aws-lambda-overview"
-	cloudIntegrationDashboardProvider = "cloud_integration"
-	integrationDashboardSource        = "integration"
-	dashboardSchemaVersion            = "v6"
-)
-
-type migrateLambdaDashboards struct{}
-
-type lambdaDashboardRow struct {
-	bun.BaseModel `bun:"table:dashboard,alias:dashboard"`
-
-	ID   string `bun:"id"`
-	Data string `bun:"data"`
-}
-
-// lambdaDashboardDefinition is the part of the embedded dashboard this migration reads:
-// its spec, which is what the cloud integration stores under data.spec.
-type lambdaDashboardDefinition struct {
-	Spec map[string]any `json:"spec"`
-}
-
-func NewMigrateLambdaDashboardsFactory() factory.ProviderFactory[SQLMigration, Config] {
-	return factory.NewProviderFactory(
-		factory.MustNewName("migrate_lambda_dashboards"),
-		func(ctx context.Context, ps factory.ProviderSettings, c Config) (SQLMigration, error) {
-			return &migrateLambdaDashboards{}, nil
-		},
-	)
-}
-
-func (m *migrateLambdaDashboards) Register(migrations *migrate.Migrations) error {
-	return migrations.Register(m.Up, m.Down)
-}
-
-// Up rewrites the spec of every provisioned AWS Lambda overview dashboard to the
-// embedded revision that added the FunctionName variable. Cloud integration dashboards
-// are provisioned once and never updated afterwards, so existing installs only pick up
-// this change through a migration. Only the spec is replaced; the row keeps its id, name,
-// tags and metadata, so the dashboard is updated in place rather than recreated.
-func (m *migrateLambdaDashboards) Up(ctx context.Context, db *bun.DB) error {
-	spec, err := m.loadSpec()
-	if err != nil {
-		return err
-	}
-
-	tx, err := db.BeginTx(ctx, nil)
-	if err != nil {
-		return err
-	}
-	defer func() { _ = tx.Rollback() }()
-
-	var rows []*lambdaDashboardRow
-	if err := tx.NewSelect().
-		Model(&rows).
-		Join("JOIN integration_dashboard AS id ON id.dashboard_id = dashboard.id").
-		Where("id.provider = ?", cloudIntegrationDashboardProvider).
-		Where("id.slug = ?", lambdaDashboardSlug).
-		Where("dashboard.source = ?", integrationDashboardSource).
-		Scan(ctx); err != nil {
-		return err
-	}
-
-	for _, row := range rows {
-		data := map[string]any{}
-		if err := json.Unmarshal([]byte(row.Data), &data); err != nil {
-			return err
-		}
-
-		// The embedded spec is v6-shaped, so only rewrite a row already carrying a v6 spec;
-		// anything else is left alone rather than turned into a broken mix of versions.
-		if !m.hasV6Spec(data) {
-			continue
-		}
-		data["spec"] = spec
-
-		encoded, err := m.marshalUnescaped(data)
-		if err != nil {
-			return err
-		}
-		// Skip rows already carrying this spec so a re-run does not needlessly rewrite them.
-		if string(encoded) == row.Data {
-			continue
-		}
-
-		if _, err := tx.NewUpdate().
-			Model((*lambdaDashboardRow)(nil)).
-			Set("data = ?", string(encoded)).
-			Set("updated_at = ?", time.Now()).
-			Where("id = ?", row.ID).
-			Exec(ctx); err != nil {
-			return err
-		}
-	}
-
-	return tx.Commit()
-}
-
-func (m *migrateLambdaDashboards) Down(context.Context, *bun.DB) error {
-	return nil
-}
-
-// hasV6Spec reports whether the stored data is a v6 dashboard with a spec object, which
-// is the shape whose spec this migration replaces.
-func (m *migrateLambdaDashboards) hasV6Spec(data map[string]any) bool {
-	metadata, _ := data["metadata"].(map[string]any)
-	version, _ := metadata["schemaVersion"].(string)
-	if version != dashboardSchemaVersion {
-		return false
-	}
-	_, ok := data["spec"].(map[string]any)
-	return ok
-}
-
-func (m *migrateLambdaDashboards) marshalUnescaped(v any) ([]byte, error) {
-	var buf bytes.Buffer
-	encoder := json.NewEncoder(&buf)
-	encoder.SetEscapeHTML(false)
-	if err := encoder.Encode(v); err != nil {
-		return nil, err
-	}
-
-	return bytes.TrimRight(buf.Bytes(), "\n"), nil
-}
-
-func (m *migrateLambdaDashboards) loadSpec() (map[string]any, error) {
-	raw, err := lambdaDashboardFiles.ReadFile(lambdaDashboardFile)
-	if err != nil {
-		return nil, err
-	}
-
-	var dashboard lambdaDashboardDefinition
-	if err := json.Unmarshal(raw, &dashboard); err != nil {
-		return nil, err
-	}
-
-	return dashboard.Spec, nil
-}

pkg/sqlmigration/116_migrate_lambda_dashboards/aws/lambda/overview.json

@@ -1,856 +0,0 @@
-{
-  "schemaVersion": "v6",
-  "image": "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iODAwcHgiIGhlaWdodD0iODAwcHgiIHZpZXdCb3g9IjAgMCAxNiAxNiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiBmaWxsPSJub25lIj48cGF0aCBmaWxsPSIjRkE3RTE0IiBkPSJNNy45ODMgOC4zN2MtLjA1My4wNzMtLjA5OC4xMzMtLjE0MS4xOTRMNS43NzUgMTEuNWMtLjY0LjkxLTEuMjgyIDEuODItMS45MjQgMi43M2EuMTI4LjEyOCAwIDAxLS4wOTIuMDUxYy0uOTA2LS4wMDctMS44MTMtLjAxNy0yLjcxOS0uMDI4LS4wMSAwLS4wMi0uMDAzLS4wNC0uMDA2YS40NTUuNDU1IDAgMDEuMDI1LS4wNTMgMTM5NzcuNDk2IDEzOTc3LjQ5NiAwIDAxNS40NDYtOC4xNDZjLjA5Mi0uMTM4LjE4OC0uMjczLjI3NS0uNDEzYS4xNjUuMTY1IDAgMDAuMDE4LS4xMjRjLS4xNjctLjUxNS0uMzM4LTEuMDMtLjUwOC0xLjU0My0uMDczLS4yMi0uMTUtLjQ0LS4yMTgtLjY2LS4wMjItLjA3Mi0uMDU5LS4wOTQtLjEzNC0uMDkzLS41Ny4wMDItMS4xMzYuMDAxLTEuNzA0LjAwMS0uMTA4IDAtLjEwOCAwLS4xMDgtLjEwMyAwLS42NzQgMC0xLjM0Ny0uMDAyLTIuMDIxIDAtLjA3NS4wMjYtLjA5Mi4wOTktLjA5MiAxLjE0My4wMDIgMi4yODYuMDAyIDMuNDMgMGEuMTEzLjExMyAwIDAxLjA3Ni4wMTcuMTA3LjEwNyAwIDAxLjA0NS4wNjEgMTgyNjYuMTg0IDE4MjY2LjE4NCAwIDAwMy45MiA5LjUxYy4yMTguNTMuNDM4IDEuMDU5LjY1NCAxLjU5LjAyNi4wNjQuMDUzLjA3Ni4xMi4wNTYuNi0uMTc4IDEuMi0uMzUyIDEuOC0uNTMxLjA3NS0uMDIzLjEwMi0uMDA4LjEyNi4wNjQuMjA0LjYyLjQxMiAxLjIzOS42MiAxLjg1OGwuMDIuMDczYy0uMDQzLjAxNS0uMDgzLjAzMi0uMTI0LjA0M2wtNC4wODUgMS4yNWMtLjA2NS4wMi0uMDg1IDAtLjEwNi0uMDU0bC0xLjI1LTMuMDQ4LTEuMjI2LTIuOTg0LS4xODMtLjQ0OWMtLjAxLS4wMjYtLjAyMy0uMDQ4LS4wNDMtLjA4N3oiLz48L3N2Zz4=",
-  "name": "",
-  "generateName": true,
-  "tags": [],
-  "spec": {
-    "display": {
-      "name": "AWS Lambda Overview",
-      "description": "Overview of AWS Lambda functions"
-    },
-    "variables": [
-      {
-        "kind": "ListVariable",
-        "spec": {
-          "display": {
-            "name": "Account",
-            "description": "AWS Account"
-          },
-          "allowAllValue": false,
-          "allowMultiple": false,
-          "customAllValue": "",
-          "capturingRegexp": "",
-          "sort": "none",
-          "plugin": {
-            "kind": "signoz/QueryVariable",
-            "spec": {
-              "queryValue": "SELECT JSONExtractString(labels, 'cloud.account.id') as `cloud.account.id`\nFROM signoz_metrics.distributed_time_series_v4_1day\nWHERE \n    metric_name like 'aws_Lambda_Invocations_sum'\nGROUP BY `cloud.account.id`\n\n"
-            }
-          },
-          "name": "Account"
-        }
-      },
-      {
-        "kind": "ListVariable",
-        "spec": {
-          "display": {
-            "name": "Region",
-            "description": "AWS Region"
-          },
-          "allowAllValue": false,
-          "allowMultiple": false,
-          "customAllValue": "",
-          "capturingRegexp": "",
-          "sort": "none",
-          "plugin": {
-            "kind": "signoz/QueryVariable",
-            "spec": {
-              "queryValue": "SELECT JSONExtractString(labels, 'cloud.region') as `cloud.region`\nFROM signoz_metrics.distributed_time_series_v4_1day\nWHERE \n    metric_name like 'aws_Lambda_Invocations_sum'\n    and JSONExtractString(labels, 'cloud.account.id') IN {{.Account}}\nGROUP BY `cloud.region`\n"
-            }
-          },
-          "name": "Region"
-        }
-      },
-      {
-        "kind": "ListVariable",
-        "spec": {
-          "display": {
-            "name": "FunctionName",
-            "description": "Name of the Lambda function"
-          },
-          "allowAllValue": true,
-          "allowMultiple": true,
-          "customAllValue": "",
-          "capturingRegexp": "",
-          "sort": "none",
-          "plugin": {
-            "kind": "signoz/DynamicVariable",
-            "spec": {
-              "name": "FunctionName",
-              "signal": "metrics"
-            }
-          },
-          "name": "FunctionName"
-        }
-      }
-    ],
-    "panels": {
-      "2516c785-b025-49b3-aeb4-a4735ccb2709": {
-        "kind": "Panel",
-        "spec": {
-          "display": {
-            "name": "Errors",
-            "description": "The number of invocations that result in a function error. Function errors include exceptions that your code throws and exceptions that the Lambda runtime throws. The runtime returns errors for issues such as timeouts and configuration errors. To calculate the error rate, divide the value of Errors by the value of Invocations. Note that the timestamp on an error metric reflects when the function was invoked, not when the error occurred.\n\nSee more at https://docs.aws.amazon.com/lambda/latest/dg/monitoring-metrics-types.html"
-          },
-          "plugin": {
-            "kind": "signoz/TimeSeriesPanel",
-            "spec": {
-              "visualization": {
-                "timePreference": "global_time",
-                "fillSpans": false
-              },
-              "formatting": {
-                "unit": "none",
-                "decimalPrecision": "2"
-              },
-              "chartAppearance": {
-                "lineInterpolation": "spline",
-                "showPoints": false,
-                "lineStyle": "solid",
-                "fillMode": "none",
-                "spanGaps": {
-                  "fillOnlyBelow": false,
-                  "fillLessThan": ""
-                }
-              },
-              "axes": {
-                "softMin": 0,
-                "softMax": 0,
-                "isLogScale": false
-              },
-              "legend": {
-                "position": "bottom",
-                "mode": "list",
-                "customColors": null
-              },
-              "thresholds": null
-            }
-          },
-          "queries": [
-            {
-              "kind": "time_series",
-              "spec": {
-                "name": "A",
-                "plugin": {
-                  "kind": "signoz/BuilderQuery",
-                  "spec": {
-                    "name": "A",
-                    "stepInterval": 60,
-                    "signal": "metrics",
-                    "source": "",
-                    "aggregations": [
-                      {
-                        "metricName": "aws_Lambda_Errors_sum",
-                        "temporality": "",
-                        "timeAggregation": "sum",
-                        "spaceAggregation": "sum",
-                        "reduceTo": "avg"
-                      }
-                    ],
-                    "disabled": false,
-                    "filter": {
-                      "expression": "(cloud.account.id = $Account AND cloud.region = $Region AND FunctionName EXISTS AND Resource NOT EXISTS) AND FunctionName IN $FunctionName"
-                    },
-                    "groupBy": [
-                      {
-                        "name": "cloud.account.id",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      },
-                      {
-                        "name": "cloud.region",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      },
-                      {
-                        "name": "FunctionName",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      }
-                    ],
-                    "order": [],
-                    "having": {
-                      "expression": ""
-                    },
-                    "functions": [],
-                    "legend": "{{FunctionName}}"
-                  }
-                }
-              }
-            }
-          ],
-          "links": []
-        }
-      },
-      "4119a1e5-32a8-4859-96e9-a5451114782b": {
-        "kind": "Panel",
-        "spec": {
-          "display": {
-            "name": "Async events dropped",
-            "description": "The number of events that are dropped without successfully executing the function. If you configure a dead-letter queue (DLQ) or OnFailure destination, then events are sent there before they're dropped. Events are dropped for various reasons. For example, events can exceed the maximum event age or exhaust the maximum retry attempts, or reserved concurrency might be set to 0. To troubleshoot why events are dropped, look at the Errors metric to identify function errors and the Throttles metric to identify concurrency issues.\n\nSee more at https://docs.aws.amazon.com/lambda/latest/dg/monitoring-metrics-types.html"
-          },
-          "plugin": {
-            "kind": "signoz/TimeSeriesPanel",
-            "spec": {
-              "visualization": {
-                "timePreference": "global_time",
-                "fillSpans": false
-              },
-              "formatting": {
-                "unit": "none",
-                "decimalPrecision": "2"
-              },
-              "chartAppearance": {
-                "lineInterpolation": "spline",
-                "showPoints": false,
-                "lineStyle": "solid",
-                "fillMode": "none",
-                "spanGaps": {
-                  "fillOnlyBelow": false,
-                  "fillLessThan": ""
-                }
-              },
-              "axes": {
-                "softMin": 0,
-                "softMax": 0,
-                "isLogScale": false
-              },
-              "legend": {
-                "position": "bottom",
-                "mode": "list",
-                "customColors": null
-              },
-              "thresholds": null
-            }
-          },
-          "queries": [
-            {
-              "kind": "time_series",
-              "spec": {
-                "name": "A",
-                "plugin": {
-                  "kind": "signoz/BuilderQuery",
-                  "spec": {
-                    "name": "A",
-                    "stepInterval": 60,
-                    "signal": "metrics",
-                    "source": "",
-                    "aggregations": [
-                      {
-                        "metricName": "aws_Lambda_AsyncEventsDropped_sum",
-                        "temporality": "",
-                        "timeAggregation": "sum",
-                        "spaceAggregation": "sum",
-                        "reduceTo": "avg"
-                      }
-                    ],
-                    "disabled": false,
-                    "filter": {
-                      "expression": "(cloud.account.id = $Account AND cloud.region = $Region AND FunctionName EXISTS AND Resource NOT EXISTS) AND FunctionName IN $FunctionName"
-                    },
-                    "groupBy": [
-                      {
-                        "name": "cloud.account.id",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      },
-                      {
-                        "name": "cloud.region",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      },
-                      {
-                        "name": "FunctionName",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      }
-                    ],
-                    "order": [],
-                    "having": {
-                      "expression": ""
-                    },
-                    "functions": [],
-                    "legend": "{{FunctionName}}"
-                  }
-                }
-              }
-            }
-          ],
-          "links": []
-        }
-      },
-      "6354ea62-e82b-4323-a33d-eef92519e843": {
-        "kind": "Panel",
-        "spec": {
-          "display": {
-            "name": "Throttles",
-            "description": "The number of invocation requests that are throttled. When all function instances are processing requests and no concurrency is available to scale up, Lambda rejects additional requests with a TooManyRequestsException error. Throttled requests and other invocation errors don't count as either Invocations or Errors.\n\nSee more at https://docs.aws.amazon.com/lambda/latest/dg/monitoring-metrics-types.html"
-          },
-          "plugin": {
-            "kind": "signoz/TimeSeriesPanel",
-            "spec": {
-              "visualization": {
-                "timePreference": "global_time",
-                "fillSpans": false
-              },
-              "formatting": {
-                "unit": "none",
-                "decimalPrecision": "2"
-              },
-              "chartAppearance": {
-                "lineInterpolation": "spline",
-                "showPoints": false,
-                "lineStyle": "solid",
-                "fillMode": "none",
-                "spanGaps": {
-                  "fillOnlyBelow": false,
-                  "fillLessThan": ""
-                }
-              },
-              "axes": {
-                "softMin": 0,
-                "softMax": 0,
-                "isLogScale": false
-              },
-              "legend": {
-                "position": "bottom",
-                "mode": "list",
-                "customColors": null
-              },
-              "thresholds": null
-            }
-          },
-          "queries": [
-            {
-              "kind": "time_series",
-              "spec": {
-                "name": "A",
-                "plugin": {
-                  "kind": "signoz/BuilderQuery",
-                  "spec": {
-                    "name": "A",
-                    "stepInterval": 60,
-                    "signal": "metrics",
-                    "source": "",
-                    "aggregations": [
-                      {
-                        "metricName": "aws_Lambda_Throttles_sum",
-                        "temporality": "",
-                        "timeAggregation": "sum",
-                        "spaceAggregation": "sum",
-                        "reduceTo": "avg"
-                      }
-                    ],
-                    "disabled": false,
-                    "filter": {
-                      "expression": "(cloud.account.id = $Account AND cloud.region = $Region AND FunctionName EXISTS AND Resource NOT EXISTS) AND FunctionName IN $FunctionName"
-                    },
-                    "groupBy": [
-                      {
-                        "name": "cloud.account.id",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      },
-                      {
-                        "name": "cloud.region",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      },
-                      {
-                        "name": "FunctionName",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      }
-                    ],
-                    "order": [],
-                    "having": {
-                      "expression": ""
-                    },
-                    "functions": [],
-                    "legend": "{{FunctionName}}"
-                  }
-                }
-              }
-            }
-          ],
-          "links": []
-        }
-      },
-      "853d3a92-b396-4064-8762-18d7487989e0": {
-        "kind": "Panel",
-        "spec": {
-          "display": {
-            "name": "Async events received",
-            "description": "The number of events that Lambda successfully queues for processing. This metric provides insight into the number of events that a Lambda function receives. Monitor this metric and set alarms for thresholds to check for issues. For example, to detect an undesirable number of events sent to Lambda, and to quickly diagnose issues resulting from incorrect trigger or function configurations. Mismatches between AsyncEventsReceived and Invocations can indicate a disparity in processing, events being dropped, or a potential queue backlog.\n\nSee more at https://docs.aws.amazon.com/lambda/latest/dg/monitoring-metrics-types.html"
-          },
-          "plugin": {
-            "kind": "signoz/TimeSeriesPanel",
-            "spec": {
-              "visualization": {
-                "timePreference": "global_time",
-                "fillSpans": false
-              },
-              "formatting": {
-                "unit": "none",
-                "decimalPrecision": "2"
-              },
-              "chartAppearance": {
-                "lineInterpolation": "spline",
-                "showPoints": false,
-                "lineStyle": "solid",
-                "fillMode": "none",
-                "spanGaps": {
-                  "fillOnlyBelow": false,
-                  "fillLessThan": ""
-                }
-              },
-              "axes": {
-                "softMin": 0,
-                "softMax": 0,
-                "isLogScale": false
-              },
-              "legend": {
-                "position": "bottom",
-                "mode": "list",
-                "customColors": null
-              },
-              "thresholds": null
-            }
-          },
-          "queries": [
-            {
-              "kind": "time_series",
-              "spec": {
-                "name": "A",
-                "plugin": {
-                  "kind": "signoz/BuilderQuery",
-                  "spec": {
-                    "name": "A",
-                    "stepInterval": 60,
-                    "signal": "metrics",
-                    "source": "",
-                    "aggregations": [
-                      {
-                        "metricName": "aws_Lambda_AsyncEventsReceived_sum",
-                        "temporality": "",
-                        "timeAggregation": "sum",
-                        "spaceAggregation": "sum",
-                        "reduceTo": "avg"
-                      }
-                    ],
-                    "disabled": false,
-                    "filter": {
-                      "expression": "(cloud.account.id = $Account AND cloud.region = $Region AND FunctionName EXISTS AND Resource NOT EXISTS) AND FunctionName IN $FunctionName"
-                    },
-                    "groupBy": [
-                      {
-                        "name": "cloud.account.id",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      },
-                      {
-                        "name": "cloud.region",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      },
-                      {
-                        "name": "FunctionName",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      }
-                    ],
-                    "order": [],
-                    "having": {
-                      "expression": ""
-                    },
-                    "functions": [],
-                    "legend": "{{FunctionName}}"
-                  }
-                }
-              }
-            }
-          ],
-          "links": []
-        }
-      },
-      "877bb5c8-331c-492f-b666-2054c2ae39bd": {
-        "kind": "Panel",
-        "spec": {
-          "display": {
-            "name": "Invocations",
-            "description": "The number of times that your function code is invoked, including successful invocations and invocations that result in a function error. Invocations aren't recorded if the invocation request is throttled or otherwise results in an invocation error. The value of Invocations equals the number of requests billed.\n\nSee more at https://docs.aws.amazon.com/lambda/latest/dg/monitoring-metrics-types.html"
-          },
-          "plugin": {
-            "kind": "signoz/TimeSeriesPanel",
-            "spec": {
-              "visualization": {
-                "timePreference": "global_time",
-                "fillSpans": false
-              },
-              "formatting": {
-                "unit": "none",
-                "decimalPrecision": "2"
-              },
-              "chartAppearance": {
-                "lineInterpolation": "spline",
-                "showPoints": false,
-                "lineStyle": "solid",
-                "fillMode": "none",
-                "spanGaps": {
-                  "fillOnlyBelow": false,
-                  "fillLessThan": ""
-                }
-              },
-              "axes": {
-                "softMin": 0,
-                "softMax": 0,
-                "isLogScale": false
-              },
-              "legend": {
-                "position": "bottom",
-                "mode": "list",
-                "customColors": null
-              },
-              "thresholds": null
-            }
-          },
-          "queries": [
-            {
-              "kind": "time_series",
-              "spec": {
-                "name": "A",
-                "plugin": {
-                  "kind": "signoz/BuilderQuery",
-                  "spec": {
-                    "name": "A",
-                    "stepInterval": 60,
-                    "signal": "metrics",
-                    "source": "",
-                    "aggregations": [
-                      {
-                        "metricName": "aws_Lambda_Invocations_sum",
-                        "temporality": "",
-                        "timeAggregation": "sum",
-                        "spaceAggregation": "sum",
-                        "reduceTo": "avg"
-                      }
-                    ],
-                    "disabled": false,
-                    "filter": {
-                      "expression": "(cloud.account.id = $Account AND cloud.region = $Region AND FunctionName EXISTS AND Resource NOT EXISTS) AND FunctionName IN $FunctionName"
-                    },
-                    "groupBy": [
-                      {
-                        "name": "cloud.account.id",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      },
-                      {
-                        "name": "cloud.region",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      },
-                      {
-                        "name": "FunctionName",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      }
-                    ],
-                    "order": [],
-                    "having": {
-                      "expression": ""
-                    },
-                    "functions": [],
-                    "legend": "{{FunctionName}}"
-                  }
-                }
-              }
-            }
-          ],
-          "links": []
-        }
-      },
-      "ae6d7c81-d921-4d4c-95ec-6b42d900ea45": {
-        "kind": "Panel",
-        "spec": {
-          "display": {
-            "name": "Max Async Event Age",
-            "description": "The time between when Lambda successfully queues the event and when the function is invoked. The value of this metric increases when events are being retried due to invocation failures or throttling. Monitor this metric and set alarms for thresholds on different statistics for when a queue buildup occurs. To troubleshoot an increase in this metric, look at the Errors metric to identify function errors and the Throttles metric to identify concurrency issues.\n\nSee more at https://docs.aws.amazon.com/lambda/latest/dg/monitoring-metrics-types.html"
-          },
-          "plugin": {
-            "kind": "signoz/TimeSeriesPanel",
-            "spec": {
-              "visualization": {
-                "timePreference": "global_time",
-                "fillSpans": false
-              },
-              "formatting": {
-                "unit": "ms",
-                "decimalPrecision": "2"
-              },
-              "chartAppearance": {
-                "lineInterpolation": "spline",
-                "showPoints": false,
-                "lineStyle": "solid",
-                "fillMode": "none",
-                "spanGaps": {
-                  "fillOnlyBelow": false,
-                  "fillLessThan": ""
-                }
-              },
-              "axes": {
-                "softMin": 0,
-                "softMax": 0,
-                "isLogScale": false
-              },
-              "legend": {
-                "position": "bottom",
-                "mode": "list",
-                "customColors": null
-              },
-              "thresholds": null
-            }
-          },
-          "queries": [
-            {
-              "kind": "time_series",
-              "spec": {
-                "name": "A",
-                "plugin": {
-                  "kind": "signoz/BuilderQuery",
-                  "spec": {
-                    "name": "A",
-                    "stepInterval": 60,
-                    "signal": "metrics",
-                    "source": "",
-                    "aggregations": [
-                      {
-                        "metricName": "aws_Lambda_AsyncEventAge_max",
-                        "temporality": "",
-                        "timeAggregation": "max",
-                        "spaceAggregation": "max",
-                        "reduceTo": "avg"
-                      }
-                    ],
-                    "disabled": false,
-                    "filter": {
-                      "expression": "(cloud.account.id = $Account AND cloud.region = $Region AND FunctionName EXISTS AND Resource NOT EXISTS) AND FunctionName IN $FunctionName"
-                    },
-                    "groupBy": [
-                      {
-                        "name": "cloud.account.id",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      },
-                      {
-                        "name": "cloud.region",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      },
-                      {
-                        "name": "FunctionName",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      }
-                    ],
-                    "order": [],
-                    "having": {
-                      "expression": ""
-                    },
-                    "functions": [],
-                    "legend": "{{FunctionName}}"
-                  }
-                }
-              }
-            }
-          ],
-          "links": []
-        }
-      },
-      "b038520d-0756-4e46-a915-12a2f19a0254": {
-        "kind": "Panel",
-        "spec": {
-          "display": {
-            "name": "Max Duration",
-            "description": "The amount of time that your function code spends processing an event. The billed duration for an invocation is the value of Duration rounded up to the nearest millisecond. Duration does not include cold start time.\n\nSee more at https://docs.aws.amazon.com/lambda/latest/dg/monitoring-metrics-types.html"
-          },
-          "plugin": {
-            "kind": "signoz/TimeSeriesPanel",
-            "spec": {
-              "visualization": {
-                "timePreference": "global_time",
-                "fillSpans": false
-              },
-              "formatting": {
-                "unit": "ms",
-                "decimalPrecision": "2"
-              },
-              "chartAppearance": {
-                "lineInterpolation": "spline",
-                "showPoints": false,
-                "lineStyle": "solid",
-                "fillMode": "none",
-                "spanGaps": {
-                  "fillOnlyBelow": false,
-                  "fillLessThan": ""
-                }
-              },
-              "axes": {
-                "softMin": 0,
-                "softMax": 0,
-                "isLogScale": false
-              },
-              "legend": {
-                "position": "bottom",
-                "mode": "list",
-                "customColors": null
-              },
-              "thresholds": null
-            }
-          },
-          "queries": [
-            {
-              "kind": "time_series",
-              "spec": {
-                "name": "A",
-                "plugin": {
-                  "kind": "signoz/BuilderQuery",
-                  "spec": {
-                    "name": "A",
-                    "stepInterval": 60,
-                    "signal": "metrics",
-                    "source": "",
-                    "aggregations": [
-                      {
-                        "metricName": "aws_Lambda_Duration_max",
-                        "temporality": "",
-                        "timeAggregation": "max",
-                        "spaceAggregation": "max",
-                        "reduceTo": "avg"
-                      }
-                    ],
-                    "disabled": false,
-                    "filter": {
-                      "expression": "(cloud.account.id = $Account AND cloud.region = $Region AND FunctionName EXISTS AND Resource NOT EXISTS) AND FunctionName IN $FunctionName"
-                    },
-                    "groupBy": [
-                      {
-                        "name": "cloud.account.id",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      },
-                      {
-                        "name": "cloud.region",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      },
-                      {
-                        "name": "FunctionName",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      }
-                    ],
-                    "order": [],
-                    "having": {
-                      "expression": ""
-                    },
-                    "functions": [],
-                    "legend": "{{FunctionName}}"
-                  }
-                }
-              }
-            }
-          ],
-          "links": []
-        }
-      }
-    },
-    "layouts": [
-      {
-        "kind": "Grid",
-        "spec": {
-          "items": [
-            {
-              "x": 0,
-              "y": 0,
-              "width": 6,
-              "height": 6,
-              "content": {
-                "$ref": "#/spec/panels/877bb5c8-331c-492f-b666-2054c2ae39bd"
-              }
-            },
-            {
-              "x": 6,
-              "y": 0,
-              "width": 6,
-              "height": 6,
-              "content": {
-                "$ref": "#/spec/panels/b038520d-0756-4e46-a915-12a2f19a0254"
-              }
-            },
-            {
-              "x": 0,
-              "y": 6,
-              "width": 6,
-              "height": 6,
-              "content": {
-                "$ref": "#/spec/panels/2516c785-b025-49b3-aeb4-a4735ccb2709"
-              }
-            },
-            {
-              "x": 6,
-              "y": 6,
-              "width": 6,
-              "height": 6,
-              "content": {
-                "$ref": "#/spec/panels/6354ea62-e82b-4323-a33d-eef92519e843"
-              }
-            },
-            {
-              "x": 0,
-              "y": 12,
-              "width": 6,
-              "height": 6,
-              "content": {
-                "$ref": "#/spec/panels/853d3a92-b396-4064-8762-18d7487989e0"
-              }
-            },
-            {
-              "x": 6,
-              "y": 12,
-              "width": 6,
-              "height": 6,
-              "content": {
-                "$ref": "#/spec/panels/ae6d7c81-d921-4d4c-95ec-6b42d900ea45"
-              }
-            },
-            {
-              "x": 0,
-              "y": 18,
-              "width": 6,
-              "height": 6,
-              "content": {
-                "$ref": "#/spec/panels/4119a1e5-32a8-4859-96e9-a5451114782b"
-              }
-            }
-          ]
-        }
-      }
-    ],
-    "duration": "",
-    "refreshInterval": "",
-    "links": []
-  }
-}

pkg/statementbuilder/metricsstatementbuilder/stmt_builder_test.go

@@ -322,38 +322,6 @@ func TestStatementBuilder(t *testing.T) {
 			},
 			expectedErr: nil,
 		},
-		{
-			name:        "test_bool_label_filter",
-			requestType: qbtypes.RequestTypeTimeSeries,
-			query: qbtypes.QueryBuilderQuery[qbtypes.MetricAggregation]{
-				Signal:       telemetrytypes.SignalMetrics,
-				StepInterval: qbtypes.Step{Duration: 30 * time.Second},
-				Aggregations: []qbtypes.MetricAggregation{
-					{
-						MetricName:       "signoz_calls_total",
-						Type:             metrictypes.SumType,
-						Temporality:      metrictypes.Cumulative,
-						TimeAggregation:  metrictypes.TimeAggregationRate,
-						SpaceAggregation: metrictypes.SpaceAggregationSum,
-					},
-				},
-				Filter: &qbtypes.Filter{
-					Expression: "success = true",
-				},
-				GroupBy: []qbtypes.GroupByKey{
-					{
-						TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{
-							Name: "service.name",
-						},
-					},
-				},
-			},
-			expected: qbtypes.Statement{
-				Query: "WITH __temporal_aggregation_cte AS (SELECT ts, `__GROUP_BY_KEY_0_service.name`, multiIf(row_number() OVER rate_window = 1, nan, (per_series_value - lagInFrame(per_series_value, 1) OVER rate_window) < 0, per_series_value / (ts - lagInFrame(ts, 1) OVER rate_window), (per_series_value - lagInFrame(per_series_value, 1) OVER rate_window) / (ts - lagInFrame(ts, 1) OVER rate_window)) AS per_series_value FROM (SELECT fingerprint, toStartOfInterval(toDateTime(intDiv(unix_milli, 1000)), toIntervalSecond(30)) AS ts, `__GROUP_BY_KEY_0_service.name`, max(value) AS per_series_value FROM signoz_metrics.distributed_samples_v4 AS points INNER JOIN (SELECT fingerprint, JSONExtractString(labels, 'service.name') AS `__GROUP_BY_KEY_0_service.name` FROM signoz_metrics.time_series_v4_6hrs WHERE metric_name IN (?) AND unix_milli >= ? AND unix_milli <= ? AND LOWER(temporality) LIKE LOWER(?) AND accurateCastOrNull(JSONExtractString(labels, 'success'), 'Bool') = ? GROUP BY fingerprint, `__GROUP_BY_KEY_0_service.name`) AS filtered_time_series ON points.fingerprint = filtered_time_series.fingerprint WHERE metric_name IN (?) AND unix_milli >= ? AND unix_milli < ? GROUP BY fingerprint, ts, `__GROUP_BY_KEY_0_service.name` ORDER BY fingerprint, ts) WINDOW rate_window AS (PARTITION BY fingerprint ORDER BY fingerprint, ts)), __spatial_aggregation_cte AS (SELECT ts, `__GROUP_BY_KEY_0_service.name`, sum(per_series_value) AS value FROM __temporal_aggregation_cte WHERE isNaN(per_series_value) = ? GROUP BY ts, `__GROUP_BY_KEY_0_service.name`) SELECT * FROM __spatial_aggregation_cte ORDER BY `__GROUP_BY_KEY_0_service.name`, ts",
-				Args:  []any{"signoz_calls_total", uint64(1747936800000), uint64(1747983420000), "cumulative", true, "signoz_calls_total", uint64(1747947360000), uint64(1747983420000), 0},
-			},
-			expectedErr: nil,
-		},
 	}
 
 	fm := metricstelemetryschema.NewFieldMapper()

pkg/statementbuilder/metricsstatementbuilder/testdata/keys_map.json

@@ -31,14 +31,6 @@
             "signal": "metrics"
         }
     ],
-    "success": [
-        {
-            "name": "success",
-            "fieldContext": "attribute",
-            "fieldDataType": "bool",
-            "signal": "metrics"
-        }
-    ],
     "materialized.key.name": [
         {
             "name": "materialized.key.name",

pkg/telemetryschema/metricstelemetryschema/condition_builder.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"slices"
 
-	schema "github.com/SigNoz/signoz-otel-collector/cmd/signozschemamigrator/schema_migrator"
 	"github.com/SigNoz/signoz/pkg/errors"
 	"github.com/SigNoz/signoz/pkg/querybuilder"
 	qbtypes "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
@@ -23,28 +22,6 @@ func NewConditionBuilder(fm qbtypes.FieldMapper) *conditionBuilder {
 	return &conditionBuilder{fm: fm}
 }
 
-// Labels read back as String from the `labels` JSON whatever type the metadata claims, so the
-// collision is always String vs the literal; intrinsic columns keep their own type.
-func resolveTypeCollisionForFieldName(fieldExpression string, value any) string {
-	if col, isColumn := timeSeriesV4Columns[fieldExpression]; isColumn {
-		columnType := col.Type.GetType()
-		if lowCardinality, ok := col.Type.(schema.LowCardinalityColumnType); ok {
-			columnType = lowCardinality.ElementType.GetType()
-		}
-		if columnType != schema.ColumnTypeEnumString {
-			return fieldExpression
-		}
-	}
-
-	switch value.(type) {
-	case bool:
-		return fmt.Sprintf("accurateCastOrNull(%s, 'Bool')", fieldExpression)
-	case float64:
-		return fmt.Sprintf("toFloat64OrNull(%s)", fieldExpression)
-	}
-	return fieldExpression
-}
-
 func (c *conditionBuilder) conditionFor(
 	ctx context.Context,
 	orgID valuer.UUID,
@@ -65,8 +42,17 @@ func (c *conditionBuilder) conditionFor(
 		return "", err
 	}
 
-	// TODO(srikanthccv): use querybuilder.DataTypeCollisionHandledFieldName when metrics schemas are updated
-	fieldExpression = resolveTypeCollisionForFieldName(fieldExpression, value)
+	// TODO(srikanthccv): use the same data type collision handling when metrics schemas are updated
+	switch v := value.(type) {
+	case float64:
+		fieldExpression = fmt.Sprintf("toFloat64OrNull(%s)", fieldExpression)
+	case []any:
+		if len(v) > 0 && (operator == qbtypes.FilterOperatorBetween || operator == qbtypes.FilterOperatorNotBetween) {
+			if _, ok := v[0].(float64); ok {
+				fieldExpression = fmt.Sprintf("toFloat64OrNull(%s)", fieldExpression)
+			}
+		}
+	}
 
 	switch operator {
 	case qbtypes.FilterOperatorEqual:
@@ -114,8 +100,6 @@ func (c *conditionBuilder) conditionFor(
 		if len(values) != 2 {
 			return "", qbtypes.ErrBetweenValues
 		}
-		// both bounds share one expression, so the lower bound picks the cast
-		fieldExpression = resolveTypeCollisionForFieldName(fieldExpression, values[0])
 		return sb.Between(fieldExpression, values[0], values[1]), nil
 	case qbtypes.FilterOperatorNotBetween:
 		values, ok := value.([]any)
@@ -125,7 +109,6 @@ func (c *conditionBuilder) conditionFor(
 		if len(values) != 2 {
 			return "", qbtypes.ErrBetweenValues
 		}
-		fieldExpression = resolveTypeCollisionForFieldName(fieldExpression, values[0])
 		return sb.NotBetween(fieldExpression, values[0], values[1]), nil
 
 	// in and not in
@@ -134,23 +117,13 @@ func (c *conditionBuilder) conditionFor(
 		if !ok {
 			return "", qbtypes.ErrInValues
 		}
-		// instead of using IN, we use `=` + `OR` to make use of index
-		conditions := []string{}
-		for _, item := range values {
-			conditions = append(conditions, sb.E(resolveTypeCollisionForFieldName(fieldExpression, item), item))
-		}
-		return sb.Or(conditions...), nil
+		return sb.In(fieldExpression, values), nil
 	case qbtypes.FilterOperatorNotIn:
 		values, ok := value.([]any)
 		if !ok {
 			return "", qbtypes.ErrInValues
 		}
-		// instead of using NOT IN, we use `!=` + `AND` to make use of index
-		conditions := []string{}
-		for _, item := range values {
-			conditions = append(conditions, sb.NE(resolveTypeCollisionForFieldName(fieldExpression, item), item))
-		}
-		return sb.And(conditions...), nil
+		return sb.NotIn(fieldExpression, values), nil
 
 	// exists and not exists
 	// in the UI based query builder, `exists` and `not exists` are used for

pkg/telemetryschema/metricstelemetryschema/condition_builder_test.go

@@ -119,8 +119,8 @@ func TestConditionFor(t *testing.T) {
 			},
 			operator:      qbtypes.FilterOperatorIn,
 			value:         []any{"http.server.duration", "http.server.request.duration", "http.server.response.duration"},
-			expectedSQL:   "(metric_name = ? OR metric_name = ? OR metric_name = ?)",
-			expectedArgs:  []any{"http.server.duration", "http.server.request.duration", "http.server.response.duration"},
+			expectedSQL:   "metric_name IN (?)",
+			expectedArgs:  []any{[]any{"http.server.duration", "http.server.request.duration", "http.server.response.duration"}},
 			expectedError: nil,
 		},
 		{
@@ -155,8 +155,8 @@ func TestConditionFor(t *testing.T) {
 			},
 			operator:      qbtypes.FilterOperatorNotIn,
 			value:         []any{"debug", "info", "trace"},
-			expectedSQL:   "(metric_name <> ? AND metric_name <> ? AND metric_name <> ?)",
-			expectedArgs:  []any{"debug", "info", "trace"},
+			expectedSQL:   "metric_name NOT IN (?)",
+			expectedArgs:  []any{[]any{"debug", "info", "trace"}},
 			expectedError: nil,
 		},
 		{
@@ -227,120 +227,6 @@ func TestConditionFor(t *testing.T) {
 			expectedSQL:   "",
 			expectedError: qbtypes.ErrColumnNotFound,
 		},
-		{
-			name: "Equal operator - bool label casts the JSON read to Bool",
-			key: telemetrytypes.TelemetryFieldKey{
-				Name:          "success",
-				FieldContext:  telemetrytypes.FieldContextAttribute,
-				FieldDataType: telemetrytypes.FieldDataTypeBool,
-			},
-			operator:      qbtypes.FilterOperatorEqual,
-			value:         true,
-			expectedSQL:   "accurateCastOrNull(JSONExtractString(labels, 'success'), 'Bool') = ?",
-			expectedArgs:  []any{true},
-			expectedError: nil,
-		},
-		{
-			name: "Not Equal operator - bool label casts the JSON read to Bool",
-			key: telemetrytypes.TelemetryFieldKey{
-				Name:          "success",
-				FieldContext:  telemetrytypes.FieldContextAttribute,
-				FieldDataType: telemetrytypes.FieldDataTypeBool,
-			},
-			operator:      qbtypes.FilterOperatorNotEqual,
-			value:         false,
-			expectedSQL:   "accurateCastOrNull(JSONExtractString(labels, 'success'), 'Bool') <> ?",
-			expectedArgs:  []any{false},
-			expectedError: nil,
-		},
-		{
-			name: "Equal operator - bool value on a label the metadata calls a string",
-			key: telemetrytypes.TelemetryFieldKey{
-				Name:          "success",
-				FieldContext:  telemetrytypes.FieldContextAttribute,
-				FieldDataType: telemetrytypes.FieldDataTypeString,
-			},
-			operator:      qbtypes.FilterOperatorEqual,
-			value:         true,
-			expectedSQL:   "accurateCastOrNull(JSONExtractString(labels, 'success'), 'Bool') = ?",
-			expectedArgs:  []any{true},
-			expectedError: nil,
-		},
-		{
-			name: "In operator - all-bool set casts the JSON read to Bool",
-			key: telemetrytypes.TelemetryFieldKey{
-				Name:          "success",
-				FieldContext:  telemetrytypes.FieldContextAttribute,
-				FieldDataType: telemetrytypes.FieldDataTypeBool,
-			},
-			operator:      qbtypes.FilterOperatorIn,
-			value:         []any{true, false},
-			expectedSQL:   "(accurateCastOrNull(JSONExtractString(labels, 'success'), 'Bool') = ? OR accurateCastOrNull(JSONExtractString(labels, 'success'), 'Bool') = ?)",
-			expectedArgs:  []any{true, false},
-			expectedError: nil,
-		},
-		{
-			name: "In operator - a mixed set casts each value on its own",
-			key: telemetrytypes.TelemetryFieldKey{
-				Name:          "success",
-				FieldContext:  telemetrytypes.FieldContextAttribute,
-				FieldDataType: telemetrytypes.FieldDataTypeBool,
-			},
-			operator:      qbtypes.FilterOperatorIn,
-			value:         []any{true, "maybe"},
-			expectedSQL:   "(accurateCastOrNull(JSONExtractString(labels, 'success'), 'Bool') = ? OR JSONExtractString(labels, 'success') = ?)",
-			expectedArgs:  []any{true, "maybe"},
-			expectedError: nil,
-		},
-		{
-			name: "Greater Than operator - a numeric column is compared without a cast",
-			key: telemetrytypes.TelemetryFieldKey{
-				Name:         "unix_milli",
-				FieldContext: telemetrytypes.FieldContextMetric,
-			},
-			operator:      qbtypes.FilterOperatorGreaterThan,
-			value:         float64(1747947419000),
-			expectedSQL:   "unix_milli > ?",
-			expectedArgs:  []any{float64(1747947419000)},
-			expectedError: nil,
-		},
-		{
-			name: "Equal operator - the is_monotonic column is already Bool, no cast",
-			key: telemetrytypes.TelemetryFieldKey{
-				Name:         "is_monotonic",
-				FieldContext: telemetrytypes.FieldContextMetric,
-			},
-			operator:      qbtypes.FilterOperatorEqual,
-			value:         true,
-			expectedSQL:   "is_monotonic = ?",
-			expectedArgs:  []any{true},
-			expectedError: nil,
-		},
-		{
-			name: "Between operator - the bounds cast the JSON read to Float64",
-			key: telemetrytypes.TelemetryFieldKey{
-				Name:          "latency",
-				FieldContext:  telemetrytypes.FieldContextAttribute,
-				FieldDataType: telemetrytypes.FieldDataTypeFloat64,
-			},
-			operator:      qbtypes.FilterOperatorBetween,
-			value:         []any{float64(10), float64(20)},
-			expectedSQL:   "toFloat64OrNull(JSONExtractString(labels, 'latency')) BETWEEN ? AND ?",
-			expectedArgs:  []any{float64(10), float64(20)},
-			expectedError: nil,
-		},
-		{
-			name: "Between operator - a numeric column is compared without a cast",
-			key: telemetrytypes.TelemetryFieldKey{
-				Name:         "unix_milli",
-				FieldContext: telemetrytypes.FieldContextMetric,
-			},
-			operator:      qbtypes.FilterOperatorBetween,
-			value:         []any{float64(1747947419000), float64(1747947429000)},
-			expectedSQL:   "unix_milli BETWEEN ? AND ?",
-			expectedArgs:  []any{float64(1747947419000), float64(1747947429000)},
-			expectedError: nil,
-		},
 	}
 
 	fm := NewFieldMapper()

tests/e2e/pnpm-lock.yaml

@@ -4,9 +4,6 @@ settings:
   autoInstallPeers: true
   excludeLinksFromLockfile: false
 
-overrides:
-  brace-expansion@>=5.0.0 <5.0.9: '>=5.0.9 <6'
-
 importers:
 
   .:
@@ -380,9 +377,9 @@ packages:
     resolution: {integrity: sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==}
     engines: {node: 18 || 20 || >=22}
 
-  brace-expansion@5.0.9:
-    resolution: {integrity: sha512-ScQ4IuvIEF1TMlP7Zt+vjJ//9zlPb2SDcxWxM3bk8s6t6GGdJ7KO1dCcTidOPJKePW30LE/2cT7wCyPho9/Wxg==}
-    engines: {node: 20 || >=22}
+  brace-expansion@5.0.5:
+    resolution: {integrity: sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==}
+    engines: {node: 18 || 20 || >=22}
 
   cross-spawn@7.0.6:
     resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==}
@@ -848,7 +845,7 @@ snapshots:
 
   balanced-match@4.0.4: {}
 
-  brace-expansion@5.0.9:
+  brace-expansion@5.0.5:
     dependencies:
       balanced-match: 4.0.4
 
@@ -1001,7 +998,7 @@ snapshots:
 
   minimatch@10.2.5:
     dependencies:
-      brace-expansion: 5.0.9
+      brace-expansion: 5.0.5
 
   ms@2.1.3: {}
 

tests/e2e/pnpm-workspace.yaml

@@ -1,6 +0,0 @@
-# Security floors for vulnerable transitive deps. Where possible, targets are
-# capped to avoid crossing breaking versions (major; and minor for 0.x).
-overrides:
- # via: eslint-plugin-playwright > eslint@10 > minimatch@10.2.5 (brace-expansion ^5.0.5)
- # remove: blocked — minimatch@10.2.6 (latest) only widens to ^5.0.8, still vulnerable
- 'brace-expansion@>=5.0.0 <5.0.9': '>=5.0.9 <6'

tests/integration/tests/queriermetrics/13_bool_label_filter.py

@@ -1,66 +0,0 @@
-from collections.abc import Callable
-from datetime import UTC, datetime, timedelta
-from http import HTTPStatus
-
-from fixtures import querier, types
-from fixtures.auth import USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD
-from fixtures.metrics import Metrics
-
-METRIC = "test.metric.boollabel"
-
-
-def test_metrics_filter_bool_label(
-    signoz: types.SigNoz,
-    create_user_admin: None,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    insert_metrics: Callable[[list[Metrics]], None],
-) -> None:
-    now = datetime.now(tz=UTC).replace(second=0, microsecond=0)
-    insert_metrics(
-        [
-            Metrics(
-                metric_name=METRIC,
-                labels=labels,
-                timestamp=now - timedelta(seconds=1),
-                temporality="Unspecified",
-                type_="Gauge",
-                is_monotonic=False,
-                value=value,
-            )
-            for labels, value in [
-                ({"success": "true"}, 30.0),
-                ({"success": "false"}, 10.0),
-                ({"success": "1"}, 5.0),
-                ({"success": "maybe"}, 3.0),
-                ({"region": "us"}, 7.0),
-            ]
-        ]
-    )
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-
-    # `true` selects "true" and "1"; `false` selects only "false". "maybe" and the series
-    # carrying no `success` label cast to NULL, so they are in neither result.
-    for expr, expected in [
-        ("success = true", 35.0),
-        ("success = false", 10.0),
-        ("success != true", 10.0),
-        ("success IN [true]", 35.0),
-        ("success IN [true, false]", 45.0),
-    ]:
-        response = querier.make_scalar_query_request(
-            signoz,
-            token,
-            now,
-            [
-                querier.build_scalar_query(
-                    name="A",
-                    signal="metrics",
-                    aggregations=[querier.build_metrics_aggregation(METRIC, "latest", "sum", "unspecified", reduce_to="last")],
-                    filter_expression=expr,
-                )
-            ],
-        )
-        assert response.status_code == HTTPStatus.OK, f"{expr}: {response.text}"
-        data = querier.get_scalar_table_data(response.json())
-        assert len(data) == 1, f"{expr}: {data}"
-        assert data[0][-1] == expected, f"{expr}: {data}"