chore(signoz): 📌 pin versions: SigNoz OtelCollector 0.88.11

Signed-off-by: Prashant Shahi <prashant@signoz.io>

deploy/docker-swarm/clickhouse-setup/docker-compose.yaml

@@ -146,7 +146,7 @@ services:
         condition: on-failure
 
   query-service:
-    image: signoz/query-service:0.37.2
+    image: signoz/query-service:0.38.2
     command:
       [
         "-config=/root/config/prometheus.yml",
@@ -186,7 +186,7 @@ services:
     <<: *db-depend
 
   frontend:
-    image: signoz/frontend:0.37.2
+    image: signoz/frontend:0.38.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -199,7 +199,7 @@ services:
       - ../common/nginx-config.conf:/etc/nginx/conf.d/default.conf
 
   otel-collector:
-    image: signoz/signoz-otel-collector:0.88.9
+    image: signoz/signoz-otel-collector:0.88.11
     command:
       [
         "--config=/etc/otel-collector-config.yaml",
@@ -237,7 +237,7 @@ services:
       - query-service
 
   otel-collector-migrator:
-      image: signoz/signoz-schema-migrator:0.88.9
+      image: signoz/signoz-schema-migrator:0.88.11
       deploy:
         restart_policy:
           condition: on-failure

deploy/docker/clickhouse-setup/docker-compose-core.yaml

@@ -66,7 +66,7 @@ services:
       - --storage.path=/data
 
   otel-collector-migrator:
-    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.88.9}
+    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.88.11}
     container_name: otel-migrator
     command:
       - "--dsn=tcp://clickhouse:9000"
@@ -81,7 +81,7 @@ services:
   # Notes for Maintainers/Contributors who will change Line Numbers of Frontend & Query-Section. Please Update Line Numbers in `./scripts/commentLinesForSetup.sh` & `./CONTRIBUTING.md`
   otel-collector:
     container_name: signoz-otel-collector
-    image: signoz/signoz-otel-collector:0.88.9
+    image: signoz/signoz-otel-collector:0.88.11
     command:
       [
         "--config=/etc/otel-collector-config.yaml",

deploy/docker/clickhouse-setup/docker-compose.yaml

@@ -164,7 +164,7 @@ services:
   # Notes for Maintainers/Contributors who will change Line Numbers of Frontend & Query-Section. Please Update Line Numbers in `./scripts/commentLinesForSetup.sh` & `./CONTRIBUTING.md`
 
   query-service:
-    image: signoz/query-service:${DOCKER_TAG:-0.37.2}
+    image: signoz/query-service:${DOCKER_TAG:-0.38.2}
     container_name: signoz-query-service
     command:
       [
@@ -203,7 +203,7 @@ services:
     <<: *db-depend
 
   frontend:
-    image: signoz/frontend:${DOCKER_TAG:-0.37.2}
+    image: signoz/frontend:${DOCKER_TAG:-0.38.2}
     container_name: signoz-frontend
     restart: on-failure
     depends_on:
@@ -215,7 +215,7 @@ services:
       - ../common/nginx-config.conf:/etc/nginx/conf.d/default.conf
 
   otel-collector-migrator:
-    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.88.9}
+    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.88.11}
     container_name: otel-migrator
     command:
       - "--dsn=tcp://clickhouse:9000"
@@ -229,7 +229,7 @@ services:
 
 
   otel-collector:
-    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-0.88.9}
+    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-0.88.11}
     container_name: signoz-otel-collector
     command:
       [

ee/query-service/app/api/api.go

@@ -152,9 +152,9 @@ func (ah *APIHandler) RegisterRoutes(router *mux.Router, am *baseapp.AuthMiddlew
 	router.HandleFunc("/api/v2/metrics/query_range", am.ViewAccess(ah.queryRangeMetricsV2)).Methods(http.MethodPost)
 
 	// PAT APIs
-	router.HandleFunc("/api/v1/pat", am.OpenAccess(ah.createPAT)).Methods(http.MethodPost)
-	router.HandleFunc("/api/v1/pat", am.OpenAccess(ah.getPATs)).Methods(http.MethodGet)
-	router.HandleFunc("/api/v1/pat/{id}", am.OpenAccess(ah.deletePAT)).Methods(http.MethodDelete)
+	router.HandleFunc("/api/v1/pat", am.AdminAccess(ah.createPAT)).Methods(http.MethodPost)
+	router.HandleFunc("/api/v1/pat", am.AdminAccess(ah.getPATs)).Methods(http.MethodGet)
+	router.HandleFunc("/api/v1/pat/{id}", am.AdminAccess(ah.deletePAT)).Methods(http.MethodDelete)
 
 	router.HandleFunc("/api/v1/checkout", am.AdminAccess(ah.checkout)).Methods(http.MethodPost)
 	router.HandleFunc("/api/v1/billing", am.AdminAccess(ah.getBilling)).Methods(http.MethodGet)

ee/query-service/app/api/license.go

@@ -40,6 +40,7 @@ type billingDetails struct {
 		BillingPeriodEnd   int64   `json:"billingPeriodEnd"`
 		Details            details `json:"details"`
 		Discount           float64 `json:"discount"`
+		SubscriptionStatus string  `json:"subscriptionStatus"`
 	} `json:"data"`
 }
 

frontend/package.json

@@ -210,7 +210,8 @@
 	},
 	"lint-staged": {
 		"*.(js|jsx|ts|tsx)": [
-			"eslint --fix"
+			"eslint --fix",
+			"sh scripts/typecheck-staged.sh"
 		]
 	},
 	"resolutions": {

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

@@ -62,6 +62,7 @@
 	"button_cancel": "No",
 	"field_promql_expr": "PromQL Expression",
 	"field_alert_name": "Alert Name",
+	"field_notification_channel": "Notification Channel",
 	"field_alert_desc": "Alert Description",
 	"field_labels": "Labels",
 	"field_severity": "Severity",
@@ -100,7 +101,7 @@
 	"user_guide_ch_step3a": "Set alert severity, name and descriptions",
 	"user_guide_ch_step3b": "Add tags to the alert in the Label field if needed",
 	"user_tooltip_more_help": "More details on how to create alerts",
-	"choose_alert_type": "Choose a type for the alert:",
+	"choose_alert_type": "Choose a type for the alert",
 	"metric_based_alert": "Metric based Alert",
 	"metric_based_alert_desc": "Send a notification when a condition occurs in the metric data",
 	"log_based_alert": "Log-based Alert",

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

@@ -54,6 +54,7 @@
 	"field_promql_expr": "PromQL Expression",
 	"field_alert_name": "Alert Name",
 	"field_alert_desc": "Alert Description",
+	"field_notification_channel": "Notification Channel",
 	"field_labels": "Labels",
 	"field_severity": "Severity",
 	"option_critical": "Critical",

frontend/public/locales/en/alerts.json

@@ -63,6 +63,7 @@
 	"field_promql_expr": "PromQL Expression",
 	"field_alert_name": "Alert Name",
 	"field_alert_desc": "Alert Description",
+	"field_notification_channel": "Notification Channel",
 	"field_labels": "Labels",
 	"field_severity": "Severity",
 	"option_critical": "Critical",
@@ -100,7 +101,7 @@
 	"user_guide_ch_step3a": "Set alert severity, name and descriptions",
 	"user_guide_ch_step3b": "Add tags to the alert in the Label field if needed",
 	"user_tooltip_more_help": "More details on how to create alerts",
-	"choose_alert_type": "Choose a type for the alert:",
+	"choose_alert_type": "Choose a type for the alert",
 	"metric_based_alert": "Metric based Alert",
 	"metric_based_alert_desc": "Send a notification when a condition occurs in the metric data",
 	"log_based_alert": "Log-based Alert",

frontend/public/locales/en/rules.json

@@ -54,6 +54,7 @@
 	"field_promql_expr": "PromQL Expression",
 	"field_alert_name": "Alert Name",
 	"field_alert_desc": "Alert Description",
+	"field_notification_channel": "Notification Channel",
 	"field_labels": "Labels",
 	"field_severity": "Severity",
 	"option_critical": "Critical",

frontend/scripts/typecheck-staged.sh

@@ -0,0 +1,25 @@
+files="";
+
+# lint-staged will pass all files in $1 $2 $3 etc. iterate and concat.
+for var in "$@"
+do
+    files="$files \"$var\","
+done
+
+# create temporary tsconfig which includes only passed files
+str="{
+  \"extends\": \"./tsconfig.json\",
+  \"include\": [\"src/types/global.d.ts\",\"src/typings/window.ts\", $files]
+}"
+echo $str > tsconfig.tmp
+
+# run typecheck using temp config
+tsc -p ./tsconfig.tmp
+
+# capture exit code of tsc
+code=$?
+
+# delete temp config
+rm ./tsconfig.tmp
+
+exit $code

frontend/src/container/CreateAlertRule/SelectAlertType/index.tsx

@@ -1,4 +1,4 @@
-import { Row } from 'antd';
+import { Row, Typography } from 'antd';
 import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { AlertTypes } from 'types/api/alerts/alertTypes';
