fix: handle the type check instead of mis casting

- Numeric/bool span attributes read from the JSON column now cast with
  accurateCastOrNull instead of accurateCastOrDefault: an absent path or a
  same-named key stored as another type reads NULL rather than erroring
  (::Nullable(Bool) throws on a non-bool string; a bare ::Int64/::Bool cast
  throws on any collision), and the straddle multiIf else stays NULL.
- Keeping absent as NULL is what positive operators and EXISTS need — the
  exists guard excludes it. Defaulting the value/multiIf else to the type zero
  broke that guard in the straddle window (a `= 0`/`= false` comparison, and
  EXISTS/NOT EXISTS, matched an absent-in-both-homes key).
- Negative operators carry no guard, so the condition builder folds the NULL to
  the Map's type zero (ifNull) for negative numeric/bool attribute ops only;
  string needs no fold since ::String already reads absent as ''.

Assisted-by: Claude Opus 4.8

docs/contributing/tests/integration.md

@@ -256,7 +256,7 @@ Tests can be configured using pytest options:
 - `--sqlite-mode` — SQLite journal mode: `delete` or `wal` (default: `delete`). Only relevant when `--sqlstore-provider=sqlite`.
 - `--postgres-version` — PostgreSQL version (default: `15`)
 - `--clickhouse-version` — ClickHouse version, also used for ClickHouse Keeper (default: `25.12.5`)
-- `--schema-migrator-version` — SigNoz schema migrator version (default: `v0.144.6`)
+- `--schema-migrator-version` — SigNoz schema migrator version (default: `v0.144.9`)
 - `--with-web` — Build the frontend into the SigNoz image (required for e2e)
 
 Example:

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

@@ -26,55 +26,6 @@
   "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_jira_site": "Site URL",
-  "tooltip_jira_site": "Your Jira Cloud base URL, e.g. https://your-domain.atlassian.net. Only Jira Cloud is supported.",
-  "jira_site_invalid": "Site URL must be an https URL on an atlassian.net domain",
-  "jira_required_fields": "Site URL, email, API token, project and issue type are required",
-  "jira_service_account_tip": "Recommended: use a Jira service account so alerts aren't reported under a personal name and the channel keeps working when someone leaves.",
-  "jira_service_account_tip_link": "Learn how",
-  "field_jira_email": "Email",
-  "help_jira_email": "The Atlassian account email used for authentication.",
-  "field_jira_api_token": "API token",
-  "help_jira_api_token": "Create one at id.atlassian.com under Security → API tokens.",
-  "field_jira_project": "Project key",
-  "field_jira_issue_type": "Issue type",
-  "help_jira_issue_type": "An issue type that exists in the project, e.g. Task, Bug or Incident.",
-  "field_jira_summary": "Summary (issue title)",
-  "help_jira_summary": "Template for the Jira issue title.",
-  "field_jira_description": "Description",
-  "help_jira_description": "Template for the issue description. Rendered as rich text with a status panel and links back to SigNoz.",
-  "jira_advanced_section": "Advanced Options",
-  "field_jira_priority": "Priority",
-  "placeholder_jira_priority": "Leave empty to use the project default",
-  "help_jira_priority": "Must match a priority in the project's scheme, e.g. High.",
-  "field_jira_labels": "Labels",
-  "placeholder_jira_labels": "Type a label and press Enter",
-  "help_jira_labels": "signoz and a deduplication label are added automatically.",
-  "field_jira_resolve_transition": "Resolve transition",
-  "field_jira_reopen_transition": "Reopen transition",
-  "help_jira_resolve_transition": "When the alert resolves, SigNoz moves the Jira issue to a \"Done\" status via a workflow transition. This is auto-detected — leave it empty unless your project has more than one \"Done\" transition (e.g. Done vs. Won't Do) and you want to force a specific one by name.",
-  "help_jira_reopen_transition": "When a resolved alert fires again (within the reopen window), SigNoz moves the issue back out of \"Done\" to an active status via a workflow transition. This is auto-detected — leave it empty unless you want to force a specific one by name (e.g. To Do or Reopen).",
-  "placeholder_jira_resolve_transition": "Auto-detected, e.g. Done",
-  "placeholder_jira_reopen_transition": "Auto-detected, e.g. To Do",
-  "field_jira_reopen_duration": "Reopen window",
-  "placeholder_jira_reopen_duration": "e.g. 72h",
-  "help_jira_reopen_duration": "If a resolved alert fires again within this window, the same ticket is reopened; after the window, a re-fire opens a new ticket instead. Default: 3d.",
-  "tooltip_jira_reopen_duration": "Accepted units: m (minutes), h (hours), d (days), w (weeks), y (years) — e.g. 30m, 72h or 3d. Minimum 1m.",
-  "jira_reopen_duration_invalid": "Reopen window must be a duration like 30m, 72h or 3d (minimum 1m)",
-  "jsmops_tip": "Create an API integration on your JSM team's Operations page and paste its key below.",
-  "jsmops_tip_link": "Learn how",
-  "field_jsmops_api_key": "API key",
-  "help_jsmops_api_key": "The JSM Ops integration API key, from your team's Operations → Integrations → API. Make sure the integration is turned on.",
-  "field_jsmops_message": "Message (alert title)",
-  "help_jsmops_message": "Template for the alert title. Truncated to 130 characters.",
-  "field_jsmops_description": "Description",
-  "help_jsmops_description": "Template for the alert description. Rendered as rich text; kept under 15,000 characters.",
-  "jsmops_advanced_section": "Advanced Options",
-  "field_jsmops_priority": "Priority",
-  "help_jsmops_priority": "Template resolving to one of P1–P5. Leave as-is to map from alert severity.",
-  "field_jsmops_tags": "Tags",
-  "placeholder_jsmops_tags": "Type a tag and press Enter",
-  "help_jsmops_tags": "Tags added to every alert.",
 
   "field_slack_recipient": "Recipient",
   "field_slack_title": "Title",

frontend/public/locales/en/channels.json

@@ -26,55 +26,6 @@
   "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_jira_site": "Site URL",
-  "tooltip_jira_site": "Your Jira Cloud base URL, e.g. https://your-domain.atlassian.net. Only Jira Cloud is supported.",
-  "jira_site_invalid": "Site URL must be an https URL on an atlassian.net domain",
-  "jira_required_fields": "Site URL, email, API token, project and issue type are required",
-  "jira_service_account_tip": "Recommended: use a Jira service account so alerts aren't reported under a personal name and the channel keeps working when someone leaves.",
-  "jira_service_account_tip_link": "Learn how",
-  "field_jira_email": "Email",
-  "help_jira_email": "The Atlassian account email used for authentication.",
-  "field_jira_api_token": "API token",
-  "help_jira_api_token": "Create one at id.atlassian.com under Security → API tokens.",
-  "field_jira_project": "Project key",
-  "field_jira_issue_type": "Issue type",
-  "help_jira_issue_type": "An issue type that exists in the project, e.g. Task, Bug or Incident.",
-  "field_jira_summary": "Summary (issue title)",
-  "help_jira_summary": "Template for the Jira issue title.",
-  "field_jira_description": "Description",
-  "help_jira_description": "Template for the issue description. Rendered as rich text with a status panel and links back to SigNoz.",
-  "jira_advanced_section": "Advanced Options",
-  "field_jira_priority": "Priority",
-  "placeholder_jira_priority": "Leave empty to use the project default",
-  "help_jira_priority": "Must match a priority in the project's scheme, e.g. High.",
-  "field_jira_labels": "Labels",
-  "placeholder_jira_labels": "Type a label and press Enter",
-  "help_jira_labels": "signoz and a deduplication label are added automatically.",
-  "field_jira_resolve_transition": "Resolve transition",
-  "field_jira_reopen_transition": "Reopen transition",
-  "help_jira_resolve_transition": "When the alert resolves, SigNoz moves the Jira issue to a \"Done\" status via a workflow transition. This is auto-detected — leave it empty unless your project has more than one \"Done\" transition (e.g. Done vs. Won't Do) and you want to force a specific one by name.",
-  "help_jira_reopen_transition": "When a resolved alert fires again (within the reopen window), SigNoz moves the issue back out of \"Done\" to an active status via a workflow transition. This is auto-detected — leave it empty unless you want to force a specific one by name (e.g. To Do or Reopen).",
-  "placeholder_jira_resolve_transition": "Auto-detected, e.g. Done",
-  "placeholder_jira_reopen_transition": "Auto-detected, e.g. To Do",
-  "field_jira_reopen_duration": "Reopen window",
-  "placeholder_jira_reopen_duration": "e.g. 72h",
-  "help_jira_reopen_duration": "If a resolved alert fires again within this window, the same ticket is reopened; after the window, a re-fire opens a new ticket instead. Default: 3d.",
-  "tooltip_jira_reopen_duration": "Accepted units: m (minutes), h (hours), d (days), w (weeks), y (years) — e.g. 30m, 72h or 3d. Minimum 1m.",
-  "jira_reopen_duration_invalid": "Reopen window must be a duration like 30m, 72h or 3d (minimum 1m)",
-  "jsmops_tip": "Create an API integration on your JSM team's Operations page and paste its key below.",
-  "jsmops_tip_link": "Learn how",
-  "field_jsmops_api_key": "API key",
-  "help_jsmops_api_key": "The JSM Ops integration API key, from your team's Operations → Integrations → API. Make sure the integration is turned on.",
-  "field_jsmops_message": "Message (alert title)",
-  "help_jsmops_message": "Template for the alert title. Truncated to 130 characters.",
-  "field_jsmops_description": "Description",
-  "help_jsmops_description": "Template for the alert description. Rendered as rich text; kept under 15,000 characters.",
-  "jsmops_advanced_section": "Advanced Options",
-  "field_jsmops_priority": "Priority",
-  "help_jsmops_priority": "Template resolving to one of P1–P5. Leave as-is to map from alert severity.",
-  "field_jsmops_tags": "Tags",
-  "placeholder_jsmops_tags": "Type a tag and press Enter",
-  "help_jsmops_tags": "Tags added to every alert.",
   "field_slack_recipient": "Recipient",
   "field_slack_title": "Title",
   "field_slack_description": "Description",

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

@@ -1,10 +1,6 @@
 import CreateAlertChannels from 'container/CreateAlertChannels';
 import { ChannelType } from 'container/CreateAlertChannels/config';
-import {
-	GoogleChatInitialConfig,
-	JiraInitialConfig,
-	JsmOpsInitialConfig,
-} from 'container/CreateAlertChannels/defaults';
+import { GoogleChatInitialConfig } from 'container/CreateAlertChannels/defaults';
 import {
 	googleChatDescriptionDefaultValue,
 	googleChatTitleDefaultValue,
@@ -530,213 +526,6 @@ describe('Create Alert Channel', () => {
 				});
 			});
 		});
