fix: update function name

docs/api/openapi.yml

@@ -11020,6 +11020,10 @@ paths:
         name: source
         schema:
           $ref: '#/components/schemas/TelemetrytypesSource'
+      - in: query
+        name: type
+        schema:
+          type: string
       - in: query
         name: limit
         schema:
@@ -11109,6 +11113,10 @@ paths:
         name: source
         schema:
           $ref: '#/components/schemas/TelemetrytypesSource'
+      - in: query
+        name: type
+        schema:
+          type: string
       - in: query
         name: limit
         schema:
@@ -21311,6 +21319,10 @@ paths:
         name: source
         schema:
           $ref: '#/components/schemas/TelemetrytypesSource'
+      - in: query
+        name: type
+        schema:
+          type: string
       - in: query
         name: limit
         schema:
@@ -21412,6 +21424,10 @@ paths:
         name: source
         schema:
           $ref: '#/components/schemas/TelemetrytypesSource'
+      - in: query
+        name: type
+        schema:
+          type: string
       - in: query
         name: limit
         schema:

frontend/public/locales/en-GB/channels.json

@@ -24,8 +24,6 @@
   "tooltip_opsgenie_api_key": "Learn how to obtain the API key from your OpsGenie account [here](https://support.atlassian.com/opsgenie/docs/integrate-opsgenie-with-prometheus/).",
   "tooltip_email_to": "Enter email addresses separated by commas.",
   "tooltip_ms_teams_url": "The URL of the Microsoft Teams [webhook](https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498) to send alerts to. Learn more about Microsoft Teams integration in the docs [here](https://signoz.io/docs/alerts-management/notification-channel/ms-teams/).",
-  "tooltip_google_chat_url": "The URL of the Google Chat space [incoming webhook](https://developers.google.com/workspace/chat/quickstart/webhooks) to send alerts to. It must be an https URL on chat.googleapis.com.",
-  "google_chat_webhook_url_invalid": "Webhook URL must be an https URL on chat.googleapis.com",
 
   "field_slack_recipient": "Recipient",
   "field_slack_title": "Title",

frontend/public/locales/en/channels.json

@@ -24,8 +24,6 @@
   "tooltip_opsgenie_api_key": "Learn how to obtain the API key from your OpsGenie account [here](https://support.atlassian.com/opsgenie/docs/integrate-opsgenie-with-prometheus/).",
   "tooltip_email_to": "Enter email addresses separated by commas.",
   "tooltip_ms_teams_url": "The URL of the Microsoft Teams [webhook](https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498) to send alerts to. Learn more about Microsoft Teams integration in the docs [here](https://signoz.io/docs/alerts-management/notification-channel/ms-teams/).",
-  "tooltip_google_chat_url": "The URL of the Google Chat space [incoming webhook](https://developers.google.com/workspace/chat/quickstart/webhooks) to send alerts to. It must be an https URL on chat.googleapis.com.",
-  "google_chat_webhook_url_invalid": "Webhook URL must be an https URL on chat.googleapis.com",
   "field_slack_recipient": "Recipient",
   "field_slack_title": "Title",
   "field_slack_description": "Description",

frontend/src/api/generated/services/sigNoz.schemas.ts