@@ -33,7 +33,14 @@ function SelectAlertType({ onSelect }: SelectAlertTypeProps): JSX.Element {
 
 	return (
 		<SelectTypeContainer>
-			<h3> {t('choose_alert_type')} </h3>
+			<Typography.Title
+				level={4}
+				style={{
+					padding: '0 8px',
+				}}
+			>
+				{t('choose_alert_type')}
+			</Typography.Title>
 			<Row>{renderOptions}</Row>
 		</SelectTypeContainer>
 	);

frontend/src/container/FormAlertRules/BasicInfo.tsx

@@ -1,4 +1,5 @@
-import { Form, Select } from 'antd';
+import { Form, Select, Switch } from 'antd';
+import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { AlertDef, Labels } from 'types/api/alerts/def';
 import { requireErrorMessage } from 'utils/form/requireErrorMessage';
@@ -7,7 +8,6 @@ import { popupContainer } from 'utils/selectPopupContainer';
 import ChannelSelect from './ChannelSelect';
 import LabelSelect from './labels';
 import {
-	ChannelSelectTip,
 	FormContainer,
 	FormItemMedium,
 	InputSmall,
@@ -19,14 +19,41 @@ import {
 const { Option } = Select;
 
 interface BasicInfoProps {
+	isNewRule: boolean;
 	alertDef: AlertDef;
 	setAlertDef: (a: AlertDef) => void;
 }
 
-function BasicInfo({ alertDef, setAlertDef }: BasicInfoProps): JSX.Element {
-	// init namespace for translations
+function BasicInfo({
+	isNewRule,
+	alertDef,
+	setAlertDef,
+}: BasicInfoProps): JSX.Element {
 	const { t } = useTranslation('alerts');
 
+	const [
+		shouldBroadCastToAllChannels,
+		setShouldBroadCastToAllChannels,
+	] = useState(false);
+
+	useEffect(() => {
+		const hasPreferredChannels =
+			(alertDef.preferredChannels && alertDef.preferredChannels.length > 0) ||
+			isNewRule;
+
+		setShouldBroadCastToAllChannels(!hasPreferredChannels);
+		// eslint-disable-next-line react-hooks/exhaustive-deps
+	}, []);
+
+	const handleBroadcastToAllChannels = (shouldBroadcast: boolean): void => {
+		setShouldBroadCastToAllChannels(shouldBroadcast);
+
+		setAlertDef({
+			...alertDef,
+			broadcastToAll: shouldBroadcast,
+		});
+	};
+
 	return (
 		<>
 			<StepHeading> {t('alert_form_step3')} </StepHeading>
@@ -105,18 +132,38 @@ function BasicInfo({ alertDef, setAlertDef }: BasicInfoProps): JSX.Element {
 						initialValues={alertDef.labels}
 					/>
 				</FormItemMedium>
-				<FormItemMedium label="Notification Channels">
-					<ChannelSelect
-						currentValue={alertDef.preferredChannels}
-						onSelectChannels={(preferredChannels): void => {
-							setAlertDef({
-								...alertDef,
-								preferredChannels,
-							});
-						}}
+
+				<FormItemMedium
+					name="alert_all_configured_channels"
+					label="Alert all the configured channels"
+				>
+					<Switch
+						checked={shouldBroadCastToAllChannels}
+						onChange={handleBroadcastToAllChannels}
 					/>
-					<ChannelSelectTip> {t('channel_select_tooltip')}</ChannelSelectTip>
 				</FormItemMedium>
+
+				{!shouldBroadCastToAllChannels && (
+					<FormItemMedium
+						label="Notification Channels"
+						name="notification_channels"
+						required
+						rules={[
+							{ required: true, message: requireErrorMessage(t('field_alert_name')) },
+						]}
+					>
+						<ChannelSelect
+							disabled={shouldBroadCastToAllChannels}
+							currentValue={alertDef.preferredChannels}
+							onSelectChannels={(preferredChannels): void => {
+								setAlertDef({
+									...alertDef,
+									preferredChannels,
+								});
+							}}
+						/>
+					</FormItemMedium>
+				)}
 			</FormContainer>
 		</>
 	);

frontend/src/container/FormAlertRules/ChannelSelect/index.tsx

@@ -8,11 +8,13 @@ import { useTranslation } from 'react-i18next';
 import { StyledSelect } from './styles';
 
 export interface ChannelSelectProps {
+	disabled?: boolean;
 	currentValue?: string[];
 	onSelectChannels: (s: string[]) => void;
 }
 
 function ChannelSelect({
+	disabled,
 	currentValue,
 	onSelectChannels,
 }: ChannelSelectProps): JSX.Element | null {
@@ -52,6 +54,7 @@ function ChannelSelect({
 	};
 	return (
 		<StyledSelect
+			disabled={disabled}
 			status={error ? 'error' : ''}
 			mode="multiple"
 			style={{ width: '100%' }}
@@ -68,6 +71,7 @@ function ChannelSelect({
 }
 
 ChannelSelect.defaultProps = {
+	disabled: false,
 	currentValue: [],
 };
 export default ChannelSelect;

frontend/src/container/FormAlertRules/index.tsx

@@ -53,6 +53,7 @@ import {
 import UserGuide from './UserGuide';
 import { getSelectedQueryOptions } from './utils';
 
+// eslint-disable-next-line sonarjs/cognitive-complexity
 function FormAlertRules({
 	alertType,
 	formInstance,
@@ -78,6 +79,8 @@ function FormAlertRules({
 	// use query client
 	const ruleCache = useQueryClient();
 
+	const isNewRule = ruleId === 0;
+
 	const [loading, setLoading] = useState(false);
 
 	// alertDef holds the form values to be posted
@@ -108,8 +111,17 @@ function FormAlertRules({
 	useShareBuilderUrl(sq);
 
 	useEffect(() => {
-		setAlertDef(initialValue);
-	}, [initialValue]);
+		const broadcastToSpecificChannels =
+			(initialValue &&
+				initialValue.preferredChannels &&
+				initialValue.preferredChannels.length > 0) ||
+			isNewRule;
+
+		setAlertDef({
+			...initialValue,
+			broadcastToAll: !broadcastToSpecificChannels,
+		});
+	}, [initialValue, isNewRule]);
 
 	useEffect(() => {
 		// Set selectedQueryName based on the length of queryOptions
@@ -243,6 +255,7 @@ function FormAlertRules({
 	const preparePostData = (): AlertDef => {
 		const postableAlert: AlertDef = {
 			...alertDef,
+			preferredChannels: alertDef.broadcastToAll ? [] : alertDef.preferredChannels,
 			alertType,
 			source: window?.location.toString(),
 			ruleType:
@@ -386,7 +399,11 @@ function FormAlertRules({
 	}, [t, isFormValid, memoizedPreparePostData, notifications]);
 
 	const renderBasicInfo = (): JSX.Element => (
-		<BasicInfo alertDef={alertDef} setAlertDef={setAlertDef} />
+		<BasicInfo
+			alertDef={alertDef}
+			setAlertDef={setAlertDef}
+			isNewRule={isNewRule}
+		/>
 	);
 
 	const renderQBChartPreview = (): JSX.Element => (
@@ -421,8 +438,6 @@ function FormAlertRules({
 		/>
 	);
 
-	const isNewRule = ruleId === 0;
-
 	const isAlertNameMissing = !formInstance.getFieldValue('alert');
 
 	const isAlertAvialableToSave =
@@ -442,6 +457,10 @@ function FormAlertRules({
 		}));
 	};
 
+	const isChannelConfigurationValid =
+		alertDef?.broadcastToAll ||
+		(alertDef.preferredChannels && alertDef.preferredChannels.length > 0);
+
 	return (
 		<>
 			{Element}
@@ -489,7 +508,11 @@ function FormAlertRules({
 									type="primary"
 									onClick={onSaveHandler}
 									icon={<SaveOutlined />}
-									disabled={isAlertNameMissing || isAlertAvialableToSave}
+									disabled={
+										isAlertNameMissing ||
+										isAlertAvialableToSave ||
+										!isChannelConfigurationValid
+									}
 								>
 									{isNewRule ? t('button_createrule') : t('button_savechanges')}
 								</ActionButton>
@@ -497,6 +520,7 @@ function FormAlertRules({
 
 							<ActionButton
 								loading={loading || false}
+								disabled={isAlertNameMissing || !isChannelConfigurationValid}
 								type="default"
 								onClick={onTestRuleHandler}
 							>

frontend/src/container/GeneralSettingsCloud/GeneralSettingsCloud.styles.scss

@@ -0,0 +1,7 @@
+.general-settings-container {
+	.ant-card-body {
+		display: flex;
+		align-items: center;
+		gap: 16px;
+	}
+}

frontend/src/container/GeneralSettingsCloud/GeneralSettingsCloud.tsx

@@ -0,0 +1,16 @@
+import './GeneralSettingsCloud.styles.scss';
+
+import { Card, Typography } from 'antd';
+import { Info } from 'lucide-react';
+
+export default function GeneralSettingsCloud(): JSX.Element {
+	return (
+		<Card className="general-settings-container">
+			<Info size={16} />
+			<Typography.Text>
+				Please <a href="mailto:cloud-support@signoz.io"> email us </a> or connect
+				with us via intercom support to change the retention period.
+			</Typography.Text>
+		</Card>
+	);
+}

frontend/src/container/GeneralSettingsCloud/index.tsx

@@ -0,0 +1,3 @@
+import GeneralSettingsCloud from './GeneralSettingsCloud';
+
+export default GeneralSettingsCloud;

frontend/src/container/GridCardLayout/GridCard/WidgetGraphComponent.tsx

@@ -124,6 +124,7 @@ function WidgetGraphComponent({
 				if (setSelectedDashboard && updatedDashboard.payload) {
 					setSelectedDashboard(updatedDashboard.payload);
 				}
+				setDeleteModal(false);
 				featureResponse.refetch();
 			},
 			onError: () => {
@@ -255,6 +256,7 @@ function WidgetGraphComponent({
 				destroyOnClose
 				onCancel={onDeleteModelHandler}
 				open={deleteModal}
+				confirmLoading={updateDashboardMutation.isLoading}
 				title="Delete"
 				height="10vh"
 				onOk={onDeleteHandler}

frontend/src/container/GridCardLayout/GridCardLayout.styles.scss

@@ -1,8 +1,10 @@
 .fullscreen-grid-container {
 	overflow: auto;
+	margin-top: 1rem;
 
 	.react-grid-layout {
 		border: none !important;
+		margin-top: 0;
 	}
 }
 
@@ -13,3 +15,9 @@
 		height: calc(100% - 30px);
 	}
 }
+
+.lightMode {
+	.fullscreen-grid-container {
+		background-color: rgb(250, 250, 250);
+	}
+}

frontend/src/container/GridCardLayout/GridCardLayout.tsx

@@ -55,7 +55,7 @@ function GraphLayout({ onAddPanelHandler }: GraphLayoutProps): JSX.Element {
 
 	const isDarkMode = useIsDarkMode();
 
-	const [dashboardLayout, setDashboardLayout] = useState(layouts);
+	const [dashboardLayout, setDashboardLayout] = useState<Layout[]>([]);
 
 	const updateDashboardMutation = useUpdateDashboard();
 
@@ -77,6 +77,10 @@ function GraphLayout({ onAddPanelHandler }: GraphLayoutProps): JSX.Element {
 		userRole,
 	);
 
+	useEffect(() => {
+		setDashboardLayout(layouts);
+	}, [layouts]);
+
 	const onSaveHandler = (): void => {
 		if (!selectedDashboard) return;
 

frontend/src/container/GridCardLayout/index.tsx

@@ -1,21 +1,14 @@
 import { useDashboard } from 'providers/Dashboard/Dashboard';
 import { useCallback } from 'react';
-import { Layout } from 'react-grid-layout';
 
-import { EMPTY_WIDGET_LAYOUT } from './config';
 import GraphLayoutContainer from './GridCardLayout';
 
 function GridGraph(): JSX.Element {
-	const { handleToggleDashboardSlider, setLayouts } = useDashboard();
+	const { handleToggleDashboardSlider } = useDashboard();
 
 	const onEmptyWidgetHandler = useCallback(() => {
 		handleToggleDashboardSlider(true);
-
-		setLayouts((preLayout: Layout[]) => [
-			EMPTY_WIDGET_LAYOUT,
-			...(preLayout || []),
-		]);
-	}, [handleToggleDashboardSlider, setLayouts]);
+	}, [handleToggleDashboardSlider]);
 
 	return <GraphLayoutContainer onAddPanelHandler={onEmptyWidgetHandler} />;
 }

frontend/src/container/ListOfDashboard/TableComponents/DeleteButton.styles.scss

@@ -0,0 +1,5 @@
+.delete-modal {
+	.ant-modal-confirm-body {
+		align-items: center;
+	}
+}

frontend/src/container/ListOfDashboard/TableComponents/DeleteButton.tsx

@@ -1,3 +1,5 @@
+import './DeleteButton.styles.scss';
+
 import { DeleteOutlined, ExclamationCircleOutlined } from '@ant-design/icons';
 import { Modal, Tooltip, Typography } from 'antd';
 import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
@@ -64,6 +66,7 @@ function DeleteButton({
 			okText: 'Delete',
 			okButtonProps: { danger: true },
 			centered: true,
+			className: 'delete-modal',
 		});
 	}, [modal, name, deleteDashboardMutation, notifications, t, queryClient]);
 

frontend/src/container/NewDashboard/DashboardVariablesSelection/DashboardVariableSelection.styles.scss

@@ -6,3 +6,11 @@
 	text-overflow: ellipsis;
 	color: gray;
 }
+
+.variable-item {
+	.variable-select {
+		.ant-select-dropdown {
+			max-width: 300px;
+		}
+	}
+}

frontend/src/container/NewDashboard/DashboardVariablesSelection/VariableItem.tsx

@@ -5,15 +5,16 @@ import { WarningOutlined } from '@ant-design/icons';
 import { Input, Popover, Select, Tooltip, Typography } from 'antd';
 import dashboardVariablesQuery from 'api/dashboard/variables/dashboardVariablesQuery';
 import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
-import useDebounce from 'hooks/useDebounce';
 import { commaValuesParser } from 'lib/dashbaordVariables/customCommaValuesParser';
 import sortValues from 'lib/dashbaordVariables/sortVariableValues';
+import { debounce } from 'lodash-es';
 import map from 'lodash-es/map';
 import { useDashboard } from 'providers/Dashboard/Dashboard';
 import { memo, useEffect, useMemo, useState } from 'react';
 import { useQuery } from 'react-query';
 import { IDashboardVariable } from 'types/api/dashboard/getAll';
 import { VariableResponseProps } from 'types/api/dashboard/variables/query';
+import { popupContainer } from 'utils/selectPopupContainer';
 
 import { variablePropsToPayloadVariables } from '../utils';
 import { SelectItemStyle, VariableContainer, VariableValue } from './styles';
@@ -44,6 +45,7 @@ const getSelectValue = (
 	return selectedValue?.toString() || '';
 };
 
+// eslint-disable-next-line sonarjs/cognitive-complexity
 function VariableItem({
 	variableData,
 	existingVariables,
@@ -55,24 +57,8 @@ function VariableItem({
 		[],
 	);
 
-	const [variableValue, setVaribleValue] = useState(
-		variableData?.selectedValue?.toString() || '',
-	);
-
-	const debouncedVariableValue = useDebounce(variableValue, 500);
-
 	const [errorMessage, setErrorMessage] = useState<null | string>(null);
 
-	useEffect(() => {
-		const { selectedValue } = variableData;
-
-		if (selectedValue) {
-			setVaribleValue(selectedValue?.toString());
-		}
-
-		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [variableData]);
-
 	const getDependentVariables = (queryValue: string): string[] => {
 		const matches = queryValue.match(variableRegexPattern);
 
@@ -92,7 +78,12 @@ function VariableItem({
 		const variableName = variableData.name || '';
 
 		dependentVariables?.forEach((element) => {
-			dependentVariablesStr += `${element}${existingVariables[element]?.selectedValue}`;
+			const [, variable] =
+				Object.entries(existingVariables).find(
+					([, value]) => value.name === element,
+				) || [];
+
+			dependentVariablesStr += `${element}${variable?.selectedValue}`;
 		});
 
 		const variableKey = dependentVariablesStr.replace(/\s/g, '');
@@ -204,6 +195,9 @@ function VariableItem({
 			}
 	};
 
+	// do not debounce the above function as we do not need debounce in select variables
+	const debouncedHandleChange = debounce(handleChange, 500);
+
 	const { selectedValue } = variableData;
 	const selectedValueStringified = useMemo(() => getSelectValue(selectedValue), [
 		selectedValue,
@@ -219,14 +213,6 @@ function VariableItem({
 			: undefined;
 	const enableSelectAll = variableData.multiSelect && variableData.showALLOption;
 
-	useEffect(() => {
-		if (debouncedVariableValue !== variableData?.selectedValue?.toString()) {
-			handleChange(debouncedVariableValue);
-		}
-
-		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [debouncedVariableValue]);
-
 	useEffect(() => {
 		// Fetch options for CUSTOM Type
 		if (variableData.type === 'CUSTOM') {
@@ -240,7 +226,7 @@ function VariableItem({
 			placement="top"
 			title={isDashboardLocked ? 'Dashboard is locked' : ''}
 		>
-			<VariableContainer>
+			<VariableContainer className="variable-item">
 				<Typography.Text className="variable-name" ellipsis>
 					${variableData.name}
 				</Typography.Text>
@@ -250,9 +236,10 @@ function VariableItem({
 							placeholder="Enter value"
 							disabled={isDashboardLocked}
 							bordered={false}
-							value={variableValue}
+							key={variableData.selectedValue?.toString()}
+							defaultValue={variableData.selectedValue?.toString()}
 							onChange={(e): void => {
-								setVaribleValue(e.target.value || '');
+								debouncedHandleChange(e.target.value || '');
 							}}
 							style={{
 								width:
@@ -263,18 +250,25 @@ function VariableItem({
 						!errorMessage &&
 						optionsData && (
 							<Select
-								value={selectValue}
+								key={
+									selectValue && Array.isArray(selectValue)
+										? selectValue.join(' ')
+										: selectValue || variableData.id
+								}
+								defaultValue={selectValue}
 								onChange={handleChange}
 								bordered={false}
 								placeholder="Select value"
+								placement="bottomRight"
 								mode={mode}
 								dropdownMatchSelectWidth={false}
 								style={SelectItemStyle}
 								loading={isLoading}
-								showArrow
 								showSearch
 								data-testid="variable-select"
+								className="variable-select"
 								disabled={isDashboardLocked}
+								getPopupContainer={popupContainer}
 							>
 								{enableSelectAll && (
 									<Select.Option data-testid="option-ALL" value={ALL_SELECT_VALUE}>

frontend/src/container/NewWidget/index.tsx

@@ -307,7 +307,7 @@ function NewWidget({ selectedGraph }: NewWidgetProps): JSX.Element {
 							disabled={isSaveDisabled}
 							onClick={onSaveDashboard}
 						>
-							Save
+							Save Changes
 						</Button>
 					</Tooltip>
 				)}
@@ -316,13 +316,14 @@ function NewWidget({ selectedGraph }: NewWidgetProps): JSX.Element {
 					<Button
 						type="primary"
 						data-testid="new-widget-save"
+						loading={updateDashboardMutation.isLoading}
 						disabled={isSaveDisabled}
 						onClick={onSaveDashboard}
 					>
-						Save
+						Save Changes
 					</Button>
 				)}
-				<Button onClick={onClickDiscardHandler}>Discard</Button>
+				<Button onClick={onClickDiscardHandler}>Discard Changes</Button>
 			</ButtonContainer>
 
 			<PanelContainer>
@@ -385,6 +386,7 @@ function NewWidget({ selectedGraph }: NewWidgetProps): JSX.Element {
 				closable
 				onCancel={closeModal}
 				onOk={onClickSaveHandler}
+				confirmLoading={updateDashboardMutation.isLoading}
 				centered
 				open={saveModal}
 				width={600}

frontend/src/container/NewWidget/styles.ts

@@ -25,7 +25,7 @@ export const LeftContainerWrapper = styled(Col)`
 
 export const ButtonContainer = styled.div`
 	display: flex;
-	gap: 1rem;
+	gap: 8px;
 	margin-bottom: 1rem;
 	justify-content: flex-end;
 `;

frontend/src/container/ServiceApplication/ServiceMetrics/ServiceMetricTable.tsx

@@ -91,6 +91,11 @@ function ServiceMetricTable({
 			<ResourceAttributesFilter />
 
 			<ResizeTable
+				pagination={{
+					defaultPageSize: 10,
+					showTotal: (total: number, range: number[]): string =>
+						`${range[0]}-${range[1]} of ${total} items`,
+				}}
 				columns={tableColumns}
 				loading={isLoading}
 				dataSource={services}

frontend/src/container/ServiceApplication/ServiceTraces/ServiceTracesTable.tsx

@@ -49,6 +49,11 @@ function ServiceTraceTable({
 			<ResourceAttributesFilter />
 
 			<ResizeTable
+				pagination={{
+					defaultPageSize: 10,
+					showTotal: (total: number, range: number[]): string =>
+						`${range[0]}-${range[1]} of ${total} items`,
+				}}
 				columns={tableColumns}
 				loading={loading}
 				dataSource={services}

frontend/src/container/SideNav/SideNav.tsx

@@ -74,6 +74,8 @@ function SideNav({
 		isCurrentVersionError,
 	} = useSelector<AppState, AppReducer>((state) => state.app);
 
+	const [licenseTag, setLicenseTag] = useState('');
+
 	const userSettingsMenuItem = {
 		key: ROUTES.MY_SETTINGS,
 		label: user?.name || 'User',
@@ -239,6 +241,27 @@ function SideNav({
 		}
 	};
 
+	useEffect(() => {
+		if (!isFetching) {
+			if (isCloudUserVal) {
+				setLicenseTag('Cloud');
+			} else if (isEnterprise) {
+				setLicenseTag('Enterprise');
+			} else {
+				setLicenseTag('Free');
+			}
+		}
+	}, [isCloudUserVal, isEnterprise, isFetching]);
+
+	const [isCurrentOrgSettings] = useComponentPermission(
+		['current_org_settings'],
+		role,
+	);
+
+	const settingsRoute = isCurrentOrgSettings
+		? ROUTES.ORG_SETTINGS
+		: ROUTES.SETTINGS;
+
 	return (
 		<div className={cx('sideNav', collapsed ? 'collapsed' : '')}>
 			<div className="brand">
@@ -257,7 +280,7 @@ function SideNav({
 
 				{!collapsed && (
 					<>
-						<div className="license tag">{!isEnterprise ? 'Free' : 'Enterprise'}</div>
+						{!isFetching && <div className="license tag">{licenseTag}</div>}
 
 						<ToggleButton
 							checked={isDarkMode}
@@ -288,7 +311,9 @@ function SideNav({
 						item={item}
 						isActive={activeMenuKey === item.key}
 						onClick={(): void => {
-							if (item) {
+							if (item.key === ROUTES.SETTINGS) {
+								history.push(settingsRoute);
+							} else if (item) {
 								onClickHandler(item?.key as string);
 							}
 						}}

frontend/src/container/TopNav/CustomDateTimeModal/CustomDateTimeModal.test.tsx

@@ -12,6 +12,7 @@ describe('CustomDateTimeModal', () => {
 				visible
 				onCreate={handleCreate}
 				onCancel={handleCancel}
+				setCustomDTPickerVisible={jest.fn()}
 			/>,
 		);
 	});

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

@@ -1,6 +1,6 @@
 import { DatePicker, Modal } from 'antd';
 import dayjs, { Dayjs } from 'dayjs';
-import { useState } from 'react';
+import { Dispatch, SetStateAction, useState } from 'react';
 
 export type DateTimeRangeType = [Dayjs | null, Dayjs | null] | null;
 
@@ -10,12 +10,12 @@ function CustomDateTimeModal({
 	visible,
 	onCreate,
 	onCancel,
+	setCustomDTPickerVisible,
 }: CustomDateTimeModalProps): JSX.Element {
 	const [selectedDate, setDateTime] = useState<DateTimeRangeType>();
 
 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	const onModalOkHandler = (date_time: any): void => {
-		onCreate(date_time);
 		setDateTime(date_time);
 	};
 
@@ -25,7 +25,10 @@ function CustomDateTimeModal({
 	};
 
 	const onOk = (): void => {
-		if (selectedDate) onCreate(selectedDate);
+		if (selectedDate) {
+			onCreate(selectedDate);
+			setCustomDTPickerVisible(false);
+		}
 	};
 
 	return (
@@ -42,7 +45,6 @@ function CustomDateTimeModal({
 				allowClear
 				onOk={onModalOkHandler}
 				showTime
-				onCalendarChange={onModalOkHandler}
 			/>
 		</Modal>
 	);
@@ -52,6 +54,7 @@ interface CustomDateTimeModalProps {
 	visible: boolean;
 	onCreate: (dateTimeRange: DateTimeRangeType) => void;
 	onCancel: () => void;
+	setCustomDTPickerVisible: Dispatch<SetStateAction<boolean>>;
 }
 
 export default CustomDateTimeModal;

frontend/src/container/TopNav/DateTimeSelection/config.ts

@@ -96,3 +96,13 @@ export const routesToSkip = [
 ];
 
 export const routesToDisable = [ROUTES.LOGS_EXPLORER, ROUTES.LIVE_LOGS];
+
+export interface LocalStorageTimeRange {
+	localstorageStartTime: string | null;
+	localstorageEndTime: string | null;
+}
+
+export interface TimeRange {
+	startTime: string;
+	endTime: string;
+}

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

@@ -15,6 +15,7 @@ import useUrlQuery from 'hooks/useUrlQuery';
 import GetMinMax from 'lib/getMinMax';
 import getTimeString from 'lib/getTimeString';
 import history from 'lib/history';
+import { isObject } from 'lodash-es';
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { connect, useSelector } from 'react-redux';
 import { RouteComponentProps, withRouter } from 'react-router-dom';
@@ -27,7 +28,13 @@ import { GlobalReducer } from 'types/reducer/globalTime';
 
 import AutoRefresh from '../AutoRefresh';
 import CustomDateTimeModal, { DateTimeRangeType } from '../CustomDateTimeModal';
-import { getDefaultOption, getOptions, Time } from './config';
+import {
+	getDefaultOption,
+	getOptions,
+	LocalStorageTimeRange,
+	Time,
+	TimeRange,
+} from './config';
 import RefreshText from './Refresh';
 import { Form, FormContainer, FormItem } from './styles';
 
@@ -44,8 +51,35 @@ function DateTimeSelection({
 	const searchStartTime = urlQuery.get('startTime');
 	const searchEndTime = urlQuery.get('endTime');
 
-	const localstorageStartTime = getLocalStorageKey('startTime');
-	const localstorageEndTime = getLocalStorageKey('endTime');
+	const {
+		localstorageStartTime,
+		localstorageEndTime,
+	} = ((): LocalStorageTimeRange => {
+		const routes = getLocalStorageKey(LOCALSTORAGE.METRICS_TIME_IN_DURATION);
+
+		if (routes !== null) {
+			const routesObject = JSON.parse(routes || '{}');
+			const selectedTime = routesObject[location.pathname];
+
+			if (selectedTime) {
+				let parsedSelectedTime: TimeRange;
+				try {
+					parsedSelectedTime = JSON.parse(selectedTime);
+				} catch {
+					parsedSelectedTime = selectedTime;
+				}
+
+				if (isObject(parsedSelectedTime)) {
+					return {
+						localstorageStartTime: parsedSelectedTime.startTime,
+						localstorageEndTime: parsedSelectedTime.endTime,
+					};
+				}
+				return { localstorageStartTime: null, localstorageEndTime: null };
+			}
+		}
+		return { localstorageStartTime: null, localstorageEndTime: null };
+	})();
 
 	const getTime = useCallback((): [number, number] | undefined => {
 		if (searchEndTime && searchStartTime) {
@@ -118,6 +152,15 @@ function DateTimeSelection({
 			const selectedTime = routesObject[pathName];
 
 			if (selectedTime) {
+				let parsedSelectedTime: TimeRange;
+				try {
+					parsedSelectedTime = JSON.parse(selectedTime);
+				} catch {
+					parsedSelectedTime = selectedTime;
+				}
+				if (isObject(parsedSelectedTime)) {
+					return 'custom';
+				}
 				return selectedTime;
 			}
 		}
@@ -125,7 +168,7 @@ function DateTimeSelection({
 		return defaultSelectedOption;
 	};
 
-	const updateLocalStorageForRoutes = (value: Time): void => {
+	const updateLocalStorageForRoutes = (value: Time | string): void => {
 		const preRoutes = getLocalStorageKey(LOCALSTORAGE.METRICS_TIME_IN_DURATION);
 		if (preRoutes !== null) {
 			const preRoutesObject = JSON.parse(preRoutes);
@@ -216,14 +259,13 @@ function DateTimeSelection({
 		if (dateTimeRange !== null) {
 			const [startTimeMoment, endTimeMoment] = dateTimeRange;
 			if (startTimeMoment && endTimeMoment) {
-				setCustomDTPickerVisible(false);
 				updateTimeInterval('custom', [
 					startTimeMoment?.toDate().getTime() || 0,
 					endTimeMoment?.toDate().getTime() || 0,
 				]);
-				setLocalStorageKey('startTime', startTimeMoment.toString());
-				setLocalStorageKey('endTime', endTimeMoment.toString());
-				updateLocalStorageForRoutes('custom');
+				updateLocalStorageForRoutes(
+					JSON.stringify({ startTime: startTimeMoment, endTime: endTimeMoment }),
+				);
 				if (!isLogsExplorerPage) {
 					urlQuery.set(
 						QueryParams.startTime,
@@ -352,6 +394,7 @@ function DateTimeSelection({
 				onCancel={(): void => {
 					setCustomDTPickerVisible(false);
 				}}
+				setCustomDTPickerVisible={setCustomDTPickerVisible}
 			/>
 		</div>
 	);

frontend/src/lib/getChartData.ts

@@ -88,9 +88,11 @@ const getChartData = ({
 	const allLabels = modifiedData.map((e) => e.label);
 
 	const updatedDataSet = updatedSortedData.map((e, index) => {
+		const label = allLabels[index];
+
 		const datasetBaseConfig = {
 			index,
-			label: allLabels[index],
+			label,
 			borderColor: colors[index % colors.length] || 'red',
 			data: e.second,
 			borderWidth: 1.5,

frontend/src/lib/uPlotLib/plugins/tooltipPlugin.ts

@@ -1,11 +1,12 @@
 import { getToolTipValue } from 'components/Graph/yAxisConfig';
+import { themeColors } from 'constants/theme';
 import dayjs from 'dayjs';
 import customParseFormat from 'dayjs/plugin/customParseFormat';
 import getLabelName from 'lib/getLabelName';
 import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
 
-import { colors } from '../../getRandomColor';
 import { placement } from '../placement';
+import { generateColor } from '../utils/generateColor';
 
 dayjs.extend(customParseFormat);
 
@@ -54,12 +55,14 @@ const generateTooltipContent = (
 				const value = data[index][idx];
 				const label = getLabelName(metric, queryName || '', legend || '');
 
+				const color = generateColor(label, themeColors.chartcolors);
+
 				if (Number.isFinite(value)) {
 					const tooltipValue = getToolTipValue(value, yAxisUnit);
 
 					const dataObj = {
 						show: item.show || false,
-						color: colors[(index - 1) % colors.length],
+						color,
 						label,
 						// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 						// @ts-ignore

frontend/src/lib/uPlotLib/utils/generateColor.ts

@@ -0,0 +1,20 @@
+/* eslint-disable no-bitwise */
+export function hashFn(str: string): number {
+	let hash = 5381;
+	for (let i = 0; i < str.length; i++) {
+		hash = (hash * 33) ^ str.charCodeAt(i);
+	}
+
+	return hash >>> 0;
+}
+
+export function generateColor(
+	key: string,
+	colorMap: Record<string, string>,
+): string {
+	const hashValue = hashFn(key);
+	const keys = Object.keys(colorMap);
+	const colorIndex = hashValue % keys.length;
+	const selectedKey = keys[colorIndex];
+	return colorMap[selectedKey];
+}

frontend/src/lib/uPlotLib/utils/getSeriesData.ts

@@ -1,8 +1,9 @@
+import { themeColors } from 'constants/theme';
 import getLabelName from 'lib/getLabelName';
-import { colors } from 'lib/getRandomColor';
 import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
 import { QueryData } from 'types/api/widgets/getQuery';
 
+import { generateColor } from './generateColor';
 import getRenderer, { drawStyles, lineInterpolations } from './getRenderer';
 
 const paths = (
@@ -36,8 +37,6 @@ const getSeries = (
 	const newGraphVisibilityStates = graphsVisibilityStates?.slice(1);
 
 	for (let i = 0; i < seriesList?.length; i += 1) {
-		const color = colors[i % colors.length]; // Use modulo to loop through colors if there are more series than colors
-
 		const { metric = {}, queryName = '', legend = '' } = widgetMetaData[i] || {};
 
 		const label = getLabelName(
@@ -46,6 +45,8 @@ const getSeries = (
 			legend || '',
 		);
 
+		const color = generateColor(label, themeColors.chartcolors);
+
 		const pointSize = seriesList[i].values.length > 1 ? 5 : 10;
 		const showPoints = !(seriesList[i].values.length > 1);
 

frontend/src/modules/Servicemap/Map.tsx

@@ -13,6 +13,8 @@ function ServiceMap({ fgRef, serviceMap }: any): JSX.Element {
 
 	const graphData = { nodes, links };
 
+	let zoomLevel = 1;
+
 	return (
 		<ForceGraph2D
 			ref={fgRef}
@@ -23,8 +25,9 @@ function ServiceMap({ fgRef, serviceMap }: any): JSX.Element {
 			linkDirectionalParticles="value"
 			linkDirectionalParticleSpeed={(d) => d.value}
 			nodeCanvasObject={(node, ctx) => {
-				const label = transformLabel(node.id);
-				const { fontSize } = node;
+				const label = transformLabel(node.id, zoomLevel);
+				let { fontSize } = node;
+				fontSize = (fontSize * 3) / zoomLevel;
 				ctx.font = `${fontSize}px Roboto`;
 				const { width } = node;
 
@@ -43,6 +46,9 @@ function ServiceMap({ fgRef, serviceMap }: any): JSX.Element {
 					tooltip.innerHTML = getTooltip(node);
 				}
 			}}
+			onZoom={(zoom) => {
+				zoomLevel = zoom.k;
+			}}
 			nodePointerAreaPaint={(node, color, ctx) => {
 				ctx.fillStyle = color;
 				ctx.beginPath();

frontend/src/modules/Servicemap/utils.ts

@@ -59,6 +59,7 @@ export const getGraphData = (serviceMap, isDarkMode): graphDataType => {
 				width: MIN_WIDTH,
 				color,
 				nodeVal: MIN_WIDTH,
+				name: node,
 			};
 		}
 		if (service.errorRate > 0) {
@@ -72,6 +73,7 @@ export const getGraphData = (serviceMap, isDarkMode): graphDataType => {
 			width,
 			color,
 			nodeVal: width,
+			name: node,
 		};
 	});
 	return {
@@ -123,9 +125,12 @@ export const getTooltip = (link: {
 							</div>`;
 };
 
-export const transformLabel = (label: string) => {
-	const MAX_LENGTH = 13;
-	const MAX_SHOW = 10;
+export const transformLabel = (label: string, zoomLevel: number) => {
+	//? 13 is the minimum label length. Scaling factor of 0.9 which is slightly less than 1
+	//? ensures smoother zoom transitions, gradually increasing MAX_LENGTH, displaying more of the label as
+	//? zooming in.
+	const MAX_LENGTH = 13 * (zoomLevel / 0.9);
+	const MAX_SHOW = MAX_LENGTH - 3;
 	if (label.length > MAX_LENGTH) {
 		return `${label.slice(0, MAX_SHOW)}...`;
 	}

frontend/src/pages/Settings/config.ts

@@ -2,17 +2,21 @@ import { RouteTabProps } from 'components/RouteTab/types';
 import ROUTES from 'constants/routes';
 import AlertChannels from 'container/AllAlertChannels';
 import GeneralSettings from 'container/GeneralSettings';
+import GeneralSettingsCloud from 'container/GeneralSettingsCloud';
 import IngestionSettings from 'container/IngestionSettings/IngestionSettings';
 import OrganizationSettings from 'container/OrganizationSettings';
 import { TFunction } from 'i18next';
 
-export const commonRoutes = (t: TFunction): RouteTabProps['routes'] => [
+export const organizationSettings = (t: TFunction): RouteTabProps['routes'] => [
 	{
-		Component: GeneralSettings,
-		name: t('routes:general').toString(),
-		route: ROUTES.SETTINGS,
-		key: ROUTES.SETTINGS,
+		Component: OrganizationSettings,
+		name: t('routes:organization_settings').toString(),
+		route: ROUTES.ORG_SETTINGS,
+		key: ROUTES.ORG_SETTINGS,
 	},
+];
+
+export const alertChannels = (t: TFunction): RouteTabProps['routes'] => [
 	{
 		Component: AlertChannels,
 		name: t('routes:alert_channels').toString(),
@@ -30,11 +34,20 @@ export const ingestionSettings = (t: TFunction): RouteTabProps['routes'] => [
 	},
 ];
 
-export const organizationSettings = (t: TFunction): RouteTabProps['routes'] => [
+export const generalSettings = (t: TFunction): RouteTabProps['routes'] => [
 	{
-		Component: OrganizationSettings,
-		name: t('routes:organization_settings').toString(),
-		route: ROUTES.ORG_SETTINGS,
-		key: ROUTES.ORG_SETTINGS,
+		Component: GeneralSettings,
+		name: t('routes:general').toString(),
+		route: ROUTES.SETTINGS,
+		key: ROUTES.SETTINGS,
+	},
+];
+
+export const generalSettingsCloud = (t: TFunction): RouteTabProps['routes'] => [
+	{
+		Component: GeneralSettingsCloud,
+		name: t('routes:general').toString(),
+		route: ROUTES.SETTINGS,
+		key: ROUTES.SETTINGS,
 	},
 ];

frontend/src/pages/Settings/utils.ts

@@ -3,7 +3,9 @@ import { TFunction } from 'i18next';
 import { isCloudUser } from 'utils/app';
 
 import {
-	commonRoutes,
+	alertChannels,
+	generalSettings,
+	generalSettingsCloud,
 	ingestionSettings,
 	organizationSettings,
 } from './config';
@@ -12,15 +14,20 @@ export const getRoutes = (
 	isCurrentOrgSettings: boolean,
 	t: TFunction,
 ): RouteTabProps['routes'] => {
-	let common = commonRoutes(t);
+	const settings = [];
 
 	if (isCurrentOrgSettings) {
-		common = [...common, ...organizationSettings(t)];
+		settings.push(...organizationSettings(t));
 	}
 
 	if (isCloudUser()) {
-		common = [...common, ...ingestionSettings(t)];
+		settings.push(...ingestionSettings(t));
+		settings.push(...alertChannels(t));
+		settings.push(...generalSettingsCloud(t));
+	} else {
+		settings.push(...alertChannels(t));
+		settings.push(...generalSettings(t));
 	}
 
-	return common;
+	return settings;
 };

frontend/src/pages/SignUp/SignUp.tsx

@@ -344,7 +344,7 @@ function SignUp({ version }: SignUpProps): JSX.Element {
 									placeholder={t('placeholder_firstname')}
 									required
 									id="signupFirstName"
-									disabled={isDetailsDisable}
+									disabled={isDetailsDisable && form.getFieldValue('firstName')}
 								/>
 							</FormContainer.Item>
 						</div>

frontend/src/types/api/alerts/def.ts

@@ -21,6 +21,7 @@ export interface AlertDef {
 	source?: string;
 	disabled?: boolean;
 	preferredChannels?: string[];
+	broadcastToAll?: boolean;
 }
 
 export interface RuleCondition {

go.mod

@@ -5,7 +5,7 @@ go 1.21
 require (
 	github.com/ClickHouse/clickhouse-go/v2 v2.15.0
 	github.com/SigNoz/govaluate v0.0.0-20220522085550-d19c08c206cb
-	github.com/SigNoz/signoz-otel-collector v0.88.9
+	github.com/SigNoz/signoz-otel-collector v0.88.11
 	github.com/SigNoz/zap_otlp/zap_otlp_encoder v0.0.0-20230822164844-1b861a431974
 	github.com/SigNoz/zap_otlp/zap_otlp_sync v0.0.0-20230822164844-1b861a431974
 	github.com/antonmedv/expr v1.15.3

go.sum

@@ -98,8 +98,8 @@ github.com/SigNoz/govaluate v0.0.0-20220522085550-d19c08c206cb h1:bneLSKPf9YUSFm
 github.com/SigNoz/govaluate v0.0.0-20220522085550-d19c08c206cb/go.mod h1:JznGDNg9x1cujDKa22RaQOimOvvEfy3nxzDGd8XDgmA=
 github.com/SigNoz/prometheus v1.9.78 h1:bB3yuDrRzi/Mv00kWayR9DZbyjTuGfendSqISyDcXiY=
 github.com/SigNoz/prometheus v1.9.78/go.mod h1:MffmFu2qFILQrOHehx3D0XjYtaZMVfI+Ppeiv98x4Ww=
-github.com/SigNoz/signoz-otel-collector v0.88.9 h1:7bbJSXrSZcQsdEVVLsjsNXm/bWe9MhKu8qfXp8MlXQM=
-github.com/SigNoz/signoz-otel-collector v0.88.9/go.mod h1:7I4FWwraVSnDywsPNbo8TdHDsPxShtYkGU5usr6dTtk=
+github.com/SigNoz/signoz-otel-collector v0.88.11 h1:w9IVcXg5T+o37c0HVtBfxdKxkPYyiGX1YaOrCexpjrc=
+github.com/SigNoz/signoz-otel-collector v0.88.11/go.mod h1:2ddO2lcb/4kMONIJXwfXxegRsi7FYPSWtXTgji3qsp8=
 github.com/SigNoz/zap_otlp v0.1.0 h1:T7rRcFN87GavY8lDGZj0Z3Xv6OhJA6Pj3I9dNPmqvRc=
 github.com/SigNoz/zap_otlp v0.1.0/go.mod h1:lcHvbDbRgvDnPxo9lDlaL1JK2PyOyouP/C3ynnYIvyo=
 github.com/SigNoz/zap_otlp/zap_otlp_encoder v0.0.0-20230822164844-1b861a431974 h1:PKVgdf83Yw+lZJbFtNGBgqXiXNf3+kOXW2qZ7Ms7OaY=

pkg/query-service/app/having.go

@@ -0,0 +1,90 @@
+package app
+
+import (
+	"strings"
+
+	v3 "go.signoz.io/signoz/pkg/query-service/model/v3"
+)
+
+// applyHavingClause applies the having clause to the result
+// each query has its own having clause
+// there can be multiple having clauses for each query
+func applyHavingClause(result []*v3.Result, queryRangeParams *v3.QueryRangeParamsV3) {
+	for _, result := range result {
+		builderQueries := queryRangeParams.CompositeQuery.BuilderQueries
+
+		if builderQueries != nil && (builderQueries[result.QueryName].DataSource == v3.DataSourceMetrics) {
+			havingClause := builderQueries[result.QueryName].Having
+
+			for i := 0; i < len(result.Series); i++ {
+				for j := 0; j < len(result.Series[i].Points); j++ {
+					if !evaluateHavingClause(havingClause, result.Series[i].Points[j].Value) {
+						result.Series[i].Points = append(result.Series[i].Points[:j], result.Series[i].Points[j+1:]...)
+						j--
+					}
+				}
+			}
+		}
+	}
+}
+
+func evaluateHavingClause(having []v3.Having, value float64) bool {
+	if len(having) == 0 {
+		return true
+	}
+
+	for _, h := range having {
+		switch h.Operator {
+		case v3.HavingOperatorEqual:
+			if value == h.Value.(float64) {
+				return true
+			}
+		case v3.HavingOperatorNotEqual:
+			if value != h.Value.(float64) {
+				return true
+			}
+		case v3.HavingOperatorGreaterThan:
+			if value > h.Value.(float64) {
+				return true
+			}
+		case v3.HavingOperatorGreaterThanOrEq:
+			if value >= h.Value.(float64) {
+				return true
+			}
+		case v3.HavingOperatorLessThan:
+			if value < h.Value.(float64) {
+				return true
+			}
+		case v3.HavingOperatorLessThanOrEq:
+			if value <= h.Value.(float64) {
+				return true
+			}
+		case v3.HavingOperatorIn, v3.HavingOperator(strings.ToLower(string(v3.HavingOperatorIn))):
+			values, ok := h.Value.([]interface{})
+			if !ok {
+				return false
+			}
+			for _, v := range values {
+				if value == v.(float64) {
+					return true
+				}
+			}
+		case v3.HavingOperatorNotIn, v3.HavingOperator(strings.ToLower(string(v3.HavingOperatorNotIn))):
+			values, ok := h.Value.([]interface{})
+			if !ok {
+				return true
+			}
+			found := false
+			for _, v := range values {
+				if value == v.(float64) {
+					found = true
+					break
+				}
+			}
+			if !found {
+				return true
+			}
+		}
+	}
+	return false
+}

pkg/query-service/app/having_test.go

@@ -0,0 +1,283 @@
+package app
+
+import (
+	"testing"
+
+	v3 "go.signoz.io/signoz/pkg/query-service/model/v3"
+)
+
+func TestApplyHavingCaluse(t *testing.T) {
+	type testCase struct {
+		name    string
+		results []*v3.Result
+		params  *v3.QueryRangeParamsV3
+		want    []*v3.Result
+	}
+
+	testCases := []testCase{
+		{
+			name: "test having equal to",
+			results: []*v3.Result{
+				{
+					QueryName: "A",
+					Series: []*v3.Series{
+						{
+							Points: []v3.Point{
+								{
+									Value: 0.5,
+								},
+								{
+									Value: 0.4,
+								},
+								{
+									Value: 0.3,
+								},
+								{
+									Value: 0.2,
+								},
+								{
+									Value: 0.1,
+								},
+							},
+						},
+					},
+				},
+			},
+			params: &v3.QueryRangeParamsV3{
+				CompositeQuery: &v3.CompositeQuery{
+					BuilderQueries: map[string]*v3.BuilderQuery{
+						"A": {
+							DataSource: v3.DataSourceMetrics,
+							Having: []v3.Having{
+								{
+									Operator: v3.HavingOperatorEqual,
+									Value:    0.3,
+								},
+							},
+						},
+					},
+				},
+			},
+			want: []*v3.Result{
+				{
+					Series: []*v3.Series{
+						{
+							Points: []v3.Point{
+								{
+									Value: 0.3,
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "test having `in`",
+			results: []*v3.Result{
+				{
+					QueryName: "A",
+					Series: []*v3.Series{
+						{
+							Points: []v3.Point{
+								{
+									Value: 0.5,
+								},
+								{
+									Value: 0.4,
+								},
+								{
+									Value: 0.3,
+								},
+								{
+									Value: 0.2,
+								},
+								{
+									Value: 0.1,
+								},
+							},
+						},
+					},
+				},
+			},
+			params: &v3.QueryRangeParamsV3{
+				CompositeQuery: &v3.CompositeQuery{
+					BuilderQueries: map[string]*v3.BuilderQuery{
+						"A": {
+							DataSource: v3.DataSourceMetrics,
+							Having: []v3.Having{
+								{
+									Operator: v3.HavingOperatorIn,
+									Value:    []interface{}{0.3, 0.4},
+								},
+							},
+						},
+					},
+				},
+			},
+			want: []*v3.Result{
+				{
+					Series: []*v3.Series{
+						{
+							Points: []v3.Point{
+								{
+									Value: 0.4,
+								},
+								{
+									Value: 0.3,
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "test having `not in` and multiple results",
+			results: []*v3.Result{
+				{
+					QueryName: "A",
+					Series: []*v3.Series{
+						{
+							Points: []v3.Point{
+								{
+									Value: 0.5,
+								},
+								{
+									Value: 0.4,
+								},
+								{
+									Value: 0.3,
+								},
+								{
+									Value: 0.2,
+								},
+								{
+									Value: 0.1,
+								},
+							},
+						},
+					},
+				},
+				{
+					QueryName: "B",
+					Series: []*v3.Series{
+						{
+							Points: []v3.Point{
+								{
+									Value: 0.5,
+								},
+								{
+									Value: 0.4,
+								},
+								{
+									Value: 0.3,
+								},
+								{
+									Value: 0.2,
+								},
+								{
+									Value: 0.1,
+								},
+							},
+						},
+					},
+				},
+			},
+			params: &v3.QueryRangeParamsV3{
+				CompositeQuery: &v3.CompositeQuery{
+					BuilderQueries: map[string]*v3.BuilderQuery{
+						"A": {
+							DataSource: v3.DataSourceMetrics,
+							Having: []v3.Having{
+								{
+									Operator: v3.HavingOperatorNotIn,
+									Value:    []interface{}{0.3, 0.4},
+								},
+							},
+						},
+						"B": {
+							DataSource: v3.DataSourceMetrics,
+							Having: []v3.Having{
+								{
+									Operator: v3.HavingOperatorNotIn,
+									Value:    []interface{}{0.1},
+								},
+							},
+						},
+					},
+				},
+			},
+			want: []*v3.Result{
+				{
+					Series: []*v3.Series{
+						{
+							Points: []v3.Point{
+								{
+									Value: 0.5,
+								},
+								{
+									Value: 0.2,
+								},
+								{
+									Value: 0.1,
+								},
+							},
+						},
+					},
+				},
+				{
+					Series: []*v3.Series{
+						{
+							Points: []v3.Point{
+								{
+									Value: 0.5,
+								},
+								{
+									Value: 0.4,
+								},
+								{
+									Value: 0.3,
+								},
+								{
+									Value: 0.2,
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+
+			applyHavingClause(tc.results, tc.params)
+
+			got := tc.results
+
+			if len(got) != len(tc.want) {
+				t.Errorf("got %v, want %v", got, tc.want)
+			}
+
+			for i := range got {
+				if len(got[i].Series) != len(tc.want[i].Series) {
+					t.Errorf("got %v, want %v", got, tc.want)
+				}
+
+				for j := range got[i].Series {
+					if len(got[i].Series[j].Points) != len(tc.want[i].Series[j].Points) {
+						t.Errorf("got %v, want %v", len(got[i].Series[j].Points), len(tc.want[i].Series[j].Points))
+					}
+
+					for k := range got[i].Series[j].Points {
+						if got[i].Series[j].Points[k].Value != tc.want[i].Series[j].Points[k].Value {
+							t.Errorf("got %v, want %v", got, tc.want)
+						}
+					}
+				}
+			}
+		})
+	}
+}

pkg/query-service/app/http_handler.go

@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"io"
 	"net/http"
-	"sort"
 	"strconv"
 	"strings"
 	"sync"
@@ -3107,78 +3106,6 @@ func (aH *APIHandler) QueryRangeV3(w http.ResponseWriter, r *http.Request) {
 	aH.queryRangeV3(r.Context(), queryRangeParams, w, r)
 }
 
-func applyMetricLimit(results []*v3.Result, queryRangeParams *v3.QueryRangeParamsV3) {
-	// apply limit if any for metrics
-	// use the grouping set points to apply the limit
-
-	for _, result := range results {
-		builderQueries := queryRangeParams.CompositeQuery.BuilderQueries
-
-		if builderQueries != nil && (builderQueries[result.QueryName].DataSource == v3.DataSourceMetrics ||
-			result.QueryName != builderQueries[result.QueryName].Expression) {
-			limit := builderQueries[result.QueryName].Limit
-
-			orderByList := builderQueries[result.QueryName].OrderBy
-			if limit >= 0 {
-				if len(orderByList) == 0 {
-					// If no orderBy is specified, sort by value in descending order
-					orderByList = []v3.OrderBy{{ColumnName: constants.SigNozOrderByValue, Order: "desc"}}
-				}
-				sort.SliceStable(result.Series, func(i, j int) bool {
-					for _, orderBy := range orderByList {
-						if orderBy.ColumnName == constants.SigNozOrderByValue {
-
-							// For table type queries (we rely on the fact that one value for row), sort
-							// based on final aggregation value
-							if len(result.Series[i].Points) == 1 && len(result.Series[j].Points) == 1 {
-								if orderBy.Order == "asc" {
-									return result.Series[i].Points[0].Value < result.Series[j].Points[0].Value
-								} else if orderBy.Order == "desc" {
-									return result.Series[i].Points[0].Value > result.Series[j].Points[0].Value
-								}
-							}
-
-							// For graph type queries, sort based on GroupingSetsPoint
-							if result.Series[i].GroupingSetsPoint == nil || result.Series[j].GroupingSetsPoint == nil {
-								// Handle nil GroupingSetsPoint, if needed
-								// Here, we assume non-nil values are always less than nil values
-								return result.Series[i].GroupingSetsPoint != nil
-							}
-							if orderBy.Order == "asc" {
-								return result.Series[i].GroupingSetsPoint.Value < result.Series[j].GroupingSetsPoint.Value
-							} else if orderBy.Order == "desc" {
-								return result.Series[i].GroupingSetsPoint.Value > result.Series[j].GroupingSetsPoint.Value
-							}
-						} else {
-							// Sort based on Labels map
-							labelI, existsI := result.Series[i].Labels[orderBy.ColumnName]
-							labelJ, existsJ := result.Series[j].Labels[orderBy.ColumnName]
-
-							if !existsI || !existsJ {
-								// Handle missing labels, if needed
-								// Here, we assume non-existent labels are always less than existing ones
-								return existsI
-							}
-
-							if orderBy.Order == "asc" {
-								return strings.Compare(labelI, labelJ) < 0
-							} else if orderBy.Order == "desc" {
-								return strings.Compare(labelI, labelJ) > 0
-							}
-						}
-					}
-					// Preserve original order if no matching orderBy is found
-					return i < j
-				})
-
-				if limit > 0 && len(result.Series) > int(limit) {
-					result.Series = result.Series[:limit]
-				}
-			}
-		}
-	}
-}
-
 func (aH *APIHandler) liveTailLogs(w http.ResponseWriter, r *http.Request) {
 
 	// get the param from url and add it to body
@@ -3295,6 +3222,10 @@ func (aH *APIHandler) queryRangeV4(ctx context.Context, queryRangeParams *v3.Que
 		return
 	}
 
+	if queryRangeParams.CompositeQuery.QueryType == v3.QueryTypeBuilder {
+		postProcessResult(result, queryRangeParams)
+	}
+
 	resp := v3.QueryRangeResponse{
 		Result: result,
 	}
@@ -3322,3 +3253,48 @@ func (aH *APIHandler) QueryRangeV4(w http.ResponseWriter, r *http.Request) {
 
 	aH.queryRangeV4(r.Context(), queryRangeParams, w, r)
 }
+
+// postProcessResult applies having clause, metric limit, reduce function to the result
+// This function is effective for metrics data source for now, but it can be extended to other data sources
+// if needed
+// Much of this work can be done in the ClickHouse query, but we decided to do it here because:
+// 1. Effective use of caching
+// 2. Easier to add new functions
+func postProcessResult(result []*v3.Result, queryRangeParams *v3.QueryRangeParamsV3) {
+	// Having clause is not part of the clickhouse query, so we need to apply it here
+	// It's not included in the query because it doesn't work nicely with caching
+	// With this change, if you have a query with a having clause, and then you change the having clause
+	// to something else, the query will still be cached.
+	applyHavingClause(result, queryRangeParams)
+	// We apply the metric limit here because it's not part of the clickhouse query
+	// The limit in the context of the time series query is the number of time series
+	// So for the limit to work, we need to know what series to keep and what to discard
+	// For us to know that, we need to execute the query first, and then apply the limit
+	// which we found expensive, because we are executing the query twice on the same data
+	// So we decided to apply the limit here, after the query is executed
+	// The function is named applyMetricLimit because it only applies to metrics data source
+	// In traces and logs, the limit is achieved using subqueries
+	applyMetricLimit(result, queryRangeParams)
+	// Each series in the result produces N number of points, where N is (end - start) / step
+	// For the panel type table, we need to show one point for each series in the row
+	// We do that by applying a reduce function to each series
+	applyReduceTo(result, queryRangeParams)
+	// We apply the functions here it's easier to add new functions
+	applyFunctions(result, queryRangeParams)
+}
+
+// applyFunctions applies functions for each query in the composite query
+// The functions can be more than one, and they are applied in the order they are defined
+func applyFunctions(results []*v3.Result, queryRangeParams *v3.QueryRangeParamsV3) {
+	for idx, result := range results {
+		builderQueries := queryRangeParams.CompositeQuery.BuilderQueries
+
+		if builderQueries != nil && (builderQueries[result.QueryName].DataSource == v3.DataSourceMetrics) {
+			functions := builderQueries[result.QueryName].Functions
+
+			for _, function := range functions {
+				results[idx] = queryBuilder.ApplyFunction(function, result)
+			}
+		}
+	}
+}

pkg/query-service/app/http_handler_test.go

@@ -8,9 +8,7 @@ import (
 	"strings"
 	"testing"
 
-	"go.signoz.io/signoz/pkg/query-service/constants"
 	"go.signoz.io/signoz/pkg/query-service/model"
-	v3 "go.signoz.io/signoz/pkg/query-service/model/v3"
 )
 
 func TestPrepareQuery(t *testing.T) {
@@ -132,619 +130,3 @@ func TestPrepareQuery(t *testing.T) {
 		})
 	}
 }
-
-func TestApplyLimitOnMetricResult(t *testing.T) {
-	cases := []struct {
-		name           string
-		inputResult    []*v3.Result
-		params         *v3.QueryRangeParamsV3
-		expectedResult []*v3.Result
-	}{
-		{
-			name: "test limit 1 without order", // top most (latency/error) as default
-			inputResult: []*v3.Result{
-				{
-					QueryName: "A",
-					Series: []*v3.Series{
-						{
-							Labels: map[string]string{
-								"service_name": "frontend",
-							},
-							Points: []v3.Point{
-								{
-									Timestamp: 1689220036000,
-									Value:     19.2,
-								},
-								{
-									Timestamp: 1689220096000,
-									Value:     19.5,
-								},
-							},
-							GroupingSetsPoint: &v3.Point{
-								Timestamp: 0,
-								Value:     19.3,
-							},
-						},
-						{
-							Labels: map[string]string{
-								"service_name": "route",
-							},
-							Points: []v3.Point{
-								{
-									Timestamp: 1689220036000,
-									Value:     8.83,
-								},
-								{
-									Timestamp: 1689220096000,
-									Value:     8.83,
-								},
-							},
-							GroupingSetsPoint: &v3.Point{
-								Timestamp: 0,
-								Value:     8.83,
-							},
-						},
-					},
-				},
-			},
-			params: &v3.QueryRangeParamsV3{
-				Start: 1689220036000,
-				End:   1689220096000,
-				Step:  60,
-				CompositeQuery: &v3.CompositeQuery{
-					BuilderQueries: map[string]*v3.BuilderQuery{
-						"A": {
-							QueryName:          "A",
-							AggregateAttribute: v3.AttributeKey{Key: "signo_calls_total"},
-							DataSource:         v3.DataSourceMetrics,
-							AggregateOperator:  v3.AggregateOperatorSumRate,
-							Expression:         "A",
-							GroupBy:            []v3.AttributeKey{{Key: "service_name"}},
-							Limit:              1,
-						},
-					},
-					QueryType: v3.QueryTypeBuilder,
-					PanelType: v3.PanelTypeGraph,
-				},
-			},
-			expectedResult: []*v3.Result{
-				{
-					QueryName: "A",
-					Series: []*v3.Series{
-						{
-							Labels: map[string]string{
-								"service_name": "frontend",
-							},
-							Points: []v3.Point{
-								{
-									Timestamp: 1689220036000,
-									Value:     19.2,
-								},
-								{
-									Timestamp: 1689220096000,
-									Value:     19.5,
-								},
-							},
-							GroupingSetsPoint: &v3.Point{
-								Timestamp: 0,
-								Value:     19.3,
-							},
-						},
-					},
-				},
-			},
-		},
-		{
-			name: "test limit with order asc",
-			inputResult: []*v3.Result{
-				{
-					QueryName: "A",
-					Series: []*v3.Series{
-						{
-							Labels: map[string]string{
-								"service_name": "frontend",
-							},
-							Points: []v3.Point{
-								{
-									Timestamp: 1689220036000,
-									Value:     19.2,
-								},
-								{
-									Timestamp: 1689220096000,
-									Value:     19.5,
-								},
-							},
-							GroupingSetsPoint: &v3.Point{
-								Timestamp: 0,
-								Value:     19.3,
-							},
-						},
-						{
-							Labels: map[string]string{
-								"service_name": "route",
-							},
-							Points: []v3.Point{
-								{
-									Timestamp: 1689220036000,
-									Value:     8.83,
-								},
-								{
-									Timestamp: 1689220096000,
-									Value:     8.83,
-								},
-							},
-							GroupingSetsPoint: &v3.Point{
-								Timestamp: 0,
-								Value:     8.83,
-							},
-						},
-					},
-				},
-			},
-			params: &v3.QueryRangeParamsV3{
-				Start: 1689220036000,
-				End:   1689220096000,
-				Step:  60,
-				CompositeQuery: &v3.CompositeQuery{
-					BuilderQueries: map[string]*v3.BuilderQuery{
-						"A": {
-							QueryName:          "A",
-							AggregateAttribute: v3.AttributeKey{Key: "signo_calls_total"},
-							DataSource:         v3.DataSourceMetrics,
-							AggregateOperator:  v3.AggregateOperatorSumRate,
-							Expression:         "A",
-							GroupBy:            []v3.AttributeKey{{Key: "service_name"}},
-							Limit:              1,
-							OrderBy:            []v3.OrderBy{{ColumnName: constants.SigNozOrderByValue, Order: "asc"}},
-						},
-					},
-					QueryType: v3.QueryTypeBuilder,
-					PanelType: v3.PanelTypeGraph,
-				},
-			},
-			expectedResult: []*v3.Result{
-				{
-					QueryName: "A",
-					Series: []*v3.Series{
-						{
-							Labels: map[string]string{
-								"service_name": "route",
-							},
-							Points: []v3.Point{
-								{
-									Timestamp: 1689220036000,
-									Value:     8.83,
-								},
-								{
-									Timestamp: 1689220096000,
-									Value:     8.83,
-								},
-							},
-							GroupingSetsPoint: &v3.Point{
-								Timestamp: 0,
-								Value:     8.83,
-							},
-						},
-					},
-				},
-			},
-		},
-		{
-			name: "test data source not metrics",
-			inputResult: []*v3.Result{
-				{
-					QueryName: "A",
-					Series: []*v3.Series{
-						{
-							Labels: map[string]string{
-								"service_name": "frontend",
-							},
-							Points: []v3.Point{
-								{
-									Timestamp: 1689220036000,
-									Value:     69,
-								},
-								{
-									Timestamp: 1689220096000,
-									Value:     240,
-								},
-							},
-							GroupingSetsPoint: &v3.Point{
-								Timestamp: 0,
-								Value:     154.5,
-							},
-						},
-						{
-							Labels: map[string]string{
-								"service_name": "redis",
-							},
-							Points: []v3.Point{
-								{
-									Timestamp: 1689220036000,
-									Value:     420,
-								},
-								{
-									Timestamp: 1689220096000,
-									Value:     260,
-								},
-							},
-							GroupingSetsPoint: &v3.Point{
-								Timestamp: 0,
-								Value:     340,
-							},
-						},
-					},
-				},
-			},
-			params: &v3.QueryRangeParamsV3{
-				Start: 1689220036000,
-				End:   1689220096000,
-				Step:  60,
-				CompositeQuery: &v3.CompositeQuery{
-					BuilderQueries: map[string]*v3.BuilderQuery{
-						"A": {
-							QueryName:          "A",
-							AggregateAttribute: v3.AttributeKey{Key: "service_name"},
-							DataSource:         v3.DataSourceTraces,
-							AggregateOperator:  v3.AggregateOperatorSum,
-							Expression:         "A",
-							GroupBy:            []v3.AttributeKey{{Key: "service_name"}},
-							Limit:              1,
-							OrderBy:            []v3.OrderBy{{ColumnName: constants.SigNozOrderByValue, Order: "asc"}},
-						},
-					},
-					QueryType: v3.QueryTypeBuilder,
-					PanelType: v3.PanelTypeGraph,
-				},
-			},
-			expectedResult: []*v3.Result{
-				{
-					QueryName: "A",
-					Series: []*v3.Series{
-						{
-							Labels: map[string]string{
-								"service_name": "frontend",
-							},
-							Points: []v3.Point{
-								{
-									Timestamp: 1689220036000,
-									Value:     69,
-								},
-								{
-									Timestamp: 1689220096000,
-									Value:     240,
-								},
-							},
-							GroupingSetsPoint: &v3.Point{
-								Timestamp: 0,
-								Value:     154.5,
-							},
-						},
-						{
-							Labels: map[string]string{
-								"service_name": "redis",
-							},
-							Points: []v3.Point{
-								{
-									Timestamp: 1689220036000,
-									Value:     420,
-								},
-								{
-									Timestamp: 1689220096000,
-									Value:     260,
-								},
-							},
-							GroupingSetsPoint: &v3.Point{
-								Timestamp: 0,
-								Value:     340,
-							},
-						},
-					},
-				},
-			},
-		},
-		{
-			// ["GET /api/v1/health", "DELETE /api/v1/health"] so result should be ["DELETE /api/v1/health"] although it has lower value
-			name: "test limit with operation asc",
-			inputResult: []*v3.Result{
-				{
-					QueryName: "A",
-					Series: []*v3.Series{
-						{
-							Labels: map[string]string{
-								"service_name": "frontend",
-								"operation":    "GET /api/v1/health",
-							},
-							Points: []v3.Point{
-								{
-									Timestamp: 1689220036000,
-									Value:     19.2,
-								},
-								{
-									Timestamp: 1689220096000,
-									Value:     19.5,
-								},
-							},
-							GroupingSetsPoint: &v3.Point{
-								Timestamp: 0,
-								Value:     19.3,
-							},
-						},
-						{
-							Labels: map[string]string{
-								"service_name": "route",
-								"operation":    "DELETE /api/v1/health",
-							},
-							Points: []v3.Point{
-								{
-									Timestamp: 1689220036000,
-									Value:     8.83,
-								},
-								{
-									Timestamp: 1689220096000,
-									Value:     8.83,
-								},
-							},
-							GroupingSetsPoint: &v3.Point{
-								Timestamp: 0,
-								Value:     8.83,
-							},
-						},
-					},
-				},
-			},
-			params: &v3.QueryRangeParamsV3{
-				Start: 1689220036000,
-				End:   1689220096000,
-				Step:  60,
-				CompositeQuery: &v3.CompositeQuery{
-					BuilderQueries: map[string]*v3.BuilderQuery{
-						"A": {
-							QueryName:          "A",
-							AggregateAttribute: v3.AttributeKey{Key: "signo_calls_total"},
-							DataSource:         v3.DataSourceMetrics,
-							AggregateOperator:  v3.AggregateOperatorSumRate,
-							Expression:         "A",
-							GroupBy:            []v3.AttributeKey{{Key: "service_name"}},
-							Limit:              1,
-							OrderBy:            []v3.OrderBy{{ColumnName: "operation", Order: "asc"}},
-						},
-					},
-					QueryType: v3.QueryTypeBuilder,
-					PanelType: v3.PanelTypeGraph,
-				},
-			},
-			expectedResult: []*v3.Result{
-				{
-					QueryName: "A",
-					Series: []*v3.Series{
-						{
-							Labels: map[string]string{
-								"service_name": "route",
-								"operation":    "DELETE /api/v1/health",
-							},
-							Points: []v3.Point{
-								{
-									Timestamp: 1689220036000,
-									Value:     8.83,
-								},
-								{
-									Timestamp: 1689220096000,
-									Value:     8.83,
-								},
-							},
-							GroupingSetsPoint: &v3.Point{
-								Timestamp: 0,
-								Value:     8.83,
-							},
-						},
-					},
-				},
-			},
-		},
-		{
-			name: "test limit with multiple order by labels",
-			inputResult: []*v3.Result{
-				{
-					QueryName: "A",
-					Series: []*v3.Series{
-						{
-							Labels: map[string]string{
-								"service_name": "frontend",
-								"operation":    "GET /api/v1/health",
-								"status_code":  "200",
-								"priority":     "P0",
-							},
-							Points: []v3.Point{
-								{
-									Timestamp: 1689220036000,
-									Value:     19.2,
-								},
-								{
-									Timestamp: 1689220096000,
-									Value:     19.5,
-								},
-							},
-							GroupingSetsPoint: &v3.Point{
-								Timestamp: 0,
-								Value:     19.3,
-							},
-						},
-						{
-							Labels: map[string]string{
-								"service_name": "route",
-								"operation":    "DELETE /api/v1/health",
-								"status_code":  "301",
-								"priority":     "P1",
-							},
-							Points: []v3.Point{
-								{
-									Timestamp: 1689220036000,
-									Value:     8.83,
-								},
-								{
-									Timestamp: 1689220096000,
-									Value:     8.83,
-								},
-							},
-							GroupingSetsPoint: &v3.Point{
-								Timestamp: 0,
-								Value:     8.83,
-							},
-						},
-						{
-							Labels: map[string]string{
-								"service_name": "route",
-								"operation":    "DELETE /api/v1/health",
-								"status_code":  "400",
-								"priority":     "P0",
-							},
-							Points: []v3.Point{
-								{
-									Timestamp: 1689220036000,
-									Value:     8.83,
-								},
-								{
-									Timestamp: 1689220096000,
-									Value:     8.83,
-								},
-							},
-							GroupingSetsPoint: &v3.Point{
-								Timestamp: 0,
-								Value:     8.83,
-							},
-						},
-						{
-							Labels: map[string]string{
-								"service_name": "route",
-								"operation":    "DELETE /api/v1/health",
-								"status_code":  "200",
-								"priority":     "P1",
-							},
-							Points: []v3.Point{
-								{
-									Timestamp: 1689220036000,
-									Value:     8.83,
-								},
-								{
-									Timestamp: 1689220096000,
-									Value:     8.83,
-								},
-							},
-							GroupingSetsPoint: &v3.Point{
-								Timestamp: 0,
-								Value:     8.83,
-							},
-						},
-					},
-				},
-			},
-			params: &v3.QueryRangeParamsV3{
-				Start: 1689220036000,
-				End:   1689220096000,
-				Step:  60,
-				CompositeQuery: &v3.CompositeQuery{
-					BuilderQueries: map[string]*v3.BuilderQuery{
-						"A": {
-							QueryName:          "A",
-							AggregateAttribute: v3.AttributeKey{Key: "signo_calls_total"},
-							DataSource:         v3.DataSourceMetrics,
-							AggregateOperator:  v3.AggregateOperatorSumRate,
-							Expression:         "A",
-							GroupBy:            []v3.AttributeKey{{Key: "service_name"}, {Key: "operation"}, {Key: "status_code"}, {Key: "priority"}},
-							Limit:              2,
-							OrderBy: []v3.OrderBy{
-								{ColumnName: "priority", Order: "asc"},
-								{ColumnName: "status_code", Order: "desc"},
-							},
-						},
-					},
-					QueryType: v3.QueryTypeBuilder,
-					PanelType: v3.PanelTypeGraph,
-				},
-			},
-			expectedResult: []*v3.Result{
-				{
-					QueryName: "A",
-					Series: []*v3.Series{
-						{
-							Labels: map[string]string{
-								"service_name": "frontend",
-								"operation":    "GET /api/v1/health",
-								"status_code":  "200",
-								"priority":     "P0",
-							},
-							Points: []v3.Point{
-								{
-									Timestamp: 1689220036000,
-									Value:     19.2,
-								},
-								{
-									Timestamp: 1689220096000,
-									Value:     19.5,
-								},
-							},
-							GroupingSetsPoint: &v3.Point{
-								Timestamp: 0,
-								Value:     19.3,
-							},
-						},
-						{
-							Labels: map[string]string{
-								"service_name": "route",
-								"operation":    "DELETE /api/v1/health",
-								"status_code":  "400",
-								"priority":     "P0",
-							},
-							Points: []v3.Point{
-								{
-									Timestamp: 1689220036000,
-									Value:     8.83,
-								},
-								{
-									Timestamp: 1689220096000,
-									Value:     8.83,
-								},
-							},
-							GroupingSetsPoint: &v3.Point{
-								Timestamp: 0,
-								Value:     8.83,
-							},
-						},
-					},
-				},
-			},
-		},
-	}
-
-	for _, c := range cases {
-		t.Run(c.name, func(t *testing.T) {
-			result := c.inputResult
-			applyMetricLimit(result, c.params)
-			if len(result) != len(c.expectedResult) {
-				t.Errorf("expected result length: %d, but got: %d", len(c.expectedResult), len(result))
-			}
-			for i, r := range result {
-				if r.QueryName != c.expectedResult[i].QueryName {
-					t.Errorf("expected query name: %s, but got: %s", c.expectedResult[i].QueryName, r.QueryName)
-				}
-				if len(r.Series) != len(c.expectedResult[i].Series) {
-					t.Errorf("expected series length: %d, but got: %d", len(c.expectedResult[i].Series), len(r.Series))
-				}
-				for j, s := range r.Series {
-					if len(s.Points) != len(c.expectedResult[i].Series[j].Points) {
-						t.Errorf("expected points length: %d, but got: %d", len(c.expectedResult[i].Series[j].Points), len(s.Points))
-					}
-					for k, p := range s.Points {
-						if p.Timestamp != c.expectedResult[i].Series[j].Points[k].Timestamp {
-							t.Errorf("expected point timestamp: %d, but got: %d", c.expectedResult[i].Series[j].Points[k].Timestamp, p.Timestamp)
-						}
-						if p.Value != c.expectedResult[i].Series[j].Points[k].Value {
-							t.Errorf("expected point value: %f, but got: %f", c.expectedResult[i].Series[j].Points[k].Value, p.Value)
-						}
-					}
-				}
-			}
-		})
-	}
-}

pkg/query-service/app/limit.go

@@ -0,0 +1,81 @@
+package app
+
+import (
+	"sort"
+	"strings"
+
+	"go.signoz.io/signoz/pkg/query-service/constants"
+	v3 "go.signoz.io/signoz/pkg/query-service/model/v3"
+)
+
+// applyMetricLimit applies limit to the metrics query results
+func applyMetricLimit(results []*v3.Result, queryRangeParams *v3.QueryRangeParamsV3) {
+	// apply limit if any for metrics
+	// use the grouping set points to apply the limit
+
+	for _, result := range results {
+		builderQueries := queryRangeParams.CompositeQuery.BuilderQueries
+
+		if builderQueries != nil && (builderQueries[result.QueryName].DataSource == v3.DataSourceMetrics) {
+			limit := builderQueries[result.QueryName].Limit
+
+			orderByList := builderQueries[result.QueryName].OrderBy
+			if limit > 0 {
+				if len(orderByList) == 0 {
+					// If no orderBy is specified, sort by value in descending order
+					orderByList = []v3.OrderBy{{ColumnName: constants.SigNozOrderByValue, Order: "desc"}}
+				}
+				sort.SliceStable(result.Series, func(i, j int) bool {
+					for _, orderBy := range orderByList {
+						if orderBy.ColumnName == constants.SigNozOrderByValue {
+
+							// For table type queries (we rely on the fact that one value for row), sort
+							// based on final aggregation value
+							if len(result.Series[i].Points) == 1 && len(result.Series[j].Points) == 1 {
+								if orderBy.Order == "asc" {
+									return result.Series[i].Points[0].Value < result.Series[j].Points[0].Value
+								} else if orderBy.Order == "desc" {
+									return result.Series[i].Points[0].Value > result.Series[j].Points[0].Value
+								}
+							}
+
+							// For graph type queries, sort based on GroupingSetsPoint
+							if result.Series[i].GroupingSetsPoint == nil || result.Series[j].GroupingSetsPoint == nil {
+								// Handle nil GroupingSetsPoint, if needed
+								// Here, we assume non-nil values are always less than nil values
+								return result.Series[i].GroupingSetsPoint != nil
+							}
+							if orderBy.Order == "asc" {
+								return result.Series[i].GroupingSetsPoint.Value < result.Series[j].GroupingSetsPoint.Value
+							} else if orderBy.Order == "desc" {
+								return result.Series[i].GroupingSetsPoint.Value > result.Series[j].GroupingSetsPoint.Value
+							}
+						} else {
+							// Sort based on Labels map
+							labelI, existsI := result.Series[i].Labels[orderBy.ColumnName]
+							labelJ, existsJ := result.Series[j].Labels[orderBy.ColumnName]
+
+							if !existsI || !existsJ {
+								// Handle missing labels, if needed
+								// Here, we assume non-existent labels are always less than existing ones
+								return existsI
+							}
+
+							if orderBy.Order == "asc" {
+								return strings.Compare(labelI, labelJ) < 0
+							} else if orderBy.Order == "desc" {
+								return strings.Compare(labelI, labelJ) > 0
+							}
+						}
+					}
+					// Preserve original order if no matching orderBy is found
+					return i < j
+				})
+
+				if limit > 0 && len(result.Series) > int(limit) {
+					result.Series = result.Series[:limit]
+				}
+			}
+		}
+	}
+}

pkg/query-service/app/limit_test.go

@@ -0,0 +1,624 @@
+package app
+
+import (
+	"testing"
+
+	"go.signoz.io/signoz/pkg/query-service/constants"
+	v3 "go.signoz.io/signoz/pkg/query-service/model/v3"
+)
+
+func TestApplyLimitOnMetricResult(t *testing.T) {
+	cases := []struct {
+		name           string
+		inputResult    []*v3.Result
+		params         *v3.QueryRangeParamsV3
+		expectedResult []*v3.Result
+	}{
+		{
+			name: "test limit 1 without order", // top most (latency/error) as default
+			inputResult: []*v3.Result{
+				{
+					QueryName: "A",
+					Series: []*v3.Series{
+						{
+							Labels: map[string]string{
+								"service_name": "frontend",
+							},
+							Points: []v3.Point{
+								{
+									Timestamp: 1689220036000,
+									Value:     19.2,
+								},
+								{
+									Timestamp: 1689220096000,
+									Value:     19.5,
+								},
+							},
+							GroupingSetsPoint: &v3.Point{
+								Timestamp: 0,
+								Value:     19.3,
+							},
+						},
+						{
+							Labels: map[string]string{
+								"service_name": "route",
+							},
+							Points: []v3.Point{
+								{
+									Timestamp: 1689220036000,
+									Value:     8.83,
+								},
+								{
+									Timestamp: 1689220096000,
+									Value:     8.83,
+								},
+							},
+							GroupingSetsPoint: &v3.Point{
+								Timestamp: 0,
+								Value:     8.83,
+							},
+						},
+					},
+				},
+			},
+			params: &v3.QueryRangeParamsV3{
+				Start: 1689220036000,
+				End:   1689220096000,
+				Step:  60,
+				CompositeQuery: &v3.CompositeQuery{
+					BuilderQueries: map[string]*v3.BuilderQuery{
+						"A": {
+							QueryName:          "A",
+							AggregateAttribute: v3.AttributeKey{Key: "signo_calls_total"},
+							DataSource:         v3.DataSourceMetrics,
+							AggregateOperator:  v3.AggregateOperatorSumRate,
+							Expression:         "A",
+							GroupBy:            []v3.AttributeKey{{Key: "service_name"}},
+							Limit:              1,
+						},
+					},
+					QueryType: v3.QueryTypeBuilder,
+					PanelType: v3.PanelTypeGraph,
+				},
+			},
+			expectedResult: []*v3.Result{
+				{
+					QueryName: "A",
+					Series: []*v3.Series{
+						{
+							Labels: map[string]string{
+								"service_name": "frontend",
+							},
+							Points: []v3.Point{
+								{
+									Timestamp: 1689220036000,
+									Value:     19.2,
+								},
+								{
+									Timestamp: 1689220096000,
+									Value:     19.5,
+								},
+							},
+							GroupingSetsPoint: &v3.Point{
+								Timestamp: 0,
+								Value:     19.3,
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "test limit with order asc",
+			inputResult: []*v3.Result{
+				{
+					QueryName: "A",
+					Series: []*v3.Series{
+						{
+							Labels: map[string]string{
+								"service_name": "frontend",
+							},
+							Points: []v3.Point{
+								{
+									Timestamp: 1689220036000,
+									Value:     19.2,
+								},
+								{
+									Timestamp: 1689220096000,
+									Value:     19.5,
+								},
+							},
+							GroupingSetsPoint: &v3.Point{
+								Timestamp: 0,
+								Value:     19.3,
+							},
+						},
+						{
+							Labels: map[string]string{
+								"service_name": "route",
+							},
+							Points: []v3.Point{
+								{
+									Timestamp: 1689220036000,
+									Value:     8.83,
+								},
+								{
+									Timestamp: 1689220096000,
+									Value:     8.83,
+								},
+							},
+							GroupingSetsPoint: &v3.Point{
+								Timestamp: 0,
+								Value:     8.83,
+							},
+						},
+					},
+				},
+			},
+			params: &v3.QueryRangeParamsV3{
+				Start: 1689220036000,
+				End:   1689220096000,
+				Step:  60,
+				CompositeQuery: &v3.CompositeQuery{
+					BuilderQueries: map[string]*v3.BuilderQuery{
+						"A": {
+							QueryName:          "A",
+							AggregateAttribute: v3.AttributeKey{Key: "signo_calls_total"},
+							DataSource:         v3.DataSourceMetrics,
+							AggregateOperator:  v3.AggregateOperatorSumRate,
+							Expression:         "A",
+							GroupBy:            []v3.AttributeKey{{Key: "service_name"}},
+							Limit:              1,
+							OrderBy:            []v3.OrderBy{{ColumnName: constants.SigNozOrderByValue, Order: "asc"}},
+						},
+					},
+					QueryType: v3.QueryTypeBuilder,
+					PanelType: v3.PanelTypeGraph,
+				},
+			},
+			expectedResult: []*v3.Result{
+				{
+					QueryName: "A",
+					Series: []*v3.Series{
+						{
+							Labels: map[string]string{
+								"service_name": "route",
+							},
+							Points: []v3.Point{
+								{
+									Timestamp: 1689220036000,
+									Value:     8.83,
+								},
+								{
+									Timestamp: 1689220096000,
+									Value:     8.83,
+								},
+							},
+							GroupingSetsPoint: &v3.Point{
+								Timestamp: 0,
+								Value:     8.83,
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "test data source not metrics",
+			inputResult: []*v3.Result{
+				{
+					QueryName: "A",
+					Series: []*v3.Series{
+						{
+							Labels: map[string]string{
+								"service_name": "frontend",
+							},
+							Points: []v3.Point{
+								{
+									Timestamp: 1689220036000,
+									Value:     69,
+								},
+								{
+									Timestamp: 1689220096000,
+									Value:     240,
+								},
+							},
+							GroupingSetsPoint: &v3.Point{
+								Timestamp: 0,
+								Value:     154.5,
+							},
+						},
+						{
+							Labels: map[string]string{
+								"service_name": "redis",
+							},
+							Points: []v3.Point{
+								{
+									Timestamp: 1689220036000,
+									Value:     420,
+								},
+								{
+									Timestamp: 1689220096000,
+									Value:     260,
+								},
+							},
+							GroupingSetsPoint: &v3.Point{
+								Timestamp: 0,
+								Value:     340,
+							},
+						},
+					},
+				},
+			},
+			params: &v3.QueryRangeParamsV3{
+				Start: 1689220036000,
+				End:   1689220096000,
+				Step:  60,
+				CompositeQuery: &v3.CompositeQuery{
+					BuilderQueries: map[string]*v3.BuilderQuery{
+						"A": {
+							QueryName:          "A",
+							AggregateAttribute: v3.AttributeKey{Key: "service_name"},
+							DataSource:         v3.DataSourceTraces,
+							AggregateOperator:  v3.AggregateOperatorSum,
+							Expression:         "A",
+							GroupBy:            []v3.AttributeKey{{Key: "service_name"}},
+							Limit:              1,
+							OrderBy:            []v3.OrderBy{{ColumnName: constants.SigNozOrderByValue, Order: "asc"}},
+						},
+					},
+					QueryType: v3.QueryTypeBuilder,
+					PanelType: v3.PanelTypeGraph,
+				},
+			},
+			expectedResult: []*v3.Result{
+				{
+					QueryName: "A",
+					Series: []*v3.Series{
+						{
+							Labels: map[string]string{
+								"service_name": "frontend",
+							},
+							Points: []v3.Point{
+								{
+									Timestamp: 1689220036000,
+									Value:     69,
+								},
+								{
+									Timestamp: 1689220096000,
+									Value:     240,
+								},
+							},
+							GroupingSetsPoint: &v3.Point{
+								Timestamp: 0,
+								Value:     154.5,
+							},
+						},
+						{
+							Labels: map[string]string{
+								"service_name": "redis",
+							},
+							Points: []v3.Point{
+								{
+									Timestamp: 1689220036000,
+									Value:     420,
+								},
+								{
+									Timestamp: 1689220096000,
+									Value:     260,
+								},
+							},
+							GroupingSetsPoint: &v3.Point{
+								Timestamp: 0,
+								Value:     340,
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			// ["GET /api/v1/health", "DELETE /api/v1/health"] so result should be ["DELETE /api/v1/health"] although it has lower value
+			name: "test limit with operation asc",
+			inputResult: []*v3.Result{
+				{
+					QueryName: "A",
+					Series: []*v3.Series{
+						{
+							Labels: map[string]string{
+								"service_name": "frontend",
+								"operation":    "GET /api/v1/health",
+							},
+							Points: []v3.Point{
+								{
+									Timestamp: 1689220036000,
+									Value:     19.2,
+								},
+								{
+									Timestamp: 1689220096000,
+									Value:     19.5,
+								},
+							},
+							GroupingSetsPoint: &v3.Point{
+								Timestamp: 0,
+								Value:     19.3,
+							},
+						},
+						{
+							Labels: map[string]string{
+								"service_name": "route",
+								"operation":    "DELETE /api/v1/health",
+							},
+							Points: []v3.Point{
+								{
+									Timestamp: 1689220036000,
+									Value:     8.83,
+								},
+								{
+									Timestamp: 1689220096000,
+									Value:     8.83,
+								},
+							},
+							GroupingSetsPoint: &v3.Point{
+								Timestamp: 0,
+								Value:     8.83,
+							},
+						},
+					},
+				},
+			},
+			params: &v3.QueryRangeParamsV3{
+				Start: 1689220036000,
+				End:   1689220096000,
+				Step:  60,
+				CompositeQuery: &v3.CompositeQuery{
+					BuilderQueries: map[string]*v3.BuilderQuery{
+						"A": {
+							QueryName:          "A",
+							AggregateAttribute: v3.AttributeKey{Key: "signo_calls_total"},
+							DataSource:         v3.DataSourceMetrics,
+							AggregateOperator:  v3.AggregateOperatorSumRate,
+							Expression:         "A",
+							GroupBy:            []v3.AttributeKey{{Key: "service_name"}},
+							Limit:              1,
+							OrderBy:            []v3.OrderBy{{ColumnName: "operation", Order: "asc"}},
+						},
+					},
+					QueryType: v3.QueryTypeBuilder,
+					PanelType: v3.PanelTypeGraph,
+				},
+			},
+			expectedResult: []*v3.Result{
+				{
+					QueryName: "A",
+					Series: []*v3.Series{
+						{
+							Labels: map[string]string{
+								"service_name": "route",
+								"operation":    "DELETE /api/v1/health",
+							},
+							Points: []v3.Point{
+								{
+									Timestamp: 1689220036000,
+									Value:     8.83,
+								},
+								{
+									Timestamp: 1689220096000,
+									Value:     8.83,
+								},
+							},
+							GroupingSetsPoint: &v3.Point{
+								Timestamp: 0,
+								Value:     8.83,
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "test limit with multiple order by labels",
+			inputResult: []*v3.Result{
+				{
+					QueryName: "A",
+					Series: []*v3.Series{
+						{
+							Labels: map[string]string{
+								"service_name": "frontend",
+								"operation":    "GET /api/v1/health",
+								"status_code":  "200",
+								"priority":     "P0",
+							},
+							Points: []v3.Point{
+								{
+									Timestamp: 1689220036000,
+									Value:     19.2,
+								},
+								{
+									Timestamp: 1689220096000,
+									Value:     19.5,
+								},
+							},
+							GroupingSetsPoint: &v3.Point{
+								Timestamp: 0,
+								Value:     19.3,
+							},
+						},
+						{
+							Labels: map[string]string{
+								"service_name": "route",
+								"operation":    "DELETE /api/v1/health",
+								"status_code":  "301",
+								"priority":     "P1",
+							},
+							Points: []v3.Point{
+								{
+									Timestamp: 1689220036000,
+									Value:     8.83,
+								},
+								{
+									Timestamp: 1689220096000,
+									Value:     8.83,
+								},
+							},
+							GroupingSetsPoint: &v3.Point{
+								Timestamp: 0,
+								Value:     8.83,
+							},
+						},
+						{
+							Labels: map[string]string{
+								"service_name": "route",
+								"operation":    "DELETE /api/v1/health",
+								"status_code":  "400",
+								"priority":     "P0",
+							},
+							Points: []v3.Point{
+								{
+									Timestamp: 1689220036000,
+									Value:     8.83,
+								},
+								{
+									Timestamp: 1689220096000,
+									Value:     8.83,
+								},
+							},
+							GroupingSetsPoint: &v3.Point{
+								Timestamp: 0,
+								Value:     8.83,
+							},
+						},
+						{
+							Labels: map[string]string{
+								"service_name": "route",
+								"operation":    "DELETE /api/v1/health",
+								"status_code":  "200",
+								"priority":     "P1",
+							},
+							Points: []v3.Point{
+								{
+									Timestamp: 1689220036000,
+									Value:     8.83,
+								},
+								{
+									Timestamp: 1689220096000,
+									Value:     8.83,
+								},
+							},
+							GroupingSetsPoint: &v3.Point{
+								Timestamp: 0,
+								Value:     8.83,
+							},
+						},
+					},
+				},
+			},
+			params: &v3.QueryRangeParamsV3{
+				Start: 1689220036000,
+				End:   1689220096000,
+				Step:  60,
+				CompositeQuery: &v3.CompositeQuery{
+					BuilderQueries: map[string]*v3.BuilderQuery{
+						"A": {
+							QueryName:          "A",
+							AggregateAttribute: v3.AttributeKey{Key: "signo_calls_total"},
+							DataSource:         v3.DataSourceMetrics,
+							AggregateOperator:  v3.AggregateOperatorSumRate,
+							Expression:         "A",
+							GroupBy:            []v3.AttributeKey{{Key: "service_name"}, {Key: "operation"}, {Key: "status_code"}, {Key: "priority"}},
+							Limit:              2,
+							OrderBy: []v3.OrderBy{
+								{ColumnName: "priority", Order: "asc"},
+								{ColumnName: "status_code", Order: "desc"},
+							},
+						},
+					},
+					QueryType: v3.QueryTypeBuilder,
+					PanelType: v3.PanelTypeGraph,
+				},
+			},
+			expectedResult: []*v3.Result{
+				{
+					QueryName: "A",
+					Series: []*v3.Series{
+						{
+							Labels: map[string]string{
+								"service_name": "frontend",
+								"operation":    "GET /api/v1/health",
+								"status_code":  "200",
+								"priority":     "P0",
+							},
+							Points: []v3.Point{
+								{
+									Timestamp: 1689220036000,
+									Value:     19.2,
+								},
+								{
+									Timestamp: 1689220096000,
+									Value:     19.5,
+								},
+							},
+							GroupingSetsPoint: &v3.Point{
+								Timestamp: 0,
+								Value:     19.3,
+							},
+						},
+						{
+							Labels: map[string]string{
+								"service_name": "route",
+								"operation":    "DELETE /api/v1/health",
+								"status_code":  "400",
+								"priority":     "P0",
+							},
+							Points: []v3.Point{
+								{
+									Timestamp: 1689220036000,
+									Value:     8.83,
+								},
+								{
+									Timestamp: 1689220096000,
+									Value:     8.83,
+								},
+							},
+							GroupingSetsPoint: &v3.Point{
+								Timestamp: 0,
+								Value:     8.83,
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+
+	for _, c := range cases {
+		t.Run(c.name, func(t *testing.T) {
+			result := c.inputResult
+			applyMetricLimit(result, c.params)
+			if len(result) != len(c.expectedResult) {
+				t.Errorf("expected result length: %d, but got: %d", len(c.expectedResult), len(result))
+			}
+			for i, r := range result {
+				if r.QueryName != c.expectedResult[i].QueryName {
+					t.Errorf("expected query name: %s, but got: %s", c.expectedResult[i].QueryName, r.QueryName)
+				}
+				if len(r.Series) != len(c.expectedResult[i].Series) {
+					t.Errorf("expected series length: %d, but got: %d", len(c.expectedResult[i].Series), len(r.Series))
+				}
+				for j, s := range r.Series {
+					if len(s.Points) != len(c.expectedResult[i].Series[j].Points) {
+						t.Errorf("expected points length: %d, but got: %d", len(c.expectedResult[i].Series[j].Points), len(s.Points))
+					}
+					for k, p := range s.Points {
+						if p.Timestamp != c.expectedResult[i].Series[j].Points[k].Timestamp {
+							t.Errorf("expected point timestamp: %d, but got: %d", c.expectedResult[i].Series[j].Points[k].Timestamp, p.Timestamp)
+						}
+						if p.Value != c.expectedResult[i].Series[j].Points[k].Value {
+							t.Errorf("expected point value: %f, but got: %f", c.expectedResult[i].Series[j].Points[k].Value, p.Value)
+						}
+					}
+				}
+			}
+		})
+	}
+}

pkg/query-service/app/metrics/v4/query_builder.go

@@ -24,7 +24,10 @@ func PrepareMetricQuery(start, end int64, queryType v3.QueryType, panelType v3.P
 	groupBy := helpers.GroupByAttributeKeyTags(mq.GroupBy...)
 	orderBy := helpers.OrderByAttributeKeyTags(mq.OrderBy, mq.GroupBy)
 
-	if mq.Quantile != 0 {
+	var quantile float64
+
+	if v3.IsPercentileOperator(mq.SpaceAggregation) {
+		quantile = v3.GetPercentileFromOperator(mq.SpaceAggregation)
 		// If quantile is set, we need to group by le
 		// and set the space aggregation to sum
 		// and time aggregation to rate
@@ -57,8 +60,8 @@ func PrepareMetricQuery(start, end int64, queryType v3.QueryType, panelType v3.P
 		return "", err
 	}
 
-	if mq.Quantile != 0 {
-		query = fmt.Sprintf(`SELECT %s, histogramQuantile(arrayMap(x -> toFloat64(x), groupArray(le)), groupArray(value), %.3f) as value FROM (%s) GROUP BY %s ORDER BY %s`, groupBy, mq.Quantile, query, groupBy, orderBy)
+	if quantile != 0 {
+		query = fmt.Sprintf(`SELECT %s, histogramQuantile(arrayMap(x -> toFloat64(x), groupArray(le)), groupArray(value), %.3f) as value FROM (%s) GROUP BY %s ORDER BY %s`, groupBy, quantile, query, groupBy, orderBy)
 	}
 
 	return query, nil

pkg/query-service/app/metrics/v4/query_builder_test.go

@@ -336,9 +336,9 @@ func TestPrepreMetricQueryCumulativeQuantile(t *testing.T) {
 					DataType: v3.AttributeKeyDataTypeString,
 					Type:     v3.AttributeKeyTypeTag,
 				}},
-				Expression: "A",
-				Disabled:   false,
-				Quantile:   0.99,
+				Expression:       "A",
+				Disabled:         false,
+				SpaceAggregation: v3.SpaceAggregationPercentile99,
 			},
 			expectedQueryContains: "SELECT service_name, ts, histogramQuantile(arrayMap(x -> toFloat64(x), groupArray(le)), groupArray(value), 0.990) as value FROM (SELECT service_name, le, ts, sum(per_series_value) as value FROM (SELECT service_name, le, ts, If((per_series_value - lagInFrame(per_series_value, 1, 0) OVER rate_window) < 0, nan, If((ts - lagInFrame(ts, 1, toDate('1970-01-01')) OVER rate_window) >= 86400, nan, (per_series_value - lagInFrame(per_series_value, 1, 0) OVER rate_window) / (ts - lagInFrame(ts, 1, toDate('1970-01-01')) OVER rate_window))) as per_series_value FROM (SELECT fingerprint, any(service_name) as service_name, any(le) as le, toStartOfInterval(toDateTime(intDiv(timestamp_ms, 1000)), INTERVAL 60 SECOND) as ts, max(value) as per_series_value FROM signoz_metrics.distributed_samples_v2 INNER JOIN (SELECT DISTINCT JSONExtractString(labels, 'service_name') as service_name, JSONExtractString(labels, 'le') as le, fingerprint FROM signoz_metrics.time_series_v2 WHERE metric_name = 'signoz_latency_bucket' AND temporality = 'Cumulative' AND like(JSONExtractString(labels, 'service_name'), '%frontend%')) as filtered_time_series USING fingerprint WHERE metric_name = 'signoz_latency_bucket' AND timestamp_ms >= 1650991980000 AND timestamp_ms <= 1651078380000 GROUP BY fingerprint, ts ORDER BY fingerprint, ts) WINDOW rate_window as (PARTITION BY fingerprint ORDER BY fingerprint, ts)) WHERE isNaN(per_series_value) = 0 GROUP BY GROUPING SETS ( (service_name, le, ts), (service_name, le) ) ORDER BY service_name ASC, le ASC, ts ASC) GROUP BY service_name, ts ORDER BY service_name ASC, ts ASC",
 		},
@@ -366,9 +366,9 @@ func TestPrepreMetricQueryCumulativeQuantile(t *testing.T) {
 						},
 					},
 				},
-				Expression: "A",
-				Disabled:   false,
-				Quantile:   0.99,
+				Expression:       "A",
+				Disabled:         false,
+				SpaceAggregation: v3.SpaceAggregationPercentile99,
 			},
 			expectedQueryContains: "SELECT ts, histogramQuantile(arrayMap(x -> toFloat64(x), groupArray(le)), groupArray(value), 0.990) as value FROM (SELECT le, ts, sum(per_series_value) as value FROM (SELECT le, ts, If((per_series_value - lagInFrame(per_series_value, 1, 0) OVER rate_window) < 0, nan, If((ts - lagInFrame(ts, 1, toDate('1970-01-01')) OVER rate_window) >= 86400, nan, (per_series_value - lagInFrame(per_series_value, 1, 0) OVER rate_window) / (ts - lagInFrame(ts, 1, toDate('1970-01-01')) OVER rate_window))) as per_series_value FROM (SELECT fingerprint, any(le) as le, toStartOfInterval(toDateTime(intDiv(timestamp_ms, 1000)), INTERVAL 60 SECOND) as ts, max(value) as per_series_value FROM signoz_metrics.distributed_samples_v2 INNER JOIN (SELECT DISTINCT JSONExtractString(labels, 'le') as le, fingerprint FROM signoz_metrics.time_series_v2 WHERE metric_name = 'signoz_latency_bucket' AND temporality = 'Cumulative' AND like(JSONExtractString(labels, 'service_name'), '%frontend%')) as filtered_time_series USING fingerprint WHERE metric_name = 'signoz_latency_bucket' AND timestamp_ms >= 1650991980000 AND timestamp_ms <= 1651078380000 GROUP BY fingerprint, ts ORDER BY fingerprint, ts) WINDOW rate_window as (PARTITION BY fingerprint ORDER BY fingerprint, ts)) WHERE isNaN(per_series_value) = 0 GROUP BY GROUPING SETS ( (le, ts), (le) ) ORDER BY le ASC, ts ASC) GROUP BY ts ORDER BY ts ASC",
 		},
@@ -418,9 +418,9 @@ func TestPrepreMetricQueryDeltaQuantile(t *testing.T) {
 					DataType: v3.AttributeKeyDataTypeString,
 					Type:     v3.AttributeKeyTypeTag,
 				}},
-				Expression: "A",
-				Disabled:   false,
-				Quantile:   0.99,
+				Expression:       "A",
+				Disabled:         false,
+				SpaceAggregation: v3.SpaceAggregationPercentile99,
 			},
 			expectedQueryContains: "SELECT service_name, ts, histogramQuantile(arrayMap(x -> toFloat64(x), groupArray(le)), groupArray(value), 0.990) as value FROM (SELECT service_name, le, toStartOfInterval(toDateTime(intDiv(timestamp_ms, 1000)), INTERVAL 60 SECOND) as ts, sum(value)/60 as value FROM signoz_metrics.distributed_samples_v2 INNER JOIN (SELECT DISTINCT JSONExtractString(labels, 'service_name') as service_name, JSONExtractString(labels, 'le') as le, fingerprint FROM signoz_metrics.time_series_v2 WHERE metric_name = 'signoz_latency_bucket' AND temporality = 'Delta' AND like(JSONExtractString(labels, 'service_name'), '%frontend%')) as filtered_time_series USING fingerprint WHERE metric_name = 'signoz_latency_bucket' AND timestamp_ms >= 1650991980000 AND timestamp_ms <= 1651078380000 GROUP BY GROUPING SETS ( (service_name, le, ts), (service_name, le) ) ORDER BY service_name ASC, le ASC, ts ASC) GROUP BY service_name, ts ORDER BY service_name ASC, ts ASC",
 		},
@@ -448,9 +448,9 @@ func TestPrepreMetricQueryDeltaQuantile(t *testing.T) {
 						},
 					},
 				},
-				Expression: "A",
-				Disabled:   false,
-				Quantile:   0.99,
+				Expression:       "A",
+				Disabled:         false,
+				SpaceAggregation: v3.SpaceAggregationPercentile99,
 			},
 			expectedQueryContains: "SELECT ts, histogramQuantile(arrayMap(x -> toFloat64(x), groupArray(le)), groupArray(value), 0.990) as value FROM (SELECT le, toStartOfInterval(toDateTime(intDiv(timestamp_ms, 1000)), INTERVAL 60 SECOND) as ts, sum(value)/60 as value FROM signoz_metrics.distributed_samples_v2 INNER JOIN (SELECT DISTINCT JSONExtractString(labels, 'le') as le, fingerprint FROM signoz_metrics.time_series_v2 WHERE metric_name = 'signoz_latency_bucket' AND temporality = 'Delta' AND like(JSONExtractString(labels, 'service_name'), '%frontend%')) as filtered_time_series USING fingerprint WHERE metric_name = 'signoz_latency_bucket' AND timestamp_ms >= 1650991980000 AND timestamp_ms <= 1651078380000 GROUP BY GROUPING SETS ( (le, ts), (le) ) ORDER BY le ASC, ts ASC) GROUP BY ts ORDER BY ts ASC",
 		},

pkg/query-service/app/queryBuilder/functions.go

@@ -0,0 +1,286 @@
+package queryBuilder
+
+import (
+	"math"
+	"sort"
+
+	v3 "go.signoz.io/signoz/pkg/query-service/model/v3"
+)
+
+// funcCutOffMin cuts off values below the threshold and replaces them with NaN
+func funcCutOffMin(result *v3.Result, threshold float64) *v3.Result {
+	for _, series := range result.Series {
+		for idx, point := range series.Points {
+			if point.Value < threshold {
+				point.Value = math.NaN()
+			}
+			series.Points[idx] = point
+		}
+	}
+	return result
+}
+
+// funcCutOffMax cuts off values above the threshold and replaces them with NaN
+func funcCutOffMax(result *v3.Result, threshold float64) *v3.Result {
+	for _, series := range result.Series {
+		for idx, point := range series.Points {
+			if point.Value > threshold {
+				point.Value = math.NaN()
+			}
+			series.Points[idx] = point
+		}
+	}
+	return result
+}
+
+// funcClampMin cuts off values below the threshold and replaces them with the threshold
+func funcClampMin(result *v3.Result, threshold float64) *v3.Result {
+	for _, series := range result.Series {
+		for idx, point := range series.Points {
+			if point.Value < threshold {
+				point.Value = threshold
+			}
+			series.Points[idx] = point
+		}
+	}
+	return result
+}
+
+// funcClampMax cuts off values above the threshold and replaces them with the threshold
+func funcClampMax(result *v3.Result, threshold float64) *v3.Result {
+	for _, series := range result.Series {
+		for idx, point := range series.Points {
+			if point.Value > threshold {
+				point.Value = threshold
+			}
+			series.Points[idx] = point
+		}
+	}
+	return result
+}
+
+// funcAbsolute returns the absolute value of each point
+func funcAbsolute(result *v3.Result) *v3.Result {
+	for _, series := range result.Series {
+		for idx, point := range series.Points {
+			point.Value = math.Abs(point.Value)
+			series.Points[idx] = point
+		}
+	}
+	return result
+}
+
+// funcLog2 returns the log2 of each point
+func funcLog2(result *v3.Result) *v3.Result {
+	for _, series := range result.Series {
+		for idx, point := range series.Points {
+			point.Value = math.Log2(point.Value)
+			series.Points[idx] = point
+		}
+	}
+	return result
+}
+
+// funcLog10 returns the log10 of each point
+func funcLog10(result *v3.Result) *v3.Result {
+	for _, series := range result.Series {
+		for idx, point := range series.Points {
+			point.Value = math.Log10(point.Value)
+			series.Points[idx] = point
+		}
+	}
+	return result
+}
+
+// funcCumSum returns the cumulative sum for each point in a series
+func funcCumSum(result *v3.Result) *v3.Result {
+	for _, series := range result.Series {
+		var sum float64
+		for idx, point := range series.Points {
+			if !math.IsNaN(point.Value) {
+				sum += point.Value
+			}
+			point.Value = sum
+			series.Points[idx] = point
+		}
+	}
+	return result
+}
+
+func funcEWMA(result *v3.Result, alpha float64) *v3.Result {
+	for _, series := range result.Series {
+		var ewma float64
+		var initialized bool
+
+		for i, point := range series.Points {
+			if !initialized {
+				if !math.IsNaN(point.Value) {
+					// Initialize EWMA with the first non-NaN value
+					ewma = point.Value
+					initialized = true
+				}
+				// Continue until the EWMA is initialized
+				continue
+			}
+
+			if !math.IsNaN(point.Value) {
+				// Update EWMA with the current value
+				ewma = alpha*point.Value + (1-alpha)*ewma
+			}
+			// Set the EWMA value for the current point
+			series.Points[i].Value = ewma
+		}
+	}
+	return result
+}
+
+// funcMedian3 returns the median of 3 points for each point in a series
+func funcMedian3(result *v3.Result) *v3.Result {
+	for _, series := range result.Series {
+		median3 := make([]float64, 0)
+		for i := 1; i < len(series.Points)-1; i++ {
+			values := make([]float64, 0, 3)
+
+			// Add non-NaN values to the slice
+			for j := -1; j <= 1; j++ {
+				if !math.IsNaN(series.Points[i+j].Value) {
+					values = append(values, series.Points[i+j].Value)
+				}
+			}
+
+			// Handle the case where there are not enough values to calculate a median
+			if len(values) == 0 {
+				median3 = append(median3, math.NaN())
+				continue
+			}
+
+			median3 = append(median3, median(values))
+		}
+
+		// Set the median3 values for the series
+		for i := 1; i < len(series.Points)-1; i++ {
+			series.Points[i].Value = median3[i-1]
+		}
+	}
+	return result
+}
+
+// funcMedian5 returns the median of 5 points for each point in a series
+func funcMedian5(result *v3.Result) *v3.Result {
+	for _, series := range result.Series {
+		median5 := make([]float64, 0)
+		for i := 2; i < len(series.Points)-2; i++ {
+			values := make([]float64, 0, 5)
+
+			// Add non-NaN values to the slice
+			for j := -2; j <= 2; j++ {
+				if !math.IsNaN(series.Points[i+j].Value) {
+					values = append(values, series.Points[i+j].Value)
+				}
+			}
+
+			// Handle the case where there are not enough values to calculate a median
+			if len(values) == 0 {
+				median5 = append(median5, math.NaN())
+				continue
+			}
+
+			median5 = append(median5, median(values))
+		}
+
+		// Set the median5 values for the series
+		for i := 2; i < len(series.Points)-2; i++ {
+			series.Points[i].Value = median5[i-2]
+		}
+	}
+	return result
+}
+
+// funcMedian7 returns the median of 7 points for each point in a series
+func funcMedian7(result *v3.Result) *v3.Result {
+	for _, series := range result.Series {
+		median7 := make([]float64, 0)
+		for i := 3; i < len(series.Points)-3; i++ {
+			values := make([]float64, 0, 7)
+
+			// Add non-NaN values to the slice
+			for j := -3; j <= 3; j++ {
+				if !math.IsNaN(series.Points[i+j].Value) {
+					values = append(values, series.Points[i+j].Value)
+				}
+			}
+
+			// Handle the case where there are not enough values to calculate a median
+			if len(values) == 0 {
+				median7 = append(median7, math.NaN())
+				continue
+			}
+
+			median7 = append(median7, median(values))
+		}
+
+		// Set the median7 values for the series
+		for i := 3; i < len(series.Points)-3; i++ {
+			series.Points[i].Value = median7[i-3]
+		}
+	}
+	return result
+}
+
+func median(values []float64) float64 {
+	sort.Float64s(values)
+	medianIndex := len(values) / 2
+	if len(values)%2 == 0 {
+		return (values[medianIndex-1] + values[medianIndex]) / 2
+	}
+	return values[medianIndex]
+}
+
+func ApplyFunction(fn v3.Function, result *v3.Result) *v3.Result {
+
+	switch fn.Name {
+	case v3.FunctionNameCutOffMin, v3.FunctionNameCutOffMax, v3.FunctionNameClampMin, v3.FunctionNameClampMax:
+		threshold, ok := fn.Args[0].(float64)
+		if !ok {
+			return result
+		}
+		switch fn.Name {
+		case v3.FunctionNameCutOffMin:
+			return funcCutOffMin(result, threshold)
+		case v3.FunctionNameCutOffMax:
+			return funcCutOffMax(result, threshold)
+		case v3.FunctionNameClampMin:
+			return funcClampMin(result, threshold)
+		case v3.FunctionNameClampMax:
+			return funcClampMax(result, threshold)
+		}
+	case v3.FunctionNameAbsolute:
+		return funcAbsolute(result)
+	case v3.FunctionNameLog2:
+		return funcLog2(result)
+	case v3.FunctionNameLog10:
+		return funcLog10(result)
+	case v3.FunctionNameCumSum:
+		return funcCumSum(result)
+	case v3.FunctionNameEWMA3, v3.FunctionNameEWMA5, v3.FunctionNameEWMA7:
+		alpha, ok := fn.Args[0].(float64)
+		if !ok {
+			// alpha = 2 / (n + 1) where n is the window size
+			if fn.Name == v3.FunctionNameEWMA3 {
+				alpha = 0.5 // 2 / (3 + 1)
+			} else if fn.Name == v3.FunctionNameEWMA5 {
+				alpha = 1 / float64(3) // 2 / (5 + 1)
+			} else if fn.Name == v3.FunctionNameEWMA7 {
+				alpha = 0.25 // 2 / (7 + 1)
+			}
+		}
+		return funcEWMA(result, alpha)
+	case v3.FunctionNameMedian3:
+		return funcMedian3(result)
+	case v3.FunctionNameMedian5:
+		return funcMedian5(result)
+	case v3.FunctionNameMedian7:
+		return funcMedian7(result)
+	}
+	return result
+}

pkg/query-service/app/queryBuilder/functions_test.go

@@ -0,0 +1,604 @@
+package queryBuilder
+
+import (
+	"math"
+	"testing"
+
+	v3 "go.signoz.io/signoz/pkg/query-service/model/v3"
+)
+
+func TestFuncCutOffMin(t *testing.T) {
+	type args struct {
+		result    *v3.Result
+		threshold float64
+	}
+	tests := []struct {
+		name string
+		args args
+		want *v3.Result
+	}{
+		{
+			name: "test funcCutOffMin",
+			args: args{
+				result: &v3.Result{
+					Series: []*v3.Series{
+						{
+							Points: []v3.Point{
+								{
+									Value: 0.5,
+								},
+								{
+									Value: 0.4,
+								},
+								{
+									Value: 0.3,
+								},
+								{
+									Value: 0.2,
+								},
+								{
+									Value: 0.1,
+								},
+							},
+						},
+					},
+				},
+				threshold: 0.3,
+			},
+			want: &v3.Result{
+				Series: []*v3.Series{
+					{
+						Points: []v3.Point{
+							{
+								Value: 0.5,
+							},
+							{
+								Value: 0.4,
+							},
+							{
+								Value: 0.3,
+							},
+							{
+								Value: math.NaN(),
+							},
+							{
+								Value: math.NaN(),
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "test funcCutOffMin with threshold 0",
+			args: args{
+				result: &v3.Result{
+					Series: []*v3.Series{
+						{
+							Points: []v3.Point{
+								{
+									Value: 0.5,
+								},
+								{
+									Value: 0.4,
+								},
+								{
+									Value: 0.3,
+								},
+								{
+									Value: 0.2,
+								},
+								{
+									Value: 0.1,
+								},
+							},
+						},
+					},
+				},
+				threshold: 0,
+			},
+			want: &v3.Result{
+				Series: []*v3.Series{
+					{
+						Points: []v3.Point{
+							{
+								Value: 0.5,
+							},
+							{
+								Value: 0.4,
+							},
+							{
+								Value: 0.3,
+							},
+							{
+								Value: 0.2,
+							},
+							{
+								Value: 0.1,
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		newResult := funcCutOffMin(tt.args.result, tt.args.threshold)
+		for j, series := range newResult.Series {
+			for k, point := range series.Points {
+
+				if math.IsNaN(tt.want.Series[j].Points[k].Value) {
+					if !math.IsNaN(point.Value) {
+						t.Errorf("funcCutOffMin() = %v, want %v", point.Value, tt.want.Series[j].Points[k].Value)
+					}
+					continue
+				}
+
+				if point.Value != tt.want.Series[j].Points[k].Value {
+					t.Errorf("funcCutOffMin() = %v, want %v", point.Value, tt.want.Series[j].Points[k].Value)
+				}
+			}
+		}
+	}
+}
+
+func TestFuncCutOffMax(t *testing.T) {
+	type args struct {
+		result    *v3.Result
+		threshold float64
+	}
+	tests := []struct {
+		name string
+		args args
+		want *v3.Result
+	}{
+		{
+			name: "test funcCutOffMax",
+			args: args{
+				result: &v3.Result{
+					Series: []*v3.Series{
+						{
+							Points: []v3.Point{
+								{
+									Value: 0.5,
+								},
+								{
+									Value: 0.4,
+								},
+								{
+									Value: 0.3,
+								},
+								{
+									Value: 0.2,
+								},
+								{
+									Value: 0.1,
+								},
+							},
+						},
+					},
+				},
+				threshold: 0.3,
+			},
+			want: &v3.Result{
+				Series: []*v3.Series{
+					{
+						Points: []v3.Point{
+							{
+								Value: math.NaN(),
+							},
+							{
+								Value: math.NaN(),
+							},
+							{
+								Value: 0.3,
+							},
+							{
+								Value: 0.2,
+							},
+							{
+								Value: 0.1,
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "test funcCutOffMax with threshold 0",
+			args: args{
+				result: &v3.Result{
+					Series: []*v3.Series{
+						{
+							Points: []v3.Point{
+								{
+									Value: 0.5,
+								},
+								{
+									Value: 0.4,
+								},
+								{
+									Value: 0.3,
+								},
+								{
+									Value: 0.2,
+								},
+								{
+									Value: 0.1,
+								},
+							},
+						},
+					},
+				},
+				threshold: 0,
+			},
+			want: &v3.Result{
+				Series: []*v3.Series{
+					{
+						Points: []v3.Point{
+							{
+								Value: math.NaN(),
+							},
+							{
+								Value: math.NaN(),
+							},
+							{
+								Value: math.NaN(),
+							},
+							{
+								Value: math.NaN(),
+							},
+							{
+								Value: math.NaN(),
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		newResult := funcCutOffMax(tt.args.result, tt.args.threshold)
+		for j, series := range newResult.Series {
+			for k, point := range series.Points {
+
+				if math.IsNaN(tt.want.Series[j].Points[k].Value) {
+					if !math.IsNaN(point.Value) {
+						t.Errorf("funcCutOffMax() = %v, want %v", point.Value, tt.want.Series[j].Points[k].Value)
+					}
+					continue
+				}
+
+				if point.Value != tt.want.Series[j].Points[k].Value {
+					t.Errorf("funcCutOffMax() = %v, want %v", point.Value, tt.want.Series[j].Points[k].Value)
+				}
+			}
+		}
+	}
+}
+
+func TestCutOffMinCumSum(t *testing.T) {
+	type args struct {
+		result    *v3.Result
+		threshold float64
+	}
+	tests := []struct {
+		name string
+		args args
+		want *v3.Result
+	}{
+		{
+			name: "test funcCutOffMin followed by funcCumulativeSum",
+			args: args{
+				result: &v3.Result{
+					Series: []*v3.Series{
+						{
+							Points: []v3.Point{
+								{
+									Value: 0.5,
+								},
+								{
+									Value: 0.2,
+								},
+								{
+									Value: 0.1,
+								},
+								{
+									Value: 0.4,
+								},
+								{
+									Value: 0.3,
+								},
+							},
+						},
+					},
+				},
+				threshold: 0.3,
+			},
+			want: &v3.Result{
+				Series: []*v3.Series{
+					{
+						Points: []v3.Point{
+							{
+								Value: 0.5,
+							},
+							{
+								Value: 0.5,
+							},
+							{
+								Value: 0.5,
+							},
+							{
+								Value: 0.9,
+							},
+							{
+								Value: 1.2,
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		newResult := funcCutOffMin(tt.args.result, tt.args.threshold)
+		newResult = funcCumSum(newResult)
+		for j, series := range newResult.Series {
+			for k, point := range series.Points {
+
+				if math.IsNaN(tt.want.Series[j].Points[k].Value) {
+					if !math.IsNaN(point.Value) {
+						t.Errorf("funcCutOffMin() = %v, want %v", point.Value, tt.want.Series[j].Points[k].Value)
+					}
+					continue
+				}
+
+				if point.Value != tt.want.Series[j].Points[k].Value {
+					t.Errorf("funcCutOffMin() = %v, want %v", point.Value, tt.want.Series[j].Points[k].Value)
+				}
+			}
+		}
+	}
+}
+
+func TestFuncMedian3(t *testing.T) {
+	type args struct {
+		result *v3.Result
+	}
+
+	tests := []struct {
+		name string
+		args args
+		want *v3.Result
+	}{
+		{
+			name: "Values",
+			args: args{
+				result: &v3.Result{
+					Series: []*v3.Series{
+						{
+							Points: []v3.Point{{Timestamp: 1, Value: 5}, {Timestamp: 2, Value: 3}, {Timestamp: 3, Value: 8}, {Timestamp: 4, Value: 2}, {Timestamp: 5, Value: 7}},
+						},
+					},
+				},
+			},
+			want: &v3.Result{
+				Series: []*v3.Series{
+					{
+						Points: []v3.Point{{Timestamp: 1, Value: 5}, {Timestamp: 2, Value: 5}, {Timestamp: 3, Value: 3}, {Timestamp: 4, Value: 7}, {Timestamp: 5, Value: 7}},
+					},
+				},
+			},
+		},
+		{
+			name: "NaNHandling",
+			args: args{
+				result: &v3.Result{
+					Series: []*v3.Series{
+						{
+							Points: []v3.Point{{Timestamp: 1, Value: math.NaN()}, {Timestamp: 2, Value: 3}, {Timestamp: 3, Value: math.NaN()}, {Timestamp: 4, Value: 7}, {Timestamp: 5, Value: 9}},
+						},
+					},
+				},
+			},
+			want: &v3.Result{
+				Series: []*v3.Series{
+					{
+						Points: []v3.Point{{Timestamp: 1, Value: math.NaN()}, {Timestamp: 2, Value: 3}, {Timestamp: 3, Value: 5}, {Timestamp: 4, Value: 8}, {Timestamp: 5, Value: 9}},
+					},
+				},
+			},
+		},
+		{
+			name: "UniformValues",
+			args: args{
+				result: &v3.Result{
+					Series: []*v3.Series{
+						{
+							Points: []v3.Point{{Timestamp: 1, Value: 7}, {Timestamp: 2, Value: 7}, {Timestamp: 3, Value: 7}, {Timestamp: 4, Value: 7}, {Timestamp: 5, Value: 7}},
+						},
+					},
+				},
+			},
+			want: &v3.Result{
+				Series: []*v3.Series{
+					{
+						Points: []v3.Point{{Timestamp: 1, Value: 7}, {Timestamp: 2, Value: 7}, {Timestamp: 3, Value: 7}, {Timestamp: 4, Value: 7}, {Timestamp: 5, Value: 7}},
+					},
+				},
+			},
+		},
+		{
+			name: "SingleValueSeries",
+			args: args{
+				result: &v3.Result{
+					Series: []*v3.Series{
+						{
+							Points: []v3.Point{{Timestamp: 1, Value: 9}},
+						},
+					},
+				},
+			},
+			want: &v3.Result{
+				Series: []*v3.Series{
+					{
+						Points: []v3.Point{{Timestamp: 1, Value: 9}},
+					},
+				},
+			},
+		},
+		{
+			name: "EmptySeries",
+			args: args{
+				result: &v3.Result{
+					Series: []*v3.Series{
+						{
+							Points: []v3.Point{},
+						},
+					},
+				},
+			},
+			want: &v3.Result{
+				Series: []*v3.Series{
+					{
+						Points: []v3.Point{},
+					},
+				},
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := funcMedian3(tt.args.result)
+			for j, series := range got.Series {
+				for k, point := range series.Points {
+					if point.Value != tt.want.Series[j].Points[k].Value && !math.IsNaN(tt.want.Series[j].Points[k].Value) {
+						t.Errorf("funcMedian3() = %v, want %v", point.Value, tt.want.Series[j].Points[k].Value)
+					}
+				}
+			}
+		})
+	}
+}
+
+func TestFuncMedian5(t *testing.T) {
+	type args struct {
+		result *v3.Result
+	}
+
+	tests := []struct {
+		name string
+		args args
+		want *v3.Result
+	}{
+		{
+			name: "Values",
+			args: args{
+				result: &v3.Result{
+					Series: []*v3.Series{
+						{
+							Points: []v3.Point{{Timestamp: 1, Value: 5}, {Timestamp: 2, Value: 3}, {Timestamp: 3, Value: 8}, {Timestamp: 4, Value: 2}, {Timestamp: 5, Value: 7}, {Timestamp: 6, Value: 9}, {Timestamp: 7, Value: 1}, {Timestamp: 8, Value: 4}, {Timestamp: 9, Value: 6}, {Timestamp: 10, Value: 10}},
+						},
+					},
+				},
+			},
+			want: &v3.Result{
+				Series: []*v3.Series{
+					{
+						Points: []v3.Point{{Timestamp: 1, Value: 5}, {Timestamp: 2, Value: 3}, {Timestamp: 3, Value: 5}, {Timestamp: 4, Value: 7}, {Timestamp: 5, Value: 7}, {Timestamp: 6, Value: 4}, {Timestamp: 7, Value: 6}, {Timestamp: 8, Value: 6}, {Timestamp: 9, Value: 6}, {Timestamp: 10, Value: 10}},
+					},
+				},
+			},
+		},
+		{
+			name: "NaNHandling",
+			args: args{
+				result: &v3.Result{
+					Series: []*v3.Series{
+						{
+							Points: []v3.Point{{Timestamp: 1, Value: math.NaN()}, {Timestamp: 2, Value: 3}, {Timestamp: 3, Value: math.NaN()}, {Timestamp: 4, Value: 7}, {Timestamp: 5, Value: 9}, {Timestamp: 6, Value: 1}, {Timestamp: 7, Value: 4}, {Timestamp: 8, Value: 6}, {Timestamp: 9, Value: 10}, {Timestamp: 10, Value: 2}},
+						},
+					},
+				},
+			},
+			want: &v3.Result{
+				Series: []*v3.Series{
+					{
+						Points: []v3.Point{{Timestamp: 1, Value: math.NaN()}, {Timestamp: 2, Value: 3}, {Timestamp: 3, Value: 7}, {Timestamp: 4, Value: 5}, {Timestamp: 5, Value: 5.5}, {Timestamp: 6, Value: 6}, {Timestamp: 7, Value: 6}, {Timestamp: 8, Value: 4}, {Timestamp: 9, Value: 10}, {Timestamp: 10, Value: 2}},
+					},
+				},
+			},
+		},
+		{
+			name: "UniformValues",
+			args: args{
+				result: &v3.Result{
+					Series: []*v3.Series{
+						{
+							Points: []v3.Point{{Timestamp: 1, Value: 7}, {Timestamp: 2, Value: 7}, {Timestamp: 3, Value: 7}, {Timestamp: 4, Value: 7}, {Timestamp: 5, Value: 7}},
+						},
+					},
+				},
+			},
+			want: &v3.Result{
+				Series: []*v3.Series{
+					{
+						Points: []v3.Point{{Timestamp: 1, Value: 7}, {Timestamp: 2, Value: 7}, {Timestamp: 3, Value: 7}, {Timestamp: 4, Value: 7}, {Timestamp: 5, Value: 7}},
+					},
+				},
+			},
+		},
+		{
+			name: "SingleValueSeries",
+			args: args{
+				result: &v3.Result{
+					Series: []*v3.Series{
+						{
+							Points: []v3.Point{{Timestamp: 1, Value: 9}},
+						},
+					},
+				},
+			},
+			want: &v3.Result{
+				Series: []*v3.Series{
+					{
+						Points: []v3.Point{{Timestamp: 1, Value: 9}},
+					},
+				},
+			},
+		},
+		{
+			name: "EmptySeries",
+			args: args{
+				result: &v3.Result{
+					Series: []*v3.Series{
+						{
+							Points: []v3.Point{},
+						},
+					},
+				},
+			},
+			want: &v3.Result{
+				Series: []*v3.Series{
+					{
+						Points: []v3.Point{},
+					},
+				},
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		got := funcMedian5(tt.args.result)
+		for j, series := range got.Series {
+			for k, point := range series.Points {
+				if point.Value != tt.want.Series[j].Points[k].Value && !math.IsNaN(tt.want.Series[j].Points[k].Value) {
+					t.Errorf("funcMedian5() = %v, want %v", point.Value, tt.want.Series[j].Points[k].Value)
+				}
+			}
+		}
+	}
+}

pkg/query-service/app/reduce_to.go

@@ -0,0 +1,71 @@
+package app
+
+import (
+	v3 "go.signoz.io/signoz/pkg/query-service/model/v3"
+)
+
+// applyReduceTo applies the reduceTo operator to each series
+// and returns a new series with the reduced value
+// reduceTo can be one of the following:
+// - last
+// - sum
+// - avg
+// - min
+// - max
+func applyReduceTo(result []*v3.Result, queryRangeParams *v3.QueryRangeParamsV3) {
+	for _, result := range result {
+		builderQueries := queryRangeParams.CompositeQuery.BuilderQueries
+
+		// reduceTo is only applicable for metrics data source
+		// and for table and value panels
+		if builderQueries[result.QueryName] != nil && (builderQueries[result.QueryName].DataSource == v3.DataSourceMetrics &&
+			(queryRangeParams.CompositeQuery.PanelType == v3.PanelTypeTable || queryRangeParams.CompositeQuery.PanelType == v3.PanelTypeValue)) {
+			reduceTo := builderQueries[result.QueryName].ReduceTo
+
+			switch reduceTo {
+			case v3.ReduceToOperatorLast:
+				for i := 0; i < len(result.Series); i++ {
+					if len(result.Series[i].Points) > 0 {
+						result.Series[i].Points = []v3.Point{result.Series[i].Points[len(result.Series[i].Points)-1]}
+					}
+				}
+			case v3.ReduceToOperatorSum:
+				for i := 0; i < len(result.Series); i++ {
+					var sum float64
+					for j := 0; j < len(result.Series[i].Points); j++ {
+						sum += result.Series[i].Points[j].Value
+					}
+					result.Series[i].Points = []v3.Point{{Value: sum}}
+				}
+			case v3.ReduceToOperatorAvg:
+				for i := 0; i < len(result.Series); i++ {
+					var sum float64
+					for j := 0; j < len(result.Series[i].Points); j++ {
+						sum += result.Series[i].Points[j].Value
+					}
+					result.Series[i].Points = []v3.Point{{Value: sum / float64(len(result.Series[i].Points))}}
+				}
+			case v3.ReduceToOperatorMin:
+				for i := 0; i < len(result.Series); i++ {
+					var min float64
+					for j := 0; j < len(result.Series[i].Points); j++ {
+						if j == 0 || result.Series[i].Points[j].Value < min {
+							min = result.Series[i].Points[j].Value
+						}
+					}
+					result.Series[i].Points = []v3.Point{{Value: min}}
+				}
+			case v3.ReduceToOperatorMax:
+				for i := 0; i < len(result.Series); i++ {
+					var max float64
+					for j := 0; j < len(result.Series[i].Points); j++ {
+						if j == 0 || result.Series[i].Points[j].Value > max {
+							max = result.Series[i].Points[j].Value
+						}
+					}
+					result.Series[i].Points = []v3.Point{{Value: max}}
+				}
+			}
+		}
+	}
+}

pkg/query-service/app/reduce_to_test.go

@@ -0,0 +1,99 @@
+package app
+
+import (
+	"testing"
+
+	v3 "go.signoz.io/signoz/pkg/query-service/model/v3"
+)
+
+func TestApplyReduceTo(t *testing.T) {
+	type testCase struct {
+		name    string
+		results []*v3.Result
+		params  *v3.QueryRangeParamsV3
+		want    []*v3.Result
+	}
+
+	testCases := []testCase{
+		{
+			name: "test reduce to",
+			results: []*v3.Result{
+				{
+					QueryName: "A",
+					Series: []*v3.Series{
+						{
+							Points: []v3.Point{
+								{
+									Value: 0.5,
+								},
+								{
+									Value: 0.4,
+								},
+								{
+									Value: 0.3,
+								},
+								{
+									Value: 0.2,
+								},
+								{
+									Value: 0.1,
+								},
+							},
+						},
+					},
+				},
+			},
+			params: &v3.QueryRangeParamsV3{
+				CompositeQuery: &v3.CompositeQuery{
+					PanelType: v3.PanelTypeValue,
+					BuilderQueries: map[string]*v3.BuilderQuery{
+						"A": {
+							DataSource: v3.DataSourceMetrics,
+							ReduceTo:   v3.ReduceToOperatorSum,
+						},
+					},
+				},
+			},
+			want: []*v3.Result{
+				{
+					QueryName: "A",
+					Series: []*v3.Series{
+						{
+							Points: []v3.Point{
+								{
+									Value: 1.5,
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+
+			applyReduceTo(tc.results, tc.params)
+			got := tc.results
+
+			for _, gotResult := range got {
+				for _, wantResult := range tc.want {
+					if gotResult.QueryName == wantResult.QueryName {
+						if len(gotResult.Series) != len(wantResult.Series) {
+							t.Errorf("got %v, want %v", gotResult.Series, wantResult.Series)
+						} else {
+							for i, gotSeries := range gotResult.Series {
+								for j, gotPoint := range gotSeries.Points {
+									if gotPoint.Value != wantResult.Series[i].Points[j].Value {
+										t.Errorf("got %v, want %v", gotPoint.Value, wantResult.Series[i].Points[j].Value)
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		})
+	}
+}

pkg/query-service/model/v3/v3.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"sort"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/google/uuid"
@@ -474,18 +475,94 @@ func (t TimeAggregation) IsRateOperator() bool {
 type SpaceAggregation string
 
 const (
-	SpaceAggregationUnspecified SpaceAggregation = ""
-	SpaceAggregationSum         SpaceAggregation = "sum"
-	SpaceAggregationAvg         SpaceAggregation = "avg"
-	SpaceAggregationMin         SpaceAggregation = "min"
-	SpaceAggregationMax         SpaceAggregation = "max"
-	SpaceAggregationCount       SpaceAggregation = "count"
+	SpaceAggregationUnspecified  SpaceAggregation = ""
+	SpaceAggregationSum          SpaceAggregation = "sum"
+	SpaceAggregationAvg          SpaceAggregation = "avg"
+	SpaceAggregationMin          SpaceAggregation = "min"
+	SpaceAggregationMax          SpaceAggregation = "max"
+	SpaceAggregationCount        SpaceAggregation = "count"
+	SpaceAggregationPercentile50 SpaceAggregation = "percentile_50"
+	SpaceAggregationPercentile75 SpaceAggregation = "percentile_75"
+	SpaceAggregationPercentile90 SpaceAggregation = "percentile_90"
+	SpaceAggregationPercentile95 SpaceAggregation = "percentile_95"
+	SpaceAggregationPercentile99 SpaceAggregation = "percentile_99"
 )
 
+func IsPercentileOperator(operator SpaceAggregation) bool {
+	switch operator {
+	case SpaceAggregationPercentile50,
+		SpaceAggregationPercentile75,
+		SpaceAggregationPercentile90,
+		SpaceAggregationPercentile95,
+		SpaceAggregationPercentile99:
+		return true
+	default:
+		return false
+	}
+}
+
+func GetPercentileFromOperator(operator SpaceAggregation) float64 {
+	// This could be done with a map, but it's just easier to read this way
+	switch operator {
+	case SpaceAggregationPercentile50:
+		return 0.5
+	case SpaceAggregationPercentile75:
+		return 0.75
+	case SpaceAggregationPercentile90:
+		return 0.9
+	case SpaceAggregationPercentile95:
+		return 0.95
+	case SpaceAggregationPercentile99:
+		return 0.99
+	default:
+		return 0
+	}
+}
+
+type FunctionName string
+
+const (
+	FunctionNameCutOffMin FunctionName = "cutOffMin"
+	FunctionNameCutOffMax FunctionName = "cutOffMax"
+	FunctionNameClampMin  FunctionName = "clampMin"
+	FunctionNameClampMax  FunctionName = "clampMax"
+	FunctionNameAbsolute  FunctionName = "absolute"
+	FunctionNameLog2      FunctionName = "log2"
+	FunctionNameLog10     FunctionName = "log10"
+	FunctionNameCumSum    FunctionName = "cumSum"
+	FunctionNameEWMA3     FunctionName = "ewma3"
+	FunctionNameEWMA5     FunctionName = "ewma5"
+	FunctionNameEWMA7     FunctionName = "ewma7"
+	FunctionNameMedian3   FunctionName = "median3"
+	FunctionNameMedian5   FunctionName = "median5"
+	FunctionNameMedian7   FunctionName = "median7"
+)
+
+func (f FunctionName) Validate() error {
+	switch f {
+	case FunctionNameCutOffMin,
+		FunctionNameCutOffMax,
+		FunctionNameClampMin,
+		FunctionNameClampMax,
+		FunctionNameAbsolute,
+		FunctionNameLog2,
+		FunctionNameLog10,
+		FunctionNameCumSum,
+		FunctionNameEWMA3,
+		FunctionNameEWMA5,
+		FunctionNameEWMA7,
+		FunctionNameMedian3,
+		FunctionNameMedian5,
+		FunctionNameMedian7:
+		return nil
+	default:
+		return fmt.Errorf("invalid function name: %s", f)
+	}
+}
+
 type Function struct {
-	Category string        `json:"category"`
-	Name     string        `json:"name"`
-	Args     []interface{} `json:"args,omitempty"`
+	Name FunctionName  `json:"name"`
+	Args []interface{} `json:"args,omitempty"`
 }
 
 type BuilderQuery struct {
@@ -509,7 +586,6 @@ type BuilderQuery struct {
 	SelectColumns      []AttributeKey    `json:"selectColumns,omitempty"`
 	TimeAggregation    TimeAggregation   `json:"timeAggregation,omitempty"`
 	SpaceAggregation   SpaceAggregation  `json:"spaceAggregation,omitempty"`
-	Quantile           float64           `json:"quantile,omitempty"`
 	Functions          []Function        `json:"functions,omitempty"`
 }
 
@@ -528,7 +604,7 @@ func (b *BuilderQuery) Validate() error {
 			return fmt.Errorf("data source is invalid: %w", err)
 		}
 		if b.DataSource == DataSourceMetrics {
-			if b.TimeAggregation == TimeAggregationUnspecified && b.Quantile == 0 {
+			if b.TimeAggregation == TimeAggregationUnspecified {
 				if err := b.AggregateOperator.Validate(); err != nil {
 					return fmt.Errorf("aggregate operator is invalid: %w", err)
 				}
@@ -562,6 +638,14 @@ func (b *BuilderQuery) Validate() error {
 		}
 	}
 
+	if b.Having != nil {
+		for _, having := range b.Having {
+			if err := having.Operator.Validate(); err != nil {
+				return fmt.Errorf("having operator is invalid: %w", err)
+			}
+		}
+	}
+
 	for _, selectColumn := range b.SelectColumns {
 		if err := selectColumn.Validate(); err != nil {
 			return fmt.Errorf("select column is invalid %w", err)
@@ -571,6 +655,15 @@ func (b *BuilderQuery) Validate() error {
 	if b.Expression == "" {
 		return fmt.Errorf("expression is required")
 	}
+
+	if len(b.Functions) > 0 {
+		for _, function := range b.Functions {
+			if err := function.Name.Validate(); err != nil {
+				return fmt.Errorf("function name is invalid: %w", err)
+			}
+		}
+	}
+
 	return nil
 }
 
@@ -655,10 +748,43 @@ type OrderBy struct {
 	IsColumn   bool                 `json:"-"`
 }
 
+// See HAVING_OPERATORS in queryBuilder.ts
+
+type HavingOperator string
+
+const (
+	HavingOperatorEqual           HavingOperator = "="
+	HavingOperatorNotEqual        HavingOperator = "!="
+	HavingOperatorGreaterThan     HavingOperator = ">"
+	HavingOperatorGreaterThanOrEq HavingOperator = ">="
+	HavingOperatorLessThan        HavingOperator = "<"
+	HavingOperatorLessThanOrEq    HavingOperator = "<="
+	HavingOperatorIn              HavingOperator = "IN"
+	HavingOperatorNotIn           HavingOperator = "NOT_IN"
+)
+
+func (h HavingOperator) Validate() error {
+	switch h {
+	case HavingOperatorEqual,
+		HavingOperatorNotEqual,
+		HavingOperatorGreaterThan,
+		HavingOperatorGreaterThanOrEq,
+		HavingOperatorLessThan,
+		HavingOperatorLessThanOrEq,
+		HavingOperatorIn,
+		HavingOperatorNotIn,
+		HavingOperator(strings.ToLower(string(HavingOperatorIn))),
+		HavingOperator(strings.ToLower(string(HavingOperatorNotIn))):
+		return nil
+	default:
+		return fmt.Errorf("invalid having operator: %s", h)
+	}
+}
+
 type Having struct {
-	ColumnName string      `json:"columnName"`
-	Operator   string      `json:"op"`
-	Value      interface{} `json:"value"`
+	ColumnName string         `json:"columnName"`
+	Operator   HavingOperator `json:"op"`
+	Value      interface{}    `json:"value"`
 }
 
 func (h *Having) CacheKey() string {

pkg/query-service/tests/test-deploy/docker-compose.yaml

@@ -192,7 +192,7 @@ services:
     <<: *db-depend
 
   otel-collector-migrator:
-    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.88.9}
+    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.88.11}
     container_name: otel-migrator
     command:
       - "--dsn=tcp://clickhouse:9000"
@@ -205,7 +205,7 @@ services:
       #   condition: service_healthy
 
   otel-collector:
-    image: signoz/signoz-otel-collector:0.88.9
+    image: signoz/signoz-otel-collector:0.88.11
     container_name: signoz-otel-collector
     command:
       [