-		describe('Jira', () => {
-			const validSite = 'https://acme.atlassian.net';
-
-			const fillRequired = async (
-				user: ReturnType<typeof userEvent.setup>,
-				site: string,
-			): Promise<void> => {
-				await user.type(screen.getByTestId('channel-name-textbox'), 'jira-channel');
-				await user.type(screen.getByTestId('jira-site-textbox'), site);
-				await user.type(screen.getByTestId('jira-email-textbox'), 'me@acme.com');
-				await user.type(screen.getByTestId('jira-api-token-textbox'), 'tok123');
-				await user.type(screen.getByTestId('jira-project-textbox'), 'KAN');
-			};
-
-			beforeEach(() => {
-				render(<CreateAlertChannels preType={ChannelType.Jira} />);
-			});
-
-			it('Should check if the selected item in the type dropdown has text "Jira"', () => {
-				expect(screen.getByText('Jira')).toBeInTheDocument();
-			});
-
-			it('Should check if the Site URL field is displayed properly', () => {
-				testLabelInputAndHelpValue({
-					labelText: 'field_jira_site',
-					testId: 'jira-site-textbox',
-				});
-			});
-
-			it('Should prefill the issue type with Task', () => {
-				expect(screen.getByTestId('jira-issue-type-textbox')).toHaveValue('Task');
-			});
-
-			it('Should show the service-account recommendation tip linking to the docs', () => {
-				expect(screen.getByTestId('jira-service-account-tip')).toBeInTheDocument();
-				expect(
-					screen.getByRole('link', { name: 'jira_service_account_tip_link' }),
-				).toHaveAttribute(
-					'href',
-					'https://signoz.io/docs/alerts-management/notification-channel/jira/#use-a-service-account-recommended',
-				);
-			});
-
-			it('Should display an error when the site is not an atlassian.net URL', async () => {
-				const user = userEvent.setup({ delay: null });
-				await fillRequired(user, 'https://example.com');
-
-				await user.click(screen.getByTestId('save-channel-button'));
-
-				await waitFor(() =>
-					expect(errorNotification).toHaveBeenCalledWith({
-						message: 'Error',
-						description: 'jira_site_invalid',
-					}),
-				);
-			});
-
-			it('Should send a jira_configs payload with basic auth', 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({ delay: null });
-				await fillRequired(user, validSite);
-
-				await user.click(screen.getByTestId('save-channel-button'));
-
-				await waitFor(() =>
-					expect(successNotification).toHaveBeenCalledWith({
-						message: 'Success',
-						description: 'channel_creation_done',
-					}),
-				);
-
-				expect(requestBody).toStrictEqual({
-					name: 'jira-channel',
-					jira_configs: [
-						{
-							site: validSite,
-							project: 'KAN',
-							issue_type: 'Task',
-							summary: JiraInitialConfig.summary,
-							description: JiraInitialConfig.description,
-							send_resolved: true,
-							http_config: {
-								basic_auth: { username: 'me@acme.com', password: 'tok123' },
-							},
-						},
-					],
-				});
-			}, 15000);
-
-			it('Should block save when the reopen window is below the 1m minimum', async () => {
-				const user = userEvent.setup({ delay: null });
-				await fillRequired(user, validSite);
-
-				await user.click(screen.getByText('jira_advanced_section'));
-				await user.type(screen.getByTestId('jira-reopen-duration-textbox'), '30s');
-
-				// the rule surfaces an inline message, not just a red border
-				await expect(
-					screen.findByText('jira_reopen_duration_invalid'),
-				).resolves.toBeInTheDocument();
-
-				await user.click(screen.getByTestId('save-channel-button'));
-
-				await waitFor(() =>
-					expect(errorNotification).toHaveBeenCalledWith({
-						message: 'Error',
-						description: 'jira_reopen_duration_invalid',
-					}),
-				);
-			}, 15000);
-		});
-		describe('JSM Ops', () => {
-			beforeEach(() => {
-				render(<CreateAlertChannels preType={ChannelType.JsmOps} />);
-			});
-
-			it('Should show "Jira Service Management Ops" as the selected type', () => {
-				expect(screen.getByText('Jira Service Management Ops')).toBeInTheDocument();
-			});
-
-			it('Should display the API key field properly', () => {
-				testLabelInputAndHelpValue({
-					labelText: 'field_jsmops_api_key',
-					testId: 'jsmops-api-key-textbox',
-				});
-			});
-
-			it('Should show the tip linking to the JSM Ops docs', () => {
-				expect(screen.getByTestId('jsmops-tip')).toBeInTheDocument();
-				expect(
-					screen.getByRole('link', { name: 'jsmops_tip_link' }),
-				).toHaveAttribute(
-					'href',
-					'https://signoz.io/docs/alerts-management/notification-channel/jsm-ops/',
-				);
-			});
-
-			it('Should block save when the API key is missing', async () => {
-				const user = userEvent.setup();
-				await user.type(
-					screen.getByTestId('channel-name-textbox'),
-					'jsmops-channel',
-				);
-
-				await user.click(screen.getByTestId('save-channel-button'));
-
-				await waitFor(() =>
-					expect(errorNotification).toHaveBeenCalledWith({
-						message: 'Error',
-						description: 'api_key_required',
-					}),
-				);
-			});
-
-			it('Should send a jsmops_configs payload with prefilled defaults', 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'),
-					'jsmops-channel',
-				);
-				await user.type(screen.getByTestId('jsmops-api-key-textbox'), 'key-abc');
-
-				await user.click(screen.getByTestId('save-channel-button'));
-
-				await waitFor(() =>
-					expect(successNotification).toHaveBeenCalledWith({
-						message: 'Success',
-						description: 'channel_creation_done',
-					}),
-				);
-
-				expect(requestBody).toStrictEqual({
-					name: 'jsmops-channel',
-					jsmops_configs: [
-						{
-							api_key: 'key-abc',
-							send_resolved: true,
-							message: JsmOpsInitialConfig.message,
-							description: JsmOpsInitialConfig.description,
-							priority: JsmOpsInitialConfig.priority,
-							tags: JsmOpsInitialConfig.tags?.join(','),
-						},
-					],
-				});
-			});
-		});
 		describe('Changing the channel type', () => {
 			async function selectType(
 				user: ReturnType<typeof userEvent.setup>,

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

@@ -58,38 +58,6 @@ describe('EditAlertChannels save', () => {
 		expect(edit.calls[0].id).toBe('3');
 	});
 
-	it('blocks jira save when the reopen window is below the 1m minimum', async () => {
-		const edit = mockEditChannel();
-		const jiraInitialValue = {
-			type: 'jira',
-			name: 'jira-channel',
-			site: 'https://acme.atlassian.net',
-			username: 'user@acme.io',
-			password: 'token',
-			project: 'OPS',
-			issue_type: 'Task',
-			send_resolved: true,
-			reopen_duration: '30s',
-		};
-
-		const { unmount } = render(
-			<EditAlertChannels channelId="3" initialValue={jiraInitialValue} />,
-		);
-		const user = userEvent.setup();
-		await user.click(screen.getByTestId('save-channel-button'));
-		expect(edit.calls).toHaveLength(0);
-		unmount();
-
-		render(
-			<EditAlertChannels
-				channelId="3"
-				initialValue={{ ...jiraInitialValue, reopen_duration: '72h' }}
-			/>,
-		);
-		await user.click(screen.getByTestId('save-channel-button'));
-		await waitFor(() => expect(edit.calls).toHaveLength(1));
-	});
-
 	it('persists send_resolved toggle in the edit request', async () => {
 		const edit = mockEditChannel();
 		render(

frontend/src/container/CreateAlertChannels/config.ts

@@ -105,8 +105,6 @@ export enum ChannelType {
 	Opsgenie = 'opsgenie',
 	MsTeams = 'msteams',
 	GoogleChat = 'googlechat',
-	Jira = 'jira',
-	JsmOps = 'jsmops',
 }
 
 // LabelFilterStatement will be used for preparing filter conditions / matchers
@@ -136,39 +134,3 @@ export interface GoogleChatChannel extends Channel {
 	title?: string;
 	text?: string;
 }
-
-// JiraChannel configures the Jira Cloud alert channel. Auth is basic auth
-// (Atlassian account email + API token) carried in username / password.
-export interface JiraChannel extends Channel {
-	// Jira Cloud base URL, e.g. https://acme.atlassian.net
-	site: string;
-	project: string;
-	issue_type: string;
-	// issue title template
-	summary?: string;
-	// issue body template, rendered to rich text server-side
-	description?: string;
-	// basic auth: username is the Atlassian account email, password is the API token
-	username: string;
-	password: string;
-	priority?: string;
-	labels?: string[];
-	resolve_transition?: string;
-	reopen_transition?: string;
-	// duration string, e.g. 72h or 3d
-	reopen_duration?: string;
-}
-
-// JsmOpsChannel configures the Jira Service Management Ops alert channel
-// (ex-Opsgenie alert API). Auth is the JSM integration API key.
-export interface JsmOpsChannel extends Channel {
-	api_key: string;
-	// alert title template
-	message?: string;
-	// alert body template (markdown, rendered to HTML server-side)
-	description?: string;
-	// priority template, resolves to P1-P5
-	priority?: string;
-	// tags, joined to a comma-separated string for the backend
-	tags?: string[];
-}

frontend/src/container/CreateAlertChannels/defaults.ts

@@ -2,8 +2,6 @@ import {
 	ChannelType,
 	EmailChannel,
 	GoogleChatChannel,
-	JiraChannel,
-	JsmOpsChannel,
 	MsTeamsChannel,
 	OpsgenieChannel,
 	PagerChannel,
@@ -49,23 +47,6 @@ export const GoogleChatInitialConfig: Partial<GoogleChatChannel> = {
 {{ end }}`,
 };
 
-// mirrors DefaultJiraSummaryTemplate / DefaultJiraDescriptionTemplate in
-// pkg/types/alertmanagertypes/jira.go, which the backend applies when the
-// summary / description are left empty. The description is markdown here and is
-// wrapped in the ADF status panel + deep-links server-side.
-export const JiraInitialConfig: Partial<JiraChannel> = {
-	issue_type: 'Task',
-	summary: `[{{ .Status | toUpper }}{{ if eq .Status "firing" }}:{{ .Alerts.Firing | len }}{{ end }}] {{ .CommonLabels.alertname }}`,
-	description: `{{ 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 PagerInitialConfig: Partial<PagerChannel> = {
 	description: `[{{ .Status | toUpper }}{{ if eq .Status "firing" }}:{{ .Alerts.Firing | len }}{{ end }}] {{ .CommonLabels.alertname }} for {{ .CommonLabels.job }}
 	{{- if gt (len .CommonLabels) (len .GroupLabels) -}}
@@ -117,33 +98,6 @@ export const OpsgenieInitialConfig: Partial<OpsgenieChannel> = {
 		'{{ if eq (index .Alerts 0).Labels.severity "critical" }}P1{{ else if eq (index .Alerts 0).Labels.severity "warning" }}P2{{ else if eq (index .Alerts 0).Labels.severity "info" }}P3{{ else }}P4{{ end }}',
 };
 
-// mirrors DefaultJSMOpsMessageTemplate / DefaultJSMOpsDescriptionTemplate in
-// pkg/types/alertmanagertypes/jsmops.go, applied by the backend when message /
-// description are left empty. send_resolved is seeded on so JSM alerts close on
-// resolve (the backend cannot default it, see jsmops.go). priority mirrors the
-// Opsgenie template mapping severity to P1-P5.
-export const JsmOpsInitialConfig: Partial<JsmOpsChannel> = {
-	send_resolved: true,
-	message: `[{{ .Status | toUpper }}{{ if eq .Status "firing" }}:{{ .Alerts.Firing | len }}{{ end }}] {{ .CommonLabels.alertname }}`,
-	description: `{{ 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 }}{{ if .GeneratorURL }}[View in SigNoz]({{ .GeneratorURL }})
-
-{{ end }}{{ if .Annotations.related_logs }}[View related logs]({{ .Annotations.related_logs }})
-
-{{ end }}{{ if .Annotations.related_traces }}[View related traces]({{ .Annotations.related_traces }})
-
-{{ end }}{{ end }}`,
-	priority:
-		'{{ if eq (index .Alerts 0).Labels.severity "critical" }}P1{{ else if eq (index .Alerts 0).Labels.severity "warning" }}P2{{ else if eq (index .Alerts 0).Labels.severity "info" }}P3{{ else }}P4{{ end }}',
-	tags: ['signoz-alert'],
-};
-
 export const EmailInitialConfig: Partial<EmailChannel> = {
 	send_resolved: true,
 	html: `<!--
@@ -551,16 +505,12 @@ export const ChannelInitialConfig: Record<
 			MsTeamsChannel &
 			OpsgenieChannel &
 			EmailChannel &
-			GoogleChatChannel &
-			JiraChannel &
-			JsmOpsChannel
+			GoogleChatChannel
 	>
 > = {
 	[ChannelType.Slack]: SlackInitialConfig,
 	[ChannelType.MsTeams]: SlackInitialConfig,
 	[ChannelType.GoogleChat]: GoogleChatInitialConfig,
-	[ChannelType.Jira]: JiraInitialConfig,
-	[ChannelType.JsmOps]: JsmOpsInitialConfig,
 	[ChannelType.Pagerduty]: PagerInitialConfig,
 	[ChannelType.Opsgenie]: OpsgenieInitialConfig,
 	[ChannelType.Email]: EmailInitialConfig,

frontend/src/container/CreateAlertChannels/index.tsx

@@ -32,8 +32,6 @@ import {
 	ChannelType,
 	EmailChannel,
 	GoogleChatChannel,
-	JiraChannel,
-	JsmOpsChannel,
 	MsTeamsChannel,
 	OpsgenieChannel,
 	PagerChannel,
@@ -45,11 +43,7 @@ import { ChannelInitialConfig } from './defaults';
 import {
 	isChannelType,
 	isValidGoogleChatWebhookURL,
-	isValidJiraReopenDuration,
-	isValidJiraSiteURL,
 	prepareGoogleChatRequest,
-	prepareJiraRequest,
-	prepareJsmOpsRequest,
 } from './utils';
 
 import './CreateAlertChannels.styles.scss';
@@ -75,9 +69,7 @@ function CreateAlertChannels({
 				MsTeamsChannel &
 				OpsgenieChannel &
 				EmailChannel &
-				GoogleChatChannel &
-				JiraChannel &
-				JsmOpsChannel
+				GoogleChatChannel
 		>
 	>(() => ({
 		send_resolved: true,
@@ -442,114 +434,6 @@ function CreateAlertChannels({
 		showErrorModal,
 	]);
 
-	const validateJiraConfig = useCallback((): boolean => {
-		if (
-			!selectedConfig.site ||
-			!selectedConfig.username ||
-			!selectedConfig.password ||
-			!selectedConfig.project ||
-			!selectedConfig.issue_type
-		) {
-			notifications.error({
-				message: 'Error',
-				description: t('jira_required_fields'),
-			});
-			return false;
-		}
-
-		if (!isValidJiraSiteURL(selectedConfig.site)) {
-			notifications.error({
-				message: 'Error',
-				description: t('jira_site_invalid'),
-			});
-			return false;
-		}
-
-		if (
-			selectedConfig.reopen_duration &&
-			!isValidJiraReopenDuration(selectedConfig.reopen_duration)
-		) {
-			notifications.error({
-				message: 'Error',
-				description: t('jira_reopen_duration_invalid'),
-			});
-			return false;
-		}
-
-		return true;
-	}, [selectedConfig, notifications, t]);
-
-	const onJiraHandler = useCallback(async () => {
-		if (!validateJiraConfig()) {
-			return { status: 'failed', statusMessage: t('channel_creation_failed') };
-		}
-
-		setSavingState(true);
-
-		try {
-			await createChannel({ data: prepareJiraRequest(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);
-		}
-	}, [
-		validateJiraConfig,
-		createChannel,
-		selectedConfig,
-		notifications,
-		t,
-		showErrorModal,
-	]);
-
-	const validateJsmOpsConfig = useCallback((): boolean => {
-		if (!selectedConfig.api_key) {
-			notifications.error({
-				message: 'Error',
-				description: t('api_key_required'),
-			});
-			return false;
-		}
-		return true;
-	}, [selectedConfig.api_key, notifications, t]);
-
-	const onJsmOpsHandler = useCallback(async () => {
-		if (!validateJsmOpsConfig()) {
-			return { status: 'failed', statusMessage: t('channel_creation_failed') };
-		}
-
-		setSavingState(true);
-
-		try {
-			await createChannel({ data: prepareJsmOpsRequest(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);
-		}
-	}, [
-		validateJsmOpsConfig,
-		createChannel,
-		selectedConfig,
-		notifications,
-		t,
-		showErrorModal,
-	]);
-
 	const onSaveHandler = useCallback(
 		async (value: ChannelType) => {
 			if (!selectedConfig.name) {
@@ -568,8 +452,6 @@ function CreateAlertChannels({
 				[ChannelType.MsTeams]: onMsTeamsHandler,
 				[ChannelType.Email]: onEmailHandler,
 				[ChannelType.GoogleChat]: onGoogleChatHandler,
-				[ChannelType.Jira]: onJiraHandler,
-				[ChannelType.JsmOps]: onJsmOpsHandler,
 			};
 
 			if (isChannelType(value)) {
@@ -602,8 +484,6 @@ function CreateAlertChannels({
 			onMsTeamsHandler,
 			onEmailHandler,
 			onGoogleChatHandler,
-			onJiraHandler,
-			onJsmOpsHandler,
 			notifications,
 			t,
 		],
@@ -648,20 +528,6 @@ function CreateAlertChannels({
 						}
 						await testChannel({ data: prepareGoogleChatRequest(selectedConfig) });
 						break;
-					case ChannelType.Jira:
-						if (!validateJiraConfig()) {
-							setTestingState(false);
-							return;
-						}
-						await testChannel({ data: prepareJiraRequest(selectedConfig) });
-						break;
-					case ChannelType.JsmOps:
-						if (!validateJsmOpsConfig()) {
-							setTestingState(false);
-							return;
-						}
-						await testChannel({ data: prepareJsmOpsRequest(selectedConfig) });
-						break;
 					default:
 						notifications.error({
 							message: 'Error',
@@ -710,8 +576,6 @@ function CreateAlertChannels({
 			prepareMsTeamsRequest,
 			prepareEmailRequest,
 			validateGoogleChatConfig,
-			validateJiraConfig,
-			validateJsmOpsConfig,
 			testChannel,
 			notifications,
 		],

frontend/src/container/CreateAlertChannels/utils.ts

@@ -1,17 +1,9 @@
 import {
-	AlertmanagertypesJiraReceiverConfigDTO,
-	AlertmanagertypesJSMOpsReceiverConfigDTO,
 	AlertmanagertypesPostableChannelDTO,
 	ConfigSecretURLDTO,
-	ModelDurationDTO,
 } from 'api/generated/services/sigNoz.schemas';
 
-import {
-	ChannelType,
-	GoogleChatChannel,
-	JiraChannel,
-	JsmOpsChannel,
-} from './config';
+import { ChannelType, GoogleChatChannel } from './config';
 
 export const isChannelType = (type: string): type is ChannelType =>
 	Object.values(ChannelType).includes(type as ChannelType);
@@ -45,126 +37,3 @@ export const prepareGoogleChatRequest = (
 		},
 	],
 });
-
-const JIRA_CLOUD_HOST_SUFFIX = '.atlassian.net';
-
-// the backend enforces the same rule, this is only for a nicer error experience
-export const isValidJiraSiteURL = (url: string): boolean => {
-	try {
-		const { protocol, hostname } = new URL(url);
-		return (
-			protocol === 'https:' &&
-			hostname.toLowerCase().endsWith(JIRA_CLOUD_HOST_SUFFIX)
-		);
-	} catch {
-		return false;
-	}
-};
-
-// mirrors go's prometheus model.Duration units
-const JIRA_DURATION_UNIT_MS: Record<string, number> = {
-	ms: 1,
-	s: 1_000,
-	m: 60_000,
-	h: 3_600_000,
-	d: 86_400_000,
-	w: 604_800_000,
-	y: 31_536_000_000,
-};
-const JIRA_DURATION_RE = /^(\d+(ms|s|m|h|d|w|y))+$/;
-const JIRA_DURATION_TOKEN_RE = /(\d+)(ms|s|m|h|d|w|y)/g;
-const JIRA_MIN_REOPEN_MS = 60_000;
-
-// backend requires the same format and a >= 1m minimum, this is only for a
-// nicer error experience. Empty and "0" defer to the backend default.
-export const isValidJiraReopenDuration = (value: string): boolean => {
-	if (!value || value === '0') {
-		return true;
-	}
-	if (!JIRA_DURATION_RE.test(value)) {
-		return false;
-	}
-	let totalMs = 0;
-	for (const [, amount, unit] of value.matchAll(JIRA_DURATION_TOKEN_RE)) {
-		totalMs += Number(amount) * JIRA_DURATION_UNIT_MS[unit];
-	}
-	return totalMs >= JIRA_MIN_REOPEN_MS;
-};
-
-// create, update and test all send the same body shape. Optional fields are
-// omitted when empty so the backend applies its defaults.
-export const prepareJiraRequest = (
-	config: Partial<JiraChannel>,
-): AlertmanagertypesPostableChannelDTO => {
-	const jira: AlertmanagertypesJiraReceiverConfigDTO = {
-		site: config.site || '',
-		project: config.project || '',
-		issue_type: config.issue_type || '',
-		send_resolved: config.send_resolved || false,
-		http_config: {
-			basic_auth: {
-				username: config.username || '',
-				password: config.password || '',
-			},
-		},
-	};
-
-	if (config.summary) {
-		jira.summary = config.summary;
-	}
-	if (config.description) {
-		jira.description = config.description;
-	}
-	if (config.priority) {
-		jira.priority = config.priority;
-	}
-	if (config.labels?.length) {
-		jira.labels = config.labels;
-	}
-	if (config.resolve_transition) {
-		jira.resolve_transition = config.resolve_transition;
-	}
-	if (config.reopen_transition) {
-		jira.reopen_transition = config.reopen_transition;
-	}
-	if (config.reopen_duration) {
-		// the generated type models go's model.Duration as a number, the api takes a
-		// duration string like "72h"
-		jira.reopen_duration = config.reopen_duration as unknown as ModelDurationDTO;
-	}
-
-	return {
-		name: config.name || '',
-		jira_configs: [jira],
-	};
-};
-
-// create, update and test all send the same body shape. Optional fields are
-// omitted when empty so the backend applies its defaults.
-export const prepareJsmOpsRequest = (
-	config: Partial<JsmOpsChannel>,
-): AlertmanagertypesPostableChannelDTO => {
-	const jsmops: AlertmanagertypesJSMOpsReceiverConfigDTO = {
-		api_key: config.api_key || '',
-		send_resolved: config.send_resolved || false,
-	};
-
-	if (config.message) {
-		jsmops.message = config.message;
-	}
-	if (config.description) {
-		jsmops.description = config.description;
-	}
-	if (config.priority) {
-		jsmops.priority = config.priority;
-	}
-	if (config.tags?.length) {
-		// the backend takes a comma-separated string and splits it back
-		jsmops.tags = config.tags.join(',');
-	}
-
-	return {
-		name: config.name || '',
-		jsmops_configs: [jsmops],
-	};
-};

frontend/src/container/EditAlertChannels/index.tsx

@@ -25,8 +25,6 @@ import {
 	ChannelType,
 	EmailChannel,
 	GoogleChatChannel,
-	JiraChannel,
-	JsmOpsChannel,
 	MsTeamsChannel,
 	OpsgenieChannel,
 	PagerChannel,
@@ -36,11 +34,7 @@ import {
 } from 'container/CreateAlertChannels/config';
 import {
 	isValidGoogleChatWebhookURL,
-	isValidJiraReopenDuration,
-	isValidJiraSiteURL,
 	prepareGoogleChatRequest,
-	prepareJiraRequest,
-	prepareJsmOpsRequest,
 } from 'container/CreateAlertChannels/utils';
 import FormAlertChannels from 'container/FormAlertChannels';
 import { useNotifications } from 'hooks/useNotifications';
@@ -64,9 +58,7 @@ function EditAlertChannels({
 				MsTeamsChannel &
 				OpsgenieChannel &
 				EmailChannel &
-				GoogleChatChannel &
-				JiraChannel &
-				JsmOpsChannel
+				GoogleChatChannel
 		>
 	>({
 		...initialValue,
@@ -460,124 +452,6 @@ function EditAlertChannels({
 		t,
 	]);
 
-	const validateJiraConfig = useCallback((): string => {
-		if (
-			!selectedConfig.site ||
-			!selectedConfig.username ||
-			!selectedConfig.password ||
-			!selectedConfig.project ||
-			!selectedConfig.issue_type
-		) {
-			return t('jira_required_fields');
-		}
-
-		if (!isValidJiraSiteURL(selectedConfig.site)) {
-			return t('jira_site_invalid');
-		}
-
-		if (
-			selectedConfig.reopen_duration &&
-			!isValidJiraReopenDuration(selectedConfig.reopen_duration)
-		) {
-			return t('jira_reopen_duration_invalid');
-		}
-
-		return '';
-	}, [selectedConfig, t]);
-
-	const onJiraEditHandler = useCallback(async () => {
-		const validationError = validateJiraConfig();
-
-		if (validationError !== '') {
-			notifications.error({
-				message: 'Error',
-				description: validationError,
-			});
-			return { status: 'failed', statusMessage: validationError };
-		}
-
-		setSavingState(true);
-
-		try {
-			await updateChannel({
-				pathParams: { id },
-				data: prepareJiraRequest(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);
-		}
-	}, [
-		validateJiraConfig,
-		updateChannel,
-		id,
-		selectedConfig,
-		notifications,
-		notifyError,
-		t,
-	]);
-
-	const validateJsmOpsConfig = useCallback((): string => {
-		if (!selectedConfig.api_key) {
-			return t('api_key_required');
-		}
-		return '';
-	}, [selectedConfig, t]);
-
-	const onJsmOpsEditHandler = useCallback(async () => {
-		const validationError = validateJsmOpsConfig();
-
-		if (validationError !== '') {
-			notifications.error({
-				message: 'Error',
-				description: validationError,
-			});
-			return { status: 'failed', statusMessage: validationError };
-		}
-
-		setSavingState(true);
-
-		try {
-			await updateChannel({
-				pathParams: { id },
-				data: prepareJsmOpsRequest(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);
-		}
-	}, [
-		validateJsmOpsConfig,
-		updateChannel,
-		id,
-		selectedConfig,
-		notifications,
-		notifyError,
-		t,
-	]);
-
 	const onSaveHandler = useCallback(
 		async (value: ChannelType) => {
 			let result;
@@ -595,10 +469,6 @@ function EditAlertChannels({
 				result = await onEmailEditHandler();
 			} else if (value === ChannelType.GoogleChat) {
 				result = await onGoogleChatEditHandler();
-			} else if (value === ChannelType.Jira) {
-				result = await onJiraEditHandler();
-			} else if (value === ChannelType.JsmOps) {
-				result = await onJsmOpsEditHandler();
 			}
 			logEvent('Alert Channel: Save channel', {
 				type: value,
@@ -618,13 +488,10 @@ function EditAlertChannels({
 			onOpsgenieEditHandler,
 			onEmailEditHandler,
 			onGoogleChatEditHandler,
-			onJiraEditHandler,
-			onJsmOpsEditHandler,
 		],
 	);
 
 	const performChannelTest = useCallback(
-		// eslint-disable-next-line sonarjs/cognitive-complexity
 		async (channelType: ChannelType) => {
 			setTestingState(true);
 			try {
@@ -675,32 +542,6 @@ function EditAlertChannels({
 						await testChannel({ data: prepareGoogleChatRequest(selectedConfig) });
 						break;
 					}
-					case ChannelType.Jira: {
-						const validationError = validateJiraConfig();
-						if (validationError !== '') {
-							notifications.error({
-								message: 'Error',
-								description: validationError,
-							});
-							setTestingState(false);
-							return;
-						}
-						await testChannel({ data: prepareJiraRequest(selectedConfig) });
-						break;
-					}
-					case ChannelType.JsmOps: {
-						const validationError = validateJsmOpsConfig();
-						if (validationError !== '') {
-							notifications.error({
-								message: 'Error',
-								description: validationError,
-							});
-							setTestingState(false);
-							return;
-						}
-						await testChannel({ data: prepareJsmOpsRequest(selectedConfig) });
-						break;
-					}
 					default:
 						notifications.error({
 							message: 'Error',
@@ -738,8 +579,6 @@ function EditAlertChannels({
 			t,
 			notifyError,
 			validateGoogleChatConfig,
-			validateJiraConfig,
-			validateJsmOpsConfig,
 			testChannel,
 			prepareWebhookRequest,
 			preparePagerRequest,

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

@@ -1,242 +0,0 @@
-import { Dispatch, SetStateAction } from 'react';
-import { useTranslation } from 'react-i18next';
-import { Collapse, Form, Input, Select } from 'antd';
-import { Typography } from '@signozhq/ui/typography';
-import { MarkdownRenderer } from 'components/MarkdownRenderer/MarkdownRenderer';
-
-import { JiraChannel } from '../../CreateAlertChannels/config';
-import {
-	isValidJiraReopenDuration,
-	isValidJiraSiteURL,
-} from '../../CreateAlertChannels/utils';
-
-function JiraSettings({ setSelectedConfig }: JiraProps): JSX.Element {
-	const { t } = useTranslation('channels');
-
-	const update = (patch: Partial<JiraChannel>): void =>
-		setSelectedConfig((value) => ({ ...value, ...patch }));
-
-	const advanced = (
-		<>
-			<Form.Item
-				name="priority"
-				label={t('field_jira_priority')}
-				help={t('help_jira_priority')}
-			>
-				<Input
-					placeholder={t('placeholder_jira_priority')}
-					onChange={(event): void => update({ priority: event.target.value })}
-					data-testid="jira-priority-textbox"
-				/>
-			</Form.Item>
-
-			<Form.Item
-				name="labels"
-				label={t('field_jira_labels')}
-				help={t('help_jira_labels')}
-			>
-				<Select
-					mode="tags"
-					open={false}
-					placeholder={t('placeholder_jira_labels')}
-					onChange={(value): void => update({ labels: value as string[] })}
-					data-testid="jira-labels-select"
-				/>
-			</Form.Item>
-
-			<Form.Item
-				name="resolve_transition"
-				label={t('field_jira_resolve_transition')}
-				help={t('help_jira_resolve_transition')}
-			>
-				<Input
-					placeholder={t('placeholder_jira_resolve_transition')}
-					onChange={(event): void =>
-						update({ resolve_transition: event.target.value })
-					}
-					data-testid="jira-resolve-transition-textbox"
-				/>
-			</Form.Item>
-
-			<Form.Item
-				name="reopen_transition"
-				label={t('field_jira_reopen_transition')}
-				help={t('help_jira_reopen_transition')}
-			>
-				<Input
-					placeholder={t('placeholder_jira_reopen_transition')}
-					onChange={(event): void =>
-						update({ reopen_transition: event.target.value })
-					}
-					data-testid="jira-reopen-transition-textbox"
-				/>
-			</Form.Item>
-
-			<Form.Item
-				name="reopen_duration"
-				label={t('field_jira_reopen_duration')}
-				extra={t('help_jira_reopen_duration')}
-				rules={[
-					{
-						validator: (_, value: string): Promise<void> =>
-							isValidJiraReopenDuration(value)
-								? Promise.resolve()
-								: Promise.reject(new Error(t('jira_reopen_duration_invalid'))),
-					},
-				]}
-				tooltip={{
-					title: (
-						<MarkdownRenderer
-							markdownContent={t('tooltip_jira_reopen_duration')}
-							variables={{}}
-						/>
-					),
-					overlayInnerStyle: { maxWidth: 400 },
-					placement: 'right',
-				}}
-			>
-				<Input
-					placeholder={t('placeholder_jira_reopen_duration')}
-					onChange={(event): void => update({ reopen_duration: event.target.value })}
-					data-testid="jira-reopen-duration-textbox"
-				/>
-			</Form.Item>
-		</>
-	);
-
-	return (
-		<>
-			<Typography.Text
-				color="muted"
-				size="sm"
-				testId="jira-service-account-tip"
-				style={{ display: 'block', marginBottom: 16 }}
-			>
-				{t('jira_service_account_tip')}{' '}
-				<Typography.Link
-					href="https://signoz.io/docs/alerts-management/notification-channel/jira/#use-a-service-account-recommended"
-					target="_blank"
-					rel="noopener noreferrer"
-				>
-					{t('jira_service_account_tip_link')}
-				</Typography.Link>
-			</Typography.Text>
-
-			<Form.Item
-				name="site"
-				label={t('field_jira_site')}
-				required
-				rules={[
-					{
-						validator: (_, value: string): Promise<void> =>
-							!value || isValidJiraSiteURL(value)
-								? Promise.resolve()
-								: Promise.reject(new Error(t('jira_site_invalid'))),
-					},
-				]}
-				tooltip={{
-					title: (
-						<MarkdownRenderer
-							markdownContent={t('tooltip_jira_site')}
-							variables={{}}
-						/>
-					),
-					overlayInnerStyle: { maxWidth: 400 },
-					placement: 'right',
-				}}
-			>
-				<Input
-					placeholder="https://your-domain.atlassian.net"
-					onChange={(event): void => update({ site: event.target.value })}
-					data-testid="jira-site-textbox"
-				/>
-			</Form.Item>
-
-			<Form.Item
-				name="username"
-				label={t('field_jira_email')}
-				help={t('help_jira_email')}
-				required
-			>
-				<Input
-					onChange={(event): void => update({ username: event.target.value })}
-					data-testid="jira-email-textbox"
-				/>
-			</Form.Item>
-
-			<Form.Item
-				name="password"
-				label={t('field_jira_api_token')}
-				help={t('help_jira_api_token')}
-				required
-			>
-				<Input
-					type="password"
-					onChange={(event): void => update({ password: event.target.value })}
-					data-testid="jira-api-token-textbox"
-				/>
-			</Form.Item>
-
-			<Form.Item name="project" label={t('field_jira_project')} required>
-				<Input
-					placeholder="e.g. OPS"
-					onChange={(event): void => update({ project: event.target.value })}
-					data-testid="jira-project-textbox"
-				/>
-			</Form.Item>
-
-			<Form.Item
-				name="issue_type"
-				label={t('field_jira_issue_type')}
-				help={t('help_jira_issue_type')}
-				required
-			>
-				<Input
-					onChange={(event): void => update({ issue_type: event.target.value })}
-					data-testid="jira-issue-type-textbox"
-				/>
-			</Form.Item>
-
-			<Form.Item
-				name="summary"
-				label={t('field_jira_summary')}
-				help={t('help_jira_summary')}
-			>
-				<Input.TextArea
-					rows={2}
-					onChange={(event): void => update({ summary: event.target.value })}
-					data-testid="jira-summary-textarea"
-				/>
-			</Form.Item>
-
-			<Form.Item
-				name="description"
-				label={t('field_jira_description')}
-				help={t('help_jira_description')}
-			>
-				<Input.TextArea
-					rows={6}
-					onChange={(event): void => update({ description: event.target.value })}
-					data-testid="jira-description-textarea"
-				/>
-			</Form.Item>
-
-			<Collapse
-				ghost
-				items={[
-					{
-						key: 'advanced',
-						label: t('jira_advanced_section'),
-						children: advanced,
-					},
-				]}
-			/>
-		</>
-	);
-}
-
-interface JiraProps {
-	setSelectedConfig: Dispatch<SetStateAction<Partial<JiraChannel>>>;
-}
-
-export default JiraSettings;

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

@@ -1,117 +0,0 @@
-import { Dispatch, SetStateAction } from 'react';
-import { useTranslation } from 'react-i18next';
-import { Collapse, Form, Input, Select } from 'antd';
-import { Typography } from '@signozhq/ui/typography';
-
-import { JsmOpsChannel } from '../../CreateAlertChannels/config';
-
-function JsmOpsSettings({ setSelectedConfig }: JsmOpsProps): JSX.Element {
-	const { t } = useTranslation('channels');
-
-	const update = (patch: Partial<JsmOpsChannel>): void =>
-		setSelectedConfig((value) => ({ ...value, ...patch }));
-
-	const advanced = (
-		<>
-			<Form.Item
-				name="priority"
-				label={t('field_jsmops_priority')}
-				help={t('help_jsmops_priority')}
-			>
-				<Input.TextArea
-					rows={2}
-					onChange={(event): void => update({ priority: event.target.value })}
-					data-testid="jsmops-priority-textarea"
-				/>
-			</Form.Item>
-
-			<Form.Item
-				name="tags"
-				label={t('field_jsmops_tags')}
-				help={t('help_jsmops_tags')}
-			>
-				<Select
-					mode="tags"
-					open={false}
-					placeholder={t('placeholder_jsmops_tags')}
-					onChange={(value): void => update({ tags: value as string[] })}
-					data-testid="jsmops-tags-select"
-				/>
-			</Form.Item>
-		</>
-	);
-
-	return (
-		<>
-			<Typography.Text
-				color="muted"
-				size="sm"
-				testId="jsmops-tip"
-				style={{ display: 'block', marginBottom: 16 }}
-			>
-				{t('jsmops_tip')}{' '}
-				<Typography.Link
-					href="https://signoz.io/docs/alerts-management/notification-channel/jsm-ops/"
-					target="_blank"
-					rel="noopener noreferrer"
-				>
-					{t('jsmops_tip_link')}
-				</Typography.Link>
-			</Typography.Text>
-
-			<Form.Item
-				name="api_key"
-				label={t('field_jsmops_api_key')}
-				help={t('help_jsmops_api_key')}
-				required
-			>
-				<Input
-					type="password"
-					onChange={(event): void => update({ api_key: event.target.value })}
-					data-testid="jsmops-api-key-textbox"
-				/>
-			</Form.Item>
-
-			<Form.Item
-				name="message"
-				label={t('field_jsmops_message')}
-				help={t('help_jsmops_message')}
-			>
-				<Input.TextArea
-					rows={2}
-					onChange={(event): void => update({ message: event.target.value })}
-					data-testid="jsmops-message-textarea"
-				/>
-			</Form.Item>
-
-			<Form.Item
-				name="description"
-				label={t('field_jsmops_description')}
-				help={t('help_jsmops_description')}
-			>
-				<Input.TextArea
-					rows={6}
-					onChange={(event): void => update({ description: event.target.value })}
-					data-testid="jsmops-description-textarea"
-				/>
-			</Form.Item>
-
-			<Collapse
-				ghost
-				items={[
-					{
-						key: 'advanced',
-						label: t('jsmops_advanced_section'),
-						children: advanced,
-					},
-				]}
-			/>
-		</>
-	);
-}
-
-interface JsmOpsProps {
-	setSelectedConfig: Dispatch<SetStateAction<Partial<JsmOpsChannel>>>;
-}
-
-export default JsmOpsSettings;

frontend/src/container/FormAlertChannels/index.tsx

@@ -10,8 +10,6 @@ import {
 	ChannelType,
 	EmailChannel,
 	GoogleChatChannel,
-	JiraChannel,
-	JsmOpsChannel,
 	OpsgenieChannel,
 	PagerChannel,
 	SlackChannel,
@@ -21,8 +19,6 @@ import history from 'lib/history';
 
 import EmailSettings from './Settings/Email';
 import GoogleChatSettings from './Settings/GoogleChat';
-import JiraSettings from './Settings/Jira';
-import JsmOpsSettings from './Settings/JsmOps';
 import MsTeamsSettings from './Settings/MsTeams';
 import OpsgenieSettings from './Settings/Opsgenie';
 import PagerSettings from './Settings/Pager';
@@ -57,10 +53,6 @@ function FormAlertChannels({
 				return <MsTeamsSettings setSelectedConfig={setSelectedConfig} />;
 			case ChannelType.GoogleChat:
 				return <GoogleChatSettings setSelectedConfig={setSelectedConfig} />;
-			case ChannelType.Jira:
-				return <JiraSettings setSelectedConfig={setSelectedConfig} />;
-			case ChannelType.JsmOps:
-				return <JsmOpsSettings setSelectedConfig={setSelectedConfig} />;
 			case ChannelType.Opsgenie:
 				return <OpsgenieSettings setSelectedConfig={setSelectedConfig} />;
 			case ChannelType.Email:
@@ -149,14 +141,6 @@ function FormAlertChannels({
 						>
 							Google Chat
 						</Select.Option>
-
-						<Select.Option value="jira" key="jira" data-testid="select-option">
-							Jira
-						</Select.Option>
-
-						<Select.Option value="jsmops" key="jsmops" data-testid="select-option">
-							Jira Service Management Ops
-						</Select.Option>
 					</Select>
 				</Form.Item>
 
@@ -205,9 +189,7 @@ interface FormAlertChannelsProps {
 					PagerChannel &
 					OpsgenieChannel &
 					EmailChannel &
-					GoogleChatChannel &
-					JiraChannel &
-					JsmOpsChannel
+					GoogleChatChannel
 			>
 		>
 	>;

frontend/src/pages/ChannelsEdit/index.tsx

@@ -11,8 +11,6 @@ import ROUTES from 'constants/routes';
 import {
 	ChannelType,
 	GoogleChatChannel,
-	JiraChannel,
-	JsmOpsChannel,
 	MsTeamsChannel,
 	PagerChannel,
 	SlackChannel,
@@ -62,25 +60,17 @@ function ChannelsEdit(): JSX.Element {
 
 	const prepChannelConfig = (): {
 		type: string;
-		channel: Partial<
-			SlackChannel &
-				WebhookChannel &
-				PagerChannel &
-				MsTeamsChannel &
-				GoogleChatChannel &
-				JiraChannel &
-				JsmOpsChannel
-		>;
+		channel: SlackChannel &
+			WebhookChannel &
+			PagerChannel &
+			MsTeamsChannel &
+			GoogleChatChannel;
 	} => {
-		let channel: Partial<
-			SlackChannel &
-				WebhookChannel &
-				PagerChannel &
-				MsTeamsChannel &
-				GoogleChatChannel &
-				JiraChannel &
-				JsmOpsChannel
-		> = {
+		let channel: SlackChannel &
+			WebhookChannel &
+			PagerChannel &
+			MsTeamsChannel &
+			GoogleChatChannel = {
 			name: '',
 		};
 
@@ -111,19 +101,6 @@ function ChannelsEdit(): JSX.Element {
 			};
 		}
 
-		if (value && 'jira_configs' in value) {
-			const [jiraConfig] = value.jira_configs;
-			channel = jiraConfig;
-			if (jiraConfig.http_config?.basic_auth) {
-				channel.username = jiraConfig.http_config.basic_auth.username;
-				channel.password = jiraConfig.http_config.basic_auth.password;
-			}
-			return {
-				type: ChannelType.Jira,
-				channel,
-			};
-		}
-
 		if (value && 'pagerduty_configs' in value) {
 			const pagerConfig = value.pagerduty_configs[0];
 			channel = pagerConfig;
@@ -135,22 +112,6 @@ function ChannelsEdit(): JSX.Element {
 			};
 		}
 
-		if (value && 'jsmops_configs' in value) {
-			const [jsmopsConfig] = value.jsmops_configs;
-			channel = jsmopsConfig;
-			// backend stores tags as a comma-separated string; the form uses chips
-			channel.tags = jsmopsConfig.tags
-				? String(jsmopsConfig.tags)
-						.split(',')
-						.map((tag: string) => tag.trim())
-						.filter(Boolean)
-				: [];
-			return {
-				type: ChannelType.JsmOps,
-				channel,
-			};
-		}
-
 		if (value && 'opsgenie_configs' in value) {
 			const opsgenieConfig = value.opsgenie_configs[0];
 			channel = opsgenieConfig;

pkg/modules/fields/implfields/handler.go

@@ -82,7 +82,6 @@ func (handler *handler) GetFieldsValues(rw http.ResponseWriter, req *http.Reques
 
 	values := &telemetrytypes.TelemetryFieldValues{
 		StringValues:  allValues.StringValues,
-		BoolValues:    allValues.BoolValues,
 		NumberValues:  allValues.NumberValues,
 		RelatedValues: relatedValues,
 	}

pkg/querybuilder/exists_expr.go

@@ -43,7 +43,7 @@ func ExistsExpression(columns []*schema.Column, key *telemetrytypes.TelemetryFie
 		if len(evolutionsEntries) > 0 && evolutionsEntries[0] != nil {
 			columnName = evolutionsEntries[0].ColumnName
 		}
-		rawPath := fmt.Sprintf("%s.`%s`", columnName, key.Name)
+		rawPath := fmt.Sprintf("%s.%s", columnName, ClickHouseIdentifier(key.Name))
 		if exists {
 			return rawPath + " IS NOT NULL", nil
 		}

pkg/telemetrymetadata/bool_values.go

@@ -1,43 +0,0 @@
-package telemetrymetadata
-
-import (
-	"strconv"
-	"strings"
-
-	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
-)
-
-// boolFieldValues is the suggestion set for a bool field, optionally narrowed
-// by the search text.
-func boolFieldValues(searchText string) *telemetrytypes.TelemetryFieldValues {
-	values := &telemetrytypes.TelemetryFieldValues{}
-	needle := strings.ToLower(searchText)
-	for _, v := range []bool{true, false} {
-		if needle == "" || strings.Contains(strconv.FormatBool(v), needle) {
-			values.BoolValues = append(values.BoolValues, v)
-		}
-	}
-	return values
-}
-
-// isKnownBoolField is true when the caller asked for the bool data type, or
-// when the name is one of the signal's static bool fields and the requested
-// context does not rule that static field out.
-func isKnownBoolField(selector *telemetrytypes.FieldValueSelector, staticFields ...map[string]telemetrytypes.TelemetryFieldKey) bool {
-	if selector.FieldDataType == telemetrytypes.FieldDataTypeBool {
-		return true
-	}
-	if selector.FieldDataType != telemetrytypes.FieldDataTypeUnspecified {
-		return false
-	}
-	for _, fields := range staticFields {
-		field, ok := fields[selector.Name]
-		if !ok || field.FieldDataType != telemetrytypes.FieldDataTypeBool {
-			continue
-		}
-		if selector.FieldContext == telemetrytypes.FieldContextUnspecified || selector.FieldContext == field.FieldContext {
-			return true
-		}
-	}
-	return false
-}

pkg/telemetrymetadata/metadata.go

@@ -187,6 +187,8 @@ func (t *telemetryMetaStore) getTracesKeys(ctx context.Context, fieldKeySelector
 	).From(t.tracesDBName + "." + t.spanAttributesKeysTblName)
 	var limit int
 
+	searchTexts := []string{}
+
 	conds := []string{}
 	for _, fieldKeySelector := range fieldKeySelectors {
 
@@ -206,6 +208,7 @@ func (t *telemetryMetaStore) getTracesKeys(ctx context.Context, fieldKeySelector
 			fieldKeyConds = append(fieldKeyConds, sb.ILike("tagKey", "%"+escapeForLike(fieldKeySelector.Name)+"%"))
 		}
 
+		searchTexts = append(searchTexts, fieldKeySelector.Name)
 		// now look at the field context
 		// we don't write most of intrinsic fields to keys table
 		// for this reason we don't want to apply tagType if the field context
@@ -285,23 +288,41 @@ func (t *telemetryMetaStore) getTracesKeys(ctx context.Context, fieldKeySelector
 	// hit the limit? (only counting DB results)
 	complete := rowCount <= limit
 
-	// Add the matching static fields: the span scope selectors, the intrinsic
-	// columns and the calculated columns. These don't count towards the limit
-	staticFields := []telemetrytypes.TelemetryFieldKey{
-		{Name: "isRoot", Signal: telemetrytypes.SignalTraces, FieldContext: telemetrytypes.FieldContextSpan, FieldDataType: telemetrytypes.FieldDataTypeBool},
-		{Name: "isEntryPoint", Signal: telemetrytypes.SignalTraces, FieldContext: telemetrytypes.FieldContextSpan, FieldDataType: telemetrytypes.FieldDataTypeBool},
-	}
-	staticFields = append(staticFields, maps.Values(tracestelemetryschema.IntrinsicFields)...)
-	staticFields = append(staticFields, maps.Values(tracestelemetryschema.CalculatedFields)...)
+	staticKeys := []string{"isRoot", "isEntryPoint"}
+	staticKeys = append(staticKeys, maps.Keys(tracestelemetryschema.IntrinsicFields)...)
+	staticKeys = append(staticKeys, maps.Keys(tracestelemetryschema.CalculatedFields)...)
 
-	for _, field := range staticFields {
-		if !staticFieldMatchesAny(field, fieldKeySelectors) {
-			continue
+	// Add matching intrinsic and matching calculated fields
+	// These don't count towards the limit
+	for _, key := range staticKeys {
+		found := false
+		for _, v := range searchTexts {
+			if v == "" || strings.Contains(key, v) {
+				found = true
+				break
+			}
 		}
-		if _, added := mapOfKeys[field.Name+";"+field.FieldContext.StringValue()+";"+field.FieldDataType.StringValue()]; added {
-			continue
+
+		if found {
+			if field, exists := tracestelemetryschema.IntrinsicFields[key]; exists {
+				if _, added := mapOfKeys[field.Name+";"+field.FieldContext.StringValue()+";"+field.FieldDataType.StringValue()]; !added {
+					keys = append(keys, &field)
+				}
+				continue
+			}
+
+			if field, exists := tracestelemetryschema.CalculatedFields[key]; exists {
+				if _, added := mapOfKeys[field.Name+";"+field.FieldContext.StringValue()+";"+field.FieldDataType.StringValue()]; !added {
+					keys = append(keys, &field)
+				}
+				continue
+			}
+			keys = append(keys, &telemetrytypes.TelemetryFieldKey{
+				Name:         key,
+				FieldContext: telemetrytypes.FieldContextSpan,
+				Signal:       telemetrytypes.SignalTraces,
+			})
 		}
-		keys = append(keys, &field)
 	}
 
 	if err = t.updateColumnEvolutionMetadataForKeys(ctx, keys); err != nil {
@@ -521,6 +542,12 @@ func (t *telemetryMetaStore) getLogsKeys(ctx context.Context, orgID valuer.UUID,
 		allArgs = append(allArgs, args...)
 	}
 
+	if len(queries) == 0 {
+		// No matching contexts, return empty result
+		return []*telemetrytypes.TelemetryFieldKey{}, true, nil
+	}
+
+	// Combine queries with UNION ALL
 	var limit int
 	for _, fieldKeySelector := range fieldKeySelectors {
 		limit += fieldKeySelector.Limit
@@ -529,15 +556,7 @@ func (t *telemetryMetaStore) getLogsKeys(ctx context.Context, orgID valuer.UUID,
 		limit = 1000
 	}
 
-	keys := []*telemetrytypes.TelemetryFieldKey{}
-	parentTypes := make(map[string][]telemetrytypes.FieldDataType)
-	rowCount := 0
-
-	// the log and scope contexts have no keys table; they are served by the
-	// static fields appended below
-	if len(queries) > 0 {
-		// Combine queries with UNION ALL
-		mainQuery := fmt.Sprintf(`
+	mainQuery := fmt.Sprintf(`
 		SELECT tag_key, tag_type, tag_data_type, max(priority) as priority
 		FROM (
 			%s
@@ -547,75 +566,103 @@ func (t *telemetryMetaStore) getLogsKeys(ctx context.Context, orgID valuer.UUID,
 		LIMIT %d
 	`, strings.Join(queries, " UNION ALL "), limit+1)
 
-		rows, err := t.telemetrystore.ClickhouseDB().Query(ctx, mainQuery, allArgs...)
+	rows, err := t.telemetrystore.ClickhouseDB().Query(ctx, mainQuery, allArgs...)
+	if err != nil {
+		return nil, false, errors.Wrap(err, errors.TypeInternal, errors.CodeInternal, ErrFailedToGetLogsKeys.Error())
+	}
+	defer rows.Close()
+
+	keys := []*telemetrytypes.TelemetryFieldKey{}
+	parentTypes := make(map[string][]telemetrytypes.FieldDataType)
+	rowCount := 0
+	searchTexts := []string{}
+
+	// Collect search texts for static field matching
+	for _, fieldKeySelector := range fieldKeySelectors {
+		searchTexts = append(searchTexts, fieldKeySelector.Name)
+	}
+
+	for rows.Next() {
+		rowCount++
+		// reached the limit, we know there are more results
+		if rowCount > limit {
+			break
+		}
+
+		var name string
+		var fieldContext telemetrytypes.FieldContext
+		var fieldDataType telemetrytypes.FieldDataType
+		var priority uint8
+		err = rows.Scan(&name, &fieldContext, &fieldDataType, &priority)
 		if err != nil {
 			return nil, false, errors.Wrap(err, errors.TypeInternal, errors.CodeInternal, ErrFailedToGetLogsKeys.Error())
 		}
-		defer rows.Close()
 
-		for rows.Next() {
-			rowCount++
-			// reached the limit, we know there are more results
-			if rowCount > limit {
-				break
-			}
-
-			var name string
-			var fieldContext telemetrytypes.FieldContext
-			var fieldDataType telemetrytypes.FieldDataType
-			var priority uint8
-			err = rows.Scan(&name, &fieldContext, &fieldDataType, &priority)
-			if err != nil {
-				return nil, false, errors.Wrap(err, errors.TypeInternal, errors.CodeInternal, ErrFailedToGetLogsKeys.Error())
-			}
-
-			// ArrayJSON/ArrayDynamic body rows for parent paths are needed by the JSON access plan
-			// builder (enrichJSONKeys). Always record them in parentTypes. Only skip adding to keys
-			// if the user did not also directly request this name — a field like "education" can be
-			// both a parent of "education[].name" and an explicitly queried field in its own right.
-			switch fieldDataType {
-			case telemetrytypes.FieldDataTypeArrayJSON, telemetrytypes.FieldDataTypeArrayDynamic:
-				if fieldContext == telemetrytypes.FieldContextBody && parentPaths[name] {
-					parentTypes[name] = append(parentTypes[name], fieldDataType)
-					if !mapOfRequestedSelectors[name] {
-						continue // skip; don't register the key.
-					}
+		// ArrayJSON/ArrayDynamic body rows for parent paths are needed by the JSON access plan
+		// builder (enrichJSONKeys). Always record them in parentTypes. Only skip adding to keys
+		// if the user did not also directly request this name — a field like "education" can be
+		// both a parent of "education[].name" and an explicitly queried field in its own right.
+		switch fieldDataType {
+		case telemetrytypes.FieldDataTypeArrayJSON, telemetrytypes.FieldDataTypeArrayDynamic:
+			if fieldContext == telemetrytypes.FieldContextBody && parentPaths[name] {
+				parentTypes[name] = append(parentTypes[name], fieldDataType)
+				if !mapOfRequestedSelectors[name] {
+					continue // skip; don't register the key.
 				}
 			}
+		}
 
-			key, ok := mapOfKeys[name+";"+fieldContext.StringValue()+";"+fieldDataType.StringValue()]
+		key, ok := mapOfKeys[name+";"+fieldContext.StringValue()+";"+fieldDataType.StringValue()]
 
-			// if there is no materialised column, create a key with the field context and data type
-			if !ok {
-				key = &telemetrytypes.TelemetryFieldKey{
-					Name:          name,
-					Signal:        telemetrytypes.SignalLogs,
-					FieldContext:  fieldContext,
-					FieldDataType: fieldDataType,
-				}
+		// if there is no materialised column, create a key with the field context and data type
+		if !ok {
+			key = &telemetrytypes.TelemetryFieldKey{
+				Name:          name,
+				Signal:        telemetrytypes.SignalLogs,
+				FieldContext:  fieldContext,
+				FieldDataType: fieldDataType,
 			}
-
-			keys = append(keys, key)
-			mapOfKeys[name+";"+fieldContext.StringValue()+";"+fieldDataType.StringValue()] = key
 		}
 
-		if rows.Err() != nil {
-			return nil, false, errors.Wrap(rows.Err(), errors.TypeInternal, errors.CodeInternal, ErrFailedToGetLogsKeys.Error())
-		}
+		keys = append(keys, key)
+		mapOfKeys[name+";"+fieldContext.StringValue()+";"+fieldDataType.StringValue()] = key
+	}
+
+	if rows.Err() != nil {
+		return nil, false, errors.Wrap(rows.Err(), errors.TypeInternal, errors.CodeInternal, ErrFailedToGetLogsKeys.Error())
 	}
 
 	// hit the limit? (only counting DB results)
 	complete := rowCount <= limit
 
-	// Add the matching intrinsic columns. These don't count towards the limit
-	for _, field := range maps.Values(logstelemetryschema.IntrinsicFields) {
-		if !staticFieldMatchesAny(field, fieldKeySelectors) {
-			continue
+	staticKeys := []string{}
+	staticKeys = append(staticKeys, maps.Keys(logstelemetryschema.IntrinsicFields)...)
+
+	// Add matching intrinsic and matching calculated fields
+	// These don't count towards the limit
+	for _, key := range staticKeys {
+		found := false
+		for _, v := range searchTexts {
+			if v == "" || strings.Contains(key, v) {
+				found = true
+				break
+			}
 		}
-		if _, added := mapOfKeys[field.Name+";"+field.FieldContext.StringValue()+";"+field.FieldDataType.StringValue()]; added {
-			continue
+
+		if found {
+			if field, exists := logstelemetryschema.IntrinsicFields[key]; exists {
+				if _, added := mapOfKeys[field.Name+";"+field.FieldContext.StringValue()+";"+field.FieldDataType.StringValue()]; !added {
+					keys = append(keys, &field)
+				}
+				continue
+			}
+
+			keys = append(keys, &telemetrytypes.TelemetryFieldKey{
+				Name:         key,
+				FieldContext: telemetrytypes.FieldContextLog,
+				Signal:       telemetrytypes.SignalLogs,
+			})
 		}
-		keys = append(keys, &field)
 	}
 
 	// enrich body keys with promoted paths, indexes, and JSON access plans
@@ -789,6 +836,11 @@ func (t *telemetryMetaStore) getAuditKeys(ctx context.Context, fieldKeySelectors
 
 	keys := []*telemetrytypes.TelemetryFieldKey{}
 	rowCount := 0
+	searchTexts := []string{}
+
+	for _, fieldKeySelector := range fieldKeySelectors {
+		searchTexts = append(searchTexts, fieldKeySelector.Name)
+	}
 
 	for rows.Next() {
 		rowCount++
@@ -825,15 +877,24 @@ func (t *telemetryMetaStore) getAuditKeys(ctx context.Context, fieldKeySelectors
 
 	complete := rowCount <= limit
 
-	// Add the matching intrinsic audit fields (same as logs intrinsics: body, severity_text, etc.)
-	for _, field := range maps.Values(audittelemetryschema.IntrinsicFields) {
-		if !staticFieldMatchesAny(field, fieldKeySelectors) {
-			continue
+	// Add intrinsic audit fields (same as logs intrinsics: body, severity_text, etc.)
+	staticKeys := maps.Keys(audittelemetryschema.IntrinsicFields)
+	for _, key := range staticKeys {
+		found := false
+		for _, v := range searchTexts {
+			if v == "" || strings.Contains(key, v) {
+				found = true
+				break
+			}
 		}
-		if _, added := mapOfKeys[field.Name+";"+field.FieldContext.StringValue()+";"+field.FieldDataType.StringValue()]; added {
-			continue
+
+		if found {
+			if field, exists := audittelemetryschema.IntrinsicFields[key]; exists {
+				if _, added := mapOfKeys[field.Name+";"+field.FieldContext.StringValue()+";"+field.FieldDataType.StringValue()]; !added {
+					keys = append(keys, &field)
+				}
+			}
 		}
-		keys = append(keys, &field)
 	}
 
 	return keys, complete, nil
@@ -1030,12 +1091,9 @@ func (t *telemetryMetaStore) getMeterSourceMetricKeys(ctx context.Context, field
 		if err != nil {
 			return nil, false, errors.Wrap(err, errors.TypeInternal, errors.CodeInternal, ErrFailedToGetMeterKeys.Error())
 		}
-		// meter labels are stored as strings in the labels JSON and have no
-		// attribute context, so only the data type is known
 		keys = append(keys, &telemetrytypes.TelemetryFieldKey{
-			Name:          name,
-			Signal:        telemetrytypes.SignalMetrics,
-			FieldDataType: telemetrytypes.FieldDataTypeString,
+			Name:   name,
+			Signal: telemetrytypes.SignalMetrics,
 		})
 	}
 
@@ -1454,24 +1512,12 @@ func (t *telemetryMetaStore) getSpanFieldValues(ctx context.Context, fieldValueS
 		limit = 50
 	}
 
-	// bool rows in the tag table carry no value; the two possible values are
-	// known without a query
-	if isKnownBoolField(fieldValueSelector, tracestelemetryschema.IntrinsicFields, tracestelemetryschema.CalculatedFields) {
-		return boolFieldValues(fieldValueSelector.Value), true, nil
-	}
-
-	sb := sqlbuilder.Select("DISTINCT string_value, number_value, tag_data_type").From(t.tracesDBName + "." + t.tracesFieldsTblName)
+	sb := sqlbuilder.Select("DISTINCT string_value, number_value").From(t.tracesDBName + "." + t.tracesFieldsTblName)
 
 	if fieldValueSelector.Name != "" {
 		sb.Where(sb.E("tag_key", fieldValueSelector.Name))
 	}
 
-	// unix_milli is the hour bucket a value was written in and rows are
-	// deduplicated per day, so this is a day-granular "seen since" filter
-	if fieldValueSelector.StartUnixMilli != 0 {
-		sb.Where(sb.GE("unix_milli", fieldValueSelector.StartUnixMilli))
-	}
-
 	// now look at the field context
 	if fieldValueSelector.FieldContext != telemetrytypes.FieldContextUnspecified {
 		sb.Where(sb.E("tag_type", fieldValueSelector.FieldContext.TagType()))
@@ -1519,20 +1565,10 @@ func (t *telemetryMetaStore) getSpanFieldValues(ctx context.Context, fieldValueS
 
 		var stringValue string
 		var numberValue float64
-		var tagDataType string
-		if err := rows.Scan(&stringValue, &numberValue, &tagDataType); err != nil {
+		if err := rows.Scan(&stringValue, &numberValue); err != nil {
 			return nil, false, errors.Wrap(err, errors.TypeInternal, errors.CodeInternal, ErrFailedToGetLogsKeys.Error())
 		}
 
-		// bool rows carry no value; the key's presence is enough to know the
-		// two values it can take
-		if tagDataType == telemetrytypes.FieldDataTypeBool.TagDataType() {
-			if len(values.BoolValues) == 0 {
-				values.BoolValues = boolFieldValues(fieldValueSelector.Value).BoolValues
-			}
-			continue
-		}
-
 		// Only add values if we haven't hit the limit yet
 		if totalCount < limit {
 			if _, ok := seen[stringValue]; !ok && stringValue != "" {
@@ -1566,24 +1602,12 @@ func (t *telemetryMetaStore) getLogFieldValues(ctx context.Context, fieldValueSe
 		limit = 50
 	}
 
-	// bool rows in the tag table carry no value; the two possible values are
-	// known without a query
-	if isKnownBoolField(fieldValueSelector, logstelemetryschema.IntrinsicFields) {
-		return boolFieldValues(fieldValueSelector.Value), true, nil
-	}
-
-	sb := sqlbuilder.Select("DISTINCT string_value, number_value, tag_data_type").From(t.logsDBName + "." + t.logsFieldsTblName)
+	sb := sqlbuilder.Select("DISTINCT string_value, number_value").From(t.logsDBName + "." + t.logsFieldsTblName)
 
 	if fieldValueSelector.Name != "" {
 		sb.Where(sb.E("tag_key", fieldValueSelector.Name))
 	}
 
-	// unix_milli is the hour bucket a value was written in and rows are
-	// deduplicated per day, so this is a day-granular "seen since" filter
-	if fieldValueSelector.StartUnixMilli != 0 {
-		sb.Where(sb.GE("unix_milli", fieldValueSelector.StartUnixMilli))
-	}
-
 	if fieldValueSelector.FieldContext != telemetrytypes.FieldContextUnspecified {
 		sb.Where(sb.E("tag_type", fieldValueSelector.FieldContext.TagType()))
 	}
@@ -1629,20 +1653,10 @@ func (t *telemetryMetaStore) getLogFieldValues(ctx context.Context, fieldValueSe
 
 		var stringValue string
 		var numberValue float64
-		var tagDataType string
-		if err := rows.Scan(&stringValue, &numberValue, &tagDataType); err != nil {
+		if err := rows.Scan(&stringValue, &numberValue); err != nil {
 			return nil, false, errors.Wrap(err, errors.TypeInternal, errors.CodeInternal, ErrFailedToGetLogsKeys.Error())
 		}
 
-		// bool rows carry no value; the key's presence is enough to know the
-		// two values it can take
-		if tagDataType == telemetrytypes.FieldDataTypeBool.TagDataType() {
-			if len(values.BoolValues) == 0 {
-				values.BoolValues = boolFieldValues(fieldValueSelector.Value).BoolValues
-			}
-			continue
-		}
-
 		// Only add values if we haven't hit the limit yet
 		if totalCount < limit {
 			if _, ok := seen[stringValue]; !ok && stringValue != "" {
@@ -2083,18 +2097,6 @@ func populateAllUnspecifiedValues(allUnspecifiedValues *telemetrytypes.Telemetry
 		}
 	}
 
-	for _, value := range values.BoolValues {
-		if totalCount >= limit {
-			complete = false
-			break
-		}
-		if _, ok := mapOfValues[value]; !ok {
-			mapOfValues[value] = true
-			allUnspecifiedValues.BoolValues = append(allUnspecifiedValues.BoolValues, value)
-			totalCount++
-		}
-	}
-
 	for _, value := range values.RelatedValues {
 		if totalCount >= limit {
 			complete = false
@@ -2465,10 +2467,6 @@ func (k *telemetryMetaStore) fetchEvolutionEntryFromClickHouse(ctx context.Conte
 
 // updateColumnEvolutionMetadataForKeys updates the evolution field for keys.
 func (k *telemetryMetaStore) updateColumnEvolutionMetadataForKeys(ctx context.Context, keysToUpdate []*telemetrytypes.TelemetryFieldKey) error {
-	// an empty selector list would run the evolution query without a filter
-	if len(keysToUpdate) == 0 {
-		return nil
-	}
 
 	var metadataKeySelectors []*telemetrytypes.EvolutionSelector
 	for _, keySelector := range keysToUpdate {
@@ -2502,13 +2500,15 @@ func (k *telemetryMetaStore) updateColumnEvolutionMetadataForKeys(ctx context.Co
 				FieldContext: key.FieldContext,
 				FieldName:    "__all__",
 			}
-			// first check if there is evolutions that with field name as __all__
-			if keyEvolutions, ok := evolutionsByUniqueKey[selector.QualifiedName()]; ok {
-				keysToUpdate[i].Evolutions = keyEvolutions
-			}
-			// then check for specific field name
+			// the per-field entries add to the column-wide ones, they don't replace them.
+			// NOTE: if a field evolved to its own column before an __all__ migration for the
+			// same signal+context, that later __all__ entry does not really apply to this field
+			// (the field had already moved). We ignore that case as it does not occur currently.
+			var keyEvolutions []*telemetrytypes.EvolutionEntry
+			keyEvolutions = append(keyEvolutions, evolutionsByUniqueKey[selector.QualifiedName()]...)
 			selector.FieldName = key.Name
-			if keyEvolutions, ok := evolutionsByUniqueKey[selector.QualifiedName()]; ok {
+			keyEvolutions = append(keyEvolutions, evolutionsByUniqueKey[selector.QualifiedName()]...)
+			if len(keyEvolutions) > 0 {
 				keysToUpdate[i].Evolutions = keyEvolutions
 			}
 		}

pkg/telemetrymetadata/static_fields.go

@@ -1,53 +0,0 @@
-package telemetrymetadata
-
-import (
-	"strings"
-
-	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
-)
-
-func staticFieldMatchesAny(field telemetrytypes.TelemetryFieldKey, selectors []*telemetrytypes.FieldKeySelector) bool {
-	for _, selector := range selectors {
-		if staticFieldMatches(field, selector) {
-			return true
-		}
-	}
-	return false
-}
-
-// staticFieldMatches mirrors the keys-table lookup for a static field: the
-// requested context and data type, when given, must agree with the field's,
-// and the name matches case-insensitively, as a substring for fuzzy selectors
-// and as the whole name for exact ones.
-func staticFieldMatches(field telemetrytypes.TelemetryFieldKey, selector *telemetrytypes.FieldKeySelector) bool {
-	if selector.FieldContext != telemetrytypes.FieldContextUnspecified && selector.FieldContext != field.FieldContext {
-		return false
-	}
-	if selector.FieldDataType != telemetrytypes.FieldDataTypeUnspecified && !sameDataTypeFamily(selector.FieldDataType, field.FieldDataType) {
-		return false
-	}
-	if selector.Name == "" {
-		return true
-	}
-	if selector.SelectorMatchType == telemetrytypes.FieldSelectorMatchTypeExact {
-		return strings.EqualFold(field.Name, selector.Name)
-	}
-	return strings.Contains(strings.ToLower(field.Name), strings.ToLower(selector.Name))
-}
-
-// sameDataTypeFamily treats the numeric types as one family: static fields
-// declare "number" while callers may ask for int64 or float64.
-func sameDataTypeFamily(requested, actual telemetrytypes.FieldDataType) bool {
-	if requested == actual {
-		return true
-	}
-	return isNumericDataType(requested) && isNumericDataType(actual)
-}
-
-func isNumericDataType(dataType telemetrytypes.FieldDataType) bool {
-	switch dataType {
-	case telemetrytypes.FieldDataTypeNumber, telemetrytypes.FieldDataTypeInt64, telemetrytypes.FieldDataTypeFloat64:
-		return true
-	}
-	return false
-}

pkg/telemetryschema/tracestelemetryschema/condition_builder.go

@@ -73,6 +73,8 @@ func (c *conditionBuilder) conditionFor(
 	// the first member stands in for the field.
 	fieldExpression, value = querybuilder.DataTypeCollisionHandledFieldName(logical.Single(), value, fieldExpression, operator)
 
+	fieldExpression = foldAbsentJSONReadToTypeDefault(logical.Single(), operator, fieldExpression)
+
 	// regular operators
 	switch operator {
 	// regular operators
@@ -177,6 +179,31 @@ func (c *conditionBuilder) conditionFor(
 	return "", nil
 }
 
+// foldAbsentJSONReadToTypeDefault gives negative operators on a numeric/bool JSON attribute the
+// legacy Map's absent-key semantics. Negative operators carry no guard, so NULL <> x would drop rows
+// lacking the key, whereas the Map defaulted them to the type zero and kept them (0 <> x).
+// String needs no fold — its ::String value already reads absent as ”.
+func foldAbsentJSONReadToTypeDefault(key *telemetrytypes.TelemetryFieldKey, operator qbtypes.FilterOperator, expr string) string {
+	if !operator.IsNegativeOperator() || operator == qbtypes.FilterOperatorNotExists {
+		return expr
+	}
+	if key.FieldContext != telemetrytypes.FieldContextAttribute {
+		return expr
+	}
+	if !attributeColumnEvolutionRegistered(key, SpanAttributesColumn) {
+		return expr
+	}
+	switch key.FieldDataType {
+	case telemetrytypes.FieldDataTypeInt64,
+		telemetrytypes.FieldDataTypeFloat64,
+		telemetrytypes.FieldDataTypeNumber:
+		return fmt.Sprintf("ifNull(%s, 0)", expr)
+	case telemetrytypes.FieldDataTypeBool:
+		return fmt.Sprintf("ifNull(%s, false)", expr)
+	}
+	return expr
+}
+
 // isFoldContext reports whether the context is one CandidateKeys would fold the prefix into
 // the key name for (span/trace). These behave like a default context that also addresses
 // columns and attributes, unlike strict resource/attribute/scope contexts.

pkg/telemetryschema/tracestelemetryschema/const.go

@@ -40,10 +40,12 @@ const (
 	SpanIsRemoteColumn           = "is_remote"
 
 	// Contextual Columns.
-	SpanAttributesStringColumn = "attributes_string"
-	SpanAttributesNumberColumn = "attributes_number"
-	SpanAttributesBoolColumn   = "attributes_bool"
-	SpanResourcesStringColumn  = "resources_string"
+	SpanAttributesStringColumn   = "attributes_string"
+	SpanAttributesNumberColumn   = "attributes_number"
+	SpanAttributesBoolColumn     = "attributes_bool"
+	SpanAttributesColumn         = "attributes"
+	SpanAttributesPromotedColumn = "attributes_promoted"
+	SpanResourcesStringColumn    = "resources_string"
 )
 
 var (

pkg/telemetryschema/tracestelemetryschema/field_mapper.go

@@ -52,8 +52,10 @@ var (
 			KeyType:   schema.LowCardinalityColumnType{ElementType: schema.ColumnTypeString},
 			ValueType: schema.ColumnTypeString,
 		}},
-		"resource": {Name: "resource", Type: schema.JSONColumnType{}},
-		"scope":    {Name: "scope", Type: schema.JSONColumnType{}},
+		"resource":            {Name: "resource", Type: schema.JSONColumnType{}},
+		"scope":               {Name: "scope", Type: schema.JSONColumnType{}},
+		"attributes":          {Name: "attributes", Type: schema.JSONColumnType{}},
+		"attributes_promoted": {Name: "attributes_promoted", Type: schema.JSONColumnType{}},
 
 		"events": {Name: "events", Type: schema.ArrayColumnType{
 			ElementType: schema.ColumnTypeString,
@@ -184,16 +186,28 @@ func (m *fieldMapper) getColumn(
 	case telemetrytypes.FieldContextScope:
 		return []*schema.Column{indexV3Columns["scope"]}, nil
 	case telemetrytypes.FieldContextAttribute:
+		var mapCol *schema.Column
 		switch key.FieldDataType {
 		case telemetrytypes.FieldDataTypeString:
-			return []*schema.Column{indexV3Columns["attributes_string"]}, nil
+			mapCol = indexV3Columns["attributes_string"]
 		case telemetrytypes.FieldDataTypeInt64,
 			telemetrytypes.FieldDataTypeFloat64,
 			telemetrytypes.FieldDataTypeNumber:
-			return []*schema.Column{indexV3Columns["attributes_number"]}, nil
+			mapCol = indexV3Columns["attributes_number"]
 		case telemetrytypes.FieldDataTypeBool:
-			return []*schema.Column{indexV3Columns["attributes_bool"]}, nil
+			mapCol = indexV3Columns["attributes_bool"]
+		default:
+			return nil, qbtypes.ErrColumnNotFound
 		}
+		// The `attributes` evolution entry is the rollout control.
+		if attributeColumnEvolutionRegistered(key, SpanAttributesColumn) {
+			cols := make([]*schema.Column, 0, 3)
+			if attributeColumnEvolutionRegistered(key, SpanAttributesPromotedColumn) {
+				cols = append(cols, indexV3Columns["attributes_promoted"])
+			}
+			return append(cols, indexV3Columns["attributes"], mapCol), nil
+		}
+		return []*schema.Column{mapCol}, nil
 	case telemetrytypes.FieldContextSpan:
 		// Check if this is a span scope field
 		if strings.ToLower(key.Name) == SpanSearchScopeRoot || strings.ToLower(key.Name) == SpanSearchScopeEntryPoint {
@@ -260,7 +274,7 @@ func (m *fieldMapper) FieldFor(
 		for i, expr := range exprs {
 			finalExprs = append(finalExprs, fmt.Sprintf("%s, %s", existExpr[i], expr))
 		}
-		return "multiIf(" + strings.Join(finalExprs, ", ") + ", NULL)", nil
+		return fmt.Sprintf("multiIf(%s, NULL)", strings.Join(finalExprs, ", ")), nil
 	}
 
 	// should not reach here
@@ -309,8 +323,13 @@ func (m *fieldMapper) resolveColumnExprs(
 					exprs = append(exprs, fmt.Sprintf("%s.attributes.%s::String", columnName, querybuilder.ClickHouseIdentifier(attributeName)))
 					existExprs = append(existExprs, fmt.Sprintf("%s.attributes.%s IS NOT NULL", columnName, querybuilder.ClickHouseIdentifier(attributeName)))
 				}
+			case telemetrytypes.FieldContextAttribute:
+				path := fmt.Sprintf("%s.%s", columnName, querybuilder.ClickHouseIdentifier(key.Name))
+				expr, existExpr := attributeJSONValueExpr(path, key.FieldDataType)
+				exprs = append(exprs, expr)
+				existExprs = append(existExprs, existExpr)
 			default:
-				return nil, nil, nil, errors.NewInternalf(errors.CodeInternal, "only resource and scope context fields are supported for json columns, got %s", key.FieldContext.String)
+				return nil, nil, nil, errors.NewInternalf(errors.CodeInternal, "only resource, scope and attribute context fields are supported for json columns, got %s", key.FieldContext.String)
 			}
 		case schema.ColumnTypeEnumString,
 			schema.ColumnTypeEnumUInt64,
@@ -353,6 +372,39 @@ func (m *fieldMapper) resolveColumnExprs(
 	return exprs, existExprs, columns, nil
 }
 
+// attributeColumnEvolutionRegistered reports whether key carries an evolution entry for the given column.
+func attributeColumnEvolutionRegistered(key *telemetrytypes.TelemetryFieldKey, columnName string) bool {
+	for _, e := range key.Evolutions {
+		if e != nil && e.ColumnName == columnName {
+			return true
+		}
+	}
+	return false
+}
+
+// attributeJSONValueExpr renders the value expression for a span attribute read from the JSON
+// column along with its per-type existence guard.
+// Numeric and bool gate a crash-safe accurateCastOrNull by dynamicType: the cast alone coerces
+// across domains (bool true reads 1, '200' reads 200, 200.5 reads true), so the read is
+// restricted to values stored as that type — the per-type separation the typed maps gave
+// structurally. Being NULL-capable, the gated read itself is the existence guard (present AS
+// THIS TYPE). Other reads are total (::String folds absent to '' on the raw path), so the
+// guard is presence on the raw path.
+func attributeJSONValueExpr(path string, dataType telemetrytypes.FieldDataType) (string, string) {
+	switch dataType {
+	case telemetrytypes.FieldDataTypeInt64,
+		telemetrytypes.FieldDataTypeFloat64,
+		telemetrytypes.FieldDataTypeNumber:
+		expr := fmt.Sprintf("if(dynamicType(%s) IN ('Int64', 'UInt64', 'Float64'), accurateCastOrNull(%s, 'Float64'), NULL)", path, path) // all numeric types to float64 like attributes_number map.
+		return expr, expr + " IS NOT NULL"
+	case telemetrytypes.FieldDataTypeBool:
+		expr := fmt.Sprintf("if(dynamicType(%s) = 'Bool', accurateCastOrNull(%s, 'Bool'), NULL)", path, path)
+		return expr, expr + " IS NOT NULL"
+	default:
+		return path + "::String", fmt.Sprintf("%s IS NOT NULL", path)
+	}
+}
+
 // upgradeToFamilies swaps single-member candidates for their family when the
 // metadata map proves membership. Candidate order and every non-family
 // candidate stay exactly as the legacy flow produced them; sibling candidates
@@ -439,6 +491,7 @@ func (m *fieldMapper) ColumnExpressionFor(
 	// Group-by/order (String) and aggregation (String/Float64): every candidate is
 	// exists-guarded and coerced to requiredDataType, in a single multiIf. Raw select
 	// (Unspecified) keeps the lighter native shape below.
+
 	if requiredDataType != telemetrytypes.FieldDataTypeUnspecified {
 		var dummyValue any = ""
 		if requiredDataType == telemetrytypes.FieldDataTypeFloat64 {
@@ -446,11 +499,7 @@ func (m *fieldMapper) ColumnExpressionFor(
 		}
 		stmts := make([]string, 0, len(candidates)*2)
 		for _, logical := range candidates {
-			value, err := querybuilder.LogicalValueExpr(ctx, orgID, startNs, endNs, m, logical)
-			if err != nil {
-				return "", err
-			}
-			guard, err := querybuilder.LogicalExistsExpr(ctx, orgID, startNs, endNs, m, logical, true)
+			value, guard, err := m.branchValueAndGuard(ctx, orgID, startNs, endNs, logical)
 			if err != nil {
 				return "", err
 			}
@@ -487,11 +536,7 @@ func (m *fieldMapper) ColumnExpressionFor(
 	// stringified so branches share a type.
 	args := make([]string, 0, len(candidates))
 	for _, logical := range candidates {
-		value, err := querybuilder.LogicalValueExpr(ctx, orgID, startNs, endNs, m, logical)
-		if err != nil {
-			return "", err
-		}
-		guard, err := querybuilder.LogicalExistsExpr(ctx, orgID, startNs, endNs, m, logical, true)
+		value, guard, err := m.branchValueAndGuard(ctx, orgID, startNs, endNs, logical)
 		if err != nil {
 			return "", err
 		}
@@ -500,7 +545,41 @@ func (m *fieldMapper) ColumnExpressionFor(
 	return fmt.Sprintf("multiIf(%s, NULL)", strings.Join(args, ", ")), nil
 }
 
+// branchValueAndGuard resolves a candidate's value expression and branch guard. A
+// single-column attribute candidate takes both from one column resolution: the guard is
+// the per-type existence (on the JSON column, the cast itself for numeric/bool), so a row
+// stored as another type falls through to the branch that renders it. Families and
+// multi-column (straddle) candidates keep the presence guard from LogicalExistsExpr.
+func (m *fieldMapper) branchValueAndGuard(ctx context.Context,
+	orgID valuer.UUID,
+	startNs, endNs uint64,
+	logical *telemetrytypes.LogicalField,
+) (string, string, error) {
+	if !logical.IsFamily() {
+		member := logical.Single()
+		if member.FieldContext == telemetrytypes.FieldContextAttribute {
+			exprs, existExprs, _, err := m.resolveColumnExprs(ctx, startNs, endNs, member)
+			if err != nil {
+				return "", "", err
+			}
+			if len(exprs) == 1 && len(existExprs) == 1 {
+				return exprs[0], existExprs[0], nil
+			}
+		}
+	}
+	value, err := querybuilder.LogicalValueExpr(ctx, orgID, startNs, endNs, m, logical)
+	if err != nil {
+		return "", "", err
+	}
+	guard, err := querybuilder.LogicalExistsExpr(ctx, orgID, startNs, endNs, m, logical, true)
+	if err != nil {
+		return "", "", err
+	}
+	return value, guard, nil
+}
+
 // logicalIsTemporal reports whether the logical field resolves to a single time
+
 // column. A family is attribute-backed and never temporal.
 func (m *fieldMapper) logicalIsTemporal(ctx context.Context, startNs, endNs uint64, logical *telemetrytypes.LogicalField) (bool, error) {
 	if logical.IsFamily() {

pkg/telemetryschema/tracestelemetryschema/field_mapper_attributes_json_test.go

@@ -0,0 +1,475 @@
+package tracestelemetryschema
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	"github.com/SigNoz/signoz/pkg/flagger/flaggertest"
+	qbtypes "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
+	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
+	"github.com/SigNoz/signoz/pkg/valuer"
+	"github.com/huandu/go-sqlbuilder"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+var (
+	attrJSONRelease = time.Date(2025, 1, 1, 0, 0, 0, 0, time.UTC)
+
+	attrWindowBefore   = [2]uint64{tsNano(2024, 1), tsNano(2024, 6)}
+	attrWindowAfter    = [2]uint64{tsNano(2025, 6), tsNano(2025, 7)}
+	attrWindowStraddle = [2]uint64{tsNano(2024, 6), tsNano(2025, 6)}
+)
+
+func tsNano(y int, m time.Month) uint64 {
+	return uint64(time.Date(y, m, 1, 0, 0, 0, 0, time.UTC).UnixNano())
+}
+
+func attrKey(name string, dt telemetrytypes.FieldDataType, evo []*telemetrytypes.EvolutionEntry) telemetrytypes.TelemetryFieldKey {
+	return telemetrytypes.TelemetryFieldKey{
+		Name:          name,
+		FieldContext:  telemetrytypes.FieldContextAttribute,
+		FieldDataType: dt,
+		Evolutions:    evo,
+	}
+}
+
+// TestFieldForAttributeJSONEvolution asserts the value expression across the rollout window:
+// before release the legacy Map lookup (byte-for-byte today), after release the type-aware JSON
+// cast, straddling a dual-read multiIf with the JSON column first.
+func TestFieldForAttributeJSONEvolution(t *testing.T) {
+	ctx := context.Background()
+	fm := NewFieldMapper(flaggertest.New(t))
+	evo := MockAttributeEvolutionData(attrJSONRelease)
+
+	testCases := []struct {
+		name     string
+		dataType telemetrytypes.FieldDataType
+		window   [2]uint64
+		expected string
+	}{
+		{"string before -> map", telemetrytypes.FieldDataTypeString, attrWindowBefore, "attributes_string['user.id']"},
+		{"string after -> json", telemetrytypes.FieldDataTypeString, attrWindowAfter, "attributes.`user.id`::String"},
+		{"string straddle -> dual", telemetrytypes.FieldDataTypeString, attrWindowStraddle, "multiIf(attributes.`user.id` IS NOT NULL, attributes.`user.id`::String, mapContains(attributes_string, 'user.id'), attributes_string['user.id'], NULL)"},
+		{"number before -> map", telemetrytypes.FieldDataTypeNumber, attrWindowBefore, "attributes_number['user.id']"},
+		{"number after -> json", telemetrytypes.FieldDataTypeNumber, attrWindowAfter, "if(dynamicType(attributes.`user.id`) IN ('Int64', 'UInt64', 'Float64'), accurateCastOrNull(attributes.`user.id`, 'Float64'), NULL)"},
+		{"number straddle -> dual", telemetrytypes.FieldDataTypeNumber, attrWindowStraddle, "multiIf(if(dynamicType(attributes.`user.id`) IN ('Int64', 'UInt64', 'Float64'), accurateCastOrNull(attributes.`user.id`, 'Float64'), NULL) IS NOT NULL, if(dynamicType(attributes.`user.id`) IN ('Int64', 'UInt64', 'Float64'), accurateCastOrNull(attributes.`user.id`, 'Float64'), NULL), mapContains(attributes_number, 'user.id'), attributes_number['user.id'], NULL)"},
+		{"int64 after -> json", telemetrytypes.FieldDataTypeInt64, attrWindowAfter, "if(dynamicType(attributes.`user.id`) IN ('Int64', 'UInt64', 'Float64'), accurateCastOrNull(attributes.`user.id`, 'Float64'), NULL)"},
+		{"bool before -> map", telemetrytypes.FieldDataTypeBool, attrWindowBefore, "attributes_bool['user.id']"},
+		{"bool after -> json", telemetrytypes.FieldDataTypeBool, attrWindowAfter, "if(dynamicType(attributes.`user.id`) = 'Bool', accurateCastOrNull(attributes.`user.id`, 'Bool'), NULL)"},
+		{"bool straddle -> dual", telemetrytypes.FieldDataTypeBool, attrWindowStraddle, "multiIf(if(dynamicType(attributes.`user.id`) = 'Bool', accurateCastOrNull(attributes.`user.id`, 'Bool'), NULL) IS NOT NULL, if(dynamicType(attributes.`user.id`) = 'Bool', accurateCastOrNull(attributes.`user.id`, 'Bool'), NULL), mapContains(attributes_bool, 'user.id'), attributes_bool['user.id'], NULL)"},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			key := attrKey("user.id", tc.dataType, evo)
+			got, err := fm.FieldFor(ctx, valuer.UUID{}, tc.window[0], tc.window[1], &key)
+			require.NoError(t, err)
+			assert.Equal(t, tc.expected, got)
+		})
+	}
+}
+
+// TestFieldForAttributeNoEvolutionParity proves the JSON column is untouched until the evolution
+// entry is registered: a key with no evolutions resolves to the Map column for every window.
+func TestFieldForAttributeNoEvolutionParity(t *testing.T) {
+	ctx := context.Background()
+	fm := NewFieldMapper(flaggertest.New(t))
+
+	for _, dt := range []struct {
+		dataType telemetrytypes.FieldDataType
+		expected string
+	}{
+		{telemetrytypes.FieldDataTypeString, "attributes_string['user.id']"},
+		{telemetrytypes.FieldDataTypeNumber, "attributes_number['user.id']"},
+		{telemetrytypes.FieldDataTypeBool, "attributes_bool['user.id']"},
+	} {
+		key := attrKey("user.id", dt.dataType, nil)
+		got, err := fm.FieldFor(ctx, valuer.UUID{}, attrWindowAfter[0], attrWindowAfter[1], &key)
+		require.NoError(t, err)
+		assert.Equal(t, dt.expected, got, "no evolution entry must keep the Map path")
+	}
+}
+
+// TestConditionForAttributeJSON asserts the emitted WHERE fragment per operator against the JSON
+// column (window fully after release). Positive operators carry the raw-path existence guard;
+// numeric comparisons keep numeric semantics; existence never tests the ::String cast.
+func TestConditionForAttributeJSON(t *testing.T) {
+	ctx := context.Background()
+	fm := NewFieldMapper(flaggertest.New(t))
+	cb := NewConditionBuilder(fm, flaggertest.New(t))
+	evo := MockAttributeEvolutionData(attrJSONRelease)
+
+	testCases := []struct {
+		name     string
+		key      telemetrytypes.TelemetryFieldKey
+		operator qbtypes.FilterOperator
+		value    any
+		expected string
+	}{
+		{
+			name:     "equal string",
+			key:      attrKey("user.id", telemetrytypes.FieldDataTypeString, evo),
+			operator: qbtypes.FilterOperatorEqual, value: "admin",
+			expected: "(attributes.`user.id`::String = ? AND attributes.`user.id` IS NOT NULL)",
+		},
+		{
+			name:     "not equal string has no exists guard",
+			key:      attrKey("user.id", telemetrytypes.FieldDataTypeString, evo),
+			operator: qbtypes.FilterOperatorNotEqual, value: "admin",
+			expected: "attributes.`user.id`::String <> ?",
+		},
+		{
+			name:     "greater than number",
+			key:      attrKey("http.status_code", telemetrytypes.FieldDataTypeInt64, evo),
+			operator: qbtypes.FilterOperatorGreaterThan, value: float64(200),
+			expected: "toFloat64(if(dynamicType(attributes.`http.status_code`) IN ('Int64', 'UInt64', 'Float64'), accurateCastOrNull(attributes.`http.status_code`, 'Float64'), NULL)) > ?",
+		},
+		{
+			name:     "ilike string",
+			key:      attrKey("user.id", telemetrytypes.FieldDataTypeString, evo),
+			operator: qbtypes.FilterOperatorILike, value: "%adm%",
+			expected: "LOWER(attributes.`user.id`::String) LIKE LOWER(?)",
+		},
+		{
+			name:     "exists uses raw path",
+			key:      attrKey("user.id", telemetrytypes.FieldDataTypeString, evo),
+			operator: qbtypes.FilterOperatorExists, value: nil,
+			expected: "attributes.`user.id` IS NOT NULL",
+		},
+		{
+			name:     "not exists uses raw path",
+			key:      attrKey("user.id", telemetrytypes.FieldDataTypeString, evo),
+			operator: qbtypes.FilterOperatorNotExists, value: nil,
+			expected: "attributes.`user.id` IS NULL",
+		},
+		{
+			name:     "in string",
+			key:      attrKey("user.id", telemetrytypes.FieldDataTypeString, evo),
+			operator: qbtypes.FilterOperatorIn, value: []any{"a", "b"},
+			expected: "((attributes.`user.id`::String = ? OR attributes.`user.id`::String = ?) AND attributes.`user.id` IS NOT NULL)",
+		},
+		{
+			name:     "not in string has no exists guard",
+			key:      attrKey("user.id", telemetrytypes.FieldDataTypeString, evo),
+			operator: qbtypes.FilterOperatorNotIn, value: []any{"a", "b"},
+			expected: "(attributes.`user.id`::String <> ? AND attributes.`user.id`::String <> ?)",
+		},
+		{
+			name:     "between number",
+			key:      attrKey("latency", telemetrytypes.FieldDataTypeNumber, evo),
+			operator: qbtypes.FilterOperatorBetween, value: []any{float64(1), float64(9)},
+			expected: "toFloat64(if(dynamicType(attributes.`latency`) IN ('Int64', 'UInt64', 'Float64'), accurateCastOrNull(attributes.`latency`, 'Float64'), NULL)) BETWEEN ? AND ?",
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			sb := sqlbuilder.NewSelectBuilder()
+			conds, _, err := cb.ConditionFor(ctx, valuer.UUID{}, attrWindowAfter[0], attrWindowAfter[1], &tc.key,
+				map[string][]*telemetrytypes.TelemetryFieldKey{tc.key.Name: {&tc.key}}, qbtypes.ConditionBuilderOptions{}, tc.operator, tc.value, sb)
+			require.NoError(t, err)
+			sb.Where(conds...)
+			sql, _ := sb.BuildWithFlavor(sqlbuilder.ClickHouse)
+			assert.Contains(t, sql, tc.expected)
+		})
+	}
+}
+
+// TestConditionForAttributeJSONNotExistsDualRead covers NOT EXISTS across both homes during the
+// dual-read window: it must AND the JSON IS NULL with NOT mapContains so a row present in either
+// home is excluded (De Morgan), including rows that predate the JSON column.
+func TestConditionForAttributeJSONNotExistsDualRead(t *testing.T) {
+	ctx := context.Background()
+	fm := NewFieldMapper(flaggertest.New(t))
+	cb := NewConditionBuilder(fm, flaggertest.New(t))
+	evo := MockAttributeEvolutionData(attrJSONRelease)
+
+	key := attrKey("user.id", telemetrytypes.FieldDataTypeString, evo)
+	sb := sqlbuilder.NewSelectBuilder()
+	conds, _, err := cb.ConditionFor(ctx, valuer.UUID{}, attrWindowStraddle[0], attrWindowStraddle[1], &key,
+		map[string][]*telemetrytypes.TelemetryFieldKey{key.Name: {&key}}, qbtypes.ConditionBuilderOptions{}, qbtypes.FilterOperatorNotExists, nil, sb)
+	require.NoError(t, err)
+	sb.Where(conds...)
+	sql, _ := sb.BuildWithFlavor(sqlbuilder.ClickHouse)
+	// the value multiIf resolves the row's home; NOT EXISTS negates the whole thing to IS NULL
+	assert.Contains(t, sql, "IS NULL")
+	assert.Contains(t, sql, "attributes.`user.id` IS NOT NULL")
+	assert.Contains(t, sql, "mapContains(attributes_string, 'user.id')")
+}
+
+// TestColumnExpressionForAttributeJSON covers group-by (coerced to String) and aggregation
+// (coerced to Float64) over a JSON attribute after release: both are exists-guarded so an absent
+// path is NULL rather than a spurious ”/0, and the numeric branch keeps its toFloat64 coercion.
+func TestColumnExpressionForAttributeJSON(t *testing.T) {
+	ctx := context.Background()
+	fm := NewFieldMapper(flaggertest.New(t))
+	evo := MockAttributeEvolutionData(attrJSONRelease)
+
+	t.Run("group by string", func(t *testing.T) {
+		key := attrKey("user.id", telemetrytypes.FieldDataTypeString, evo)
+		got, err := fm.ColumnExpressionFor(ctx, valuer.UUID{}, attrWindowAfter[0], attrWindowAfter[1], &key, telemetrytypes.FieldDataTypeString, nil)
+		require.NoError(t, err)
+		assert.Equal(t, "multiIf(attributes.`user.id` IS NOT NULL, attributes.`user.id`::String, NULL)", got)
+	})
+
+	t.Run("aggregation numeric", func(t *testing.T) {
+		key := attrKey("latency", telemetrytypes.FieldDataTypeNumber, evo)
+		got, err := fm.ColumnExpressionFor(ctx, valuer.UUID{}, attrWindowAfter[0], attrWindowAfter[1], &key, telemetrytypes.FieldDataTypeFloat64, nil)
+		require.NoError(t, err)
+		assert.Equal(t, "multiIf(if(dynamicType(attributes.`latency`) IN ('Int64', 'UInt64', 'Float64'), accurateCastOrNull(attributes.`latency`, 'Float64'), NULL) IS NOT NULL, toFloat64(if(dynamicType(attributes.`latency`) IN ('Int64', 'UInt64', 'Float64'), accurateCastOrNull(attributes.`latency`, 'Float64'), NULL)), NULL)", got)
+	})
+}
+
+// TestAttributeJSONNoAmbiguityWarning guards against a visible regression: the JSON column is a
+// second physical home for the same logical field, not a second logical field, so a plain
+// attribute filter must not emit the "ambiguous key" warning.
+func TestAttributeJSONNoAmbiguityWarning(t *testing.T) {
+	ctx := context.Background()
+	fm := NewFieldMapper(flaggertest.New(t))
+	cb := NewConditionBuilder(fm, flaggertest.New(t))
+	evo := MockAttributeEvolutionData(attrJSONRelease)
+
+	key := attrKey("user.id", telemetrytypes.FieldDataTypeString, evo)
+	sb := sqlbuilder.NewSelectBuilder()
+	_, warnings, err := cb.ConditionFor(ctx, valuer.UUID{}, attrWindowAfter[0], attrWindowAfter[1], &key,
+		map[string][]*telemetrytypes.TelemetryFieldKey{key.Name: {&key}}, qbtypes.ConditionBuilderOptions{}, qbtypes.FilterOperatorEqual, "x", sb)
+	require.NoError(t, err)
+	assert.Empty(t, warnings, "a plain attribute filter must not emit an ambiguity warning")
+}
+
+// TestConditionForAttributeJSONTypeCollision covers a name stored under two data types (String
+// and Int64) in the JSON column: an untyped filter fans out to one exists-guarded condition per
+// type, both reading the same physical path with their own cast, and surfaces the ambiguity
+// warning. In the JSON column the two branches share the raw path; only the cast differs.
+func TestConditionForAttributeJSONTypeCollision(t *testing.T) {
+	ctx := context.Background()
+	fm := NewFieldMapper(flaggertest.New(t))
+	cb := NewConditionBuilder(fm, flaggertest.New(t))
+	evo := MockAttributeEvolutionData(attrJSONRelease)
+
+	strKey := attrKey("http.status_code", telemetrytypes.FieldDataTypeString, evo)
+	intKey := attrKey("http.status_code", telemetrytypes.FieldDataTypeInt64, evo)
+	fieldKeys := map[string][]*telemetrytypes.TelemetryFieldKey{
+		"http.status_code": {&strKey, &intKey},
+	}
+
+	ref := attrKey("http.status_code", telemetrytypes.FieldDataTypeUnspecified, nil)
+	sb := sqlbuilder.NewSelectBuilder()
+	conds, warnings, err := cb.ConditionFor(ctx, valuer.UUID{}, attrWindowAfter[0], attrWindowAfter[1], &ref,
+		fieldKeys, qbtypes.ConditionBuilderOptions{}, qbtypes.FilterOperatorEqual, float64(200), sb)
+	require.NoError(t, err)
+	require.Len(t, conds, 2, "a colliding name must build one condition per data type")
+
+	sb.Where(sb.Or(conds...))
+	sql, _ := sb.BuildWithFlavor(sqlbuilder.ClickHouse)
+	assert.Contains(t, sql, "toFloat64OrNull(attributes.`http.status_code`::String) = ?")
+	assert.Contains(t, sql, "toFloat64(if(dynamicType(attributes.`http.status_code`) IN ('Int64', 'UInt64', 'Float64'), accurateCastOrNull(attributes.`http.status_code`, 'Float64'), NULL)) = ?")
+	assert.Contains(t, sql, "attributes.`http.status_code` IS NOT NULL")
+	assert.NotEmpty(t, warnings, "a colliding name must surface the ambiguity warning")
+}
+
+// TestColumnExpressionForAttributeJSONTypeCollision covers group-by on a name stored under two
+// data types. On the JSON column both interpretations read one path: the numeric branch is guarded
+// by its cast (a wrong-typed row reads NULL and falls through), and the ::String branch renders any
+// stored scalar faithfully (200 -> '200', true -> 'true'), so every candidate order reads each row
+// as its actual stored type.
+func TestColumnExpressionForAttributeJSONTypeCollision(t *testing.T) {
+	ctx := context.Background()
+	fm := NewFieldMapper(flaggertest.New(t))
+	evo := MockAttributeEvolutionData(attrJSONRelease)
+
+	strKey := attrKey("http.status_code", telemetrytypes.FieldDataTypeString, evo)
+	intKey := attrKey("http.status_code", telemetrytypes.FieldDataTypeInt64, evo)
+	fieldKeys := map[string][]*telemetrytypes.TelemetryFieldKey{
+		"http.status_code": {&strKey, &intKey},
+	}
+
+	ref := attrKey("http.status_code", telemetrytypes.FieldDataTypeUnspecified, nil)
+	got, err := fm.ColumnExpressionFor(ctx, valuer.UUID{}, attrWindowAfter[0], attrWindowAfter[1], &ref, telemetrytypes.FieldDataTypeString, fieldKeys)
+	require.NoError(t, err)
+	assert.Equal(t,
+		"multiIf(attributes.`http.status_code` IS NOT NULL, attributes.`http.status_code`::String, if(dynamicType(attributes.`http.status_code`) IN ('Int64', 'UInt64', 'Float64'), accurateCastOrNull(attributes.`http.status_code`, 'Float64'), NULL) IS NOT NULL, toString(if(dynamicType(attributes.`http.status_code`) IN ('Int64', 'UInt64', 'Float64'), accurateCastOrNull(attributes.`http.status_code`, 'Float64'), NULL)), NULL)",
+		got)
+}
+
+// TestColumnExpressionForAttributeJSONTypeCollisionNumericAgg covers a numeric aggregation over a
+// name colliding as Number and String: the cast-guarded numeric branch takes numeric rows (a
+// wrong-typed row reads NULL and falls through), and the string branch parses whatever remains —
+// non-numeric strings parse to NULL and stay out of the aggregate, the per-type Map union's
+// coverage.
+func TestColumnExpressionForAttributeJSONTypeCollisionNumericAgg(t *testing.T) {
+	ctx := context.Background()
+	fm := NewFieldMapper(flaggertest.New(t))
+	evo := MockAttributeEvolutionData(attrJSONRelease)
+
+	numKey := attrKey("http.status_code", telemetrytypes.FieldDataTypeNumber, evo)
+	strKey := attrKey("http.status_code", telemetrytypes.FieldDataTypeString, evo)
+	fieldKeys := map[string][]*telemetrytypes.TelemetryFieldKey{
+		"http.status_code": {&numKey, &strKey},
+	}
+
+	ref := attrKey("http.status_code", telemetrytypes.FieldDataTypeUnspecified, nil)
+	got, err := fm.ColumnExpressionFor(ctx, valuer.UUID{}, attrWindowAfter[0], attrWindowAfter[1], &ref, telemetrytypes.FieldDataTypeFloat64, fieldKeys)
+	require.NoError(t, err)
+	assert.Equal(t,
+		"multiIf(if(dynamicType(attributes.`http.status_code`) IN ('Int64', 'UInt64', 'Float64'), accurateCastOrNull(attributes.`http.status_code`, 'Float64'), NULL) IS NOT NULL, toFloat64(if(dynamicType(attributes.`http.status_code`) IN ('Int64', 'UInt64', 'Float64'), accurateCastOrNull(attributes.`http.status_code`, 'Float64'), NULL)), attributes.`http.status_code` IS NOT NULL, toFloat64OrNull(attributes.`http.status_code`::String), NULL)",
+		got)
+}
+
+// TestConditionForAttributeMapTypeCollisionParity anchors the legacy behavior the JSON path must
+// preserve: before the rollout the same colliding name fans out to two separate physical map
+// columns (attributes_string / attributes_number), each with its own mapContains guard.
+func TestConditionForAttributeMapTypeCollisionParity(t *testing.T) {
+	ctx := context.Background()
+	fm := NewFieldMapper(flaggertest.New(t))
+	cb := NewConditionBuilder(fm, flaggertest.New(t))
+	evo := MockAttributeEvolutionData(attrJSONRelease)
+
+	strKey := attrKey("http.status_code", telemetrytypes.FieldDataTypeString, evo)
+	intKey := attrKey("http.status_code", telemetrytypes.FieldDataTypeInt64, evo)
+	fieldKeys := map[string][]*telemetrytypes.TelemetryFieldKey{
+		"http.status_code": {&strKey, &intKey},
+	}
+
+	ref := attrKey("http.status_code", telemetrytypes.FieldDataTypeUnspecified, nil)
+	sb := sqlbuilder.NewSelectBuilder()
+	conds, _, err := cb.ConditionFor(ctx, valuer.UUID{}, attrWindowBefore[0], attrWindowBefore[1], &ref,
+		fieldKeys, qbtypes.ConditionBuilderOptions{}, qbtypes.FilterOperatorEqual, float64(200), sb)
+	require.NoError(t, err)
+	require.Len(t, conds, 2, "a colliding name must build one condition per data type")
+
+	sb.Where(sb.Or(conds...))
+	sql, _ := sb.BuildWithFlavor(sqlbuilder.ClickHouse)
+	assert.Contains(t, sql, "toFloat64OrNull(attributes_string['http.status_code']) = ?")
+	assert.Contains(t, sql, "mapContains(attributes_string, 'http.status_code')")
+	assert.Contains(t, sql, "toFloat64(attributes_number['http.status_code']) = ?")
+	assert.Contains(t, sql, "mapContains(attributes_number, 'http.status_code')")
+}
+
+// TestColumnForUnspecifiedAttributeNoBranchFlip pins the branch-flip decision: a
+// data-type-unspecified attribute key resolves to no column (even with the evolution present), so
+// bare attribute keys keep taking the legacy CandidateKeys/synthesis path rather than becoming
+// metadata-first resolvable.
+func TestColumnForUnspecifiedAttributeNoBranchFlip(t *testing.T) {
+	ctx := context.Background()
+	fm := NewFieldMapper(flaggertest.New(t))
+	evo := MockAttributeEvolutionData(attrJSONRelease)
+
+	key := attrKey("user.id", telemetrytypes.FieldDataTypeUnspecified, evo)
+	_, err := fm.ColumnFor(ctx, valuer.UUID{}, attrWindowAfter[0], attrWindowAfter[1], &key)
+	assert.ErrorIs(t, err, qbtypes.ErrColumnNotFound)
+}
+
+// TestConditionForAttributeJSONNegativeOperatorParity pins Map parity for numeric/bool attributes.
+// The value reads an absent key as NULL (accurateCastOrNull, or the straddle multiIf else); a
+// positive operator excludes such a row via the exists guard, but a negative operator has no guard,
+// so the condition builder folds the NULL to the Map's type zero (ifNull) for negatives only.
+// String needs no fold — ::String already reads absent as ”. The fold rides the attributes
+// evolution: a key without it (the pre-rollout system) is byte-identical to today.
+func TestConditionForAttributeJSONNegativeOperatorParity(t *testing.T) {
+	ctx := context.Background()
+	fm := NewFieldMapper(flaggertest.New(t))
+	cb := NewConditionBuilder(fm, flaggertest.New(t))
+	evo := MockAttributeEvolutionData(attrJSONRelease)
+
+	build := func(t *testing.T, key telemetrytypes.TelemetryFieldKey, window [2]uint64, op qbtypes.FilterOperator, value any) string {
+		t.Helper()
+		sb := sqlbuilder.NewSelectBuilder()
+		conds, _, err := cb.ConditionFor(ctx, valuer.UUID{}, window[0], window[1], &key,
+			map[string][]*telemetrytypes.TelemetryFieldKey{key.Name: {&key}}, qbtypes.ConditionBuilderOptions{}, op, value, sb)
+		require.NoError(t, err)
+		sb.Where(conds...)
+		sql, _ := sb.BuildWithFlavor(sqlbuilder.ClickHouse)
+		return sql
+	}
+
+	t.Run("not equal number after -> NULL folded to 0", func(t *testing.T) {
+		key := attrKey("http.status_code", telemetrytypes.FieldDataTypeInt64, evo)
+		sql := build(t, key, attrWindowAfter, qbtypes.FilterOperatorNotEqual, float64(200))
+		assert.Contains(t, sql, "ifNull(toFloat64(if(dynamicType(attributes.`http.status_code`) IN ('Int64', 'UInt64', 'Float64'), accurateCastOrNull(attributes.`http.status_code`, 'Float64'), NULL)), 0) <> ?")
+	})
+
+	t.Run("not equal bool after -> NULL folded to false", func(t *testing.T) {
+		key := attrKey("http.cache.hit", telemetrytypes.FieldDataTypeBool, evo)
+		sql := build(t, key, attrWindowAfter, qbtypes.FilterOperatorNotEqual, true)
+		assert.Contains(t, sql, "ifNull(if(dynamicType(attributes.`http.cache.hit`) = 'Bool', accurateCastOrNull(attributes.`http.cache.hit`, 'Bool'), NULL), false) <> ?")
+	})
+
+	t.Run("equal number after -> not folded, exists guard excludes absent", func(t *testing.T) {
+		key := attrKey("http.status_code", telemetrytypes.FieldDataTypeInt64, evo)
+		sql := build(t, key, attrWindowAfter, qbtypes.FilterOperatorEqual, float64(0))
+		assert.Contains(t, sql, "(toFloat64(if(dynamicType(attributes.`http.status_code`) IN ('Int64', 'UInt64', 'Float64'), accurateCastOrNull(attributes.`http.status_code`, 'Float64'), NULL)) = ? AND attributes.`http.status_code` IS NOT NULL)")
+		assert.NotContains(t, sql, "ifNull")
+	})
+
+	t.Run("not in number after -> each operand folded to 0", func(t *testing.T) {
+		key := attrKey("http.status_code", telemetrytypes.FieldDataTypeInt64, evo)
+		sql := build(t, key, attrWindowAfter, qbtypes.FilterOperatorNotIn, []any{float64(200), float64(404)})
+		assert.Contains(t, sql, "(ifNull(toFloat64(if(dynamicType(attributes.`http.status_code`) IN ('Int64', 'UInt64', 'Float64'), accurateCastOrNull(attributes.`http.status_code`, 'Float64'), NULL)), 0) <> ? AND ifNull(toFloat64(if(dynamicType(attributes.`http.status_code`) IN ('Int64', 'UInt64', 'Float64'), accurateCastOrNull(attributes.`http.status_code`, 'Float64'), NULL)), 0) <> ?)")
+	})
+
+	t.Run("not equal number straddle -> whole multiIf folded", func(t *testing.T) {
+		key := attrKey("http.status_code", telemetrytypes.FieldDataTypeInt64, evo)
+		sql := build(t, key, attrWindowStraddle, qbtypes.FilterOperatorNotEqual, float64(200))
+		assert.Contains(t, sql, "ifNull(toFloat64(multiIf(if(dynamicType(attributes.`http.status_code`) IN ('Int64', 'UInt64', 'Float64'), accurateCastOrNull(attributes.`http.status_code`, 'Float64'), NULL) IS NOT NULL, if(dynamicType(attributes.`http.status_code`) IN ('Int64', 'UInt64', 'Float64'), accurateCastOrNull(attributes.`http.status_code`, 'Float64'), NULL), mapContains(attributes_number, 'http.status_code'), attributes_number['http.status_code'], NULL)), 0) <> ?")
+	})
+
+	t.Run("not equal number before -> harmless fold over the map read", func(t *testing.T) {
+		key := attrKey("http.status_code", telemetrytypes.FieldDataTypeInt64, evo)
+		sql := build(t, key, attrWindowBefore, qbtypes.FilterOperatorNotEqual, float64(200))
+		assert.Contains(t, sql, "ifNull(toFloat64(attributes_number['http.status_code']), 0) <> ?")
+	})
+
+	t.Run("not equal number without rollout -> byte-identical to today", func(t *testing.T) {
+		key := attrKey("http.status_code", telemetrytypes.FieldDataTypeInt64, nil)
+		sql := build(t, key, attrWindowBefore, qbtypes.FilterOperatorNotEqual, float64(200))
+		assert.Contains(t, sql, "toFloat64(attributes_number['http.status_code']) <> ?")
+		assert.NotContains(t, sql, "ifNull")
+	})
+
+	t.Run("not equal string after -> '' default, never folded", func(t *testing.T) {
+		key := attrKey("user.id", telemetrytypes.FieldDataTypeString, evo)
+		sql := build(t, key, attrWindowAfter, qbtypes.FilterOperatorNotEqual, "admin")
+		assert.Contains(t, sql, "attributes.`user.id`::String <> ?")
+		assert.NotContains(t, sql, "ifNull")
+	})
+}
+
+// TestConditionForAttributeJSONStraddleAbsentKeyExclusion guards the straddle exists path: because
+// the value reads absent-in-both-homes as NULL (multiIf else), a positive zero-value comparison and
+// EXISTS/NOT EXISTS must still exclude a key absent from every home, rather than matching it.
+func TestConditionForAttributeJSONStraddleAbsentKeyExclusion(t *testing.T) {
+	ctx := context.Background()
+	fm := NewFieldMapper(flaggertest.New(t))
+	cb := NewConditionBuilder(fm, flaggertest.New(t))
+	evo := MockAttributeEvolutionData(attrJSONRelease)
+
+	build := func(t *testing.T, key telemetrytypes.TelemetryFieldKey, op qbtypes.FilterOperator, value any) string {
+		t.Helper()
+		sb := sqlbuilder.NewSelectBuilder()
+		conds, _, err := cb.ConditionFor(ctx, valuer.UUID{}, attrWindowStraddle[0], attrWindowStraddle[1], &key,
+			map[string][]*telemetrytypes.TelemetryFieldKey{key.Name: {&key}}, qbtypes.ConditionBuilderOptions{}, op, value, sb)
+		require.NoError(t, err)
+		sb.Where(conds...)
+		sql, _ := sb.BuildWithFlavor(sqlbuilder.ClickHouse)
+		return sql
+	}
+
+	guard := "multiIf(if(dynamicType(attributes.`http.status_code`) IN ('Int64', 'UInt64', 'Float64'), accurateCastOrNull(attributes.`http.status_code`, 'Float64'), NULL) IS NOT NULL, if(dynamicType(attributes.`http.status_code`) IN ('Int64', 'UInt64', 'Float64'), accurateCastOrNull(attributes.`http.status_code`, 'Float64'), NULL), mapContains(attributes_number, 'http.status_code'), attributes_number['http.status_code'], NULL) IS NOT NULL"
+
+	t.Run("equal zero keeps the exists guard", func(t *testing.T) {
+		key := attrKey("http.status_code", telemetrytypes.FieldDataTypeInt64, evo)
+		assert.Contains(t, build(t, key, qbtypes.FilterOperatorEqual, float64(0)), guard)
+	})
+	t.Run("exists is the raw multiIf, not always-true", func(t *testing.T) {
+		key := attrKey("http.status_code", telemetrytypes.FieldDataTypeInt64, evo)
+		assert.Contains(t, build(t, key, qbtypes.FilterOperatorExists, nil), guard)
+	})
+	t.Run("not exists negates the raw multiIf", func(t *testing.T) {
+		key := attrKey("http.status_code", telemetrytypes.FieldDataTypeInt64, evo)
+		sql := build(t, key, qbtypes.FilterOperatorNotExists, nil)
+		assert.Contains(t, sql, ", NULL) IS NULL")
+	})
+}

pkg/telemetryschema/tracestelemetryschema/field_mapper_attributes_promoted_test.go

@@ -0,0 +1,104 @@
+package tracestelemetryschema
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	"github.com/SigNoz/signoz/pkg/flagger/flaggertest"
+	qbtypes "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
+	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
+	"github.com/SigNoz/signoz/pkg/valuer"
+	"github.com/huandu/go-sqlbuilder"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+var (
+	promoJSONRelease  = time.Date(2025, 1, 1, 0, 0, 0, 0, time.UTC)
+	promoPromoRelease = time.Date(2025, 6, 1, 0, 0, 0, 0, time.UTC)
+)
+
+// TestFieldForAttributePromotedEvolution proves promotion is just a third evolution column:
+// evolution selection reads a single physical home per window — the legacy Map before the JSON
+// rollout, `attributes` between the JSON rollout and the path's promotion, and
+// `attributes_promoted` alone after promotion — fanning out only across an evolution boundary.
+func TestFieldForAttributePromotedEvolution(t *testing.T) {
+	ctx := context.Background()
+	fm := NewFieldMapper(flaggertest.New(t))
+	evo := MockPromotedAttributeEvolutionData("span.operation", promoJSONRelease, promoPromoRelease)
+
+	win := func(from, to string) [2]uint64 {
+		a, _ := time.Parse("2006-01-02", from)
+		b, _ := time.Parse("2006-01-02", to)
+		return [2]uint64{uint64(a.UnixNano()), uint64(b.UnixNano())}
+	}
+
+	testCases := []struct {
+		name     string
+		window   [2]uint64
+		expected string
+	}{
+		{"before json rollout -> map", win("2024-01-01", "2024-06-01"), "attributes_string['span.operation']"},
+		{"between json and promotion -> attributes", win("2025-02-01", "2025-04-01"), "attributes.`span.operation`::String"},
+		{"after promotion -> promoted only", win("2025-07-01", "2025-08-01"), "attributes_promoted.`span.operation`::String"},
+		{"straddle promotion -> attributes_promoted + attributes", win("2025-04-01", "2025-08-01"), "multiIf(attributes_promoted.`span.operation` IS NOT NULL, attributes_promoted.`span.operation`::String, attributes.`span.operation` IS NOT NULL, attributes.`span.operation`::String, NULL)"},
+		{"straddle json rollout -> attributes + map", win("2024-06-01", "2025-03-01"), "multiIf(attributes.`span.operation` IS NOT NULL, attributes.`span.operation`::String, mapContains(attributes_string, 'span.operation'), attributes_string['span.operation'], NULL)"},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			key := telemetrytypes.TelemetryFieldKey{
+				Name:          "span.operation",
+				FieldContext:  telemetrytypes.FieldContextAttribute,
+				FieldDataType: telemetrytypes.FieldDataTypeString,
+				Evolutions:    evo,
+			}
+			got, err := fm.FieldFor(ctx, valuer.UUID{}, tc.window[0], tc.window[1], &key)
+			require.NoError(t, err)
+			assert.Equal(t, tc.expected, got)
+		})
+	}
+}
+
+// TestConditionForAttributePromoted asserts a filter over a window fully after promotion reads
+// only the promoted column, with existence testing the promoted raw path (index-eligible via
+// attributes_promoted_paths_tokenbf) — not the attributes column.
+func TestConditionForAttributePromoted(t *testing.T) {
+	ctx := context.Background()
+	fm := NewFieldMapper(flaggertest.New(t))
+	cb := NewConditionBuilder(fm, flaggertest.New(t))
+	evo := MockPromotedAttributeEvolutionData("span.operation", promoJSONRelease, promoPromoRelease)
+	afterPromo := [2]uint64{
+		uint64(time.Date(2025, 7, 1, 0, 0, 0, 0, time.UTC).UnixNano()),
+		uint64(time.Date(2025, 8, 1, 0, 0, 0, 0, time.UTC).UnixNano()),
+	}
+
+	key := telemetrytypes.TelemetryFieldKey{
+		Name:          "span.operation",
+		FieldContext:  telemetrytypes.FieldContextAttribute,
+		FieldDataType: telemetrytypes.FieldDataTypeString,
+		Evolutions:    evo,
+	}
+
+	t.Run("equal reads promoted column only", func(t *testing.T) {
+		sb := sqlbuilder.NewSelectBuilder()
+		conds, _, err := cb.ConditionFor(ctx, valuer.UUID{}, afterPromo[0], afterPromo[1], &key,
+			map[string][]*telemetrytypes.TelemetryFieldKey{key.Name: {&key}}, qbtypes.ConditionBuilderOptions{}, qbtypes.FilterOperatorEqual, "GET", sb)
+		require.NoError(t, err)
+		sb.Where(conds...)
+		sql, _ := sb.BuildWithFlavor(sqlbuilder.ClickHouse)
+		assert.Contains(t, sql, "(attributes_promoted.`span.operation`::String = ? AND attributes_promoted.`span.operation` IS NOT NULL)")
+		assert.NotContains(t, sql, "attributes.`span.operation`")
+	})
+
+	t.Run("exists uses promoted raw path", func(t *testing.T) {
+		sb := sqlbuilder.NewSelectBuilder()
+		conds, _, err := cb.ConditionFor(ctx, valuer.UUID{}, afterPromo[0], afterPromo[1], &key,
+			map[string][]*telemetrytypes.TelemetryFieldKey{key.Name: {&key}}, qbtypes.ConditionBuilderOptions{}, qbtypes.FilterOperatorExists, nil, sb)
+		require.NoError(t, err)
+		sb.Where(conds...)
+		sql, _ := sb.BuildWithFlavor(sqlbuilder.ClickHouse)
+		assert.Contains(t, sql, "attributes_promoted.`span.operation` IS NOT NULL")
+	})
+}

pkg/telemetryschema/tracestelemetryschema/test_data.go

@@ -154,6 +154,34 @@ func BuildCompleteFieldKeyMap(releaseTime time.Time) map[string][]*telemetrytype
 	return keysMap
 }
 
+// MockAttributeEvolutionData returns the attribute-context evolution timeline: only the JSON
+// `attributes` migration released at releaseTime, field_name "__all__". The legacy map columns
+// are the epoch-0 base and are not stored as evolution rows; SelectEvolutionsForColumns
+// synthesizes the base entry for whichever typed map getColumn resolves the key to.
+func MockAttributeEvolutionData(releaseTime time.Time) []*telemetrytypes.EvolutionEntry {
+	return []*telemetrytypes.EvolutionEntry{
+		{
+			Signal:       telemetrytypes.SignalTraces,
+			ColumnName:   "attributes",
+			ColumnType:   "JSON()",
+			FieldContext: telemetrytypes.FieldContextAttribute,
+			FieldName:    "__all__",
+			ReleaseTime:  releaseTime,
+		},
+	}
+}
+
+// MockPromotedAttributeEvolutionData returns a promoted attribute's evolution timeline: the JSON
+// `attributes` column at jsonRelease (field_name "__all__") and the per-path `attributes_promoted`
+// column at promoteRelease (field_name = path). The legacy map is the synthesized epoch-0 base and
+// is not stored as an evolution row.
+func MockPromotedAttributeEvolutionData(path string, jsonRelease, promoteRelease time.Time) []*telemetrytypes.EvolutionEntry {
+	return []*telemetrytypes.EvolutionEntry{
+		{Signal: telemetrytypes.SignalTraces, ColumnName: "attributes", ColumnType: "JSON()", FieldContext: telemetrytypes.FieldContextAttribute, FieldName: "__all__", ReleaseTime: jsonRelease},
+		{Signal: telemetrytypes.SignalTraces, ColumnName: "attributes_promoted", ColumnType: "JSON()", FieldContext: telemetrytypes.FieldContextAttribute, FieldName: path, ReleaseTime: promoteRelease},
+	}
+}
+
 // MockEvolutionData returns the canonical resource-column evolution timeline used in tests:
 // the legacy resources_string map at epoch 0 and the JSON resource column released at releaseTime.
 func MockEvolutionData(releaseTime time.Time) []*telemetrytypes.EvolutionEntry {

pkg/types/querybuildertypes/querybuildertypesv5/evolution.go

@@ -23,8 +23,21 @@ func SelectEvolutionsForColumns(columns []*schema.Column, evolutions []*telemetr
 		return columns, nil, nil
 	}
 
-	sortedEvolutions := make([]*telemetrytypes.EvolutionEntry, len(evolutions))
-	copy(sortedEvolutions, evolutions)
+	// Derive the base column from the candidate columns.
+	seen := make(map[string]struct{}, len(evolutions))
+	for _, e := range evolutions {
+		seen[e.ColumnName] = struct{}{}
+	}
+
+	// never modify evolutions in place, it may be cached and shared across queries.
+	sortedEvolutions := make([]*telemetrytypes.EvolutionEntry, 0, len(evolutions)+len(columns))
+	sortedEvolutions = append(sortedEvolutions, evolutions...)
+	for _, c := range columns {
+		if _, ok := seen[c.Name]; ok {
+			continue
+		}
+		sortedEvolutions = append(sortedEvolutions, &telemetrytypes.EvolutionEntry{ColumnName: c.Name, ReleaseTime: time.Unix(0, 0)})
+	}
 
 	// sort the evolutions by ReleaseTime ascending
 	sort.Slice(sortedEvolutions, func(i, j int) bool {

pkg/types/telemetrytypes/telemetrytypestest/metadata_store.go

@@ -396,14 +396,15 @@ func (m *MockMetadataStore) updateColumnEvolutionMetadataForKeys(_ context.Conte
 			FieldContext: selector.FieldContext,
 			FieldName:    "__all__",
 		}
-		key := sel.QualifiedName()
-		if entries, exists := m.ColumnEvolutionMetadataMap[key]; exists {
-			result[key] = entries
-		}
+		// column-wide (__all__) homes plus this field's own homes, appended not replaced,
+		// mirroring the real store
+		var evolutions []*telemetrytypes.EvolutionEntry
+		evolutions = append(evolutions, m.ColumnEvolutionMetadataMap[sel.QualifiedName()]...)
 		sel.FieldName = metadataKeySelectors[i].FieldName
-		key = sel.QualifiedName()
-		if entries, exists := m.ColumnEvolutionMetadataMap[key]; exists {
-			result[key] = entries
+		evolutions = append(evolutions, m.ColumnEvolutionMetadataMap[sel.QualifiedName()]...)
+		if len(evolutions) > 0 {
+			keysToUpdate[i].Evolutions = evolutions
+			result[sel.QualifiedName()] = evolutions
 		}
 	}
 	return result

pkg/types/telemetrytypes/telemetrytypestest/metadata_store_test.go

@@ -0,0 +1,76 @@
+package telemetrytypestest
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
+	"github.com/SigNoz/signoz/pkg/valuer"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+// TestEvolutionAppendsPerFieldToColumnWide covers the metadata enrichment: a key's column-wide
+// (__all__) evolution homes and its per-field homes are appended, not replaced. A promoted
+// attribute (whose attributes_promoted entry lives under its own field name) must therefore keep
+// its Map and base-JSON homes for time ranges before it was promoted.
+func TestEvolutionAppendsPerFieldToColumnWide(t *testing.T) {
+	jsonRel := time.Date(2025, 1, 1, 0, 0, 0, 0, time.UTC)
+	promoRel := time.Date(2025, 6, 1, 0, 0, 0, 0, time.UTC)
+	mk := func(col, field string, rt time.Time) *telemetrytypes.EvolutionEntry {
+		return &telemetrytypes.EvolutionEntry{
+			Signal: telemetrytypes.SignalTraces, ColumnName: col,
+			FieldContext: telemetrytypes.FieldContextAttribute, FieldName: field, ReleaseTime: rt,
+		}
+	}
+
+	columnNames := func(entries []*telemetrytypes.EvolutionEntry) []string {
+		out := make([]string, 0, len(entries))
+		for _, e := range entries {
+			out = append(out, e.ColumnName)
+		}
+		return out
+	}
+
+	// Only JSON columns are recorded as evolution rows; the legacy Map column is the
+	// synthesized epoch-0 base and is not stored here.
+	newStore := func() *MockMetadataStore {
+		store := NewMockMetadataStore()
+		store.ColumnEvolutionMetadataMap["traces:attribute:__all__"] = []*telemetrytypes.EvolutionEntry{
+			mk("attributes", "__all__", jsonRel),
+		}
+		return store
+	}
+
+	resolve := func(t *testing.T, store *MockMetadataStore, name string) *telemetrytypes.TelemetryFieldKey {
+		t.Helper()
+		key := &telemetrytypes.TelemetryFieldKey{
+			Name: name, Signal: telemetrytypes.SignalTraces,
+			FieldContext: telemetrytypes.FieldContextAttribute, FieldDataType: telemetrytypes.FieldDataTypeString,
+		}
+		store.KeysMap[name] = []*telemetrytypes.TelemetryFieldKey{key}
+		selector := &telemetrytypes.FieldKeySelector{
+			Name: name, Signal: telemetrytypes.SignalTraces,
+			FieldContext: telemetrytypes.FieldContextAttribute, SelectorMatchType: telemetrytypes.FieldSelectorMatchTypeExact,
+		}
+		_, _, err := store.GetKeysMulti(context.Background(), valuer.UUID{}, []*telemetrytypes.FieldKeySelector{selector})
+		require.NoError(t, err)
+		return key
+	}
+
+	t.Run("promoted key keeps the column-wide attributes home and gains the promoted column", func(t *testing.T) {
+		store := newStore()
+		store.ColumnEvolutionMetadataMap["traces:attribute:span.operation"] = []*telemetrytypes.EvolutionEntry{
+			mk("attributes_promoted", "span.operation", promoRel),
+		}
+		key := resolve(t, store, "span.operation")
+		assert.ElementsMatch(t, []string{"attributes", "attributes_promoted"}, columnNames(key.Evolutions))
+	})
+
+	t.Run("non-promoted key gets only the column-wide home", func(t *testing.T) {
+		store := newStore()
+		key := resolve(t, store, "user.id")
+		assert.ElementsMatch(t, []string{"attributes"}, columnNames(key.Evolutions))
+	})
+}

tests/conftest.py

@@ -114,6 +114,6 @@ def pytest_addoption(parser: pytest.Parser):
     parser.addoption(
         "--schema-migrator-version",
         action="store",
-        default="v0.144.6",
+        default="v0.144.9", # todo(nikhil): change to 0.144.10
         help="schema migrator version",
     )

tests/fixtures/traces.py

@@ -292,6 +292,7 @@ class Traces(ABC):
     events: list[dict[str, Any]]
     links: list[dict[str, Any]]
     resource_json: dict[str, str]
+    attributes_json: dict[str, Any]
     response_status_code: str
     external_http_url: str
     http_url: str
@@ -330,6 +331,7 @@ class Traces(ABC):
         flags: np.uint32 = 0,
         scope: dict[str, Any] = {},
         resource_write_mode: Literal["legacy_only", "dual_write"] = "dual_write",
+        attribute_write_mode: Literal["legacy_only", "dual_write"] = "dual_write",
     ) -> None:
         if timestamp is None:
             timestamp = datetime.datetime.now()
@@ -510,6 +512,11 @@ class Traces(ABC):
                     )
                 )
 
+        # Spans before the attribute JSON-evolution time populate only the legacy
+        # attributes_{string,number,bool} maps; spans at or after it dual-write the
+        # native-typed `attributes` JSON column too.
+        self.attributes_json = {} if attribute_write_mode == "legacy_only" else dict(attributes)
+
         # Process events and derive error events. self.events holds the parsed
         # response shape; np_arr() encodes back to the DB format on insert.
         self.events = []
@@ -689,6 +696,7 @@ class Traces(ABC):
                 self.is_remote,
                 self.resource_json,
                 self.scope_json,
+                self.attributes_json,
             ],
             dtype=object,
         )
@@ -860,6 +868,7 @@ def insert_traces_to_clickhouse(conn, traces: list[Traces]) -> None:
             "is_remote",
             "resource",
             "scope",
+            "attributes",
         ],
         data=[trace.np_arr() for trace in traces],
     )
@@ -923,6 +932,37 @@ def insert_traces(
     )
 
 
+def insert_attribute_evolution_to_clickhouse(conn, signal: str, release_time: datetime.datetime) -> None:
+    """Seed the `attributes` JSON column-evolution row for a signal at release_time. Unlike the
+    resource row (seeded by the migrator at install), the attribute JSON rollout is install-specific
+    and not migrator-seeded, so tests insert it to gate map-vs-JSON resolution across a window."""
+    conn.command(
+        """
+        INSERT INTO signoz_metadata.distributed_column_evolution_metadata
+            (signal, column_name, column_type, field_context, field_name, version, release_time)
+        VALUES (%(signal)s, 'attributes', 'JSON()', 'attribute', '__all__', 1, %(release_time_ns)s)
+        """,
+        parameters={"signal": signal, "release_time_ns": int(release_time.timestamp() * 1e9)},
+    )
+
+
+@pytest.fixture(name="seed_attribute_evolution", scope="function")
+def seed_attribute_evolution(
+    clickhouse: types.TestContainerClickhouse,
+) -> Generator[Callable[[str, datetime.datetime], None], Any]:
+    def _seed(signal: str, release_time: datetime.datetime) -> None:
+        insert_attribute_evolution_to_clickhouse(clickhouse.conn, signal, release_time)
+
+    yield _seed
+
+    cluster = clickhouse.env["SIGNOZ_TELEMETRYSTORE_CLICKHOUSE_CLUSTER"]
+    clickhouse.conn.query(
+        f"ALTER TABLE signoz_metadata.column_evolution_metadata ON CLUSTER '{cluster}' "
+        "DELETE WHERE column_name = 'attributes' AND field_context = 'attribute' AND field_name = '__all__' "
+        "SETTINGS mutations_sync = 1"
+    )
+
+
 @pytest.fixture(name="insert_top_level_operations", scope="function")
 def insert_top_level_operations(
     clickhouse: types.TestContainerClickhouse,

tests/integration/tests/queriercommon/07_fields_keys_values.py

@@ -1,235 +0,0 @@
-from collections.abc import Callable
-from datetime import UTC, datetime, timedelta
-from http import HTTPStatus
-
-import pytest
-import requests
-
-from fixtures import types
-from fixtures.auth import USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD
-from fixtures.logs import Logs
-from fixtures.traces import Traces
-
-
-@pytest.mark.parametrize(
-    "signal,field_context,present,absent",
-    [
-        pytest.param("logs", "log", {"severity_text": "log", "body": "log", "trace_id": "log"}, ["code.file", "scope_name"], id="log_context_lists_log_intrinsics"),
-        pytest.param("logs", "scope", {"scope_name": "scope", "scope_version": "scope"}, ["severity_text", "body", "code.file"], id="scope_context_lists_scope_intrinsics_for_logs"),
-        pytest.param("logs", "attribute", {"code.file": "attribute"}, ["body", "scope_name"], id="attribute_context_excludes_log_intrinsics"),
-        pytest.param("traces", "span", {"name": "span", "has_error": "span", "isRoot": "span", "http.method": "attribute"}, ["scope.name"], id="span_context_lists_span_intrinsics_and_attributes"),
-        pytest.param("traces", "scope", {"scope.name": "scope", "scope.version": "scope"}, ["name", "has_error", "isRoot"], id="scope_context_lists_scope_intrinsics_for_traces"),
-        pytest.param("traces", "resource", {"host.name": "resource"}, ["name", "has_error", "isRoot", "http.method"], id="resource_context_excludes_span_intrinsics"),
-        pytest.param("traces", "attribute", {"http.method": "attribute"}, ["name", "has_error", "isRoot", "host.name"], id="attribute_context_excludes_span_intrinsics"),
-    ],
-)
-def test_fields_keys_by_context(
-    signoz: types.SigNoz,
-    create_user_admin: None,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    insert_logs: Callable[[list[Logs]], None],
-    insert_traces: Callable[[list[Traces]], None],
-    signal: str,
-    field_context: str,
-    present: dict[str, str],
-    absent: list[str],
-) -> None:
-    """
-    Setup:
-    Insert a log with a code.file attribute and a span with an http.method attribute and a host.name resource.
-
-    Tests:
-    1. Keys for a context list that context's intrinsic columns and the stored keys the context maps to,
-       each with its context; intrinsics of other contexts are not listed. The span context also keeps
-       listing attributes because `span.<attribute>` resolves attributes in queries.
-    """
-    now = datetime.now(tz=UTC)
-    insert_logs([Logs(timestamp=now, attributes={"code.file": "/opt/integration.go"}, body="a log line")])
-    insert_traces([Traces(timestamp=now, resources={"host.name": "linux-001"}, attributes={"http.method": "GET"})])
-
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-    response = requests.get(
-        signoz.self.host_configs["8080"].get("/api/v1/fields/keys"),
-        timeout=2,
-        headers={"authorization": f"Bearer {token}"},
-        params={"signal": signal, "fieldContext": field_context},
-    )
-
-    assert response.status_code == HTTPStatus.OK
-    keys = response.json()["data"]["keys"]
-    listed = {name: [key["fieldContext"] for key in keys.get(name, [])] for name in present}
-    assert listed == {name: [context] for name, context in present.items()}, f"keys for the {field_context} context"
-    assert [name for name in absent if name in keys] == [], f"keys that do not belong to the {field_context} context"
-
-
-@pytest.mark.parametrize(
-    "signal,field_context,field_data_type,present,absent",
-    [
-        pytest.param("traces", "span", "float64", ["duration_nano", "status_code"], ["name", "has_error"], id="float64_matches_number_span_intrinsics"),
-        pytest.param("traces", "span", "int64", ["duration_nano", "status_code"], ["name", "has_error"], id="int64_matches_number_span_intrinsics"),
-        pytest.param("traces", "span", "bool", ["has_error", "isRoot", "isEntryPoint"], ["name", "duration_nano"], id="bool_matches_bool_span_intrinsics"),
-        pytest.param("traces", "span", "string", ["name", "http_method"], ["duration_nano", "has_error"], id="string_matches_string_span_intrinsics"),
-        pytest.param("logs", "log", "number", ["severity_number", "trace_flags"], ["severity_text", "body"], id="number_matches_number_log_intrinsics"),
-    ],
-)
-def test_fields_keys_by_data_type(
-    signoz: types.SigNoz,
-    create_user_admin: None,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    signal: str,
-    field_context: str,
-    field_data_type: str,
-    present: list[str],
-    absent: list[str],
-) -> None:
-    """
-    Tests:
-    1. A data type filter keeps the intrinsic columns of that type; number, int64 and float64 are one family.
-    """
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-    response = requests.get(
-        signoz.self.host_configs["8080"].get("/api/v1/fields/keys"),
-        timeout=2,
-        headers={"authorization": f"Bearer {token}"},
-        params={"signal": signal, "fieldContext": field_context, "fieldDataType": field_data_type},
-    )
-
-    assert response.status_code == HTTPStatus.OK
-    keys = response.json()["data"]["keys"]
-    assert [name for name in present if name not in keys] == [], f"intrinsics of type {field_data_type}"
-    assert [name for name in absent if name in keys] == [], f"intrinsics not of type {field_data_type}"
-
-
-@pytest.mark.parametrize(
-    "signal,search_text,present",
-    [
-        pytest.param("logs", "SEVERITY", ["severity_text", "severity_number"], id="upper_case_search_logs"),
-        pytest.param("traces", "HTTP_", ["http_method", "http_host", "http_url"], id="upper_case_search_traces"),
-        pytest.param("traces", "Duration", ["duration_nano"], id="mixed_case_search_traces"),
-        pytest.param("traces", "span.HAS_ERR", ["has_error"], id="context_prefix_with_upper_case_search"),
-    ],
-)
-def test_fields_keys_search_matches_intrinsics_case_insensitively(
-    signoz: types.SigNoz,
-    create_user_admin: None,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    signal: str,
-    search_text: str,
-    present: list[str],
-) -> None:
-    """
-    Tests:
-    1. The search text matches intrinsic columns case-insensitively, as it does for stored keys,
-       with or without a context prefix.
-    """
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-    response = requests.get(
-        signoz.self.host_configs["8080"].get("/api/v1/fields/keys"),
-        timeout=2,
-        headers={"authorization": f"Bearer {token}"},
-        params={"signal": signal, "searchText": search_text},
-    )
-
-    assert response.status_code == HTTPStatus.OK
-    keys = response.json()["data"]["keys"]
-    assert [name for name in present if name not in keys] == [], f"intrinsics matching {search_text!r}"
-
-
-@pytest.mark.parametrize(
-    "signal,params,expected",
-    [
-        pytest.param("traces", {"name": "has_error"}, [True, False], id="calculated_bool_span_field"),
-        pytest.param("traces", {"name": "has_error", "fieldContext": "span"}, [True, False], id="calculated_bool_span_field_with_context"),
-        pytest.param("traces", {"name": "has_error", "searchText": "tr"}, [True], id="search_text_narrows_bool_values"),
-        pytest.param("logs", {"name": "retry"}, [True, False], id="bool_attribute_from_tag_rows"),
-        pytest.param("logs", {"name": "retry", "fieldContext": "attribute"}, [True, False], id="bool_attribute_with_context"),
-        pytest.param("logs", {"name": "never_seen", "fieldDataType": "bool"}, [True, False], id="declared_bool_type_needs_no_rows"),
-    ],
-)
-def test_fields_values_bool_fields(
-    signoz: types.SigNoz,
-    create_user_admin: None,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    insert_logs: Callable[[list[Logs]], None],
-    signal: str,
-    params: dict[str, str],
-    expected: list[bool],
-) -> None:
-    """
-    Setup:
-    Insert a log with a bool attribute.
-
-    Tests:
-    1. Values for a bool field are true and false (narrowed by the search text): for the calculated span
-       field, for a stored bool attribute whose tag rows carry no value, and for a key the caller declares bool.
-    """
-    insert_logs([Logs(timestamp=datetime.now(tz=UTC), attributes={"retry": True}, body="retrying")])
-
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-    response = requests.get(
-        signoz.self.host_configs["8080"].get("/api/v1/fields/values"),
-        timeout=2,
-        headers={"authorization": f"Bearer {token}"},
-        params={"signal": signal, **params},
-    )
-
-    assert response.status_code == HTTPStatus.OK
-    assert response.json()["data"]["values"]["boolValues"] == expected
-    assert response.json()["data"]["complete"] is True
-
-
-@pytest.mark.parametrize("signal", [pytest.param("logs", id="logs"), pytest.param("traces", id="traces")])
-def test_fields_values_start_excludes_values_not_seen_since(
-    signoz: types.SigNoz,
-    create_user_admin: None,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    insert_logs: Callable[[list[Logs]], None],
-    insert_traces: Callable[[list[Traces]], None],
-    signal: str,
-) -> None:
-    """
-    Setup:
-    Insert a log and a span three days old and a log and a span now, with different service names.
-
-    Tests:
-    1. Values with startUnixMilli an hour ago contain only the service seen now.
-    2. Values without a start contain both services.
-    """
-    now = datetime.now(tz=UTC)
-    insert_logs(
-        [
-            Logs(timestamp=now - timedelta(days=3), resources={"service.name": "archived-service"}, body="old"),
-            Logs(timestamp=now, resources={"service.name": "live-service"}, body="new"),
-        ]
-    )
-    insert_traces(
-        [
-            Traces(timestamp=now - timedelta(days=3), resources={"service.name": "archived-service"}),
-            Traces(timestamp=now, resources={"service.name": "live-service"}),
-        ]
-    )
-
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-    response = requests.get(
-        signoz.self.host_configs["8080"].get("/api/v1/fields/values"),
-        timeout=2,
-        headers={"authorization": f"Bearer {token}"},
-        params={
-            "signal": signal,
-            "name": "service.name",
-            "startUnixMilli": int((now - timedelta(hours=1)).timestamp() * 1000),
-        },
-    )
-
-    assert response.status_code == HTTPStatus.OK
-    assert response.json()["data"]["values"]["stringValues"] == ["live-service"], "values last seen before the start must be dropped"
-
-    response = requests.get(
-        signoz.self.host_configs["8080"].get("/api/v1/fields/values"),
-        timeout=2,
-        headers={"authorization": f"Bearer {token}"},
-        params={"signal": signal, "name": "service.name"},
-    )
-
-    assert response.status_code == HTTPStatus.OK
-    assert set(response.json()["data"]["values"]["stringValues"]) == {"archived-service", "live-service"}

tests/integration/tests/queriertraces/13_attributes_json_evolution.py

@@ -0,0 +1,339 @@
+from collections.abc import Callable
+from datetime import UTC, datetime, timedelta
+from http import HTTPStatus
+
+from fixtures import types
+from fixtures.auth import USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD
+from fixtures.querier import (
+    RequestType,
+    assert_grouped_series,
+    build_aggregation,
+    build_group_by_field,
+    build_traces_scalar_query,
+    index_series_by_label,
+    make_query_request,
+)
+from fixtures.traces import TraceIdGenerator, Traces
+
+
+def test_traces_attributes_json_evolution(
+    signoz: types.SigNoz,
+    create_user_admin: None,  # pylint: disable=unused-argument
+    get_token: Callable[[str, str], str],
+    insert_traces: Callable[[list[Traces]], None],
+    seed_attribute_evolution: Callable[[str, datetime], None],
+) -> None:
+    """`http.route` is a dotted key, so the `attributes` JSON column nests it under the path
+    http.route while the legacy attributes_string map keys it verbatim. Spans before the attribute
+    JSON-evolution time write only the map; spans at or after it dual-write the JSON column too. A
+    query window resolves the attribute to the map (before), the JSON nested path (after), or a
+    map+JSON multiIf (straddling), and must return identical rows across the boundary."""
+    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
+
+    evolution_time = datetime.now(tz=UTC).replace(second=0, microsecond=0) - timedelta(minutes=30)
+    seed_attribute_evolution("traces", evolution_time)
+
+    before_2 = evolution_time - timedelta(minutes=10)
+    before_1 = evolution_time - timedelta(minutes=5)
+    after_1 = evolution_time + timedelta(minutes=5)
+    after_2 = evolution_time + timedelta(minutes=10)
+
+    insert_traces(
+        [
+            Traces(
+                timestamp=before_2,
+                trace_id=TraceIdGenerator.trace_id(),
+                span_id=TraceIdGenerator.span_id(),
+                name="before 2",
+                attributes={"http.route": "/d"},
+                attribute_write_mode="legacy_only",
+            ),
+            Traces(
+                timestamp=before_1,
+                trace_id=TraceIdGenerator.trace_id(),
+                span_id=TraceIdGenerator.span_id(),
+                name="before 1",
+                attributes={"http.route": "/c"},
+                attribute_write_mode="legacy_only",
+            ),
+            Traces(
+                timestamp=after_1,
+                trace_id=TraceIdGenerator.trace_id(),
+                span_id=TraceIdGenerator.span_id(),
+                name="after 1",
+                attributes={"http.route": "/a", "http.retry.count": 5, "http.cache.hit": True},
+                attribute_write_mode="dual_write",
+            ),
+            Traces(
+                timestamp=after_2,
+                trace_id=TraceIdGenerator.trace_id(),
+                span_id=TraceIdGenerator.span_id(),
+                name="after 2",
+                attributes={"http.route": "/b", "http.retry.count": 1, "http.cache.hit": False},
+                attribute_write_mode="dual_write",
+            ),
+        ]
+    )
+
+    # before window -> map-only resolution
+    response = make_query_request(
+        signoz,
+        token,
+        start_ms=int((before_2 - timedelta(minutes=1)).timestamp() * 1000),
+        end_ms=int((before_1 + timedelta(minutes=1)).timestamp() * 1000),
+        request_type=RequestType.TIME_SERIES,
+        queries=[
+            build_traces_scalar_query(
+                aggregations=[build_aggregation("count()")],
+                group_by=[build_group_by_field("http.route", field_context="attribute")],
+            )
+        ],
+    )
+    assert response.status_code == HTTPStatus.OK
+    before_series = index_series_by_label(
+        response.json()["data"]["data"]["results"][0]["aggregations"][0]["series"], "http.route"
+    )
+    assert_grouped_series(
+        before_series,
+        expected_values_by_group={
+            "/d": {int(before_2.timestamp() * 1000): 1},
+            "/c": {int(before_1.timestamp() * 1000): 1},
+        },
+    )
+
+    # after window -> JSON-only resolution (nested path)
+    response = make_query_request(
+        signoz,
+        token,
+        start_ms=int((after_1 - timedelta(minutes=1)).timestamp() * 1000),
+        end_ms=int((after_2 + timedelta(minutes=1)).timestamp() * 1000),
+        request_type=RequestType.TIME_SERIES,
+        queries=[
+            build_traces_scalar_query(
+                aggregations=[build_aggregation("count()")],
+                group_by=[build_group_by_field("http.route", field_context="attribute")],
+            )
+        ],
+    )
+    assert response.status_code == HTTPStatus.OK
+    after_series = index_series_by_label(
+        response.json()["data"]["data"]["results"][0]["aggregations"][0]["series"], "http.route"
+    )
+    assert_grouped_series(
+        after_series,
+        expected_values_by_group={
+            "/a": {int(after_1.timestamp() * 1000): 1},
+            "/b": {int(after_2.timestamp() * 1000): 1},
+        },
+    )
+
+    # straddling window -> map + JSON multiIf resolution
+    response = make_query_request(
+        signoz,
+        token,
+        start_ms=int(before_2.timestamp() * 1000),
+        end_ms=int((after_2 + timedelta(minutes=1)).timestamp() * 1000),
+        request_type=RequestType.TIME_SERIES,
+        queries=[
+            build_traces_scalar_query(
+                aggregations=[build_aggregation("count()")],
+                group_by=[build_group_by_field("http.route", field_context="attribute")],
+            )
+        ],
+    )
+    assert response.status_code == HTTPStatus.OK
+    spanning_series = index_series_by_label(
+        response.json()["data"]["data"]["results"][0]["aggregations"][0]["series"], "http.route"
+    )
+    assert_grouped_series(
+        spanning_series,
+        expected_values_by_group={
+            "/d": {int(before_2.timestamp() * 1000): 1},
+            "/c": {int(before_1.timestamp() * 1000): 1},
+            "/a": {int(after_1.timestamp() * 1000): 1},
+            "/b": {int(after_2.timestamp() * 1000): 1},
+        },
+    )
+
+
+def test_traces_attributes_json_typed_filters(
+    signoz: types.SigNoz,
+    create_user_admin: None,  # pylint: disable=unused-argument
+    get_token: Callable[[str, str], str],
+    insert_traces: Callable[[list[Traces]], None],
+    seed_attribute_evolution: Callable[[str, datetime], None],
+) -> None:
+    """In the JSON-only window each dotted attribute reads through the nested path with its native
+    cast: string (::String), Int64 (toFloat64(...::Nullable(Float64))), Bool (::Nullable(Bool)),
+    and existence via the raw path. Filters must select the same rows the Map path would."""
+    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
+
+    evolution_time = datetime.now(tz=UTC).replace(second=0, microsecond=0) - timedelta(minutes=30)
+    seed_attribute_evolution("traces", evolution_time)
+
+    hit = evolution_time + timedelta(minutes=5)
+    miss = evolution_time + timedelta(minutes=6)
+
+    insert_traces(
+        [
+            Traces(
+                timestamp=hit,
+                trace_id=TraceIdGenerator.trace_id(),
+                span_id=TraceIdGenerator.span_id(),
+                name="hit",
+                attributes={"http.route": "/a", "http.retry.count": 5, "http.cache.hit": True},
+                attribute_write_mode="dual_write",
+            ),
+            Traces(
+                timestamp=miss,
+                trace_id=TraceIdGenerator.trace_id(),
+                span_id=TraceIdGenerator.span_id(),
+                name="miss",
+                attributes={"http.route": "/b", "http.retry.count": 1, "http.cache.hit": False},
+                attribute_write_mode="dual_write",
+            ),
+        ]
+    )
+
+    start_ms = int((hit - timedelta(minutes=1)).timestamp() * 1000)
+    end_ms = int((miss + timedelta(minutes=1)).timestamp() * 1000)
+
+    for label, filter_expression, expected in [
+        ("string_eq", "http.route = '/a'", {"/a"}),
+        ("int_gt", "http.retry.count > 1", {"/a"}),
+        ("bool_eq", "http.cache.hit = true", {"/a"}),
+        ("exists", "http.cache.hit EXISTS", {"/a", "/b"}),
+    ]:
+        response = make_query_request(
+            signoz,
+            token,
+            start_ms=start_ms,
+            end_ms=end_ms,
+            request_type=RequestType.TIME_SERIES,
+            queries=[
+                build_traces_scalar_query(
+                    aggregations=[build_aggregation("count()")],
+                    group_by=[build_group_by_field("http.route", field_context="attribute")],
+                    filter_expression=filter_expression,
+                )
+            ],
+        )
+        assert response.status_code == HTTPStatus.OK, label
+        series = index_series_by_label(
+            response.json()["data"]["data"]["results"][0]["aggregations"][0]["series"], "http.route"
+        )
+        assert set(series.keys()) == expected, label
+
+
+def test_traces_attributes_json_collision_and_map_parity(
+    signoz: types.SigNoz,
+    create_user_admin: None,  # pylint: disable=unused-argument
+    get_token: Callable[[str, str], str],
+    insert_traces: Callable[[list[Traces]], None],
+    seed_attribute_evolution: Callable[[str, datetime], None],
+) -> None:
+    """A name stored under two types (`app.status` as 200 and 'teapot') is one JSON path with
+    per-row types. The Map-era behavior must hold on it: group-by reads each row as its stored
+    type, numeric comparisons self-guard wrong-typed rows out via NULL, negative operators keep
+    rows lacking a numeric value (Map defaulted them to 0), and EXISTS/NOT EXISTS see the key
+    across every stored type."""
+    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
+
+    evolution_time = datetime.now(tz=UTC).replace(second=0, microsecond=0) - timedelta(minutes=30)
+    seed_attribute_evolution("traces", evolution_time)
+
+    hit = evolution_time + timedelta(minutes=5)
+    insert_traces(
+        [
+            Traces(
+                timestamp=hit,
+                trace_id=TraceIdGenerator.trace_id(),
+                span_id=TraceIdGenerator.span_id(),
+                name="numeric",
+                attributes={"http.route": "/num", "app.status": 200},
+                attribute_write_mode="dual_write",
+            ),
+            Traces(
+                timestamp=hit,
+                trace_id=TraceIdGenerator.trace_id(),
+                span_id=TraceIdGenerator.span_id(),
+                name="string",
+                attributes={"http.route": "/str", "app.status": "teapot"},
+                attribute_write_mode="dual_write",
+            ),
+            Traces(
+                timestamp=hit,
+                trace_id=TraceIdGenerator.trace_id(),
+                span_id=TraceIdGenerator.span_id(),
+                name="float",
+                attributes={"http.route": "/float", "app.latency": 2.5},
+                attribute_write_mode="dual_write",
+            ),
+            Traces(
+                timestamp=hit,
+                trace_id=TraceIdGenerator.trace_id(),
+                span_id=TraceIdGenerator.span_id(),
+                name="absent",
+                attributes={"http.route": "/absent"},
+                attribute_write_mode="dual_write",
+            ),
+        ]
+    )
+
+    start_ms = int((hit - timedelta(minutes=1)).timestamp() * 1000)
+    end_ms = int((hit + timedelta(minutes=1)).timestamp() * 1000)
+
+    # Group-by on the colliding name: each row reads as its stored type through one path.
+    response = make_query_request(
+        signoz,
+        token,
+        start_ms=start_ms,
+        end_ms=end_ms,
+        request_type=RequestType.TIME_SERIES,
+        queries=[
+            build_traces_scalar_query(
+                aggregations=[build_aggregation("count()")],
+                group_by=[build_group_by_field("app.status", field_context="attribute")],
+                filter_expression="app.status EXISTS",
+            )
+        ],
+    )
+    assert response.status_code == HTTPStatus.OK, "collision group-by"
+    series = index_series_by_label(
+        response.json()["data"]["data"]["results"][0]["aggregations"][0]["series"], "app.status"
+    )
+    assert set(series.keys()) == {"200", "teapot"}, "collision group-by"
+
+    # Filters against the colliding/numeric names, grouped by route.
+    for label, filter_expression, expected in [
+        # numeric comparison: wrong-typed and absent rows self-guard out via NULL
+        ("num_eq", "app.status = 200", {"/num"}),
+        # = 0 must NOT match absent or string-stored rows (Map: numeric map lacks them)
+        ("num_eq_zero", "app.status = 0", set()),
+        # negative operator: rows without a numeric value read as the Map default 0 and are kept
+        ("num_ne", "app.status != 500", {"/num", "/str", "/float", "/absent"}),
+        # cross-numeric: a float-stored value answers a numeric comparison
+        ("float_gt", "app.latency > 2", {"/float"}),
+        # EXISTS sees the key across every stored type; NOT EXISTS means absent in all of them
+        ("exists_all_types", "app.status EXISTS", {"/num", "/str"}),
+        ("not_exists_all_types", "app.status NOT EXISTS", {"/float", "/absent"}),
+    ]:
+        response = make_query_request(
+            signoz,
+            token,
+            start_ms=start_ms,
+            end_ms=end_ms,
+            request_type=RequestType.TIME_SERIES,
+            queries=[
+                build_traces_scalar_query(
+                    aggregations=[build_aggregation("count()")],
+                    group_by=[build_group_by_field("http.route", field_context="attribute")],
+                    filter_expression=filter_expression,
+                )
+            ],
+        )
+        assert response.status_code == HTTPStatus.OK, label
+        series = index_series_by_label(
+            response.json()["data"]["data"]["results"][0]["aggregations"][0]["series"], "http.route"
+        )
+        assert set(series.keys()) == expected, label