Merge branch 'main' into issue_4203

Co-authored-by: Tushar Vats <tushar@signoz.io>

.prettierrc

@@ -1,3 +0,0 @@
-{
-  "trailingComma": "none"
-}

.vscode/settings.json

@@ -1,25 +1,23 @@
 {
-  "eslint.workingDirectories": ["./frontend"],
-  "editor.formatOnSave": true,
-  "editor.defaultFormatter": "esbenp.prettier-vscode",
-  "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": "explicit"
-  },
-  "prettier.requireConfig": true,
-  "[go]": {
-    "editor.formatOnSave": true,
-    "editor.defaultFormatter": "golang.go"
-  },
-  "[sql]": {
-    "editor.defaultFormatter": "adpyke.vscode-sql-formatter"
-  },
-  "[html]": {
-    "editor.defaultFormatter": "vscode.html-language-features"
-  },
-  "python-envs.defaultEnvManager": "ms-python.python:system",
-  "python-envs.pythonProjects": [],
-  "editor.tokenColorCustomizations": {
-    "comments": "",
-    "textMateRules": []
-  }
+	"eslint.workingDirectories": [
+		"./frontend"
+	],
+	"editor.formatOnSave": true,
+	"editor.defaultFormatter": "esbenp.prettier-vscode",
+	"editor.codeActionsOnSave": {
+		"source.fixAll.eslint": "explicit"
+	},
+	"prettier.requireConfig": true,
+	"[go]": {
+		"editor.formatOnSave": true,
+		"editor.defaultFormatter": "golang.go"
+	},
+	"[sql]": {
+		"editor.defaultFormatter": "adpyke.vscode-sql-formatter"
+	},
+	"[html]": {
+		"editor.defaultFormatter": "vscode.html-language-features"
+	},
+	"python-envs.defaultEnvManager": "ms-python.python:system",
+	"python-envs.pythonProjects": []
 }

frontend/src/container/DashboardContainer/DashboardDescription/index.tsx

@@ -577,6 +577,11 @@ function DashboardDescription(props: DashboardDescriptionProps): JSX.Element {
 				open={isPanelNameModalOpen}
 				title="New Section"
 				rootClassName="section-naming"
+				onOk={(): void => handleAddRow()}
+				onCancel={(): void => {
+					setIsPanelNameModalOpen(false);
+					setSectionName(DEFAULT_ROW_NAME);
+				}}
 				footer={
 					<div className="dashboard-rename">
 						<Button

frontend/src/container/InfraMonitoringK8s/__tests__/Volumes/K8sVolumesList.test.tsx

@@ -1,390 +0,0 @@
-import { QueryClient, QueryClientProvider } from 'react-query';
-// eslint-disable-next-line no-restricted-imports
-import { MemoryRouter } from 'react-router-dom-v5-compat';
-import { FeatureKeys } from 'constants/features';
-import K8sVolumesList from 'container/InfraMonitoringK8s/Volumes/K8sVolumesList';
-import { rest, server } from 'mocks-server/server';
-import { NuqsTestingAdapter } from 'nuqs/adapters/testing';
-import { IAppContext, IUser } from 'providers/App/types';
-import { QueryBuilderProvider } from 'providers/QueryBuilder';
-// eslint-disable-next-line no-restricted-imports
-import { applyMiddleware, legacy_createStore as createStore } from 'redux';
-import thunk from 'redux-thunk';
-import reducers from 'store/reducers';
-import { act, render, screen, userEvent, waitFor } from 'tests/test-utils';
-import { UPDATE_TIME_INTERVAL } from 'types/actions/globalTime';
-import { LicenseResModel } from 'types/api/licensesV3/getActive';
-
-import { INFRA_MONITORING_K8S_PARAMS_KEYS } from '../../constants';
-
-const SERVER_URL = 'http://localhost/api';
-
-// jsdom does not implement IntersectionObserver — provide a no-op stub
-const mockObserver = {
-	observe: jest.fn(),
-	unobserve: jest.fn(),
-	disconnect: jest.fn(),
-};
-global.IntersectionObserver = jest
-	.fn()
-	.mockImplementation(() => mockObserver) as any;
-
-const mockVolume = {
-	persistentVolumeClaimName: 'test-pvc',
-	volumeAvailable: 1000000,
-	volumeCapacity: 5000000,
-	volumeInodes: 100,
-	volumeInodesFree: 50,
-	volumeInodesUsed: 50,
-	volumeUsage: 4000000,
-	meta: {
-		k8s_cluster_name: 'test-cluster',
-		k8s_namespace_name: 'test-namespace',
-		k8s_node_name: 'test-node',
-		k8s_persistentvolumeclaim_name: 'test-pvc',
-		k8s_pod_name: 'test-pod',
-		k8s_pod_uid: 'test-pod-uid',
-		k8s_statefulset_name: '',
-	},
-};
-
-const mockVolumesResponse = {
-	status: 'success',
-	data: {
-		type: '',
-		records: [mockVolume],
-		groups: null,
-		total: 1,
-		sentAnyHostMetricsData: false,
-		isSendingK8SAgentMetrics: false,
-	},
-};
-
-/** Renders K8sVolumesList with a real Redux store so dispatched actions affect state. */
-function renderWithRealStore(
-	initialEntries?: Record<string, any>,
-): { testStore: ReturnType<typeof createStore> } {
-	const testStore = createStore(reducers, applyMiddleware(thunk as any));
-	const queryClient = new QueryClient({
-		defaultOptions: { queries: { retry: false } },
-	});
-
-	render(
-		<NuqsTestingAdapter searchParams={initialEntries}>
-			<QueryClientProvider client={queryClient}>
-				<QueryBuilderProvider>
-					<MemoryRouter>
-						<K8sVolumesList
-							isFiltersVisible={false}
-							handleFilterVisibilityChange={jest.fn()}
-							quickFiltersLastUpdated={-1}
-						/>
-					</MemoryRouter>
-				</QueryBuilderProvider>
-			</QueryClientProvider>
-		</NuqsTestingAdapter>,
-	);
-
-	return { testStore };
-}
-
-describe('K8sVolumesList - useGetAggregateKeys Category Regression', () => {
-	let requestsMade: Array<{
-		url: string;
-		params: URLSearchParams;
-		body?: any;
-	}> = [];
-
-	beforeEach(() => {
-		requestsMade = [];
-
-		server.use(
-			rest.get(`${SERVER_URL}/v3/autocomplete/attribute_keys`, (req, res, ctx) => {
-				const url = req.url.toString();
-				const params = req.url.searchParams;
-
-				requestsMade.push({
-					url,
-					params,
-				});
-
-				return res(
-					ctx.status(200),
-					ctx.json({
-						status: 'success',
-						data: {
-							attributeKeys: [],
-						},
-					}),
-				);
-			}),
-			rest.post(`${SERVER_URL}/v1/pvcs/list`, (req, res, ctx) =>
-				res(
-					ctx.status(200),
-					ctx.json({
-						status: 'success',
-						data: {
-							type: 'list',
-							records: [],
-							groups: null,
-							total: 0,
-							sentAnyHostMetricsData: false,
-							isSendingK8SAgentMetrics: false,
-						},
-					}),
-				),
-			),
-		);
-	});
-
-	afterEach(() => {
-		server.resetHandlers();
-	});
-
-	it('should call aggregate keys API with k8s_volume_capacity', async () => {
-		renderWithRealStore();
-
-		await waitFor(() => {
-			expect(requestsMade.length).toBeGreaterThan(0);
-		});
-
-		// Find the attribute_keys request
-		const attributeKeysRequest = requestsMade.find((req) =>
-			req.url.includes('/autocomplete/attribute_keys'),
-		);
-
-		expect(attributeKeysRequest).toBeDefined();
-
-		const aggregateAttribute = attributeKeysRequest?.params.get(
-			'aggregateAttribute',
-		);
-
-		expect(aggregateAttribute).toBe('k8s_volume_capacity');
-	});
-
-	it('should call aggregate keys API with k8s.volume.capacity when dotMetrics enabled', async () => {
-		jest
-			.spyOn(await import('providers/App/App'), 'useAppContext')
-			.mockReturnValue({
-				featureFlags: [
-					{
-						name: FeatureKeys.DOT_METRICS_ENABLED,
-						active: true,
-						usage: 0,
-						usage_limit: 0,
-						route: '',
-					},
-				],
-				user: { role: 'ADMIN' } as IUser,
-				activeLicense: (null as unknown) as LicenseResModel,
-			} as IAppContext);
-
-		renderWithRealStore();
-
-		await waitFor(() => {
-			expect(requestsMade.length).toBeGreaterThan(0);
-		});
-
-		const attributeKeysRequest = requestsMade.find((req) =>
-			req.url.includes('/autocomplete/attribute_keys'),
-		);
-
-		expect(attributeKeysRequest).toBeDefined();
-
-		const aggregateAttribute = attributeKeysRequest?.params.get(
-			'aggregateAttribute',
-		);
-
-		expect(aggregateAttribute).toBe('k8s.volume.capacity');
-	});
-});
-
-describe('K8sVolumesList', () => {
-	beforeEach(() => {
-		server.use(
-			rest.post('http://localhost/api/v1/pvcs/list', (_req, res, ctx) =>
-				res(ctx.status(200), ctx.json(mockVolumesResponse)),
-			),
-			rest.get(
-				'http://localhost/api/v3/autocomplete/attribute_keys',
-				(_req, res, ctx) =>
-					res(ctx.status(200), ctx.json({ data: { attributeKeys: [] } })),
-			),
-		);
-	});
-
-	it('renders volume rows from API response', async () => {
-		renderWithRealStore();
-
-		await waitFor(async () => {
-			const elements = await screen.findAllByText('test-pvc');
-
-			expect(elements.length).toBeGreaterThan(0);
-		});
-	});
-
-	it('opens VolumeDetails when a volume row is clicked', async () => {
-		const user = userEvent.setup();
-		renderWithRealStore();
-
-		const pvcCells = await screen.findAllByText('test-pvc');
-		expect(pvcCells.length).toBeGreaterThan(0);
-
-		const row = pvcCells[0].closest('tr');
-		expect(row).not.toBeNull();
-		await user.click(row!);
-
-		await waitFor(async () => {
-			const cells = await screen.findAllByText('test-pvc');
-			expect(cells.length).toBeGreaterThan(1);
-		});
-	});
-
-	it('closes VolumeDetails when the close button is clicked', async () => {
-		const user = userEvent.setup();
-		renderWithRealStore();
-
-		const pvcCells = await screen.findAllByText('test-pvc');
-		expect(pvcCells.length).toBeGreaterThan(0);
-
-		const row = pvcCells[0].closest('tr');
-		await user.click(row!);
-
-		await waitFor(() => {
-			expect(screen.getByRole('button', { name: 'Close' })).toBeInTheDocument();
-		});
-
-		await user.click(screen.getByRole('button', { name: 'Close' }));
-
-		await waitFor(() => {
-			expect(
-				screen.queryByRole('button', { name: 'Close' }),
-			).not.toBeInTheDocument();
-		});
-	});
-
-	it('does not re-fetch the volumes list when time range changes after selecting a volume', async () => {
-		const user = userEvent.setup();
-		let apiCallCount = 0;
-		server.use(
-			rest.post('http://localhost/api/v1/pvcs/list', async (_req, res, ctx) => {
-				apiCallCount += 1;
-				return res(ctx.status(200), ctx.json(mockVolumesResponse));
-			}),
-		);
-
-		const { testStore } = renderWithRealStore();
-
-		await waitFor(() => expect(apiCallCount).toBe(1));
-
-		const pvcCells = await screen.findAllByText('test-pvc');
-		const row = pvcCells[0].closest('tr');
-		await user.click(row!);
-		await waitFor(async () => {
-			const cells = await screen.findAllByText('test-pvc');
-			expect(cells.length).toBeGreaterThan(1);
-		});
-
-		// Wait for nuqs URL state to fully propagate to the component
-		// The selectedVolumeUID is managed via nuqs (async URL state),
-		// so we need to ensure the state has settled before dispatching time changes
-		await act(async () => {
-			await new Promise((resolve) => {
-				setTimeout(resolve, 0);
-			});
-		});
-
-		const countAfterClick = apiCallCount;
-
-		// There's a specific component causing the min/max time to be updated
-		// After the volume loads, it triggers the change again
-		// And then the query to fetch data for the selected volume enters in a loop
-		act(() => {
-			testStore.dispatch({
-				type: UPDATE_TIME_INTERVAL,
-				payload: {
-					minTime: Date.now() * 1000000 - 30 * 60 * 1000 * 1000000,
-					maxTime: Date.now() * 1000000,
-					selectedTime: '30m',
-				},
-			} as any);
-		});
-
-		// Allow any potential re-fetch to settle
-		await new Promise((resolve) => {
-			setTimeout(resolve, 500);
-		});
-
-		expect(apiCallCount).toBe(countAfterClick);
-	});
-
-	it('does not re-fetch groupedByRowData when time range changes after expanding a volume row with groupBy', async () => {
-		const user = userEvent.setup();
-		const groupByValue = [{ key: 'k8s_namespace_name' }];
-
-		let groupedByRowDataCallCount = 0;
-		server.use(
-			rest.post('http://localhost/api/v1/pvcs/list', async (req, res, ctx) => {
-				const body = await req.json();
-				// Check for both underscore and dot notation keys since dotMetricsEnabled
-				// may be true or false depending on test order
-				const isGroupedByRowDataRequest = body.filters?.items?.some(
-					(item: { key?: { key?: string }; value?: string }) =>
-						(item.key?.key === 'k8s_namespace_name' ||
-							item.key?.key === 'k8s.namespace.name') &&
-						item.value === 'test-namespace',
-				);
-				if (isGroupedByRowDataRequest) {
-					groupedByRowDataCallCount += 1;
-				}
-				return res(ctx.status(200), ctx.json(mockVolumesResponse));
-			}),
-			rest.get(
-				'http://localhost/api/v3/autocomplete/attribute_keys',
-				(_req, res, ctx) =>
-					res(
-						ctx.status(200),
-						ctx.json({
-							data: {
-								attributeKeys: [{ key: 'k8s_namespace_name', dataType: 'string' }],
-							},
-						}),
-					),
-			),
-		);
-
-		const { testStore } = renderWithRealStore({
-			[INFRA_MONITORING_K8S_PARAMS_KEYS.GROUP_BY]: JSON.stringify(groupByValue),
-		});
-
-		await waitFor(async () => {
-			const elements = await screen.findAllByText('test-namespace');
-			return expect(elements.length).toBeGreaterThan(0);
-		});
-
-		const row = (await screen.findAllByText('test-namespace'))[0].closest('tr');
-		expect(row).not.toBeNull();
-		user.click(row as HTMLElement);
-		await waitFor(() => expect(groupedByRowDataCallCount).toBe(1));
-
-		const countAfterExpand = groupedByRowDataCallCount;
-
-		act(() => {
-			testStore.dispatch({
-				type: UPDATE_TIME_INTERVAL,
-				payload: {
-					minTime: Date.now() * 1000000 - 30 * 60 * 1000 * 1000000,
-					maxTime: Date.now() * 1000000,
-					selectedTime: '30m',
-				},
-			} as any);
-		});
-
-		// Allow any potential re-fetch to settle
-		await new Promise((resolve) => {
-			setTimeout(resolve, 500);
-		});
-
-		expect(groupedByRowDataCallCount).toBe(countAfterExpand);
-	});
-});

frontend/src/container/NewWidget/types.ts

@@ -16,10 +16,8 @@ export interface NewWidgetProps {
 }
 
 export interface WidgetGraphProps {
-	// this should be inside the querier plugin definition
 	selectedLogFields: Widgets['selectedLogFields'];
 	setSelectedLogFields?: Dispatch<SetStateAction<Widgets['selectedLogFields']>>;
-	// this should be inside the querier plugin definition
 	selectedTracesFields: Widgets['selectedTracesFields'];
 	setSelectedTracesFields?: Dispatch<
 		SetStateAction<Widgets['selectedTracesFields']>

frontend/src/types/api/dashboard/getAll.ts

@@ -118,6 +118,7 @@ export interface IBaseWidget {
 	opacity: string;
 	nullZeroValues: string;
 	timePreferance: timePreferenceType;
+	stepSize?: number;
 	yAxisUnit?: string;
 	decimalPrecision?: PrecisionOption; // number of decimals or 'full precision'
 	stackedBarChart?: boolean;

perses/common/common.cue

@@ -1,120 +0,0 @@
-package common
-
-// ──────────────────────────────────────────────
-// Shared types
-// ──────────────────────────────────────────────
-
-#TelemetryFieldKey: {
-    name:           string
-    key?:           string
-    description?:   string
-    unit?:          string
-    signal?:        string
-    fieldContext?:   string
-    fieldDataType?: string
-    materialized?:  bool
-    isIndexed?:     bool
-}
-
-// ──────────────────────────────────────────────
-// Panel types
-// ──────────────────────────────────────────────
-
-#ContextLinkProps: {
-    url:   string
-    label: string
-}
-
-#TimePreference: *"globalTime" | "last5Min" | "last15Min" | "last30Min" | "last1Hr" | "last6Hr" | "last1Day" | "last3Days" | "last1Week" | "last1Month"
-
-#PrecisionOption: *2 | 0 | 1 | 3 | 4 | "full"
-
-// how is this undefined and null? Would like to avoid undefined if possible
-// also bools can required always?
-#Axes: {
-    softMin?:    number | *null
-    softMax?:    number | *null
-    isLogScale?: bool | *false
-}
-
-#LegendPosition: *"bottom" | "right"
-
-#ThresholdWithLabel: {
-    value:  number
-    unit?:  string
-    color:  string
-    // What is this?
-    format: "Text" | "Background"
-    label?: string
-}
-
-// where is this used
-#ComparisonThreshold: {
-    value:    number
-    operator: ">" | "<" | ">=" | "<=" | "="
-    unit?:    string
-    color:    string
-    format:   "Text" | "Background"
-}
-
-// ──────────────────────────────────────────────
-// Query types
-// ──────────────────────────────────────────────
-
-#QueryName: =~"^[A-Za-z][A-Za-z0-9_]*$"
-
-#Limit: int & >=0 & <=10000
-
-#Offset: int & >=0
-
-#ReduceTo: "sum" | "count" | "avg" | "min" | "max" | "last" | "median"
-
-#MetricAggregation: close({
-    metricName:       string & !=""
-    timeAggregation:  "latest" | "sum" | "avg" | "min" | "max" | "count" | "rate" | "increase"
-    spaceAggregation: "sum" | "avg" | "min" | "max" | "count" | "p50" | "p75" | "p90" | "p95" | "p99"
-    reduceTo?:        #ReduceTo
-    // should unspecified be the default?
-    temporality?:     "delta" | "cumulative" | "unspecified"
-})
-
-#ExpressionAggregation: close({
-    expression: string & !=""
-    alias?:     string
-})
-
-#Aggregation: #MetricAggregation | #ExpressionAggregation
-
-#FilterExpression: close({
-    expression: string
-})
-
-#GroupByItem: close({
-    name:           string & !=""
-    fieldDataType?: string
-    fieldContext?:   string
-})
-
-#OrderByItem: close({
-    columnName: string & !=""
-    order:      "asc" | "desc"
-})
-
-#HavingExpression: close({
-    expression: string
-})
-
-#Function: close({
-    name: "cutOffMin" | "cutOffMax" | "clampMin" | "clampMax" |
-        "absolute" | "runningDiff" | "log2" | "log10" |
-        "cumulativeSum" | "ewma3" | "ewma5" | "ewma7" |
-        "median3" | "median5" | "median7" | "timeShift" |
-        "anomaly" | "fillZero"
-    args?: [...close({value: number | string | bool})]
-})
-
-// ──────────────────────────────────────────────
-// Variable types
-// ──────────────────────────────────────────────
-
-#VariableSortOrder: *"disabled" | "asc" | "desc"