@@ -10426,6 +10426,11 @@ export type GetFieldsKeysParams = {
 	 * @description undefined
 	 */
 	source?: TelemetrytypesSourceDTO;
+	/**
+	 * @type string
+	 * @description undefined
+	 */
+	type?: string;
 	/**
 	 * @type integer
 	 * @description undefined
@@ -10485,6 +10490,11 @@ export type GetFieldsValuesParams = {
 	 * @description undefined
 	 */
 	source?: TelemetrytypesSourceDTO;
+	/**
+	 * @type string
+	 * @description undefined
+	 */
+	type?: string;
 	/**
 	 * @type integer
 	 * @description undefined
@@ -11792,6 +11802,11 @@ export type GetRuleHistoryFilterKeysParams = {
 	 * @description undefined
 	 */
 	source?: TelemetrytypesSourceDTO;
+	/**
+	 * @type string
+	 * @description undefined
+	 */
+	type?: string;
 	/**
 	 * @type integer
 	 * @description undefined
@@ -11854,6 +11869,11 @@ export type GetRuleHistoryFilterValuesParams = {
 	 * @description undefined
 	 */
 	source?: TelemetrytypesSourceDTO;
+	/**
+	 * @type string
+	 * @description undefined
+	 */
+	type?: string;
 	/**
 	 * @type integer
 	 * @description undefined

frontend/src/container/AllAlertChannels/__tests__/CreateAlertChannel.test.tsx

@@ -1,28 +1,18 @@
 import CreateAlertChannels from 'container/CreateAlertChannels';
 import { ChannelType } from 'container/CreateAlertChannels/config';
-import { GoogleChatInitialConfig } from 'container/CreateAlertChannels/defaults';
 import {
-	googleChatDescriptionDefaultValue,
-	googleChatTitleDefaultValue,
 	opsGenieDescriptionDefaultValue,
 	opsGenieMessageDefaultValue,
 	opsGeniePriorityDefaultValue,
 	pagerDutyAdditionalDetailsDefaultValue,
-	pagerDutyDescriptionDefaultValue,
+	pagerDutyDescriptionDefaultVaule,
 	pagerDutySeverityTextDefaultValue,
 	slackDescriptionDefaultValue,
 	slackTitleDefaultValue,
 } from 'mocks-server/__mockdata__/alerts';
 import { server } from 'mocks-server/server';
 import { rest } from 'msw';
-import {
-	act,
-	fireEvent,
-	render,
-	screen,
-	userEvent,
-	waitFor,
-} from 'tests/test-utils';
+import { act, fireEvent, render, screen, waitFor } from 'tests/test-utils';
 
 import { testLabelInputAndHelpValue } from './testUtils';
 
@@ -235,7 +225,7 @@ describe('Create Alert Channel', () => {
 				);
 
 				expect(descriptionTextArea).toHaveTextContent(
-					pagerDutyDescriptionDefaultValue,
+					pagerDutyDescriptionDefaultVaule,
 				);
 			});
 			it('Should check if Severity label, info (help_pager_severity), and textbox are displayed properly', () => {
@@ -429,150 +419,5 @@ describe('Create Alert Channel', () => {
 				expect(descriptionTextArea).toHaveTextContent(slackDescriptionDefaultValue);
 			});
 		});
-		describe('Google Chat', () => {
-			const validWebhookUrl =
-				'https://chat.googleapis.com/v1/spaces/AAAA/messages?key=dummy_key&token=dummy_token';
-
-			beforeEach(() => {
-				render(<CreateAlertChannels preType={ChannelType.GoogleChat} />);
-			});
-
-			it('Should check if the selected item in the type dropdown has text "Google Chat"', () => {
-				expect(screen.getByText('Google Chat')).toBeInTheDocument();
-			});
-
-			it('Should check if Webhook URL label and input are displayed properly', () => {
-				testLabelInputAndHelpValue({
-					labelText: 'field_webhook_url',
-					testId: 'webhook-url-textbox',
-				});
-			});
-
-			it('Should check if Title contains the google chat template', () => {
-				expect(screen.getByTestId('title-textarea')).toHaveTextContent(
-					googleChatTitleDefaultValue,
-				);
-			});
-
-			it('Should check if Description contains the google chat template', () => {
-				expect(screen.getByTestId('description-textarea')).toHaveTextContent(
-					googleChatDescriptionDefaultValue,
-				);
-			});
-
-			it('Should check if saving with a webhook url outside chat.googleapis.com displays error notification', async () => {
-				const user = userEvent.setup();
-
-				await user.type(
-					screen.getByTestId('channel-name-textbox'),
-					'gchat-channel',
-				);
-				await user.type(
-					screen.getByTestId('webhook-url-textbox'),
-					'https://example.com/webhook',
-				);
-
-				await user.click(screen.getByTestId('save-channel-button'));
-
-				await waitFor(() =>
-					expect(errorNotification).toHaveBeenCalledWith({
-						message: 'Error',
-						description: 'google_chat_webhook_url_invalid',
-					}),
-				);
-			});
-
-			it('Should check if saving sends a googlechat_configs payload', async () => {
-				let requestBody: unknown;
-				server.use(
-					rest.post('http://localhost/api/v1/channels', async (req, res, ctx) => {
-						requestBody = await req.json();
-						return res(
-							ctx.status(201),
-							ctx.json({ status: 'success', data: 'channel created' }),
-						);
-					}),
-				);
-
-				const user = userEvent.setup();
-
-				await user.type(
-					screen.getByTestId('channel-name-textbox'),
-					'gchat-channel',
-				);
-				await user.type(screen.getByTestId('webhook-url-textbox'), validWebhookUrl);
-
-				await user.click(screen.getByTestId('save-channel-button'));
-
-				await waitFor(() =>
-					expect(successNotification).toHaveBeenCalledWith({
-						message: 'Success',
-						description: 'channel_creation_done',
-					}),
-				);
-
-				expect(requestBody).toStrictEqual({
-					name: 'gchat-channel',
-					googlechat_configs: [
-						{
-							webhook_url: validWebhookUrl,
-							title: GoogleChatInitialConfig.title,
-							text: GoogleChatInitialConfig.text,
-							send_resolved: true,
-						},
-					],
-				});
-			});
-		});
-		describe('Changing the channel type', () => {
-			async function selectType(
-				user: ReturnType<typeof userEvent.setup>,
-				optionText: string,
-			): Promise<void> {
-				// the type dropdown opens on the inner search input of the antd select
-				await user.click(screen.getByRole('combobox'));
-				await user.click(await screen.findByTitle(optionText));
-			}
-
-			it('Should check if switching to Google Chat and back swaps the prefilled templates', async () => {
-				const user = userEvent.setup();
-				render(<CreateAlertChannels preType={ChannelType.Slack} />);
-
-				await selectType(user, 'Google Chat');
-
-				await waitFor(() =>
-					expect(screen.getByTestId('title-textarea')).toHaveTextContent(
-						googleChatTitleDefaultValue,
-					),
-				);
-				expect(screen.getByTestId('description-textarea')).toHaveTextContent(
-					googleChatDescriptionDefaultValue,
-				);
-
-				await selectType(user, 'Slack');
-
-				await waitFor(() =>
-					expect(screen.getByTestId('title-textarea')).toHaveTextContent(
-						slackTitleDefaultValue,
-					),
-				);
-				expect(screen.getByTestId('description-textarea')).toHaveTextContent(
-					slackDescriptionDefaultValue,
-				);
-			});
-
-			it('Should check if switching to Pagerduty prefills the pagerduty description and not the opsgenie one', async () => {
-				const user = userEvent.setup();
-				render(<CreateAlertChannels preType={ChannelType.Opsgenie} />);
-
-				await selectType(user, 'Pagerduty');
-
-				await waitFor(() =>
-					expect(screen.getByTestId('pager-description-textarea')).toHaveTextContent(
-						pagerDutyDescriptionDefaultValue,
-					),
-				);
-			});
-		});
 	});
 });

frontend/src/container/AllAlertChannels/__tests__/CreateAlertChannelNormalUser.test.tsx

@@ -5,7 +5,7 @@ import {
 	opsGenieMessageDefaultValue,
 	opsGeniePriorityDefaultValue,
 	pagerDutyAdditionalDetailsDefaultValue,
-	pagerDutyDescriptionDefaultValue,
+	pagerDutyDescriptionDefaultVaule,
 	pagerDutySeverityTextDefaultValue,
 	slackDescriptionDefaultValue,
 	slackTitleDefaultValue,
@@ -150,7 +150,7 @@ describe('Create Alert Channel (Normal User)', () => {
 				);
 
 				expect(descriptionTextArea).toHaveTextContent(
-					pagerDutyDescriptionDefaultValue,
+					pagerDutyDescriptionDefaultVaule,
 				);
 			});
 			it('Should check if Severity label, info (help_pager_severity), and textbox are displayed properly', () => {

frontend/src/container/CreateAlertChannels/config.ts

@@ -104,7 +104,6 @@ export enum ChannelType {
 	Pagerduty = 'pagerduty',
 	Opsgenie = 'opsgenie',
 	MsTeams = 'msteams',
-	GoogleChat = 'googlechat',
 }
 
 // LabelFilterStatement will be used for preparing filter conditions / matchers
@@ -126,11 +125,3 @@ export interface MsTeamsChannel extends Channel {
 	title?: string;
 	text?: string;
 }
-
-export interface GoogleChatChannel extends Channel {
-	// incoming webhook url of the google chat space, must be an
-	// https url on chat.googleapis.com
-	webhook_url?: string;
-	title?: string;
-	text?: string;
-}

frontend/src/container/CreateAlertChannels/defaults.ts

@@ -1,51 +1,4 @@
-import {
-	ChannelType,
-	EmailChannel,
-	GoogleChatChannel,
-	MsTeamsChannel,
-	OpsgenieChannel,
-	PagerChannel,
-	SlackChannel,
-	WebhookChannel,
-} from './config';
-
-// shared by slack and ms teams, both render the same title / description boxes
-export const SlackInitialConfig: Partial<SlackChannel> = {
-	text: `{{ range .Alerts -}}
-     *Alert:* {{ .Labels.alertname }}{{ if .Labels.severity }} - {{ .Labels.severity }}{{ end }}
-
-     *Summary:* {{ .Annotations.summary }}
-     *Description:* {{ .Annotations.description }}
-     *RelatedLogs:* {{ if gt (len .Annotations.related_logs) 0 -}} View in <{{ .Annotations.related_logs }}|logs explorer> {{- end}}
-     *RelatedTraces:* {{ if gt (len .Annotations.related_traces) 0 -}} View in <{{ .Annotations.related_traces }}|traces explorer> {{- end}}
-
-     *Details:*
-       {{ range .Labels.SortedPairs }} • *{{ .Name }}:* {{ .Value }}
-       {{ end }}
-     {{ end }}`,
-	title: `[{{ .Status | toUpper }}{{ if eq .Status "firing" }}:{{ .Alerts.Firing | len }}{{ end }}] {{ .CommonLabels.alertname }} for {{ .CommonLabels.job }}
-     {{- if gt (len .CommonLabels) (len .GroupLabels) -}}
-       {{" "}}(
-       {{- with .CommonLabels.Remove .GroupLabels.Names }}
-         {{- range $index, $label := .SortedPairs -}}
-           {{ if $index }}, {{ end }}
-           {{- $label.Name }}="{{ $label.Value -}}"
-         {{- end }}
-       {{- end -}}
-       )
-     {{- end }}`,
-};
-
-// mirrors DefaultGoogleChatReceiverConfig in pkg/types/alertmanagertypes/googlechat.go,
-// which the backend applies when title / text are left empty
-export const GoogleChatInitialConfig: Partial<GoogleChatChannel> = {
-	title: `[{{ .Status | toUpper }}{{ if eq .Status "firing" }}:{{ .Alerts.Firing | len }}{{ end }}] {{ .CommonLabels.alertname }}`,
-	text: `{{ range .Alerts -}}
-**Alert:** {{ .Labels.alertname }}{{ if .Labels.severity }} ({{ .Labels.severity }}){{ end }}{{ if .Annotations.summary }}
-**Summary:** {{ .Annotations.summary }}{{ end }}{{ if .Annotations.description }}
-**Description:** {{ .Annotations.description }}{{ end }}
-{{ end }}`,
-};
+import { EmailChannel, OpsgenieChannel, PagerChannel } from './config';
 
 export const PagerInitialConfig: Partial<PagerChannel> = {
 	description: `[{{ .Status | toUpper }}{{ if eq .Status "firing" }}:{{ .Alerts.Firing | len }}{{ end }}] {{ .CommonLabels.alertname }} for {{ .CommonLabels.job }}
@@ -493,26 +446,3 @@ export const EmailInitialConfig: Partial<EmailChannel> = {
 	</body>
   </html>`,
 };
-
-// prefilled values of every channel type, keyed by type so the form can apply
-// exactly one set of defaults and swap it when the type changes
-export const ChannelInitialConfig: Record<
-	ChannelType,
-	Partial<
-		SlackChannel &
-			WebhookChannel &
-			PagerChannel &
-			MsTeamsChannel &
-			OpsgenieChannel &
-			EmailChannel &
-			GoogleChatChannel
-	>
-> = {
-	[ChannelType.Slack]: SlackInitialConfig,
-	[ChannelType.MsTeams]: SlackInitialConfig,
-	[ChannelType.GoogleChat]: GoogleChatInitialConfig,
-	[ChannelType.Pagerduty]: PagerInitialConfig,
-	[ChannelType.Opsgenie]: OpsgenieInitialConfig,
-	[ChannelType.Email]: EmailInitialConfig,
-	[ChannelType.Webhook]: {},
-};

frontend/src/container/CreateAlertChannels/index.tsx

@@ -14,24 +14,16 @@ import testPagerApi from 'api/channels/testPager';
 import testSlackApi from 'api/channels/testSlack';
 import testWebhookApi from 'api/channels/testWebhook';
 import logEvent from 'api/common/logEvent';
-import {
-	useCreateChannel,
-	useTestChannel,
-} from 'api/generated/services/channels';
-import { RenderErrorResponseDTO } from 'api/generated/services/sigNoz.schemas';
-import { ErrorType } from 'api/generatedAPIInstance';
 import ROUTES from 'constants/routes';
 import FormAlertChannels from 'container/FormAlertChannels';
 import { useNotifications } from 'hooks/useNotifications';
 import history from 'lib/history';
 import { useErrorModal } from 'providers/ErrorModalProvider';
 import APIError from 'types/api/error';
-import { toAPIError } from 'utils/errorUtils';
 
 import {
 	ChannelType,
 	EmailChannel,
-	GoogleChatChannel,
 	MsTeamsChannel,
 	OpsgenieChannel,
 	PagerChannel,
@@ -39,12 +31,12 @@ import {
 	ValidatePagerChannel,
 	WebhookChannel,
 } from './config';
-import { ChannelInitialConfig } from './defaults';
 import {
-	isChannelType,
-	isValidGoogleChatWebhookURL,
-	prepareGoogleChatRequest,
-} from './utils';
+	EmailInitialConfig,
+	OpsgenieInitialConfig,
+	PagerInitialConfig,
+} from './defaults';
+import { isChannelType } from './utils';
 
 import './CreateAlertChannels.styles.scss';
 
@@ -68,38 +60,69 @@ function CreateAlertChannels({
 				PagerChannel &
 				MsTeamsChannel &
 				OpsgenieChannel &
-				EmailChannel &
-				GoogleChatChannel
+				EmailChannel
 		>
-	>(() => ({
+	>({
 		send_resolved: true,
-		...ChannelInitialConfig[preType],
-	}));
+		text: `{{ range .Alerts -}}
+     *Alert:* {{ .Labels.alertname }}{{ if .Labels.severity }} - {{ .Labels.severity }}{{ end }}
+
+     *Summary:* {{ .Annotations.summary }}
+     *Description:* {{ .Annotations.description }}
+     *RelatedLogs:* {{ if gt (len .Annotations.related_logs) 0 -}} View in <{{ .Annotations.related_logs }}|logs explorer> {{- end}}
+     *RelatedTraces:* {{ if gt (len .Annotations.related_traces) 0 -}} View in <{{ .Annotations.related_traces }}|traces explorer> {{- end}}
+
+     *Details:*
+       {{ range .Labels.SortedPairs }} • *{{ .Name }}:* {{ .Value }}
+       {{ end }}
+     {{ end }}`,
+		title: `[{{ .Status | toUpper }}{{ if eq .Status "firing" }}:{{ .Alerts.Firing | len }}{{ end }}] {{ .CommonLabels.alertname }} for {{ .CommonLabels.job }}
+     {{- if gt (len .CommonLabels) (len .GroupLabels) -}}
+       {{" "}}(
+       {{- with .CommonLabels.Remove .GroupLabels.Names }}
+         {{- range $index, $label := .SortedPairs -}}
+           {{ if $index }}, {{ end }}
+           {{- $label.Name }}="{{ $label.Value -}}"
+         {{- end }}
+       {{- end -}}
+       )
+     {{- end }}`,
+	});
 	const [savingState, setSavingState] = useState<boolean>(false);
 	const [testingState, setTestingState] = useState<boolean>(false);
 	const { notifications } = useNotifications();
 
-	const { mutateAsync: createChannel } = useCreateChannel();
-	const { mutateAsync: testChannel } = useTestChannel();
-
 	const [type, setType] = useState<ChannelType>(preType);
 	const onTypeChangeHandler = useCallback(
 		(value: string) => {
-			const nextType = value as ChannelType;
-			if (nextType === type) {
-				return;
+			const currentType = type;
+			setType(value as ChannelType);
+
+			if (value === ChannelType.Pagerduty && currentType !== value) {
+				// reset config to pager defaults
+				setSelectedConfig({
+					name: selectedConfig?.name,
+					send_resolved: selectedConfig.send_resolved,
+					...PagerInitialConfig,
+				});
 			}
 
-			setType(nextType);
+			if (value === ChannelType.Opsgenie && currentType !== value) {
+				setSelectedConfig((selectedConfig) => ({
+					...selectedConfig,
+					...OpsgenieInitialConfig,
+				}));
+			}
 
-			// the fields the types share (title, text, description) keep the value of
-			// the type that was selected before, so the new type's defaults have to be
-			// written to both the config and the form
-			const defaults = ChannelInitialConfig[nextType];
-			setSelectedConfig((selectedConfig) => ({ ...selectedConfig, ...defaults }));
-			formInstance.setFieldsValue(defaults);
+			// reset config to email defaults
+			if (value === ChannelType.Email && currentType !== value) {
+				setSelectedConfig((selectedConfig) => ({
+					...selectedConfig,
+					...EmailInitialConfig,
+				}));
+			}
 		},
-		[type, formInstance],
+		[type, selectedConfig],
 	);
 
 	const prepareSlackRequest = useCallback(
@@ -384,56 +407,6 @@ function CreateAlertChannels({
 		showErrorModal,
 	]);
 
-	const validateGoogleChatConfig = useCallback((): boolean => {
-		if (!selectedConfig.webhook_url) {
-			notifications.error({
-				message: 'Error',
-				description: t('webhook_url_required'),
-			});
-			return false;
-		}
-
-		if (!isValidGoogleChatWebhookURL(selectedConfig.webhook_url)) {
-			notifications.error({
-				message: 'Error',
-				description: t('google_chat_webhook_url_invalid'),
-			});
-			return false;
-		}
-
-		return true;
-	}, [selectedConfig.webhook_url, notifications, t]);
-
-	const onGoogleChatHandler = useCallback(async () => {
-		if (!validateGoogleChatConfig()) {
-			return { status: 'failed', statusMessage: t('channel_creation_failed') };
-		}
-
-		setSavingState(true);
-
-		try {
-			await createChannel({ data: prepareGoogleChatRequest(selectedConfig) });
-			notifications.success({
-				message: 'Success',
-				description: t('channel_creation_done'),
-			});
-			history.replace(ROUTES.ALL_CHANNELS);
-			return { status: 'success', statusMessage: t('channel_creation_done') };
-		} catch (error) {
-			showErrorModal(toAPIError(error as ErrorType<RenderErrorResponseDTO>));
-			return { status: 'failed', statusMessage: t('channel_creation_failed') };
-		} finally {
-			setSavingState(false);
-		}
-	}, [
-		validateGoogleChatConfig,
-		createChannel,
-		selectedConfig,
-		notifications,
-		t,
-		showErrorModal,
-	]);
-
 	const onSaveHandler = useCallback(
 		async (value: ChannelType) => {
 			if (!selectedConfig.name) {
@@ -451,7 +424,6 @@ function CreateAlertChannels({
 				[ChannelType.Opsgenie]: onOpsgenieHandler,
 				[ChannelType.MsTeams]: onMsTeamsHandler,
 				[ChannelType.Email]: onEmailHandler,
-				[ChannelType.GoogleChat]: onGoogleChatHandler,
 			};
 
 			if (isChannelType(value)) {
@@ -483,7 +455,6 @@ function CreateAlertChannels({
 			onOpsgenieHandler,
 			onMsTeamsHandler,
 			onEmailHandler,
-			onGoogleChatHandler,
 			notifications,
 			t,
 		],
@@ -521,13 +492,6 @@ function CreateAlertChannels({
 						request = prepareEmailRequest();
 						await testEmail(request);
 						break;
-					case ChannelType.GoogleChat:
-						if (!validateGoogleChatConfig()) {
-							setTestingState(false);
-							return;
-						}
-						await testChannel({ data: prepareGoogleChatRequest(selectedConfig) });
-						break;
 					default:
 						notifications.error({
 							message: 'Error',
@@ -549,11 +513,7 @@ function CreateAlertChannels({
 					status: 'Test success',
 				});
 			} catch (error) {
-				showErrorModal(
-					error instanceof APIError
-						? error
-						: toAPIError(error as ErrorType<RenderErrorResponseDTO>),
-				);
+				showErrorModal(error as APIError);
 
 				logEvent('Alert Channel: Test notification', {
 					type: channelType,
@@ -575,8 +535,6 @@ function CreateAlertChannels({
 			prepareSlackRequest,
 			prepareMsTeamsRequest,
 			prepareEmailRequest,
-			validateGoogleChatConfig,
-			testChannel,
 			notifications,
 		],
 	);
@@ -604,6 +562,9 @@ function CreateAlertChannels({
 					initialValue: {
 						type,
 						...selectedConfig,
+						...PagerInitialConfig,
+						...OpsgenieInitialConfig,
+						...EmailInitialConfig,
 					},
 				}}
 			/>

frontend/src/container/CreateAlertChannels/utils.ts

@@ -1,39 +1,4 @@
-import {
-	AlertmanagertypesPostableChannelDTO,
-	ConfigSecretURLDTO,
-} from 'api/generated/services/sigNoz.schemas';
-
-import { ChannelType, GoogleChatChannel } from './config';
+import { ChannelType } from './config';
 
 export const isChannelType = (type: string): type is ChannelType =>
 	Object.values(ChannelType).includes(type as ChannelType);
-
-const GOOGLE_CHAT_WEBHOOK_HOST = 'chat.googleapis.com';
-
-// the backend enforces the same two rules, this is only for a nicer error experience
-export const isValidGoogleChatWebhookURL = (url: string): boolean => {
-	try {
-		const { protocol, hostname } = new URL(url);
-		return (
-			protocol === 'https:' && hostname.toLowerCase() === GOOGLE_CHAT_WEBHOOK_HOST
-		);
-	} catch {
-		return false;
-	}
-};
-
-// create, update and test all send the same body shape
-export const prepareGoogleChatRequest = (
-	config: Partial<GoogleChatChannel>,
-): AlertmanagertypesPostableChannelDTO => ({
-	name: config.name || '',
-	googlechat_configs: [
-		{
-			// the generated type models go's config.SecretURL as an object, the api takes a string
-			webhook_url: (config.webhook_url || '') as unknown as ConfigSecretURLDTO,
-			title: config.title || '',
-			text: config.text || '',
-			send_resolved: config.send_resolved || false,
-		},
-	],
-});

frontend/src/container/EditAlertChannels/index.tsx

@@ -14,17 +14,10 @@ import testPagerApi from 'api/channels/testPager';
 import testSlackApi from 'api/channels/testSlack';
 import testWebhookApi from 'api/channels/testWebhook';
 import logEvent from 'api/common/logEvent';
-import {
-	useTestChannel,
-	useUpdateChannelByID,
-} from 'api/generated/services/channels';
-import { RenderErrorResponseDTO } from 'api/generated/services/sigNoz.schemas';
-import { ErrorType } from 'api/generatedAPIInstance';
 import ROUTES from 'constants/routes';
 import {
 	ChannelType,
 	EmailChannel,
-	GoogleChatChannel,
 	MsTeamsChannel,
 	OpsgenieChannel,
 	PagerChannel,
@@ -32,15 +25,10 @@ import {
 	ValidatePagerChannel,
 	WebhookChannel,
 } from 'container/CreateAlertChannels/config';
-import {
-	isValidGoogleChatWebhookURL,
-	prepareGoogleChatRequest,
-} from 'container/CreateAlertChannels/utils';
 import FormAlertChannels from 'container/FormAlertChannels';
 import { useNotifications } from 'hooks/useNotifications';
 import history from 'lib/history';
 import APIError from 'types/api/error';
-import { toAPIError } from 'utils/errorUtils';
 
 function EditAlertChannels({
 	initialValue,
@@ -57,8 +45,7 @@ function EditAlertChannels({
 				PagerChannel &
 				MsTeamsChannel &
 				OpsgenieChannel &
-				EmailChannel &
-				GoogleChatChannel
+				EmailChannel
 		>
 	>({
 		...initialValue,
@@ -67,26 +54,6 @@ function EditAlertChannels({
 	const [testingState, setTestingState] = useState<boolean>(false);
 	const { notifications } = useNotifications();
 
-	const { mutateAsync: updateChannel } = useUpdateChannelByID();
-	const { mutateAsync: testChannel } = useTestChannel();
-
-	const notifyError = useCallback(
-		(error: unknown): APIError => {
-			const apiError =
-				error instanceof APIError
-					? error
-					: toAPIError(error as ErrorType<RenderErrorResponseDTO>);
-
-			notifications.error({
-				message: apiError.getErrorCode(),
-				description: apiError.getErrorMessage(),
-			});
-
-			return apiError;
-		},
-		[notifications],
-	);
-
 	const [type, setType] = useState<ChannelType>(
 		initialValue?.type ? (initialValue.type as ChannelType) : ChannelType.Slack,
 	);
@@ -397,61 +364,6 @@ function EditAlertChannels({
 		}
 	}, [prepareMsTeamsRequest, t, notifications, selectedConfig]);
 
-	const validateGoogleChatConfig = useCallback((): string => {
-		if (!selectedConfig?.webhook_url) {
-			return t('webhook_url_required');
-		}
-
-		if (!isValidGoogleChatWebhookURL(selectedConfig.webhook_url)) {
-			return t('google_chat_webhook_url_invalid');
-		}
-
-		return '';
-	}, [selectedConfig, t]);
-
-	const onGoogleChatEditHandler = useCallback(async () => {
-		const validationError = validateGoogleChatConfig();
-
-		if (validationError !== '') {
-			notifications.error({
-				message: 'Error',
-				description: validationError,
-			});
-			return { status: 'failed', statusMessage: validationError };
-		}
-
-		setSavingState(true);
-
-		try {
-			await updateChannel({
-				pathParams: { id },
-				data: prepareGoogleChatRequest(selectedConfig),
-			});
-			notifications.success({
-				message: 'Success',
-				description: t('channel_edit_done'),
-			});
-			history.replace(ROUTES.ALL_CHANNELS);
-			return { status: 'success', statusMessage: t('channel_edit_done') };
-		} catch (error) {
-			const apiError = notifyError(error);
-			return {
-				status: 'failed',
-				statusMessage: apiError.getErrorMessage() || t('channel_edit_failed'),
-			};
-		} finally {
-			setSavingState(false);
-		}
-	}, [
-		validateGoogleChatConfig,
-		updateChannel,
-		id,
-		selectedConfig,
-		notifications,
-		notifyError,
-		t,
-	]);
-
 	const onSaveHandler = useCallback(
 		async (value: ChannelType) => {
 			let result;
@@ -467,8 +379,6 @@ function EditAlertChannels({
 				result = await onOpsgenieEditHandler();
 			} else if (value === ChannelType.Email) {
 				result = await onEmailEditHandler();
-			} else if (value === ChannelType.GoogleChat) {
-				result = await onGoogleChatEditHandler();
 			}
 			logEvent('Alert Channel: Save channel', {
 				type: value,
@@ -487,7 +397,6 @@ function EditAlertChannels({
 			onMsTeamsEditHandler,
 			onOpsgenieEditHandler,
 			onEmailEditHandler,
-			onGoogleChatEditHandler,
 		],
 	);
 
@@ -529,19 +438,6 @@ function EditAlertChannels({
 							await testEmail(request);
 						}
 						break;
-					case ChannelType.GoogleChat: {
-						const validationError = validateGoogleChatConfig();
-						if (validationError !== '') {
-							notifications.error({
-								message: 'Error',
-								description: validationError,
-							});
-							setTestingState(false);
-							return;
-						}
-						await testChannel({ data: prepareGoogleChatRequest(selectedConfig) });
-						break;
-					}
 					default:
 						notifications.error({
 							message: 'Error',
@@ -563,7 +459,10 @@ function EditAlertChannels({
 					status: 'Test success',
 				});
 			} catch (error) {
-				notifyError(error);
+				notifications.error({
+					message: (error as APIError).getErrorCode(),
+					description: (error as APIError).getErrorMessage(),
+				});
 				logEvent('Alert Channel: Test notification', {
 					type: channelType,
 					sendResolvedAlert: selectedConfig?.send_resolved,
@@ -577,9 +476,6 @@ function EditAlertChannels({
 		// eslint-disable-next-line react-hooks/exhaustive-deps
 		[
 			t,
-			notifyError,
-			validateGoogleChatConfig,
-			testChannel,
 			prepareWebhookRequest,
 			preparePagerRequest,
 			prepareSlackRequest,

frontend/src/container/FormAlertChannels/Settings/GoogleChat.tsx

@@ -1,82 +0,0 @@
-import { Dispatch, SetStateAction } from 'react';
-import { useTranslation } from 'react-i18next';
-import { Form, Input } from 'antd';
-import { MarkdownRenderer } from 'components/MarkdownRenderer/MarkdownRenderer';
-
-import { GoogleChatChannel } from '../../CreateAlertChannels/config';
-import { isValidGoogleChatWebhookURL } from '../../CreateAlertChannels/utils';
-
-function GoogleChat({ setSelectedConfig }: GoogleChatProps): JSX.Element {
-	const { t } = useTranslation('channels');
-
-	return (
-		<>
-			<Form.Item
-				name="webhook_url"
-				label={t('field_webhook_url')}
-				required
-				rules={[
-					{
-						validator: (_, value: string): Promise<void> =>
-							!value || isValidGoogleChatWebhookURL(value)
-								? Promise.resolve()
-								: Promise.reject(new Error(t('google_chat_webhook_url_invalid'))),
-					},
-				]}
-				tooltip={{
-					title: (
-						<MarkdownRenderer
-							markdownContent={t('tooltip_google_chat_url')}
-							variables={{}}
-						/>
-					),
-					overlayInnerStyle: { maxWidth: 400 },
-					placement: 'right',
-				}}
-			>
-				<Input
-					onChange={(event): void => {
-						setSelectedConfig((value) => ({
-							...value,
-							webhook_url: event.target.value,
-						}));
-					}}
-					data-testid="webhook-url-textbox"
-				/>
-			</Form.Item>
-
-			<Form.Item name="title" label={t('field_slack_title')}>
-				<Input.TextArea
-					rows={4}
-					onChange={(event): void =>
-						setSelectedConfig((value) => ({
-							...value,
-							title: event.target.value,
-						}))
-					}
-					data-testid="title-textarea"
-				/>
-			</Form.Item>
-
-			<Form.Item name="text" label={t('field_slack_description')}>
-				<Input.TextArea
-					rows={4}
-					onChange={(event): void =>
-						setSelectedConfig((value) => ({
-							...value,
-							text: event.target.value,
-						}))
-					}
-					data-testid="description-textarea"
-					placeholder={t('placeholder_slack_description')}
-				/>
-			</Form.Item>
-		</>
-	);
-}
-
-interface GoogleChatProps {
-	setSelectedConfig: Dispatch<SetStateAction<Partial<GoogleChatChannel>>>;
-}
-
-export default GoogleChat;

frontend/src/container/FormAlertChannels/index.tsx

@@ -9,7 +9,6 @@ import ROUTES from 'constants/routes';
 import {
 	ChannelType,
 	EmailChannel,
-	GoogleChatChannel,
 	OpsgenieChannel,
 	PagerChannel,
 	SlackChannel,
@@ -18,7 +17,6 @@ import {
 import history from 'lib/history';
 
 import EmailSettings from './Settings/Email';
-import GoogleChatSettings from './Settings/GoogleChat';
 import MsTeamsSettings from './Settings/MsTeams';
 import OpsgenieSettings from './Settings/Opsgenie';
 import PagerSettings from './Settings/Pager';
@@ -51,8 +49,6 @@ function FormAlertChannels({
 				return <PagerSettings setSelectedConfig={setSelectedConfig} />;
 			case ChannelType.MsTeams:
 				return <MsTeamsSettings setSelectedConfig={setSelectedConfig} />;
-			case ChannelType.GoogleChat:
-				return <GoogleChatSettings setSelectedConfig={setSelectedConfig} />;
 			case ChannelType.Opsgenie:
 				return <OpsgenieSettings setSelectedConfig={setSelectedConfig} />;
 			case ChannelType.Email:
@@ -133,14 +129,6 @@ function FormAlertChannels({
 						<Select.Option value="msteams" key="msteams" data-testid="select-option">
 							Microsoft Teams
 						</Select.Option>
-
-						<Select.Option
-							value="googlechat"
-							key="googlechat"
-							data-testid="select-option"
-						>
-							Google Chat
-						</Select.Option>
 					</Select>
 				</Form.Item>
 
@@ -188,8 +176,7 @@ interface FormAlertChannelsProps {
 					WebhookChannel &
 					PagerChannel &
 					OpsgenieChannel &
-					EmailChannel &
-					GoogleChatChannel
+					EmailChannel
 			>
 		>
 	>;

frontend/src/mocks-server/__mockdata__/alerts.ts

@@ -27,13 +27,9 @@ export const slackTitleDefaultValue = `[{{ .Status | toUpper }}{{ if eq .Status
 
 export const slackDescriptionDefaultValue = `{{ range .Alerts -}} *Alert:* {{ .Labels.alertname }}{{ if .Labels.severity }} - {{ .Labels.severity }}{{ end }} *Summary:* {{ .Annotations.summary }} *Description:* {{ .Annotations.description }} *RelatedLogs:* {{ if gt (len .Annotations.related_logs) 0 -}} View in <{{ .Annotations.related_logs }}|logs explorer> {{- end}} *RelatedTraces:* {{ if gt (len .Annotations.related_traces) 0 -}} View in <{{ .Annotations.related_traces }}|traces explorer> {{- end}} *Details:* {{ range .Labels.SortedPairs }} • *{{ .Name }}:* {{ .Value }} {{ end }} {{ end }}`;
 
-export const googleChatTitleDefaultValue = `[{{ .Status | toUpper }}{{ if eq .Status "firing" }}:{{ .Alerts.Firing | len }}{{ end }}] {{ .CommonLabels.alertname }}`;
-
-export const googleChatDescriptionDefaultValue = `{{ range .Alerts -}} **Alert:** {{ .Labels.alertname }}{{ if .Labels.severity }} ({{ .Labels.severity }}){{ end }}{{ if .Annotations.summary }} **Summary:** {{ .Annotations.summary }}{{ end }}{{ if .Annotations.description }} **Description:** {{ .Annotations.description }}{{ end }} {{ end }}`;
-
 export const editSlackDescriptionDefaultValue = `{{ range .Alerts -}} *Alert:* {{ .Labels.alertname }}{{ if .Labels.severity }} - {{ .Labels.severity }}{{ end }} dummy_summary *Summary:* {{ .Annotations.summary }} *Description:* {{ .Annotations.description }} *Details:* {{ range .Labels.SortedPairs }} • *{{ .Name }}:* {{ .Value }} {{ end }} {{ end }}`;
 
-export const pagerDutyDescriptionDefaultValue = `[{{ .Status | toUpper }}{{ if eq .Status "firing" }}:{{ .Alerts.Firing | len }}{{ end }}] {{ .CommonLabels.alertname }} for {{ .CommonLabels.job }} {{- if gt (len .CommonLabels) (len .GroupLabels) -}} {{" "}}( {{- with .CommonLabels.Remove .GroupLabels.Names }} {{- range $index, $label := .SortedPairs -}} {{ if $index }}, {{ end }} {{- $label.Name }}="{{ $label.Value -}}" {{- end }} {{- end -}} ) {{- end }}`;
+export const pagerDutyDescriptionDefaultVaule = `{{ if gt (len .Alerts.Firing) 0 -}} Alerts Firing: {{ range .Alerts.Firing }} - Message: {{ .Annotations.description }} Labels: {{ range .Labels.SortedPairs }} - {{ .Name }} = {{ .Value }} {{ end }} Annotations: {{ range .Annotations.SortedPairs }} - {{ .Name }} = {{ .Value }} {{ end }} Source: {{ .GeneratorURL }} {{ end }} {{- end }} {{ if gt (len .Alerts.Resolved) 0 -}} Alerts Resolved: {{ range .Alerts.Resolved }} - Message: {{ .Annotations.description }} Labels: {{ range .Labels.SortedPairs }} - {{ .Name }} = {{ .Value }} {{ end }} Annotations: {{ range .Annotations.SortedPairs }} - {{ .Name }} = {{ .Value }} {{ end }} Source: {{ .GeneratorURL }} {{ end }} {{- end }}`;
 
 export const pagerDutyAdditionalDetailsDefaultValue = JSON.stringify({
 	firing: `{{ .Alerts.Firing | toJson }}`,

frontend/src/pages/ChannelsEdit/index.tsx

@@ -10,7 +10,6 @@ import Spinner from 'components/Spinner';
 import ROUTES from 'constants/routes';
 import {
 	ChannelType,
-	GoogleChatChannel,
 	MsTeamsChannel,
 	PagerChannel,
 	SlackChannel,
@@ -60,20 +59,11 @@ function ChannelsEdit(): JSX.Element {
 
 	const prepChannelConfig = (): {
 		type: string;
-		channel: SlackChannel &
-			WebhookChannel &
-			PagerChannel &
-			MsTeamsChannel &
-			GoogleChatChannel;
+		channel: SlackChannel & WebhookChannel & PagerChannel & MsTeamsChannel;
 	} => {
-		let channel: SlackChannel &
-			WebhookChannel &
-			PagerChannel &
-			MsTeamsChannel &
-			GoogleChatChannel = {
+		let channel: SlackChannel & WebhookChannel & PagerChannel & MsTeamsChannel = {
 			name: '',
 		};
-
 		if (value && 'slack_configs' in value) {
 			const slackConfig = value.slack_configs[0];
 			channel = slackConfig;
@@ -91,16 +81,6 @@ function ChannelsEdit(): JSX.Element {
 				channel,
 			};
 		}
-
-		if (value && 'googlechat_configs' in value) {
-			const [googleChatConfig] = value.googlechat_configs;
-			channel = googleChatConfig;
-			return {
-				type: ChannelType.GoogleChat,
-				channel,
-			};
-		}
-
 		if (value && 'pagerduty_configs' in value) {
 			const pagerConfig = value.pagerduty_configs[0];
 			channel = pagerConfig;

pkg/modules/dashboard/impldashboard/v2_module.go

@@ -20,6 +20,7 @@ func (m *module) CreateV2(ctx context.Context, orgID valuer.UUID, createdBy stri
 	}
 
 	dashboard := postable.NewDashboardV2(orgID, createdBy, source)
+	var storableDashboard *dashboardtypes.StorableDashboard
 
 	err := m.store.RunInTx(ctx, func(ctx context.Context) error {
 		resolvedTags, err := m.tagModule.SyncTags(ctx, orgID, coretypes.KindDashboard, dashboard.ID, postable.Tags)
@@ -32,13 +33,14 @@ func (m *module) CreateV2(ctx context.Context, orgID valuer.UUID, createdBy stri
 		if err != nil {
 			return err
 		}
+		storableDashboard = storable
 		return m.store.Create(ctx, storable)
 	})
 	if err != nil {
 		return nil, err
 	}
 
-	m.analytics.TrackUser(ctx, orgID.String(), creator.String(), "Dashboard Created", dashboardtypes.NewStatsFromPostableDashboardV2(postable))
+	m.analytics.TrackUser(ctx, orgID.String(), creator.String(), "Dashboard Created", dashboardtypes.NewStatsFromStorableDashboards([]*dashboardtypes.StorableDashboard{storableDashboard}))
 	return dashboard, nil
 }
 

pkg/statementbuilder/aistatementbuilder/statement_builder.go

@@ -49,20 +49,21 @@ func Scope() scopedtraces.TraceScope {
 	str := telemetrytypes.FieldDataTypeString
 	columns := append(scopedtraces.CommonTraceColumns(),
 		// LLM calls only (request model present), not the full gate.
-		scopedtraces.TraceColumn{Alias: "llm_call_count", Orderable: true, Expr: scopedtraces.CountExists(&reqModel)},
-		scopedtraces.TraceColumn{Alias: "tool_call_count", Orderable: true, Expr: scopedtraces.CountExists(&toolName)},
-		scopedtraces.TraceColumn{Alias: "distinct_tool_count", Orderable: true, Expr: scopedtraces.UniqCount(&toolName, str)},
+		scopedtraces.TraceColumn{Alias: "llm_call_count", Orderable: true, Filterable: true, Expr: scopedtraces.CountExists(&reqModel)},
+		scopedtraces.TraceColumn{Alias: "tool_call_count", Orderable: true, Filterable: true, Expr: scopedtraces.CountExists(&toolName)},
+		scopedtraces.TraceColumn{Alias: "distinct_tool_count", Orderable: true, Filterable: true, Expr: scopedtraces.UniqCount(&toolName, str)},
 		// tokens live only on LLM spans, so a plain sum needs no gate scoping.
-		scopedtraces.TraceColumn{Alias: "input_tokens", Orderable: true, Expr: scopedtraces.Reduce(scopedtraces.AggSum, &inTok)},
-		scopedtraces.TraceColumn{Alias: "output_tokens", Orderable: true, Expr: scopedtraces.Reduce(scopedtraces.AggSum, &outTok)},
-		scopedtraces.TraceColumn{Alias: "total_tokens", Orderable: true, Expr: scopedtraces.SumOfKeys(telemetrytypes.FieldDataTypeFloat64, &inTok, &outTok)},
+		scopedtraces.TraceColumn{Alias: "input_tokens", Orderable: true, Filterable: true, Expr: scopedtraces.Reduce(scopedtraces.AggSum, &inTok)},
+		scopedtraces.TraceColumn{Alias: "output_tokens", Orderable: true, Filterable: true, Expr: scopedtraces.Reduce(scopedtraces.AggSum, &outTok)},
+		scopedtraces.TraceColumn{Alias: "total_tokens", Orderable: true, Filterable: true, Expr: scopedtraces.SumOfKeys(telemetrytypes.FieldDataTypeFloat64, &inTok, &outTok)},
 		// per-span cost attached by the SigNoz LLM pricing processor.
-		scopedtraces.TraceColumn{Alias: "estimated_total_cost", Orderable: true, Expr: scopedtraces.Reduce(scopedtraces.AggSum, &cost)},
+		scopedtraces.TraceColumn{Alias: "estimated_total_cost", Orderable: true, Filterable: true, Expr: scopedtraces.Reduce(scopedtraces.AggSum, &cost)},
 		// slowest single LLM call in the trace.
-		scopedtraces.TraceColumn{Alias: "max_llm_duration_nano", Orderable: true, Expr: scopedtraces.ScopedToKeyColumn(scopedtraces.AggMax, scopedtraces.IntrinsicSpanKey("duration_nano"), &reqModel)},
+		scopedtraces.TraceColumn{Alias: "max_llm_duration_nano", Orderable: true, Filterable: true, Expr: scopedtraces.ScopedToKeyColumn(scopedtraces.AggMax, scopedtraces.IntrinsicSpanKey("duration_nano"), &reqModel)},
 		// errors across the whole trace (any span), so display-only.
 		scopedtraces.TraceColumn{Alias: "error_count", Expr: scopedtraces.CondCount(scopedtraces.IntrinsicSpanKey("has_error"), qbtypes.FilterOperatorEqual, true)},
-		// timestamp of the last gen_ai span (LLM/tool/agent), hence gate-scoped.
+		// timestamp of the last gen_ai span (LLM/tool/agent), hence gate-scoped;
+		// order-only: a raw-nanos threshold makes no sense in the filter bar.
 		scopedtraces.TraceColumn{Alias: "last_activity_time", Orderable: true, Expr: scopedtraces.ScopedReduce(scopedtraces.AggMax, scopedtraces.IntrinsicSpanKey("timestamp"))},
 		// previews: first call's input (the prompt), last call's output (the answer).
 		scopedtraces.TraceColumn{Alias: "input", SpanLevel: true, Expr: scopedtraces.PickBy(&inMsg, str, scopedtraces.IntrinsicSpanKey("timestamp"), scopedtraces.PickEarliest)},
@@ -76,3 +77,22 @@ func Scope() scopedtraces.TraceScope {
 		DefaultOrderAlias: "last_activity_time",
 	}
 }
+
+// MetadataFieldKeys returns the aggregates the metadata store surfaces as trace-context
+// keys for builder_ai_query suggestions; only filterable columns qualify.
+func MetadataFieldKeys() []*telemetrytypes.TelemetryFieldKey {
+	cols := Scope().Columns
+	keys := make([]*telemetrytypes.TelemetryFieldKey, 0, len(cols))
+	for _, c := range cols {
+		if !c.Orderable || !c.Filterable {
+			continue
+		}
+		keys = append(keys, &telemetrytypes.TelemetryFieldKey{
+			Name:          c.Alias,
+			Signal:        telemetrytypes.SignalTraces,
+			FieldContext:  telemetrytypes.FieldContextTrace,
+			FieldDataType: telemetrytypes.FieldDataTypeFloat64,
+		})
+	}
+	return keys
+}

pkg/statementbuilder/scopedtracesstatementbuilder/scope.go

@@ -23,10 +23,9 @@ type TraceColumn struct {
 	// Alias must not reuse a physical span-index column name (e.g. duration_nano):
 	// ClickHouse resolves bare identifiers to same-SELECT aliases first, so any
 	// expression referencing that column would silently bind to the alias.
-	Alias string
-	// Orderable columns can be used in ORDER BY and the aggregate filter; all-span
-	// aggregates are display-only and set false.
-	Orderable bool
+	Alias      string
+	Orderable  bool
+	Filterable bool
 	// SpanLevel columns surface a real span/resource attribute; a filter on them is
 	// applied span-level, so they are excluded from the trace-level aliases.
 	SpanLevel bool

pkg/statementbuilder/scopedtracesstatementbuilder/statement_builder.go

@@ -185,18 +185,19 @@ func (b *scopedTraceStatementBuilder) buildTraceListQuery(
 		return nil, err
 	}
 	orderableSet := orderableAliasSet(resolved)
+	filterableSet := filterableAliasSet(resolved)
 
 	resourceFrag, resourceArgs, resourcePred, err := b.maybeAttachResourceFilter(ctx, orgID, query, start, end, variables)
 	if err != nil {
 		return nil, err
 	}
 
-	fp, err := b.splitFilter(ctx, orgID, query, b.aggregateAliasSet(), orderableSet, start, end, variables, matchedSB)
+	fp, err := b.splitFilter(ctx, orgID, query, b.aggregateAliasSet(), filterableSet, start, end, variables, matchedSB)
 	if err != nil {
 		return nil, err
 	}
 
-	matchedFrag, matchedArgs, err := b.buildMatchedCTE(matchedSB, start, end, startBucket, endBucket, resolved, orders, orderableSet, maskExpr, fp, resourcePred, limit, query.Offset)
+	matchedFrag, matchedArgs, err := b.buildMatchedCTE(matchedSB, start, end, startBucket, endBucket, resolved, orders, orderableSet, filterableSet, maskExpr, fp, resourcePred, limit, query.Offset)
 	if err != nil {
 		return nil, err
 	}
@@ -326,9 +327,10 @@ func (b *scopedTraceStatementBuilder) resolveMask(ctx context.Context, orgID val
 }
 
 type resolvedColumn struct {
-	alias     string
-	expr      string
-	orderable bool
+	alias      string
+	expr       string
+	orderable  bool
+	filterable bool
 }
 
 func (b *scopedTraceStatementBuilder) resolveColumns(ctx context.Context, orgID valuer.UUID, start, end uint64, cols *columnResolver, preds *predicateResolver) ([]resolvedColumn, error) {
@@ -338,7 +340,7 @@ func (b *scopedTraceStatementBuilder) resolveColumns(ctx context.Context, orgID
 		if err != nil {
 			return nil, err
 		}
-		out = append(out, resolvedColumn{alias: c.Alias, expr: expr, orderable: c.Orderable})
+		out = append(out, resolvedColumn{alias: c.Alias, expr: expr, orderable: c.Orderable, filterable: c.Filterable})
 	}
 	return out, nil
 }
@@ -393,7 +395,7 @@ type filterParts struct {
 // splitFilter splits query.Filter into a span-level predicate (args bound into sb)
 // and a trace-level HAVING (explicit query.Having ANDed on), then validates the
 // trace-level part against the matched-pass aggregates.
-func (b *scopedTraceStatementBuilder) splitFilter(ctx context.Context, orgID valuer.UUID, query qbtypes.QueryBuilderQuery[qbtypes.TraceAggregation], classifySet, orderableSet map[string]struct{}, start, end uint64, variables map[string]qbtypes.VariableItem, sb *sqlbuilder.SelectBuilder) (filterParts, error) {
+func (b *scopedTraceStatementBuilder) splitFilter(ctx context.Context, orgID valuer.UUID, query qbtypes.QueryBuilderQuery[qbtypes.TraceAggregation], classifySet, filterableSet map[string]struct{}, start, end uint64, variables map[string]qbtypes.VariableItem, sb *sqlbuilder.SelectBuilder) (filterParts, error) {
 	var fp filterParts
 	if query.Filter != nil && strings.TrimSpace(query.Filter.Expression) != "" {
 		spanExpr, traceExpr, err := querybuilder.SplitFilterForAggregates(query.Filter.Expression, classifySet)
@@ -429,7 +431,7 @@ func (b *scopedTraceStatementBuilder) splitFilter(ctx context.Context, orgID val
 		}
 		fp.havingExpr = replaced
 	}
-	if err := validateAggregateFilter(fp.havingExpr, orderableSet); err != nil {
+	if err := validateAggregateFilter(fp.havingExpr, filterableSet); err != nil {
 		return fp, err
 	}
 	return fp, nil
@@ -473,7 +475,7 @@ func (b *scopedTraceStatementBuilder) resolveSpanPredicate(ctx context.Context,
 // span filter + HAVING + ORDER BY + LIMIT/OFFSET, selecting only the aliases ORDER BY
 // / HAVING reference. Expressions carry $n markers bound to sb, so each can appear
 // several times and every occurrence resolves to the same arg.
-func (b *scopedTraceStatementBuilder) buildMatchedCTE(sb *sqlbuilder.SelectBuilder, start, end, startBucket, endBucket uint64, resolved []resolvedColumn, orders []listOrder, orderableSet map[string]struct{}, maskExpr string, fp filterParts, resourcePred string, limit, offset int) (string, []any, error) {
+func (b *scopedTraceStatementBuilder) buildMatchedCTE(sb *sqlbuilder.SelectBuilder, start, end, startBucket, endBucket uint64, resolved []resolvedColumn, orders []listOrder, orderableSet, filterableSet map[string]struct{}, maskExpr string, fp filterParts, resourcePred string, limit, offset int) (string, []any, error) {
 	needed := neededMatchedAliases(orders, fp.havingExpr, orderableSet)
 	selects := []string{"trace_id"}
 	for _, rc := range resolved {
@@ -513,8 +515,8 @@ func (b *scopedTraceStatementBuilder) buildMatchedCTE(sb *sqlbuilder.SelectBuild
 	}
 	if strings.TrimSpace(fp.havingExpr) != "" {
 		// the rewriter matches raw key text, so map the trace. form alongside the bare name
-		columnMap := make(map[string]string, len(orderableSet)*2)
-		for a := range orderableSet {
+		columnMap := make(map[string]string, len(filterableSet)*2)
+		for a := range filterableSet {
 			columnMap[a] = quoteAlias(a)
 			columnMap[telemetrytypes.FieldContextTrace.StringValue()+"."+a] = quoteAlias(a)
 		}
@@ -603,6 +605,17 @@ func orderableAliasSet(resolved []resolvedColumn) map[string]struct{} {
 	return set
 }
 
+// filterableAliasSet is the subset of aliases usable in the trace-level filter.
+func filterableAliasSet(resolved []resolvedColumn) map[string]struct{} {
+	set := make(map[string]struct{})
+	for _, rc := range resolved {
+		if rc.filterable {
+			set[rc.alias] = struct{}{}
+		}
+	}
+	return set
+}
+
 // neededMatchedAliases is the minimal alias set the matched pass must select: those
 // in ORDER BY plus those in the aggregate HAVING.
 func neededMatchedAliases(orders []listOrder, havingExpr string, orderableSet map[string]struct{}) map[string]struct{} {
@@ -630,19 +643,19 @@ func traceAggregateNames(havingExpr string) []string {
 	return names
 }
 
-// validateAggregateFilter rejects a trace-level filter referencing an aggregate not
-// computable in the matched pass.
-func validateAggregateFilter(havingExpr string, orderableSet map[string]struct{}) error {
+// validateAggregateFilter rejects a trace-level filter referencing an aggregate that
+// is not filterable.
+func validateAggregateFilter(havingExpr string, filterableSet map[string]struct{}) error {
 	if strings.TrimSpace(havingExpr) == "" {
 		return nil
 	}
-	allowed := make([]string, 0, len(orderableSet))
-	for a := range orderableSet {
+	allowed := make([]string, 0, len(filterableSet))
+	for a := range filterableSet {
 		allowed = append(allowed, a)
 	}
 	sort.Strings(allowed)
 	for _, name := range traceAggregateNames(havingExpr) {
-		if _, ok := orderableSet[name]; !ok {
+		if _, ok := filterableSet[name]; !ok {
 			return errors.NewInvalidInputf(errors.CodeInvalidInput,
 				"aggregate %q cannot be used in the trace-list filter; filterable aggregates: %s", name, strings.Join(allowed, ", "))
 		}

pkg/telemetrymetadata/metadata.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"log/slog"
+	"slices"
 	"strings"
 	"time"
 
@@ -14,6 +15,7 @@ import (
 	"github.com/SigNoz/signoz/pkg/factory"
 	"github.com/SigNoz/signoz/pkg/flagger"
 	"github.com/SigNoz/signoz/pkg/querybuilder"
+	"github.com/SigNoz/signoz/pkg/statementbuilder/aistatementbuilder"
 	"github.com/SigNoz/signoz/pkg/telemetryschema/audittelemetryschema"
 	"github.com/SigNoz/signoz/pkg/telemetryschema/logstelemetryschema"
 	"github.com/SigNoz/signoz/pkg/telemetryschema/metertelemetryschema"
@@ -159,6 +161,13 @@ func (t *telemetryMetaStore) getTracesKeys(ctx context.Context, fieldKeySelector
 		instrumentationtypes.CodeFunctionName: "getTracesKeys",
 	})
 
+	// The trace field context never matches ingested keys — it names the computed
+	// per-trace aggregates, which enrichWithAITraceAggregateKeys serves. Without this
+	// the tagType condition below has no branch for it and the scan returns every key.
+	fieldKeySelectors = slices.DeleteFunc(slices.Clone(fieldKeySelectors), func(s *telemetrytypes.FieldKeySelector) bool {
+		return s.FieldContext == telemetrytypes.FieldContextTrace
+	})
+
 	if len(fieldKeySelectors) == 0 {
 		return nil, true, nil
 	}
@@ -1168,6 +1177,31 @@ func enrichWithIntrinsicMetricKeys(keys map[string][]*telemetrytypes.TelemetryFi
 	return keys
 }
 
+// enrichWithAITraceAggregateKeys adds the computed per-trace aggregate keys for
+// builder_ai_query selectors; they are never ingested, so the scan cannot serve them.
+func enrichWithAITraceAggregateKeys(keys map[string][]*telemetrytypes.TelemetryFieldKey, selectors []*telemetrytypes.FieldKeySelector) map[string][]*telemetrytypes.TelemetryFieldKey {
+	defs := aistatementbuilder.MetadataFieldKeys()
+	matched := make(map[string]*telemetrytypes.TelemetryFieldKey)
+	for _, selector := range selectors {
+		if selector.QueryType != qbtypes.QueryTypeBuilderAI.StringValue() {
+			continue
+		}
+		if selector.Signal != telemetrytypes.SignalTraces && selector.Signal != telemetrytypes.SignalUnspecified {
+			continue
+		}
+		for _, def := range defs {
+			if selectorMatchesIntrinsicField(selector, *def) {
+				matched[def.Name] = def
+			}
+		}
+	}
+
+	for name, def := range matched {
+		keys[name] = append(keys[name], def)
+	}
+	return keys
+}
+
 // enrichWithGenAIKeys adds keys that can be queried for GenAI signals, even though they have not been ingested yet.
 func enrichWithGenAIKeys(keys map[string][]*telemetrytypes.TelemetryFieldKey, selectors []*telemetrytypes.FieldKeySelector) map[string][]*telemetrytypes.TelemetryFieldKey {
 	for _, selector := range selectors {
@@ -1276,6 +1310,7 @@ func (t *telemetryMetaStore) GetKeys(ctx context.Context, orgID valuer.UUID, fie
 	mapOfKeys = enrichWithIntrinsicMetricKeys(mapOfKeys, selectors)
 	if t.fl.BooleanOrEmpty(ctx, flagger.FeatureEnableAIObservability, featuretypes.NewFlaggerEvaluationContext(orgID)) {
 		mapOfKeys = enrichWithGenAIKeys(mapOfKeys, selectors)
+		mapOfKeys = enrichWithAITraceAggregateKeys(mapOfKeys, selectors)
 	}
 
 	return mapOfKeys, complete, nil
@@ -1357,6 +1392,7 @@ func (t *telemetryMetaStore) GetKeysMulti(ctx context.Context, orgID valuer.UUID
 	mapOfKeys = enrichWithIntrinsicMetricKeys(mapOfKeys, fieldKeySelectors)
 	if t.fl.BooleanOrEmpty(ctx, flagger.FeatureEnableAIObservability, featuretypes.NewFlaggerEvaluationContext(orgID)) {
 		mapOfKeys = enrichWithGenAIKeys(mapOfKeys, fieldKeySelectors)
+		mapOfKeys = enrichWithAITraceAggregateKeys(mapOfKeys, fieldKeySelectors)
 	}
 
 	return mapOfKeys, complete, nil

pkg/types/dashboardtypes/dashboard.go

@@ -176,6 +176,69 @@ func NewGettableDashboardFromDashboard(dashboard *Dashboard) (*GettableDashboard
 	}, nil
 }
 
+func NewStatsFromStorableDashboards(dashboards []*StorableDashboard) map[string]any {
+	stats := make(map[string]any)
+	stats["dashboard.panels.count"] = int64(0)
+	stats["dashboard.panels.traces.count"] = int64(0)
+	stats["dashboard.panels.metrics.count"] = int64(0)
+	stats["dashboard.panels.logs.count"] = int64(0)
+	for _, dashboard := range dashboards {
+		addStatsFromStorableDashboard(dashboard, stats)
+	}
+
+	stats["dashboard.count"] = int64(len(dashboards))
+	return stats
+}
+
+func addStatsFromStorableDashboard(dashboard *StorableDashboard, stats map[string]any) {
+	if dashboard.Data == nil {
+		return
+	}
+
+	if dashboard.Data["widgets"] == nil {
+		return
+	}
+
+	widgets, ok := dashboard.Data["widgets"]
+	if !ok {
+		return
+	}
+
+	data, ok := widgets.([]interface{})
+	if !ok {
+		return
+	}
+
+	for _, widget := range data {
+		sData, ok := widget.(map[string]interface{})
+		if ok && sData["query"] != nil {
+			stats["dashboard.panels.count"] = stats["dashboard.panels.count"].(int64) + 1
+			query, ok := sData["query"].(map[string]interface{})
+			if ok && query["queryType"] == "builder" && query["builder"] != nil {
+				builderData, ok := query["builder"].(map[string]interface{})
+				if ok && builderData["queryData"] != nil {
+					builderQueryData, ok := builderData["queryData"].([]interface{})
+					if ok {
+						for _, queryData := range builderQueryData {
+							data, ok := queryData.(map[string]interface{})
+							if ok {
+								switch data["dataSource"] {
+								case "traces":
+									stats["dashboard.panels.traces.count"] = stats["dashboard.panels.traces.count"].(int64) + 1
+								case "metrics":
+									stats["dashboard.panels.metrics.count"] = stats["dashboard.panels.metrics.count"].(int64) + 1
+								case "logs":
+									stats["dashboard.panels.logs.count"] = stats["dashboard.panels.logs.count"].(int64) + 1
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
 func (storableDashboardData *StorableDashboardData) GetWidgetIds() []string {
 	data := *storableDashboardData
 	widgetIds := []string{}

pkg/types/dashboardtypes/perses_dashboard_stats.go

@@ -1,90 +0,0 @@
-package dashboardtypes
-
-import (
-	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
-)
-
-const (
-	statKeyDashboardCount    = "dashboard.count"
-	statKeyPanelCount        = "dashboard.panels.count"
-	statKeyPanelTracesCount  = "dashboard.panels.traces.count"
-	statKeyPanelMetricsCount = "dashboard.panels.metrics.count"
-	statKeyPanelLogsCount    = "dashboard.panels.logs.count"
-)
-
-// panelSignalStatKeys maps a builder query's signal to the stat it contributes
-// to. Signal-less queries (promql, clickhouse sql, formulas) count towards the
-// panel total only.
-var panelSignalStatKeys = map[telemetrytypes.Signal]string{
-	telemetrytypes.SignalTraces:  statKeyPanelTracesCount,
-	telemetrytypes.SignalMetrics: statKeyPanelMetricsCount,
-	telemetrytypes.SignalLogs:    statKeyPanelLogsCount,
-}
-
-// NewStatsFromStorableDashboards reports the stats of stored dashboards. Rows that
-// do not decode as v2 contribute to dashboard.count only.
-func NewStatsFromStorableDashboards(dashboards []*StorableDashboard) map[string]any {
-	stats := newPanelStats()
-
-	for _, dashboard := range dashboards {
-		if dashboard == nil {
-			continue
-		}
-		dashboardV2, err := dashboard.ToDashboardV2(nil)
-		if err != nil {
-			continue
-		}
-		addPanelStats(&dashboardV2.Spec, stats)
-	}
-
-	stats[statKeyDashboardCount] = int64(len(dashboards))
-	return stats
-}
-
-// NewStatsFromPostableDashboardV2 reports the stats of a dashboard as it is
-// created, straight off the postable spec — the create path has no reason to make
-// a storable round-trip just to be counted.
-func NewStatsFromPostableDashboardV2(postable PostableDashboardV2) map[string]any {
-	stats := newPanelStats()
-	addPanelStats(&postable.Spec, stats)
-
-	stats[statKeyDashboardCount] = int64(1)
-	return stats
-}
-
-func newPanelStats() map[string]any {
-	return map[string]any{
-		statKeyPanelCount:        int64(0),
-		statKeyPanelTracesCount:  int64(0),
-		statKeyPanelMetricsCount: int64(0),
-		statKeyPanelLogsCount:    int64(0),
-	}
-}
-
-// addPanelStats counts the panels of a v2 spec, and each panel's queries against
-// the signal they read.
-func addPanelStats(spec *DashboardSpec, stats map[string]any) {
-	for _, panel := range spec.Panels {
-		if panel == nil {
-			continue
-		}
-		incrementStat(stats, statKeyPanelCount)
-
-		for _, query := range panel.Spec.Queries {
-			composite, err := query.Spec.Plugin.buildV5CompositeQueryFromPlugin()
-			if err != nil {
-				continue
-			}
-			for _, envelope := range composite.Queries {
-				if key, ok := panelSignalStatKeys[envelope.GetSignal()]; ok {
-					incrementStat(stats, key)
-				}
-			}
-		}
-	}
-}
-
-func incrementStat(stats map[string]any, key string) {
-	count, _ := stats[key].(int64)
-	stats[key] = count + 1
-}

pkg/types/dashboardtypes/perses_dashboard_stats_test.go

@@ -1,220 +0,0 @@
-package dashboardtypes
-
-import (
-	"encoding/json"
-	"testing"
-
-	"github.com/SigNoz/signoz/pkg/types"
-	"github.com/SigNoz/signoz/pkg/valuer"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func statsSpecJSON(panelsJSON string) string {
-	return `{
-		"display": {"name": "Stats Dashboard"},
-		"variables": [],
-		"panels": {` + panelsJSON + `},
-		"layouts": [],
-		"links": []
-	}`
-}
-
-// newStatsStorableV2 builds a stored v2 row from a panels JSON fragment, going
-// through the untyped data blob the way a row read off the DB does.
-func newStatsStorableV2(t *testing.T, panelsJSON string) *StorableDashboard {
-	t.Helper()
-
-	raw := `{
-		"metadata": {"schemaVersion": "` + SchemaVersion + `"},
-		"spec": ` + statsSpecJSON(panelsJSON) + `
-	}`
-
-	var data StorableDashboardData
-	require.NoError(t, json.Unmarshal([]byte(raw), &data))
-
-	return &StorableDashboard{
-		Identifiable: types.Identifiable{ID: valuer.GenerateUUID()},
-		OrgID:        valuer.GenerateUUID(),
-		Source:       SourceUser,
-		Name:         "stats-dashboard",
-		Data:         data,
-	}
-}
-
-func newStatsPostableV2(t *testing.T, panelsJSON string) PostableDashboardV2 {
-	t.Helper()
-
-	var spec DashboardSpec
-	require.NoError(t, json.Unmarshal([]byte(statsSpecJSON(panelsJSON)), &spec))
-
-	return PostableDashboardV2{
-		DashboardV2MetadataBase: DashboardV2MetadataBase{SchemaVersion: SchemaVersion},
-		Name:                    "stats-dashboard",
-		Spec:                    spec,
-	}
-}
-
-func statsPanel(queriesJSON string) string {
-	return `{
-		"kind": "Panel",
-		"spec": {
-			"links": [],
-			"plugin": {"kind": "signoz/TimeSeriesPanel", "spec": {}},
-			"queries": [` + queriesJSON + `]
-		}
-	}`
-}
-
-// A panel holds a single query, so its name never matters to the assertions.
-func statsBuilderQuery(signal string) string {
-	return `{
-		"kind": "time_series",
-		"spec": {"plugin": {"kind": "signoz/BuilderQuery", "spec": ` + statsBuilderQuerySpec("A", signal) + `}}
-	}`
-}
-
-func statsBuilderQuerySpec(name, signal string) string {
-	aggregations := `[{"expression": "count()"}]`
-	if signal == "metrics" {
-		aggregations = `[{"metricName": "m", "timeAggregation": "rate", "spaceAggregation": "sum"}]`
-	}
-	return `{"name": "` + name + `", "signal": "` + signal + `", "aggregations": ` + aggregations + `}`
-}
-
-func TestNewStatsFromStorableDashboardsCountsV2Panels(t *testing.T) {
-	dashboard := newStatsStorableV2(t, `
-		"p1": `+statsPanel(statsBuilderQuery("logs"))+`,
-		"p2": `+statsPanel(statsBuilderQuery("metrics"))+`,
-		"p3": `+statsPanel(statsBuilderQuery("traces"))+`
-	`)
-
-	stats := NewStatsFromStorableDashboards([]*StorableDashboard{dashboard})
-
-	assert.Equal(t, int64(1), stats[statKeyDashboardCount])
-	assert.Equal(t, int64(3), stats[statKeyPanelCount])
-	assert.Equal(t, int64(1), stats[statKeyPanelLogsCount])
-	assert.Equal(t, int64(1), stats[statKeyPanelMetricsCount])
-	assert.Equal(t, int64(1), stats[statKeyPanelTracesCount])
-}
-
-// A panel carries exactly one query envelope, so multi-signal panels arrive as a
-// composite: the panel counts once and every builder sub-query counts its signal.
-func TestNewStatsFromStorableDashboardsCountsCompositeSubQueries(t *testing.T) {
-	composite := `{
-		"kind": "time_series",
-		"spec": {"plugin": {"kind": "signoz/CompositeQuery", "spec": {"queries": [
-			{"type": "builder_query", "spec": ` + statsBuilderQuerySpec("A", "traces") + `},
-			{"type": "builder_query", "spec": ` + statsBuilderQuerySpec("B", "logs") + `}
-		]}}}
-	}`
-	dashboard := newStatsStorableV2(t, `"p1": `+statsPanel(composite))
-
-	stats := NewStatsFromStorableDashboards([]*StorableDashboard{dashboard})
-
-	assert.Equal(t, int64(1), stats[statKeyPanelCount])
-	assert.Equal(t, int64(1), stats[statKeyPanelTracesCount])
-	assert.Equal(t, int64(1), stats[statKeyPanelLogsCount])
-}
-
-// promql and clickhouse queries carry no signal, so they land in the panel total
-// and nowhere else.
-func TestNewStatsFromStorableDashboardsIgnoresSignallessQueries(t *testing.T) {
-	promql := `{
-		"kind": "time_series",
-		"spec": {"plugin": {"kind": "signoz/PromQLQuery", "spec": {"name": "A", "query": "up"}}}
-	}`
-	dashboard := newStatsStorableV2(t, `"p1": `+statsPanel(promql))
-
-	stats := NewStatsFromStorableDashboards([]*StorableDashboard{dashboard})
-
-	assert.Equal(t, int64(1), stats[statKeyPanelCount])
-	assert.Equal(t, int64(0), stats[statKeyPanelTracesCount])
-	assert.Equal(t, int64(0), stats[statKeyPanelMetricsCount])
-	assert.Equal(t, int64(0), stats[statKeyPanelLogsCount])
-}
-
-func TestNewStatsFromStorableDashboardsAggregatesAcrossDashboards(t *testing.T) {
-	first := newStatsStorableV2(t, `"p1": `+statsPanel(statsBuilderQuery("logs")))
-	second := newStatsStorableV2(t, `
-		"p1": `+statsPanel(statsBuilderQuery("logs"))+`,
-		"p2": `+statsPanel(statsBuilderQuery("traces"))+`
-	`)
-
-	stats := NewStatsFromStorableDashboards([]*StorableDashboard{first, second})
-
-	assert.Equal(t, int64(2), stats[statKeyDashboardCount])
-	assert.Equal(t, int64(3), stats[statKeyPanelCount])
-	assert.Equal(t, int64(2), stats[statKeyPanelLogsCount])
-	assert.Equal(t, int64(1), stats[statKeyPanelTracesCount])
-}
-
-// v1 rows are counted as dashboards but contribute no panel stats — the counters
-// read the v2 spec only.
-func TestNewStatsFromStorableDashboardsSkipsNonV2Rows(t *testing.T) {
-	v1 := &StorableDashboard{
-		Identifiable: types.Identifiable{ID: valuer.GenerateUUID()},
-		OrgID:        valuer.GenerateUUID(),
-		Source:       SourceUser,
-		Name:         "legacy-dashboard",
-		Data: StorableDashboardData{
-			"title":   "Legacy Title",
-			"version": "v5",
-			"widgets": []any{
-				map[string]any{"query": map[string]any{
-					"queryType": "builder",
-					"builder": map[string]any{
-						"queryData": []any{map[string]any{"dataSource": "logs"}},
-					},
-				}},
-			},
-		},
-	}
-	empty := &StorableDashboard{
-		Identifiable: types.Identifiable{ID: valuer.GenerateUUID()},
-		OrgID:        valuer.GenerateUUID(),
-		Source:       SourceUser,
-		Name:         "bare",
-	}
-
-	stats := NewStatsFromStorableDashboards([]*StorableDashboard{v1, empty})
-
-	assert.Equal(t, int64(2), stats[statKeyDashboardCount])
-	assert.Equal(t, int64(0), stats[statKeyPanelCount])
-	assert.Equal(t, int64(0), stats[statKeyPanelLogsCount])
-}
-
-// The create path counts off the postable spec, so it never round-trips through a
-// storable to be counted.
-func TestNewStatsFromPostableDashboardV2(t *testing.T) {
-	postable := newStatsPostableV2(t, `
-		"p1": `+statsPanel(statsBuilderQuery("logs"))+`,
-		"p2": `+statsPanel(statsBuilderQuery("traces"))+`
-	`)
-
-	stats := NewStatsFromPostableDashboardV2(postable)
-
-	assert.Equal(t, int64(1), stats[statKeyDashboardCount])
-	assert.Equal(t, int64(2), stats[statKeyPanelCount])
-	assert.Equal(t, int64(1), stats[statKeyPanelLogsCount])
-	assert.Equal(t, int64(1), stats[statKeyPanelTracesCount])
-	assert.Equal(t, int64(0), stats[statKeyPanelMetricsCount])
-}
-
-func TestNewStatsFromPostableDashboardV2WithNoPanels(t *testing.T) {
-	stats := NewStatsFromPostableDashboardV2(newStatsPostableV2(t, ``))
-
-	assert.Equal(t, int64(1), stats[statKeyDashboardCount])
-	assert.Equal(t, int64(0), stats[statKeyPanelCount])
-	assert.Equal(t, int64(0), stats[statKeyPanelLogsCount])
-}
-
-func TestNewStatsFromStorableDashboardsWithNoDashboards(t *testing.T) {
-	stats := NewStatsFromStorableDashboards(nil)
-
-	assert.Equal(t, int64(0), stats[statKeyDashboardCount])
-	assert.Equal(t, int64(0), stats[statKeyPanelCount])
-	assert.Equal(t, int64(0), stats[statKeyPanelTracesCount])
-	assert.Equal(t, int64(0), stats[statKeyPanelMetricsCount])
-	assert.Equal(t, int64(0), stats[statKeyPanelLogsCount])
-}

pkg/types/telemetrytypes/field.go

@@ -238,6 +238,7 @@ type FieldKeySelector struct {
 	EndUnixMilli      int64                  `json:"endUnixMilli"`
 	Signal            Signal                 `json:"signal"`
 	Source            Source                 `json:"source"`
+	QueryType         string                 `json:"queryType"`
 	FieldContext      FieldContext           `json:"fieldContext"`
 	FieldDataType     FieldDataType          `json:"fieldDataType"`
 	Name              string                 `json:"name"`
@@ -261,6 +262,7 @@ type GettableFieldKeys struct {
 type PostableFieldKeysParams struct {
 	Signal          Signal        `query:"signal"`
 	Source          Source        `query:"source"`
+	Type            string        `query:"type"`
 	Limit           int           `query:"limit"`
 	StartUnixMilli  int64         `query:"startUnixMilli"`
 	EndUnixMilli    int64         `query:"endUnixMilli"`
@@ -297,6 +299,7 @@ func NewFieldKeySelectorFromPostableFieldKeysParams(params PostableFieldKeysPara
 
 	req.Signal = params.Signal
 	req.Source = params.Source
+	req.QueryType = params.Type
 	req.FieldContext = params.FieldContext
 	req.FieldDataType = params.FieldDataType
 	req.SelectorMatchType = FieldSelectorMatchTypeFuzzy

tests/integration/tests/querierai/03_ai_metadata.py

@@ -0,0 +1,79 @@
+"""Fields metadata API with type="builder_ai_query": gen_ai attributes and per-trace
+aggregate keys are served pre-ingestion, behind the conftest's AI observability flag."""
+
+from collections.abc import Callable
+from http import HTTPStatus
+
+import pytest
+import requests
+
+from fixtures import types
+from fixtures.auth import USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD
+
+AI_TRACE_AGGREGATES = {
+    "llm_call_count",
+    "tool_call_count",
+    "distinct_tool_count",
+    "input_tokens",
+    "output_tokens",
+    "total_tokens",
+    "estimated_total_cost",
+    "max_llm_duration_nano",
+}
+
+
+@pytest.fixture(name="get_keys")
+def get_keys_fixture(
+    signoz: types.SigNoz,
+    create_user_admin: None,  # pylint: disable=unused-argument
+    get_token: Callable[[str, str], str],
+) -> Callable[[dict], dict]:
+    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
+
+    def get_keys(params: dict) -> dict:
+        response = requests.get(
+            signoz.self.host_configs["8080"].get("/api/v1/fields/keys"),
+            timeout=5,
+            headers={"authorization": f"Bearer {token}"},
+            params={"signal": "traces", **params},
+        )
+        assert response.status_code == HTTPStatus.OK, response.text
+        assert response.json()["status"] == "success"
+        return response.json()["data"]["keys"]
+
+    return get_keys
+
+
+def trace_context_names(keys: dict) -> set:
+    return {name for name, variants in keys.items() if any(k["fieldContext"] == "trace" for k in variants)}
+
+
+def test_ai_fields_trace_context_lists_only_aggregates(get_keys: Callable[[dict], dict]) -> None:
+    """fieldContext=trace (the order-by picker request) returns exactly the
+    filterable aggregates — the ingested-key scan must not leak into it."""
+    keys = get_keys({"type": "builder_ai_query", "fieldContext": "trace"})
+    assert set(keys.keys()) == AI_TRACE_AGGREGATES, keys
+    assert trace_context_names(keys) == AI_TRACE_AGGREGATES
+
+
+def test_ai_fields_trace_prefix_search(get_keys: Callable[[dict], dict]) -> None:
+    """`trace.output` in the filter bar parses into the trace context and suggests
+    the matching aggregate."""
+    keys = get_keys({"type": "builder_ai_query", "searchText": "trace.output"})
+    assert trace_context_names(keys) == {"output_tokens"}, keys
+
+
+def test_ai_fields_bare_prefix_suggests_both_classes(get_keys: Callable[[dict], dict]) -> None:
+    """A bare prefix suggests the aggregate and the gen_ai span attribute side by side."""
+    keys = get_keys({"type": "builder_ai_query", "searchText": "output_tok"})
+    assert "output_tokens" in trace_context_names(keys), keys
+    assert "gen_ai.usage.output_tokens" in keys, keys
+    assert any(k["fieldContext"] == "attribute" for k in keys["gen_ai.usage.output_tokens"])
+
+
+def test_ai_fields_aggregates_require_ai_query_type(get_keys: Callable[[dict], dict]) -> None:
+    """Without type=builder_ai_query the aggregates are not suggested; the gen_ai
+    attributes still are (flag-gated, not query-type-gated)."""
+    keys = get_keys({"searchText": "output_tok"})
+    assert not trace_context_names(keys), keys
+    assert "gen_ai.usage.output_tokens" in keys, keys

tests/integration/tests/querierai/conftest.py

@@ -0,0 +1,35 @@
+import pytest
+from testcontainers.core.container import Network
+
+from fixtures import types
+from fixtures.signoz import create_signoz
+
+
+@pytest.fixture(name="signoz", scope="package")
+def signoz_ai(
+    network: Network,
+    zeus: types.TestContainerDocker,
+    gateway: types.TestContainerDocker,
+    sqlstore: types.TestContainerSQL,
+    clickhouse: types.TestContainerClickhouse,
+    request: pytest.FixtureRequest,
+    pytestconfig: pytest.Config,
+) -> types.SigNoz:
+    """
+    Package-scoped SigNoz with AI observability enabled: the metadata store surfaces
+    the gen_ai semconv keys and the trace-aggregate suggestion keys only behind this
+    flag, so the querierai suite runs against a flag-enabled instance.
+    """
+    return create_signoz(
+        network=network,
+        zeus=zeus,
+        gateway=gateway,
+        sqlstore=sqlstore,
+        clickhouse=clickhouse,
+        request=request,
+        pytestconfig=pytestconfig,
+        cache_key="signoz-ai",
+        env_overrides={
+            "SIGNOZ_FLAGGER_CONFIG_BOOLEAN_ENABLE__AI__OBSERVABILITY": True,
+        },
+    )