Merge remote-tracking branch 'origin/main' into issue_4071

docs/api/openapi.yml

@@ -6167,10 +6167,6 @@ paths:
         name: searchText
         schema:
           type: string
-      - in: query
-        name: source
-        schema:
-          type: string
       responses:
         "200":
           content:

frontend/src/api/ErrorResponseHandlerForGeneratedAPIs.ts

@@ -2,7 +2,7 @@ import { RenderErrorResponseDTO } from 'api/generated/services/sigNoz.schemas';
 import { AxiosError } from 'axios';
 import APIError from 'types/api/error';
 
-// @deprecated Use convertToApiError instead
+// Handles errors from generated API hooks (which use RenderErrorResponseDTO)
 export function ErrorResponseHandlerForGeneratedAPIs(
 	error: AxiosError<RenderErrorResponseDTO>,
 ): never {
@@ -46,34 +46,3 @@ export function ErrorResponseHandlerForGeneratedAPIs(
 		},
 	});
 }
-
-// convertToApiError converts an AxiosError from generated API
-// hooks into an APIError.
-export function convertToApiError(
-	error: AxiosError<RenderErrorResponseDTO> | null,
-): APIError | undefined {
-	if (!error) {
-		return undefined;
-	}
-
-	const response = error.response;
-	const errorData = response?.data?.error;
-
-	return new APIError({
-		httpStatusCode: response?.status || error.status || 500,
-		error: {
-			code:
-				errorData?.code ||
-				String(response?.status || error.code || 'unknown_error'),
-			message:
-				errorData?.message ||
-				response?.statusText ||
-				error.message ||
-				'Something went wrong',
-			url: errorData?.url ?? '',
-			errors: (errorData?.errors ?? []).map((e) => ({
-				message: e.message ?? '',
-			})),
-		},
-	});
-}

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