perses/cue.mod/module.cue

@@ -1,4 +0,0 @@
-module: "github.com/signoz"
-language: {
-	version: "v0.12.0"
-}

perses/examples/perses.json

@@ -1,926 +0,0 @@
-{
-  "kind": "Dashboard",
-  "metadata": {
-    "name": "the-everything-dashboard",
-    "project": "signoz" // should this be an id? What is this project exactly?
-    // where would createdAt, updatedAt, createdBy, updatedBy be used?
-    // where would dashboardID or organizationID go
-    // where is locked going to come in
-    // can we have public path here as well? default time range and
-
-    // where would version go?
-    // where would image value go?
-    // where would tags go?
-
-    // we have uploadedGrafana. What is uploadedGrafana used for?
-
-    // ! all above looks like we need a plugin for the root dashboard as well
-
-    // how is panelMap and widgets translated to layout? Is layout the same as before?
-    // where is timePreferance set up
-    // collapsed?
-    // ? https://github.com/react-grid-layout/react-grid-layout?tab=readme-ov-file#layout-item
-  },
-  "spec": {
-    "display": {
-      "name": "The everything dashboard", // this is duplicate?
-      "description": "Trying to cover as many concepts here as possible"
-    },
-    "duration": "1h", // is this required?
-    "datasources": {
-      "SigNozDatasource": {
-        "default": true,
-        "plugin": {
-          "kind": "SigNozDatasource",
-          "spec": {}
-        }
-      }
-    },
-    "variables": [
-      {
-        // what is a ListVariable
-        "kind": "ListVariable",
-        "spec": {
-          "name": "serviceName",
-          "display": {
-            "name": "serviceName"
-          },
-          "allowAllValue": true,
-          "allowMultiple": false,
-          "plugin": {
-            "kind": "SigNozDynamicVariable",
-            "spec": {
-              "name": "service.name",
-              "source": "Metrics",
-              "sort": "disabled"
-            }
-          }
-        }
-      },
-      {
-        "kind": "ListVariable",
-        "spec": {
-          "name": "statusCodesFromQuery",
-          "display": {
-            "name": "statusCodesFromQuery"
-          },
-          "allowAllValue": true,
-          "allowMultiple": true,
-          "plugin": {
-            "kind": "SigNozQueryVariable",
-            "spec": {
-              // missing defaultValue for these list variables
-              "queryValue": "SELECT JSONExtractString(labels, 'http.status_code') AS status_code FROM signoz_metrics.distributed_time_series_v4_1day WHERE status_code != '' GROUP BY status_code",
-              "sort": "asc"
-            }
-          }
-        }
-      },
-      {
-        "kind": "ListVariable",
-        "spec": {
-          "name": "limit",
-          "display": {
-            "name": "limit"
-          },
-          "allowAllValue": false,
-          "allowMultiple": false,
-          "plugin": {
-            "kind": "SigNozCustomVariable",
-            "spec": {
-              // defaultValue missing
-              "customValue": "1,10,20,40,80,160,200",
-              "sort": "disabled"
-            }
-          }
-        }
-      },
-      {
-        // do we need uuid for id here? Do we need id at all?
-        // migration will require cleanup from localstorage as it is all saved with ids right now
-        "kind": "TextVariable",
-        "spec": {
-          "name": "textboxvar",
-          "display": {
-            "name": "textboxvar"
-          },
-          "value": "defaultvaluegoeshere",
-          "plugin": {
-            // just to confirm, this would be the type right?
-            "kind": "SigNozTextboxVariable",
-            "spec": {
-              // How should selectedValue be handled on share?
-              // we should have an option for selectedValue here
-              // should go in for all variables
-              // should be auto filled with the default or with the queried value. All for multi, first for single
-              // if selectedValue goes in, then we will need allSelected as well
-            }
-          }
-        }
-      }
-    ],
-    "panels": {
-      // need metadata inside this for section creation
-      // maybe another key just for sections. much easier
-      "24e2697b": {
-        "kind": "Panel",
-        "spec": {
-          "display": {
-            "name": "total resp size",
-            "description": ""
-          },
-          "plugin": {
-            "kind": "SigNozTimeSeriesPanel",
-            "spec": {
-              "visualization": {
-                "fillSpans": true
-              },
-              "formatting": {
-                "unit": "By",
-                "decimalPrecision": 3
-              },
-              "axes": {
-                "softMax": 800,
-                "isLogScale": true
-              },
-              "legend": {
-                "position": "right",
-                "customColors": {
-                  "{service.name=\"sampleapp-gateway\"}": "#9ea5f7"
-                }
-              },
-              "contextLinks": [
-                {
-                  "label": "View service details",
-                  "url": "http://localhost:8080/{{_service.name}}?dfddf=%7B%7Blimit%7D%7D"
-                }
-              ],
-              "thresholds": [
-                {
-                  "value": 1024,
-                  "unit": "By",
-                  "color": "Red",
-                  "format": "Text",
-                  "label": "upper limit"
-                },
-                {
-                  "value": 100,
-                  "unit": "By",
-                  "color": "Orange",
-                  "format": "Text",
-                  "label": "kinda bad"
-                }
-              ]
-            }
-          },
-          "queries": [
-            {
-              "kind": "TimeSeriesQuery",
-              "spec": {
-                "plugin": {
-                  "kind": "SigNozBuilderQuery",
-                  "spec": {
-                    "name": "A",
-                    "signal": "metrics",
-                    "expression": "A",
-                    "aggregations": [
-                      {
-                        "metricName": "http.server.response.body.size.sum",
-                        "reduceTo": "sum",
-                        "spaceAggregation": "sum",
-                        "timeAggregation": "rate"
-                      }
-                    ],
-                    "filter": {
-                      "expression": "http.response.status_code IN $statusCodesFromQuery"
-                    },
-                    "groupBy": [
-                      {
-                        "name": "service.name",
-                        "fieldDataType": "string",
-                        "fieldContext": "tag"
-                      }
-                    ]
-                  }
-                }
-              }
-            }
-          ]
-        }
-      },
-      "ff2f72f1": {
-        "kind": "Panel",
-        "spec": {
-          "display": {
-            "name": "fraction of calls",
-            "description": ""
-          },
-          "plugin": {
-            "kind": "SigNozTimeSeriesPanel",
-            "spec": {
-              "visualization": {
-                "fillSpans": true
-              },
-              "formatting": {
-                "decimalPrecision": 1
-              },
-              "thresholds": [
-                {
-                  "value": 1,
-                  "color": "Blue",
-                  "format": "Background",
-                  "label": "max possible"
-                }
-              ]
-            }
-          },
-          "queries": [
-            {
-              "kind": "TimeSeriesQuery",
-              "spec": {
-                "plugin": {
-                  "kind": "SigNozCompositeQuery",
-                  "spec": {
-                    "queries": [
-                      {
-                        "type": "builder_query",
-                        "spec": {
-                          "name": "A",
-                          "signal": "metrics",
-                          "expression": "A",
-                          "disabled": true,
-                          "aggregations": [
-                            {
-                              "metricName": "signoz_calls_total",
-                              "reduceTo": "sum",
-                              "spaceAggregation": "sum",
-                              "timeAggregation": "rate"
-                            }
-                          ],
-                          "filter": {
-                            "expression": "service.name IN $serviceName  AND http.status_code IN $statusCodesFromQuery"
-                          }
-                        }
-                      },
-                      {
-                        "type": "builder_query",
-                        "spec": {
-                          "name": "B",
-                          "signal": "metrics",
-                          "expression": "B",
-                          "disabled": true,
-                          "aggregations": [
-                            {
-                              "metricName": "signoz_calls_total",
-                              "reduceTo": "sum",
-                              "spaceAggregation": "sum",
-                              "timeAggregation": "rate"
-                            }
-                          ],
-                          "filter": {
-                            "expression": "service.name in $serviceName"
-                          }
-                        }
-                      },
-                      {
-                        "type": "builder_formula",
-                        "spec": {
-                          "name": "F1",
-                          "expression": "A / B"
-                        }
-                      }
-                    ]
-                  }
-                }
-              }
-            }
-          ]
-        }
-      },
-      "011605e7": {
-        "kind": "Panel",
-        "spec": {
-          "display": {
-            "name": "total resp size"
-          },
-          "plugin": {
-            "kind": "SigNozBarChartPanel",
-            "spec": {
-              "visualization": {
-                "stackedBarChart": false
-              },
-              "formatting": {
-                "unit": "By"
-              }
-            }
-          },
-          "queries": [
-            {
-              "kind": "TimeSeriesQuery",
-              "spec": {
-                "plugin": {
-                  "kind": "SigNozBuilderQuery",
-                  "spec": {
-                    "name": "A",
-                    "signal": "metrics",
-                    "expression": "A",
-                    "aggregations": [
-                      {
-                        "metricName": "http.server.response.body.size.sum",
-                        "reduceTo": "sum",
-                        "spaceAggregation": "sum",
-                        "timeAggregation": "rate"
-                      }
-                    ],
-                    "filter": {
-                      "expression": "http.response.status_code IN $statusCodesFromQuery"
-                    },
-                    "groupBy": [
-                      {
-                        "name": "service.name",
-                        "fieldDataType": "string",
-                        "fieldContext": "tag"
-                      }
-                    ]
-                  }
-                }
-              }
-            }
-          ]
-        }
-      },
-      "e23516fc": {
-        "kind": "Panel",
-        "spec": {
-          "display": {
-            "name": "num traces for service"
-          },
-          "plugin": {
-            "kind": "SigNozNumberPanel",
-            "spec": {
-              "formatting": {
-                "unit": "none",
-                "decimalPrecision": 1
-              },
-              "thresholds": [
-                {
-                  "value": 1200000,
-                  "operator": ">",
-                  "unit": "none",
-                  "color": "Red",
-                  "format": "Text"
-                },
-                {
-                  "value": 1200000,
-                  "operator": "<=",
-                  "unit": "none",
-                  "color": "Green",
-                  "format": "Text"
-                }
-              ]
-            }
-          },
-          "queries": [
-            {
-              "kind": "TimeSeriesQuery",
-              "spec": {
-                "plugin": {
-                  "kind": "SigNozBuilderQuery",
-                  "spec": {
-                    "name": "A",
-                    "signal": "traces",
-                    "expression": "A",
-                    "aggregations": [
-                      {
-                        "expression": "count() "
-                      }
-                    ],
-                    "filter": {
-                      "expression": "service.name = $serviceName "
-                    }
-                  }
-                }
-              }
-            }
-          ]
-        }
-      },
-      "130c8d6b": {
-        "kind": "Panel",
-        "spec": {
-          "display": {
-            "name": "num logs for service"
-          },
-          "plugin": {
-            "kind": "SigNozNumberPanel",
-            "spec": {
-              "formatting": {
-                "unit": "none",
-                "decimalPrecision": 1
-              }
-            }
-          },
-          "queries": [
-            {
-              "kind": "TimeSeriesQuery",
-              "spec": {
-                "plugin": {
-                  "kind": "SigNozBuilderQuery",
-                  "spec": {
-                    "name": "A",
-                    "signal": "logs",
-                    "expression": "A",
-                    "aggregations": [
-                      {
-                        "expression": "count() "
-                      }
-                    ],
-                    "filter": {
-                      "expression": "service.name = $serviceName "
-                    }
-                  }
-                }
-              }
-            }
-          ]
-        }
-      },
-      "246f7c6d": {
-        "kind": "Panel",
-        "spec": {
-          "display": {
-            "name": "num traces for service per resp code"
-          },
-          "plugin": {
-            "kind": "SigNozPieChartPanel",
-            "spec": {
-              "formatting": {
-                "decimalPrecision": 1
-              },
-              "legend": {
-                "customColors": {
-                  "\"201\"": "#2bc051",
-                  "\"400\"": "#cc462e",
-                  "\"500\"": "#ff0000"
-                }
-              }
-            }
-          },
-          "queries": [
-            {
-              "kind": "TimeSeriesQuery",
-              "spec": {
-                "plugin": {
-                  "kind": "SigNozBuilderQuery",
-                  "spec": {
-                    "name": "A",
-                    "signal": "traces",
-                    "expression": "A",
-                    "aggregations": [
-                      {
-                        "expression": "count() "
-                      }
-                    ],
-                    "filter": {
-                      "expression": "service.name = $serviceName isEntryPoint = 'true'"
-                    },
-                    "groupBy": [
-                      {
-                        "name": "http.response.status_code",
-                        "fieldDataType": "float64",
-                        "fieldContext": "tag"
-                      }
-                    ],
-                    "legend": "\"{{http.response.status_code}}\""
-                  }
-                }
-              }
-            }
-          ]
-        }
-      },
-      "21f7d4d0": {
-        "kind": "Panel",
-        "spec": {
-          "display": {
-            "name": "average latency per service"
-          },
-          "plugin": {
-            "kind": "SigNozTablePanel",
-            "spec": {
-              "formatting": {
-                "columnUnits": {
-                  "A": "s"
-                }
-              },
-              "thresholds": [
-                {
-                  "value": 1,
-                  "operator": ">",
-                  "unit": "min",
-                  "color": "Red",
-                  "format": "Text",
-                  "tableOptions": "A"
-                }
-              ]
-            }
-          },
-          "queries": [
-            {
-              "kind": "TimeSeriesQuery",
-              "spec": {
-                "plugin": {
-                  "kind": "SigNozClickHouseSQL",
-                  "spec": {
-                    "name": "A",
-                    "query": "WITH\n    __spatial_aggregation_cte AS\n    (\n        SELECT\n            toStartOfInterval(toDateTime(intDiv(unix_milli, 1000)), toIntervalSecond(60)) AS ts,\n            `service.name`,\n            le,\n            sum(value) / 60 AS value\n        FROM signoz_metrics.distributed_samples_v4 AS points\n        INNER JOIN\n        (\n            SELECT\n                fingerprint,\n                JSONExtractString(labels, 'service.name') AS `service.name`,\n                JSONExtractString(labels, 'le') AS le\n            FROM signoz_metrics.time_series_v4\n            WHERE (metric_name IN ('signoz_latency.bucket')) AND (LOWER(temporality) LIKE LOWER('delta')) AND (__normalized = 0)\n            GROUP BY\n                fingerprint,\n                `service.name`,\n                le\n        ) AS filtered_time_series ON points.fingerprint = filtered_time_series.fingerprint\n        WHERE metric_name IN ('signoz_latency.bucket')\n        GROUP BY\n            ts,\n            `service.name`,\n            le\n    ),\n    __histogramCTE AS\n    (\n        SELECT\n            ts,\n            `service.name`,\n            histogramQuantile(arrayMap(x -> toFloat64(x), groupArray(le)), groupArray(value), 0.9) AS value\n        FROM __spatial_aggregation_cte\n        GROUP BY\n            `service.name`,\n            ts\n        ORDER BY\n            `service.name` ASC,\n            ts ASC\n    )\nSELECT\n    `service.name` AS service,\n    avg(value) AS A\nFROM __histogramCTE\nGROUP BY `service.name`"
-                  }
-                }
-              }
-            }
-          ]
-        }
-      },
-      "ad5fd556": {
-        "kind": "Panel",
-        "spec": {
-          "display": {
-            "name": "logs from service"
-          },
-          "plugin": {
-            "kind": "SigNozListPanel",
-            "spec": {
-              "selectedLogFields": [
-                {
-                  "name": "timestamp",
-                  "type": "log",
-                  "dataType": ""
-                },
-                {
-                  "name": "body",
-                  "type": "log",
-                  "dataType": ""
-                },
-                {
-                  "name": "error",
-                  "type": "",
-                  "dataType": "string"
-                }
-              ]
-            }
-          },
-          "queries": [
-            {
-              "kind": "LogQuery",
-              "spec": {
-                "plugin": {
-                  "kind": "SigNozBuilderQuery",
-                  "spec": {
-                    "name": "A",
-                    "signal": "logs",
-                    "expression": "A",
-                    "aggregations": [
-                      {
-                        "expression": "count() "
-                      }
-                    ],
-                    "filter": {
-                      "expression": "service.name = $serviceName"
-                    },
-                    "groupBy": [],
-                    "order": [
-                      {
-                        "columnName": "timestamp",
-                        "order": "desc"
-                      },
-                      {
-                        "columnName": "id",
-                        "order": "desc"
-                      }
-                    ]
-                  }
-                }
-              }
-            }
-          ]
-        }
-      },
-      "f07b59ee": {
-        "kind": "Panel",
-        "spec": {
-          "display": {
-            "name": "response size buckets"
-          },
-          "plugin": {
-            "kind": "SigNozHistogramPanel",
-            "spec": {
-              "histogramBuckets": {
-                "bucketCount": 60,
-                "mergeAllActiveQueries": true
-              }
-            }
-          },
-          "queries": [
-            {
-              "kind": "TimeSeriesQuery",
-              "spec": {
-                "plugin": {
-                  "kind": "SigNozBuilderQuery",
-                  "spec": {
-                    "name": "A",
-                    "signal": "metrics",
-                    "expression": "A",
-                    "aggregations": [
-                      {
-                        "metricName": "http.server.response.body.size.bucket",
-                        "reduceTo": "avg",
-                        "spaceAggregation": "p90",
-                        "timeAggregation": "rate"
-                      }
-                    ]
-                  }
-                }
-              }
-            }
-          ]
-        }
-      },
-      "e1a41831": {
-        "kind": "Panel",
-        "spec": {
-          "display": {
-            "name": "trace operator",
-            "description": ""
-          },
-          "plugin": {
-            "kind": "SigNozTimeSeriesPanel",
-            "spec": {
-              "legend": {
-                "position": "right"
-              }
-            }
-          },
-          "queries": [
-            {
-              "kind": "TimeSeriesQuery",
-              "spec": {
-                "plugin": {
-                  "kind": "SigNozCompositeQuery",
-                  "spec": {
-                    "queries": [
-                      {
-                        "type": "builder_query",
-                        "spec": {
-                          "name": "A",
-                          "signal": "traces",
-                          "expression": "A",
-                          "aggregations": [
-                            {
-                              "expression": "count() "
-                            }
-                          ],
-                          "filter": {
-                            "expression": "service.name = 'sampleapp-gateway' "
-                          },
-                          "legend": "Gateway"
-                        }
-                      },
-                      {
-                        "type": "builder_query",
-                        "spec": {
-                          "name": "B",
-                          "signal": "traces",
-                          "expression": "B",
-                          "aggregations": [
-                            {
-                              "expression": "count() "
-                            }
-                          ],
-                          "filter": {
-                            "expression": "http.response.status_code = 200"
-                          },
-                          "legend": "$serviceName"
-                        }
-                      },
-                      {
-                        "type": "builder_trace_operator",
-                        "spec": {
-                          "name": "T1",
-                          "expression": "A -> B ",
-                          "aggregations": [
-                            {
-                              "expression": "count()",
-                              "alias": "request_count"
-                            }
-                          ]
-                        }
-                      }
-                    ]
-                  }
-                }
-              }
-            }
-          ]
-        }
-      },
-      "f0d70491": {
-        "kind": "Panel",
-        "spec": {
-          "display": {
-            "name": "no results in this promql",
-            "description": ""
-          },
-          "plugin": {
-            "kind": "SigNozTimeSeriesPanel",
-            "spec": {}
-          },
-          "queries": [
-            {
-              "kind": "TimeSeriesQuery",
-              "spec": {
-                "plugin": {
-                  "kind": "SigNozCompositeQuery",
-                  "spec": {
-                    "queries": [
-                      {
-                        "type": "promql",
-                        "spec": {
-                          "name": "A",
-                          "query": "sum(rate(flask_exporter_info[5m]))"
-                        }
-                      },
-                      {
-                        "type": "promql",
-                        "spec": {
-                          "name": "B",
-                          "query": "sum(increase(flask_exporter_info[5m]))"
-                        }
-                      }
-                    ]
-                  }
-                }
-              }
-            }
-          ]
-        }
-      },
-      "0e6eb4ca": {
-        "kind": "Panel",
-        "spec": {
-          "display": {
-            "name": "no results in this promql",
-            "description": ""
-          },
-          "plugin": {
-            "kind": "SigNozTimeSeriesPanel",
-            "spec": {}
-          },
-          "queries": [
-            {
-              "kind": "TimeSeriesQuery",
-              "spec": {
-                "plugin": {
-                  "kind": "SigNozPromQLQuery",
-                  "spec": {
-                    "name": "A",
-                    "query": "sum(rate(flask_exporter_info[5m]))"
-                  }
-                }
-              }
-            }
-          ]
-        }
-      }
-    },
-    "layouts": [
-      {
-        "kind": "Grid",
-        "spec": {
-          // ! where is row header?
-          // w: 12,
-          // 	minW: 12,
-          // 	minH: 1,
-          // 	maxH: 1,
-          // 	x: 0,
-          // 	h: 1,
-          // 	y: 0,
-          // These above properties are required for the headers only
-          // need collapsed state for a section
-          "items": [
-            {
-              // we need id here. could be injected from the frontend
-              "x": 0,
-              "y": 0,
-              "width": 6,
-              "height": 6,
-              // how easy would it be to introduce more here? like maxW, minW, static, etc. Do we want to introduce those from the start?
-              // "moved" might need experimenting
-              "content": {
-                "$ref": "#/spec/panels/24e2697b"
-              }
-            },
-            {
-              "x": 6,
-              "y": 0,
-              "width": 6,
-              "height": 6,
-              "content": {
-                "$ref": "#/spec/panels/ff2f72f1"
-              }
-            },
-            {
-              "x": 0,
-              "y": 6,
-              "width": 6,
-              "height": 6,
-              "content": {
-                "$ref": "#/spec/panels/011605e7"
-              }
-            },
-            {
-              "x": 6,
-              "y": 6,
-              "width": 6,
-              "height": 3,
-              "content": {
-                "$ref": "#/spec/panels/e23516fc"
-              }
-            },
-            {
-              "x": 6,
-              "y": 9,
-              "width": 6,
-              "height": 3,
-              "content": {
-                "$ref": "#/spec/panels/130c8d6b"
-              }
-            },
-            {
-              "x": 0,
-              "y": 12,
-              "width": 6,
-              "height": 6,
-              "content": {
-                "$ref": "#/spec/panels/246f7c6d"
-              }
-            },
-            {
-              "x": 6,
-              "y": 12,
-              "width": 6,
-              "height": 6,
-              "content": {
-                "$ref": "#/spec/panels/21f7d4d0"
-              }
-            },
-            {
-              "x": 0,
-              "y": 18,
-              "width": 6,
-              "height": 6,
-              "content": {
-                "$ref": "#/spec/panels/ad5fd556"
-              }
-            },
-            {
-              "x": 6,
-              "y": 18,
-              "width": 6,
-              "height": 6,
-              "content": {
-                "$ref": "#/spec/panels/f07b59ee"
-              }
-            },
-            {
-              "x": 0,
-              "y": 24,
-              "width": 12,
-              "height": 6,
-              "content": {
-                "$ref": "#/spec/panels/e1a41831"
-              }
-            },
-            {
-              "x": 0,
-              "y": 30,
-              "width": 6,
-              "height": 6,
-              "content": {
-                "$ref": "#/spec/panels/f0d70491"
-              }
-            },
-            {
-              "x": 6,
-              "y": 30,
-              "width": 6,
-              "height": 6,
-              "content": {
-                "$ref": "#/spec/panels/0e6eb4ca"
-              }
-            }
-          ]
-        }
-      }
-    ]
-  }
-}

perses/howToDefineAPanel.md

@@ -1,140 +0,0 @@
-# Adding a new panel plugin
-
-This guide is for developers adding a new panel kind to the Perses schema. It covers the file structure you need to create, the shared types available in `common.cue`, and how to compose them into your panel's spec.
-
----
-
-## 1. File structure
-
-Create a new directory under `schemas-wrapper/schemas/` named after your panel:
-
-```
-schemas-wrapper/schemas/your-panel-name/
-├── your-panel-name.cue    # Schema definition
-└── example.json           # Example JSON that validates against the schema
-```
-
-The CUE file must use `package model` and declare a `kind` and `spec`:
-
-```cue
-package model
-
-import "github.com/signoz/common"
-
-kind: "YourPanelName"
-spec: close({
-    // your fields here
-})
-```
-
-Register the panel in `schemas-wrapper/schemas/package.json` by adding an entry to the `plugins` array:
-
-```json
-{
-    "kind": "Panel",
-    "spec": {
-        "name": "YourPanelName"
-    }
-}
-```
-
----
-
-## 2. Available shared types from `common.cue`
-
-These types are defined in `common/common.cue` and can be used via `import "github.com/signoz/common"`. Use them instead of redefining the same structures in your panel.
-
-## 3. Defining your spec
-
-Your spec is a `close({})` block containing the fields relevant to your panel. Pick from the shared types above and add panel-specific types as needed. Every field should be optional (suffixed with `?`) since a panel should be valid with just defaults.
-
-### Typical patterns
-
-**Panel with graphs** (has axes, legend, thresholds as reference lines):
-
-```cue
-spec: close({
-    visualization?:  #Visualization
-    formatting?:     #Formatting
-    axes?:           common.#Axes
-    legend?:         #Legend
-    contextLinks?:   [...common.#ContextLinkProps]
-    thresholds?:     [...common.#ThresholdWithLabel]
-})
-```
-
-**Panel with a single value** (no axes/legend, thresholds as conditional formatting):
-
-```cue
-spec: close({
-    visualization?:  #Visualization
-    formatting?:     #Formatting
-    contextLinks?:   [...common.#ContextLinkProps]
-    thresholds?:     [...common.#ComparisonThreshold]
-})
-```
-
-**Panel with custom data structure** (panel-specific fields only):
-
-```cue
-spec: close({
-    yourCustomConfig?: #YourCustomConfig
-    contextLinks?:     [...common.#ContextLinkProps]
-})
-```
-
-### Defining panel-local types
-
-Types that are specific to your panel (not reusable) should be defined in your CUE file, not in common. For example, `#Visualization` varies per panel because each panel has different rendering options:
-
-```cue
-#Visualization: {
-    timePreference?: common.#TimePreference
-    yourCustomFlag?: bool | *false
-}
-```
-
-If your panel needs a threshold type that extends a common one, embed it:
-
-```cue
-#YourThreshold: {
-    common.#ComparisonThreshold
-    extraField: string
-}
-```
-
----
-
-## 4. Writing the example JSON
-
-Create an `example.json` that exercises all fields in your spec. This file is used for validation — `./validate.sh` will check it against your schema.
-
-```json
-{
-    "kind": "YourPanelName",
-    "spec": {
-        ...
-    }
-}
-```
-
-Also add at least one panel using your new kind to `examples/perses.json` so it gets validated as part of a full dashboard.
-
----
-
-## 5. Validation
-
-Run `./validate.sh` from the `perses/` directory. It lints `examples/perses.json` against all registered schemas. If your schema or example has issues, the error will point to the specific field.
-
----
-
-## Quick reference: existing panels and what they use
-
-| Field | Time-series | Bar-chart | Number | Pie | Table | Histogram | List |
-|-------|:-----------:|:---------:|:------:|:---:|:-----:|:---------:|:----:|
-| `visualization` | yes | yes | yes | yes | yes | — | — |
-| `formatting` | yes | yes | yes | yes | yes | — | — |
-| `axes` | yes | yes | — | — | — | — | — |
-| `legend` | yes | yes | — | yes | — | yes | — |
-| `contextLinks` | yes | yes | yes | yes | yes | yes | — |
-| `thresholds` | yes | yes | yes | — | yes | — | — |