@@ -3451,11 +3451,6 @@ export type ListMetricsParams = {
 	 * @description undefined
 	 */
 	searchText?: string;
-	/**
-	 * @type string
-	 * @description undefined
-	 */
-	source?: string;
 };
 
 export type ListMetrics200 = {

frontend/src/api/metricsExplorer/getMetricsTreeMap.ts

@@ -0,0 +1,54 @@
+import axios from 'api';
+import { ErrorResponseHandler } from 'api/ErrorResponseHandler';
+import { AxiosError } from 'axios';
+import { TreemapViewType } from 'container/MetricsExplorer/Summary/types';
+import { ErrorResponse, SuccessResponse } from 'types/api';
+import { TagFilter } from 'types/api/queryBuilder/queryBuilderData';
+
+export interface MetricsTreeMapPayload {
+	filters: TagFilter;
+	limit?: number;
+	treemap?: TreemapViewType;
+}
+
+export interface MetricsTreeMapResponse {
+	status: string;
+	data: {
+		[TreemapViewType.TIMESERIES]: TimeseriesData[];
+		[TreemapViewType.SAMPLES]: SamplesData[];
+	};
+}
+
+export interface TimeseriesData {
+	percentage: number;
+	total_value: number;
+	metric_name: string;
+}
+
+export interface SamplesData {
+	percentage: number;
+	metric_name: string;
+}
+
+export const getMetricsTreeMap = async (
+	props: MetricsTreeMapPayload,
+	signal?: AbortSignal,
+	headers?: Record<string, string>,
+): Promise<SuccessResponse<MetricsTreeMapResponse> | ErrorResponse> => {
+	try {
+		const response = await axios.post('/metrics/treemap', props, {
+			signal,
+			headers,
+		});
+
+		return {
+			statusCode: 200,
+			error: null,
+			message: response.data.status,
+			payload: response.data,
+			params: props,
+		};
+	} catch (error) {
+		return ErrorResponseHandler(error as AxiosError);
+	}
+};

frontend/src/api/metricsExplorer/updateMetricMetadata.ts

@@ -0,0 +1,36 @@
+import axios from 'api';
+import { ErrorResponse, SuccessResponse } from 'types/api';
+
+import { Temporality } from './getMetricDetails';
+import { MetricType } from './getMetricsList';
+
+export interface UpdateMetricMetadataProps {
+	description: string;
+	metricType: MetricType;
+	temporality?: Temporality;
+	isMonotonic?: boolean;
+	unit?: string;
+}
+
+export interface UpdateMetricMetadataResponse {
+	success: boolean;
+	message: string;
+}
+
+const updateMetricMetadata = async (
+	metricName: string,
+	props: UpdateMetricMetadataProps,
+): Promise<SuccessResponse<UpdateMetricMetadataResponse> | ErrorResponse> => {
+	const response = await axios.post(`/metrics/${metricName}/metadata`, {
+		...props,
+	});
+
+	return {
+		statusCode: 200,
+		error: null,
+		message: response.data.status,
+		payload: response.data.data,
+	};
+};
+
+export default updateMetricMetadata;

frontend/src/components/CustomTimePicker/CustomTimePicker.tsx

@@ -104,10 +104,6 @@ function CustomTimePicker({
 	const location = useLocation();
 
 	const inputRef = useRef<InputRef>(null);
-	const initialInputValueOnOpenRef = useRef<string>('');
-	const hasChangedSinceOpenRef = useRef<boolean>(false);
-	// Tracks if the last pointer down was on the input so we don't close the popover when user clicks the input again
-	const isClickFromInputRef = useRef(false);
 
 	const [activeView, setActiveView] = useState<ViewType>(DEFAULT_VIEW);
 
@@ -242,21 +238,6 @@ function CustomTimePicker({
 	};
 
 	const handleOpenChange = (newOpen: boolean): void => {
-		// Don't close when the user clicked the input (trigger); Ant Design treats trigger as "outside" overlay
-		if (!newOpen && isClickFromInputRef.current) {
-			isClickFromInputRef.current = false;
-			return;
-		}
-		isClickFromInputRef.current = false;
-
-		// If the popover is trying to close and the value changed since opening,
-		// treat it as if the user pressed Enter (attempt to apply the value)
-		if (!newOpen && hasChangedSinceOpenRef.current) {
-			hasChangedSinceOpenRef.current = false;
-			handleInputPressEnter();
-			return;
-		}
-
 		setOpen(newOpen);
 
 		if (!newOpen) {
@@ -425,18 +406,10 @@ function CustomTimePicker({
 	const handleOpen = (e?: React.SyntheticEvent): void => {
 		e?.stopPropagation?.();
 
-		// If the popover is already open, avoid resetting the input value
-		// so that any in-progress edits are preserved.
-		if (open) {
-			return;
-		}
-
 		if (showLiveLogs) {
 			setOpen(true);
 			setSelectedTimePlaceholderValue('Live');
 			setInputValue('Live');
-			initialInputValueOnOpenRef.current = 'Live';
-			hasChangedSinceOpenRef.current = false;
 			return;
 		}
 
@@ -451,21 +424,11 @@ function CustomTimePicker({
 			.tz(timezone.value)
 			.format(DATE_TIME_FORMATS.UK_DATETIME_SECONDS);
 
-		const nextValue = `${startTime} - ${endTime}`;
-		setInputValue(nextValue);
-		initialInputValueOnOpenRef.current = nextValue;
-		hasChangedSinceOpenRef.current = false;
+		setInputValue(`${startTime} - ${endTime}`);
 	};
 
 	const handleClose = (e: React.MouseEvent): void => {
 		e.stopPropagation();
-		// If the value changed since opening, treat this like pressing Enter
-		if (hasChangedSinceOpenRef.current) {
-			hasChangedSinceOpenRef.current = false;
-			handleInputPressEnter();
-			return;
-		}
-
 		setOpen(false);
 		setCustomDTPickerVisible?.(false);
 
@@ -487,9 +450,6 @@ function CustomTimePicker({
 	}, [location.pathname]);
 
 	const handleInputBlur = (): void => {
-		// Track whether the value was changed since the input was opened for editing
-		hasChangedSinceOpenRef.current =
-			inputValue !== initialInputValueOnOpenRef.current;
 		resetErrorStatus();
 	};
 
@@ -592,12 +552,6 @@ function CustomTimePicker({
 						readOnly={!open || showLiveLogs}
 						placeholder={selectedTimePlaceholderValue}
 						value={inputValue}
-						onMouseDown={(e): void => {
-							// Only treat as "click from input" when the actual input element is clicked (not suffix/chevron)
-							if (e.target === inputRef.current?.input) {
-								isClickFromInputRef.current = true;
-							}
-						}}
 						onFocus={handleOpen}
 						onClick={handleOpen}
 						onChange={handleInputChange}

frontend/src/components/QueryBuilderV2/QueryBuilderV2.styles.scss

@@ -60,30 +60,11 @@
 			gap: 8px;
 
 			margin-left: 108px;
-			position: relative;
-
-			/* Vertical dashed line connecting query elements */
-			&::after {
-				content: '';
-				position: absolute;
-				left: -28px;
-				top: 0;
-				bottom: 0;
-				width: 1px;
-				background: repeating-linear-gradient(
-					to bottom,
-					#1d212d,
-					#1d212d 4px,
-					transparent 4px,
-					transparent 8px
-				);
-			}
 
 			.code-mirror-where-clause,
 			.query-aggregation-container,
 			.query-add-ons,
-			.metrics-aggregation-section-content,
-			.metrics-container {
+			.metrics-aggregation-section-content {
 				position: relative;
 
 				&::before {
@@ -121,10 +102,6 @@
 			.qb-elements-container {
 				margin-left: 0px;
 
-				&::after {
-					display: none;
-				}
-
 				.code-mirror-where-clause,
 				.query-aggregation-container,
 				.query-add-ons,
@@ -356,7 +333,28 @@
 				text-transform: uppercase;
 
 				&::before {
-					display: none;
+					content: '';
+					height: 120px;
+					content: '';
+					position: absolute;
+					left: 0;
+					top: 31px;
+					bottom: 0;
+					width: 1px;
+					background: repeating-linear-gradient(
+						to bottom,
+						#1d212d,
+						#1d212d 4px,
+						transparent 4px,
+						transparent 8px
+					);
+					left: 15px;
+				}
+
+				&.has-trace-operator {
+					&::before {
+						height: 0px;
+					}
 				}
 			}
 
@@ -464,21 +462,10 @@
 
 		.qb-content-section {
 			.qb-elements-container {
-				&::after {
-					background: repeating-linear-gradient(
-						to bottom,
-						var(--bg-vanilla-300),
-						var(--bg-vanilla-300) 4px,
-						transparent 4px,
-						transparent 8px
-					);
-				}
-
 				.code-mirror-where-clause,
 				.query-aggregation-container,
 				.query-add-ons,
-				.metrics-aggregation-section-content,
-				.metrics-container {
+				.metrics-aggregation-section-content {
 					&::before {
 						border-left: 6px dotted var(--bg-vanilla-300);
 					}
@@ -542,6 +529,18 @@
 
 		.qb-entity-options {
 			.options {
+				.query-name {
+					&::before {
+						background: repeating-linear-gradient(
+							to bottom,
+							var(--bg-vanilla-300),
+							var(--bg-vanilla-300) 4px,
+							transparent 4px,
+							transparent 8px
+						);
+					}
+				}
+
 				.formula-name {
 					&::before {
 						background: repeating-linear-gradient(

frontend/src/components/QueryBuilderV2/QueryBuilderV2.tsx

@@ -207,7 +207,6 @@ export const QueryBuilderV2 = memo(function QueryBuilderV2({
 							queryVariant={config?.queryVariant || 'dropdown'}
 							showOnlyWhereClause={showOnlyWhereClause}
 							isListViewPanel={isListViewPanel}
-							signalSource={currentQuery.builder.queryData[0].source as 'meter' | ''}
 							onSignalSourceChange={onSignalSourceChange || ((): void => {})}
 							signalSourceChangeEnabled={signalSourceChangeEnabled}
 							queriesCount={1}

frontend/src/components/QueryBuilderV2/QueryV2/MetricsSelect/MetricsSelect.tsx

@@ -1,13 +1,14 @@
-import { memo, useCallback, useMemo } from 'react';
+import { memo, useCallback, useMemo, useState } from 'react';
 import { Select } from 'antd';
 import {
 	initialQueriesMap,
 	initialQueryMeterWithType,
 	PANEL_TYPES,
 } from 'constants/queryBuilder';
-import { MetricNameSelector } from 'container/QueryBuilder/filters';
+import { AggregatorFilter } from 'container/QueryBuilder/filters';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import { useQueryOperations } from 'hooks/queryBuilder/useQueryBuilderOperations';
+import { BaseAutocompleteData } from 'types/api/queryBuilder/queryAutocompleteResponse';
 import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
 import { DataSource } from 'types/common/queryBuilder';
 import { SelectOption } from 'types/common/select';
@@ -43,12 +44,21 @@ export const MetricsSelect = memo(function MetricsSelect({
 	signalSourceChangeEnabled: boolean;
 	savePreviousQuery: boolean;
 }): JSX.Element {
+	const [attributeKeys, setAttributeKeys] = useState<BaseAutocompleteData[]>([]);
+
 	const { handleChangeAggregatorAttribute } = useQueryOperations({
 		index,
 		query,
 		entityVersion: version,
 	});
 
+	const handleAggregatorAttributeChange = useCallback(
+		(value: BaseAutocompleteData, isEditMode?: boolean) => {
+			handleChangeAggregatorAttribute(value, isEditMode, attributeKeys || []);
+		},
+		[handleChangeAggregatorAttribute, attributeKeys],
+	);
+
 	const {
 		updateAllQueriesOperators,
 		handleSetQueryData,
@@ -154,10 +164,12 @@ export const MetricsSelect = memo(function MetricsSelect({
 				/>
 			)}
 
-			<MetricNameSelector
-				onChange={handleChangeAggregatorAttribute}
+			<AggregatorFilter
+				onChange={handleAggregatorAttributeChange}
 				query={query}
+				index={index}
 				signalSource={signalSource || ''}
+				setAttributeKeys={setAttributeKeys}
 			/>
 		</div>
 	);

frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/QueryAddOns.tsx

@@ -202,8 +202,8 @@ function QueryAddOns({
 		} else {
 			filteredAddOns = Object.values(ADD_ONS);
 
+			// Filter out group_by for metrics data source
 			if (query.dataSource === DataSource.METRICS) {
-				// Filter out group_by for metrics data source (handled in MetricsAggregateSection)
 				filteredAddOns = filteredAddOns.filter(
 					(addOn) => addOn.key !== ADD_ONS_KEYS.GROUP_BY,
 				);

frontend/src/components/QueryBuilderV2/__tests__/QueryBuilder.PrevQuery.test.tsx

@@ -43,7 +43,6 @@ jest.mock(
 );
 jest.mock('container/QueryBuilder/filters', () => ({
 	AggregatorFilter: (): JSX.Element => <div />,
-	MetricNameSelector: (): JSX.Element => <div />,
 }));
 // Mock hooks
 jest.mock('hooks/queryBuilder/useQueryBuilder');

frontend/src/constants/queryBuilder.ts

@@ -1,5 +1,4 @@
 // ** Helpers
-import { MetrictypesTypeDTO } from 'api/generated/services/sigNoz.schemas';
 import { createIdFromObjectFields } from 'lib/createIdFromObjectFields';
 import { createNewBuilderItemName } from 'lib/newQueryBuilder/createNewBuilderItemName';
 import { IAttributeValuesResponse } from 'types/api/queryBuilder/getAttributesValues';
@@ -178,7 +177,7 @@ export const initialQueryBuilderFormValues: IBuilderQuery = {
 		{
 			metricName: '',
 			temporality: '',
-			timeAggregation: MetricAggregateOperator.AVG,
+			timeAggregation: MetricAggregateOperator.COUNT,
 			spaceAggregation: MetricAggregateOperator.SUM,
 			reduceTo: ReduceOperators.AVG,
 		},
@@ -226,7 +225,7 @@ export const initialQueryBuilderFormMeterValues: IBuilderQuery = {
 		{
 			metricName: '',
 			temporality: '',
-			timeAggregation: MeterAggregateOperator.AVG,
+			timeAggregation: MeterAggregateOperator.COUNT,
 			spaceAggregation: MeterAggregateOperator.SUM,
 			reduceTo: ReduceOperators.AVG,
 		},
@@ -372,31 +371,6 @@ export enum ATTRIBUTE_TYPES {
 	EXPONENTIAL_HISTOGRAM = 'ExponentialHistogram',
 }
 
-const METRIC_TYPE_TO_ATTRIBUTE_TYPE: Record<
-	MetrictypesTypeDTO,
-	ATTRIBUTE_TYPES
-> = {
-	[MetrictypesTypeDTO.sum]: ATTRIBUTE_TYPES.SUM,
-	[MetrictypesTypeDTO.gauge]: ATTRIBUTE_TYPES.GAUGE,
-	[MetrictypesTypeDTO.histogram]: ATTRIBUTE_TYPES.HISTOGRAM,
-	[MetrictypesTypeDTO.summary]: ATTRIBUTE_TYPES.GAUGE,
-	[MetrictypesTypeDTO.exponentialhistogram]:
-		ATTRIBUTE_TYPES.EXPONENTIAL_HISTOGRAM,
-};
-
-export function toAttributeType(
-	metricType: MetrictypesTypeDTO | undefined,
-	isMonotonic?: boolean,
-): ATTRIBUTE_TYPES | '' {
-	if (!metricType) {
-		return '';
-	}
-	if (metricType === MetrictypesTypeDTO.sum && isMonotonic === false) {
-		return ATTRIBUTE_TYPES.GAUGE;
-	}
-	return METRIC_TYPE_TO_ATTRIBUTE_TYPE[metricType] || '';
-}
-
 export type IQueryBuilderState = 'search';
 
 export const QUERY_BUILDER_SEARCH_VALUES = {

frontend/src/constants/reactQueryKeys.ts

@@ -49,6 +49,7 @@ export const REACT_QUERY_KEY = {
 
 	// Metrics Explorer Query Keys
 	GET_METRICS_LIST: 'GET_METRICS_LIST',
+	GET_METRICS_TREE_MAP: 'GET_METRICS_TREE_MAP',
 	GET_METRICS_LIST_FILTER_KEYS: 'GET_METRICS_LIST_FILTER_KEYS',
 	GET_METRICS_LIST_FILTER_VALUES: 'GET_METRICS_LIST_FILTER_VALUES',
 	GET_METRIC_DETAILS: 'GET_METRIC_DETAILS',

frontend/src/container/CreateAlertV2/Footer/__tests__/utils.test.ts

@@ -441,7 +441,7 @@ describe('Footer utils', () => {
 											reduceTo: undefined,
 											spaceAggregation: 'sum',
 											temporality: undefined,
-											timeAggregation: 'avg',
+											timeAggregation: 'count',
 										},
 									],
 									disabled: false,

frontend/src/container/DashboardContainer/visualization/charts/types.ts

@@ -1,4 +1,3 @@
-import { Timezone } from 'components/CustomTimePicker/timezoneUtils';
 import { PrecisionOption } from 'components/Graph/types';
 import { LegendConfig, TooltipRenderArgs } from 'lib/uPlotV2/components/types';
 import { UPlotConfigBuilder } from 'lib/uPlotV2/config/UPlotConfigBuilder';
@@ -9,7 +8,7 @@ interface BaseChartProps {
 	height: number;
 	showTooltip?: boolean;
 	showLegend?: boolean;
-	timezone?: Timezone;
+	timezone: string;
 	canPinTooltip?: boolean;
 	yAxisUnit?: string;
 	decimalPrecision?: PrecisionOption;

frontend/src/container/DashboardContainer/visualization/panels/BarPanel/BarPanel.tsx

@@ -129,12 +129,12 @@ function BarPanel(props: PanelWrapperProps): JSX.Element {
 					onDestroy={onPlotDestroy}
 					yAxisUnit={widget.yAxisUnit}
 					decimalPrecision={widget.decimalPrecision}
+					timezone={timezone.value}
 					data={chartData as uPlot.AlignedData}
 					width={containerDimensions.width}
 					height={containerDimensions.height}
 					layoutChildren={layoutChildren}
 					isStackedBarChart={widget.stackedBarChart ?? false}
-					timezone={timezone}
 				>
 					<ContextMenu
 						coordinates={coordinates}

frontend/src/container/DashboardContainer/visualization/panels/BarPanel/utils.ts

@@ -5,7 +5,12 @@ import { getInitialStackedBands } from 'container/DashboardContainer/visualizati
 import { getLegend } from 'lib/dashboard/getQueryResults';
 import getLabelName from 'lib/getLabelName';
 import { OnClickPluginOpts } from 'lib/uPlotLib/plugins/onClickPlugin';
-import { DrawStyle } from 'lib/uPlotV2/config/types';
+import {
+	DrawStyle,
+	LineInterpolation,
+	LineStyle,
+	VisibilityMode,
+} from 'lib/uPlotV2/config/types';
 import { UPlotConfigBuilder } from 'lib/uPlotV2/config/UPlotConfigBuilder';
 import { get } from 'lodash-es';
 import { Widgets } from 'types/api/dashboard/getAll';
@@ -58,12 +63,7 @@ export function prepareBarPanelConfig({
 	const minStepInterval = Math.min(...Object.values(stepIntervals));
 
 	const builder = buildBaseConfig({
-		id: widget.id,
-		thresholds: widget.thresholds,
-		yAxisUnit: widget.yAxisUnit,
-		softMin: widget.softMin ?? undefined,
-		softMax: widget.softMax ?? undefined,
-		isLogScale: widget.isLogScale,
+		widget,
 		isDarkMode,
 		onClick,
 		onDragSelect,
@@ -98,8 +98,14 @@ export function prepareBarPanelConfig({
 		builder.addSeries({
 			scaleKey: 'y',
 			drawStyle: DrawStyle.Bar,
+			panelType: PANEL_TYPES.BAR,
 			label: label,
 			colorMapping: widget.customLegendColors ?? {},
+			spanGaps: false,
+			lineStyle: LineStyle.Solid,
+			lineInterpolation: LineInterpolation.Spline,
+			showPoints: VisibilityMode.Never,
+			pointSize: 5,
 			isDarkMode,
 			stepInterval: currentStepInterval,
 		});

frontend/src/container/DashboardContainer/visualization/panels/HistogramPanel/HistogramPanel.tsx

@@ -100,7 +100,7 @@ function HistogramPanel(props: PanelWrapperProps): JSX.Element {
 					yAxisUnit={widget.yAxisUnit}
 					decimalPrecision={widget.decimalPrecision}
 					syncMode={DashboardCursorSync.Crosshair}
-					timezone={timezone}
+					timezone={timezone.value}
 					data={chartData as uPlot.AlignedData}
 					width={containerDimensions.width}
 					height={containerDimensions.height}

frontend/src/container/DashboardContainer/visualization/panels/HistogramPanel/utils.ts

@@ -154,12 +154,7 @@ export function prepareHistogramPanelConfig({
 	isDarkMode: boolean;
 }): UPlotConfigBuilder {
 	const builder = buildBaseConfig({
-		id: widget.id,
-		thresholds: widget.thresholds,
-		yAxisUnit: widget.yAxisUnit,
-		softMin: widget.softMin ?? undefined,
-		softMax: widget.softMax ?? undefined,
-		isLogScale: widget.isLogScale,
+		widget,
 		isDarkMode,
 		apiResponse,
 		panelMode,
@@ -196,8 +191,10 @@ export function prepareHistogramPanelConfig({
 		builder.addSeries({
 			label: '',
 			scaleKey: 'y',
-			drawStyle: DrawStyle.Histogram,
+			drawStyle: DrawStyle.Bar,
+			panelType: PANEL_TYPES.HISTOGRAM,
 			colorMapping: widget.customLegendColors ?? {},
+			spanGaps: false,
 			barWidthFactor: 1,
 			pointSize: 5,
 			lineColor: '#3f5ecc',
@@ -219,8 +216,10 @@ export function prepareHistogramPanelConfig({
 			builder.addSeries({
 				label: label,
 				scaleKey: 'y',
-				drawStyle: DrawStyle.Histogram,
+				drawStyle: DrawStyle.Bar,
+				panelType: PANEL_TYPES.HISTOGRAM,
 				colorMapping: widget.customLegendColors ?? {},
+				spanGaps: false,
 				barWidthFactor: 1,
 				pointSize: 5,
 				isDarkMode,

frontend/src/container/DashboardContainer/visualization/panels/TimeSeriesPanel/TimeSeriesPanel.tsx

@@ -118,7 +118,7 @@ function TimeSeriesPanel(props: PanelWrapperProps): JSX.Element {
 					}}
 					yAxisUnit={widget.yAxisUnit}
 					decimalPrecision={widget.decimalPrecision}
-					timezone={timezone}
+					timezone={timezone.value}
 					data={chartData as uPlot.AlignedData}
 					width={containerDimensions.width}
 					height={containerDimensions.height}

frontend/src/container/DashboardContainer/visualization/panels/TimeSeriesPanel/utils.ts

@@ -82,12 +82,7 @@ export const prepareUPlotConfig = ({
 	const minStepInterval = Math.min(...Object.values(stepIntervals));
 
 	const builder = buildBaseConfig({
-		id: widget.id,
-		thresholds: widget.thresholds,
-		yAxisUnit: widget.yAxisUnit,
-		softMin: widget.softMin ?? undefined,
-		softMax: widget.softMax ?? undefined,
-		isLogScale: widget.isLogScale,
+		widget,
 		isDarkMode,
 		onClick,
 		onDragSelect,
@@ -125,6 +120,7 @@ export const prepareUPlotConfig = ({
 				: VisibilityMode.Never,
 			pointSize: 5,
 			isDarkMode,
+			panelType: PANEL_TYPES.TIME_SERIES,
 		});
 	});
 

frontend/src/container/DashboardContainer/visualization/panels/utils/__tests__/baseConfigBuilder.test.ts

@@ -1,11 +1,11 @@
 import { PANEL_TYPES } from 'constants/queryBuilder';
-import { ThresholdProps } from 'container/NewWidget/RightContainer/Threshold/types';
 import { STEP_INTERVAL_MULTIPLIER } from 'lib/uPlotV2/constants';
+import { Widgets } from 'types/api/dashboard/getAll';
 import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
 import uPlot from 'uplot';
 
 import { PanelMode } from '../../types';
-import { BaseConfigBuilderProps, buildBaseConfig } from '../baseConfigBuilder';
+import { buildBaseConfig } from '../baseConfigBuilder';
 
 jest.mock(
 	'container/DashboardContainer/visualization/panels/utils/legendVisibilityUtils',
@@ -27,25 +27,16 @@ jest.mock('lib/uPlotLib/plugins/onClickPlugin', () => ({
 	default: jest.fn().mockReturnValue({ name: 'onClickPlugin' }),
 }));
 
-const createBaseConfigBuilderProps = (
-	overrides: Partial<
-		Pick<
-			BaseConfigBuilderProps,
-			'id' | 'yAxisUnit' | 'isLogScale' | 'softMin' | 'softMax' | 'thresholds'
-		>
-	> = {},
-): Pick<
-	BaseConfigBuilderProps,
-	'id' | 'yAxisUnit' | 'isLogScale' | 'softMin' | 'softMax' | 'thresholds'
-> => ({
-	id: 'widget-1',
-	yAxisUnit: 'ms',
-	isLogScale: false,
-	softMin: undefined,
-	softMax: undefined,
-	thresholds: [],
-	...overrides,
-});
+const createWidget = (overrides: Partial<Widgets> = {}): Widgets =>
+	({
+		id: 'widget-1',
+		yAxisUnit: 'ms',
+		isLogScale: false,
+		softMin: undefined,
+		softMax: undefined,
+		thresholds: [],
+		...overrides,
+	} as Widgets);
 
 const createApiResponse = (
 	overrides: Partial<MetricRangePayloadProps> = {},
@@ -56,7 +47,7 @@ const createApiResponse = (
 	} as MetricRangePayloadProps);
 
 const baseProps = {
-	...createBaseConfigBuilderProps(),
+	widget: createWidget(),
 	apiResponse: createApiResponse(),
 	isDarkMode: true,
 	panelMode: PanelMode.DASHBOARD_VIEW,
@@ -72,14 +63,14 @@ describe('buildBaseConfig', () => {
 		expect(typeof builder.getLegendItems).toBe('function');
 	});
 
-	it('configures builder with id and DASHBOARD_VIEW preferences', () => {
+	it('configures builder with widgetId and DASHBOARD_VIEW preferences', () => {
 		const builder = buildBaseConfig({
 			...baseProps,
 			panelMode: PanelMode.DASHBOARD_VIEW,
-			...createBaseConfigBuilderProps({ id: 'my-widget' }),
+			widget: createWidget({ id: 'my-widget' }),
 		});
 
-		expect(builder.getId()).toBe('my-widget');
+		expect(builder.getWidgetId()).toBe('my-widget');
 		expect(builder.getShouldSaveSelectionPreference()).toBe(true);
 	});
 
@@ -136,7 +127,7 @@ describe('buildBaseConfig', () => {
 	it('configures log scale on y axis when widget.isLogScale is true', () => {
 		const builder = buildBaseConfig({
 			...baseProps,
-			...createBaseConfigBuilderProps({ isLogScale: true }),
+			widget: createWidget({ isLogScale: true }),
 		});
 
 		const config = builder.getConfig();
@@ -180,7 +171,7 @@ describe('buildBaseConfig', () => {
 	it('adds thresholds from widget', () => {
 		const builder = buildBaseConfig({
 			...baseProps,
-			...createBaseConfigBuilderProps({
+			widget: createWidget({
 				thresholds: [
 					{
 						thresholdValue: 80,
@@ -188,7 +179,7 @@ describe('buildBaseConfig', () => {
 						thresholdUnit: 'ms',
 						thresholdLabel: 'High',
 					},
-				] as ThresholdProps[],
+				] as Widgets['thresholds'],
 			}),
 		});
 

frontend/src/container/DashboardContainer/visualization/panels/utils/baseConfigBuilder.ts

@@ -1,6 +1,5 @@
 import { Timezone } from 'components/CustomTimePicker/timezoneUtils';
 import { PANEL_TYPES } from 'constants/queryBuilder';
-import { ThresholdProps } from 'container/NewWidget/RightContainer/Threshold/types';
 import onClickPlugin, {
 	OnClickPluginOpts,
 } from 'lib/uPlotLib/plugins/onClickPlugin';
@@ -10,32 +9,28 @@ import {
 } from 'lib/uPlotV2/config/types';
 import { UPlotConfigBuilder } from 'lib/uPlotV2/config/UPlotConfigBuilder';
 import { ThresholdsDrawHookOptions } from 'lib/uPlotV2/hooks/types';
+import { Widgets } from 'types/api/dashboard/getAll';
 import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
 import uPlot from 'uplot';
 
 import { PanelMode } from '../types';
 
 export interface BaseConfigBuilderProps {
-	id: string;
-	thresholds?: ThresholdProps[];
+	widget: Widgets;
 	apiResponse: MetricRangePayloadProps;
 	isDarkMode: boolean;
 	onClick?: OnClickPluginOpts['onClick'];
 	onDragSelect?: (startTime: number, endTime: number) => void;
 	timezone?: Timezone;
-	panelMode?: PanelMode;
+	panelMode: PanelMode;
 	panelType: PANEL_TYPES;
 	minTimeScale?: number;
 	maxTimeScale?: number;
 	stepInterval?: number;
-	isLogScale?: boolean;
-	yAxisUnit?: string;
-	softMin?: number;
-	softMax?: number;
 }
 
 export function buildBaseConfig({
-	id,
+	widget,
 	isDarkMode,
 	onClick,
 	onDragSelect,
@@ -43,14 +38,9 @@ export function buildBaseConfig({
 	timezone,
 	panelMode,
 	panelType,
-	thresholds,
 	minTimeScale,
 	maxTimeScale,
 	stepInterval,
-	isLogScale,
-	yAxisUnit,
-	softMin,
-	softMax,
 }: BaseConfigBuilderProps): UPlotConfigBuilder {
 	const tzDate = timezone
 		? (timestamp: number): Date =>
@@ -58,27 +48,28 @@ export function buildBaseConfig({
 		: undefined;
 
 	const builder = new UPlotConfigBuilder({
-		id,
 		onDragSelect,
+		widgetId: widget.id,
 		tzDate,
 		shouldSaveSelectionPreference: panelMode === PanelMode.DASHBOARD_VIEW,
-		selectionPreferencesSource: panelMode
-			? [PanelMode.DASHBOARD_VIEW, PanelMode.STANDALONE_VIEW].includes(panelMode)
-				? SelectionPreferencesSource.LOCAL_STORAGE
-				: SelectionPreferencesSource.IN_MEMORY
+		selectionPreferencesSource: [
+			PanelMode.DASHBOARD_VIEW,
+			PanelMode.STANDALONE_VIEW,
+		].includes(panelMode)
+			? SelectionPreferencesSource.LOCAL_STORAGE
 			: SelectionPreferencesSource.IN_MEMORY,
 		stepInterval,
 	});
 
 	const thresholdOptions: ThresholdsDrawHookOptions = {
 		scaleKey: 'y',
-		thresholds: (thresholds || []).map((threshold) => ({
+		thresholds: (widget.thresholds || []).map((threshold) => ({
 			thresholdValue: threshold.thresholdValue ?? 0,
 			thresholdColor: threshold.thresholdColor,
 			thresholdUnit: threshold.thresholdUnit,
 			thresholdLabel: threshold.thresholdLabel,
 		})),
-		yAxisUnit: yAxisUnit,
+		yAxisUnit: widget.yAxisUnit,
 	};
 
 	builder.addThresholds(thresholdOptions);
@@ -88,8 +79,8 @@ export function buildBaseConfig({
 		time: true,
 		min: minTimeScale,
 		max: maxTimeScale,
-		logBase: isLogScale ? 10 : undefined,
-		distribution: isLogScale
+		logBase: widget.isLogScale ? 10 : undefined,
+		distribution: widget.isLogScale
 			? DistributionType.Logarithmic
 			: DistributionType.Linear,
 	});
@@ -100,11 +91,11 @@ export function buildBaseConfig({
 		time: false,
 		min: undefined,
 		max: undefined,
-		softMin: softMin,
-		softMax: softMax,
+		softMin: widget.softMin ?? undefined,
+		softMax: widget.softMax ?? undefined,
 		thresholds: thresholdOptions,
-		logBase: isLogScale ? 10 : undefined,
-		distribution: isLogScale
+		logBase: widget.isLogScale ? 10 : undefined,
+		distribution: widget.isLogScale
 			? DistributionType.Logarithmic
 			: DistributionType.Linear,
 	});
@@ -123,7 +114,7 @@ export function buildBaseConfig({
 		show: true,
 		side: 2,
 		isDarkMode,
-		isLogScale,
+		isLogScale: widget.isLogScale,
 		panelType,
 	});
 
@@ -132,8 +123,8 @@ export function buildBaseConfig({
 		show: true,
 		side: 3,
 		isDarkMode,
-		isLogScale,
-		yAxisUnit,
+		isLogScale: widget.isLogScale,
+		yAxisUnit: widget.yAxisUnit,
 		panelType,
 	});
 

frontend/src/container/ExplorerOptions/utils.ts

@@ -15,7 +15,7 @@ export const getRandomColor = (): string => {
 };
 
 export const DATASOURCE_VS_ROUTES: Record<DataSource, string> = {
-	[DataSource.METRICS]: ROUTES.METRICS_EXPLORER_EXPLORER,
+	[DataSource.METRICS]: ROUTES.METRICS_EXPLORER,
 	[DataSource.TRACES]: ROUTES.TRACES_EXPLORER,
 	[DataSource.LOGS]: ROUTES.LOGS_EXPLORER,
 };

frontend/src/container/InfraMonitoringHosts/InfraMonitoring.styles.scss

@@ -190,11 +190,6 @@
 			.ant-table-cell:nth-child(n + 3) {
 				padding-right: 24px;
 			}
-			.status-header {
-				display: flex;
-				align-items: center;
-				gap: 4px;
-			}
 			.memory-usage-header {
 				display: flex;
 				align-items: center;

frontend/src/container/InfraMonitoringHosts/utils.tsx

@@ -146,14 +146,7 @@ export const getHostsListColumns = (): ColumnType<HostRowData>[] => [
 		),
 	},
 	{
-		title: (
-			<div className="status-header">
-				Status
-				<Tooltip title="Sent system metrics in last 10 mins">
-					<InfoCircleOutlined />
-				</Tooltip>
-			</div>
-		),
+		title: 'Status',
 		dataIndex: 'active',
 		key: 'active',
 		width: 100,

frontend/src/container/MeterExplorer/Explorer/TimeSeries.tsx

@@ -6,7 +6,6 @@ import { isAxiosError } from 'axios';
 import { ENTITY_VERSION_V5 } from 'constants/app';
 import { initialQueryMeterWithType, PANEL_TYPES } from 'constants/queryBuilder';
 import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
-import EmptyMetricsSearch from 'container/MetricsExplorer/Explorer/EmptyMetricsSearch';
 import { BuilderUnitsFilter } from 'container/QueryBuilder/filters/BuilderUnitsFilter';
 import TimeSeriesView from 'container/TimeSeriesView/TimeSeriesView';
 import { convertDataValueToMs } from 'container/TimeSeriesView/utils';
@@ -116,34 +115,27 @@ function TimeSeries(): JSX.Element {
 		setYAxisUnit(value);
 	};
 
-	const hasMetricSelected = useMemo(
-		() => currentQuery.builder.queryData.some((q) => q.aggregateAttribute?.key),
-		[currentQuery],
-	);
-
 	return (
 		<div className="meter-time-series-container">
 			<BuilderUnitsFilter onChange={onUnitChangeHandler} yAxisUnit={yAxisUnit} />
 			<div className="time-series-container">
-				{!hasMetricSelected && <EmptyMetricsSearch />}
-				{hasMetricSelected &&
-					responseData.map((datapoint, index) => (
-						<div
-							className="time-series-view-panel"
-							// eslint-disable-next-line react/no-array-index-key
-							key={index}
-						>
-							<TimeSeriesView
-								isFilterApplied={false}
-								isError={queries[index].isError}
-								isLoading={queries[index].isLoading}
-								data={datapoint}
-								dataSource={DataSource.METRICS}
-								yAxisUnit={yAxisUnit}
-								panelType={PANEL_TYPES.BAR}
-							/>
-						</div>
-					))}
+				{responseData.map((datapoint, index) => (
+					<div
+						className="time-series-view-panel"
+						// eslint-disable-next-line react/no-array-index-key
+						key={index}
+					>
+						<TimeSeriesView
+							isFilterApplied={false}
+							isError={queries[index].isError}
+							isLoading={queries[index].isLoading}
+							data={datapoint}
+							dataSource={DataSource.METRICS}
+							yAxisUnit={yAxisUnit}
+							panelType={PANEL_TYPES.BAR}
+						/>
+					</div>
+				))}
 			</div>
 		</div>
 	);

frontend/src/container/MetricsExplorer/Explorer/EmptyMetricsSearch.tsx

@@ -1,21 +1,13 @@
 import { Typography } from 'antd';
 import { Empty } from 'antd/lib';
 
-interface EmptyMetricsSearchProps {
-	hasQueryResult?: boolean;
-}
-
-export default function EmptyMetricsSearch({
-	hasQueryResult,
-}: EmptyMetricsSearchProps): JSX.Element {
+export default function EmptyMetricsSearch(): JSX.Element {
 	return (
 		<div className="empty-metrics-search">
 			<Empty
 				description={
 					<Typography.Title level={5}>
-						{hasQueryResult
-							? 'No data'
-							: 'Select a metric and run a query to see the results'}
+						Please build and run a valid query to see the result
 					</Typography.Title>
 				}
 			/>

frontend/src/container/MetricsExplorer/Explorer/Explorer.tsx

@@ -12,21 +12,14 @@ import { QueryBuilderProps } from 'container/QueryBuilder/QueryBuilder.interface
 import DateTimeSelector from 'container/TopNav/DateTimeSelectionV2';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import { useShareBuilderUrl } from 'hooks/queryBuilder/useShareBuilderUrl';
-import {
-	ICurrentQueryData,
-	useHandleExplorerTabChange,
-} from 'hooks/useHandleExplorerTabChange';
 import { useSafeNavigate } from 'hooks/useSafeNavigate';
 import { isEmpty } from 'lodash-es';
 import ErrorBoundaryFallback from 'pages/ErrorBoundaryFallback/ErrorBoundaryFallback';
-import { ExplorerViews } from 'pages/LogsExplorer/utils';
 import { Warning } from 'types/api';
 import { Dashboard } from 'types/api/dashboard/getAll';
 import { Query } from 'types/api/queryBuilder/queryBuilderData';
-import { MetricAggregation } from 'types/api/v5/queryRange';
 import { DataSource } from 'types/common/queryBuilder';
 import { generateExportToDashboardLink } from 'utils/dashboard/generateExportToDashboardLink';
-import { explorerViewToPanelType } from 'utils/explorerUtils';
 import { v4 as uuid } from 'uuid';
 
 import { MetricsExplorerEventKeys, MetricsExplorerEvents } from '../events';
@@ -49,20 +42,15 @@ function Explorer(): JSX.Element {
 		stagedQuery,
 		updateAllQueriesOperators,
 		currentQuery,
-		handleSetConfig,
 	} = useQueryBuilder();
 	const { safeNavigate } = useSafeNavigate();
-	const { handleExplorerTabChange } = useHandleExplorerTabChange();
 	const [isMetricDetailsOpen, setIsMetricDetailsOpen] = useState(false);
 
 	const metricNames = useMemo(() => {
 		const currentMetricNames: string[] = [];
 		stagedQuery?.builder.queryData.forEach((query) => {
-			const metricName =
-				query.aggregateAttribute?.key ||
-				(query.aggregations?.[0] as MetricAggregation | undefined)?.metricName;
-			if (metricName) {
-				currentMetricNames.push(metricName);
+			if (query.aggregateAttribute?.key) {
+				currentMetricNames.push(query.aggregateAttribute?.key);
 			}
 		});
 		return currentMetricNames;
@@ -81,7 +69,7 @@ function Explorer(): JSX.Element {
 			!isMetricUnitsLoading &&
 			!isMetricUnitsError &&
 			units.length > 0 &&
-			units.every((unit) => unit === units[0]),
+			units.every((unit) => unit && unit === units[0]),
 		[units, isMetricUnitsLoading, isMetricUnitsError],
 	);
 
@@ -188,16 +176,6 @@ function Explorer(): JSX.Element {
 
 	useShareBuilderUrl({ defaultValue: defaultQuery });
 
-	const handleChangeSelectedView = useCallback(
-		(view: ExplorerViews, querySearchParameters?: ICurrentQueryData): void => {
-			const nextPanelType =
-				explorerViewToPanelType[view] || PANEL_TYPES.TIME_SERIES;
-			handleSetConfig(nextPanelType, DataSource.METRICS);
-			handleExplorerTabChange(nextPanelType, querySearchParameters);
-		},
-		[handleSetConfig, handleExplorerTabChange],
-	);
-
 	const handleExport = useCallback(
 		(
 			dashboard: Dashboard | null,
@@ -370,7 +348,6 @@ function Explorer(): JSX.Element {
 				onExport={handleExport}
 				isOneChartPerQuery={showOneChartPerQuery}
 				splitedQueries={splitedQueries}
-				handleChangeSelectedView={handleChangeSelectedView}
 			/>
 			{isMetricDetailsOpen && selectedMetricName && (
 				<MetricDetails

frontend/src/container/MetricsExplorer/Explorer/TimeSeries.tsx

@@ -28,7 +28,6 @@ import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
 import { DataSource } from 'types/common/queryBuilder';
 import { GlobalReducer } from 'types/reducer/globalTime';
 
-import EmptyMetricsSearch from './EmptyMetricsSearch';
 import { TimeSeriesProps } from './types';
 import {
 	buildUpdateMetricYAxisUnitPayload,
@@ -210,7 +209,7 @@ function TimeSeries({
 						{showSaveUnitButton && (
 							<div className="save-unit-container">
 								<Typography.Text>
-									Set the selected unit as the metric unit?
+									Save the selected unit for this metric?
 								</Typography.Text>
 								<Button
 									type="primary"
@@ -230,71 +229,64 @@ function TimeSeries({
 					'time-series-container': changeLayoutForOneChartPerQuery,
 				})}
 			>
-				{metricNames.length === 0 && <EmptyMetricsSearch />}
-				{metricNames.length > 0 &&
-					responseData.map((datapoint, index) => {
-						const isQueryDataItem = index < metricNames.length;
-						const metricName = isQueryDataItem ? metricNames[index] : undefined;
-						const metricUnit = isQueryDataItem ? metricUnits[index] : undefined;
+				{responseData.map((datapoint, index) => {
+					const isQueryDataItem = index < metricNames.length;
+					const metricName = isQueryDataItem ? metricNames[index] : undefined;
+					const metricUnit = isQueryDataItem ? metricUnits[index] : undefined;
 
-						// Show the no unit warning if -
-						// 1. The metric query is not loading
-						// 2. The metric units are not loading
-						// 3. There are more than one metric
-						// 4. The current metric unit is empty
-						// 5. Is a queryData item
-						const isMetricUnitEmpty =
-							isQueryDataItem &&
-							!queries[index].isLoading &&
-							!isMetricUnitsLoading &&
-							metricUnits.length > 1 &&
-							!metricUnit &&
-							metricName;
+					// Show the no unit warning if -
+					// 1. The metric query is not loading
+					// 2. The metric units are not loading
+					// 3. There are more than one metric
+					// 4. The current metric unit is empty
+					// 5. Is a queryData item
+					const isMetricUnitEmpty =
+						isQueryDataItem &&
+						!queries[index].isLoading &&
+						!isMetricUnitsLoading &&
+						metricUnits.length > 1 &&
+						!metricUnit &&
+						metricName;
 
-						const currentYAxisUnit = yAxisUnit || metricUnit;
+					const currentYAxisUnit = yAxisUnit || metricUnit;
 
-						return (
-							<div
-								className="time-series-view"
-								// eslint-disable-next-line react/no-array-index-key
-								key={index}
-							>
-								{isMetricUnitEmpty && metricName && (
-									<Tooltip
-										className="no-unit-warning"
-										title={
-											<Typography.Text>
-												No unit is set for this metric. You can assign one from the{' '}
-												<Typography.Link
-													onClick={(): void => handleOpenMetricDetails(metricName)}
-												>
-													metric details
-												</Typography.Link>{' '}
-												page.
-											</Typography.Text>
-										}
-									>
-										<AlertTriangle
-											size={16}
-											color={Color.BG_AMBER_400}
-											role="img"
-											aria-label="no unit warning"
-										/>
-									</Tooltip>
-								)}
-								<TimeSeriesView
-									isFilterApplied={false}
-									isError={queries[index].isError}
-									isLoading={queries[index].isLoading || isMetricUnitsLoading}
-									data={datapoint}
-									yAxisUnit={currentYAxisUnit}
-									dataSource={DataSource.METRICS}
-									error={queries[index].error as APIError}
-									setWarning={setWarning}
-								/>
-							</div>
-						);
-					})}
+					return (
+						<div
+							className="time-series-view"
+							// eslint-disable-next-line react/no-array-index-key
+							key={index}
+						>
+							{isMetricUnitEmpty && metricName && (
+								<Tooltip
+									className="no-unit-warning"
+									title={
+										<Typography.Text>
+											This metric does not have a unit. Please set one for it in the{' '}
+											<Typography.Link
+												onClick={(): void => handleOpenMetricDetails(metricName)}
+											>
+												metric details
+											</Typography.Link>{' '}
+											page.
+										</Typography.Text>
+									}
+								>
+									<AlertTriangle size={16} color={Color.BG_AMBER_400} />
+								</Tooltip>
+							)}
+							<TimeSeriesView
+								isFilterApplied={false}
+								isError={queries[index].isError}
+								isLoading={queries[index].isLoading || isMetricUnitsLoading}
+								data={datapoint}
+								yAxisUnit={currentYAxisUnit}
+								dataSource={DataSource.METRICS}
+								error={queries[index].error as APIError}
+								setWarning={setWarning}
+							/>
+						</div>
+					);
+				})}
 			</div>
 		</>
 	);

frontend/src/container/MetricsExplorer/Explorer/__tests__/EmptyMetricsSearch.test.tsx

@@ -1,19 +0,0 @@
-import { render, screen } from '@testing-library/react';
-
-import EmptyMetricsSearch from '../EmptyMetricsSearch';
-
-describe('EmptyMetricsSearch', () => {
-	it('shows select metric message when no query has been run', () => {
-		render(<EmptyMetricsSearch />);
-
-		expect(
-			screen.getByText('Select a metric and run a query to see the results'),
-		).toBeInTheDocument();
-	});
-
-	it('shows no data message when a query returned empty results', () => {
-		render(<EmptyMetricsSearch hasQueryResult />);
-
-		expect(screen.getByText('No data')).toBeInTheDocument();
-	});
-});

frontend/src/container/MetricsExplorer/Explorer/__tests__/Explorer.test.tsx

@@ -8,11 +8,10 @@ import {
 	MetrictypesTemporalityDTO,
 	MetrictypesTypeDTO,
 } from 'api/generated/services/sigNoz.schemas';
-import { initialQueriesMap } from 'constants/queryBuilder';
+import { initialQueriesMap, PANEL_TYPES } from 'constants/queryBuilder';
 import * as useOptionsMenuHooks from 'container/OptionsMenu';
 import * as useUpdateDashboardHooks from 'hooks/dashboard/useUpdateDashboard';
 import * as useQueryBuilderHooks from 'hooks/queryBuilder/useQueryBuilder';
-import * as useHandleExplorerTabChangeHooks from 'hooks/useHandleExplorerTabChange';
 import * as appContextHooks from 'providers/App/App';
 import { ErrorModalProvider } from 'providers/ErrorModalProvider';
 import * as timezoneHooks from 'providers/Timezone';
@@ -30,8 +29,6 @@ const queryClient = new QueryClient();
 const mockUpdateAllQueriesOperators = jest
 	.fn()
 	.mockReturnValue(initialQueriesMap[DataSource.METRICS]);
-const mockHandleSetConfig = jest.fn();
-const mockHandleExplorerTabChange = jest.fn();
 const mockUseQueryBuilderData = {
 	handleRunQuery: jest.fn(),
 	stagedQuery: initialQueriesMap[DataSource.METRICS],
@@ -43,7 +40,7 @@ const mockUseQueryBuilderData = {
 	handleSetQueryData: jest.fn(),
 	handleSetFormulaData: jest.fn(),
 	handleSetQueryItemData: jest.fn(),
-	handleSetConfig: mockHandleSetConfig,
+	handleSetConfig: jest.fn(),
 	removeQueryBuilderEntityByIndex: jest.fn(),
 	removeQueryTypeItemByIndex: jest.fn(),
 	isDefaultQuery: jest.fn(),
@@ -138,11 +135,6 @@ jest.spyOn(appContextHooks, 'useAppContext').mockReturnValue({
 jest.spyOn(useQueryBuilderHooks, 'useQueryBuilder').mockReturnValue({
 	...mockUseQueryBuilderData,
 } as any);
-jest
-	.spyOn(useHandleExplorerTabChangeHooks, 'useHandleExplorerTabChange')
-	.mockReturnValue({
-		handleExplorerTabChange: mockHandleExplorerTabChange,
-	});
 
 const Y_AXIS_UNIT_SELECTOR_TEST_ID = 'y-axis-unit-selector';
 
@@ -165,6 +157,26 @@ describe('Explorer', () => {
 		jest.clearAllMocks();
 	});
 
+	it('should render Explorer query builder with metrics datasource selected', () => {
+		jest.spyOn(useQueryBuilderHooks, 'useQueryBuilder').mockReturnValue({
+			...mockUseQueryBuilderData,
+			stagedQuery: initialQueriesMap[DataSource.TRACES],
+		} as any);
+
+		(useSearchParams as jest.Mock).mockReturnValue([
+			new URLSearchParams({ isOneChartPerQueryEnabled: 'false' }),
+			mockSetSearchParams,
+		]);
+
+		renderExplorer();
+
+		expect(mockUpdateAllQueriesOperators).toHaveBeenCalledWith(
+			initialQueriesMap[DataSource.METRICS],
+			PANEL_TYPES.TIME_SERIES,
+			DataSource.METRICS,
+		);
+	});
+
 	it('should enable one chart per query toggle when oneChartPerQuery=true in URL', () => {
 		(useSearchParams as jest.Mock).mockReturnValue([
 			new URLSearchParams({ isOneChartPerQueryEnabled: 'true' }),
@@ -229,46 +241,20 @@ describe('Explorer', () => {
 		expect(yAxisUnitSelector).not.toBeInTheDocument();
 	});
 
-	it('one chart per query toggle should be forced on and disabled when multiple metrics have different units', () => {
-		const mockQueryData = {
-			...initialQueriesMap[DataSource.METRICS].builder.queryData[0],
-			aggregateAttribute: {
-				...(initialQueriesMap[DataSource.METRICS].builder.queryData[0]
-					.aggregateAttribute as BaseAutocompleteData),
-				key: 'metric1',
-			},
-		};
-		const mockStagedQueryWithMultipleQueries = {
-			...initialQueriesMap[DataSource.METRICS],
-			builder: {
-				...initialQueriesMap[DataSource.METRICS].builder,
-				queryData: [mockQueryData, mockQueryData],
-			},
-		};
-
-		jest.spyOn(useQueryBuilderHooks, 'useQueryBuilder').mockReturnValue(({
-			...mockUseQueryBuilderData,
-			stagedQuery: mockStagedQueryWithMultipleQueries,
-		} as Partial<QueryBuilderContextType>) as QueryBuilderContextType);
-
+	it('should hide y axis unit selector for multiple metrics with different units', () => {
 		jest.spyOn(useGetMetricsHooks, 'useGetMetrics').mockReturnValue({
 			isLoading: false,
 			isError: false,
-			metrics: [
-				{ ...MOCK_METRIC_METADATA, unit: 'seconds' },
-				{ ...MOCK_METRIC_METADATA, unit: 'bytes' },
-			],
+			metrics: [MOCK_METRIC_METADATA, MOCK_METRIC_METADATA],
 		});
 
-		(useSearchParams as jest.Mock).mockReturnValue([
-			new URLSearchParams({ isOneChartPerQueryEnabled: 'false' }),
-			mockSetSearchParams,
-		]);
-
 		renderExplorer();
 
+		const yAxisUnitSelector = screen.queryByTestId(Y_AXIS_UNIT_SELECTOR_TEST_ID);
+		expect(yAxisUnitSelector).not.toBeInTheDocument();
+
+		// One chart per query toggle should be disabled
 		const oneChartPerQueryToggle = screen.getByRole('switch');
-		expect(oneChartPerQueryToggle).toBeChecked();
 		expect(oneChartPerQueryToggle).toBeDisabled();
 	});
 
@@ -341,158 +327,4 @@ describe('Explorer', () => {
 		const oneChartPerQueryToggle = screen.getByRole('switch');
 		expect(oneChartPerQueryToggle).toBeEnabled();
 	});
-
-	it('one chart per query toggle should be enabled when multiple metrics have no unit', () => {
-		const metricWithNoUnit = {
-			type: MetrictypesTypeDTO.sum,
-			description: 'metric without unit',
-			unit: '',
-			temporality: MetrictypesTemporalityDTO.cumulative,
-			isMonotonic: true,
-		};
-		const mockQueryData = {
-			...initialQueriesMap[DataSource.METRICS].builder.queryData[0],
-			aggregateAttribute: {
-				...(initialQueriesMap[DataSource.METRICS].builder.queryData[0]
-					.aggregateAttribute as BaseAutocompleteData),
-				key: 'metric1',
-			},
-		};
-		const mockStagedQueryWithMultipleQueries = {
-			...initialQueriesMap[DataSource.METRICS],
-			builder: {
-				...initialQueriesMap[DataSource.METRICS].builder,
-				queryData: [mockQueryData, mockQueryData],
-			},
-		};
-
-		jest.spyOn(useQueryBuilderHooks, 'useQueryBuilder').mockReturnValue(({
-			...mockUseQueryBuilderData,
-			stagedQuery: mockStagedQueryWithMultipleQueries,
-		} as Partial<QueryBuilderContextType>) as QueryBuilderContextType);
-
-		jest.spyOn(useGetMetricsHooks, 'useGetMetrics').mockReturnValue({
-			isLoading: false,
-			isError: false,
-			metrics: [metricWithNoUnit, metricWithNoUnit],
-		});
-
-		(useSearchParams as jest.Mock).mockReturnValue([
-			new URLSearchParams({ isOneChartPerQueryEnabled: 'false' }),
-			mockSetSearchParams,
-		]);
-
-		renderExplorer();
-
-		const oneChartPerQueryToggle = screen.getByRole('switch');
-		// Toggle should be enabled (not forced/disabled) since both metrics
-		// have the same unit (no unit) and should be viewable on the same graph
-		expect(oneChartPerQueryToggle).toBeEnabled();
-		expect(oneChartPerQueryToggle).not.toBeChecked();
-	});
-
-	describe('loading saved views with v5 query format', () => {
-		const EMPTY_STATE_TEXT = 'Select a metric and run a query to see the results';
-
-		it('should show empty state when no metric is selected', () => {
-			(useSearchParams as jest.Mock).mockReturnValue([
-				new URLSearchParams({}),
-				mockSetSearchParams,
-			]);
-			jest.spyOn(useGetMetricsHooks, 'useGetMetrics').mockReturnValue({
-				isLoading: false,
-				isError: false,
-				metrics: [],
-			});
-			jest.spyOn(useQueryBuilderHooks, 'useQueryBuilder').mockReturnValue({
-				...mockUseQueryBuilderData,
-			} as any);
-
-			renderExplorer();
-
-			expect(screen.getByText(EMPTY_STATE_TEXT)).toBeInTheDocument();
-		});
-
-		it('should not show empty state when saved view has v5 aggregations format', () => {
-			(useSearchParams as jest.Mock).mockReturnValue([
-				new URLSearchParams({}),
-				mockSetSearchParams,
-			]);
-			jest.spyOn(useGetMetricsHooks, 'useGetMetrics').mockReturnValue({
-				isLoading: false,
-				isError: false,
-				metrics: [MOCK_METRIC_METADATA],
-			});
-
-			// saved view loaded back from v5 format
-			// aggregateAttribute.key is empty (lost in v3/v4 -> v5 -> v3/v4 round trip)
-			// but aggregations[0].metricName has metric name
-			// TODO(srikanthccv): remove this mess
-			const mockQueryData = {
-				...initialQueriesMap[DataSource.METRICS].builder.queryData[0],
-				aggregateAttribute: {
-					...(initialQueriesMap[DataSource.METRICS].builder.queryData[0]
-						.aggregateAttribute as BaseAutocompleteData),
-					key: '',
-				},
-				aggregations: [
-					{
-						metricName: 'http_requests_total',
-						temporality: 'cumulative',
-						timeAggregation: 'rate',
-						spaceAggregation: 'sum',
-					},
-				],
-			};
-			jest.spyOn(useQueryBuilderHooks, 'useQueryBuilder').mockReturnValue(({
-				...mockUseQueryBuilderData,
-				stagedQuery: {
-					...initialQueriesMap[DataSource.METRICS],
-					builder: {
-						...initialQueriesMap[DataSource.METRICS].builder,
-						queryData: [mockQueryData],
-					},
-				},
-			} as Partial<QueryBuilderContextType>) as QueryBuilderContextType);
-
-			renderExplorer();
-
-			expect(screen.queryByText(EMPTY_STATE_TEXT)).not.toBeInTheDocument();
-		});
-
-		it('should not show empty state when query uses v3 aggregateAttribute format', () => {
-			(useSearchParams as jest.Mock).mockReturnValue([
-				new URLSearchParams({}),
-				mockSetSearchParams,
-			]);
-			jest.spyOn(useGetMetricsHooks, 'useGetMetrics').mockReturnValue({
-				isLoading: false,
-				isError: false,
-				metrics: [MOCK_METRIC_METADATA],
-			});
-
-			const mockQueryData = {
-				...initialQueriesMap[DataSource.METRICS].builder.queryData[0],
-				aggregateAttribute: {
-					...(initialQueriesMap[DataSource.METRICS].builder.queryData[0]
-						.aggregateAttribute as BaseAutocompleteData),
-					key: 'system_cpu_usage',
-				},
-			};
-			jest.spyOn(useQueryBuilderHooks, 'useQueryBuilder').mockReturnValue(({
-				...mockUseQueryBuilderData,
-				stagedQuery: {
-					...initialQueriesMap[DataSource.METRICS],
-					builder: {
-						...initialQueriesMap[DataSource.METRICS].builder,
-						queryData: [mockQueryData],
-					},
-				},
-			} as Partial<QueryBuilderContextType>) as QueryBuilderContextType);
-
-			renderExplorer();
-
-			expect(screen.queryByText(EMPTY_STATE_TEXT)).not.toBeInTheDocument();
-		});
-	});
 });

frontend/src/container/MetricsExplorer/Explorer/__tests__/TimeSeries.test.tsx

@@ -1,4 +1,4 @@
-import { render, screen } from '@testing-library/react';
+import { render, RenderResult, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import * as metricsExplorerHooks from 'api/generated/services/metrics';
 
@@ -56,7 +56,7 @@ const mockSetYAxisUnit = jest.fn();
 
 function renderTimeSeries(
 	overrides: Partial<TimeSeriesProps> = {},
-): ReturnType<typeof render> {
+): RenderResult {
 	return render(
 		<TimeSeries
 			showOneChartPerQuery={false}
@@ -84,57 +84,45 @@ describe('TimeSeries', () => {
 		} as Partial<UseUpdateMetricMetadataReturnType>) as UseUpdateMetricMetadataReturnType);
 	});
 
-	it('shows select metric message when no metric is selected', () => {
-		renderTimeSeries({ metricNames: [] });
-
-		expect(
-			screen.getByText('Select a metric and run a query to see the results'),
-		).toBeInTheDocument();
-		expect(screen.queryByText('TimeSeriesView')).not.toBeInTheDocument();
-	});
-
-	it('renders chart view when a metric is selected', () => {
-		renderTimeSeries({
-			metricNames: ['metric1'],
-			metricUnits: ['count'],
-			metrics: [MOCK_METRIC_METADATA],
-		});
-
-		expect(screen.getByText('TimeSeriesView')).toBeInTheDocument();
-		expect(
-			screen.queryByText('Select a metric and run a query to see the results'),
-		).not.toBeInTheDocument();
-	});
-
 	it('should render a warning icon when a metric has no unit among multiple metrics', () => {
-		renderTimeSeries({
+		const user = userEvent.setup();
+		const { container } = renderTimeSeries({
 			metricUnits: ['', 'count'],
 			metricNames: ['metric1', 'metric2'],
 			metrics: [undefined, undefined],
 		});
 
-		expect(
-			screen.getByRole('img', { name: 'no unit warning' }),
-		).toBeInTheDocument();
+		const alertIcon = container.querySelector('.no-unit-warning') as HTMLElement;
+		user.hover(alertIcon);
+		waitFor(() =>
+			expect(
+				screen.findByText('This metric does not have a unit'),
+			).toBeInTheDocument(),
+		);
 	});
 
-	it('warning tooltip shows metric details link', async () => {
+	it('clicking on warning icon tooltip should open metric details modal', async () => {
 		const user = userEvent.setup();
-		renderTimeSeries({
+		const { container } = renderTimeSeries({
 			metricUnits: ['', 'count'],
 			metricNames: ['metric1', 'metric2'],
 			metrics: [MOCK_METRIC_METADATA, MOCK_METRIC_METADATA],
 			yAxisUnit: 'seconds',
 		});
 
-		const alertIcon = screen.getByRole('img', { name: 'no unit warning' });
-		await user.hover(alertIcon);
+		const alertIcon = container.querySelector('.no-unit-warning') as HTMLElement;
+		user.hover(alertIcon);
 
-		expect(await screen.findByText('metric details')).toBeInTheDocument();
+		const metricDetailsLink = await screen.findByText('metric details');
+		user.click(metricDetailsLink);
+
+		waitFor(() =>
+			expect(mockSetIsMetricDetailsOpen).toHaveBeenCalledWith('metric1'),
+		);
 	});
 
-	it('shows save unit prompt with enabled button when metric has no unit and a unit is selected', async () => {
-		renderTimeSeries({
+	it('shows Save unit button when metric had no unit but one is selected', async () => {
+		const { findByText, getByRole } = renderTimeSeries({
 			metricUnits: [undefined],
 			metricNames: ['metric1'],
 			metrics: [MOCK_METRIC_METADATA],
@@ -143,10 +131,38 @@ describe('TimeSeries', () => {
 		});
 
 		expect(
-			await screen.findByText('Set the selected unit as the metric unit?'),
+			await findByText('Save the selected unit for this metric?'),
 		).toBeInTheDocument();
 
-		const yesButton = screen.getByRole('button', { name: 'Yes' });
+		const yesButton = getByRole('button', { name: 'Yes' });
+		expect(yesButton).toBeInTheDocument();
 		expect(yesButton).toBeEnabled();
 	});
+
+	it('clicking on save unit button shoould upated metric metadata', async () => {
+		const user = userEvent.setup();
+		const { getByRole } = renderTimeSeries({
+			metricUnits: [''],
+			metricNames: ['metric1'],
+			metrics: [MOCK_METRIC_METADATA],
+			yAxisUnit: 'seconds',
+			showYAxisUnitSelector: true,
+		});
+
+		const yesButton = getByRole('button', { name: /Yes/i });
+		await user.click(yesButton);
+
+		expect(mockUpdateMetricMetadata).toHaveBeenCalledWith(
+			{
+				pathParams: {
+					metricName: 'metric1',
+				},
+				data: expect.objectContaining({ unit: 'seconds' }),
+			},
+			expect.objectContaining({
+				onSuccess: expect.any(Function),
+				onError: expect.any(Function),
+			}),
+		);
+	});
 });

frontend/src/container/MetricsExplorer/Explorer/__tests__/utils.test.tsx

@@ -139,14 +139,4 @@ describe('getMetricUnits', () => {
 		expect(result).toHaveLength(1);
 		expect(result[0]).toBe('s');
 	});
-
-	it('should return undefined for metrics with no unit', () => {
-		const result = getMetricUnits([
-			{ ...MOCK_METRIC_METADATA, unit: '' },
-			{ ...MOCK_METRIC_METADATA, unit: '' },
-		]);
-		expect(result).toHaveLength(2);
-		expect(result[0]).toBeUndefined();
-		expect(result[1]).toBeUndefined();
-	});
 });

frontend/src/container/MetricsExplorer/Inspect/MetricNameSearch.tsx

@@ -1,7 +1,7 @@
 import { useState } from 'react';
 import { Typography } from 'antd';
 import { initialQueriesMap } from 'constants/queryBuilder';
-import { MetricNameSelector } from 'container/QueryBuilder/filters';
+import { AggregatorFilter } from 'container/QueryBuilder/filters';
 import { BaseAutocompleteData } from 'types/api/queryBuilder/queryAutocompleteResponse';
 import { DataSource } from 'types/common/queryBuilder';
 
@@ -27,7 +27,7 @@ function MetricNameSearch({
 			className="inspect-metrics-input-group metric-name-search"
 		>
 			<Typography.Text>From</Typography.Text>
-			<MetricNameSelector
+			<AggregatorFilter
 				defaultValue={searchText ?? ''}
 				query={initialQueriesMap[DataSource.METRICS].builder.queryData[0]}
 				onSelect={handleSetMetricName}

frontend/src/container/MetricsExplorer/Inspect/__tests__/QueryBuilder.test.tsx

@@ -1,9 +1,8 @@
 import { QueryClient, QueryClientProvider } from 'react-query';
 // eslint-disable-next-line no-restricted-imports
 import { Provider } from 'react-redux';
-import { fireEvent, render, screen, within } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import * as metricsService from 'api/generated/services/metrics';
 import { MetricType } from 'api/metricsExplorer/getMetricsList';
 import * as appContextHooks from 'providers/App/App';
 import store from 'store';
@@ -24,31 +23,27 @@ jest.mock('react-router-dom', () => ({
 	}),
 }));
 
-jest.mock('api/generated/services/metrics', () => ({
-	useListMetrics: jest.fn().mockReturnValue({
-		isFetching: false,
-		isError: false,
-		data: { data: { metrics: [] } },
-	}),
-	useUpdateMetricMetadata: jest.fn().mockReturnValue({
-		mutate: jest.fn(),
-		isLoading: false,
-	}),
+jest.mock('container/QueryBuilder/filters', () => ({
+	AggregatorFilter: ({ onSelect, onChange, defaultValue }: any): JSX.Element => (
+		<div data-testid="mock-aggregator-filter">
+			<input
+				data-testid="metric-name-input"
+				defaultValue={defaultValue}
+				onChange={(e: React.ChangeEvent<HTMLInputElement>): void =>
+					onChange({ key: e.target.value })
+				}
+			/>
+			<button
+				type="button"
+				data-testid="select-metric-button"
+				onClick={(): void => onSelect({ key: 'test_metric_2' })}
+			>
+				Select Metric
+			</button>
+		</div>
+	),
 }));
 
-jest.mock('hooks/useDebounce', () => ({
-	__esModule: true,
-	default: <T,>(value: T): T => value,
-}));
-
-jest.mock(
-	'container/QueryBuilder/filters/QueryBuilderSearch/OptionRenderer',
-	() => ({
-		__esModule: true,
-		default: ({ value }: { value: string }): JSX.Element => <span>{value}</span>,
-	}),
-);
-
 jest.spyOn(appContextHooks, 'useAppContext').mockReturnValue({
 	user: {
 		role: 'admin',
@@ -128,24 +123,6 @@ describe('QueryBuilder', () => {
 
 	it('should call setCurrentMetricName when metric name is selected', async () => {
 		const user = userEvent.setup();
-		(metricsService.useListMetrics as jest.Mock).mockReturnValue({
-			isFetching: false,
-			isError: false,
-			data: {
-				data: {
-					metrics: [
-						{
-							metricName: 'test_metric_2',
-							type: 'Sum',
-							isMonotonic: true,
-							description: '',
-							temporality: 'cumulative',
-							unit: '',
-						},
-					],
-				},
-			},
-		});
 
 		render(
 			<QueryClientProvider client={queryClient}>
@@ -160,12 +137,8 @@ describe('QueryBuilder', () => {
 
 		expect(screen.getByText('From')).toBeInTheDocument();
 
-		const input = within(metricNameSearch).getByRole('combobox');
-		fireEvent.change(input, { target: { value: 'test_metric_2' } });
-
-		const options = document.querySelectorAll('.ant-select-item');
-		expect(options.length).toBeGreaterThan(0);
-		await user.click(options[0] as HTMLElement);
+		const selectButton = screen.getByTestId('select-metric-button');
+		await user.click(selectButton);
 
 		expect(mockSetCurrentMetricName).toHaveBeenCalledWith('test_metric_2');
 	});

frontend/src/container/MetricsExplorer/MetricDetails/AllAttributes.tsx

@@ -33,7 +33,6 @@ const COPY_FEEDBACK_DURATION_MS = 1500;
 function AllAttributes({
 	metricName,
 	metricType,
-	isMonotonic,
 	minTime,
 	maxTime,
 }: AllAttributesProps): JSX.Element {
@@ -74,7 +73,6 @@ function AllAttributes({
 				undefined,
 				groupBy,
 				limit,
-				isMonotonic,
 			);
 			handleExplorerTabChange(
 				PANEL_TYPES.TIME_SERIES,
@@ -84,7 +82,6 @@ function AllAttributes({
 					id: metricName,
 				},
 				ROUTES.METRICS_EXPLORER_EXPLORER,
-				true,
 			);
 			logEvent(MetricsExplorerEvents.OpenInExplorerClicked, {
 				[MetricsExplorerEventKeys.MetricName]: metricName,
@@ -93,19 +90,15 @@ function AllAttributes({
 				[MetricsExplorerEventKeys.AttributeKey]: groupBy,
 			});
 		},
-		[metricName, metricType, isMonotonic, handleExplorerTabChange],
+		[metricName, metricType, handleExplorerTabChange],
 	);
 
 	const goToMetricsExploreWithAppliedAttribute = useCallback(
 		(key: string, value: string) => {
-			const compositeQuery = getMetricDetailsQuery(
-				metricName,
-				metricType,
-				{ key, value },
-				undefined,
-				undefined,
-				isMonotonic,
-			);
+			const compositeQuery = getMetricDetailsQuery(metricName, metricType, {
+				key,
+				value,
+			});
 			handleExplorerTabChange(
 				PANEL_TYPES.TIME_SERIES,
 				{
@@ -114,7 +107,6 @@ function AllAttributes({
 					id: metricName,
 				},
 				ROUTES.METRICS_EXPLORER_EXPLORER,
-				true,
 			);
 			logEvent(MetricsExplorerEvents.OpenInExplorerClicked, {
 				[MetricsExplorerEventKeys.MetricName]: metricName,
@@ -124,7 +116,7 @@ function AllAttributes({
 				[MetricsExplorerEventKeys.AttributeValue]: value,
 			});
 		},
-		[metricName, metricType, isMonotonic, handleExplorerTabChange],
+		[metricName, metricType, handleExplorerTabChange],
 	);
 
 	const handleKeyMenuItemClick = useCallback(

frontend/src/container/MetricsExplorer/MetricDetails/AllAttributesValue.tsx

@@ -1,6 +1,7 @@
 import { useCallback, useMemo, useRef, useState } from 'react';
 import { useCopyToClipboard } from 'react-use';
 import { Button, Input, Menu, Popover, Tooltip, Typography } from 'antd';
+import { useNotifications } from 'hooks/useNotifications';
 import { Check, Copy, Search, SquareArrowOutUpRight } from 'lucide-react';
 
 import MetricDetailsErrorState from './MetricDetailsErrorState';
@@ -38,6 +39,7 @@ export function AllAttributesValue({
 	const [allValuesSearch, setAllValuesSearch] = useState('');
 	const [copiedValue, setCopiedValue] = useState<string | null>(null);
 	const [, copyToClipboard] = useCopyToClipboard();
+	const { notifications } = useNotifications();
 	const copyTimerRef = useRef<ReturnType<typeof setTimeout>>();
 
 	const handleCopyWithFeedback = useCallback(
@@ -60,13 +62,21 @@ export function AllAttributesValue({
 					break;
 				case 'copy-value':
 					handleCopyWithFeedback(attribute);
+					notifications.success({
+						message: 'Value copied!',
+					});
 					break;
 				default:
 					break;
 			}
 			setAttributePopoverKey(null);
 		},
-		[goToMetricsExploreWithAppliedAttribute, filterKey, handleCopyWithFeedback],
+		[
+			goToMetricsExploreWithAppliedAttribute,
+			filterKey,
+			handleCopyWithFeedback,
+			notifications,
+		],
 	);
 
 	const attributePopoverContent = useCallback(
@@ -159,35 +169,26 @@ export function AllAttributesValue({
 
 	return (
 		<div className="all-attributes-value">
-			{filterValue.slice(0, INITIAL_VISIBLE_COUNT).map((attribute) => {
-				const isCopied = copiedValue === attribute;
-				return (
-					<div key={attribute} className="all-attributes-value-item">
-						<Popover
-							content={attributePopoverContent(attribute)}
-							trigger="click"
-							overlayClassName="metric-details-popover attribute-value-popover-overlay"
-							open={attributePopoverKey === `${filterKey}-${attribute}`}
-							onOpenChange={(open): void => {
-								if (!open) {
-									setAttributePopoverKey(null);
-								} else {
-									setAttributePopoverKey(`${filterKey}-${attribute}`);
-								}
-							}}
-						>
-							<Button type="text">
-								<Typography.Text>{attribute}</Typography.Text>
-							</Button>
-						</Popover>
-						{isCopied && (
-							<span className="copy-feedback">
-								<Check size={12} />
-							</span>
-						)}
-					</div>
-				);
-			})}
+			{filterValue.slice(0, INITIAL_VISIBLE_COUNT).map((attribute) => (
+				<Popover
+					key={attribute}
+					content={attributePopoverContent(attribute)}
+					trigger="click"
+					overlayClassName="metric-details-popover attribute-value-popover-overlay"
+					open={attributePopoverKey === `${filterKey}-${attribute}`}
+					onOpenChange={(open): void => {
+						if (!open) {
+							setAttributePopoverKey(null);
+						} else {
+							setAttributePopoverKey(`${filterKey}-${attribute}`);
+						}
+					}}
+				>
+					<Button key={attribute} type="text">
+						<Typography.Text>{attribute}</Typography.Text>
+					</Button>
+				</Popover>
+			))}
 			{filterValue.length > INITIAL_VISIBLE_COUNT && (
 				<Popover
 					content={allValuesPopoverContent}

frontend/src/container/MetricsExplorer/MetricDetails/DashboardsAndAlertsPopover.tsx

@@ -9,6 +9,9 @@ import {
 } from 'api/generated/services/metrics';
 import { QueryParams } from 'constants/query';
 import ROUTES from 'constants/routes';
+import { useSafeNavigate } from 'hooks/useSafeNavigate';
+import useUrlQuery from 'hooks/useUrlQuery';
+import history from 'lib/history';
 import { Bell, Grid } from 'lucide-react';
 import { pluralize } from 'utils/pluralize';
 
@@ -17,6 +20,9 @@ import { DashboardsAndAlertsPopoverProps } from './types';
 function DashboardsAndAlertsPopover({
 	metricName,
 }: DashboardsAndAlertsPopoverProps): JSX.Element | null {
+	const { safeNavigate } = useSafeNavigate();
+	const params = useUrlQuery();
+
 	const {
 		data: alertsData,
 		isLoading: isLoadingAlerts,
@@ -68,10 +74,8 @@ function DashboardsAndAlertsPopover({
 					<Typography.Link
 						key={alert.alertId}
 						onClick={(): void => {
-							window.open(
-								`${ROUTES.ALERT_OVERVIEW}?${QueryParams.ruleId}=${alert.alertId}`,
-								'_blank',
-							);
+							params.set(QueryParams.ruleId, alert.alertId);
+							history.push(`${ROUTES.ALERT_OVERVIEW}?${params.toString()}`);
 						}}
 						className="dashboards-popover-content-item"
 					>
@@ -81,7 +85,7 @@ function DashboardsAndAlertsPopover({
 			}));
 		}
 		return null;
-	}, [alerts]);
+	}, [alerts, params]);
 
 	const dashboardsPopoverContent = useMemo(() => {
 		if (dashboards && dashboards.length > 0) {
@@ -91,11 +95,10 @@ function DashboardsAndAlertsPopover({
 					<Typography.Link
 						key={dashboard.dashboardId}
 						onClick={(): void => {
-							window.open(
+							safeNavigate(
 								generatePath(ROUTES.DASHBOARD, {
 									dashboardId: dashboard.dashboardId,
 								}),
-								'_blank',
 							);
 						}}
 						className="dashboards-popover-content-item"
@@ -106,7 +109,7 @@ function DashboardsAndAlertsPopover({
 			}));
 		}
 		return null;
-	}, [dashboards]);
+	}, [dashboards, safeNavigate]);
 
 	if (isLoadingAlerts || isLoadingDashboards) {
 		return (

frontend/src/container/MetricsExplorer/MetricDetails/MetricDetails.styles.scss

@@ -245,18 +245,6 @@
 							background: var(--bg-slate-300);
 							border-radius: 1px;
 						}
-						.all-attributes-value-item {
-							display: flex;
-							align-items: center;
-							gap: 4px;
-
-							.copy-feedback {
-								display: inline-flex;
-								align-items: center;
-								color: var(--bg-forest-500);
-								animation: fade-in-out 1.5s ease-in-out;
-							}
-						}
 						.ant-btn {
 							text-align: left;
 							width: fit-content;
@@ -410,8 +398,9 @@
 					}
 
 					.all-attributes-key {
-						.all-attributes-contribution {
-							color: var(--bg-slate-400);
+						.ant-typography:last-child {
+							color: var(--bg-vanilla-200);
+							background-color: var(--bg-robin-300);
 						}
 					}
 				}
@@ -593,14 +582,6 @@
 			background: var(--bg-vanilla-100) !important;
 		}
 	}
-
-	.all-values-popover {
-		.all-values-item {
-			&:hover {
-				background: rgba(0, 0, 0, 0.04);
-			}
-		}
-	}
 }
 
 @keyframes fade-in-out {

frontend/src/container/MetricsExplorer/MetricDetails/MetricDetails.tsx

@@ -80,14 +80,7 @@ function MetricDetails({
 
 	const goToMetricsExplorerwithSelectedMetric = useCallback(() => {
 		if (metricName) {
-			const compositeQuery = getMetricDetailsQuery(
-				metricName,
-				metadata?.type,
-				undefined,
-				undefined,
-				undefined,
-				metadata?.isMonotonic,
-			);
+			const compositeQuery = getMetricDetailsQuery(metricName, metadata?.type);
 			handleExplorerTabChange(
 				PANEL_TYPES.TIME_SERIES,
 				{
@@ -96,7 +89,6 @@ function MetricDetails({
 					id: metricName,
 				},
 				ROUTES.METRICS_EXPLORER_EXPLORER,
-				true,
 			);
 			logEvent(MetricsExplorerEvents.OpenInExplorerClicked, {
 				[MetricsExplorerEventKeys.MetricName]: metricName,
@@ -104,12 +96,7 @@ function MetricDetails({
 				[MetricsExplorerEventKeys.Modal]: 'metric-details',
 			});
 		}
-	}, [
-		metricName,
-		handleExplorerTabChange,
-		metadata?.type,
-		metadata?.isMonotonic,
-	]);
+	}, [metricName, handleExplorerTabChange, metadata?.type]);
 
 	useEffect(() => {
 		logEvent(MetricsExplorerEvents.ModalOpened, {
@@ -195,7 +182,6 @@ function MetricDetails({
 				<AllAttributes
 					metricName={metricName}
 					metricType={metadata?.type}
-					isMonotonic={metadata?.isMonotonic}
 					minTime={minTime}
 					maxTime={maxTime}
 				/>

frontend/src/container/MetricsExplorer/MetricDetails/__tests__/DashboardsAndAlertsPopover.test.tsx

@@ -14,8 +14,21 @@ import {
 	MOCK_METRIC_NAME,
 } from './testUtlls';
 
-const mockWindowOpen = jest.fn();
-Object.defineProperty(window, 'open', { value: mockWindowOpen });
+const mockSafeNavigate = jest.fn();
+jest.mock('hooks/useSafeNavigate', () => ({
+	useSafeNavigate: (): any => ({
+		safeNavigate: mockSafeNavigate,
+	}),
+}));
+const mockSetQuery = jest.fn();
+const mockUrlQuery = {
+	set: mockSetQuery,
+	toString: jest.fn(),
+};
+jest.mock('hooks/useUrlQuery', () => ({
+	__esModule: true,
+	default: jest.fn(() => mockUrlQuery),
+}));
 
 const useGetMetricAlertsMock = jest.spyOn(
 	metricsExplorerHooks,
@@ -30,7 +43,6 @@ describe('DashboardsAndAlertsPopover', () => {
 	beforeEach(() => {
 		useGetMetricAlertsMock.mockReturnValue(getMockAlertsData());
 		useGetMetricDashboardsMock.mockReturnValue(getMockDashboardsData());
-		mockWindowOpen.mockClear();
 	});
 
 	it('renders the popover correctly with multiple dashboards and alerts', () => {
@@ -128,10 +140,9 @@ describe('DashboardsAndAlertsPopover', () => {
 		// Click on the first dashboard
 		await userEvent.click(screen.getByText(MOCK_DASHBOARD_1.dashboardName));
 
-		// Should open dashboard in new tab
-		expect(mockWindowOpen).toHaveBeenCalledWith(
+		// Should navigate to the dashboard
+		expect(mockSafeNavigate).toHaveBeenCalledWith(
 			`/dashboard/${MOCK_DASHBOARD_1.dashboardId}`,
-			'_blank',
 		);
 	});
 
@@ -147,9 +158,10 @@ describe('DashboardsAndAlertsPopover', () => {
 		// Click on the first alert rule
 		await userEvent.click(screen.getByText(MOCK_ALERT_1.alertName));
 
-		expect(mockWindowOpen).toHaveBeenCalledWith(
-			`/alerts/overview?${QueryParams.ruleId}=${MOCK_ALERT_1.alertId}`,
-			'_blank',
+		// Should navigate to the alert rule
+		expect(mockSetQuery).toHaveBeenCalledWith(
+			QueryParams.ruleId,
+			MOCK_ALERT_1.alertId,
 		);
 	});
 

frontend/src/container/MetricsExplorer/MetricDetails/__tests__/utils.test.ts

@@ -2,7 +2,6 @@ import {
 	MetrictypesTemporalityDTO,
 	MetrictypesTypeDTO,
 } from 'api/generated/services/sigNoz.schemas';
-import { ATTRIBUTE_TYPES } from 'constants/queryBuilder';
 
 import {
 	determineIsMonotonic,
@@ -140,7 +139,7 @@ describe('MetricDetails utils', () => {
 				TEST_METRIC_NAME,
 			);
 			expect(query.builder.queryData[0]?.aggregateAttribute?.type).toBe(
-				ATTRIBUTE_TYPES.SUM,
+				MetrictypesTypeDTO.sum,
 			);
 			expect(query.builder.queryData[0]?.aggregateOperator).toBe('rate');
 			expect(query.builder.queryData[0]?.timeAggregation).toBe('rate');
@@ -157,7 +156,7 @@ describe('MetricDetails utils', () => {
 				TEST_METRIC_NAME,
 			);
 			expect(query.builder.queryData[0]?.aggregateAttribute?.type).toBe(
-				ATTRIBUTE_TYPES.GAUGE,
+				MetrictypesTypeDTO.gauge,
 			);
 			expect(query.builder.queryData[0]?.aggregateOperator).toBe('avg');
 			expect(query.builder.queryData[0]?.timeAggregation).toBe('avg');
@@ -174,7 +173,7 @@ describe('MetricDetails utils', () => {
 				TEST_METRIC_NAME,
 			);
 			expect(query.builder.queryData[0]?.aggregateAttribute?.type).toBe(
-				ATTRIBUTE_TYPES.GAUGE,
+				MetrictypesTypeDTO.summary,
 			);
 			expect(query.builder.queryData[0]?.aggregateOperator).toBe('noop');
 			expect(query.builder.queryData[0]?.timeAggregation).toBe('noop');
@@ -191,7 +190,7 @@ describe('MetricDetails utils', () => {
 				TEST_METRIC_NAME,
 			);
 			expect(query.builder.queryData[0]?.aggregateAttribute?.type).toBe(
-				ATTRIBUTE_TYPES.HISTOGRAM,
+				MetrictypesTypeDTO.histogram,
 			);
 			expect(query.builder.queryData[0]?.aggregateOperator).toBe('noop');
 			expect(query.builder.queryData[0]?.timeAggregation).toBe('noop');
@@ -208,7 +207,7 @@ describe('MetricDetails utils', () => {
 				TEST_METRIC_NAME,
 			);
 			expect(query.builder.queryData[0]?.aggregateAttribute?.type).toBe(
-				ATTRIBUTE_TYPES.EXPONENTIAL_HISTOGRAM,
+				MetrictypesTypeDTO.exponentialhistogram,
 			);
 			expect(query.builder.queryData[0]?.aggregateOperator).toBe('noop');
 			expect(query.builder.queryData[0]?.timeAggregation).toBe('noop');

frontend/src/container/MetricsExplorer/MetricDetails/types.ts

@@ -34,7 +34,6 @@ export interface MetadataProps {
 export interface AllAttributesProps {
 	metricName: string;
 	metricType: MetrictypesTypeDTO | undefined;
-	isMonotonic?: boolean;
 	minTime?: number;
 	maxTime?: number;
 }

frontend/src/container/MetricsExplorer/MetricDetails/utils.tsx

@@ -5,7 +5,7 @@ import {
 	MetrictypesTypeDTO,
 } from 'api/generated/services/sigNoz.schemas';
 import { SpaceAggregation, TimeAggregation } from 'api/v5/v5';
-import { initialQueriesMap, toAttributeType } from 'constants/queryBuilder';
+import { initialQueriesMap } from 'constants/queryBuilder';
 import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
 import { Query } from 'types/api/queryBuilder/queryBuilderData';
 import { DataSource, ReduceOperators } from 'types/common/queryBuilder';
@@ -88,25 +88,15 @@ export function getMetricDetailsQuery(
 	filter?: { key: string; value: string },
 	groupBy?: string,
 	limit?: number,
-	isMonotonic?: boolean,
 ): Query {
 	let timeAggregation;
 	let spaceAggregation;
 	let aggregateOperator;
-	const isNonMonotonicSum =
-		metricType === MetrictypesTypeDTO.sum && isMonotonic === false;
-
 	switch (metricType) {
 		case MetrictypesTypeDTO.sum:
-			if (isNonMonotonicSum) {
-				timeAggregation = 'avg';
-				spaceAggregation = 'avg';
-				aggregateOperator = 'avg';
-			} else {
-				timeAggregation = 'rate';
-				spaceAggregation = 'sum';
-				aggregateOperator = 'rate';
-			}
+			timeAggregation = 'rate';
+			spaceAggregation = 'sum';
+			aggregateOperator = 'rate';
 			break;
 		case MetrictypesTypeDTO.gauge:
 			timeAggregation = 'avg';
@@ -131,8 +121,6 @@ export function getMetricDetailsQuery(
 			break;
 	}
 
-	const attributeType = toAttributeType(metricType, isMonotonic);
-
 	return {
 		...initialQueriesMap[DataSource.METRICS],
 		builder: {
@@ -141,8 +129,8 @@ export function getMetricDetailsQuery(
 					...initialQueriesMap[DataSource.METRICS].builder.queryData[0],
 					aggregateAttribute: {
 						key: metricName,
-						type: attributeType,
-						id: `${metricName}----${attributeType}---string--`,
+						type: metricType ?? '',
+						id: `${metricName}----${metricType}---string--`,
 						dataType: DataTypes.String,
 					},
 					aggregations: [

frontend/src/container/MetricsExplorer/Summary/MetricTypeRenderer.tsx

@@ -0,0 +1,76 @@
+import { useMemo } from 'react';
+import { Color } from '@signozhq/design-tokens';
+import { Typography } from 'antd';
+import { MetricType } from 'api/metricsExplorer/getMetricsList';
+import {
+	BarChart,
+	BarChart2,
+	BarChartHorizontal,
+	Diff,
+	Gauge,
+} from 'lucide-react';
+
+import { METRIC_TYPE_LABEL_MAP } from './constants';
+
+// TODO: @amlannandy Delete this component after API migration is complete
+function MetricTypeRenderer({ type }: { type: MetricType }): JSX.Element {
+	const [icon, color] = useMemo(() => {
+		switch (type) {
+			case MetricType.SUM:
+				return [
+					<Diff key={type} size={12} color={Color.BG_ROBIN_500} />,
+					Color.BG_ROBIN_500,
+				];
+			case MetricType.GAUGE:
+				return [
+					<Gauge key={type} size={12} color={Color.BG_SAKURA_500} />,
+					Color.BG_SAKURA_500,
+				];
+			case MetricType.HISTOGRAM:
+				return [
+					<BarChart2 key={type} size={12} color={Color.BG_SIENNA_500} />,
+					Color.BG_SIENNA_500,
+				];
+			case MetricType.SUMMARY:
+				return [
+					<BarChartHorizontal key={type} size={12} color={Color.BG_FOREST_500} />,
+					Color.BG_FOREST_500,
+				];
+			case MetricType.EXPONENTIAL_HISTOGRAM:
+				return [
+					<BarChart key={type} size={12} color={Color.BG_AQUA_500} />,
+					Color.BG_AQUA_500,
+				];
+			default:
+				return [null, ''];
+		}
+	}, [type]);
+
+	const metricTypeRendererStyle = useMemo(
+		() => ({
+			backgroundColor: `${color}33`,
+			border: `1px solid ${color}`,
+			color,
+		}),
+		[color],
+	);
+
+	const metricTypeRendererTextStyle = useMemo(
+		() => ({
+			color,
+			fontSize: 12,
+		}),
+		[color],
+	);
+
+	return (
+		<div className="metric-type-renderer" style={metricTypeRendererStyle}>
+			{icon}
+			<Typography.Text style={metricTypeRendererTextStyle}>
+				{METRIC_TYPE_LABEL_MAP[type]}
+			</Typography.Text>
+		</div>
+	);
+}
+
+export default MetricTypeRenderer;

frontend/src/container/MetricsExplorer/Summary/MetricsSearch.tsx

@@ -47,7 +47,7 @@ function MetricsSearch({
 					}}
 					onRun={handleRunQuery}
 					showFilterSuggestionsWithoutMetric
-					placeholder="Search your metrics. Try service.name='api' to see all API service metrics, or http.client for HTTP client metrics."
+					placeholder="Try metric_name CONTAINS 'http.server' to view all HTTP Server metrics being sent"
 				/>
 			</div>
 			<RunQueryBtn

frontend/src/container/MetricsExplorer/Summary/MetricsTable.tsx

@@ -10,7 +10,6 @@ import {
 } from 'antd';
 import { SorterResult } from 'antd/es/table/interface';
 import { Querybuildertypesv5OrderDirectionDTO } from 'api/generated/services/sigNoz.schemas';
-import ErrorInPlace from 'components/ErrorInPlace/ErrorInPlace';
 import { Info } from 'lucide-react';
 
 import { MetricsListItemRowData, MetricsTableProps } from './types';
@@ -19,7 +18,6 @@ import { getMetricsTableColumns } from './utils';
 function MetricsTable({
 	isLoading,
 	isError,
-	error,
 	data,
 	pageSize,
 	currentPage,
@@ -73,54 +71,54 @@ function MetricsTable({
 					<Info size={16} />
 				</Tooltip>
 			</div>
-			{isError && error ? (
-				<ErrorInPlace error={error} />
-			) : (
-				<Table
-					loading={{
-						spinning: isLoading,
-						indicator: (
-							<Spin
-								data-testid="metrics-table-loading-state"
-								indicator={<LoadingOutlined size={14} spin />}
+			<Table
+				loading={{
+					spinning: isLoading,
+					indicator: (
+						<Spin
+							data-testid="metrics-table-loading-state"
+							indicator={<LoadingOutlined size={14} spin />}
+						/>
+					),
+				}}
+				dataSource={data}
+				columns={getMetricsTableColumns(queryFilterExpression, onFilterChange)}
+				locale={{
+					emptyText: isLoading ? null : (
+						<div
+							className="no-metrics-message-container"
+							data-testid={
+								isError ? 'metrics-table-error-state' : 'metrics-table-empty-state'
+							}
+						>
+							<img
+								src="/Icons/emptyState.svg"
+								alt="thinking-emoji"
+								className="empty-state-svg"
 							/>
-						),
-					}}
-					dataSource={data}
-					columns={getMetricsTableColumns(queryFilterExpression, onFilterChange)}
-					locale={{
-						emptyText: isLoading ? null : (
-							<div
-								className="no-metrics-message-container"
-								data-testid="metrics-table-empty-state"
-							>
-								<img
-									src="/Icons/emptyState.svg"
-									alt="thinking-emoji"
-									className="empty-state-svg"
-								/>
-								<Typography.Text className="no-metrics-message">
-									This query had no results. Edit your query and try again!
-								</Typography.Text>
-							</div>
-						),
-					}}
-					tableLayout="fixed"
-					onChange={handleTableChange}
-					pagination={{
-						current: currentPage,
-						pageSize,
-						showSizeChanger: true,
-						hideOnSinglePage: false,
-						onChange: onPaginationChange,
-						total: totalCount,
-					}}
-					onRow={(record): { onClick: () => void; className: string } => ({
-						onClick: (): void => openMetricDetails(record.key, 'list'),
-						className: 'clickable-row',
-					})}
-				/>
-			)}
+							<Typography.Text className="no-metrics-message">
+								{isError
+									? 'Error fetching metrics. If the problem persists, please contact support.'
+									: 'This query had no results. Edit your query and try again!'}
+							</Typography.Text>
+						</div>
+					),
+				}}
+				tableLayout="fixed"
+				onChange={handleTableChange}
+				pagination={{
+					current: currentPage,
+					pageSize,
+					showSizeChanger: true,
+					hideOnSinglePage: false,
+					onChange: onPaginationChange,
+					total: totalCount,
+				}}
+				onRow={(record): { onClick: () => void; className: string } => ({
+					onClick: (): void => openMetricDetails(record.key, 'list'),
+					className: 'clickable-row',
+				})}
+			/>
 		</div>
 	);
 }

frontend/src/container/MetricsExplorer/Summary/MetricsTreemap.tsx

@@ -4,7 +4,6 @@ import { Group } from '@visx/group';
 import { Treemap } from '@visx/hierarchy';
 import { Empty, Select, Skeleton, Tooltip, Typography } from 'antd';
 import { MetricsexplorertypesTreemapModeDTO } from 'api/generated/services/sigNoz.schemas';
-import ErrorInPlace from 'components/ErrorInPlace/ErrorInPlace';
 import { HierarchyNode, stratify, treemapBinary } from 'd3-hierarchy';
 import { Info } from 'lucide-react';
 
@@ -28,7 +27,6 @@ import {
 function MetricsTreemapInternal({
 	isLoading,
 	isError,
-	error,
 	data,
 	viewType,
 	openMetricDetails,
@@ -93,10 +91,6 @@ function MetricsTreemapInternal({
 		);
 	}
 
-	if (isError && error) {
-		return <ErrorInPlace error={error} />;
-	}
-
 	if (isError) {
 		return (
 			<Empty
@@ -180,7 +174,6 @@ function MetricsTreemap({
 	data,
 	isLoading,
 	isError,
-	error,
 	openMetricDetails,
 	setHeatmapView,
 }: MetricsTreemapProps): JSX.Element {
@@ -209,7 +202,6 @@ function MetricsTreemap({
 			<MetricsTreemapInternal
 				isLoading={isLoading}
 				isError={isError}
-				error={error}
 				data={data}
 				viewType={viewType}
 				openMetricDetails={openMetricDetails}

frontend/src/container/MetricsExplorer/Summary/Summary.tsx

@@ -4,7 +4,6 @@ import { useSelector } from 'react-redux';
 import { useSearchParams } from 'react-router-dom-v5-compat';
 import * as Sentry from '@sentry/react';
 import logEvent from 'api/common/logEvent';
-import { convertToApiError } from 'api/ErrorResponseHandlerForGeneratedAPIs';
 import {
 	useGetMetricsStats,
 	useGetMetricsTreemap,
@@ -64,20 +63,13 @@ function Summary(): JSX.Element {
 		MetricsexplorertypesTreemapModeDTO.samples,
 	);
 
-	const {
-		currentQuery,
-		stagedQuery,
-		redirectWithQueryBuilderData,
-	} = useQueryBuilder();
+	const { currentQuery, redirectWithQueryBuilderData } = useQueryBuilder();
 
 	useShareBuilderUrl({ defaultValue: initialQueriesMap[DataSource.METRICS] });
 
-	const query = useMemo(
-		() =>
-			stagedQuery?.builder?.queryData?.[0] ||
-			initialQueriesMap[DataSource.METRICS].builder.queryData[0],
-		[stagedQuery],
-	);
+	const query = useMemo(() => currentQuery?.builder?.queryData[0], [
+		currentQuery,
+	]);
 
 	const [searchParams, setSearchParams] = useSearchParams();
 	const [isMetricDetailsOpen, setIsMetricDetailsOpen] = useState(
@@ -94,16 +86,14 @@ function Summary(): JSX.Element {
 		(state) => state.globalTime,
 	);
 
-	const appliedFilterExpression = query?.filter?.expression || '';
-
 	const [
 		currentQueryFilterExpression,
 		setCurrentQueryFilterExpression,
-	] = useState<string>(appliedFilterExpression);
+	] = useState<string>(query?.filter?.expression || '');
 
-	useEffect(() => {
-		setCurrentQueryFilterExpression(appliedFilterExpression);
-	}, [appliedFilterExpression]);
+	const [appliedFilterExpression, setAppliedFilterExpression] = useState(
+		query?.filter?.expression || '',
+	);
 
 	const queryFilterExpression = useMemo(
 		() => ({ expression: appliedFilterExpression }),
@@ -160,7 +150,6 @@ function Summary(): JSX.Element {
 		mutate: getMetricsStats,
 		isLoading: isGetMetricsStatsLoading,
 		isError: isGetMetricsStatsError,
-		error: metricsStatsError,
 	} = useGetMetricsStats();
 
 	const {
@@ -168,19 +157,8 @@ function Summary(): JSX.Element {
 		mutate: getMetricsTreemap,
 		isLoading: isGetMetricsTreemapLoading,
 		isError: isGetMetricsTreemapError,
-		error: metricsTreemapError,
 	} = useGetMetricsTreemap();
 
-	const metricsStatsApiError = useMemo(
-		() => convertToApiError(metricsStatsError),
-		[metricsStatsError],
-	);
-
-	const metricsTreemapApiError = useMemo(
-		() => convertToApiError(metricsTreemapError),
-		[metricsTreemapError],
-	);
-
 	useEffect(() => {
 		getMetricsStats({
 			data: metricsListQuery,
@@ -214,6 +192,8 @@ function Summary(): JSX.Element {
 					],
 				},
 			});
+			setCurrentQueryFilterExpression(expression);
+			setAppliedFilterExpression(expression);
 			setCurrentPage(1);
 			if (expression) {
 				logEvent(MetricsExplorerEvents.FilterApplied, {
@@ -310,14 +290,10 @@ function Summary(): JSX.Element {
 	};
 
 	const isMetricsListDataEmpty =
-		formattedMetricsData.length === 0 &&
-		!isGetMetricsStatsLoading &&
-		!isGetMetricsStatsError;
+		formattedMetricsData.length === 0 && !isGetMetricsStatsLoading;
 
 	const isMetricsTreeMapDataEmpty =
-		!treeMapData?.data[heatmapView]?.length &&
-		!isGetMetricsTreemapLoading &&
-		!isGetMetricsTreemapError;
+		!treeMapData?.data[heatmapView]?.length && !isGetMetricsTreemapLoading;
 
 	const showFullScreenLoading =
 		(isGetMetricsStatsLoading || isGetMetricsTreemapLoading) &&
@@ -336,9 +312,7 @@ function Summary(): JSX.Element {
 				/>
 				{showFullScreenLoading ? (
 					<MetricsLoading />
-				) : isMetricsListDataEmpty &&
-				  isMetricsTreeMapDataEmpty &&
-				  !appliedFilterExpression ? (
+				) : isMetricsListDataEmpty && isMetricsTreeMapDataEmpty ? (
 					<NoLogs dataSource={DataSource.METRICS} />
 				) : (
 					<>
@@ -346,7 +320,6 @@ function Summary(): JSX.Element {
 							data={treeMapData?.data}
 							isLoading={isGetMetricsTreemapLoading}
 							isError={isGetMetricsTreemapError}
-							error={metricsTreemapApiError}
 							viewType={heatmapView}
 							openMetricDetails={openMetricDetails}
 							setHeatmapView={handleSetHeatmapView}
@@ -354,7 +327,6 @@ function Summary(): JSX.Element {
 						<MetricsTable
 							isLoading={isGetMetricsStatsLoading}
 							isError={isGetMetricsStatsError}
-							error={metricsStatsApiError}
 							data={formattedMetricsData}
 							pageSize={pageSize}
 							currentPage={currentPage}

frontend/src/container/MetricsExplorer/Summary/__tests__/MetricTypeRenderer.test.tsx

@@ -0,0 +1,63 @@
+import { Color } from '@signozhq/design-tokens';
+import { render, screen } from '@testing-library/react';
+import { MetricType } from 'api/metricsExplorer/getMetricsList';
+
+import MetricTypeRenderer from '../MetricTypeRenderer';
+
+jest.mock('lucide-react', () => {
+	return {
+		__esModule: true,
+		Diff: (): JSX.Element => <svg data-testid="diff-icon" />,
+		Gauge: (): JSX.Element => <svg data-testid="gauge-icon" />,
+		BarChart2: (): JSX.Element => <svg data-testid="bar-chart-2-icon" />,
+		BarChartHorizontal: (): JSX.Element => (
+			<svg data-testid="bar-chart-horizontal-icon" />
+		),
+		BarChart: (): JSX.Element => <svg data-testid="bar-chart-icon" />,
+	};
+});
+
+describe('MetricTypeRenderer', () => {
+	it('should render correct icon and color for each metric type', () => {
+		const types = [
+			{
+				type: MetricType.SUM,
+				color: Color.BG_ROBIN_500,
+				iconTestId: 'diff-icon',
+			},
+			{
+				type: MetricType.GAUGE,
+				color: Color.BG_SAKURA_500,
+				iconTestId: 'gauge-icon',
+			},
+			{
+				type: MetricType.HISTOGRAM,
+				color: Color.BG_SIENNA_500,
+				iconTestId: 'bar-chart-2-icon',
+			},
+			{
+				type: MetricType.SUMMARY,
+				color: Color.BG_FOREST_500,
+				iconTestId: 'bar-chart-horizontal-icon',
+			},
+			{
+				type: MetricType.EXPONENTIAL_HISTOGRAM,
+				color: Color.BG_AQUA_500,
+				iconTestId: 'bar-chart-icon',
+			},
+		];
+
+		types.forEach(({ type, color, iconTestId }) => {
+			const { container } = render(<MetricTypeRenderer type={type} />);
+			const rendererDiv = container.firstChild as HTMLElement;
+
+			expect(rendererDiv).toHaveStyle({
+				backgroundColor: `${color}33`,
+				border: `1px solid ${color}`,
+				color,
+			});
+
+			expect(screen.getByTestId(iconTestId)).toBeInTheDocument();
+		});
+	});
+});

frontend/src/container/MetricsExplorer/Summary/__tests__/MetricsTable.test.tsx

@@ -6,7 +6,6 @@ import { Filter } from 'api/v5/v5';
 import * as useGetMetricsListFilterValues from 'hooks/metricsExplorer/useGetMetricsListFilterValues';
 import * as useQueryBuilderOperationsHooks from 'hooks/queryBuilder/useQueryBuilderOperations';
 import store from 'store';
-import APIError from 'types/api/error';
 
 import MetricsTable from '../MetricsTable';
 import { MetricsListItemRowData } from '../types';
@@ -120,23 +119,12 @@ describe('MetricsTable', () => {
 	});
 
 	it('shows error state', () => {
-		const mockError = new APIError({
-			httpStatusCode: 400,
-			error: {
-				code: '400',
-				message: 'invalid filter expression',
-				url: '',
-				errors: [],
-			},
-		});
-
 		render(
 			<MemoryRouter>
 				<Provider store={store}>
 					<MetricsTable
 						isLoading={false}
 						isError
-						error={mockError}
 						data={[]}
 						pageSize={10}
 						currentPage={1}
@@ -151,8 +139,12 @@ describe('MetricsTable', () => {
 			</MemoryRouter>,
 		);
 
-		expect(screen.getByText('400')).toBeInTheDocument();
-		expect(screen.getByText('invalid filter expression')).toBeInTheDocument();
+		expect(screen.getByTestId('metrics-table-error-state')).toBeInTheDocument();
+		expect(
+			screen.getByText(
+				'Error fetching metrics. If the problem persists, please contact support.',
+			),
+		).toBeInTheDocument();
 	});
 
 	it('shows empty state when no data', () => {

frontend/src/container/MetricsExplorer/Summary/__tests__/Summary.test.tsx

@@ -1,12 +1,16 @@
+import { QueryClient, QueryClientProvider } from 'react-query';
+// eslint-disable-next-line no-restricted-imports
+import { Provider } from 'react-redux';
 import { useSearchParams } from 'react-router-dom-v5-compat';
-import * as metricsHooks from 'api/generated/services/metrics';
-import { initialQueriesMap } from 'constants/queryBuilder';
+import { MetricType } from 'api/metricsExplorer/getMetricsList';
 import ROUTES from 'constants/routes';
-import * as useQueryBuilderHooks from 'hooks/queryBuilder/useQueryBuilder';
-import { render, screen, waitFor } from 'tests/test-utils';
-import { DataSource, QueryBuilderContextType } from 'types/common/queryBuilder';
+import * as useGetMetricsListHooks from 'hooks/metricsExplorer/useGetMetricsList';
+import * as useGetMetricsTreeMapHooks from 'hooks/metricsExplorer/useGetMetricsTreeMap';
+import store from 'store';
+import { render, screen } from 'tests/test-utils';
 
 import Summary from '../Summary';
+import { TreemapViewType } from '../types';
 
 jest.mock('d3-hierarchy', () => ({
 	stratify: jest.fn().mockReturnValue({
@@ -40,135 +44,58 @@ jest.mock('react-router-dom', () => ({
 		pathname: `${ROUTES.METRICS_EXPLORER_BASE}`,
 	}),
 }));
-jest.mock('hooks/queryBuilder/useShareBuilderUrl', () => ({
-	useShareBuilderUrl: jest.fn(),
-}));
 
-// so filter expression assertions easy
-jest.mock('../MetricsSearch', () => {
-	return function MockMetricsSearch(props: {
-		currentQueryFilterExpression: string;
-	}): JSX.Element {
-		return (
-			<div data-testid="metrics-search-expression">
-				{props.currentQueryFilterExpression}
-			</div>
-		);
-	};
-});
-
-const mockSetSearchParams = jest.fn();
-const mockGetMetricsStats = jest.fn();
-const mockGetMetricsTreemap = jest.fn();
-
-const mockUseQueryBuilderData = {
-	handleRunQuery: jest.fn(),
-	stagedQuery: initialQueriesMap[DataSource.METRICS],
-	updateAllQueriesOperators: jest.fn(),
-	currentQuery: initialQueriesMap[DataSource.METRICS],
-	resetQuery: jest.fn(),
-	redirectWithQueryBuilderData: jest.fn(),
-	isStagedQueryUpdated: jest.fn(),
-	handleSetQueryData: jest.fn(),
-	handleSetFormulaData: jest.fn(),
-	handleSetQueryItemData: jest.fn(),
-	handleSetConfig: jest.fn(),
-	removeQueryBuilderEntityByIndex: jest.fn(),
-	removeQueryTypeItemByIndex: jest.fn(),
-	isDefaultQuery: jest.fn(),
-};
-
-const useGetMetricsStatsSpy = jest.spyOn(metricsHooks, 'useGetMetricsStats');
-const useGetMetricsTreemapSpy = jest.spyOn(
-	metricsHooks,
-	'useGetMetricsTreemap',
-);
-const useQueryBuilderSpy = jest.spyOn(useQueryBuilderHooks, 'useQueryBuilder');
-
-describe('Summary', () => {
-	beforeEach(() => {
-		jest.clearAllMocks();
-
-		(useSearchParams as jest.Mock).mockReturnValue([
-			new URLSearchParams(),
-			mockSetSearchParams,
-		]);
-
-		useGetMetricsStatsSpy.mockReturnValue({
-			data: null,
-			mutate: mockGetMetricsStats,
-			isLoading: true,
-			isError: false,
-			error: null,
-			isIdle: true,
-			isSuccess: false,
-			reset: jest.fn(),
-			status: 'idle',
-		} as any);
-
-		useGetMetricsTreemapSpy.mockReturnValue({
-			data: null,
-			mutate: mockGetMetricsTreemap,
-			isLoading: true,
-			isError: false,
-			error: null,
-			isIdle: true,
-			isSuccess: false,
-			reset: jest.fn(),
-			status: 'idle',
-		} as any);
-
-		useQueryBuilderSpy.mockReturnValue(({
-			...mockUseQueryBuilderData,
-		} as Partial<QueryBuilderContextType>) as QueryBuilderContextType);
-	});
-
-	it('does not carry filter expression from a previous page', async () => {
-		const staleFilterExpression = "service.name = 'redis'";
-
-		// prev filter from logs explorer
-		const staleQuery = {
-			...initialQueriesMap[DataSource.METRICS],
-			builder: {
-				...initialQueriesMap[DataSource.METRICS].builder,
-				queryData: [
+const queryClient = new QueryClient();
+const mockMetricName = 'test-metric';
+jest.spyOn(useGetMetricsListHooks, 'useGetMetricsList').mockReturnValue({
+	data: {
+		payload: {
+			status: 'success',
+			data: {
+				metrics: [
 					{
-						...initialQueriesMap[DataSource.METRICS].builder.queryData[0],
-						filter: { expression: staleFilterExpression },
+						metric_name: mockMetricName,
+						description: 'description for a test metric',
+						type: MetricType.GAUGE,
+						unit: 'count',
+						lastReceived: '1715702400',
+						[TreemapViewType.TIMESERIES]: 100,
+						[TreemapViewType.SAMPLES]: 100,
 					},
 				],
 			},
-		};
-
-		// stagedQuery has stale filter (before QueryBuilder resets it)
-		useQueryBuilderSpy.mockReturnValue(({
-			...mockUseQueryBuilderData,
-			stagedQuery: staleQuery,
-			currentQuery: staleQuery,
-		} as Partial<QueryBuilderContextType>) as QueryBuilderContextType);
-
-		const { rerender } = render(<Summary />);
-
-		expect(screen.getByTestId('metrics-search-expression')).toHaveTextContent(
-			staleFilterExpression,
-		);
-
-		// QB route change effect resets stagedQuery to null
-		useQueryBuilderSpy.mockReturnValue(({
-			...mockUseQueryBuilderData,
-			stagedQuery: null,
-			currentQuery: initialQueriesMap[DataSource.METRICS],
-		} as Partial<QueryBuilderContextType>) as QueryBuilderContextType);
-
-		rerender(<Summary />);
-
-		await waitFor(() => {
-			expect(
-				screen.getByTestId('metrics-search-expression'),
-			).toBeEmptyDOMElement();
-		});
-	});
+		},
+	},
+	isError: false,
+	isLoading: false,
+} as any);
+jest.spyOn(useGetMetricsTreeMapHooks, 'useGetMetricsTreeMap').mockReturnValue({
+	data: {
+		payload: {
+			status: 'success',
+			data: {
+				[TreemapViewType.TIMESERIES]: [
+					{
+						metric_name: mockMetricName,
+						percentage: 100,
+						total_value: 100,
+					},
+				],
+				[TreemapViewType.SAMPLES]: [
+					{
+						metric_name: mockMetricName,
+						percentage: 100,
+					},
+				],
+			},
+		},
+	},
+	isError: false,
+	isLoading: false,
+} as any);
+const mockSetSearchParams = jest.fn();
 
+describe('Summary', () => {
 	it('persists inspect modal open state across page refresh', () => {
 		(useSearchParams as jest.Mock).mockReturnValue([
 			new URLSearchParams({
@@ -178,7 +105,13 @@ describe('Summary', () => {
 			mockSetSearchParams,
 		]);
 
-		render(<Summary />);
+		render(
+			<QueryClientProvider client={queryClient}>
+				<Provider store={store}>
+					<Summary />
+				</Provider>
+			</QueryClientProvider>,
+		);
 
 		expect(screen.queryByText('Proportion View')).not.toBeInTheDocument();
 	});
@@ -187,12 +120,18 @@ describe('Summary', () => {
 		(useSearchParams as jest.Mock).mockReturnValue([
 			new URLSearchParams({
 				isMetricDetailsOpen: 'true',
-				selectedMetricName: 'test-metric',
+				selectedMetricName: mockMetricName,
 			}),
 			mockSetSearchParams,
 		]);
 
-		render(<Summary />);
+		render(
+			<QueryClientProvider client={queryClient}>
+				<Provider store={store}>
+					<Summary />
+				</Provider>
+			</QueryClientProvider>,
+		);
 
 		expect(screen.queryByText('Proportion View')).not.toBeInTheDocument();
 	});

frontend/src/container/MetricsExplorer/Summary/constants.ts

@@ -2,6 +2,7 @@ import {
 	MetricsexplorertypesTreemapModeDTO,
 	MetrictypesTypeDTO,
 } from 'api/generated/services/sigNoz.schemas';
+import { MetricType } from 'api/metricsExplorer/getMetricsList';
 
 export const METRICS_TABLE_PAGE_SIZE = 10;
 
@@ -18,6 +19,15 @@ export const TREEMAP_SQUARE_PADDING = 5;
 
 export const TREEMAP_MARGINS = { TOP: 10, LEFT: 10, RIGHT: 10, BOTTOM: 10 };
 
+// TODO: Remove this once API migration is complete
+export const METRIC_TYPE_LABEL_MAP = {
+	[MetricType.SUM]: 'Sum',
+	[MetricType.GAUGE]: 'Gauge',
+	[MetricType.HISTOGRAM]: 'Histogram',
+	[MetricType.SUMMARY]: 'Summary',
+	[MetricType.EXPONENTIAL_HISTOGRAM]: 'Exp. Histogram',
+};
+
 export const METRIC_TYPE_VIEW_LABEL_MAP: Record<MetrictypesTypeDTO, string> = {
 	[MetrictypesTypeDTO.sum]: 'Sum',
 	[MetrictypesTypeDTO.gauge]: 'Gauge',
@@ -26,6 +36,15 @@ export const METRIC_TYPE_VIEW_LABEL_MAP: Record<MetrictypesTypeDTO, string> = {
 	[MetrictypesTypeDTO.exponentialhistogram]: 'Exp. Histogram',
 };
 
+// TODO(@amlannandy): To remove this once API migration is complete
+export const METRIC_TYPE_VALUES_MAP: Record<MetricType, string> = {
+	[MetricType.SUM]: 'Sum',
+	[MetricType.GAUGE]: 'Gauge',
+	[MetricType.HISTOGRAM]: 'Histogram',
+	[MetricType.SUMMARY]: 'Summary',
+	[MetricType.EXPONENTIAL_HISTOGRAM]: 'ExponentialHistogram',
+};
+
 export const METRIC_TYPE_VIEW_VALUES_MAP: Record<MetrictypesTypeDTO, string> = {
 	[MetrictypesTypeDTO.sum]: 'Sum',
 	[MetrictypesTypeDTO.gauge]: 'Gauge',

frontend/src/container/MetricsExplorer/Summary/types.ts

@@ -5,13 +5,11 @@ import {
 	Querybuildertypesv5OrderByDTO,
 } from 'api/generated/services/sigNoz.schemas';
 import { Filter } from 'api/v5/v5';
-import APIError from 'types/api/error';
 import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
 
 export interface MetricsTableProps {
 	isLoading: boolean;
 	isError: boolean;
-	error?: APIError;
 	data: MetricsListItemRowData[];
 	pageSize: number;
 	currentPage: number;
@@ -35,7 +33,6 @@ export interface MetricsTreemapProps {
 	data: MetricsexplorertypesTreemapResponseDTO | undefined;
 	isLoading: boolean;
 	isError: boolean;
-	error?: APIError;
 	viewType: MetricsexplorertypesTreemapModeDTO;
 	openMetricDetails: (metricName: string, view: 'list' | 'treemap') => void;
 	setHeatmapView: (value: MetricsexplorertypesTreemapModeDTO) => void;
@@ -44,7 +41,6 @@ export interface MetricsTreemapProps {
 export interface MetricsTreemapInternalProps {
 	isLoading: boolean;
 	isError: boolean;
-	error?: APIError;
 	data: MetricsexplorertypesTreemapResponseDTO | undefined;
 	viewType: MetricsexplorertypesTreemapModeDTO;
 	openMetricDetails: (metricName: string, view: 'list' | 'treemap') => void;

frontend/src/container/QueryBuilder/components/Query/Query.tsx

@@ -24,7 +24,6 @@ import {
 	AggregatorFilter,
 	GroupByFilter,
 	HavingFilter,
-	MetricNameSelector,
 	OperatorsSelect,
 	OrderByFilter,
 	ReduceToFilter,
@@ -404,7 +403,7 @@ export const Query = memo(function Query({
 										)}
 
 										<Col flex="auto">
-											<MetricNameSelector
+											<AggregatorFilter
 												onChange={handleChangeAggregatorAttribute}
 												query={query}
 											/>

frontend/src/container/QueryBuilder/filters/MetricNameSelector/MetricNameSelector.styles.scss

@@ -1,6 +0,0 @@
-.metric-name-selector {
-	.ant-select-selection-placeholder {
-		color: var(--bg-slate-200);
-		font-style: italic;
-	}
-}

frontend/src/container/QueryBuilder/filters/MetricNameSelector/MetricNameSelector.test.tsx

@@ -1,995 +0,0 @@
-import { useEffect, useState } from 'react';
-import {
-	fireEvent,
-	render,
-	screen,
-	waitFor,
-	within,
-} from '@testing-library/react';
-import {
-	MetricsexplorertypesListMetricDTO,
-	MetrictypesTypeDTO,
-} from 'api/generated/services/sigNoz.schemas';
-import { ENTITY_VERSION_V5 } from 'constants/app';
-import { ATTRIBUTE_TYPES } from 'constants/queryBuilder';
-import { useQueryOperations } from 'hooks/queryBuilder/useQueryBuilderOperations';
-import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
-import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
-import { MetricAggregation } from 'types/api/v5/queryRange';
-import { DataSource, ReduceOperators } from 'types/common/queryBuilder';
-
-import { MetricNameSelector } from './MetricNameSelector';
-
-const mockUseListMetrics = jest.fn();
-jest.mock('api/generated/services/metrics', () => ({
-	useListMetrics: (...args: unknown[]): ReturnType<typeof mockUseListMetrics> =>
-		mockUseListMetrics(...args),
-}));
-
-jest.mock('hooks/useDebounce', () => ({
-	__esModule: true,
-	default: <T,>(value: T): T => value,
-}));
-
-jest.mock('../QueryBuilderSearch/OptionRenderer', () => ({
-	__esModule: true,
-	default: ({ value }: { value: string }): JSX.Element => <span>{value}</span>,
-}));
-
-// Ref lets StatefulMetricQueryHarness wire handleSetQueryData to real state,
-// while other tests keep the default no-op mock.
-const handleSetQueryDataRef: {
-	current: (index: number, query: IBuilderQuery) => void;
-} = {
-	current: jest.fn(),
-};
-
-jest.mock('hooks/queryBuilder/useQueryBuilder', () => ({
-	useQueryBuilder: (): Record<string, unknown> => ({
-		handleSetQueryData: (index: number, query: IBuilderQuery): void =>
-			handleSetQueryDataRef.current(index, query),
-		handleSetTraceOperatorData: jest.fn(),
-		handleSetFormulaData: jest.fn(),
-		removeQueryBuilderEntityByIndex: jest.fn(),
-		panelType: 'TIME_SERIES',
-		initialDataSource: DataSource.METRICS,
-		currentQuery: {
-			builder: { queryData: [], queryFormulas: [], queryTraceOperator: [] },
-			queryType: 'builder',
-		},
-		setLastUsedQuery: jest.fn(),
-		redirectWithQueryBuilderData: jest.fn(),
-	}),
-}));
-
-function makeMetric(
-	overrides: Partial<MetricsexplorertypesListMetricDTO> = {},
-): MetricsexplorertypesListMetricDTO {
-	return {
-		metricName: 'http_requests_total',
-		type: MetrictypesTypeDTO.sum,
-		isMonotonic: true,
-		description: '',
-		temporality: 'cumulative' as never,
-		unit: '',
-		...overrides,
-	};
-}
-
-function makeQuery(overrides: Partial<IBuilderQuery> = {}): IBuilderQuery {
-	return {
-		dataSource: DataSource.METRICS,
-		queryName: 'A',
-		aggregateOperator: 'count',
-		aggregateAttribute: { key: '', type: '', dataType: DataTypes.Float64 },
-		timeAggregation: 'avg',
-		spaceAggregation: 'sum',
-		filter: { expression: '' },
-		aggregations: [],
-		functions: [],
-		filters: { items: [], op: 'AND' },
-		expression: 'A',
-		disabled: false,
-		stepInterval: null,
-		having: [],
-		limit: null,
-		orderBy: [],
-		groupBy: [],
-		legend: '',
-		reduceTo: ReduceOperators.AVG,
-		...overrides,
-	} as IBuilderQuery;
-}
-
-function returnMetrics(
-	metrics: MetricsexplorertypesListMetricDTO[],
-	overrides: Record<string, unknown> = {},
-): void {
-	mockUseListMetrics.mockReturnValue({
-		isFetching: false,
-		isError: false,
-		data: { data: { metrics } },
-		queryKey: ['/api/v2/metrics'],
-		...overrides,
-	});
-}
-
-// snippet so tests can assert on them.
-function MetricQueryHarness({ query }: { query: IBuilderQuery }): JSX.Element {
-	const {
-		handleChangeAggregatorAttribute,
-		operators,
-		spaceAggregationOptions,
-	} = useQueryOperations({
-		query,
-		index: 0,
-		entityVersion: ENTITY_VERSION_V5,
-	});
-
-	return (
-		<div>
-			<MetricNameSelector
-				query={query}
-				onChange={handleChangeAggregatorAttribute}
-			/>
-			<ul data-testid="time-agg-options">
-				{operators.map((op) => (
-					<li key={op.value}>{op.label}</li>
-				))}
-			</ul>
-			<ul data-testid="space-agg-options">
-				{spaceAggregationOptions.map((op) => (
-					<li key={op.value}>{op.label}</li>
-				))}
-			</ul>
-		</div>
-	);
-}
-
-function getOptionLabels(testId: string): string[] {
-	const list = screen.getByTestId(testId);
-	const items = within(list).queryAllByRole('listitem');
-	return items.map((el) => el.textContent || '');
-}
-
-describe('MetricNameSelector', () => {
-	beforeEach(() => {
-		jest.clearAllMocks();
-		handleSetQueryDataRef.current = jest.fn();
-		returnMetrics([]);
-	});
-
-	it('shows metric names from API as dropdown options', () => {
-		returnMetrics([
-			makeMetric({ metricName: 'http_requests_total' }),
-			makeMetric({
-				metricName: 'cpu_usage_percent',
-				type: MetrictypesTypeDTO.gauge,
-			}),
-		]);
-
-		render(<MetricNameSelector query={makeQuery()} onChange={jest.fn()} />);
-
-		const input = screen.getByRole('combobox');
-		fireEvent.change(input, { target: { value: 'h' } });
-
-		expect(
-			screen.getAllByText('http_requests_total').length,
-		).toBeGreaterThanOrEqual(1);
-		expect(
-			screen.getAllByText('cpu_usage_percent').length,
-		).toBeGreaterThanOrEqual(1);
-	});
-
-	it('retains typed metric name in input after blur', () => {
-		returnMetrics([makeMetric({ metricName: 'http_requests_total' })]);
-
-		render(<MetricNameSelector query={makeQuery()} onChange={jest.fn()} />);
-
-		const input = screen.getByRole('combobox');
-		fireEvent.change(input, { target: { value: 'http_requests_total' } });
-		fireEvent.blur(input);
-
-		expect(input).toHaveValue('http_requests_total');
-	});
-
-	it('shows error message when API request fails', () => {
-		mockUseListMetrics.mockReturnValue({
-			isFetching: false,
-			isError: true,
-			data: undefined,
-			queryKey: ['/api/v2/metrics'],
-		});
-
-		render(<MetricNameSelector query={makeQuery()} onChange={jest.fn()} />);
-
-		const input = screen.getByRole('combobox');
-		fireEvent.focus(input);
-		fireEvent.change(input, { target: { value: 'test' } });
-
-		expect(screen.getByText('Failed to load metrics')).toBeInTheDocument();
-	});
-
-	it('shows loading spinner while fetching metrics', () => {
-		mockUseListMetrics.mockReturnValue({
-			isFetching: true,
-			isError: false,
-			data: undefined,
-			queryKey: ['/api/v2/metrics'],
-		});
-
-		const { container } = render(
-			<MetricNameSelector query={makeQuery()} onChange={jest.fn()} />,
-		);
-
-		const input = screen.getByRole('combobox');
-		fireEvent.change(input, { target: { value: 'test' } });
-
-		expect(container.querySelector('.ant-spin-spinning')).toBeInTheDocument();
-	});
-
-	it('preserves metric search text for signalSource normalization transition (undefined -> empty)', async () => {
-		returnMetrics([makeMetric({ metricName: 'http_requests_total' })]);
-
-		const query = makeQuery({
-			aggregateAttribute: {
-				key: 'http_requests_total',
-				type: '',
-				dataType: DataTypes.Float64,
-			},
-			aggregations: [
-				{
-					metricName: 'http_requests_total',
-					timeAggregation: 'rate',
-					spaceAggregation: 'sum',
-					temporality: '',
-				},
-			] as MetricAggregation[],
-		});
-
-		const { rerender } = render(
-			<MetricNameSelector
-				query={query}
-				onChange={jest.fn()}
-				signalSource={undefined}
-			/>,
-		);
-
-		rerender(
-			<MetricNameSelector query={query} onChange={jest.fn()} signalSource="" />,
-		);
-
-		await waitFor(() => {
-			const lastCall =
-				mockUseListMetrics.mock.calls[mockUseListMetrics.mock.calls.length - 1];
-			expect(lastCall?.[0]).toMatchObject({
-				searchText: 'http_requests_total',
-				limit: 100,
-			});
-		});
-	});
-
-	it('updates search text when metric name is hydrated after initial mount', async () => {
-		returnMetrics([makeMetric({ metricName: 'signoz_latency.bucket' })]);
-
-		const emptyQuery = makeQuery({
-			aggregateAttribute: {
-				key: '',
-				type: '',
-				dataType: DataTypes.Float64,
-			},
-			aggregations: [
-				{
-					metricName: '',
-					timeAggregation: 'rate',
-					spaceAggregation: 'sum',
-					temporality: '',
-				},
-			] as MetricAggregation[],
-		});
-
-		const hydratedQuery = makeQuery({
-			aggregateAttribute: {
-				key: '',
-				type: '',
-				dataType: DataTypes.Float64,
-			},
-			aggregations: [
-				{
-					metricName: 'signoz_latency.bucket',
-					timeAggregation: 'rate',
-					spaceAggregation: 'sum',
-					temporality: '',
-				},
-			] as MetricAggregation[],
-		});
-
-		const { rerender } = render(
-			<MetricNameSelector
-				query={emptyQuery}
-				onChange={jest.fn()}
-				signalSource=""
-			/>,
-		);
-
-		rerender(
-			<MetricNameSelector
-				query={hydratedQuery}
-				onChange={jest.fn()}
-				signalSource=""
-			/>,
-		);
-
-		await waitFor(() => {
-			const lastCall =
-				mockUseListMetrics.mock.calls[mockUseListMetrics.mock.calls.length - 1];
-			expect(lastCall?.[0]).toMatchObject({
-				searchText: 'signoz_latency.bucket',
-				limit: 100,
-			});
-		});
-	});
-});
-
-describe('selecting a metric type updates the aggregation options', () => {
-	beforeEach(() => {
-		jest.clearAllMocks();
-		handleSetQueryDataRef.current = jest.fn();
-		returnMetrics([]);
-	});
-
-	it('Sum metric shows Rate/Increase time options and Sum/Avg/Min/Max space options', () => {
-		returnMetrics([
-			makeMetric({
-				metricName: 'http_requests_total',
-				type: MetrictypesTypeDTO.sum,
-				isMonotonic: true,
-			}),
-		]);
-
-		render(<MetricQueryHarness query={makeQuery()} />);
-
-		const input = screen.getByRole('combobox');
-		fireEvent.change(input, { target: { value: 'http_requests_total' } });
-		fireEvent.blur(input);
-
-		expect(getOptionLabels('time-agg-options')).toEqual(['Rate', 'Increase']);
-		expect(getOptionLabels('space-agg-options')).toEqual([
-			'Sum',
-			'Avg',
-			'Min',
-			'Max',
-		]);
-	});
-
-	it('Gauge metric shows Latest/Sum/Avg/Min/Max/Count/Count Distinct time options and Sum/Avg/Min/Max space options', () => {
-		returnMetrics([
-			makeMetric({
-				metricName: 'cpu_usage_percent',
-				type: MetrictypesTypeDTO.gauge,
-			}),
-		]);
-
-		render(<MetricQueryHarness query={makeQuery()} />);
-
-		const input = screen.getByRole('combobox');
-		fireEvent.change(input, { target: { value: 'cpu_usage_percent' } });
-		fireEvent.blur(input);
-
-		expect(getOptionLabels('time-agg-options')).toEqual([
-			'Latest',
-			'Sum',
-			'Avg',
-			'Min',
-			'Max',
-			'Count',
-			'Count Distinct',
-		]);
-		expect(getOptionLabels('space-agg-options')).toEqual([
-			'Sum',
-			'Avg',
-			'Min',
-			'Max',
-		]);
-	});
-
-	it('non-monotonic Sum metric is treated as Gauge', () => {
-		returnMetrics([
-			makeMetric({
-				metricName: 'active_connections',
-				type: MetrictypesTypeDTO.sum,
-				isMonotonic: false,
-			}),
-		]);
-
-		render(<MetricQueryHarness query={makeQuery()} />);
-
-		const input = screen.getByRole('combobox');
-		fireEvent.change(input, {
-			target: { value: 'active_connections' },
-		});
-		fireEvent.blur(input);
-
-		expect(getOptionLabels('time-agg-options')).toEqual([
-			'Latest',
-			'Sum',
-			'Avg',
-			'Min',
-			'Max',
-			'Count',
-			'Count Distinct',
-		]);
-		expect(getOptionLabels('space-agg-options')).toEqual([
-			'Sum',
-			'Avg',
-			'Min',
-			'Max',
-		]);
-	});
-
-	it('Histogram metric shows no time options and P50–P99 space options', () => {
-		returnMetrics([
-			makeMetric({
-				metricName: 'request_duration_seconds',
-				type: MetrictypesTypeDTO.histogram,
-			}),
-		]);
-
-		render(<MetricQueryHarness query={makeQuery()} />);
-
-		const input = screen.getByRole('combobox');
-		fireEvent.change(input, {
-			target: { value: 'request_duration_seconds' },
-		});
-		fireEvent.blur(input);
-
-		expect(getOptionLabels('time-agg-options')).toEqual([]);
-		expect(getOptionLabels('space-agg-options')).toEqual([
-			'P50',
-			'P75',
-			'P90',
-			'P95',
-			'P99',
-		]);
-	});
-
-	it('ExponentialHistogram metric shows no time options and P50–P99 space options', () => {
-		returnMetrics([
-			makeMetric({
-				metricName: 'request_duration_exp',
-				type: MetrictypesTypeDTO.exponentialhistogram,
-			}),
-		]);
-
-		render(<MetricQueryHarness query={makeQuery()} />);
-
-		const input = screen.getByRole('combobox');
-		fireEvent.change(input, {
-			target: { value: 'request_duration_exp' },
-		});
-		fireEvent.blur(input);
-
-		expect(getOptionLabels('time-agg-options')).toEqual([]);
-		expect(getOptionLabels('space-agg-options')).toEqual([
-			'P50',
-			'P75',
-			'P90',
-			'P95',
-			'P99',
-		]);
-	});
-
-	it('unknown metric (typed name not in API results) shows all time and space options', () => {
-		returnMetrics([makeMetric({ metricName: 'known_metric' })]);
-
-		render(<MetricQueryHarness query={makeQuery()} />);
-
-		const input = screen.getByRole('combobox');
-		fireEvent.change(input, { target: { value: 'unknown_metric' } });
-		fireEvent.blur(input);
-
-		expect(getOptionLabels('time-agg-options')).toEqual([
-			'Max',
-			'Min',
-			'Sum',
-			'Avg',
-			'Count',
-			'Rate',
-			'Increase',
-		]);
-		expect(getOptionLabels('space-agg-options')).toEqual([
-			'Sum',
-			'Avg',
-			'Min',
-			'Max',
-			'P50',
-			'P75',
-			'P90',
-			'P95',
-			'P99',
-		]);
-	});
-});
-
-// these tests require the previous state, so we setup it to
-// tracks previousMetricInfo across metric selections
-function StatefulMetricQueryHarness({
-	initialQuery,
-}: {
-	initialQuery: IBuilderQuery;
-}): JSX.Element {
-	const [query, setQuery] = useState(initialQuery);
-
-	useEffect(() => {
-		handleSetQueryDataRef.current = (
-			_index: number,
-			newQuery: IBuilderQuery,
-		): void => {
-			setQuery(newQuery);
-		};
-		return (): void => {
-			handleSetQueryDataRef.current = jest.fn();
-		};
-	}, []);
-
-	const {
-		handleChangeAggregatorAttribute,
-		operators,
-		spaceAggregationOptions,
-	} = useQueryOperations({
-		query,
-		index: 0,
-		entityVersion: ENTITY_VERSION_V5,
-	});
-
-	const currentAggregation = query.aggregations?.[0] as MetricAggregation;
-
-	return (
-		<div>
-			<MetricNameSelector
-				query={query}
-				onChange={handleChangeAggregatorAttribute}
-			/>
-			<ul data-testid="time-agg-options">
-				{operators.map((op) => (
-					<li key={op.value}>{op.label}</li>
-				))}
-			</ul>
-			<ul data-testid="space-agg-options">
-				{spaceAggregationOptions.map((op) => (
-					<li key={op.value}>{op.label}</li>
-				))}
-			</ul>
-			<div data-testid="selected-time-agg">
-				{currentAggregation?.timeAggregation || ''}
-			</div>
-			<div data-testid="selected-space-agg">
-				{currentAggregation?.spaceAggregation || ''}
-			</div>
-			<div data-testid="selected-metric-name">
-				{currentAggregation?.metricName || ''}
-			</div>
-		</div>
-	);
-}
-
-describe('switching between metrics of the same type preserves aggregation settings', () => {
-	beforeEach(() => {
-		jest.clearAllMocks();
-		handleSetQueryDataRef.current = jest.fn();
-		returnMetrics([]);
-	});
-
-	it('Sum: preserves non-default increase/avg when switching to another Sum metric', () => {
-		returnMetrics([
-			makeMetric({
-				metricName: 'metric_a',
-				type: MetrictypesTypeDTO.sum,
-				isMonotonic: true,
-			}),
-			makeMetric({
-				metricName: 'metric_b',
-				type: MetrictypesTypeDTO.sum,
-				isMonotonic: true,
-			}),
-		]);
-
-		render(
-			<StatefulMetricQueryHarness
-				initialQuery={makeQuery({
-					aggregateAttribute: {
-						key: 'metric_a',
-						type: ATTRIBUTE_TYPES.SUM,
-						dataType: DataTypes.Float64,
-					},
-					aggregations: [
-						{
-							timeAggregation: 'increase',
-							spaceAggregation: 'avg',
-							metricName: 'metric_a',
-							temporality: '',
-						},
-					] as MetricAggregation[],
-				})}
-			/>,
-		);
-
-		expect(screen.getByTestId('selected-time-agg')).toHaveTextContent('increase');
-		expect(screen.getByTestId('selected-space-agg')).toHaveTextContent('avg');
-
-		const input = screen.getByRole('combobox');
-		fireEvent.change(input, { target: { value: 'metric_b' } });
-		fireEvent.blur(input);
-
-		expect(screen.getByTestId('selected-time-agg')).toHaveTextContent('increase');
-		expect(screen.getByTestId('selected-space-agg')).toHaveTextContent('avg');
-		expect(screen.getByTestId('selected-metric-name')).toHaveTextContent(
-			'metric_b',
-		);
-	});
-
-	it('Gauge: preserves non-default min/max when switching to another Gauge metric', () => {
-		returnMetrics([
-			makeMetric({
-				metricName: 'cpu_usage',
-				type: MetrictypesTypeDTO.gauge,
-			}),
-			makeMetric({
-				metricName: 'mem_usage',
-				type: MetrictypesTypeDTO.gauge,
-			}),
-		]);
-
-		render(
-			<StatefulMetricQueryHarness
-				initialQuery={makeQuery({
-					aggregateAttribute: {
-						key: 'cpu_usage',
-						type: ATTRIBUTE_TYPES.GAUGE,
-						dataType: DataTypes.Float64,
-					},
-					aggregations: [
-						{
-							timeAggregation: 'min',
-							spaceAggregation: 'max',
-							metricName: 'cpu_usage',
-							temporality: '',
-						},
-					] as MetricAggregation[],
-				})}
-			/>,
-		);
-
-		expect(screen.getByTestId('selected-time-agg')).toHaveTextContent('min');
-		expect(screen.getByTestId('selected-space-agg')).toHaveTextContent('max');
-
-		const input = screen.getByRole('combobox');
-		fireEvent.change(input, { target: { value: 'mem_usage' } });
-		fireEvent.blur(input);
-
-		expect(screen.getByTestId('selected-time-agg')).toHaveTextContent('min');
-		expect(screen.getByTestId('selected-space-agg')).toHaveTextContent('max');
-		expect(screen.getByTestId('selected-metric-name')).toHaveTextContent(
-			'mem_usage',
-		);
-	});
-
-	it('Histogram: preserves non-default p99 when switching to another Histogram metric', () => {
-		returnMetrics([
-			makeMetric({
-				metricName: 'req_duration',
-				type: MetrictypesTypeDTO.histogram,
-			}),
-			makeMetric({
-				metricName: 'db_latency',
-				type: MetrictypesTypeDTO.histogram,
-			}),
-		]);
-
-		render(
-			<StatefulMetricQueryHarness
-				initialQuery={makeQuery({
-					aggregateAttribute: {
-						key: 'req_duration',
-						type: ATTRIBUTE_TYPES.HISTOGRAM,
-						dataType: DataTypes.Float64,
-					},
-					aggregations: [
-						{
-							timeAggregation: '',
-							spaceAggregation: 'p99',
-							metricName: 'req_duration',
-							temporality: '',
-						},
-					] as MetricAggregation[],
-				})}
-			/>,
-		);
-
-		expect(screen.getByTestId('selected-space-agg')).toHaveTextContent('p99');
-
-		const input = screen.getByRole('combobox');
-		fireEvent.change(input, { target: { value: 'db_latency' } });
-		fireEvent.blur(input);
-
-		expect(screen.getByTestId('selected-space-agg')).toHaveTextContent('p99');
-		expect(screen.getByTestId('selected-metric-name')).toHaveTextContent(
-			'db_latency',
-		);
-	});
-
-	it('ExponentialHistogram: preserves non-default p75 when switching to another ExponentialHistogram metric', () => {
-		returnMetrics([
-			makeMetric({
-				metricName: 'exp_hist_a',
-				type: MetrictypesTypeDTO.exponentialhistogram,
-			}),
-			makeMetric({
-				metricName: 'exp_hist_b',
-				type: MetrictypesTypeDTO.exponentialhistogram,
-			}),
-		]);
-
-		render(
-			<StatefulMetricQueryHarness
-				initialQuery={makeQuery({
-					aggregateAttribute: {
-						key: 'exp_hist_a',
-						type: ATTRIBUTE_TYPES.EXPONENTIAL_HISTOGRAM,
-						dataType: DataTypes.Float64,
-					},
-					aggregations: [
-						{
-							timeAggregation: '',
-							spaceAggregation: 'p75',
-							metricName: 'exp_hist_a',
-							temporality: '',
-						},
-					] as MetricAggregation[],
-				})}
-			/>,
-		);
-
-		expect(screen.getByTestId('selected-space-agg')).toHaveTextContent('p75');
-
-		const input = screen.getByRole('combobox');
-		fireEvent.change(input, { target: { value: 'exp_hist_b' } });
-		fireEvent.blur(input);
-
-		expect(screen.getByTestId('selected-space-agg')).toHaveTextContent('p75');
-		expect(screen.getByTestId('selected-metric-name')).toHaveTextContent(
-			'exp_hist_b',
-		);
-	});
-});
-
-describe('switching to a different metric type resets aggregation to new defaults', () => {
-	beforeEach(() => {
-		jest.clearAllMocks();
-		handleSetQueryDataRef.current = jest.fn();
-		returnMetrics([]);
-	});
-
-	it('Sum to Gauge: resets from increase/avg to the Gauge defaults avg/avg', () => {
-		returnMetrics([
-			makeMetric({
-				metricName: 'sum_metric',
-				type: MetrictypesTypeDTO.sum,
-				isMonotonic: true,
-			}),
-			makeMetric({
-				metricName: 'gauge_metric',
-				type: MetrictypesTypeDTO.gauge,
-			}),
-		]);
-
-		render(
-			<StatefulMetricQueryHarness
-				initialQuery={makeQuery({
-					aggregateAttribute: {
-						key: 'sum_metric',
-						type: ATTRIBUTE_TYPES.SUM,
-						dataType: DataTypes.Float64,
-					},
-					aggregations: [
-						{
-							timeAggregation: 'increase',
-							spaceAggregation: 'avg',
-							metricName: 'sum_metric',
-							temporality: '',
-						},
-					] as MetricAggregation[],
-				})}
-			/>,
-		);
-
-		const input = screen.getByRole('combobox');
-		fireEvent.change(input, { target: { value: 'gauge_metric' } });
-		fireEvent.blur(input);
-
-		expect(screen.getByTestId('selected-time-agg')).toHaveTextContent('avg');
-		expect(screen.getByTestId('selected-space-agg')).toHaveTextContent('avg');
-		expect(screen.getByTestId('selected-metric-name')).toHaveTextContent(
-			'gauge_metric',
-		);
-	});
-
-	it('Gauge to Histogram: resets from min/max to the Histogram defaults (no time, p90 space)', () => {
-		returnMetrics([
-			makeMetric({
-				metricName: 'gauge_metric',
-				type: MetrictypesTypeDTO.gauge,
-			}),
-			makeMetric({
-				metricName: 'hist_metric',
-				type: MetrictypesTypeDTO.histogram,
-			}),
-		]);
-
-		render(
-			<StatefulMetricQueryHarness
-				initialQuery={makeQuery({
-					aggregateAttribute: {
-						key: 'gauge_metric',
-						type: ATTRIBUTE_TYPES.GAUGE,
-						dataType: DataTypes.Float64,
-					},
-					aggregations: [
-						{
-							timeAggregation: 'min',
-							spaceAggregation: 'max',
-							metricName: 'gauge_metric',
-							temporality: '',
-						},
-					] as MetricAggregation[],
-				})}
-			/>,
-		);
-
-		const input = screen.getByRole('combobox');
-		fireEvent.change(input, { target: { value: 'hist_metric' } });
-		fireEvent.blur(input);
-
-		expect(screen.getByTestId('selected-time-agg')).toHaveTextContent('');
-		expect(screen.getByTestId('selected-space-agg')).toHaveTextContent('p90');
-		expect(screen.getByTestId('selected-metric-name')).toHaveTextContent(
-			'hist_metric',
-		);
-	});
-
-	it('Histogram to Sum: resets from p99 to the Sum defaults rate/sum', () => {
-		returnMetrics([
-			makeMetric({
-				metricName: 'hist_metric',
-				type: MetrictypesTypeDTO.histogram,
-			}),
-			makeMetric({
-				metricName: 'sum_metric',
-				type: MetrictypesTypeDTO.sum,
-				isMonotonic: true,
-			}),
-		]);
-
-		render(
-			<StatefulMetricQueryHarness
-				initialQuery={makeQuery({
-					aggregateAttribute: {
-						key: 'hist_metric',
-						type: ATTRIBUTE_TYPES.HISTOGRAM,
-						dataType: DataTypes.Float64,
-					},
-					aggregations: [
-						{
-							timeAggregation: '',
-							spaceAggregation: 'p99',
-							metricName: 'hist_metric',
-							temporality: '',
-						},
-					] as MetricAggregation[],
-				})}
-			/>,
-		);
-
-		const input = screen.getByRole('combobox');
-		fireEvent.change(input, { target: { value: 'sum_metric' } });
-		fireEvent.blur(input);
-
-		expect(screen.getByTestId('selected-time-agg')).toHaveTextContent('rate');
-		expect(screen.getByTestId('selected-space-agg')).toHaveTextContent('sum');
-		expect(screen.getByTestId('selected-metric-name')).toHaveTextContent(
-			'sum_metric',
-		);
-	});
-});
-
-describe('typed metric not in search results is committed with unknown defaults', () => {
-	beforeEach(() => {
-		jest.clearAllMocks();
-		handleSetQueryDataRef.current = jest.fn();
-		returnMetrics([]);
-	});
-
-	it('Gauge to unknown metric: resets from Gauge aggregations to unknown defaults (avg/avg)', () => {
-		returnMetrics([
-			makeMetric({
-				metricName: 'cpu_usage',
-				type: MetrictypesTypeDTO.gauge,
-			}),
-		]);
-
-		render(
-			<StatefulMetricQueryHarness
-				initialQuery={makeQuery({
-					aggregateAttribute: {
-						key: 'cpu_usage',
-						type: ATTRIBUTE_TYPES.GAUGE,
-						dataType: DataTypes.Float64,
-					},
-					aggregations: [
-						{
-							timeAggregation: 'min',
-							spaceAggregation: 'max',
-							metricName: 'cpu_usage',
-							temporality: '',
-						},
-					] as MetricAggregation[],
-				})}
-			/>,
-		);
-
-		expect(screen.getByTestId('selected-time-agg')).toHaveTextContent('min');
-		expect(screen.getByTestId('selected-space-agg')).toHaveTextContent('max');
-
-		const input = screen.getByRole('combobox');
-		fireEvent.change(input, { target: { value: 'unknown_metric' } });
-		fireEvent.blur(input);
-
-		// Metric not in search results is committed with empty type resets to unknown defaults
-		expect(screen.getByTestId('selected-time-agg')).toHaveTextContent('avg');
-		expect(screen.getByTestId('selected-space-agg')).toHaveTextContent('avg');
-		expect(screen.getByTestId('selected-metric-name')).toHaveTextContent(
-			'unknown_metric',
-		);
-	});
-});
-
-describe('Summary metric type is treated as Gauge', () => {
-	beforeEach(() => {
-		jest.clearAllMocks();
-		handleSetQueryDataRef.current = jest.fn();
-		returnMetrics([]);
-	});
-
-	it('selecting a Summary metric shows Gauge aggregation options', () => {
-		returnMetrics([
-			makeMetric({
-				metricName: 'rpc_duration_summary',
-				type: MetrictypesTypeDTO.summary,
-			}),
-		]);
-
-		render(<MetricQueryHarness query={makeQuery()} />);
-
-		const input = screen.getByRole('combobox');
-		fireEvent.change(input, {
-			target: { value: 'rpc_duration_summary' },
-		});
-		fireEvent.blur(input);
-
-		expect(getOptionLabels('time-agg-options')).toEqual([
-			'Latest',
-			'Sum',
-			'Avg',
-			'Min',
-			'Max',
-			'Count',
-			'Count Distinct',
-		]);
-		expect(getOptionLabels('space-agg-options')).toEqual([
-			'Sum',
-			'Avg',
-			'Min',
-			'Max',
-		]);
-	});
-});

frontend/src/container/QueryBuilder/filters/MetricNameSelector/MetricNameSelector.tsx

@@ -1,289 +0,0 @@
-import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { flushSync } from 'react-dom';
-import { AutoComplete, Spin, Typography } from 'antd';
-import { useListMetrics } from 'api/generated/services/metrics';
-import { MetricsexplorertypesListMetricDTO } from 'api/generated/services/sigNoz.schemas';
-import { ATTRIBUTE_TYPES, toAttributeType } from 'constants/queryBuilder';
-import { DEBOUNCE_DELAY } from 'constants/queryBuilderFilterConfig';
-import useDebounce from 'hooks/useDebounce';
-import {
-	BaseAutocompleteData,
-	DataTypes,
-} from 'types/api/queryBuilder/queryAutocompleteResponse';
-import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
-import { MetricAggregation } from 'types/api/v5/queryRange';
-import { ExtendedSelectOption } from 'types/common/select';
-import { popupContainer } from 'utils/selectPopupContainer';
-
-import { selectStyle } from '../QueryBuilderSearch/config';
-import OptionRenderer from '../QueryBuilderSearch/OptionRenderer';
-
-import './MetricNameSelector.styles.scss';
-
-export type MetricNameSelectorProps = {
-	query: IBuilderQuery;
-	onChange: (value: BaseAutocompleteData, isEditMode?: boolean) => void;
-	disabled?: boolean;
-	defaultValue?: string;
-	onSelect?: (value: BaseAutocompleteData) => void;
-	signalSource?: 'meter' | '';
-};
-
-function getAttributeType(
-	metric: MetricsexplorertypesListMetricDTO,
-): ATTRIBUTE_TYPES | '' {
-	return toAttributeType(metric.type, metric.isMonotonic);
-}
-
-function createAutocompleteData(
-	metricName: string,
-	type: string,
-): BaseAutocompleteData {
-	return { key: metricName, type, dataType: DataTypes.Float64 };
-}
-
-// N.B on the metric name selector behaviour.
-//
-// Metric aggregation options resolution:
-//   The component maintains a ref (metricsRef) of the latest API results.
-//   When the user commits a metric name (via dropdown select, blur, or Cmd+Enter),
-//   resolveMetricFromText looks up the metric in metricsRef to determine its type
-//   (Sum, Gauge, Histogram, etc.). If the metric isn't found (e.g. the user typed
-//   a name before the debounced search returned), the type is empty and downstream
-//   treats it as unknown.
-//
-// Selection handling:
-//   - Dropdown select: user picks from the dropdown; type is always resolved
-//      since the option came from the current API results.
-//   - Blur: user typed a name and tabbed/clicked away without selecting from
-//      the dropdown. If the name differs from the current metric, it's resolved
-//      and committed. If the input is empty, it resets to the current metric name.
-//   - Cmd/Ctrl+Enter: resolves the typed name and commits it using flushSync
-//      so the state update is processed synchronously before QueryBuilderV2's
-//      onKeyDownCapture fires handleRunQuery. Uses document-level capture phase
-//      to run before React's root-level event dispatch. However, there is still one
-//      need to be handled here. TODO(srikanthccv): enter before n/w req completion
-//
-// Edit mode:
-//   When a saved query is loaded, the metric name may be set via aggregations
-//   but aggregateAttribute.type may be missing. Once the API returns metric data,
-//   the component calls onChange with isEditMode=true to backfill the type without
-//   resetting aggregation options.
-//
-// Signal source:
-//   When signalSource is 'meter', the API is filtered to meter metrics only.
-//   Changing signalSource clears the input and search text.
-
-export const MetricNameSelector = memo(function MetricNameSelector({
-	query,
-	onChange,
-	disabled,
-	defaultValue,
-	onSelect,
-	signalSource,
-}: MetricNameSelectorProps): JSX.Element {
-	const currentMetricName =
-		(query.aggregations?.[0] as MetricAggregation)?.metricName ||
-		query.aggregateAttribute?.key ||
-		'';
-
-	const [inputValue, setInputValue] = useState<string>(
-		currentMetricName || defaultValue || '',
-	);
-	const [searchText, setSearchText] = useState<string>(currentMetricName);
-
-	const metricsRef = useRef<MetricsexplorertypesListMetricDTO[]>([]);
-	const selectedFromDropdownRef = useRef(false);
-	const prevSignalSourceRef = useRef(signalSource);
-
-	useEffect(() => {
-		setInputValue(currentMetricName || defaultValue || '');
-		if (currentMetricName) {
-			setSearchText(currentMetricName);
-		}
-	}, [defaultValue, currentMetricName]);
-
-	useEffect(() => {
-		if (prevSignalSourceRef.current !== signalSource) {
-			const previousSignalSource = prevSignalSourceRef.current;
-			prevSignalSourceRef.current = signalSource;
-
-			const isNormalizationTransition =
-				(previousSignalSource === undefined && signalSource === '') ||
-				(previousSignalSource === '' && signalSource === undefined);
-
-			if (isNormalizationTransition && currentMetricName) {
-				setSearchText(currentMetricName);
-				setInputValue(currentMetricName || defaultValue || '');
-				return;
-			}
-
-			setSearchText('');
-			setInputValue('');
-		}
-	}, [signalSource, currentMetricName, defaultValue]);
-
-	const debouncedValue = useDebounce(searchText, DEBOUNCE_DELAY);
-
-	const { isFetching, isError, data: listMetricsData } = useListMetrics(
-		{
-			searchText: debouncedValue,
-			limit: 100,
-			source: signalSource || undefined,
-		} as Record<string, unknown>,
-		{
-			query: {
-				keepPreviousData: false,
-				retry: 2,
-			},
-		},
-	);
-
-	const metrics = useMemo(() => listMetricsData?.data?.metrics ?? [], [
-		listMetricsData,
-	]);
-
-	useEffect(() => {
-		metricsRef.current = metrics;
-	}, [metrics]);
-
-	const optionsData = useMemo((): ExtendedSelectOption[] => {
-		if (!metrics.length) {
-			return [];
-		}
-
-		return metrics.map((metric) => ({
-			label: (
-				<OptionRenderer
-					label={metric.metricName}
-					value={metric.metricName}
-					dataType={DataTypes.Float64}
-					type={getAttributeType(metric) || ''}
-				/>
-			),
-			value: metric.metricName,
-			key: metric.metricName,
-		}));
-	}, [metrics]);
-
-	useEffect(() => {
-		const metricName =
-			(query.aggregations?.[0] as MetricAggregation)?.metricName ||
-			query.aggregateAttribute?.key;
-		const hasAggregateAttributeType = query.aggregateAttribute?.type;
-
-		if (metricName && !hasAggregateAttributeType && metrics.length > 0) {
-			const found = metrics.find((m) => m.metricName === metricName);
-			if (found) {
-				onChange(
-					createAutocompleteData(found.metricName, getAttributeType(found)),
-					true,
-				);
-			}
-		}
-	}, [
-		metrics,
-		query.aggregations,
-		query.aggregateAttribute?.key,
-		query.aggregateAttribute?.type,
-		onChange,
-	]);
-
-	const resolveMetricFromText = useCallback(
-		(text: string): BaseAutocompleteData => {
-			const found = metricsRef.current.find((m) => m.metricName === text);
-			if (found) {
-				return createAutocompleteData(found.metricName, getAttributeType(found));
-			}
-			return createAutocompleteData(text, '');
-		},
-		[],
-	);
-
-	const placeholder = useMemo(() => {
-		if (signalSource === 'meter') {
-			return 'Search for a meter metric...';
-		}
-		return 'Search for a metric...';
-	}, [signalSource]);
-
-	const handleChange = useCallback((value: string): void => {
-		setInputValue(value);
-	}, []);
-
-	const handleSearch = useCallback((value: string): void => {
-		setSearchText(value);
-		selectedFromDropdownRef.current = false;
-	}, []);
-
-	const handleSelect = useCallback(
-		(value: string): void => {
-			selectedFromDropdownRef.current = true;
-			const resolved = resolveMetricFromText(value);
-			onChange(resolved);
-			if (onSelect) {
-				onSelect(resolved);
-			}
-			setSearchText('');
-		},
-		[onChange, onSelect, resolveMetricFromText],
-	);
-
-	const handleBlur = useCallback(() => {
-		if (selectedFromDropdownRef.current) {
-			selectedFromDropdownRef.current = false;
-			return;
-		}
-
-		const typedValue = inputValue?.trim() || '';
-		if (typedValue && typedValue !== currentMetricName) {
-			onChange(resolveMetricFromText(typedValue));
-		} else if (!typedValue && currentMetricName) {
-			setInputValue(currentMetricName);
-		}
-	}, [inputValue, currentMetricName, onChange, resolveMetricFromText]);
-
-	useEffect(() => {
-		const handleKeyDown = (e: KeyboardEvent): void => {
-			if (e.key === 'Enter' && (e.metaKey || e.ctrlKey)) {
-				const typedValue = inputValue?.trim() || '';
-				if (typedValue && typedValue !== currentMetricName) {
-					flushSync(() => {
-						onChange(resolveMetricFromText(typedValue));
-					});
-				}
-			}
-		};
-
-		document.addEventListener('keydown', handleKeyDown, true);
-		return (): void => {
-			document.removeEventListener('keydown', handleKeyDown, true);
-		};
-	}, [inputValue, currentMetricName, onChange, resolveMetricFromText]);
-
-	return (
-		<AutoComplete
-			className="metric-name-selector"
-			getPopupContainer={popupContainer}
-			style={selectStyle}
-			filterOption={false}
-			placeholder={placeholder}
-			onSearch={handleSearch}
-			onChange={handleChange}
-			notFoundContent={
-				isFetching ? (
-					<Spin size="small" />
-				) : isError ? (
-					<Typography.Text type="danger" style={{ fontSize: 12 }}>
-						Failed to load metrics
-					</Typography.Text>
-				) : null
-			}
-			options={optionsData}
-			value={inputValue}
-			onBlur={handleBlur}
-			onSelect={handleSelect}
-			disabled={disabled}
-		/>
-	);
-});

frontend/src/container/QueryBuilder/filters/MetricNameSelector/index.ts

@@ -1,2 +0,0 @@
-export type { MetricNameSelectorProps } from './MetricNameSelector';
-export { MetricNameSelector } from './MetricNameSelector';

frontend/src/container/QueryBuilder/filters/index.ts

@@ -2,7 +2,6 @@ export { AggregatorFilter } from './AggregatorFilter';
 export { BuilderUnitsFilter } from './BuilderUnitsFilter';
 export { GroupByFilter } from './GroupByFilter';
 export { HavingFilter } from './HavingFilter';
-export { MetricNameSelector } from './MetricNameSelector';
 export { OperatorsSelect } from './OperatorsSelect';
 export { OrderByFilter } from './OrderByFilter';
 export { ReduceToFilter } from './ReduceToFilter';

frontend/src/container/TimeSeriesView/TimeSeriesView.tsx

@@ -257,9 +257,7 @@ function TimeSeriesView({
 					chartData[0]?.length === 0 &&
 					!isLoading &&
 					!isError &&
-					dataSource === DataSource.METRICS && (
-						<EmptyMetricsSearch hasQueryResult={data !== undefined} />
-					)}
+					dataSource === DataSource.METRICS && <EmptyMetricsSearch />}
 
 				{!isLoading &&
 					!isError &&

frontend/src/hooks/metricsExplorer/useGetMetricsTreeMap.ts

@@ -0,0 +1,50 @@
+import { useMemo } from 'react';
+import { useQuery, UseQueryOptions, UseQueryResult } from 'react-query';
+import {
+	getMetricsTreeMap,
+	MetricsTreeMapPayload,
+	MetricsTreeMapResponse,
+} from 'api/metricsExplorer/getMetricsTreeMap';
+import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
+import { ErrorResponse, SuccessResponse } from 'types/api';
+
+type UseGetMetricsTreeMap = (
+	requestData: MetricsTreeMapPayload,
+
+	options?: UseQueryOptions<
+		SuccessResponse<MetricsTreeMapResponse> | ErrorResponse,
+		Error
+	>,
+
+	headers?: Record<string, string>,
+) => UseQueryResult<
+	SuccessResponse<MetricsTreeMapResponse> | ErrorResponse,
+	Error
+>;
+
+export const useGetMetricsTreeMap: UseGetMetricsTreeMap = (
+	requestData,
+	options,
+	headers,
+) => {
+	const queryKey = useMemo(() => {
+		if (options?.queryKey && Array.isArray(options.queryKey)) {
+			return [...options.queryKey];
+		}
+
+		if (options?.queryKey && typeof options.queryKey === 'string') {
+			return options.queryKey;
+		}
+
+		return [REACT_QUERY_KEY.GET_METRICS_TREE_MAP, requestData];
+	}, [options?.queryKey, requestData]);
+
+	return useQuery<
+		SuccessResponse<MetricsTreeMapResponse> | ErrorResponse,
+		Error
+	>({
+		queryFn: ({ signal }) => getMetricsTreeMap(requestData, signal, headers),
+		...options,
+		queryKey,
+	});
+};

frontend/src/hooks/metricsExplorer/useUpdateMetricMetadata.ts

@@ -0,0 +1,26 @@
+import { useMutation, UseMutationResult } from 'react-query';
+import updateMetricMetadata, {
+	UpdateMetricMetadataProps,
+	UpdateMetricMetadataResponse,
+} from 'api/metricsExplorer/updateMetricMetadata';
+import { ErrorResponse, SuccessResponse } from 'types/api';
+
+export interface UseUpdateMetricMetadataProps {
+	metricName: string;
+	payload: UpdateMetricMetadataProps;
+}
+
+export function useUpdateMetricMetadata(): UseMutationResult<
+	SuccessResponse<UpdateMetricMetadataResponse> | ErrorResponse,
+	Error,
+	UseUpdateMetricMetadataProps
+> {
+	return useMutation<
+		SuccessResponse<UpdateMetricMetadataResponse> | ErrorResponse,
+		Error,
+		UseUpdateMetricMetadataProps
+	>({
+		mutationFn: ({ metricName, payload }) =>
+			updateMetricMetadata(metricName, payload),
+	});
+}

frontend/src/hooks/queryBuilder/useQueryBuilderOperations.ts

@@ -248,12 +248,19 @@ export const useQueryOperations: UseQueryOperations = ({
 	);
 
 	const handleChangeAggregatorAttribute = useCallback(
-		(value: BaseAutocompleteData, isEditMode?: boolean): void => {
+		(
+			value: BaseAutocompleteData,
+			isEditMode?: boolean,
+			attributeKeys?: BaseAutocompleteData[],
+		): void => {
 			const newQuery: IBuilderQuery = {
 				...query,
 				aggregateAttribute: value,
 			};
 
+			const getAttributeKeyFromMetricName = (metricName: string): string =>
+				attributeKeys?.find((key) => key.key === metricName)?.type || '';
+
 			if (
 				newQuery.dataSource === DataSource.METRICS &&
 				entityVersion === ENTITY_VERSION_V4
@@ -304,7 +311,9 @@ export const useQueryOperations: UseQueryOperations = ({
 					// Get current metric info
 					const currentMetricType = newQuery.aggregateAttribute?.type || '';
 
-					const prevMetricType = previousMetricInfo?.type || '';
+					const prevMetricType = previousMetricInfo?.type
+						? previousMetricInfo.type
+						: getAttributeKeyFromMetricName(previousMetricInfo?.name || '');
 
 					// Check if metric type has changed by comparing with tracked previous values
 					const metricTypeChanged =
@@ -365,7 +374,7 @@ export const useQueryOperations: UseQueryOperations = ({
 
 						// Handled query with unknown metric to avoid 400 and 500 errors
 						// With metric value typed and not available then - time - 'avg', space - 'avg'
-						// If not typed - time - 'avg', space - 'sum'
+						// If not typed - time - 'rate', space - 'sum', op - 'count'
 						if (isEmpty(newQuery.aggregateAttribute?.type)) {
 							if (!isEmpty(newQuery.aggregateAttribute?.key)) {
 								newQuery.aggregations = [
@@ -379,7 +388,7 @@ export const useQueryOperations: UseQueryOperations = ({
 							} else {
 								newQuery.aggregations = [
 									{
-										timeAggregation: MetricAggregateOperator.AVG,
+										timeAggregation: MetricAggregateOperator.COUNT,
 										metricName: newQuery.aggregateAttribute?.key || '',
 										temporality: '',
 										spaceAggregation: MetricAggregateOperator.SUM,
@@ -399,29 +408,6 @@ export const useQueryOperations: UseQueryOperations = ({
 							];
 						}
 					}
-
-					// Override with safe defaults when metric type is unknown to avoid 400/500 errors
-					if (isEmpty(newQuery.aggregateAttribute?.type)) {
-						if (!isEmpty(newQuery.aggregateAttribute?.key)) {
-							newQuery.aggregations = [
-								{
-									timeAggregation: MetricAggregateOperator.AVG,
-									metricName: newQuery.aggregateAttribute?.key || '',
-									temporality: '',
-									spaceAggregation: MetricAggregateOperator.AVG,
-								},
-							];
-						} else {
-							newQuery.aggregations = [
-								{
-									timeAggregation: MetricAggregateOperator.AVG,
-									metricName: newQuery.aggregateAttribute?.key || '',
-									temporality: '',
-									spaceAggregation: MetricAggregateOperator.SUM,
-								},
-							];
-						}
-					}
 				}
 			}
 

frontend/src/hooks/useHandleExplorerTabChange.ts

@@ -20,7 +20,6 @@ export const useHandleExplorerTabChange = (): {
 		type: string,
 		querySearchParameters?: ICurrentQueryData,
 		redirectToUrl?: typeof ROUTES[keyof typeof ROUTES],
-		newTab?: boolean,
 	) => void;
 } => {
 	const {
@@ -64,7 +63,6 @@ export const useHandleExplorerTabChange = (): {
 			type: string,
 			currentQueryData?: ICurrentQueryData,
 			redirectToUrl?: typeof ROUTES[keyof typeof ROUTES],
-			newTab?: boolean,
 		) => {
 			const newPanelType = type as PANEL_TYPES;
 
@@ -83,21 +81,13 @@ export const useHandleExplorerTabChange = (): {
 						[QueryParams.viewKey]: currentQueryData?.id || viewKey,
 					},
 					redirectToUrl,
-					undefined,
-					newTab,
 				);
 			} else {
-				redirectWithQueryBuilderData(
-					query,
-					{
-						[QueryParams.panelTypes]: newPanelType,
-						[QueryParams.viewName]: currentQueryData?.name || viewName,
-						[QueryParams.viewKey]: currentQueryData?.id || viewKey,
-					},
-					undefined,
-					undefined,
-					newTab,
-				);
+				redirectWithQueryBuilderData(query, {
+					[QueryParams.panelTypes]: newPanelType,
+					[QueryParams.viewName]: currentQueryData?.name || viewName,
+					[QueryParams.viewKey]: currentQueryData?.id || viewKey,
+				});
 			}
 		},
 		[panelType, getUpdateQuery, redirectWithQueryBuilderData, viewName, viewKey],

frontend/src/lib/newQueryBuilder/queryBuilderMappers/__tests__/mapQueryDataFromApiInputs.ts

@@ -54,7 +54,7 @@ export const stepIntervalUnchanged = {
 					{
 						metricName: '',
 						temporality: '',
-						timeAggregation: 'avg',
+						timeAggregation: 'count',
 						spaceAggregation: 'sum',
 						reduceTo: ReduceOperators.AVG,
 					},
@@ -177,7 +177,7 @@ export const replaceVariables = {
 					{
 						metricName: '',
 						temporality: '',
-						timeAggregation: 'avg',
+						timeAggregation: 'count',
 						spaceAggregation: 'sum',
 						reduceTo: ReduceOperators.AVG,
 					},
@@ -267,7 +267,7 @@ export const defaultOutput = {
 						reduceTo: ReduceOperators.AVG,
 						spaceAggregation: 'sum',
 						temporality: '',
-						timeAggregation: 'avg',
+						timeAggregation: 'count',
 					},
 				],
 				filter: { expression: '' },
@@ -392,7 +392,7 @@ export const outputWithFunctions = {
 					{
 						metricName: '',
 						temporality: '',
-						timeAggregation: 'avg',
+						timeAggregation: 'count',
 						spaceAggregation: 'sum',
 						reduceTo: ReduceOperators.AVG,
 					},
@@ -429,7 +429,7 @@ export const outputWithFunctions = {
 					{
 						metricName: '',
 						temporality: '',
-						timeAggregation: 'avg',
+						timeAggregation: 'count',
 						spaceAggregation: 'sum',
 						reduceTo: ReduceOperators.AVG,
 					},

frontend/src/lib/uPlotV2/components/Tooltip/Tooltip.tsx

@@ -4,7 +4,6 @@ import cx from 'classnames';
 import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';
 import dayjs from 'dayjs';
 import { useIsDarkMode } from 'hooks/useDarkMode';
-import { useTimezone } from 'providers/Timezone';
 
 import { TooltipProps } from '../types';
 
@@ -23,14 +22,6 @@ export default function Tooltip({
 	const isDarkMode = useIsDarkMode();
 	const [listHeight, setListHeight] = useState(0);
 	const tooltipContent = content ?? [];
-	const { timezone: userTimezone } = useTimezone();
-
-	const resolvedTimezone = useMemo(() => {
-		if (!timezone) {
-			return userTimezone.value;
-		}
-		return timezone.value;
-	}, [timezone, userTimezone]);
 
 	const headerTitle = useMemo(() => {
 		if (!showTooltipHeader) {
@@ -42,10 +33,10 @@ export default function Tooltip({
 			return null;
 		}
 		return dayjs(data[0][cursorIdx] * 1000)
-			.tz(resolvedTimezone)
+			.tz(timezone)
 			.format(DATE_TIME_FORMATS.MONTH_DATETIME_SECONDS);
 	}, [
-		resolvedTimezone,
+		timezone,
 		uPlotInstance.data,
 		uPlotInstance.cursor.idx,
 		showTooltipHeader,

frontend/src/lib/uPlotV2/components/Tooltip/__tests__/Tooltip.test.tsx

@@ -83,7 +83,7 @@ function createUPlotInstance(cursorIdx: number | null): uPlot {
 function renderTooltip(props: Partial<TooltipTestProps> = {}): RenderResult {
 	const defaultProps: TooltipTestProps = {
 		uPlotInstance: createUPlotInstance(null),
-		timezone: { value: 'UTC', name: 'UTC', offset: '0', searchIndex: '0' },
+		timezone: 'UTC',
 		content: [],
 		showTooltipHeader: true,
 		// TooltipRenderArgs (not used directly in component but required by type)

frontend/src/lib/uPlotV2/components/UPlotChart.tsx

@@ -92,7 +92,7 @@ export default function UPlotChart({
 
 		setPlotContextInitialState({
 			uPlotInstance: plot,
-			id: config.getId(),
+			widgetId: config.getWidgetId(),
 			shouldSaveSelectionPreference: config.getShouldSaveSelectionPreference(),
 		});
 

frontend/src/lib/uPlotV2/components/__tests__/UPlotChart.test.tsx

@@ -84,7 +84,7 @@ const createMockConfig = (): UPlotConfigBuilder => {
 			hooks: {},
 			cursor: {},
 		}),
-		getId: jest.fn().mockReturnValue(undefined),
+		getWidgetId: jest.fn().mockReturnValue(undefined),
 		getShouldSaveSelectionPreference: jest.fn().mockReturnValue(false),
 	} as unknown) as UPlotConfigBuilder;
 };

frontend/src/lib/uPlotV2/components/types.ts

@@ -1,5 +1,4 @@
 import { ReactNode } from 'react';
-import { Timezone } from 'components/CustomTimePicker/timezoneUtils';
 import { PrecisionOption } from 'components/Graph/types';
 import uPlot from 'uplot';
 
@@ -62,7 +61,7 @@ export interface TooltipRenderArgs {
 
 export interface BaseTooltipProps {
 	showTooltipHeader?: boolean;
-	timezone?: Timezone;
+	timezone: string;
 	yAxisUnit?: string;
 	decimalPrecision?: PrecisionOption;
 	content?: TooltipContentItem[];

frontend/src/lib/uPlotV2/config/UPlotConfigBuilder.ts

@@ -74,21 +74,23 @@ export class UPlotConfigBuilder extends ConfigBuilder<
 
 	private tzDate: ((timestamp: number) => Date) | undefined;
 
-	private id: string;
+	private widgetId: string | undefined;
 
 	private onDragSelect: (startTime: number, endTime: number) => void;
 
-	constructor(args: ConfigBuilderProps) {
-		super(args);
+	constructor(args?: ConfigBuilderProps) {
+		super(args ?? {});
 		const {
-			id,
+			widgetId,
 			onDragSelect,
 			tzDate,
 			selectionPreferencesSource,
 			shouldSaveSelectionPreference,
 			stepInterval,
 		} = args ?? {};
-		this.id = id;
+		if (widgetId) {
+			this.widgetId = widgetId;
+		}
 
 		if (tzDate) {
 			this.tzDate = tzDate;
@@ -250,10 +252,10 @@ export class UPlotConfigBuilder extends ConfigBuilder<
 	 */
 	private getStoredVisibility(): SeriesVisibilityItem[] | null {
 		if (
-			this.id &&
+			this.widgetId &&
 			this.selectionPreferencesSource === SelectionPreferencesSource.LOCAL_STORAGE
 		) {
-			return getStoredSeriesVisibility(this.id);
+			return getStoredSeriesVisibility(this.widgetId);
 		}
 		return null;
 	}
@@ -376,10 +378,10 @@ export class UPlotConfigBuilder extends ConfigBuilder<
 	}
 
 	/**
-	 * Get the id for the builder
+	 * Get the widget id
 	 */
-	getId(): string {
-		return this.id;
+	getWidgetId(): string | undefined {
+		return this.widgetId;
 	}
 
 	/**

frontend/src/lib/uPlotV2/config/UPlotSeriesBuilder.ts

@@ -1,3 +1,4 @@
+import { PANEL_TYPES } from 'constants/queryBuilder';
 import { themeColors } from 'constants/theme';
 import { generateColor } from 'lib/uPlotLib/utils/generateColor';
 import { calculateWidthBasedOnStepInterval } from 'lib/uPlotV2/utils';
@@ -22,9 +23,6 @@ import {
  * Path builders are static and shared across all instances of UPlotSeriesBuilder
  */
 let builders: PathBuilders | null = null;
-
-const DEFAULT_LINE_WIDTH = 2;
-export const POINT_SIZE_FACTOR = 2.5;
 export class UPlotSeriesBuilder extends ConfigBuilder<SeriesProps, Series> {
 	constructor(props: SeriesProps) {
 		super(props);
@@ -55,7 +53,7 @@ export class UPlotSeriesBuilder extends ConfigBuilder<SeriesProps, Series> {
 		const { lineWidth, lineStyle, lineCap, fillColor } = this.props;
 		const lineConfig: Partial<Series> = {
 			stroke: resolvedLineColor,
-			width: lineWidth ?? DEFAULT_LINE_WIDTH,
+			width: lineWidth ?? 2,
 		};
 
 		if (lineStyle === LineStyle.Dashed) {
@@ -68,9 +66,9 @@ export class UPlotSeriesBuilder extends ConfigBuilder<SeriesProps, Series> {
 
 		if (fillColor) {
 			lineConfig.fill = fillColor;
-		} else if (this.props.drawStyle === DrawStyle.Bar) {
+		} else if (this.props.panelType === PANEL_TYPES.BAR) {
 			lineConfig.fill = resolvedLineColor;
-		} else if (this.props.drawStyle === DrawStyle.Histogram) {
+		} else if (this.props.panelType === PANEL_TYPES.HISTOGRAM) {
 			lineConfig.fill = `${resolvedLineColor}40`;
 		}
 
@@ -139,19 +137,10 @@ export class UPlotSeriesBuilder extends ConfigBuilder<SeriesProps, Series> {
 			drawStyle,
 			showPoints,
 		} = this.props;
-
-		/**
-		 * If pointSize is not provided, use the lineWidth * POINT_SIZE_FACTOR
-		 * to determine the point size.
-		 * POINT_SIZE_FACTOR is 2, so the point size will be 2x the line width.
-		 */
-		const resolvedPointSize =
-			pointSize ?? (lineWidth ?? DEFAULT_LINE_WIDTH) * POINT_SIZE_FACTOR;
-
 		const pointsConfig: Partial<Series.Points> = {
 			stroke: resolvedLineColor,
 			fill: resolvedLineColor,
-			size: resolvedPointSize,
+			size: !pointSize || pointSize < (lineWidth ?? 2) ? undefined : pointSize,
 			filter: pointsFilter || undefined,
 		};
 
@@ -242,7 +231,7 @@ function getPathBuilder({
 		throw new Error('Required uPlot path builders are not available');
 	}
 
-	if (drawStyle === DrawStyle.Bar || drawStyle === DrawStyle.Histogram) {
+	if (drawStyle === DrawStyle.Bar) {
 		const pathBuilders = uPlot.paths;
 		return getBarPathBuilder({
 			pathBuilders,

frontend/src/lib/uPlotV2/config/__tests__/UPlotConfigBuilder.test.ts

@@ -1,3 +1,4 @@
+import { PANEL_TYPES } from 'constants/queryBuilder';
 import uPlot from 'uplot';
 
 import {
@@ -42,27 +43,27 @@ describe('UPlotConfigBuilder', () => {
 		label: 'Requests',
 		colorMapping: {},
 		drawStyle: DrawStyle.Line,
+		panelType: PANEL_TYPES.TIME_SERIES,
 		...overrides,
 	});
 
 	it('returns correct save selection preference flag from constructor args', () => {
 		const builder = new UPlotConfigBuilder({
-			id: 'widget-123',
 			shouldSaveSelectionPreference: true,
 		});
 
 		expect(builder.getShouldSaveSelectionPreference()).toBe(true);
 	});
 
-	it('returns id from constructor args', () => {
-		const builder = new UPlotConfigBuilder({ id: 'widget-123' });
+	it('returns widgetId from constructor args', () => {
+		const builder = new UPlotConfigBuilder({ widgetId: 'widget-123' });
 
-		expect(builder.getId()).toBe('widget-123');
+		expect(builder.getWidgetId()).toBe('widget-123');
 	});
 
 	it('sets tzDate from constructor and includes it in config', () => {
 		const tzDate = (ts: number): Date => new Date(ts);
-		const builder = new UPlotConfigBuilder({ id: 'widget-123', tzDate });
+		const builder = new UPlotConfigBuilder({ tzDate });
 
 		const config = builder.getConfig();
 
@@ -71,7 +72,7 @@ describe('UPlotConfigBuilder', () => {
 
 	it('does not call onDragSelect for click without drag (width === 0)', () => {
 		const onDragSelect = jest.fn();
-		const builder = new UPlotConfigBuilder({ id: 'widget-123', onDragSelect });
+		const builder = new UPlotConfigBuilder({ onDragSelect });
 
 		const config = builder.getConfig();
 		const setSelectHooks = config.hooks?.setSelect ?? [];
@@ -84,15 +85,14 @@ describe('UPlotConfigBuilder', () => {
 
 		// Simulate uPlot calling the hook
 		const setSelectHook = setSelectHooks[0];
-		expect(setSelectHook).toBeDefined();
-		setSelectHook?.(uplotInstance);
+		setSelectHook!(uplotInstance);
 
 		expect(onDragSelect).not.toHaveBeenCalled();
 	});
 
 	it('calls onDragSelect with start and end times in milliseconds for a drag selection', () => {
 		const onDragSelect = jest.fn();
-		const builder = new UPlotConfigBuilder({ id: 'widget-123', onDragSelect });
+		const builder = new UPlotConfigBuilder({ onDragSelect });
 
 		const config = builder.getConfig();
 		const setSelectHooks = config.hooks?.setSelect ?? [];
@@ -111,8 +111,7 @@ describe('UPlotConfigBuilder', () => {
 		} as unknown) as uPlot;
 
 		const setSelectHook = setSelectHooks[0];
-		expect(setSelectHook).toBeDefined();
-		setSelectHook?.(uplotInstance);
+		setSelectHook!(uplotInstance);
 
 		expect(onDragSelect).toHaveBeenCalledTimes(1);
 		// 100 and 110 seconds converted to milliseconds
@@ -120,7 +119,7 @@ describe('UPlotConfigBuilder', () => {
 	});
 
 	it('adds and removes hooks via addHook, and exposes them through getConfig', () => {
-		const builder = new UPlotConfigBuilder({ id: 'widget-123' });
+		const builder = new UPlotConfigBuilder();
 		const drawHook = jest.fn();
 
 		const remove = builder.addHook('draw', drawHook as uPlot.Hooks.Defs['draw']);
@@ -135,7 +134,7 @@ describe('UPlotConfigBuilder', () => {
 	});
 
 	it('adds axes, scales, and series and wires them into the final config', () => {
-		const builder = new UPlotConfigBuilder({ id: 'widget-123' });
+		const builder = new UPlotConfigBuilder();
 
 		// Add axis and scale
 		builder.addAxis({ scaleKey: 'y', label: 'Requests' });
@@ -171,7 +170,7 @@ describe('UPlotConfigBuilder', () => {
 	});
 
 	it('merges axis when addAxis is called twice with same scaleKey', () => {
-		const builder = new UPlotConfigBuilder({ id: 'widget-123' });
+		const builder = new UPlotConfigBuilder();
 
 		builder.addAxis({ scaleKey: 'y', label: 'Requests' });
 		builder.addAxis({ scaleKey: 'y', label: 'Updated Label', show: false });
@@ -184,7 +183,7 @@ describe('UPlotConfigBuilder', () => {
 	});
 
 	it('merges scale when addScale is called twice with same scaleKey', () => {
-		const builder = new UPlotConfigBuilder({ id: 'widget-123' });
+		const builder = new UPlotConfigBuilder();
 
 		builder.addScale({ scaleKey: 'y', min: 0 });
 		builder.addScale({ scaleKey: 'y', max: 100 });
@@ -205,7 +204,7 @@ describe('UPlotConfigBuilder', () => {
 		]);
 
 		const builder = new UPlotConfigBuilder({
-			id: 'widget-1',
+			widgetId: 'widget-1',
 			selectionPreferencesSource: SelectionPreferencesSource.LOCAL_STORAGE,
 		});
 
@@ -232,7 +231,7 @@ describe('UPlotConfigBuilder', () => {
 		]);
 
 		const builder = new UPlotConfigBuilder({
-			id: 'widget-1',
+			widgetId: 'widget-1',
 			selectionPreferencesSource: SelectionPreferencesSource.LOCAL_STORAGE,
 		});
 
@@ -270,7 +269,7 @@ describe('UPlotConfigBuilder', () => {
 		]);
 
 		const builder = new UPlotConfigBuilder({
-			id: 'widget-1',
+			widgetId: 'widget-1',
 			selectionPreferencesSource: SelectionPreferencesSource.LOCAL_STORAGE,
 		});
 
@@ -303,7 +302,7 @@ describe('UPlotConfigBuilder', () => {
 		]);
 
 		const builder = new UPlotConfigBuilder({
-			id: 'widget-dup',
+			widgetId: 'widget-dup',
 			selectionPreferencesSource: SelectionPreferencesSource.LOCAL_STORAGE,
 		});
 
@@ -330,7 +329,7 @@ describe('UPlotConfigBuilder', () => {
 
 	it('does not attempt to read stored visibility when using in-memory preferences', () => {
 		const builder = new UPlotConfigBuilder({
-			id: 'widget-1',
+			widgetId: 'widget-1',
 			selectionPreferencesSource: SelectionPreferencesSource.IN_MEMORY,
 		});
 
@@ -345,7 +344,7 @@ describe('UPlotConfigBuilder', () => {
 	});
 
 	it('adds thresholds only once per scale key', () => {
-		const builder = new UPlotConfigBuilder({ id: 'widget-123' });
+		const builder = new UPlotConfigBuilder();
 
 		const thresholdsOptions = {
 			scaleKey: 'y',
@@ -363,7 +362,7 @@ describe('UPlotConfigBuilder', () => {
 	});
 
 	it('adds multiple thresholds when scale key is different', () => {
-		const builder = new UPlotConfigBuilder({ id: 'widget-123' });
+		const builder = new UPlotConfigBuilder();
 
 		const thresholdsOptions = {
 			scaleKey: 'y',
@@ -384,7 +383,7 @@ describe('UPlotConfigBuilder', () => {
 	});
 
 	it('merges cursor configuration with defaults instead of replacing them', () => {
-		const builder = new UPlotConfigBuilder({ id: 'widget-123' });
+		const builder = new UPlotConfigBuilder();
 
 		builder.setCursor({
 			drag: { setScale: false },
@@ -399,7 +398,7 @@ describe('UPlotConfigBuilder', () => {
 
 	describe('getCursorConfig', () => {
 		it('returns default cursor merged with custom cursor when no stepInterval', () => {
-			const builder = new UPlotConfigBuilder({ id: 'widget-123' });
+			const builder = new UPlotConfigBuilder();
 
 			builder.setCursor({
 				drag: { setScale: false },
@@ -413,7 +412,7 @@ describe('UPlotConfigBuilder', () => {
 		});
 
 		it('returns hover prox as DEFAULT_HOVER_PROXIMITY_VALUE when stepInterval is not set', () => {
-			const builder = new UPlotConfigBuilder({ id: 'widget-123' });
+			const builder = new UPlotConfigBuilder();
 
 			const cursorConfig = builder.getCursorConfig();
 
@@ -425,15 +424,15 @@ describe('UPlotConfigBuilder', () => {
 			const mockWidth = 100;
 			calculateWidthBasedOnStepIntervalMock.mockReturnValue(mockWidth);
 
-			const builder = new UPlotConfigBuilder({ id: 'widget-123', stepInterval });
+			const builder = new UPlotConfigBuilder({ stepInterval });
 			const cursorConfig = builder.getCursorConfig();
 
 			expect(typeof cursorConfig.hover?.prox).toBe('function');
 
 			const uPlotInstance = {} as uPlot;
-			const prox = cursorConfig.hover?.prox as ((u: uPlot) => number) | undefined;
-			expect(prox).toBeDefined();
-			const proxResult = prox ? prox(uPlotInstance) : NaN;
+			const proxResult = (cursorConfig.hover!.prox as (u: uPlot) => number)(
+				uPlotInstance,
+			);
 
 			expect(calculateWidthBasedOnStepIntervalMock).toHaveBeenCalledWith({
 				uPlotInstance,
@@ -444,7 +443,7 @@ describe('UPlotConfigBuilder', () => {
 	});
 
 	it('adds plugins and includes them in config', () => {
-		const builder = new UPlotConfigBuilder({ id: 'widget-123' });
+		const builder = new UPlotConfigBuilder();
 		const plugin: uPlot.Plugin = {
 			opts: (): void => {},
 			hooks: {},
@@ -459,7 +458,7 @@ describe('UPlotConfigBuilder', () => {
 
 	it('sets padding, legend, focus, select, tzDate, bands and includes them in config', () => {
 		const tzDate = (ts: number): Date => new Date(ts);
-		const builder = new UPlotConfigBuilder({ id: 'widget-123' });
+		const builder = new UPlotConfigBuilder();
 
 		const bands: uPlot.Band[] = [{ series: [1, 2], fill: (): string => '#000' }];
 
@@ -481,7 +480,7 @@ describe('UPlotConfigBuilder', () => {
 	});
 
 	it('does not include plugins when none added', () => {
-		const builder = new UPlotConfigBuilder({ id: 'widget-123' });
+		const builder = new UPlotConfigBuilder();
 
 		const config = builder.getConfig();
 
@@ -489,7 +488,7 @@ describe('UPlotConfigBuilder', () => {
 	});
 
 	it('does not include bands when empty', () => {
-		const builder = new UPlotConfigBuilder({ id: 'widget-123' });
+		const builder = new UPlotConfigBuilder();
 
 		const config = builder.getConfig();
 

frontend/src/lib/uPlotV2/config/__tests__/UPlotSeriesBuilder.test.ts

@@ -1,3 +1,4 @@
+import { PANEL_TYPES } from 'constants/queryBuilder';
 import { themeColors } from 'constants/theme';
 import uPlot from 'uplot';
 
@@ -8,7 +9,7 @@ import {
 	LineStyle,
 	VisibilityMode,
 } from '../types';
-import { POINT_SIZE_FACTOR, UPlotSeriesBuilder } from '../UPlotSeriesBuilder';
+import { UPlotSeriesBuilder } from '../UPlotSeriesBuilder';
 
 const createBaseProps = (
 	overrides: Partial<SeriesProps> = {},
@@ -18,6 +19,7 @@ const createBaseProps = (
 	colorMapping: {},
 	drawStyle: DrawStyle.Line,
 	isDarkMode: false,
+	panelType: PANEL_TYPES.TIME_SERIES,
 	...overrides,
 });
 
@@ -135,6 +137,7 @@ describe('UPlotSeriesBuilder', () => {
 		const smallPointsBuilder = new UPlotSeriesBuilder(
 			createBaseProps({
 				lineWidth: 4,
+				pointSize: 2,
 			}),
 		);
 		const largePointsBuilder = new UPlotSeriesBuilder(
@@ -147,7 +150,7 @@ describe('UPlotSeriesBuilder', () => {
 		const smallConfig = smallPointsBuilder.getConfig();
 		const largeConfig = largePointsBuilder.getConfig();
 
-		expect(smallConfig.points?.size).toBe(4 * POINT_SIZE_FACTOR); // should be lineWidth * POINT_SIZE_FACTOR, when pointSize is not provided
+		expect(smallConfig.points?.size).toBeUndefined();
 		expect(largeConfig.points?.size).toBe(4);
 	});
 

frontend/src/lib/uPlotV2/config/types.ts

@@ -34,7 +34,7 @@ export enum SelectionPreferencesSource {
  * Props for configuring the uPlot config builder
  */
 export interface ConfigBuilderProps {
-	id: string;
+	widgetId?: string;
 	onDragSelect?: (startTime: number, endTime: number) => void;
 	tzDate?: uPlot.LocalDateFromUnix;
 	selectionPreferencesSource?: SelectionPreferencesSource;
@@ -112,7 +112,6 @@ export enum DrawStyle {
 	Line = 'line',
 	Points = 'points',
 	Bar = 'bar',
-	Histogram = 'histogram',
 }
 
 export enum LineInterpolation {
@@ -169,6 +168,7 @@ export interface PointsConfig {
 export interface SeriesProps extends LineConfig, PointsConfig, BarConfig {
 	scaleKey: string;
 	label?: string;
+	panelType: PANEL_TYPES;
 	colorMapping: Record<string, string>;
 	drawStyle: DrawStyle;
 	pathBuilder?: Series.PathBuilder;

frontend/src/lib/uPlotV2/context/PlotContext.tsx

@@ -13,7 +13,7 @@ import { updateSeriesVisibilityToLocalStorage } from 'container/DashboardContain
 import type uPlot from 'uplot';
 export interface PlotContextInitialState {
 	uPlotInstance: uPlot | null;
-	id?: string;
+	widgetId?: string;
 	shouldSaveSelectionPreference?: boolean;
 }
 export interface IPlotContext {
@@ -31,17 +31,17 @@ export const PlotContextProvider = ({
 }: PropsWithChildren): JSX.Element => {
 	const uPlotInstanceRef = useRef<uPlot | null>(null);
 	const activeSeriesIndex = useRef<number | undefined>(undefined);
-	const idRef = useRef<string | undefined>(undefined);
+	const widgetIdRef = useRef<string | undefined>(undefined);
 	const shouldSavePreferencesRef = useRef<boolean>(false);
 
 	const setPlotContextInitialState = useCallback(
 		({
 			uPlotInstance,
-			id,
+			widgetId,
 			shouldSaveSelectionPreference,
 		}: PlotContextInitialState): void => {
 			uPlotInstanceRef.current = uPlotInstance;
-			idRef.current = id;
+			widgetIdRef.current = widgetId;
 			activeSeriesIndex.current = undefined;
 			shouldSavePreferencesRef.current = !!shouldSaveSelectionPreference;
 		},
@@ -50,7 +50,7 @@ export const PlotContextProvider = ({
 
 	const syncSeriesVisibilityToLocalStorage = useCallback((): void => {
 		const plot = uPlotInstanceRef.current;
-		if (!plot || !idRef.current) {
+		if (!plot || !widgetIdRef.current) {
 			return;
 		}
 
@@ -61,7 +61,7 @@ export const PlotContextProvider = ({
 			}),
 		);
 
-		updateSeriesVisibilityToLocalStorage(idRef.current, seriesVisibility);
+		updateSeriesVisibilityToLocalStorage(widgetIdRef.current, seriesVisibility);
 	}, []);
 
 	const onToggleSeriesVisibility = useCallback(
@@ -84,7 +84,7 @@ export const PlotContextProvider = ({
 						show: isReset || currentSeriesIndex === seriesIndex,
 					});
 				});
-				if (idRef.current && shouldSavePreferencesRef.current) {
+				if (widgetIdRef.current && shouldSavePreferencesRef.current) {
 					syncSeriesVisibilityToLocalStorage();
 				}
 			});
@@ -104,7 +104,7 @@ export const PlotContextProvider = ({
 				return;
 			}
 			plot.setSeries(seriesIndex, { show: !series.show });
-			if (idRef.current && shouldSavePreferencesRef.current) {
+			if (widgetIdRef.current && shouldSavePreferencesRef.current) {
 				syncSeriesVisibilityToLocalStorage();
 			}
 		},

frontend/src/lib/uPlotV2/context/__tests__/PlotContext.test.tsx

@@ -32,13 +32,13 @@ const createMockPlot = (series: MockSeries[] = []): uPlot =>
 
 interface TestComponentProps {
 	plot?: uPlot;
-	id?: string;
+	widgetId?: string;
 	shouldSaveSelectionPreference?: boolean;
 }
 
 const TestComponent = ({
 	plot,
-	id,
+	widgetId,
 	shouldSaveSelectionPreference,
 }: TestComponentProps): JSX.Element => {
 	const {
@@ -49,13 +49,17 @@ const TestComponent = ({
 		onFocusSeries,
 	} = usePlotContext();
 	const handleInit = (): void => {
-		if (!plot || !id || typeof shouldSaveSelectionPreference !== 'boolean') {
+		if (
+			!plot ||
+			!widgetId ||
+			typeof shouldSaveSelectionPreference !== 'boolean'
+		) {
 			return;
 		}
 
 		setPlotContextInitialState({
 			uPlotInstance: plot,
-			id,
+			widgetId,
 			shouldSaveSelectionPreference,
 		});
 	};
@@ -144,7 +148,11 @@ describe('PlotContext', () => {
 
 		render(
 			<PlotContextProvider>
-				<TestComponent plot={plot} id="widget-123" shouldSaveSelectionPreference />
+				<TestComponent
+					plot={plot}
+					widgetId="widget-123"
+					shouldSaveSelectionPreference
+				/>
 			</PlotContextProvider>,
 		);
 
@@ -191,7 +199,7 @@ describe('PlotContext', () => {
 				<PlotContextProvider>
 					<TestComponent
 						plot={plot}
-						id="widget-visibility"
+						widgetId="widget-visibility"
 						shouldSaveSelectionPreference
 					/>
 				</PlotContextProvider>,
@@ -232,7 +240,7 @@ describe('PlotContext', () => {
 				<PlotContextProvider>
 					<TestComponent
 						plot={plot}
-						id="widget-reset"
+						widgetId="widget-reset"
 						shouldSaveSelectionPreference
 					/>
 				</PlotContextProvider>,
@@ -282,7 +290,7 @@ describe('PlotContext', () => {
 				<PlotContextProvider>
 					<TestComponent
 						plot={plot}
-						id="widget-toggle"
+						widgetId="widget-toggle"
 						shouldSaveSelectionPreference
 					/>
 				</PlotContextProvider>,
@@ -308,7 +316,7 @@ describe('PlotContext', () => {
 				<PlotContextProvider>
 					<TestComponent
 						plot={plot}
-						id="widget-missing-series"
+						widgetId="widget-missing-series"
 						shouldSaveSelectionPreference
 					/>
 				</PlotContextProvider>,
@@ -333,7 +341,7 @@ describe('PlotContext', () => {
 				<PlotContextProvider>
 					<TestComponent
 						plot={plot}
-						id="widget-no-persist"
+						widgetId="widget-no-persist"
 						shouldSaveSelectionPreference={false}
 					/>
 				</PlotContextProvider>,
@@ -371,7 +379,7 @@ describe('PlotContext', () => {
 				<PlotContextProvider>
 					<TestComponent
 						plot={plot}
-						id="widget-focus"
+						widgetId="widget-focus"
 						shouldSaveSelectionPreference={false}
 					/>
 				</PlotContextProvider>,

frontend/src/lib/uPlotV2/plugins/__tests__/TooltipPlugin.test.ts

@@ -40,7 +40,7 @@ class TestConfigBuilder extends UPlotConfigBuilder {
 type ConfigMock = TestConfigBuilder;
 
 function createConfigMock(): ConfigMock {
-	return new TestConfigBuilder({ id: 'test-widget' });
+	return new TestConfigBuilder();
 }
 
 function getHandler(config: ConfigMock, hookName: string): HookHandler {

frontend/src/providers/Dashboard/store/__tests__/variableFetchStore.test.ts

@@ -25,7 +25,7 @@ function resetStore(): void {
 
 function mockContext(overrides: Partial<VariableFetchContext> = {}): void {
 	getVariableDependencyContextSpy.mockReturnValue({
-		doAllQueryVariablesHaveValuesSelected: false,
+		doAllVariablesHaveValuesSelected: false,
 		variableTypes: {},
 		dynamicVariableOrder: [],
 		dependencyData: null,
@@ -175,9 +175,9 @@ describe('variableFetchStore', () => {
 			expect(storeSnapshot.cycleIds.b).toBe(1);
 		});
 
-		it('should set dynamic variables to waiting when not all query variables have values', () => {
+		it('should set dynamic variables to waiting when not all variables have values', () => {
 			mockContext({
-				doAllQueryVariablesHaveValuesSelected: false,
+				doAllVariablesHaveValuesSelected: false,
 				dependencyData: buildDependencyData({ order: [] }),
 				variableTypes: { dyn1: 'DYNAMIC' },
 				dynamicVariableOrder: ['dyn1'],
@@ -190,9 +190,9 @@ describe('variableFetchStore', () => {
 			expect(storeSnapshot.states.dyn1).toBe('waiting');
 		});
 
-		it('should set dynamic variables to loading when all query variables have values', () => {
+		it('should set dynamic variables to loading when all variables have values', () => {
 			mockContext({
-				doAllQueryVariablesHaveValuesSelected: true,
+				doAllVariablesHaveValuesSelected: true,
 				dependencyData: buildDependencyData({ order: [] }),
 				variableTypes: { dyn1: 'DYNAMIC' },
 				dynamicVariableOrder: ['dyn1'],
@@ -523,77 +523,5 @@ describe('variableFetchStore', () => {
 
 			expect(variableFetchStore.getSnapshot().states.b).toBe('revalidating');
 		});
-
-		it('should enqueue dynamic variables immediately when all query variables are settled', () => {
-			mockContext({
-				dependencyData: buildDependencyData({
-					transitiveDescendants: { customVar: [] },
-					parentDependencyGraph: {},
-				}),
-				variableTypes: { q1: 'QUERY', customVar: 'CUSTOM', dyn1: 'DYNAMIC' },
-				dynamicVariableOrder: ['dyn1'],
-			});
-
-			variableFetchStore.update((d) => {
-				d.states.q1 = 'idle';
-				d.states.customVar = 'idle';
-				d.states.dyn1 = 'idle';
-			});
-
-			enqueueDescendantsOfVariable('customVar');
-
-			const snapshot = variableFetchStore.getSnapshot();
-			expect(snapshot.states.dyn1).toBe('loading');
-			expect(snapshot.cycleIds.dyn1).toBe(1);
-		});
-
-		it('should set dynamic variables to waiting when query variables are not yet settled', () => {
-			// a is a query variable still loading; changing customVar should queue dyn1 as waiting
-			mockContext({
-				dependencyData: buildDependencyData({
-					transitiveDescendants: { customVar: [] },
-					parentDependencyGraph: {},
-				}),
-				variableTypes: { a: 'QUERY', customVar: 'CUSTOM', dyn1: 'DYNAMIC' },
-				dynamicVariableOrder: ['dyn1'],
-			});
-
-			variableFetchStore.update((d) => {
-				d.states.a = 'loading';
-				d.states.customVar = 'idle';
-				d.states.dyn1 = 'idle';
-			});
-
-			enqueueDescendantsOfVariable('customVar');
-
-			expect(variableFetchStore.getSnapshot().states.dyn1).toBe('waiting');
-		});
-
-		it('should set dynamic variables to waiting when a query descendant is now loading', () => {
-			// a -> b (QUERY), dyn1 (DYNAMIC). When a changes, b starts loading,
-			// so dyn1 should wait until b settles.
-			mockContext({
-				dependencyData: buildDependencyData({
-					transitiveDescendants: { a: ['b'] },
-					parentDependencyGraph: { b: ['a'] },
-				}),
-				variableTypes: { a: 'QUERY', b: 'QUERY', dyn1: 'DYNAMIC' },
-				dynamicVariableOrder: ['dyn1'],
-			});
-
-			variableFetchStore.update((d) => {
-				d.states.a = 'idle';
-				d.states.b = 'idle';
-				d.states.dyn1 = 'idle';
-			});
-
-			enqueueDescendantsOfVariable('a');
-
-			const snapshot = variableFetchStore.getSnapshot();
-			// b's parent (a) is idle → b starts loading
-			expect(snapshot.states.b).toBe('loading');
-			// dyn1 must wait because b is now loading (not settled)
-			expect(snapshot.states.dyn1).toBe('waiting');
-		});
 	});
 });

frontend/src/providers/Dashboard/store/dashboardVariables/__tests__/dashboardVariablesStore.test.ts

@@ -134,7 +134,7 @@ describe('dashboardVariablesStore', () => {
 			expect(dependencyData).not.toBeNull();
 		});
 
-		it('should report doAllQueryVariablesHaveValuesSelected as true when all query variables have values', () => {
+		it('should report doAllVariablesHaveValuesSelected as true when all variables have selectedValue', () => {
 			setDashboardVariablesStore({
 				dashboardId: 'dash-1',
 				variables: {
@@ -146,46 +146,18 @@ describe('dashboardVariablesStore', () => {
 					}),
 					region: createVariable({
 						name: 'region',
-						type: 'QUERY',
+						type: 'CUSTOM',
 						order: 1,
 						selectedValue: 'us-east',
 					}),
 				},
 			});
 
-			const {
-				doAllQueryVariablesHaveValuesSelected,
-			} = getVariableDependencyContext();
-			expect(doAllQueryVariablesHaveValuesSelected).toBe(true);
+			const { doAllVariablesHaveValuesSelected } = getVariableDependencyContext();
+			expect(doAllVariablesHaveValuesSelected).toBe(true);
 		});
 
-		it('should report doAllQueryVariablesHaveValuesSelected as false when a query variable lacks a selectedValue', () => {
-			setDashboardVariablesStore({
-				dashboardId: 'dash-1',
-				variables: {
-					env: createVariable({
-						name: 'env',
-						type: 'QUERY',
-						order: 0,
-						selectedValue: 'prod',
-					}),
-					region: createVariable({
-						name: 'region',
-						type: 'QUERY',
-						order: 1,
-						selectedValue: undefined,
-					}),
-				},
-			});
-
-			const {
-				doAllQueryVariablesHaveValuesSelected,
-			} = getVariableDependencyContext();
-			expect(doAllQueryVariablesHaveValuesSelected).toBe(false);
-		});
-
-		it('should ignore non-QUERY variables when computing doAllQueryVariablesHaveValuesSelected', () => {
-			// env (QUERY) has a value; region (CUSTOM) and dyn1 (DYNAMIC) do not — they are ignored
+		it('should report doAllVariablesHaveValuesSelected as false when some variables lack selectedValue', () => {
 			setDashboardVariablesStore({
 				dashboardId: 'dash-1',
 				variables: {
@@ -201,22 +173,14 @@ describe('dashboardVariablesStore', () => {
 						order: 1,
 						selectedValue: undefined,
 					}),
-					dyn1: createVariable({
-						name: 'dyn1',
-						type: 'DYNAMIC',
-						order: 2,
-						selectedValue: '',
-					}),
 				},
 			});
 
-			const {
-				doAllQueryVariablesHaveValuesSelected,
-			} = getVariableDependencyContext();
-			expect(doAllQueryVariablesHaveValuesSelected).toBe(true);
+			const { doAllVariablesHaveValuesSelected } = getVariableDependencyContext();
+			expect(doAllVariablesHaveValuesSelected).toBe(false);
 		});
 
-		it('should return true for doAllQueryVariablesHaveValuesSelected when there are no query variables', () => {
+		it('should treat DYNAMIC variable with allSelected=true and selectedValue=null as having a value', () => {
 			setDashboardVariablesStore({
 				dashboardId: 'dash-1',
 				variables: {
@@ -224,73 +188,110 @@ describe('dashboardVariablesStore', () => {
 						name: 'dyn1',
 						type: 'DYNAMIC',
 						order: 0,
-						selectedValue: '',
+						selectedValue: null as any,
+						allSelected: true,
 					}),
-				},
-			});
-
-			const {
-				doAllQueryVariablesHaveValuesSelected,
-			} = getVariableDependencyContext();
-			expect(doAllQueryVariablesHaveValuesSelected).toBe(true);
-		});
-
-		// Any non-nil, non-empty-array selectedValue is treated as selected
-		it.each([
-			{ label: 'numeric 0', selectedValue: 0 as number },
-			{ label: 'boolean false', selectedValue: false as boolean },
-			// ideally not possible but till we have concrete schema, we should not block dynamic variables
-			{ label: 'empty string', selectedValue: '' },
-			{
-				label: 'non-empty array',
-				selectedValue: ['a', 'b'] as (string | number | boolean)[],
-			},
-		])('should return true when selectedValue is $label', ({ selectedValue }) => {
-			setDashboardVariablesStore({
-				dashboardId: 'dash-1',
-				variables: {
 					env: createVariable({
 						name: 'env',
 						type: 'QUERY',
-						order: 0,
-						selectedValue,
+						order: 1,
+						selectedValue: 'prod',
 					}),
 				},
 			});
 
-			const {
-				doAllQueryVariablesHaveValuesSelected,
-			} = getVariableDependencyContext();
-			expect(doAllQueryVariablesHaveValuesSelected).toBe(true);
+			const { doAllVariablesHaveValuesSelected } = getVariableDependencyContext();
+			expect(doAllVariablesHaveValuesSelected).toBe(true);
 		});
 
-		// null/undefined (tested above) and empty array are treated as not selected
-		it.each([
-			{
-				label: 'null',
-				selectedValue: null as IDashboardVariable['selectedValue'],
-			},
-			{ label: 'empty array', selectedValue: [] as (string | number | boolean)[] },
-		])(
-			'should return false when selectedValue is $label',
-			({ selectedValue }) => {
-				setDashboardVariablesStore({
-					dashboardId: 'dash-1',
-					variables: {
-						env: createVariable({
-							name: 'env',
-							type: 'QUERY',
-							order: 0,
-							selectedValue,
-						}),
-					},
-				});
+		it('should treat DYNAMIC variable with allSelected=true and selectedValue=undefined as having a value', () => {
+			setDashboardVariablesStore({
+				dashboardId: 'dash-1',
+				variables: {
+					dyn1: createVariable({
+						name: 'dyn1',
+						type: 'DYNAMIC',
+						order: 0,
+						selectedValue: undefined,
+						allSelected: true,
+					}),
+					env: createVariable({
+						name: 'env',
+						type: 'QUERY',
+						order: 1,
+						selectedValue: 'prod',
+					}),
+				},
+			});
 
-				const {
-					doAllQueryVariablesHaveValuesSelected,
-				} = getVariableDependencyContext();
-				expect(doAllQueryVariablesHaveValuesSelected).toBe(false);
-			},
-		);
+			const { doAllVariablesHaveValuesSelected } = getVariableDependencyContext();
+			expect(doAllVariablesHaveValuesSelected).toBe(true);
+		});
+
+		it('should treat DYNAMIC variable with allSelected=true and empty string selectedValue as having a value', () => {
+			setDashboardVariablesStore({
+				dashboardId: 'dash-1',
+				variables: {
+					dyn1: createVariable({
+						name: 'dyn1',
+						type: 'DYNAMIC',
+						order: 0,
+						selectedValue: '',
+						allSelected: true,
+					}),
+					env: createVariable({
+						name: 'env',
+						type: 'QUERY',
+						order: 1,
+						selectedValue: 'prod',
+					}),
+				},
+			});
+
+			const { doAllVariablesHaveValuesSelected } = getVariableDependencyContext();
+			expect(doAllVariablesHaveValuesSelected).toBe(true);
+		});
+
+		it('should treat DYNAMIC variable with allSelected=true and empty array selectedValue as having a value', () => {
+			setDashboardVariablesStore({
+				dashboardId: 'dash-1',
+				variables: {
+					dyn1: createVariable({
+						name: 'dyn1',
+						type: 'DYNAMIC',
+						order: 0,
+						selectedValue: [] as any,
+						allSelected: true,
+					}),
+					env: createVariable({
+						name: 'env',
+						type: 'QUERY',
+						order: 1,
+						selectedValue: 'prod',
+					}),
+				},
+			});
+
+			const { doAllVariablesHaveValuesSelected } = getVariableDependencyContext();
+			expect(doAllVariablesHaveValuesSelected).toBe(true);
+		});
+
+		it('should report false when a DYNAMIC variable has empty selectedValue and allSelected is not true', () => {
+			setDashboardVariablesStore({
+				dashboardId: 'dash-1',
+				variables: {
+					dyn1: createVariable({
+						name: 'dyn1',
+						type: 'DYNAMIC',
+						order: 0,
+						selectedValue: '',
+						allSelected: false,
+					}),
+				},
+			});
+
+			const { doAllVariablesHaveValuesSelected } = getVariableDependencyContext();
+			expect(doAllVariablesHaveValuesSelected).toBe(false);
+		});
 	});
 });

frontend/src/providers/Dashboard/store/dashboardVariables/dashboardVariablesStore.ts

@@ -1,4 +1,4 @@
-import { isNil } from 'lodash-es';
+import { isEmpty, isUndefined } from 'lodash-es';
 
 import createStore from '../store';
 import { VariableFetchContext } from '../variableFetchStore';
@@ -68,28 +68,28 @@ export function updateDashboardVariablesStore({
  */
 export function getVariableDependencyContext(): VariableFetchContext {
 	const state = dashboardVariablesStore.getSnapshot();
-	// Dynamic variables should only wait on query variables having values,
-	// not on CUSTOM, TEXTBOX, or other types.
-	const doAllQueryVariablesHaveValuesSelected = Object.values(
-		state.variables,
-	).every((variable) => {
-		if (variable.type !== 'QUERY') {
-			return true;
-		}
 
-		if (isNil(variable.selectedValue)) {
-			return false;
-		}
+	// If every variable already has a selectedValue (e.g. persisted from
+	// localStorage/URL), dynamic variables can start in parallel.
+	// Otherwise they wait for query vars to settle first.
+	const doAllVariablesHaveValuesSelected = Object.values(state.variables).every(
+		(variable) => {
+			if (
+				variable.type === 'DYNAMIC' &&
+				(variable.selectedValue === null || isEmpty(variable.selectedValue)) &&
+				variable.allSelected === true
+			) {
+				return true;
+			}
 
-		if (Array.isArray(variable.selectedValue)) {
-			return variable.selectedValue.length > 0;
-		}
-
-		return true;
-	});
+			return (
+				!isUndefined(variable.selectedValue) && !isEmpty(variable.selectedValue)
+			);
+		},
+	);
 
 	return {
-		doAllQueryVariablesHaveValuesSelected,
+		doAllVariablesHaveValuesSelected,
 		variableTypes: state.variableTypes,
 		dynamicVariableOrder: state.dynamicVariableOrder,
 		dependencyData: state.dependencyData,

frontend/src/providers/Dashboard/store/variableFetchStore.ts

@@ -36,7 +36,7 @@ export type VariableFetchContext = Pick<
 	IDashboardVariablesStoreState,
 	'variableTypes' | 'dynamicVariableOrder' | 'dependencyData'
 > & {
-	doAllQueryVariablesHaveValuesSelected: boolean;
+	doAllVariablesHaveValuesSelected: boolean;
 };
 
 const initialState: IVariableFetchStoreState = {
@@ -88,7 +88,7 @@ export function initializeVariableFetchStore(variableNames: string[]): void {
  */
 export function enqueueFetchOfAllVariables(): void {
 	const {
-		doAllQueryVariablesHaveValuesSelected,
+		doAllVariablesHaveValuesSelected,
 		dependencyData,
 		variableTypes,
 		dynamicVariableOrder,
@@ -116,7 +116,7 @@ export function enqueueFetchOfAllVariables(): void {
 		// otherwise wait for query variables to settle first
 		dynamicVariableOrder.forEach((name) => {
 			draft.cycleIds[name] = (draft.cycleIds[name] || 0) + 1;
-			draft.states[name] = doAllQueryVariablesHaveValuesSelected
+			draft.states[name] = doAllVariablesHaveValuesSelected
 				? resolveFetchState(draft, name)
 				: 'waiting';
 		});
@@ -208,11 +208,7 @@ export function onVariableFetchFailure(name: string): void {
  * ensures parents are set before children within a single update).
  */
 export function enqueueDescendantsOfVariable(name: string): void {
-	const {
-		dependencyData,
-		variableTypes,
-		dynamicVariableOrder,
-	} = getVariableDependencyContext();
+	const { dependencyData, variableTypes } = getVariableDependencyContext();
 	if (!dependencyData) {
 		return;
 	}
@@ -234,18 +230,5 @@ export function enqueueDescendantsOfVariable(name: string): void {
 				? resolveFetchState(draft, desc)
 				: 'waiting';
 		});
-
-		// Dynamic variables implicitly depend on all query variable values.
-		// If all query variables are currently settled, start them immediately;
-		// otherwise they wait until query vars finish (unlocked via onVariableFetchComplete).
-		dynamicVariableOrder.forEach((dynName) => {
-			draft.cycleIds[dynName] = (draft.cycleIds[dynName] || 0) + 1;
-			draft.states[dynName] = areAllQueryVariablesSettled(
-				draft.states,
-				variableTypes,
-			)
-				? resolveFetchState(draft, dynName)
-				: 'waiting';
-		});
 	});
 }

frontend/src/providers/QueryBuilder.tsx

@@ -947,7 +947,6 @@ export function QueryBuilderProvider({
 			searchParams?: Record<string, unknown>,
 			redirectingUrl?: typeof ROUTES[keyof typeof ROUTES],
 			shouldNotStringify?: boolean,
-			newTab?: boolean,
 		) => {
 			const queryType =
 				!query.queryType || !Object.values(EQueryType).includes(query.queryType)
@@ -1014,7 +1013,7 @@ export function QueryBuilderProvider({
 				? `${redirectingUrl}?${urlQuery}`
 				: `${location.pathname}?${urlQuery}`;
 
-			safeNavigate(generatedUrl, { newTab });
+			safeNavigate(generatedUrl);
 		},
 		[location.pathname, safeNavigate, urlQuery],
 	);

frontend/src/types/common/operations.types.ts

@@ -72,6 +72,7 @@ export type UseQueryOperations = (
 	handleChangeAggregatorAttribute: (
 		value: BaseAutocompleteData,
 		isEditMode?: boolean,
+		attributeKeys?: BaseAutocompleteData[],
 	) => void;
 	handleChangeDataSource: (newSource: DataSource) => void;
 	handleDeleteQuery: () => void;

frontend/src/types/common/queryBuilder.ts

@@ -278,7 +278,6 @@ export type QueryBuilderContextType = {
 		searchParams?: Record<string, unknown>,
 		redirectToUrl?: typeof ROUTES[keyof typeof ROUTES],
 		shallStringify?: boolean,
-		newTab?: boolean,
 	) => void;
 	handleRunQuery: () => void;
 	resetQuery: (newCurrentQuery?: QueryState) => void;

pkg/modules/metricsexplorer/implmetricsexplorer/module.go

@@ -14,7 +14,6 @@ import (
 	"github.com/SigNoz/signoz/pkg/modules/dashboard"
 	"github.com/SigNoz/signoz/pkg/modules/metricsexplorer"
 	"github.com/SigNoz/signoz/pkg/querybuilder"
-	"github.com/SigNoz/signoz/pkg/telemetrymeter"
 	"github.com/SigNoz/signoz/pkg/telemetrymetrics"
 	"github.com/SigNoz/signoz/pkg/telemetrystore"
 	"github.com/SigNoz/signoz/pkg/types/ctxtypes"
@@ -57,81 +56,22 @@ func NewModule(ts telemetrystore.TelemetryStore, telemetryMetadataStore telemetr
 	}
 }
 
-// TODO(srikanthccv): use metadata store to fetch metric metadata
+func withMetricsExplorerQuery(ctx context.Context, functionName string) context.Context {
+	comments := map[string]string{
+		"signal":        telemetrytypes.SignalMetrics.StringValue(),
+		"module_name":   "metrics-explorer",
+		"function_name": functionName,
+	}
+	return ctxtypes.AddCommentsToContext(ctx, comments)
+}
+
 func (m *module) ListMetrics(ctx context.Context, orgID valuer.UUID, params *metricsexplorertypes.ListMetricsParams) (*metricsexplorertypes.ListMetricsResponse, error) {
+	ctx = withMetricsExplorerQuery(ctx, "ListMetrics")
+
 	if err := params.Validate(); err != nil {
 		return nil, err
 	}
 
-	if params.Source == "meter" {
-		return m.listMeterMetrics(ctx, params)
-	}
-	return m.listMetrics(ctx, orgID, params)
-}
-
-func (m *module) listMeterMetrics(ctx context.Context, params *metricsexplorertypes.ListMetricsParams) (*metricsexplorertypes.ListMetricsResponse, error) {
-	sb := sqlbuilder.NewSelectBuilder()
-	sb.Select(
-		"metric_name",
-		"any(description) AS description",
-		"any(type) AS metric_type",
-		"any(unit) AS metric_unit",
-		"argMax(temporality, unix_milli) AS temporality",
-		"any(is_monotonic) AS is_monotonic",
-	)
-	sb.From(fmt.Sprintf("%s.%s", telemetrymeter.DBName, telemetrymeter.SamplesTableName))
-
-	if params.Start != nil && params.End != nil {
-		sb.Where(sb.Between("unix_milli", *params.Start, *params.End))
-	}
-
-	if params.Search != "" {
-		searchLower := strings.ToLower(params.Search)
-		searchLower = strings.ReplaceAll(searchLower, "%", "\\%")
-		searchLower = strings.ReplaceAll(searchLower, "_", "\\_")
-		sb.Where(sb.Like("lower(metric_name)", fmt.Sprintf("%%%s%%", searchLower)))
-	}
-
-	sb.GroupBy("metric_name")
-	sb.OrderBy("metric_name ASC")
-	sb.Limit(params.Limit)
-
-	query, args := sb.BuildWithFlavor(sqlbuilder.ClickHouse)
-
-	valueCtx := ctxtypes.SetClickhouseMaxThreads(ctx, m.config.TelemetryStore.Threads)
-	db := m.telemetryStore.ClickhouseDB()
-	rows, err := db.Query(valueCtx, query, args...)
-	if err != nil {
-		return nil, errors.WrapInternalf(err, errors.CodeInternal, "failed to list meter metrics")
-	}
-	defer rows.Close()
-
-	metrics := make([]metricsexplorertypes.ListMetric, 0)
-	for rows.Next() {
-		var metric metricsexplorertypes.ListMetric
-		if err := rows.Scan(
-			&metric.MetricName,
-			&metric.Description,
-			&metric.MetricType,
-			&metric.MetricUnit,
-			&metric.Temporality,
-			&metric.IsMonotonic,
-		); err != nil {
-			return nil, errors.WrapInternalf(err, errors.CodeInternal, "failed to scan meter metric")
-		}
-		metrics = append(metrics, metric)
-	}
-
-	if err := rows.Err(); err != nil {
-		return nil, errors.WrapInternalf(err, errors.CodeInternal, "error iterating meter metrics")
-	}
-
-	return &metricsexplorertypes.ListMetricsResponse{
-		Metrics: metrics,
-	}, nil
-}
-
-func (m *module) listMetrics(ctx context.Context, orgID valuer.UUID, params *metricsexplorertypes.ListMetricsParams) (*metricsexplorertypes.ListMetricsResponse, error) {
 	sb := sqlbuilder.NewSelectBuilder()
 	sb.Select("DISTINCT metric_name")
 
@@ -288,6 +228,7 @@ func (m *module) GetTreemap(ctx context.Context, orgID valuer.UUID, req *metrics
 }
 
 func (m *module) GetMetricMetadataMulti(ctx context.Context, orgID valuer.UUID, metricNames []string) (map[string]*metricsexplorertypes.MetricMetadata, error) {
+
 	if len(metricNames) == 0 {
 		return map[string]*metricsexplorertypes.MetricMetadata{}, nil
 	}
@@ -476,6 +417,8 @@ func (m *module) GetMetricAttributes(ctx context.Context, orgID valuer.UUID, req
 }
 
 func (m *module) CheckMetricExists(ctx context.Context, orgID valuer.UUID, metricName string) (bool, error) {
+	ctx = withMetricsExplorerQuery(ctx, "CheckMetricExists")
+
 	sb := sqlbuilder.NewSelectBuilder()
 	sb.Select("count(*) > 0 as metricExists")
 	sb.From(fmt.Sprintf("%s.%s", telemetrymetrics.DBName, telemetrymetrics.AttributesMetadataTableName))
@@ -512,6 +455,8 @@ func (m *module) fetchMetadataFromCache(ctx context.Context, orgID valuer.UUID,
 }
 
 func (m *module) fetchUpdatedMetadata(ctx context.Context, orgID valuer.UUID, metricNames []string) (map[string]*metricsexplorertypes.MetricMetadata, error) {
+	ctx = withMetricsExplorerQuery(ctx, "fetchUpdatedMetadata")
+
 	if len(metricNames) == 0 {
 		return map[string]*metricsexplorertypes.MetricMetadata{}, nil
 	}
@@ -570,6 +515,8 @@ func (m *module) fetchUpdatedMetadata(ctx context.Context, orgID valuer.UUID, me
 }
 
 func (m *module) fetchTimeseriesMetadata(ctx context.Context, orgID valuer.UUID, metricNames []string) (map[string]*metricsexplorertypes.MetricMetadata, error) {
+	ctx = withMetricsExplorerQuery(ctx, "fetchTimeseriesMetadata")
+
 	if len(metricNames) == 0 {
 		return map[string]*metricsexplorertypes.MetricMetadata{}, nil
 	}
@@ -698,6 +645,8 @@ func (m *module) validateMetricLabels(ctx context.Context, req *metricsexplorert
 }
 
 func (m *module) checkForLabelInMetric(ctx context.Context, metricName string, label string) (bool, error) {
+	ctx = withMetricsExplorerQuery(ctx, "checkForLabelInMetric")
+
 	sb := sqlbuilder.NewSelectBuilder()
 	sb.Select("count(*) > 0 AS has_label")
 	sb.From(fmt.Sprintf("%s.%s", telemetrymetrics.DBName, telemetrymetrics.AttributesMetadataTableName))
@@ -719,6 +668,7 @@ func (m *module) checkForLabelInMetric(ctx context.Context, metricName string, l
 }
 
 func (m *module) insertMetricsMetadata(ctx context.Context, orgID valuer.UUID, req *metricsexplorertypes.UpdateMetricMetadataRequest) error {
+	ctx = withMetricsExplorerQuery(ctx, "insertMetricsMetadata")
 	createdAt := time.Now().UnixMilli()
 
 	ib := sqlbuilder.NewInsertBuilder()
@@ -786,8 +736,9 @@ func (m *module) buildFilterClause(ctx context.Context, filter *qbtypes.Filter,
 		Logger:           m.logger,
 		FieldMapper:      m.fieldMapper,
 		ConditionBuilder: m.condBuilder,
-		FullTextColumn:   &telemetrytypes.TelemetryFieldKey{Name: "metric_name", FieldContext: telemetrytypes.FieldContextMetric},
-		FieldKeys:        keys,
+		FullTextColumn: &telemetrytypes.TelemetryFieldKey{
+			Name: "labels"},
+		FieldKeys: keys,
 	}
 
 	startNs := querybuilder.ToNanoSecs(uint64(startMillis))
@@ -812,6 +763,7 @@ func (m *module) fetchMetricsStatsWithSamples(
 	normalized bool,
 	orderBy *qbtypes.OrderBy,
 ) ([]metricsexplorertypes.Stat, uint64, error) {
+	ctx = withMetricsExplorerQuery(ctx, "fetchMetricsStatsWithSamples")
 
 	start, end, distributedTsTable, localTsTable := telemetrymetrics.WhichTSTableToUse(uint64(req.Start), uint64(req.End), nil)
 	samplesTable := telemetrymetrics.WhichSamplesTableToUse(uint64(req.Start), uint64(req.End), metrictypes.UnspecifiedType, metrictypes.TimeAggregationUnspecified, nil)
@@ -919,6 +871,8 @@ func (m *module) fetchMetricsStatsWithSamples(
 }
 
 func (m *module) computeTimeseriesTreemap(ctx context.Context, req *metricsexplorertypes.TreemapRequest, filterWhereClause *sqlbuilder.WhereClause) ([]metricsexplorertypes.TreemapEntry, error) {
+	ctx = withMetricsExplorerQuery(ctx, "computeTimeseriesTreemap")
+
 	start, end, distributedTsTable, _ := telemetrymetrics.WhichTSTableToUse(uint64(req.Start), uint64(req.End), nil)
 
 	totalTSBuilder := sqlbuilder.NewSelectBuilder()
@@ -983,6 +937,8 @@ func (m *module) computeTimeseriesTreemap(ctx context.Context, req *metricsexplo
 }
 
 func (m *module) computeSamplesTreemap(ctx context.Context, req *metricsexplorertypes.TreemapRequest, filterWhereClause *sqlbuilder.WhereClause) ([]metricsexplorertypes.TreemapEntry, error) {
+	ctx = withMetricsExplorerQuery(ctx, "computeSamplesTreemap")
+
 	start, end, distributedTsTable, localTsTable := telemetrymetrics.WhichTSTableToUse(uint64(req.Start), uint64(req.End), nil)
 	samplesTable := telemetrymetrics.WhichSamplesTableToUse(uint64(req.Start), uint64(req.End), metrictypes.UnspecifiedType, metrictypes.TimeAggregationUnspecified, nil)
 	countExp := telemetrymetrics.CountExpressionForSamplesTable(samplesTable)
@@ -1084,6 +1040,8 @@ func (m *module) computeSamplesTreemap(ctx context.Context, req *metricsexplorer
 
 // getMetricDataPoints returns the total number of data points (samples) for a metric.
 func (m *module) getMetricDataPoints(ctx context.Context, metricName string) (uint64, error) {
+	ctx = withMetricsExplorerQuery(ctx, "getMetricDataPoints")
+
 	sb := sqlbuilder.NewSelectBuilder()
 	sb.Select("sum(count) AS data_points")
 	sb.From(fmt.Sprintf("%s.%s", telemetrymetrics.DBName, telemetrymetrics.SamplesV4Agg30mTableName))
@@ -1104,6 +1062,8 @@ func (m *module) getMetricDataPoints(ctx context.Context, metricName string) (ui
 
 // getMetricLastReceived returns the last received timestamp for a metric.
 func (m *module) getMetricLastReceived(ctx context.Context, metricName string) (uint64, error) {
+	ctx = withMetricsExplorerQuery(ctx, "getMetricLastReceived")
+
 	sb := sqlbuilder.NewSelectBuilder()
 	sb.Select("MAX(last_reported_unix_milli) AS last_received_time")
 	sb.From(fmt.Sprintf("%s.%s", telemetrymetrics.DBName, telemetrymetrics.AttributesMetadataTableName))
@@ -1127,6 +1087,8 @@ func (m *module) getMetricLastReceived(ctx context.Context, metricName string) (
 
 // getTotalTimeSeriesForMetricName returns the total number of unique time series for a metric.
 func (m *module) getTotalTimeSeriesForMetricName(ctx context.Context, metricName string) (uint64, error) {
+	ctx = withMetricsExplorerQuery(ctx, "getTotalTimeSeriesForMetricName")
+
 	sb := sqlbuilder.NewSelectBuilder()
 	sb.Select("uniq(fingerprint) AS time_series_count")
 	sb.From(fmt.Sprintf("%s.%s", telemetrymetrics.DBName, telemetrymetrics.TimeseriesV41weekTableName))
@@ -1147,6 +1109,8 @@ func (m *module) getTotalTimeSeriesForMetricName(ctx context.Context, metricName
 
 // getActiveTimeSeriesForMetricName returns the number of active time series for a metric within the given duration.
 func (m *module) getActiveTimeSeriesForMetricName(ctx context.Context, metricName string, duration time.Duration) (uint64, error) {
+	ctx = withMetricsExplorerQuery(ctx, "getActiveTimeSeriesForMetricName")
+
 	milli := time.Now().Add(-duration).UnixMilli()
 
 	sb := sqlbuilder.NewSelectBuilder()
@@ -1168,6 +1132,8 @@ func (m *module) getActiveTimeSeriesForMetricName(ctx context.Context, metricNam
 }
 
 func (m *module) fetchMetricAttributes(ctx context.Context, metricName string, start, end *int64) ([]metricsexplorertypes.MetricAttribute, error) {
+	ctx = withMetricsExplorerQuery(ctx, "fetchMetricAttributes")
+
 	// Build query using sqlbuilder
 	sb := sqlbuilder.NewSelectBuilder()
 	sb.Select(

pkg/modules/promote/implpromote/module.go

@@ -11,6 +11,7 @@ import (
 	"github.com/SigNoz/signoz/pkg/modules/promote"
 	"github.com/SigNoz/signoz/pkg/telemetrylogs"
 	"github.com/SigNoz/signoz/pkg/telemetrystore"
+	"github.com/SigNoz/signoz/pkg/types/ctxtypes"
 	"github.com/SigNoz/signoz/pkg/types/promotetypes"
 	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
 )
@@ -105,6 +106,11 @@ func (m *module) PromotePaths(ctx context.Context, paths []string) error {
 
 // createIndexes creates string ngram + token filter indexes on JSON path subcolumns for LIKE queries.
 func (m *module) createIndexes(ctx context.Context, indexes []schemamigrator.Index) error {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalLogs.StringValue(),
+		"module_name":   "promote",
+		"function_name": "createIndexes",
+	})
 	if len(indexes) == 0 {
 		return nil
 	}

pkg/modules/services/implservices/module.go

@@ -13,6 +13,7 @@ import (
 	"github.com/SigNoz/signoz/pkg/querier"
 	"github.com/SigNoz/signoz/pkg/telemetrystore"
 	"github.com/SigNoz/signoz/pkg/telemetrytraces"
+	"github.com/SigNoz/signoz/pkg/types/ctxtypes"
 	qbtypes "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
 	"github.com/SigNoz/signoz/pkg/types/servicetypes/servicetypesv1"
 	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
@@ -34,6 +35,12 @@ func NewModule(q querier.Querier, ts telemetrystore.TelemetryStore) services.Mod
 
 // FetchTopLevelOperations returns top-level operations per service using db query
 func (m *module) FetchTopLevelOperations(ctx context.Context, start time.Time, services []string) (map[string][]string, error) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalTraces.StringValue(),
+		"module_name":   "services",
+		"function_name": "FetchTopLevelOperations",
+	})
+
 	db := m.TelemetryStore.ClickhouseDB()
 	query := fmt.Sprintf("SELECT name, serviceName, max(time) as ts FROM %s.%s WHERE time >= @start", telemetrytraces.DBName, telemetrytraces.TopLevelOperationsTableName)
 	args := []any{clickhouse.Named("start", start)}

pkg/prometheus/clickhouseprometheus/client.go

@@ -11,6 +11,8 @@ import (
 	"github.com/SigNoz/signoz/pkg/factory"
 	"github.com/SigNoz/signoz/pkg/query-service/constants"
 	"github.com/SigNoz/signoz/pkg/telemetrystore"
+	"github.com/SigNoz/signoz/pkg/types/ctxtypes"
+	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
 	promValue "github.com/prometheus/prometheus/model/value"
 	"github.com/prometheus/prometheus/prompb"
 	"github.com/prometheus/prometheus/storage"
@@ -137,6 +139,11 @@ func (client *client) queryToClickhouseQuery(_ context.Context, query *prompb.Qu
 }
 
 func (client *client) getFingerprintsFromClickhouseQuery(ctx context.Context, query string, args []any) (map[uint64][]prompb.Label, error) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalMetrics.StringValue(),
+		"module_name":   "clickhouse-prometheus",
+		"function_name": "getFingerprintsFromClickhouseQuery",
+	})
 	rows, err := client.telemetryStore.ClickhouseDB().Query(ctx, query, args...)
 	if err != nil {
 		return nil, err
@@ -168,6 +175,11 @@ func (client *client) getFingerprintsFromClickhouseQuery(ctx context.Context, qu
 }
 
 func (client *client) querySamples(ctx context.Context, start int64, end int64, fingerprints map[uint64][]prompb.Label, metricName string, subQuery string, args []any) ([]*prompb.TimeSeries, error) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalMetrics.StringValue(),
+		"module_name":   "clickhouse-prometheus",
+		"function_name": "querySamples",
+	})
 	argCount := len(args)
 
 	query := fmt.Sprintf(`
@@ -244,6 +256,12 @@ func (client *client) querySamples(ctx context.Context, start int64, end int64,
 }
 
 func (client *client) queryRaw(ctx context.Context, query string, ts int64) (*prompb.QueryResult, error) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalMetrics.StringValue(),
+		"module_name":   "clickhouse-prometheus",
+		"function_name": "queryRaw",
+	})
+
 	rows, err := client.telemetryStore.ClickhouseDB().Query(ctx, query)
 	if err != nil {
 		return nil, err

pkg/querier/builder_query.go

@@ -12,6 +12,7 @@ import (
 	"github.com/SigNoz/signoz/pkg/errors"
 	"github.com/SigNoz/signoz/pkg/telemetrylogs"
 	"github.com/SigNoz/signoz/pkg/telemetrystore"
+	"github.com/SigNoz/signoz/pkg/types/ctxtypes"
 	qbtypes "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
 	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
 	"github.com/bytedance/sonic"
@@ -212,6 +213,13 @@ func (q *builderQuery[T]) Execute(ctx context.Context) (*qbtypes.Result, error)
 
 // executeWithContext executes the query with query window and step context for partial value detection
 func (q *builderQuery[T]) executeWithContext(ctx context.Context, query string, args []any) (*qbtypes.Result, error) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        q.spec.Signal.StringValue(),
+		"module_name":   "builder-query",
+		"function_name": "executeWithContext",
+		"duration":      qbtypes.DurationBucket(q.fromMS, q.toMS),
+	})
+
 	totalRows := uint64(0)
 	totalBytes := uint64(0)
 	elapsed := time.Duration(0)

pkg/querier/clickhouse_query.go

@@ -14,6 +14,7 @@ import (
 	"github.com/SigNoz/signoz/pkg/errors"
 	"github.com/SigNoz/signoz/pkg/querybuilder"
 	"github.com/SigNoz/signoz/pkg/telemetrystore"
+	"github.com/SigNoz/signoz/pkg/types/ctxtypes"
 	qbtypes "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
 )
 
@@ -98,6 +99,11 @@ func (q *chSQLQuery) renderVars(query string, vars map[string]qbtypes.VariableIt
 }
 
 func (q *chSQLQuery) Execute(ctx context.Context) (*qbtypes.Result, error) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"module_name":   "clickhouse-query",
+		"function_name": "Execute",
+		"duration":      qbtypes.DurationBucket(q.fromMS, q.toMS),
+	})
 
 	totalRows := uint64(0)
 	totalBytes := uint64(0)

pkg/querier/promql_query.go

@@ -14,6 +14,8 @@ import (
 	"github.com/SigNoz/signoz/pkg/errors"
 	"github.com/SigNoz/signoz/pkg/prometheus"
 	"github.com/SigNoz/signoz/pkg/querybuilder"
+	"github.com/SigNoz/signoz/pkg/types/ctxtypes"
+	qbtypes "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
 	qbv5 "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
 	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
 	"github.com/prometheus/prometheus/promql"
@@ -187,6 +189,11 @@ func (q *promqlQuery) renderVars(query string, vars map[string]qbv5.VariableItem
 
 func (q *promqlQuery) Execute(ctx context.Context) (*qbv5.Result, error) {
 
+	comment := ctxtypes.CommentFromContext(ctx)
+	comment.Set("signal", telemetrytypes.SignalMetrics.StringValue())
+	comment.Set("duration", qbtypes.DurationBucket(q.tr.From, q.tr.To))
+	ctx = ctxtypes.NewContextWithComment(ctx, comment)
+
 	start := int64(querybuilder.ToNanoSecs(q.tr.From))
 	end := int64(querybuilder.ToNanoSecs(q.tr.To))
 

pkg/querier/querier.go

@@ -16,6 +16,7 @@ import (
 	"github.com/SigNoz/signoz/pkg/query-service/utils"
 	"github.com/SigNoz/signoz/pkg/querybuilder"
 	"github.com/SigNoz/signoz/pkg/telemetrystore"
+	"github.com/SigNoz/signoz/pkg/types/ctxtypes"
 	"github.com/SigNoz/signoz/pkg/types/metrictypes"
 	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
 	"golang.org/x/exp/maps"
@@ -526,6 +527,11 @@ func (q *querier) run(
 	steps map[string]qbtypes.Step,
 	qbEvent *qbtypes.QBEvent,
 ) (*qbtypes.QueryRangeResponse, error) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"panel_type": qbEvent.PanelType,
+		"query_type": qbEvent.QueryType,
+	})
+
 	results := make(map[string]any)
 	warnings := make([]string, 0)
 	warningsDocURL := ""

pkg/querier/trace_operator_query.go

@@ -6,7 +6,9 @@ import (
 
 	"github.com/ClickHouse/clickhouse-go/v2"
 	"github.com/SigNoz/signoz/pkg/telemetrystore"
+	"github.com/SigNoz/signoz/pkg/types/ctxtypes"
 	qbtypes "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
+	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
 )
 
 type traceOperatorQuery struct {
@@ -52,6 +54,13 @@ func (q *traceOperatorQuery) Execute(ctx context.Context) (*qbtypes.Result, erro
 }
 
 func (q *traceOperatorQuery) executeWithContext(ctx context.Context, query string, args []any) (*qbtypes.Result, error) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalTraces.StringValue(),
+		"module_name":   "querier",
+		"function_name": "executeWithContext",
+		"duration":      qbtypes.DurationBucket(q.fromMS, q.toMS),
+	})
+
 	totalRows := uint64(0)
 	totalBytes := uint64(0)
 	elapsed := time.Duration(0)

pkg/query-service/app/clickhouseReader/reader.go

@@ -20,6 +20,8 @@ import (
 	"github.com/SigNoz/signoz/pkg/sqlstore"
 	"github.com/SigNoz/signoz/pkg/telemetrystore"
 	"github.com/SigNoz/signoz/pkg/types"
+	"github.com/SigNoz/signoz/pkg/types/ctxtypes"
+	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
 	"github.com/SigNoz/signoz/pkg/valuer"
 	"github.com/uptrace/bun"
 
@@ -269,6 +271,12 @@ func (r *ClickHouseReader) GetQueryRangeResult(ctx context.Context, query *model
 }
 
 func (r *ClickHouseReader) GetServicesList(ctx context.Context) (*[]string, error) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalTraces.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetServicesList",
+	})
+
 	services := []string{}
 	rows, err := r.db.Query(ctx, fmt.Sprintf(`SELECT DISTINCT resource_string_service$$name FROM %s.%s WHERE ts_bucket_start > (toUnixTimestamp(now() - INTERVAL 1 DAY) - 1800) AND toDate(timestamp) > now() - INTERVAL 1 DAY`, r.TraceDB, r.traceTableName))
 	if err != nil {
@@ -288,6 +296,12 @@ func (r *ClickHouseReader) GetServicesList(ctx context.Context) (*[]string, erro
 }
 
 func (r *ClickHouseReader) GetTopLevelOperations(ctx context.Context, start, end time.Time, services []string) (*map[string][]string, *model.ApiError) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalTraces.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetTopLevelOperations",
+	})
+
 	start = start.In(time.UTC)
 
 	// The `top_level_operations` that have `time` >= start
@@ -383,6 +397,12 @@ func (r *ClickHouseReader) buildResourceSubQuery(tags []model.TagQueryParam, svc
 
 func (r *ClickHouseReader) GetServices(ctx context.Context, queryParams *model.GetServicesParams) (*[]model.ServiceItem, *model.ApiError) {
 
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalTraces.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetServices",
+	})
+
 	if r.indexTable == "" {
 		return nil, &model.ApiError{Typ: model.ErrorExec, Err: ErrNoIndexTable}
 	}
@@ -739,6 +759,11 @@ func (r *ClickHouseReader) GetEntryPointOperations(ctx context.Context, queryPar
 
 func (r *ClickHouseReader) GetTopOperations(ctx context.Context, queryParams *model.GetTopOperationsParams) (*[]model.TopOperationsItem, *model.ApiError) {
 
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalTraces.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetTopOperations",
+	})
 	namedArgs := []interface{}{
 		clickhouse.Named("start", strconv.FormatInt(queryParams.Start.UnixNano(), 10)),
 		clickhouse.Named("end", strconv.FormatInt(queryParams.End.UnixNano(), 10)),
@@ -794,6 +819,11 @@ func (r *ClickHouseReader) GetTopOperations(ctx context.Context, queryParams *mo
 
 func (r *ClickHouseReader) GetUsage(ctx context.Context, queryParams *model.GetUsageParams) (*[]model.UsageItem, error) {
 
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalTraces.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetUsage",
+	})
 	var usageItems []model.UsageItem
 	namedArgs := []interface{}{
 		clickhouse.Named("interval", queryParams.StepHour),
@@ -829,6 +859,13 @@ func (r *ClickHouseReader) GetUsage(ctx context.Context, queryParams *model.GetU
 }
 
 func (r *ClickHouseReader) GetSpansForTrace(ctx context.Context, traceID string, traceDetailsQuery string) ([]model.SpanItemV2, *model.ApiError) {
+
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalTraces.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetSpansForTrace",
+	})
+
 	var traceSummary model.TraceSummary
 	summaryQuery := fmt.Sprintf("SELECT trace_id, min(start) AS start, max(end) AS end, sum(num_spans) AS num_spans FROM %s.%s WHERE trace_id=$1 GROUP BY trace_id", r.TraceDB, r.traceSummaryTable)
 	err := r.db.QueryRow(ctx, summaryQuery, traceID).Scan(&traceSummary.TraceID, &traceSummary.Start, &traceSummary.End, &traceSummary.NumSpans)
@@ -1227,6 +1264,11 @@ func (r *ClickHouseReader) GetFlamegraphSpansForTrace(ctx context.Context, orgID
 
 func (r *ClickHouseReader) GetDependencyGraph(ctx context.Context, queryParams *model.GetServicesParams) (*[]model.ServiceMapDependencyResponseItem, error) {
 
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalTraces.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetDependencyGraph",
+	})
 	response := []model.ServiceMapDependencyResponseItem{}
 
 	args := []interface{}{}
@@ -1281,6 +1323,11 @@ func getLocalTableName(tableName string) string {
 }
 
 func (r *ClickHouseReader) setTTLLogs(ctx context.Context, orgID string, params *model.TTLParams) (*model.SetTTLResponseItem, *model.ApiError) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalLogs.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "setTTLLogs",
+	})
 	hasCustomRetention, err := r.hasCustomRetentionColumn(ctx)
 	if hasCustomRetention {
 		return nil, &model.ApiError{Typ: model.ErrorExec, Err: fmt.Errorf("SetTTLV2 only supported")}
@@ -1444,6 +1491,11 @@ func (r *ClickHouseReader) setTTLLogs(ctx context.Context, orgID string, params
 }
 
 func (r *ClickHouseReader) setTTLTraces(ctx context.Context, orgID string, params *model.TTLParams) (*model.SetTTLResponseItem, *model.ApiError) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalTraces.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "setTTLTraces",
+	})
 	// uuid is used as transaction id
 	uuidWithHyphen := uuid.New()
 	uuid := strings.Replace(uuidWithHyphen.String(), "-", "", -1)
@@ -1589,6 +1641,12 @@ func (r *ClickHouseReader) setTTLTraces(ctx context.Context, orgID string, param
 }
 
 func (r *ClickHouseReader) hasCustomRetentionColumn(ctx context.Context) (bool, error) {
+
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"module_name":   "clickhouse-reader",
+		"function_name": "hasCustomRetentionColumn",
+	})
+
 	// Directly query for the _retention_days column existence
 	query := fmt.Sprintf("SELECT 1 FROM system.columns WHERE database = '%s' AND table = '%s' AND name = '_retention_days' LIMIT 1", r.logsDB, r.logsLocalTableV2)
 
@@ -1610,6 +1668,11 @@ func (r *ClickHouseReader) hasCustomRetentionColumn(ctx context.Context) (bool,
 
 func (r *ClickHouseReader) SetTTLV2(ctx context.Context, orgID string, params *model.CustomRetentionTTLParams) (*model.CustomRetentionTTLResponse, error) {
 
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalLogs.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "SetTTLV2",
+	})
 	hasCustomRetention, err := r.hasCustomRetentionColumn(ctx)
 	if err != nil {
 		return nil, errorsV2.Wrapf(err, errorsV2.TypeInternal, errorsV2.CodeInternal, "custom retention not supported")
@@ -1999,6 +2062,10 @@ func (r *ClickHouseReader) updateCustomRetentionTTLStatus(ctx context.Context, o
 
 // Enhanced validation function with duplicate detection and efficient key validation
 func (r *ClickHouseReader) validateTTLConditions(ctx context.Context, ttlConditions []model.CustomRetentionRule) error {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"module_name":   "clickhouse-reader",
+		"function_name": "validateTTLConditions",
+	})
 	if len(ttlConditions) == 0 {
 		return nil
 	}
@@ -2116,6 +2183,11 @@ func (r *ClickHouseReader) SetTTL(ctx context.Context, orgID string, params *mod
 }
 
 func (r *ClickHouseReader) setTTLMetrics(ctx context.Context, orgID string, params *model.TTLParams) (*model.SetTTLResponseItem, *model.ApiError) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalMetrics.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "setTTLMetrics",
+	})
 	// uuid is used as transaction id
 	uuidWithHyphen := uuid.New()
 	uuid := strings.Replace(uuidWithHyphen.String(), "-", "", -1)
@@ -2324,6 +2396,10 @@ func (r *ClickHouseReader) getTTLQueryStatus(ctx context.Context, orgID string,
 
 func (r *ClickHouseReader) setColdStorage(ctx context.Context, tableName string, coldStorageVolume string) *model.ApiError {
 
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"module_name":   "clickhouse-reader",
+		"function_name": "setColdStorage",
+	})
 	// Set the storage policy for the required table. If it is already set, then setting it again
 	// will not a problem.
 	if len(coldStorageVolume) > 0 {
@@ -2340,6 +2416,10 @@ func (r *ClickHouseReader) setColdStorage(ctx context.Context, tableName string,
 
 // GetDisks returns a list of disks {name, type} configured in clickhouse DB.
 func (r *ClickHouseReader) GetDisks(ctx context.Context) (*[]model.DiskItem, *model.ApiError) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetDisks",
+	})
 	diskItems := []model.DiskItem{}
 
 	query := "SELECT name,type FROM system.disks"
@@ -2363,6 +2443,10 @@ func getLocalTableNameArray(tableNames []string) []string {
 // GetTTL returns current ttl, expected ttl and past setTTL status for metrics/traces.
 func (r *ClickHouseReader) GetTTL(ctx context.Context, orgID string, ttlParams *model.GetTTLParams) (*model.GetTTLResponseItem, *model.ApiError) {
 
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetTTL",
+	})
 	parseTTL := func(queryResp string) (int, int) {
 
 		zap.L().Info("Parsing TTL from: ", zap.String("queryResp", queryResp))
@@ -2532,6 +2616,11 @@ func (r *ClickHouseReader) GetTTL(ctx context.Context, orgID string, ttlParams *
 
 func (r *ClickHouseReader) ListErrors(ctx context.Context, queryParams *model.ListErrorsParams) (*[]model.Error, *model.ApiError) {
 
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalTraces.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "ListErrors",
+	})
 	var getErrorResponses []model.Error
 
 	query := "SELECT any(exceptionMessage) as exceptionMessage, count() AS exceptionCount, min(timestamp) as firstSeen, max(timestamp) as lastSeen, groupID"
@@ -2604,6 +2693,12 @@ func (r *ClickHouseReader) ListErrors(ctx context.Context, queryParams *model.Li
 
 func (r *ClickHouseReader) CountErrors(ctx context.Context, queryParams *model.CountErrorsParams) (uint64, *model.ApiError) {
 
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalTraces.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "CountErrors",
+	})
+
 	var errorCount uint64
 
 	query := fmt.Sprintf("SELECT count(distinct(groupID)) FROM %s.%s WHERE timestamp >= @timestampL AND timestamp <= @timestampU", r.TraceDB, r.errorTable)
@@ -2641,6 +2736,11 @@ func (r *ClickHouseReader) CountErrors(ctx context.Context, queryParams *model.C
 
 func (r *ClickHouseReader) GetErrorFromErrorID(ctx context.Context, queryParams *model.GetErrorParams) (*model.ErrorWithSpan, *model.ApiError) {
 
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalTraces.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetErrorFromErrorID",
+	})
 	if queryParams.ErrorID == "" {
 		zap.L().Error("errorId missing from params")
 		return nil, &model.ApiError{Typ: model.ErrorBadData, Err: fmt.Errorf("ErrorID missing from params")}
@@ -2668,6 +2768,11 @@ func (r *ClickHouseReader) GetErrorFromErrorID(ctx context.Context, queryParams
 
 func (r *ClickHouseReader) GetErrorFromGroupID(ctx context.Context, queryParams *model.GetErrorParams) (*model.ErrorWithSpan, *model.ApiError) {
 
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalTraces.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetErrorFromGroupID",
+	})
 	var getErrorWithSpanReponse []model.ErrorWithSpan
 
 	query := fmt.Sprintf("SELECT errorID, exceptionType, exceptionStacktrace, exceptionEscaped, exceptionMessage, timestamp, spanID, traceID, serviceName, groupID FROM %s.%s WHERE timestamp = @timestamp AND groupID = @groupID LIMIT 1", r.TraceDB, r.errorTable)
@@ -2716,6 +2821,11 @@ func (r *ClickHouseReader) GetNextPrevErrorIDs(ctx context.Context, queryParams
 
 func (r *ClickHouseReader) getNextErrorID(ctx context.Context, queryParams *model.GetErrorParams) (string, time.Time, *model.ApiError) {
 
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalTraces.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "getNextErrorID",
+	})
 	var getNextErrorIDReponse []model.NextPrevErrorIDsDBResponse
 
 	query := fmt.Sprintf("SELECT errorID as nextErrorID, timestamp as nextTimestamp FROM %s.%s WHERE groupID = @groupID AND timestamp >= @timestamp AND errorID != @errorID ORDER BY timestamp ASC LIMIT 2", r.TraceDB, r.errorTable)
@@ -2785,6 +2895,11 @@ func (r *ClickHouseReader) getNextErrorID(ctx context.Context, queryParams *mode
 
 func (r *ClickHouseReader) getPrevErrorID(ctx context.Context, queryParams *model.GetErrorParams) (string, time.Time, *model.ApiError) {
 
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalTraces.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "getPrevErrorID",
+	})
 	var getPrevErrorIDReponse []model.NextPrevErrorIDsDBResponse
 
 	query := fmt.Sprintf("SELECT errorID as prevErrorID, timestamp as prevTimestamp FROM %s.%s WHERE groupID = @groupID AND timestamp <= @timestamp AND errorID != @errorID ORDER BY timestamp DESC LIMIT 2", r.TraceDB, r.errorTable)
@@ -2876,6 +2991,11 @@ func (r *ClickHouseReader) FetchTemporality(ctx context.Context, orgID valuer.UU
 }
 
 func (r *ClickHouseReader) GetLogFields(ctx context.Context) (*model.GetFieldsResponse, *model.ApiError) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalLogs.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetLogFields",
+	})
 	// response will contain top level fields from the otel log model
 	response := model.GetFieldsResponse{
 		Selected:    constants.StaticSelectedLogFields,
@@ -2912,6 +3032,11 @@ func (r *ClickHouseReader) GetLogFields(ctx context.Context) (*model.GetFieldsRe
 }
 
 func (r *ClickHouseReader) GetLogFieldsFromNames(ctx context.Context, fieldNames []string) (*model.GetFieldsResponse, *model.ApiError) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalLogs.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetLogFieldsFromNames",
+	})
 	// response will contain top level fields from the otel log model
 	response := model.GetFieldsResponse{
 		Selected:    constants.StaticSelectedLogFields,
@@ -2962,6 +3087,10 @@ func (r *ClickHouseReader) extractSelectedAndInterestingFields(tableStatement st
 }
 
 func (r *ClickHouseReader) UpdateLogField(ctx context.Context, field *model.UpdateField) *model.ApiError {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"module_name":   "clickhouse-reader",
+		"function_name": "UpdateLogField",
+	})
 	if !field.Selected {
 		return model.ForbiddenError(errors.New("removing a selected field is not allowed, please reach out to support."))
 	}
@@ -3028,6 +3157,10 @@ func (r *ClickHouseReader) UpdateLogField(ctx context.Context, field *model.Upda
 }
 
 func (r *ClickHouseReader) GetTraceFields(ctx context.Context) (*model.GetFieldsResponse, *model.ApiError) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetTraceFields",
+	})
 	// response will contain top level fields from the otel trace model
 	response := model.GetFieldsResponse{
 		Selected:    []model.Field{},
@@ -3083,6 +3216,11 @@ func (r *ClickHouseReader) GetTraceFields(ctx context.Context) (*model.GetFields
 }
 
 func (r *ClickHouseReader) UpdateTraceField(ctx context.Context, field *model.UpdateField) *model.ApiError {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalTraces.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "UpdateTraceField",
+	})
 	if !field.Selected {
 		return model.ForbiddenError(errors.New("removing a selected field is not allowed, please reach out to support."))
 	}
@@ -3174,6 +3312,10 @@ func (r *ClickHouseReader) UpdateTraceField(ctx context.Context, field *model.Up
 	return nil
 }
 func (r *ClickHouseReader) QueryDashboardVars(ctx context.Context, query string) (*model.DashboardVar, error) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"module_name":   "clickhouse-reader",
+		"function_name": "QueryDashboardVars",
+	})
 	var result = model.DashboardVar{VariableValues: make([]interface{}, 0)}
 	rows, err := r.db.Query(ctx, query)
 
@@ -3210,6 +3352,11 @@ func (r *ClickHouseReader) QueryDashboardVars(ctx context.Context, query string)
 }
 
 func (r *ClickHouseReader) GetMetricAggregateAttributes(ctx context.Context, orgID valuer.UUID, req *v3.AggregateAttributeRequest, skipSignozMetrics bool) (*v3.AggregateAttributeResponse, error) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalMetrics.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetMetricAggregateAttributes",
+	})
 	var response v3.AggregateAttributeResponse
 	normalized := true
 	if constants.IsDotMetricsEnabled {
@@ -3288,6 +3435,11 @@ func (r *ClickHouseReader) GetMetricAggregateAttributes(ctx context.Context, org
 }
 
 func (r *ClickHouseReader) GetMeterAggregateAttributes(ctx context.Context, orgID valuer.UUID, req *v3.AggregateAttributeRequest) (*v3.AggregateAttributeResponse, error) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalMetrics.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetMeterAggregateAttributes",
+	})
 	var response v3.AggregateAttributeResponse
 	// Query all relevant metric names from time_series_v4, but leave metadata retrieval to cache/db
 	query := fmt.Sprintf(
@@ -3336,6 +3488,11 @@ func (r *ClickHouseReader) GetMeterAggregateAttributes(ctx context.Context, orgI
 }
 
 func (r *ClickHouseReader) GetMetricAttributeKeys(ctx context.Context, req *v3.FilterAttributeKeyRequest) (*v3.FilterAttributeKeyResponse, error) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalMetrics.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetMetricAttributeKeys",
+	})
 	var query string
 	var err error
 	var rows driver.Rows
@@ -3376,6 +3533,11 @@ func (r *ClickHouseReader) GetMetricAttributeKeys(ctx context.Context, req *v3.F
 }
 
 func (r *ClickHouseReader) GetMeterAttributeKeys(ctx context.Context, req *v3.FilterAttributeKeyRequest) (*v3.FilterAttributeKeyResponse, error) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalMetrics.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetMeterAttributeKeys",
+	})
 	var query string
 	var err error
 	var rows driver.Rows
@@ -3412,6 +3574,11 @@ func (r *ClickHouseReader) GetMeterAttributeKeys(ctx context.Context, req *v3.Fi
 
 func (r *ClickHouseReader) GetMetricAttributeValues(ctx context.Context, req *v3.FilterAttributeValueRequest) (*v3.FilterAttributeValueResponse, error) {
 
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalMetrics.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetMetricAttributeValues",
+	})
 	var query string
 	var err error
 	var rows driver.Rows
@@ -3452,6 +3619,11 @@ func (r *ClickHouseReader) GetMetricAttributeValues(ctx context.Context, req *v3
 
 func (r *ClickHouseReader) GetMetricMetadata(ctx context.Context, orgID valuer.UUID, metricName, serviceName string) (*v3.MetricMetadataResponse, error) {
 
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalMetrics.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetMetricMetadata",
+	})
 	unixMilli := common.PastDayRoundOff()
 
 	// 1. Fetch metadata from cache/db using unified function
@@ -3533,6 +3705,10 @@ func (r *ClickHouseReader) GetMetricMetadata(ctx context.Context, orgID valuer.U
 // GetCountOfThings returns the count of things in the query
 // This is a generic function that can be used to check if any data exists for a given query
 func (r *ClickHouseReader) GetCountOfThings(ctx context.Context, query string) (uint64, error) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetCountOfThings",
+	})
 	var count uint64
 	err := r.db.QueryRow(ctx, query).Scan(&count)
 	if err != nil {
@@ -3541,48 +3717,14 @@ func (r *ClickHouseReader) GetCountOfThings(ctx context.Context, query string) (
 	return count, nil
 }
 
-func (r *ClickHouseReader) GetActiveHostsFromMetricMetadata(ctx context.Context, metricNames []string, hostNameAttr string, sinceUnixMilli int64) (map[string]bool, error) {
-	activeHosts := map[string]bool{}
-
-	query := fmt.Sprintf(
-		`SELECT DISTINCT attr_string_value
-		FROM %s.%s
-		WHERE metric_name IN @metricNames
-		  AND attr_name = @attrName
-		  AND last_reported_unix_milli >= @sinceUnixMilli`,
-		signozMetricDBName,
-		constants.SIGNOZ_METADATA_TABLENAME,
-	)
-
-	rows, err := r.db.Query(ctx, query,
-		clickhouse.Named("metricNames", metricNames),
-		clickhouse.Named("attrName", hostNameAttr),
-		clickhouse.Named("sinceUnixMilli", sinceUnixMilli),
-	)
-	if err != nil {
-		return nil, errorsV2.WrapInternalf(err, errorsV2.CodeInternal, "error querying active hosts")
-	}
-	defer rows.Close()
-
-	for rows.Next() {
-		var hostName string
-		if err := rows.Scan(&hostName); err != nil {
-			return nil, errorsV2.WrapInternalf(err, errorsV2.CodeInternal, "error scanning active host row")
-		}
-		if hostName != "" {
-			activeHosts[hostName] = true
-		}
-	}
-	if err := rows.Err(); err != nil {
-		return nil, errorsV2.WrapInternalf(err, errorsV2.CodeInternal, "error iterating active host rows")
-	}
-
-	return activeHosts, nil
-}
-
 func (r *ClickHouseReader) GetLatestReceivedMetric(
 	ctx context.Context, metricNames []string, labelValues map[string]string,
 ) (*model.MetricStatus, *model.ApiError) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalMetrics.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetLatestReceivedMetric",
+	})
 	// at least 1 metric name must be specified.
 	// this query can be too slow otherwise.
 	if len(metricNames) < 1 {
@@ -3667,6 +3809,11 @@ func isColumn(tableStatement, attrType, field, datType string) bool {
 
 func (r *ClickHouseReader) GetLogAggregateAttributes(ctx context.Context, req *v3.AggregateAttributeRequest) (*v3.AggregateAttributeResponse, error) {
 
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalLogs.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetLogAggregateAttributes",
+	})
 	var query string
 	var err error
 	var rows driver.Rows
@@ -3751,6 +3898,11 @@ func (r *ClickHouseReader) GetLogAggregateAttributes(ctx context.Context, req *v
 }
 
 func (r *ClickHouseReader) GetLogAttributeKeys(ctx context.Context, req *v3.FilterAttributeKeyRequest) (*v3.FilterAttributeKeyResponse, error) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalLogs.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetLogAttributeKeys",
+	})
 	var query string
 	var err error
 	var rows driver.Rows
@@ -3817,6 +3969,10 @@ func (r *ClickHouseReader) GetLogAttributeKeys(ctx context.Context, req *v3.Filt
 }
 
 func (r *ClickHouseReader) FetchRelatedValues(ctx context.Context, req *v3.FilterAttributeValueRequest) ([]string, error) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"module_name":   "clickhouse-reader",
+		"function_name": "FetchRelatedValues",
+	})
 	var andConditions []string
 
 	andConditions = append(andConditions, fmt.Sprintf("unix_milli >= %d", req.StartTimeMillis))
@@ -3908,6 +4064,11 @@ func (r *ClickHouseReader) FetchRelatedValues(ctx context.Context, req *v3.Filte
 }
 
 func (r *ClickHouseReader) GetLogAttributeValues(ctx context.Context, req *v3.FilterAttributeValueRequest) (*v3.FilterAttributeValueResponse, error) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalLogs.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetLogAttributeValues",
+	})
 	var err error
 	var filterValueColumn string
 	var rows driver.Rows
@@ -4225,6 +4386,10 @@ func readRowsForTimeSeriesResult(rows driver.Rows, vars []interface{}, columnNam
 
 // GetTimeSeriesResultV3 runs the query and returns list of time series
 func (r *ClickHouseReader) GetTimeSeriesResultV3(ctx context.Context, query string) ([]*v3.Series, error) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetTimeSeriesResultV3",
+	})
 	// Hook up query progress reporting if requested.
 	queryId := ctx.Value("queryId")
 	if queryId != nil {
@@ -4288,6 +4453,10 @@ func (r *ClickHouseReader) GetTimeSeriesResultV3(ctx context.Context, query stri
 
 // GetListResultV3 runs the query and returns list of rows
 func (r *ClickHouseReader) GetListResultV3(ctx context.Context, query string) ([]*v3.Row, error) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetListResultV3",
+	})
 	rows, err := r.db.Query(ctx, query)
 	if err != nil {
 		zap.L().Error("error while reading time series result", zap.Error(err))
@@ -4350,6 +4519,11 @@ func (r *ClickHouseReader) GetListResultV3(ctx context.Context, query string) ([
 // GetHostMetricsExistenceAndEarliestTime returns (count, minFirstReportedUnixMilli, error) for the given host metric names
 // from distributed_metadata. When count is 0, minFirstReportedUnixMilli is 0.
 func (r *ClickHouseReader) GetMetricsExistenceAndEarliestTime(ctx context.Context, metricNames []string) (uint64, uint64, error) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalMetrics.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetMetricsExistenceAndEarliestTime",
+	})
 	if len(metricNames) == 0 {
 		return 0, 0, nil
 	}
@@ -4385,6 +4559,10 @@ func getPersonalisedError(err error) error {
 }
 
 func (r *ClickHouseReader) CheckClickHouse(ctx context.Context) error {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"module_name":   "clickhouse-reader",
+		"function_name": "CheckClickHouse",
+	})
 	rows, err := r.db.Query(ctx, "SELECT 1")
 	if err != nil {
 		return err
@@ -4395,6 +4573,11 @@ func (r *ClickHouseReader) CheckClickHouse(ctx context.Context) error {
 }
 
 func (r *ClickHouseReader) GetTraceAggregateAttributes(ctx context.Context, req *v3.AggregateAttributeRequest) (*v3.AggregateAttributeResponse, error) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalTraces.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetTraceAggregateAttributes",
+	})
 	var query string
 	var err error
 	var rows driver.Rows
@@ -4488,6 +4671,11 @@ func (r *ClickHouseReader) GetTraceAggregateAttributes(ctx context.Context, req
 
 func (r *ClickHouseReader) GetTraceAttributeKeys(ctx context.Context, req *v3.FilterAttributeKeyRequest) (*v3.FilterAttributeKeyResponse, error) {
 
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalTraces.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetTraceAttributeKeys",
+	})
 	var query string
 	var err error
 	var rows driver.Rows
@@ -4556,6 +4744,11 @@ func (r *ClickHouseReader) GetTraceAttributeKeys(ctx context.Context, req *v3.Fi
 }
 
 func (r *ClickHouseReader) GetTraceAttributeValues(ctx context.Context, req *v3.FilterAttributeValueRequest) (*v3.FilterAttributeValueResponse, error) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalTraces.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetTraceAttributeValues",
+	})
 	var query string
 	var filterValueColumn string
 	var err error
@@ -4649,6 +4842,11 @@ func (r *ClickHouseReader) GetTraceAttributeValues(ctx context.Context, req *v3.
 }
 
 func (r *ClickHouseReader) GetSpanAttributeKeysByNames(ctx context.Context, names []string) (map[string]v3.AttributeKey, error) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalTraces.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetSpanAttributeKeysByNames",
+	})
 	var query string
 	var err error
 	var rows driver.Rows
@@ -4697,6 +4895,10 @@ func (r *ClickHouseReader) GetSpanAttributeKeysByNames(ctx context.Context, name
 }
 
 func (r *ClickHouseReader) AddRuleStateHistory(ctx context.Context, ruleStateHistory []model.RuleStateHistory) error {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"module_name":   "clickhouse-reader",
+		"function_name": "AddRuleStateHistory",
+	})
 	var statement driver.Batch
 	var err error
 
@@ -4728,6 +4930,10 @@ func (r *ClickHouseReader) AddRuleStateHistory(ctx context.Context, ruleStateHis
 }
 
 func (r *ClickHouseReader) GetLastSavedRuleStateHistory(ctx context.Context, ruleID string) ([]model.RuleStateHistory, error) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetLastSavedRuleStateHistory",
+	})
 	query := fmt.Sprintf("SELECT * FROM %s.%s WHERE rule_id = '%s' AND state_changed = true ORDER BY unix_milli DESC LIMIT 1 BY fingerprint",
 		signozHistoryDBName, ruleStateHistoryTableName, ruleID)
 
@@ -4742,6 +4948,10 @@ func (r *ClickHouseReader) GetLastSavedRuleStateHistory(ctx context.Context, rul
 func (r *ClickHouseReader) ReadRuleStateHistoryByRuleID(
 	ctx context.Context, ruleID string, params *model.QueryRuleStateHistory) (*model.RuleStateTimeline, error) {
 
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"module_name":   "clickhouse-reader",
+		"function_name": "ReadRuleStateHistoryByRuleID",
+	})
 	var conditions []string
 
 	conditions = append(conditions, fmt.Sprintf("rule_id = '%s'", ruleID))
@@ -4856,6 +5066,10 @@ func (r *ClickHouseReader) ReadRuleStateHistoryByRuleID(
 
 func (r *ClickHouseReader) ReadRuleStateHistoryTopContributorsByRuleID(
 	ctx context.Context, ruleID string, params *model.QueryRuleStateHistory) ([]model.RuleStateHistoryContributor, error) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"module_name":   "clickhouse-reader",
+		"function_name": "ReadRuleStateHistoryTopContributorsByRuleID",
+	})
 	query := fmt.Sprintf(`SELECT
 		fingerprint,
 		any(labels) as labels,
@@ -4880,6 +5094,10 @@ func (r *ClickHouseReader) ReadRuleStateHistoryTopContributorsByRuleID(
 
 func (r *ClickHouseReader) GetOverallStateTransitions(ctx context.Context, ruleID string, params *model.QueryRuleStateHistory) ([]model.ReleStateItem, error) {
 
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetOverallStateTransitions",
+	})
 	tmpl := `WITH firing_events AS (
     SELECT
         rule_id,
@@ -5007,6 +5225,10 @@ ORDER BY firing_time ASC;`
 
 func (r *ClickHouseReader) GetAvgResolutionTime(ctx context.Context, ruleID string, params *model.QueryRuleStateHistory) (float64, error) {
 
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetAvgResolutionTime",
+	})
 	tmpl := `
 WITH firing_events AS (
     SELECT
@@ -5118,6 +5340,10 @@ ORDER BY ts ASC;`
 }
 
 func (r *ClickHouseReader) GetTotalTriggers(ctx context.Context, ruleID string, params *model.QueryRuleStateHistory) (uint64, error) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetTotalTriggers",
+	})
 	query := fmt.Sprintf("SELECT count(*) FROM %s.%s WHERE rule_id = '%s' AND (state_changed = true) AND (state = '%s') AND unix_milli >= %d AND unix_milli <= %d",
 		signozHistoryDBName, ruleStateHistoryTableName, ruleID, model.StateFiring.String(), params.Start, params.End)
 
@@ -5146,6 +5372,11 @@ func (r *ClickHouseReader) GetTriggersByInterval(ctx context.Context, ruleID str
 }
 
 func (r *ClickHouseReader) GetMinAndMaxTimestampForTraceID(ctx context.Context, traceID []string) (int64, int64, error) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalTraces.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetMinAndMaxTimestampForTraceID",
+	})
 	var minTime, maxTime time.Time
 
 	query := fmt.Sprintf("SELECT min(timestamp), max(timestamp) FROM %s.%s WHERE traceID IN ('%s')",
@@ -5183,6 +5414,11 @@ func (r *ClickHouseReader) SubscribeToQueryProgress(
 }
 
 func (r *ClickHouseReader) GetAllMetricFilterAttributeKeys(ctx context.Context, req *metrics_explorer.FilterKeyRequest) (*[]v3.AttributeKey, *model.ApiError) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalMetrics.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetAllMetricFilterAttributeKeys",
+	})
 	var rows driver.Rows
 	var response []v3.AttributeKey
 	normalized := true
@@ -5220,6 +5456,11 @@ func (r *ClickHouseReader) GetAllMetricFilterAttributeKeys(ctx context.Context,
 }
 
 func (r *ClickHouseReader) GetAllMetricFilterAttributeValues(ctx context.Context, req *metrics_explorer.FilterValueRequest) ([]string, *model.ApiError) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalMetrics.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetAllMetricFilterAttributeValues",
+	})
 	var query string
 	var err error
 	var rows driver.Rows
@@ -5256,6 +5497,11 @@ func (r *ClickHouseReader) GetAllMetricFilterAttributeValues(ctx context.Context
 }
 
 func (r *ClickHouseReader) GetAllMetricFilterUnits(ctx context.Context, req *metrics_explorer.FilterValueRequest) ([]string, *model.ApiError) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalMetrics.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetAllMetricFilterUnits",
+	})
 	var rows driver.Rows
 	var response []string
 	query := fmt.Sprintf("SELECT DISTINCT unit FROM %s.%s WHERE unit ILIKE $1 AND unit IS NOT NULL ORDER BY unit", signozMetricDBName, signozTSTableNameV41Day)
@@ -5283,6 +5529,11 @@ func (r *ClickHouseReader) GetAllMetricFilterUnits(ctx context.Context, req *met
 	return response, nil
 }
 func (r *ClickHouseReader) GetAllMetricFilterTypes(ctx context.Context, req *metrics_explorer.FilterValueRequest) ([]string, *model.ApiError) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalMetrics.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetAllMetricFilterTypes",
+	})
 	var rows driver.Rows
 	var response []string
 	query := fmt.Sprintf("SELECT DISTINCT type FROM %s.%s WHERE type ILIKE $1 AND type IS NOT NULL ORDER BY type", signozMetricDBName, signozTSTableNameV41Day)
@@ -5310,6 +5561,11 @@ func (r *ClickHouseReader) GetAllMetricFilterTypes(ctx context.Context, req *met
 }
 
 func (r *ClickHouseReader) GetMetricsDataPoints(ctx context.Context, metricName string) (uint64, *model.ApiError) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalMetrics.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetMetricsDataPoints",
+	})
 	query := fmt.Sprintf(`SELECT 
     sum(count) as data_points
 FROM %s.%s
@@ -5325,6 +5581,11 @@ WHERE metric_name = ?
 }
 
 func (r *ClickHouseReader) GetMetricsLastReceived(ctx context.Context, metricName string) (int64, *model.ApiError) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalMetrics.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetMetricsLastReceived",
+	})
 	query := fmt.Sprintf(`SELECT 
     MAX(unix_milli) AS last_received_time
 FROM %s.%s
@@ -5350,6 +5611,11 @@ WHERE metric_name = ? and unix_milli > ?
 }
 
 func (r *ClickHouseReader) GetTotalTimeSeriesForMetricName(ctx context.Context, metricName string) (uint64, *model.ApiError) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalMetrics.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetTotalTimeSeriesForMetricName",
+	})
 	query := fmt.Sprintf(`SELECT 
     uniq(fingerprint) AS timeSeriesCount
 FROM %s.%s
@@ -5364,6 +5630,11 @@ WHERE metric_name = ?;`, signozMetricDBName, signozTSTableNameV41Week)
 }
 
 func (r *ClickHouseReader) GetAttributesForMetricName(ctx context.Context, metricName string, start, end *int64, filters *v3.FilterSet) (*[]metrics_explorer.Attribute, *model.ApiError) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalMetrics.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetAttributesForMetricName",
+	})
 	whereClause := ""
 	if filters != nil {
 		conditions, _ := utils.BuildFilterConditions(filters, "t")
@@ -5431,6 +5702,11 @@ WHERE metric_name = ? AND __normalized=? %s`
 }
 
 func (r *ClickHouseReader) GetActiveTimeSeriesForMetricName(ctx context.Context, metricName string, duration time.Duration) (uint64, *model.ApiError) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalMetrics.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetActiveTimeSeriesForMetricName",
+	})
 	milli := time.Now().Add(-duration).UnixMilli()
 	query := fmt.Sprintf("SELECT uniq(fingerprint) FROM %s.%s WHERE metric_name = '%s' and unix_milli >= ?", signozMetricDBName, signozTSTableNameV4, metricName)
 	var timeSeries uint64
@@ -5444,6 +5720,11 @@ func (r *ClickHouseReader) GetActiveTimeSeriesForMetricName(ctx context.Context,
 }
 
 func (r *ClickHouseReader) ListSummaryMetrics(ctx context.Context, orgID valuer.UUID, req *metrics_explorer.SummaryListMetricsRequest) (*metrics_explorer.SummaryListMetricsResponse, *model.ApiError) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalMetrics.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "ListSummaryMetrics",
+	})
 	var args []interface{}
 
 	// Build filter conditions (if any)
@@ -5662,6 +5943,11 @@ func (r *ClickHouseReader) ListSummaryMetrics(ctx context.Context, orgID valuer.
 }
 
 func (r *ClickHouseReader) GetMetricsTimeSeriesPercentage(ctx context.Context, req *metrics_explorer.TreeMapMetricsRequest) (*[]metrics_explorer.TreeMapResponseItem, *model.ApiError) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalMetrics.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetMetricsTimeSeriesPercentage",
+	})
 	var args []interface{}
 
 	normalized := true
@@ -5742,6 +6028,11 @@ func (r *ClickHouseReader) GetMetricsTimeSeriesPercentage(ctx context.Context, r
 
 func (r *ClickHouseReader) GetMetricsSamplesPercentage(ctx context.Context, req *metrics_explorer.TreeMapMetricsRequest) (*[]metrics_explorer.TreeMapResponseItem, *model.ApiError) {
 
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalMetrics.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetMetricsSamplesPercentage",
+	})
 	conditions, _ := utils.BuildFilterConditions(&req.Filters, "ts")
 	whereClause := ""
 	if conditions != nil {
@@ -5901,6 +6192,11 @@ func (r *ClickHouseReader) GetMetricsSamplesPercentage(ctx context.Context, req
 }
 
 func (r *ClickHouseReader) GetNameSimilarity(ctx context.Context, req *metrics_explorer.RelatedMetricsRequest) (map[string]metrics_explorer.RelatedMetricsScore, *model.ApiError) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalMetrics.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetNameSimilarity",
+	})
 	start, end, tsTable, _ := utils.WhichTSTableToUse(req.Start, req.End)
 
 	normalized := true
@@ -5954,6 +6250,11 @@ func (r *ClickHouseReader) GetNameSimilarity(ctx context.Context, req *metrics_e
 }
 
 func (r *ClickHouseReader) GetAttributeSimilarity(ctx context.Context, req *metrics_explorer.RelatedMetricsRequest) (map[string]metrics_explorer.RelatedMetricsScore, *model.ApiError) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalMetrics.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetAttributeSimilarity",
+	})
 	start, end, tsTable, _ := utils.WhichTSTableToUse(req.Start, req.End)
 
 	normalized := true
@@ -6112,6 +6413,11 @@ func (r *ClickHouseReader) GetAttributeSimilarity(ctx context.Context, req *metr
 }
 
 func (r *ClickHouseReader) GetMetricsAllResourceAttributes(ctx context.Context, start int64, end int64) (map[string]uint64, *model.ApiError) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalMetrics.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetMetricsAllResourceAttributes",
+	})
 	start, end, attTable, _ := utils.WhichAttributesTableToUse(start, end)
 	query := fmt.Sprintf(`SELECT 
     key, 
@@ -6148,6 +6454,11 @@ ORDER BY distinct_value_count DESC;`, signozMetadataDbName, attTable)
 }
 
 func (r *ClickHouseReader) GetInspectMetrics(ctx context.Context, req *metrics_explorer.InspectMetricsRequest, fingerprints []string) (*metrics_explorer.InspectMetricsResponse, *model.ApiError) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalMetrics.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetInspectMetrics",
+	})
 	start, end, _, localTsTable := utils.WhichTSTableToUse(req.Start, req.End)
 	fingerprintsString := strings.Join(fingerprints, ",")
 	query := fmt.Sprintf(`SELECT
@@ -6242,6 +6553,11 @@ func (r *ClickHouseReader) GetInspectMetrics(ctx context.Context, req *metrics_e
 }
 
 func (r *ClickHouseReader) GetInspectMetricsFingerprints(ctx context.Context, attributes []string, req *metrics_explorer.InspectMetricsRequest) ([]string, *model.ApiError) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalMetrics.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetInspectMetricsFingerprints",
+	})
 	// Build dynamic key selections and JSON extracts
 	var jsonExtracts []string
 	var groupBys []string
@@ -6323,6 +6639,11 @@ LIMIT 40`, // added rand to get diff value every time we run this query
 }
 
 func (r *ClickHouseReader) UpdateMetricsMetadata(ctx context.Context, orgID valuer.UUID, req *model.UpdateMetricsMetadata) *model.ApiError {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalMetrics.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "UpdateMetricsMetadata",
+	})
 	if req.MetricType == v3.MetricTypeHistogram {
 		labels := []string{"le"}
 		hasLabels, apiError := r.CheckForLabelsInMetric(ctx, req.MetricName, labels)
@@ -6367,6 +6688,11 @@ VALUES ( ?, ?, ?, ?, ?, ?, ?);`, signozMetricDBName, signozUpdatedMetricsMetadat
 }
 
 func (r *ClickHouseReader) CheckForLabelsInMetric(ctx context.Context, metricName string, labels []string) (bool, *model.ApiError) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalMetrics.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "CheckForLabelsInMetric",
+	})
 	if len(labels) == 0 {
 		return true, nil
 	}
@@ -6401,6 +6727,11 @@ func (r *ClickHouseReader) CheckForLabelsInMetric(ctx context.Context, metricNam
 }
 
 func (r *ClickHouseReader) GetUpdatedMetricsMetadata(ctx context.Context, orgID valuer.UUID, metricNames ...string) (map[string]*model.UpdateMetricsMetadata, *model.ApiError) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalMetrics.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetUpdatedMetricsMetadata",
+	})
 	cachedMetadata := make(map[string]*model.UpdateMetricsMetadata)
 	var missingMetrics []string
 
@@ -6510,6 +6841,11 @@ func (r *ClickHouseReader) GetUpdatedMetricsMetadata(ctx context.Context, orgID
 }
 
 func (r *ClickHouseReader) SearchTraces(ctx context.Context, params *model.SearchTracesParams) (*[]model.SearchSpansResult, error) {
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalTraces.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "SearchTraces",
+	})
 	searchSpansResult := []model.SearchSpansResult{
 		{
 			Columns:   []string{"__time", "SpanId", "TraceId", "ServiceName", "Name", "Kind", "DurationNano", "TagsKeys", "TagsValues", "References", "Events", "HasError", "StatusMessage", "StatusCodeString", "SpanKind"},
@@ -6621,6 +6957,11 @@ func (r *ClickHouseReader) GetNormalizedStatus(
 	metricNames []string,
 ) (map[string]bool, error) {
 
+	ctx = ctxtypes.AddCommentsToContext(ctx, map[string]string{
+		"signal":        telemetrytypes.SignalMetrics.StringValue(),
+		"module_name":   "clickhouse-reader",
+		"function_name": "GetNormalizedStatus",
+	})
 	if len(metricNames) == 0 {
 		return map[string]bool{}, nil
 	}

pkg/query-service/app/inframetrics/common.go

@@ -10,110 +10,55 @@ import (
 )
 
 var dotMetricMap = map[string]string{
-	"system_uptime":                  "system.uptime",
-	"system_cpu_physical_count":      "system.cpu.physical.count",
-	"system_cpu_logical_count":       "system.cpu.logical.count",
-	"system_cpu_time":                "system.cpu.time",
-	"system_cpu_frequency":           "system.cpu.frequency",
-	"system_cpu_utilization":         "system.cpu.utilization",
-	"system_cpu_load_average_15m":    "system.cpu.load_average.15m",
-	"system_memory_usage":            "system.memory.usage",
-	"system_memory_limit":            "system.memory.limit",
-	"system_memory_utilization":      "system.memory.utilization",
-	"system_memory_linux_available":  "system.memory.linux.available",
-	"system_memory_linux_shared":     "system.memory.linux.shared",
-	"system_memory_linux_slab_usage": "system.memory.linux.slab.usage",
-	"system_paging_usage":            "system.paging.usage",
-	"system_paging_utilization":      "system.paging.utilization",
-	"system_paging_faults":           "system.paging.faults",
-	"system_paging_operations":       "system.paging.operations",
-	"system_disk_io":                 "system.disk.io",
-	"system_disk_operations":         "system.disk.operations",
-	"system_disk_io_time":            "system.disk.io_time",
-	"system_disk_operation_time":     "system.disk.operation_time",
-	"system_disk_merged":             "system.disk.merged",
-	"system_disk_limit":              "system.disk.limit",
-	"system_filesystem_usage":        "system.filesystem.usage",
-	"system_filesystem_utilization":  "system.filesystem.utilization",
-	"system_filesystem_limit":        "system.filesystem.limit",
-	"system_network_errors":          "system.network.errors",
-	"system_network_io":              "system.network.io",
-	"system_network_connections":     "system.network.connections",
-	"system_network_dropped":         "system.network.dropped",
-	"system_network_packets":         "system.network.packets",
-	"system_processes_count":         "system.processes.count",
-	"system_processes_created":       "system.processes.created",
-	"system_disk_pending_operations": "system.disk.pending_operations",
-	"system_disk_weighted_io_time":   "system.disk.weighted_io_time",
-	"system_filesystem_inodes_usage": "system.filesystem.inodes.usage",
-	"system_network_conntrack_count": "system.network.conntrack.count",
-	"system_network_conntrack_max":   "system.network.conntrack.max",
-	"system_cpu_load_average_1m":     "system.cpu.load_average.1m",
-	"system_cpu_load_average_5m":     "system.cpu.load_average.5m",
-
-	"host_name":                              "host.name",
-	"k8s_cluster_name":                       "k8s.cluster.name",
-	"k8s_node_name":                          "k8s.node.name",
-	"k8s_pod_memory_usage":                   "k8s.pod.memory.usage",
-	"k8s_pod_cpu_request_utilization":        "k8s.pod.cpu_request_utilization",
-	"k8s_pod_memory_request_utilization":     "k8s.pod.memory_request_utilization",
-	"k8s_pod_cpu_limit_utilization":          "k8s.pod.cpu_limit_utilization",
-	"k8s_pod_memory_limit_utilization":       "k8s.pod.memory_limit_utilization",
-	"k8s_container_restarts":                 "k8s.container.restarts",
-	"k8s_pod_phase":                          "k8s.pod.phase",
-	"k8s_node_allocatable_cpu":               "k8s.node.allocatable_cpu",
-	"k8s_node_allocatable_memory":            "k8s.node.allocatable_memory",
-	"k8s_node_memory_usage":                  "k8s.node.memory.usage",
-	"k8s_node_condition_ready":               "k8s.node.condition_ready",
-	"k8s_daemonset_desired_scheduled_nodes":  "k8s.daemonset.desired_scheduled_nodes",
-	"k8s_daemonset_current_scheduled_nodes":  "k8s.daemonset.current_scheduled_nodes",
-	"k8s_deployment_desired":                 "k8s.deployment.desired",
-	"k8s_deployment_available":               "k8s.deployment.available",
-	"k8s_job_desired_successful_pods":        "k8s.job.desired_successful_pods",
-	"k8s_job_active_pods":                    "k8s.job.active_pods",
-	"k8s_job_failed_pods":                    "k8s.job.failed_pods",
-	"k8s_job_successful_pods":                "k8s.job.successful_pods",
-	"k8s_statefulset_desired_pods":           "k8s.statefulset.desired_pods",
-	"k8s_statefulset_current_pods":           "k8s.statefulset.current_pods",
-	"k8s_namespace_name":                     "k8s.namespace.name",
-	"k8s_deployment_name":                    "k8s.deployment.name",
-	"k8s_cronjob_name":                       "k8s.cronjob.name",
-	"k8s_job_name":                           "k8s.job.name",
-	"k8s_daemonset_name":                     "k8s.daemonset.name",
-	"os_type":                                "os.type",
-	"process_cgroup":                         "process.cgroup",
-	"process_pid":                            "process.pid",
-	"process_parent_pid":                     "process.parent_pid",
-	"process_owner":                          "process.owner",
-	"process_executable_path":                "process.executable.path",
-	"process_executable_name":                "process.executable.name",
-	"process_command_line":                   "process.command_line",
-	"process_command":                        "process.command",
-	"process_memory_usage":                   "process.memory.usage",
-	"process_memory_virtual":                 "process.memory.virtual",
-	"process_cpu_time":                       "process.cpu.time",
-	"process_disk_io":                        "process.disk.io",
-	"nfs_client_net_count":                   "nfs.client.net.count",
-	"nfs_client_net_tcp_connection_accepted": "nfs.client.net.tcp.connection.accepted",
-	"nfs_client_operation_count":             "nfs.client.operation.count",
-	"nfs_client_procedure_count":             "nfs.client.procedure.count",
-	"nfs_client_rpc_authrefresh_count":       "nfs.client.rpc.authrefresh.count",
-	"nfs_client_rpc_count":                   "nfs.client.rpc.count",
-	"nfs_client_rpc_retransmit_count":        "nfs.client.rpc.retransmit.count",
-	"nfs_server_fh_stale_count":              "nfs.server.fh.stale.count",
-	"nfs_server_io":                          "nfs.server.io",
-	"nfs_server_net_count":                   "nfs.server.net.count",
-	"nfs_server_net_tcp_connection_accepted": "nfs.server.net.tcp.connection.accepted",
-	"nfs_server_operation_count":             "nfs.server.operation.count",
-	"nfs_server_procedure_count":             "nfs.server.procedure.count",
-	"nfs_server_repcache_requests":           "nfs.server.repcache.requests",
-	"nfs_server_rpc_count":                   "nfs.server.rpc.count",
-	"nfs_server_thread_count":                "nfs.server.thread.count",
-	"k8s_persistentvolumeclaim_name":         "k8s.persistentvolumeclaim.name",
-	"k8s_volume_available":                   "k8s.volume.available",
-	"k8s_volume_capacity":                    "k8s.volume.capacity",
-	"k8s_volume_inodes":                      "k8s.volume.inodes",
-	"k8s_volume_inodes_free":                 "k8s.volume.inodes.free",
+	"system_filesystem_usage":               "system.filesystem.usage",
+	"system_cpu_time":                       "system.cpu.time",
+	"system_memory_usage":                   "system.memory.usage",
+	"system_cpu_load_average_15m":           "system.cpu.load_average.15m",
+	"host_name":                             "host.name",
+	"k8s_cluster_name":                      "k8s.cluster.name",
+	"k8s_node_name":                         "k8s.node.name",
+	"k8s_pod_memory_usage":                  "k8s.pod.memory.usage",
+	"k8s_pod_cpu_request_utilization":       "k8s.pod.cpu_request_utilization",
+	"k8s_pod_memory_request_utilization":    "k8s.pod.memory_request_utilization",
+	"k8s_pod_cpu_limit_utilization":         "k8s.pod.cpu_limit_utilization",
+	"k8s_pod_memory_limit_utilization":      "k8s.pod.memory_limit_utilization",
+	"k8s_container_restarts":                "k8s.container.restarts",
+	"k8s_pod_phase":                         "k8s.pod.phase",
+	"k8s_node_allocatable_cpu":              "k8s.node.allocatable_cpu",
+	"k8s_node_allocatable_memory":           "k8s.node.allocatable_memory",
+	"k8s_node_memory_usage":                 "k8s.node.memory.usage",
+	"k8s_node_condition_ready":              "k8s.node.condition_ready",
+	"k8s_daemonset_desired_scheduled_nodes": "k8s.daemonset.desired_scheduled_nodes",
+	"k8s_daemonset_current_scheduled_nodes": "k8s.daemonset.current_scheduled_nodes",
+	"k8s_deployment_desired":                "k8s.deployment.desired",
+	"k8s_deployment_available":              "k8s.deployment.available",
+	"k8s_job_desired_successful_pods":       "k8s.job.desired_successful_pods",
+	"k8s_job_active_pods":                   "k8s.job.active_pods",
+	"k8s_job_failed_pods":                   "k8s.job.failed_pods",
+	"k8s_job_successful_pods":               "k8s.job.successful_pods",
+	"k8s_statefulset_desired_pods":          "k8s.statefulset.desired_pods",
+	"k8s_statefulset_current_pods":          "k8s.statefulset.current_pods",
+	"k8s_namespace_name":                    "k8s.namespace.name",
+	"k8s_deployment_name":                   "k8s.deployment.name",
+	"k8s_cronjob_name":                      "k8s.cronjob.name",
+	"k8s_job_name":                          "k8s.job.name",
+	"k8s_daemonset_name":                    "k8s.daemonset.name",
+	"os_type":                               "os.type",
+	"process_cgroup":                        "process.cgroup",
+	"process_pid":                           "process.pid",
+	"process_parent_pid":                    "process.parent_pid",
+	"process_owner":                         "process.owner",
+	"process_executable_path":               "process.executable.path",
+	"process_executable_name":               "process.executable.name",
+	"process_command_line":                  "process.command_line",
+	"process_command":                       "process.command",
+	"process_memory_usage":                  "process.memory.usage",
+	"k8s_persistentvolumeclaim_name":        "k8s.persistentvolumeclaim.name",
+	"k8s_volume_available":                  "k8s.volume.available",
+	"k8s_volume_capacity":                   "k8s.volume.capacity",
+	"k8s_volume_inodes":                     "k8s.volume.inodes",
+	"k8s_volume_inodes_free":                "k8s.volume.inodes.free",
+	// add additional mappings as needed
 
 	"k8s_pod_uid":              "k8s.pod.uid",
 	"k8s_pod_name":             "k8s.pod.name",

pkg/query-service/app/inframetrics/hosts.go

@@ -73,53 +73,6 @@ var (
 		"load15":     GetDotMetrics("system_cpu_load_average_15m"),
 		"wait":       GetDotMetrics("system_cpu_time"),
 	}
-	uniqueMetricNamesForHosts = []string{
-		GetDotMetrics("system_uptime"),
-		GetDotMetrics("system_cpu_time"),
-		GetDotMetrics("system_cpu_load_average_1m"),
-		GetDotMetrics("system_cpu_load_average_5m"),
-		GetDotMetrics("system_cpu_load_average_15m"),
-		GetDotMetrics("system_memory_usage"),
-		GetDotMetrics("system_paging_usage"),
-		GetDotMetrics("system_paging_faults"),
-		GetDotMetrics("system_paging_operations"),
-		GetDotMetrics("system_disk_io"),
-		GetDotMetrics("system_disk_operations"),
-		GetDotMetrics("system_disk_io_time"),
-		GetDotMetrics("system_disk_operation_time"),
-		GetDotMetrics("system_disk_merged"),
-		GetDotMetrics("system_disk_pending_operations"),
-		GetDotMetrics("system_disk_weighted_io_time"),
-		GetDotMetrics("system_filesystem_usage"),
-		GetDotMetrics("system_filesystem_inodes_usage"),
-		GetDotMetrics("system_network_io"),
-		GetDotMetrics("system_network_errors"),
-		GetDotMetrics("system_network_connections"),
-		GetDotMetrics("system_network_dropped"),
-		GetDotMetrics("system_network_packets"),
-		GetDotMetrics("system_processes_count"),
-		GetDotMetrics("system_processes_created"),
-		GetDotMetrics("process_cpu_time"),
-		GetDotMetrics("process_disk_io"),
-		GetDotMetrics("process_memory_usage"),
-		GetDotMetrics("process_memory_virtual"),
-		GetDotMetrics("nfs_client_net_count"),
-		GetDotMetrics("nfs_client_net_tcp_connection_accepted"),
-		GetDotMetrics("nfs_client_operation_count"),
-		GetDotMetrics("nfs_client_procedure_count"),
-		GetDotMetrics("nfs_client_rpc_authrefresh_count"),
-		GetDotMetrics("nfs_client_rpc_count"),
-		GetDotMetrics("nfs_client_rpc_retransmit_count"),
-		GetDotMetrics("nfs_server_fh_stale_count"),
-		GetDotMetrics("nfs_server_io"),
-		GetDotMetrics("nfs_server_net_count"),
-		GetDotMetrics("nfs_server_net_tcp_connection_accepted"),
-		GetDotMetrics("nfs_server_operation_count"),
-		GetDotMetrics("nfs_server_procedure_count"),
-		GetDotMetrics("nfs_server_repcache_requests"),
-		GetDotMetrics("nfs_server_rpc_count"),
-		GetDotMetrics("nfs_server_thread_count"),
-	}
 )
 
 func NewHostsRepo(reader interfaces.Reader, querierV2 interfaces.Querier) *HostsRepo {
@@ -178,9 +131,62 @@ func (h *HostsRepo) GetHostAttributeValues(ctx context.Context, req v3.FilterAtt
 	return &v3.FilterAttributeValueResponse{StringAttributeValues: hostNames}, nil
 }
 
-func (h *HostsRepo) getActiveHosts(ctx context.Context) (map[string]bool, error) {
-	tenMinAgo := time.Now().Add(-10 * time.Minute).UTC().UnixMilli()
-	return h.reader.GetActiveHostsFromMetricMetadata(ctx, uniqueMetricNamesForHosts, hostNameAttrKey, tenMinAgo)
+func (h *HostsRepo) getActiveHosts(ctx context.Context, orgID valuer.UUID, req model.HostListRequest) (map[string]bool, error) {
+	activeStatus := map[string]bool{}
+	step := common.MinAllowedStepInterval(req.Start, req.End)
+
+	hasHostName := false
+	for _, key := range req.GroupBy {
+		if key.Key == hostNameAttrKey {
+			hasHostName = true
+		}
+	}
+
+	if !hasHostName {
+		req.GroupBy = append(req.GroupBy, v3.AttributeKey{Key: hostNameAttrKey})
+	}
+
+	params := v3.QueryRangeParamsV3{
+		Start: time.Now().Add(-time.Minute * 10).UTC().UnixMilli(),
+		End:   time.Now().UTC().UnixMilli(),
+		Step:  step,
+		CompositeQuery: &v3.CompositeQuery{
+			BuilderQueries: map[string]*v3.BuilderQuery{
+				"A": {
+					QueryName:    "A",
+					StepInterval: step,
+					DataSource:   v3.DataSourceMetrics,
+					AggregateAttribute: v3.AttributeKey{
+						Key:      metricToUseForHostAttributes,
+						DataType: v3.AttributeKeyDataTypeFloat64,
+					},
+					Temporality:      v3.Unspecified,
+					Filters:          req.Filters,
+					GroupBy:          req.GroupBy,
+					Expression:       "A",
+					TimeAggregation:  v3.TimeAggregationAvg,
+					SpaceAggregation: v3.SpaceAggregationAvg,
+					Disabled:         false,
+				},
+			},
+			QueryType: v3.QueryTypeBuilder,
+			PanelType: v3.PanelTypeGraph,
+		},
+	}
+
+	queryResponse, _, err := h.querierV2.QueryRange(ctx, orgID, &params)
+	if err != nil {
+		return nil, err
+	}
+
+	for _, result := range queryResponse {
+		for _, series := range result.Series {
+			name := series.Labels[hostNameAttrKey]
+			activeStatus[name] = true
+		}
+	}
+
+	return activeStatus, nil
 }
 
 func (h *HostsRepo) getMetadataAttributes(ctx context.Context, req model.HostListRequest) (map[string]map[string]string, error) {
@@ -444,7 +450,7 @@ func (h *HostsRepo) GetHostList(ctx context.Context, orgID valuer.UUID, req mode
 		return resp, err
 	}
 
-	activeHosts, err := h.getActiveHosts(ctx)
+	activeHosts, err := h.getActiveHosts(ctx, orgID, req)
 	if err != nil {
 		return resp, err
 	}

pkg/query-service/interfaces/interface.go

@@ -99,7 +99,6 @@ type Reader interface {
 	SubscribeToQueryProgress(queryId string) (<-chan model.QueryProgress, func(), *model.ApiError)
 
 	GetCountOfThings(ctx context.Context, query string) (uint64, error)
-	GetActiveHostsFromMetricMetadata(ctx context.Context, metricNames []string, hostNameAttr string, sinceUnixMilli int64) (map[string]bool, error)
 
 	GetMetricsExistenceAndEarliestTime(ctx context.Context, metricNames []string) (uint64, uint64, error)