perses/schemas-wrapper/schemas/mf-manifest.json

@@ -1,9 +0,0 @@
-{
-  "id": "signoz",
-  "name": "signoz",
-  "metaData": {
-    "buildInfo": {
-      "buildVersion": "0.0.1"
-    }
-  }
-}

perses/schemas-wrapper/schemas/package.json

@@ -1,136 +0,0 @@
-{
-  "name": "@signoz/signoz-schemas",
-  "version": "0.0.1",
-  "description": "SigNoz schema plugins",
-  "perses": {
-    "schemasPath": ".",
-    "plugins": [
-      {
-        "kind": "Datasource",
-        "spec": {
-          "name": "SigNozDatasource"
-        }
-      },
-      {
-        "kind": "Panel",
-        "spec": {
-          "name": "SigNozTimeSeriesPanel"
-        }
-      },
-      {
-        "kind": "Panel",
-        "spec": {
-          "name": "SigNozBarChartPanel"
-        }
-      },
-      {
-        "kind": "Panel",
-        "spec": {
-          "name": "SigNozNumberPanel"
-        }
-      },
-      {
-        "kind": "Panel",
-        "spec": {
-          "name": "SigNozPieChartPanel"
-        }
-      },
-      {
-        "kind": "Panel",
-        "spec": {
-          "name": "SigNozTablePanel"
-        }
-      },
-      {
-        "kind": "Panel",
-        "spec": {
-          "name": "SigNozHistogramPanel"
-        }
-      },
-      {
-        "kind": "Panel",
-        "spec": {
-          "name": "SigNozListPanel"
-        }
-      },
-      {
-        "kind": "Panel",
-        "spec": {
-          "name": "SigNozIgnoredFieldsChart"
-        }
-      },
-      {
-        "kind": "TimeSeriesQuery",
-        "spec": {
-          "name": "SigNozBuilderQuery"
-        }
-      },
-      {
-        "kind": "TimeSeriesQuery",
-        "spec": {
-          "name": "SigNozClickHouseSQL"
-        }
-      },
-      {
-        "kind": "TimeSeriesQuery",
-        "spec": {
-          "name": "SigNozPromQLQuery"
-        }
-      },
-      {
-        "kind": "TimeSeriesQuery",
-        "spec": {
-          "name": "SigNozCompositeQuery"
-        }
-      },
-      {
-        "kind": "TimeSeriesQuery",
-        "spec": {
-          "name": "SigNozTraceOperator"
-        }
-      },
-      {
-        "kind": "TimeSeriesQuery",
-        "spec": {
-          "name": "SigNozFormula"
-        }
-      },
-      {
-        "kind": "LogQuery",
-        "spec": {
-          "name": "SigNozBuilderQuery"
-        }
-      },
-      {
-        "kind": "TraceQuery",
-        "spec": {
-          "name": "SigNozBuilderQuery"
-        }
-      },
-      {
-        "kind": "Variable",
-        "spec": {
-          "name": "SigNozCustomVariable"
-        }
-      },
-      {
-        "kind": "Variable",
-        "spec": {
-          "name": "SigNozDynamicVariable"
-        }
-      },
-      {
-        "kind": "Variable",
-        "spec": {
-          "name": "SigNozQueryVariable"
-        }
-      },
-      {
-        "kind": "Variable",
-        "spec": {
-          "name": "SigNozTextboxVariable"
-        }
-      }
-    ]
-  }
-}

perses/schemas-wrapper/schemas/review-panels.md

@@ -1,20 +0,0 @@
-which panel type only caters to specific signals?
-metrics has no option for list panel type. also, no other querying types
-
-should the panel definition be linked to the query type?
-
-| type        | QB  | P   | CH  |
-| ----------- | --- | --- | --- |
-| Time Series | ✅  | ✅  | ✅  |
-| Number      | ✅  | ✅  | ✅  |
-| Table       | ✅  | ❌  | ✅  |
-| List        | ✅  | ❌  | ❌  |
-| Bar         | ✅  | ✅  | ✅  |
-| Pie         | ✅  | ❌  | ✅  |
-| Histogram   | ✅  | ✅  | ✅  |
-
-- unsure where this is used
-  stepSize - can be removed
-  renderColumnCell - used though - only table
-  customColumTitles - used though - only table
-  hiddenColumns - used though - only table

perses/schemas-wrapper/schemas/review.md

@@ -1 +0,0 @@
-creating folders based on type is helpful instead of a flat folder structure. It is how you would visualise the dashboard as components

perses/schemas-wrapper/schemas/signoz-bar-chart-panel/example.json

@@ -1,40 +0,0 @@
-{
-    "kind": "SigNozBarChartPanel",
-    "spec": {
-        "visualization": {
-            "timePreference": "globalTime",
-            "fillSpans": false,
-            "stackedBarChart": false
-        },
-        "formatting": {
-            "unit": "By",
-            "decimalPrecision": 2
-        },
-        "axes": {
-            "softMin": 0,
-            "softMax": 1000,
-            "isLogScale": false
-        },
-        "legend": {
-            "position": "bottom",
-            "customColors": {
-                "series-A": "#9ea5f7"
-            }
-        },
-        "contextLinks": [
-            {
-                "label": "View details",
-                "url": "http://localhost:8080/{{_service.name}}"
-            }
-        ],
-        "thresholds": [
-            {
-                "value": 500,
-                "unit": "By",
-                "color": "Red",
-                "format": "Text",
-                "label": "upper limit"
-            }
-        ]
-    }
-}

perses/schemas-wrapper/schemas/signoz-bar-chart-panel/signoz-bar-chart-panel.cue

@@ -1,31 +0,0 @@
-package model
-
-import "github.com/signoz/common"
-
-kind: "SigNozBarChartPanel"
-spec: close({
-    // need to put more thought into this being optional?
-    visualization?:        #Visualization
-    formatting?:           #Formatting
-    axes?:                 common.#Axes
-    legend?:               #Legend
-    contextLinks?:         [...common.#ContextLinkProps]
-    thresholds?:           [...common.#ThresholdWithLabel]
-})
-
-#Visualization: {
-    timePreference?:  common.#TimePreference
-    fillSpans?:       bool | *false
-    stackedBarChart?: bool | *true
-}
-
-#Formatting: {
-    unit?:             string | *""
-    decimalPrecision?: common.#PrecisionOption
-}
-
-// can this be more composable?
-#Legend: {
-    position?:     common.#LegendPosition
-    customColors?: [string]: string
-}

perses/schemas-wrapper/schemas/signoz-builder-query/signoz-builder-query.cue

@@ -1,35 +0,0 @@
-package model
-
-import "github.com/signoz/common"
-
-// Source: pkg/types/querybuildertypes/querybuildertypesv5/builder_query.go — QueryBuilderQuery
-kind: "SigNozBuilderQuery"
-spec: close({
-	name:       common.#QueryName
-	signal:     "metrics" | "logs" | "traces"
-	expression: string
-	disabled?:  bool | *false
-
-	aggregations?:   [...common.#Aggregation]
-	filter?:         common.#FilterExpression
-	groupBy?:        [...common.#GroupByItem]
-	order?:          [...common.#OrderByItem]
-	selectFields?:   [...common.#TelemetryFieldKey]
-	limit?:          common.#Limit
-	limitBy?:        #LimitBy
-	offset?:         common.#Offset
-	cursor?:         string
-	having?:         common.#HavingExpression
-	// secondaryAggregations not added — not yet implemented.
-	functions?:      [...common.#Function]
-	legend?:         string
-	stepInterval?:   number
-	reduceTo?:       common.#ReduceTo
-	pageSize?:       int & >=1
-	source?:         string
-})
-
-#LimitBy: close({
-	keys:  [...string]
-	value: string
-})

perses/schemas-wrapper/schemas/signoz-builder-query/signoz-builder-query.json

@@ -1,24 +0,0 @@
-{
-    "kind": "SigNozBuilderQuery",
-    "spec": {
-        "name": "A",
-        "signal": "metrics",
-        "expression": "A",
-        "aggregations": [
-            {
-                "metricName": "redis_keyspace_hits",
-                "timeAggregation": "rate",
-                "spaceAggregation": "sum",
-                "reduceTo": "sum"
-            }
-        ],
-        "filter": {
-            "expression": "host_name IN $host_name"
-        },
-        "groupBy": [],
-        "order": [],
-        "disabled": false,
-        "legend": "Hit/s across all hosts",
-        "stepInterval": 60
-    }
-}

perses/schemas-wrapper/schemas/signoz-clickhouse-sql/signoz-clickhouse-sql.cue

@@ -1,13 +0,0 @@
-package model
-
-import "github.com/signoz/common"
-
-// Source: pkg/types/querybuildertypes/querybuildertypesv5/clickhouse_query.go — ClickHouseQuery
-kind: "SigNozClickHouseSQL"
-spec: close({
-	name:      common.#QueryName
-	query:     string & !=""
-	// required / optional
-	disabled?: bool | *false
-	legend?:   string
-})

perses/schemas-wrapper/schemas/signoz-clickhouse-sql/signoz-clickhouse-sql.json

@@ -1,9 +0,0 @@
-{
-    "kind": "SigNozClickHouseSQL",
-    "spec": {
-        "name": "A",
-        "query": "SELECT toStartOfInterval(timestamp, INTERVAL 1 MINUTE) AS ts, count() AS total FROM signoz_logs.distributed_logs GROUP BY ts ORDER BY ts",
-        "disabled": false,
-        "legend": "Log count"
-    }
-}

perses/schemas-wrapper/schemas/signoz-composite-query/signoz-composite-query.cue

@@ -1,47 +0,0 @@
-package model
-
-import (
-	bq "github.com/signoz/schemas-wrapper/schemas/signoz-builder-query:model"
-	f "github.com/signoz/schemas-wrapper/schemas/signoz-formula:model"
-	to "github.com/signoz/schemas-wrapper/schemas/signoz-trace-operator:model"
-	pql "github.com/signoz/schemas-wrapper/schemas/signoz-promql:model"
-	ch "github.com/signoz/schemas-wrapper/schemas/signoz-clickhouse-sql:model"
-)
-
-// Source: pkg/types/querybuildertypes/querybuildertypesv5/req.go — CompositeQuery
-// SigNozCompositeQuery groups multiple query plugins into a single
-// query request. Each entry is a typed envelope whose spec is
-// validated by the corresponding plugin schema.
-
-// this is to be used when there are multiple queries in a panel
-// in most cases, there will be only one query, and there it is a better idea to 
-// use the corresponding kind for that query instead of this composite query
-kind: "SigNozCompositeQuery"
-spec: close({
-	queries: [...#QueryEnvelope]
-})
-
-// QueryEnvelope wraps a single query plugin with a type discriminator.
-
-// need to verify the types internally are marked required where necessary, so that we can make them optional here and not have to worry about it at the top level
-#QueryEnvelope:
-	close({
-		type: "builder_query",
-		spec: bq.spec
-	}) |
-	close({
-		type: "builder_formula",
-		spec: f.spec
-	}) |
-	close({
-		type: "builder_trace_operator",
-		spec: to.spec
-	}) |
-	close({
-		type: "promql",
-		spec: pql.spec
-	}) |
-	close({
-		type: "clickhouse_sql",
-		spec: ch.spec
-	})

perses/schemas-wrapper/schemas/signoz-composite-query/signoz-composite-query.json

@@ -1,53 +0,0 @@
-{
-    "kind": "SigNozCompositeQuery",
-    "spec": {
-        "queries": [
-            {
-                "type": "builder_query",
-                "spec": {
-                    "name": "A",
-                    "signal": "metrics",
-                    "expression": "A",
-                    "aggregations": [
-                        {
-                            "metricName": "redis_keyspace_hits",
-                            "timeAggregation": "rate",
-                            "spaceAggregation": "sum",
-                            "reduceTo": "sum"
-                        }
-                    ],
-                    "filter": {
-                        "expression": "host_name IN $host_name"
-                    }
-                }
-            },
-            {
-                "type": "builder_query",
-                "spec": {
-                    "name": "B",
-                    "signal": "metrics",
-                    "expression": "B",
-                    "aggregations": [
-                        {
-                            "metricName": "redis_keyspace_misses",
-                            "timeAggregation": "rate",
-                            "spaceAggregation": "sum",
-                            "reduceTo": "sum"
-                        }
-                    ],
-                    "filter": {
-                        "expression": "host_name IN $host_name"
-                    }
-                }
-            },
-            {
-                "type": "builder_formula",
-                "spec": {
-                    "name": "F1",
-                    "expression": "A / (A + B) * 100",
-                    "legend": "Hit rate %"
-                }
-            }
-        ]
-    }
-}

perses/schemas-wrapper/schemas/signoz-custom-variable/signoz-custom-variable.cue

@@ -1,10 +0,0 @@
-package model
-
-import "github.com/signoz/common"
-
-// defaultValue lives on the Perses ListVariable wrapper (spec level).
-kind: "SigNozCustomVariable"
-spec: close({
-	customValue: =~"^[^,]+(,[^,]+)*$"
-	sort?:       common.#VariableSortOrder
-})

perses/schemas-wrapper/schemas/signoz-custom-variable/signoz-custom-variable.json

@@ -1,7 +0,0 @@
-{
-    "kind": "SigNozCustomVariable",
-    "spec": {
-        "customValue": "production,staging,development",
-        "sort": "disabled"
-    }
-}

perses/schemas-wrapper/schemas/signoz-datasource/signoz-datasource.cue

@@ -1,11 +0,0 @@
-package model
-
-kind: "SigNozDatasource"
-
-// SigNoz has a single built-in backend — the frontend already knows
-// the API endpoint, so there is no connection config to validate.
-// Add fields here if SigNoz ever supports multiple backends or
-// configurable API versions.
-spec: close({})
-
- // this is required to override the default that always requires a spec

perses/schemas-wrapper/schemas/signoz-datasource/signoz-datasource.json

@@ -1,4 +0,0 @@
-{
-    "kind": "SigNozDatasource",
-    "spec": {}
-}

perses/schemas-wrapper/schemas/signoz-dynamic-variable/signoz-dynamic-variable.cue

@@ -1,12 +0,0 @@
-package model
-
-import "github.com/signoz/common"
-
-// defaultValue lives on the Perses ListVariable wrapper (spec level).
-kind: "SigNozDynamicVariable"
-spec: close({
-	name: string
-	source:    string
-	sort?: common.#VariableSortOrder
-	// where does attribute go here?
-})

perses/schemas-wrapper/schemas/signoz-dynamic-variable/signoz-dynamic-variable.json

@@ -1,8 +0,0 @@
-{
-    "kind": "SigNozDynamicVariable",
-    "spec": {
-        "name": "host_name",
-        "source": "metrics",
-        "sort": "asc"
-    }
-}

perses/schemas-wrapper/schemas/signoz-everything-chart/signoz-everything-chart.cue

@@ -1,26 +0,0 @@
-package model
-
-// Fields from IBaseWidget that are NOT in any dedicated panel CUE file.
-// This file exists as a reference only and will be removed in the end.
-// Needs to be removed from package.json as well.
-
-kind: "SigNozIgnoredFieldsChart"
-spec: close({
-    opacity?:              string        // not wired to chart rendering
-    nullZeroValues?:       string        // not wired to chart rendering
-    stepSize?:             number
-    columnWidths?:         [string]: number // not a config choice — persisted user-resized column widths
-    // "Chart Appearance" section in UI — could not find this section in the app.
-    // This is behind a boolean flag right now. Can help reproduce locally
-    // These 4 fields are gated behind panelTypeVs* constants (TIME_SERIES only).
-    lineInterpolation?:    #LineInterpolation
-    showPoints?:           bool
-    lineStyle?:            #LineStyle
-    fillMode?:             #FillMode
-})
-
-#LineInterpolation: "linear" | "spline" | "stepAfter" | "stepBefore"
-
-#LineStyle: "solid" | "dashed"
-
-#FillMode: "solid" | "gradient" | "none"

perses/schemas-wrapper/schemas/signoz-formula/signoz-formula.cue

@@ -1,17 +0,0 @@
-package model
-
-import "github.com/signoz/common"
-
-// Source: pkg/types/querybuildertypes/querybuildertypesv5/formula.go — QueryBuilderFormula
-kind: "SigNozFormula"
-spec: close({
-	name:          common.#QueryName
-	expression:    string
-	disabled?:     bool | *false
-	legend?:       string
-	limit?:        common.#Limit
-	having?:       common.#HavingExpression
-	stepInterval?: number
-	order?:        [...common.#OrderByItem]
-	functions?:      [...common.#Function]
-})

perses/schemas-wrapper/schemas/signoz-formula/signoz-formula.json

@@ -1,8 +0,0 @@
-{
-    "kind": "SigNozFormula",
-    "spec": {
-        "name": "F1",
-        "expression": "A / B * 100",
-        "legend": "Hit rate %"
-    }
-}

perses/schemas-wrapper/schemas/signoz-histogram-panel/example.json

@@ -1,21 +0,0 @@
-{
-    "kind": "SigNozHistogramPanel",
-    "spec": {
-        "histogramBuckets": {
-            "bucketCount": 60,
-            "bucketWidth": 100,
-            "mergeAllActiveQueries": true
-        },
-        "legend": {
-            "customColors": {
-                "series-A": "#9ea5f7"
-            }
-        },
-        "contextLinks": [
-            {
-                "label": "View histogram details",
-                "url": "http://localhost:8080/histogram"
-            }
-        ]
-    }
-}

perses/schemas-wrapper/schemas/signoz-histogram-panel/signoz-histogram-panel.cue

@@ -1,20 +0,0 @@
-package model
-
-import "github.com/signoz/common"
-
-kind: "SigNozHistogramPanel"
-spec: close({
-    histogramBuckets?:     #HistogramBuckets
-    legend?:               #Legend
-    contextLinks?:         [...common.#ContextLinkProps]
-})
-
-#HistogramBuckets: {
-    bucketCount?:          number | *30
-    bucketWidth?:          number | *0
-    mergeAllActiveQueries?: bool | *false
-}
-
-#Legend: {
-    customColors?: [string]: string
-}

perses/schemas-wrapper/schemas/signoz-list-panel/example.json

@@ -1,54 +0,0 @@
-{
-    "kind": "SigNozListPanel",
-    "spec": {
-        "selectedLogFields": [
-            {
-                "name": "timestamp",
-                "type": "log",
-                "dataType": ""
-            },
-            {
-                "name": "body",
-                "type": "log",
-                "dataType": ""
-            },
-            {
-                "name": "error",
-                "type": "",
-                "dataType": "string"
-            }
-        ],
-        "selectedTracesFields": [
-            {
-                "name": "service.name",
-                "signal": "traces",
-                "fieldContext": "resource",
-                "fieldDataType": "string"
-            },
-            {
-                "name": "name",
-                "signal": "traces",
-                "fieldContext": "span",
-                "fieldDataType": "string"
-            },
-            {
-                "name": "duration_nano",
-                "signal": "traces",
-                "fieldContext": "span",
-                "fieldDataType": ""
-            },
-            {
-                "name": "http_method",
-                "signal": "traces",
-                "fieldContext": "span",
-                "fieldDataType": ""
-            },
-            {
-                "name": "response_status_code",
-                "signal": "traces",
-                "fieldContext": "span",
-                "fieldDataType": ""
-            }
-        ]
-    }
-}

perses/schemas-wrapper/schemas/signoz-list-panel/signoz-list-panel.cue

@@ -1,15 +0,0 @@
-package model
-
-import "github.com/signoz/common"
-
-kind: "SigNozListPanel"
-spec: close({
-    selectedLogFields?:    [...#LogField]
-    selectedTracesFields?: [...common.#TelemetryFieldKey]
-})
-
-#LogField: {
-    name:     string
-    type:     string
-    dataType: string
-}

perses/schemas-wrapper/schemas/signoz-number-panel/example.json

@@ -1,34 +0,0 @@
-{
-    "kind": "SigNozNumberPanel",
-    "spec": {
-        "visualization": {
-            "timePreference": "globalTime"
-        },
-        "formatting": {
-            "unit": "none",
-            "decimalPrecision": 1
-        },
-        "contextLinks": [
-            {
-                "label": "View details",
-                "url": "http://localhost:8080/details"
-            }
-        ],
-        "thresholds": [
-            {
-                "value": 1200000,
-                "operator": ">",
-                "unit": "none",
-                "color": "Red",
-                "format": "Text"
-            },
-            {
-                "value": 1200000,
-                "operator": "<=",
-                "unit": "none",
-                "color": "Green",
-                "format": "Text"
-            }
-        ]
-    }
-}

perses/schemas-wrapper/schemas/signoz-number-panel/signoz-number-panel.cue

@@ -1,23 +0,0 @@
-package model
-
-import "github.com/signoz/common"
-
-kind: "SigNozNumberPanel"
-spec: close({
-    visualization?:        #Visualization
-    formatting?:           #Formatting
-    contextLinks?:         [...common.#ContextLinkProps]
-    thresholds?:           [...common.#ComparisonThreshold]
-})
-
-#Visualization: {
-    timePreference?: common.#TimePreference
-}
-
-// where to store if alerts can be added or not?
-
-#Formatting: {
-    // mainly need to discuss optional fields
-    unit?:             string | *""
-    decimalPrecision?: common.#PrecisionOption
-}

perses/schemas-wrapper/schemas/signoz-pie-chart-panel/example.json

@@ -1,25 +0,0 @@
-{
-    "kind": "SigNozPieChartPanel",
-    "spec": {
-        "visualization": {
-            "timePreference": "globalTime"
-        },
-        "formatting": {
-            "unit": "none",
-            "decimalPrecision": 1
-        },
-        "legend": {
-            "customColors": {
-                "\"201\"": "#2bc051",
-                "\"400\"": "#cc462e",
-                "\"500\"": "#ff0000"
-            }
-        },
-        "contextLinks": [
-            {
-                "label": "View breakdown",
-                "url": "http://localhost:8080/breakdown"
-            }
-        ]
-    }
-}

perses/schemas-wrapper/schemas/signoz-pie-chart-panel/signoz-pie-chart-panel.cue

@@ -1,24 +0,0 @@
-package model
-
-import "github.com/signoz/common"
-
-kind: "SigNozPieChartPanel"
-spec: close({
-    visualization?:        #Visualization
-    formatting?:           #Formatting
-    legend?:               #Legend
-    contextLinks?:         [...common.#ContextLinkProps]
-})
-
-#Visualization: {
-    timePreference?: common.#TimePreference
-}
-
-#Formatting: {
-    unit?:             string | *""
-    decimalPrecision?: common.#PrecisionOption
-}
-
-#Legend: {
-    customColors?: [string]: string
-}

perses/schemas-wrapper/schemas/signoz-promql/signoz-promql.cue

@@ -1,15 +0,0 @@
-package model
-
-import "github.com/signoz/common"
-
-// Source: pkg/types/querybuildertypes/querybuildertypesv5/prom_query.go — PromQuery
-kind: "SigNozPromQLQuery"
-spec: close({
-	name:      common.#QueryName
-	query:     string & !=""
-	disabled?: bool | *false
-	legend?:   string
-	// where are the below items coming from? Don't see types for it. How to arrive at this?
-	step?:     =~"^([0-9]+(\\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$" | number
-	stats?:    bool
-})

perses/schemas-wrapper/schemas/signoz-promql/signoz-promql.json

@@ -1,9 +0,0 @@
-{
-    "kind": "SigNozPromQLQuery",
-    "spec": {
-        "name": "A",
-        "query": "rate(http_requests_total{status=\"200\"}[5m])",
-        "disabled": false,
-        "legend": "{{method}} {{path}}"
-    }
-}

perses/schemas-wrapper/schemas/signoz-query-variable/signoz-query-variable.cue

@@ -1,13 +0,0 @@
-package model
-
-import "github.com/signoz/common"
-
-// defaultValue lives on the Perses ListVariable wrapper (spec level).
-kind: "SigNozQueryVariable"
-spec: close({
-	queryValue: string
-	sort?:      common.#VariableSortOrder
-	// This should not be optional
-	// what happens to the existing https://perses.dev/perses/docs/dac/go/variable/#sortingby inside the ListVariable spec? Do we move that to the plugin spec level?
-	// same for other list variable cues
-})

perses/schemas-wrapper/schemas/signoz-query-variable/signoz-query-variable.json

@@ -1,7 +0,0 @@
-{
-    "kind": "SigNozQueryVariable",
-    "spec": {
-        "queryValue": "SELECT DISTINCT host_name FROM signoz_metrics.distributed_time_series_v4_1day WHERE metric_name = 'redis_cpu_time'",
-        "sort": "asc"
-    }
-}

perses/schemas-wrapper/schemas/signoz-table-panel/example.json

@@ -1,30 +0,0 @@
-{
-    "kind": "SigNozTablePanel",
-    "spec": {
-        "visualization": {
-            "timePreference": "globalTime"
-        },
-        "formatting": {
-            "columnUnits": {
-                "A": "s"
-            },
-            "decimalPrecision": 2
-        },
-        "contextLinks": [
-            {
-                "label": "View trace",
-                "url": "http://localhost:8080/trace/{{traceID}}"
-            }
-        ],
-        "thresholds": [
-            {
-                "value": 1,
-                "operator": ">",
-                "unit": "min",
-                "color": "Red",
-                "format": "Text",
-                "tableOptions": "A"
-            }
-        ]
-    }
-}

perses/schemas-wrapper/schemas/signoz-table-panel/signoz-table-panel.cue

@@ -1,31 +0,0 @@
-package model
-
-import "github.com/signoz/common"
-
-kind: "SigNozTablePanel"
-spec: close({
-    visualization?:        #Visualization
-    formatting?:           #Formatting
-    contextLinks?:         [...common.#ContextLinkProps]
-    thresholds?:           [...#TableThreshold]
-})
-
-#Visualization: {
-    timePreference?: common.#TimePreference
-}
-
-#Formatting: {
-    columnUnits?:      [string]: string
-    decimalPrecision?: common.#PrecisionOption
-}
-
-#TableThreshold: {
-    common.#ComparisonThreshold
-    tableOptions: string
-}
-
-// missing
-columnWidths
-customColumnTitles
-hiddenColumns
-renderColumnCell - can be FE

perses/schemas-wrapper/schemas/signoz-textbox-variable/signoz-textbox-variable.cue

@@ -1,7 +0,0 @@
-package model
-
-// Shouldn't the below line be TextVariable?
-// are any of the variables inside this required? How would that validation work?
-// defaultValue lives on the Perses ListVariable wrapper (spec level).
-kind: "SigNozTextboxVariable"
-spec: close({})

perses/schemas-wrapper/schemas/signoz-textbox-variable/signoz-textbox-variable.json

@@ -1,4 +0,0 @@
-{
-    "kind": "SigNozTextboxVariable",
-    "spec": {}
-}

perses/schemas-wrapper/schemas/signoz-time-series-panel/example.json

@@ -1,46 +0,0 @@
-{
-    "kind": "SigNozTimeSeriesPanel",
-    "spec": {
-        "visualization": {
-            "timePreference": "globalTime",
-            "fillSpans": true
-        },
-        "formatting": {
-            "unit": "By",
-            "decimalPrecision": 3
-        },
-        "axes": {
-            "softMin": 0,
-            "softMax": 800,
-            "isLogScale": true
-        },
-        "legend": {
-            "position": "right",
-            "customColors": {
-                "{service.name=\"sampleapp-gateway\"}": "#9ea5f7"
-            }
-        },
-        "contextLinks": [
-            {
-                "label": "View service details",
-                "url": "http://localhost:8080/{{_service.name}}?dfddf=%7B%7Blimit%7D%7D"
-            }
-        ],
-        "thresholds": [
-            {
-                "value": 1024,
-                "unit": "By",
-                "color": "Red",
-                "format": "Text",
-                "label": "upper limit"
-            },
-            {
-                "value": 100,
-                "unit": "By",
-                "color": "Orange",
-                "format": "Text",
-                "label": "kinda bad"
-            }
-        ]
-    }
-}

perses/schemas-wrapper/schemas/signoz-time-series-panel/signoz-time-series-panel.cue

@@ -1,36 +0,0 @@
-package model
-
-import "github.com/signoz/common"
-
-kind: "SigNozTimeSeriesPanel"
-spec: close({
-    visualization?:        #Visualization
-    formatting?:           #Formatting
-    axes?:                 common.#Axes
-    legend?:               #Legend
-    contextLinks?:         [...common.#ContextLinkProps]
-    thresholds?:           [...common.#ThresholdWithLabel]
-})
-
-#Visualization: {
-    timePreference?: common.#TimePreference
-    fillSpans?:      bool | *false
-}
-
-#Formatting: {
-    unit?:             string | *""
-    decimalPrecision?: common.#PrecisionOption
-}
-
-#Legend: {
-    position?:     common.#LegendPosition
-    // why call it customColors?
-    customColors?: [string]: string
-}
-
-// chart appearance
- - fill mode
- - line style
- - line interpolation
- - show points
- - span gaps

perses/schemas-wrapper/schemas/signoz-trace-operator/signoz-trace-operator.cue

@@ -1,31 +0,0 @@
-package model
-
-import "github.com/signoz/common"
-
-// Source: pkg/types/querybuildertypes/querybuildertypesv5/trace_operator.go — QueryBuilderTraceOperator
-// SigNozTraceOperator composes multiple trace BuilderQueries using
-// relational operators (=>, ->, &&, ||, NOT) to query trace relationships.
-// Signal is implicitly "traces" — all referenced queries must be trace queries.
-kind: "SigNozTraceOperator"
-spec: close({
-	name:       common.#QueryName
-	// Operator expression composing trace queries, e.g. "A => B && C".
-	expression: string & !=""
-	disabled?:  bool | *false
-
-	// Which query's spans to return (must be a query referenced in expression).
-	returnSpansFrom?: common.#QueryName
-
-	aggregations?: [...common.#ExpressionAggregation]
-	filter?:       common.#FilterExpression
-	groupBy?:      [...common.#GroupByItem]
-	order?:        [...common.#OrderByItem]
-	limit?:        common.#Limit
-	offset?:       common.#Offset
-	cursor?:       string
-	functions?:    [...common.#Function]
-	stepInterval?: number
-	having?:       common.#HavingExpression
-	legend?:       string
-	selectFields?: [...common.#TelemetryFieldKey]
-})

perses/schemas-wrapper/schemas/signoz-trace-operator/signoz-trace-operator.json

@@ -1,19 +0,0 @@
-{
-    "kind": "SigNozTraceOperator",
-    "spec": {
-        "name": "T1",
-        "expression": "A => B",
-        "returnSpansFrom": "A",
-        "aggregations": [
-            {
-                "expression": "count()",
-                "alias": "request_count"
-            }
-        ],
-        "filter": {
-            "expression": "service.name = 'frontend'"
-        },
-        "groupBy": [],
-        "order": []
-    }
-}

perses/validate.sh

@@ -1,2 +0,0 @@
-percli lint -f ./examples/perses.json --plugin.path ./schemas-wrapper
-rm ./schemas-wrapper/plugin-modules.json

pkg/telemetrytraces/const.go

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

pkg/telemetrytraces/field_mapper.go

@@ -247,6 +247,15 @@ func (m *defaultFieldMapper) FieldFor(
 		return key.Name, nil
 	}
 
+	// special handling for contextual map fields
+	if key.FieldContext == telemetrytypes.FieldContextSpan &&
+		(key.Name == SpanAttributesStringColumn ||
+			key.Name == SpanAttributesNumberColumn ||
+			key.Name == SpanAttributesBoolColumn ||
+			key.Name == SpanResourcesStringColumn) {
+		return key.Name, nil
+	}
+
 	column, err := m.getColumn(ctx, key)
 	if err != nil {
 		return "", err

pkg/telemetrytraces/field_mapper_test.go

@@ -78,6 +78,34 @@ func TestGetFieldKeyName(t *testing.T) {
 			expectedResult: "multiIf(resource.`deployment.environment` IS NOT NULL, resource.`deployment.environment`::String, `resource_string_deployment$$environment_exists`==true, `resource_string_deployment$$environment`, NULL)",
 			expectedError:  nil,
 		},
+		{
+			name: "Contextual map column - attributes_string with span context",
+			key: telemetrytypes.TelemetryFieldKey{
+				Name:         SpanAttributesStringColumn,
+				FieldContext: telemetrytypes.FieldContextSpan,
+			},
+			expectedResult: SpanAttributesStringColumn,
+			expectedError:  nil,
+		},
+		{
+			name: "Contextual map column - resources_string with span context",
+			key: telemetrytypes.TelemetryFieldKey{
+				Name:         SpanResourcesStringColumn,
+				FieldContext: telemetrytypes.FieldContextSpan,
+			},
+			expectedResult: SpanResourcesStringColumn,
+			expectedError:  nil,
+		},
+		{
+			name: "Contextual map column - attributes_string without span context does not short-circuit",
+			key: telemetrytypes.TelemetryFieldKey{
+				Name:          SpanAttributesStringColumn,
+				FieldContext:  telemetrytypes.FieldContextAttribute,
+				FieldDataType: telemetrytypes.FieldDataTypeString,
+			},
+			expectedResult: "attributes_string['attributes_string']",
+			expectedError:  nil,
+		},
 		{
 			name: "Non-existent column",
 			key: telemetrytypes.TelemetryFieldKey{

pkg/telemetrytraces/statement_builder.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"log/slog"
-	"slices"
 	"strings"
 
 	"github.com/SigNoz/signoz/pkg/errors"
@@ -14,7 +13,6 @@ import (
 	qbtypes "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
 	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
 	"github.com/huandu/go-sqlbuilder"
-	"golang.org/x/exp/maps"
 )
 
 var (
@@ -74,40 +72,11 @@ func (b *traceQueryStatementBuilder) Build(
 		return nil, err
 	}
 
-	/*
-		Adding a tech debt note here:
-		This piece of code is a hot fix and should be removed once we close issue: engineering-pod/issues/3622
-	*/
-	/*
-		-------------------------------- Start of tech debt ----------------------------
-	*/
 	if requestType == qbtypes.RequestTypeRaw {
-
-		selectedFields := query.SelectFields
-
-		if len(selectedFields) == 0 {
-			sortedKeys := maps.Keys(DefaultFields)
-			slices.Sort(sortedKeys)
-			for _, key := range sortedKeys {
-				selectedFields = append(selectedFields, DefaultFields[key])
-			}
-			query.SelectFields = selectedFields
-		}
-
-		selectFieldKeys := []string{}
-		for _, field := range selectedFields {
-			selectFieldKeys = append(selectFieldKeys, field.Name)
-		}
-
-		for _, x := range []string{"timestamp", "span_id", "trace_id"} {
-			if !slices.Contains(selectFieldKeys, x) {
-				query.SelectFields = append(query.SelectFields, DefaultFields[x])
-			}
-		}
+		// we are expnding here to ensure that all the conflicts are taken care in adjustKeys
+		// i.e if there is a conflict we strip away context of the key in adjustKeys
+		query = b.expandRawSelectFields(query)
 	}
-	/*
-		-------------------------------- End of tech debt ----------------------------
-	*/
 
 	query = b.adjustKeys(ctx, keys, query, requestType)
 
@@ -294,8 +263,15 @@ func (b *traceQueryStatementBuilder) buildListQuery(
 		cteArgs = append(cteArgs, args)
 	}
 
-	// TODO: should we deprecate `SelectFields` and return everything from a span like we do for logs?
 	for _, field := range query.SelectFields {
+		// For the contextual map columns, select them directly without considering their context
+		// if field.Name == SpanAttributesStringColumn ||
+		// 	field.Name == SpanAttributesNumberColumn ||
+		// 	field.Name == SpanAttributesBoolColumn ||
+		// 	field.Name == SpanResourcesStringColumn {
+		// 	sb.SelectMore(field.Name)
+		// 	continue
+		// }
 		colExpr, err := b.fm.ColumnExpressionFor(ctx, &field, keys)
 		if err != nil {
 			return nil, err
@@ -814,3 +790,56 @@ func (b *traceQueryStatementBuilder) buildResourceFilterCTE(
 		variables,
 	)
 }
+
+// expandRawSelectFields populates SelectFields for raw (list view) queries.
+// It must be called before adjustKeys so that normalization runs over the full set.
+func (b *traceQueryStatementBuilder) expandRawSelectFields(query qbtypes.QueryBuilderQuery[qbtypes.TraceAggregation]) qbtypes.QueryBuilderQuery[qbtypes.TraceAggregation] {
+	selectFields := []telemetrytypes.TelemetryFieldKey{
+		{Name: SpanTimestampColumn, FieldContext: telemetrytypes.FieldContextSpan},
+		{Name: SpanTraceIDColumn, FieldContext: telemetrytypes.FieldContextSpan},
+		{Name: SpanSpanIDColumn, FieldContext: telemetrytypes.FieldContextSpan},
+	}
+	if len(query.SelectFields) == 0 {
+		// Select all intrinsic columns
+		selectFields = append(selectFields, telemetrytypes.TelemetryFieldKey{Name: SpanTraceStateColumn, FieldContext: telemetrytypes.FieldContextSpan})
+		selectFields = append(selectFields, telemetrytypes.TelemetryFieldKey{Name: SpanParentSpanIDColumn, FieldContext: telemetrytypes.FieldContextSpan})
+		selectFields = append(selectFields, telemetrytypes.TelemetryFieldKey{Name: SpanFlagsColumn, FieldContext: telemetrytypes.FieldContextSpan})
+		selectFields = append(selectFields, telemetrytypes.TelemetryFieldKey{Name: SpanNameColumn, FieldContext: telemetrytypes.FieldContextSpan})
+		selectFields = append(selectFields, telemetrytypes.TelemetryFieldKey{Name: SpanKindColumn, FieldContext: telemetrytypes.FieldContextSpan})
+		selectFields = append(selectFields, telemetrytypes.TelemetryFieldKey{Name: SpanKindStringColumn, FieldContext: telemetrytypes.FieldContextSpan})
+		selectFields = append(selectFields, telemetrytypes.TelemetryFieldKey{Name: SpanDurationNanoColumn, FieldContext: telemetrytypes.FieldContextSpan})
+		selectFields = append(selectFields, telemetrytypes.TelemetryFieldKey{Name: SpanStatusCodeColumn, FieldContext: telemetrytypes.FieldContextSpan})
+		selectFields = append(selectFields, telemetrytypes.TelemetryFieldKey{Name: SpanStatusMessageColumn, FieldContext: telemetrytypes.FieldContextSpan})
+		selectFields = append(selectFields, telemetrytypes.TelemetryFieldKey{Name: SpanStatusCodeStringColumn, FieldContext: telemetrytypes.FieldContextSpan})
+		selectFields = append(selectFields, telemetrytypes.TelemetryFieldKey{Name: SpanEventsColumn, FieldContext: telemetrytypes.FieldContextSpan})
+		selectFields = append(selectFields, telemetrytypes.TelemetryFieldKey{Name: SpanLinksColumn, FieldContext: telemetrytypes.FieldContextSpan})
+
+		// select all calculated columns
+		selectFields = append(selectFields, telemetrytypes.TelemetryFieldKey{Name: SpanResponseStatusCodeColumn, FieldContext: telemetrytypes.FieldContextSpan})
+		selectFields = append(selectFields, telemetrytypes.TelemetryFieldKey{Name: SpanExternalHTTPURLColumn, FieldContext: telemetrytypes.FieldContextSpan})
+		selectFields = append(selectFields, telemetrytypes.TelemetryFieldKey{Name: SpanHTTPURLColumn, FieldContext: telemetrytypes.FieldContextSpan})
+		selectFields = append(selectFields, telemetrytypes.TelemetryFieldKey{Name: SpanExternalHTTPMethodColumn, FieldContext: telemetrytypes.FieldContextSpan})
+		selectFields = append(selectFields, telemetrytypes.TelemetryFieldKey{Name: SpanHTTPMethodColumn, FieldContext: telemetrytypes.FieldContextSpan})
+		selectFields = append(selectFields, telemetrytypes.TelemetryFieldKey{Name: SpanHTTPHostColumn, FieldContext: telemetrytypes.FieldContextSpan})
+		selectFields = append(selectFields, telemetrytypes.TelemetryFieldKey{Name: SpanDBNameColumn, FieldContext: telemetrytypes.FieldContextSpan})
+		selectFields = append(selectFields, telemetrytypes.TelemetryFieldKey{Name: SpanDBOperationColumn, FieldContext: telemetrytypes.FieldContextSpan})
+		selectFields = append(selectFields, telemetrytypes.TelemetryFieldKey{Name: SpanHasErrorColumn, FieldContext: telemetrytypes.FieldContextSpan})
+		selectFields = append(selectFields, telemetrytypes.TelemetryFieldKey{Name: SpanIsRemoteColumn, FieldContext: telemetrytypes.FieldContextSpan})
+
+		// select all contextual map columns (special handling for them in field mapper)
+		selectFields = append(selectFields, telemetrytypes.TelemetryFieldKey{Name: SpanAttributesStringColumn, FieldContext: telemetrytypes.FieldContextSpan})
+		selectFields = append(selectFields, telemetrytypes.TelemetryFieldKey{Name: SpanAttributesNumberColumn, FieldContext: telemetrytypes.FieldContextSpan})
+		selectFields = append(selectFields, telemetrytypes.TelemetryFieldKey{Name: SpanAttributesBoolColumn, FieldContext: telemetrytypes.FieldContextSpan})
+		selectFields = append(selectFields, telemetrytypes.TelemetryFieldKey{Name: SpanResourcesStringColumn, FieldContext: telemetrytypes.FieldContextSpan})
+	} else {
+		for _, field := range query.SelectFields {
+			// TODO(tvats): If a user specifies attribute.timestamp in the select fields, this loop will basically ignore it, as we already added a field by default. This can be fixed once we close https://github.com/SigNoz/engineering-pod/issues/3693
+			if field.Name == SpanTimestampColumn || field.Name == SpanTraceIDColumn || field.Name == SpanSpanIDColumn {
+				continue
+			}
+			selectFields = append(selectFields, field)
+		}
+	}
+	query.SelectFields = selectFields
+	return query
+}

pkg/telemetrytraces/stmt_builder_test.go

@@ -454,7 +454,7 @@ func TestStatementBuilderListQuery(t *testing.T) {
 				},
 			},
 			expected: qbtypes.Statement{
-				Query: "WITH __resource_filter AS (SELECT fingerprint FROM signoz_traces.distributed_traces_v3_resource WHERE (simpleJSONExtractString(labels, 'service.name') = ? AND labels LIKE ? AND labels LIKE ?) AND seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ?) SELECT name AS `name`, multiIf(resource.`service.name` IS NOT NULL, resource.`service.name`::String, mapContains(resources_string, 'service.name'), resources_string['service.name'], NULL) AS `service.name`, duration_nano AS `duration_nano`, `attribute_number_cart$$items_count` AS `cart.items_count`, timestamp AS `timestamp`, span_id AS `span_id`, trace_id AS `trace_id` FROM signoz_traces.distributed_signoz_index_v3 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND true AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? LIMIT ?",
+				Query: "WITH __resource_filter AS (SELECT fingerprint FROM signoz_traces.distributed_traces_v3_resource WHERE (simpleJSONExtractString(labels, 'service.name') = ? AND labels LIKE ? AND labels LIKE ?) AND seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ?) SELECT timestamp AS `timestamp`, trace_id AS `trace_id`, span_id AS `span_id`, name AS `name`, multiIf(resource.`service.name` IS NOT NULL, resource.`service.name`::String, mapContains(resources_string, 'service.name'), resources_string['service.name'], NULL) AS `service.name`, duration_nano AS `duration_nano`, `attribute_number_cart$$items_count` AS `cart.items_count` FROM signoz_traces.distributed_signoz_index_v3 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND true AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? LIMIT ?",
 				Args:  []any{"redis-manual", "%service.name%", "%service.name\":\"redis-manual%", uint64(1747945619), uint64(1747983448), "1747947419000000000", "1747983448000000000", uint64(1747945619), uint64(1747983448), 10},
 			},
 			expectedErr: nil,
@@ -483,7 +483,7 @@ func TestStatementBuilderListQuery(t *testing.T) {
 				Limit: 10,
 			},
 			expected: qbtypes.Statement{
-				Query: "WITH __resource_filter AS (SELECT fingerprint FROM signoz_traces.distributed_traces_v3_resource WHERE (simpleJSONExtractString(labels, 'service.name') = ? AND labels LIKE ? AND labels LIKE ?) AND seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ?) SELECT duration_nano AS `duration_nano`, name AS `name`, response_status_code AS `response_status_code`, multiIf(resource.`service.name` IS NOT NULL, resource.`service.name`::String, mapContains(resources_string, 'service.name'), resources_string['service.name'], NULL) AS `service.name`, span_id AS `span_id`, timestamp AS `timestamp`, trace_id AS `trace_id` FROM signoz_traces.distributed_signoz_index_v3 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND true AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? ORDER BY attributes_string['user.id'] AS `user.id` desc LIMIT ?",
+				Query: "WITH __resource_filter AS (SELECT fingerprint FROM signoz_traces.distributed_traces_v3_resource WHERE (simpleJSONExtractString(labels, 'service.name') = ? AND labels LIKE ? AND labels LIKE ?) AND seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ?) SELECT timestamp AS `timestamp`, trace_id AS `trace_id`, span_id AS `span_id`, trace_state AS `trace_state`, parent_span_id AS `parent_span_id`, flags AS `flags`, name AS `name`, kind AS `kind`, kind_string AS `kind_string`, duration_nano AS `duration_nano`, status_code AS `status_code`, status_message AS `status_message`, status_code_string AS `status_code_string`, events AS `events`, links AS `links`, response_status_code AS `response_status_code`, external_http_url AS `external_http_url`, http_url AS `http_url`, external_http_method AS `external_http_method`, http_method AS `http_method`, http_host AS `http_host`, db_name AS `db_name`, db_operation AS `db_operation`, has_error AS `has_error`, is_remote AS `is_remote`, attributes_string AS `attributes_string`, attributes_number AS `attributes_number`, attributes_bool AS `attributes_bool`, resources_string AS `resources_string` FROM signoz_traces.distributed_signoz_index_v3 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND true AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? ORDER BY attributes_string['user.id'] AS `user.id` desc LIMIT ?",
 				Args:  []any{"redis-manual", "%service.name%", "%service.name\":\"redis-manual%", uint64(1747945619), uint64(1747983448), "1747947419000000000", "1747983448000000000", uint64(1747945619), uint64(1747983448), 10},
 			},
 			expectedErr: nil,
@@ -527,7 +527,7 @@ func TestStatementBuilderListQuery(t *testing.T) {
 				Limit: 10,
 			},
 			expected: qbtypes.Statement{
-				Query: "WITH __resource_filter AS (SELECT fingerprint FROM signoz_traces.distributed_traces_v3_resource WHERE (simpleJSONExtractString(labels, 'service.name') = ? AND labels LIKE ? AND labels LIKE ?) AND seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ?) SELECT name AS `name`, resource_string_service$$name AS `serviceName`, duration_nano AS `durationNano`, http_method AS `httpMethod`, response_status_code AS `responseStatusCode`, timestamp AS `timestamp`, span_id AS `span_id`, trace_id AS `trace_id` FROM signoz_traces.distributed_signoz_index_v3 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND true AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? LIMIT ?",
+				Query: "WITH __resource_filter AS (SELECT fingerprint FROM signoz_traces.distributed_traces_v3_resource WHERE (simpleJSONExtractString(labels, 'service.name') = ? AND labels LIKE ? AND labels LIKE ?) AND seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ?) SELECT timestamp AS `timestamp`, trace_id AS `trace_id`, span_id AS `span_id`, name AS `name`, resource_string_service$$name AS `serviceName`, duration_nano AS `durationNano`, http_method AS `httpMethod`, response_status_code AS `responseStatusCode` FROM signoz_traces.distributed_signoz_index_v3 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND true AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? LIMIT ?",
 				Args:  []any{"redis-manual", "%service.name%", "%service.name\":\"redis-manual%", uint64(1747945619), uint64(1747983448), "1747947419000000000", "1747983448000000000", uint64(1747945619), uint64(1747983448), 10},
 			},
 			expectedErr: nil,
@@ -571,7 +571,7 @@ func TestStatementBuilderListQuery(t *testing.T) {
 				Limit: 10,
 			},
 			expected: qbtypes.Statement{
-				Query: "WITH __resource_filter AS (SELECT fingerprint FROM signoz_traces.distributed_traces_v3_resource WHERE (simpleJSONExtractString(labels, 'service.name') = ? AND labels LIKE ? AND labels LIKE ?) AND seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ?) SELECT name AS `name`, resource_string_service$$name AS `serviceName`, duration_nano AS `durationNano`, http_method AS `httpMethod`, multiIf(toString(`attribute_string_mixed$$materialization$$key`) != '', toString(`attribute_string_mixed$$materialization$$key`), toString(multiIf(resource.`mixed.materialization.key` IS NOT NULL, resource.`mixed.materialization.key`::String, mapContains(resources_string, 'mixed.materialization.key'), resources_string['mixed.materialization.key'], NULL)) != '', toString(multiIf(resource.`mixed.materialization.key` IS NOT NULL, resource.`mixed.materialization.key`::String, mapContains(resources_string, 'mixed.materialization.key'), resources_string['mixed.materialization.key'], NULL)), NULL) AS `mixed.materialization.key`, timestamp AS `timestamp`, span_id AS `span_id`, trace_id AS `trace_id` FROM signoz_traces.distributed_signoz_index_v3 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND true AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? LIMIT ?",
+				Query: "WITH __resource_filter AS (SELECT fingerprint FROM signoz_traces.distributed_traces_v3_resource WHERE (simpleJSONExtractString(labels, 'service.name') = ? AND labels LIKE ? AND labels LIKE ?) AND seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ?) SELECT timestamp AS `timestamp`, trace_id AS `trace_id`, span_id AS `span_id`, name AS `name`, resource_string_service$$name AS `serviceName`, duration_nano AS `durationNano`, http_method AS `httpMethod`, multiIf(toString(`attribute_string_mixed$$materialization$$key`) != '', toString(`attribute_string_mixed$$materialization$$key`), toString(multiIf(resource.`mixed.materialization.key` IS NOT NULL, resource.`mixed.materialization.key`::String, mapContains(resources_string, 'mixed.materialization.key'), resources_string['mixed.materialization.key'], NULL)) != '', toString(multiIf(resource.`mixed.materialization.key` IS NOT NULL, resource.`mixed.materialization.key`::String, mapContains(resources_string, 'mixed.materialization.key'), resources_string['mixed.materialization.key'], NULL)), NULL) AS `mixed.materialization.key` FROM signoz_traces.distributed_signoz_index_v3 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND true AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? LIMIT ?",
 				Args:  []any{"redis-manual", "%service.name%", "%service.name\":\"redis-manual%", uint64(1747945619), uint64(1747983448), "1747947419000000000", "1747983448000000000", uint64(1747945619), uint64(1747983448), 10},
 			},
 			expectedErr: nil,
@@ -616,7 +616,7 @@ func TestStatementBuilderListQuery(t *testing.T) {
 				Limit: 10,
 			},
 			expected: qbtypes.Statement{
-				Query: "WITH __resource_filter AS (SELECT fingerprint FROM signoz_traces.distributed_traces_v3_resource WHERE (simpleJSONExtractString(labels, 'service.name') = ? AND labels LIKE ? AND labels LIKE ?) AND seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ?) SELECT name AS `name`, resource_string_service$$name AS `serviceName`, duration_nano AS `durationNano`, http_method AS `httpMethod`, `attribute_string_mixed$$materialization$$key` AS `mixed.materialization.key`, timestamp AS `timestamp`, span_id AS `span_id`, trace_id AS `trace_id` FROM signoz_traces.distributed_signoz_index_v3 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND true AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? LIMIT ?",
+				Query: "WITH __resource_filter AS (SELECT fingerprint FROM signoz_traces.distributed_traces_v3_resource WHERE (simpleJSONExtractString(labels, 'service.name') = ? AND labels LIKE ? AND labels LIKE ?) AND seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ?) SELECT timestamp AS `timestamp`, trace_id AS `trace_id`, span_id AS `span_id`, name AS `name`, resource_string_service$$name AS `serviceName`, duration_nano AS `durationNano`, http_method AS `httpMethod`, `attribute_string_mixed$$materialization$$key` AS `mixed.materialization.key` FROM signoz_traces.distributed_signoz_index_v3 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND true AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? LIMIT ?",
 				Args:  []any{"redis-manual", "%service.name%", "%service.name\":\"redis-manual%", uint64(1747945619), uint64(1747983448), "1747947419000000000", "1747983448000000000", uint64(1747945619), uint64(1747983448), 10},
 			},
 			expectedErr: nil,
@@ -727,7 +727,7 @@ func TestStatementBuilderListQueryWithCorruptData(t *testing.T) {
 				Limit:        10,
 			},
 			expected: qbtypes.Statement{
-				Query: "WITH __resource_filter AS (SELECT fingerprint FROM signoz_traces.distributed_traces_v3_resource WHERE seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ?) SELECT duration_nano AS `duration_nano`, name AS `name`, response_status_code AS `response_status_code`, multiIf(resource.`service.name` IS NOT NULL, resource.`service.name`::String, mapContains(resources_string, 'service.name'), resources_string['service.name'], NULL) AS `service.name`, span_id AS `span_id`, timestamp AS `timestamp`, trace_id AS `trace_id` FROM signoz_traces.distributed_signoz_index_v3 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? LIMIT ?",
+				Query: "WITH __resource_filter AS (SELECT fingerprint FROM signoz_traces.distributed_traces_v3_resource WHERE seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ?) SELECT timestamp AS `timestamp`, trace_id AS `trace_id`, span_id AS `span_id`, trace_state AS `trace_state`, parent_span_id AS `parent_span_id`, flags AS `flags`, name AS `name`, kind AS `kind`, kind_string AS `kind_string`, duration_nano AS `duration_nano`, status_code AS `status_code`, status_message AS `status_message`, status_code_string AS `status_code_string`, events AS `events`, links AS `links`, response_status_code AS `response_status_code`, external_http_url AS `external_http_url`, http_url AS `http_url`, external_http_method AS `external_http_method`, http_method AS `http_method`, http_host AS `http_host`, db_name AS `db_name`, db_operation AS `db_operation`, has_error AS `has_error`, is_remote AS `is_remote`, attributes_string AS `attributes_string`, attributes_number AS `attributes_number`, attributes_bool AS `attributes_bool`, resources_string AS `resources_string` FROM signoz_traces.distributed_signoz_index_v3 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? LIMIT ?",
 				Args:  []any{uint64(1747945619), uint64(1747983448), "1747947419000000000", "1747983448000000000", uint64(1747945619), uint64(1747983448), 10},
 			},
 			expectedErr: nil,
@@ -760,7 +760,7 @@ func TestStatementBuilderListQueryWithCorruptData(t *testing.T) {
 				}},
 			},
 			expected: qbtypes.Statement{
-				Query: "WITH __resource_filter AS (SELECT fingerprint FROM signoz_traces.distributed_traces_v3_resource WHERE seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ?) SELECT duration_nano AS `duration_nano`, name AS `name`, response_status_code AS `response_status_code`, multiIf(resource.`service.name` IS NOT NULL, resource.`service.name`::String, mapContains(resources_string, 'service.name'), resources_string['service.name'], NULL) AS `service.name`, span_id AS `span_id`, timestamp AS `timestamp`, trace_id AS `trace_id` FROM signoz_traces.distributed_signoz_index_v3 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? ORDER BY timestamp AS `timestamp` asc LIMIT ?",
+				Query: "WITH __resource_filter AS (SELECT fingerprint FROM signoz_traces.distributed_traces_v3_resource WHERE seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ?) SELECT timestamp AS `timestamp`, trace_id AS `trace_id`, span_id AS `span_id`, trace_state AS `trace_state`, parent_span_id AS `parent_span_id`, flags AS `flags`, name AS `name`, kind AS `kind`, kind_string AS `kind_string`, duration_nano AS `duration_nano`, status_code AS `status_code`, status_message AS `status_message`, status_code_string AS `status_code_string`, events AS `events`, links AS `links`, response_status_code AS `response_status_code`, external_http_url AS `external_http_url`, http_url AS `http_url`, external_http_method AS `external_http_method`, http_method AS `http_method`, http_host AS `http_host`, db_name AS `db_name`, db_operation AS `db_operation`, has_error AS `has_error`, is_remote AS `is_remote`, attributes_string AS `attributes_string`, attributes_number AS `attributes_number`, attributes_bool AS `attributes_bool`, resources_string AS `resources_string` FROM signoz_traces.distributed_signoz_index_v3 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? ORDER BY timestamp AS `timestamp` asc LIMIT ?",
 				Args:  []any{uint64(1747945619), uint64(1747983448), "1747947419000000000", "1747983448000000000", uint64(1747945619), uint64(1747983448), 10},
 			},
 			expectedErr: nil,

tests/integration/src/querier/04_traces.py

@@ -490,25 +490,24 @@ def test_traces_list(
                     "name": "A",
                     "signal": "traces",
                     "disabled": False,
+                    "selectFields": [
+                        {"name": "span_id"},
+                        {"name": "span.timestamp"},
+                        {"name": "trace_id"},
+                    ],
                     "order": [{"key": {"name": "timestamp"}, "direction": "desc"}],
                     "limit": 1,
                 },
             },
             HTTPStatus.OK,
             lambda x: [
-                x[3].duration_nano,
-                x[3].name,
-                x[3].response_status_code,
-                x[3].service_name,
                 x[3].span_id,
                 format_timestamp(x[3].timestamp),
                 x[3].trace_id,
             ],  # type: Callable[[List[Traces]], List[Any]]
         ),
         # Case 2: order by attribute timestamp field which is there in attributes as well
-        # This should break but it doesn't because attribute.timestamp gets adjusted to timestamp
-        # because of default trace.timestamp gets added by default and bug in field mapper picks
-        # instrinsic field
+        # attribute.timestamp gets adjusted to span.timestamp
         pytest.param(
             {
                 "type": "builder_query",
@@ -516,6 +515,11 @@ def test_traces_list(
                     "name": "A",
                     "signal": "traces",
                     "disabled": False,
+                    "selectFields": [
+                        {"name": "span_id"},
+                        {"name": "span.timestamp"},
+                        {"name": "trace_id"},
+                    ],
                     "order": [
                         {"key": {"name": "attribute.timestamp"}, "direction": "desc"}
                     ],
@@ -524,10 +528,6 @@ def test_traces_list(
             },
             HTTPStatus.OK,
             lambda x: [
-                x[3].duration_nano,
-                x[3].name,
-                x[3].response_status_code,
-                x[3].service_name,
                 x[3].span_id,
                 format_timestamp(x[3].timestamp),
                 x[3].trace_id,
@@ -553,7 +553,7 @@ def test_traces_list(
             ],  # type: Callable[[List[Traces]], List[Any]]
         ),
         # Case 4: select attribute.timestamp with empty order by
-        # This doesn't return any data because of where_clause using aliased timestamp
+        # This returns the one span which has attribute.timestamp
         pytest.param(
             {
                 "type": "builder_query",
@@ -567,7 +567,11 @@ def test_traces_list(
                 },
             },
             HTTPStatus.OK,
-            lambda x: [],  # type: Callable[[List[Traces]], List[Any]]
+            lambda x: [
+                x[0].span_id,
+                format_timestamp(x[0].timestamp),
+                x[0].trace_id,
+            ],  # type: Callable[[List[Traces]], List[Any]]
         ),
         # Case 5: select timestamp with timestamp order by
         pytest.param(
@@ -706,6 +710,114 @@ def test_traces_list_with_corrupt_data(
                 assert data[key] == value
 
 
+@pytest.mark.parametrize(
+    "select_fields,status_code,expected_keys",
+    [
+        pytest.param(
+            [],
+            HTTPStatus.OK,
+            [
+                # all intrinsic column
+                "timestamp",
+                "trace_id",
+                "span_id",
+                "trace_state",
+                "parent_span_id",
+                "flags",
+                "name",
+                "kind",
+                "kind_string",
+                "duration_nano",
+                "status_code",
+                "status_message",
+                "status_code_string",
+                "events",
+                "links",
+                # all calculated columns
+                "response_status_code",
+                "external_http_url",
+                "http_url",
+                "external_http_method",
+                "http_method",
+                "http_host",
+                "db_name",
+                "db_operation",
+                "has_error",
+                "is_remote",
+                # all contextual columns
+                "attributes_number",
+                "attributes_string",
+                "attributes_bool",
+                "resources_string",
+            ],
+        ),
+        pytest.param(
+            [
+                {"name": "service.name"},
+            ],
+            HTTPStatus.OK,
+            ["timestamp", "trace_id", "span_id", "service.name"],
+        ),
+    ],
+)
+def test_traces_list_with_select_fields(
+    signoz: types.SigNoz,
+    create_user_admin: None,  # pylint: disable=unused-argument
+    get_token: Callable[[str, str], str],
+    insert_traces: Callable[[List[Traces]], None],
+    select_fields: List[dict],
+    status_code: HTTPStatus,
+    expected_keys: List[str],
+) -> None:
+    """
+    Setup:
+    Insert 4 traces with different attributes.
+
+    Tests:
+    1. Empty select fields should return all the fields.
+    2. Non empty select field should return the select field along with timestamp, trace_id and span_id.
+    """
+    traces = (
+        generate_traces_with_corrupt_metadata()
+    )  # using this as the data doesn't matter
+
+    insert_traces(traces)
+
+    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
+
+    payload = {
+        "type": "builder_query",
+        "spec": {
+            "name": "A",
+            "signal": "traces",
+            "selectFields": select_fields,
+            "order": [{"key": {"name": "timestamp"}, "direction": "desc"}],
+            "limit": 1,
+        },
+    }
+
+    response = make_query_request(
+        signoz,
+        token,
+        start_ms=int(
+            (datetime.now(tz=timezone.utc) - timedelta(minutes=5)).timestamp() * 1000
+        ),
+        end_ms=int(datetime.now(tz=timezone.utc).timestamp() * 1000),
+        request_type="raw",
+        queries=[payload],
+    )
+    assert response.status_code == status_code
+
+    if response.status_code == HTTPStatus.OK:
+        data = response.json()
+        assert len(data["data"]["data"]["results"][0]["rows"][0]["data"].keys()) == len(
+            expected_keys
+        )
+        assert set(data["data"]["data"]["results"][0]["rows"][0]["data"].keys()) == set(
+            expected_keys
+        )
+
+
 @pytest.mark.parametrize(
     "order_by,aggregation_alias,expected_status",
     [