chore: fix some light mode issues in alerts and services tabs

* chore: made baseconfigbuilder generic to be used across different charts

* chore: updated baseconfigbuilder test

* chore: updated timezone types

* chore: fixed tsc + test

* chore: fixed tsc + test

* chore: fixed tsc + test

* chore: updated config builder types

* chore: updated comment

docs/api/openapi.yml

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

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

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

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

@@ -60,11 +60,30 @@
 			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-aggregation-section-content,
+			.metrics-container {
 				position: relative;
 
 				&::before {
@@ -102,6 +121,10 @@
 			.qb-elements-container {
 				margin-left: 0px;
 
+				&::after {
+					display: none;
+				}
+
 				.code-mirror-where-clause,
 				.query-aggregation-container,
 				.query-add-ons,
@@ -333,28 +356,7 @@
 				text-transform: uppercase;
 
 				&::before {
-					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;
-					}
+					display: none;
 				}
 			}
 
@@ -462,10 +464,21 @@
 
 		.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-aggregation-section-content,
+				.metrics-container {
 					&::before {
 						border-left: 6px dotted var(--bg-vanilla-300);
 					}
@@ -529,18 +542,6 @@
 
 		.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,6 +207,7 @@ 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,14 +1,13 @@
-import { memo, useCallback, useMemo, useState } from 'react';
+import { memo, useCallback, useMemo } from 'react';
 import { Select } from 'antd';
 import {
 	initialQueriesMap,
 	initialQueryMeterWithType,
 	PANEL_TYPES,
 } from 'constants/queryBuilder';
-import { AggregatorFilter } from 'container/QueryBuilder/filters';
+import { MetricNameSelector } 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';
@@ -44,21 +43,12 @@ 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,
@@ -164,12 +154,10 @@ export const MetricsSelect = memo(function MetricsSelect({
 				/>
 			)}
 
-			<AggregatorFilter
-				onChange={handleAggregatorAttributeChange}
+			<MetricNameSelector
+				onChange={handleChangeAggregatorAttribute}
 				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,6 +43,7 @@ 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/localStorage.ts

@@ -29,7 +29,6 @@ export enum LOCALSTORAGE {
 	DONT_SHOW_SLOW_API_WARNING = 'DONT_SHOW_SLOW_API_WARNING',
 	METRICS_LIST_OPTIONS = 'METRICS_LIST_OPTIONS',
 	SHOW_EXCEPTIONS_QUICK_FILTERS = 'SHOW_EXCEPTIONS_QUICK_FILTERS',
-	BANNER_DISMISSED = 'BANNER_DISMISSED',
 	QUICK_FILTERS_SETTINGS_ANNOUNCEMENT = 'QUICK_FILTERS_SETTINGS_ANNOUNCEMENT',
 	FUNNEL_STEPS = 'FUNNEL_STEPS',
 	SPAN_DETAILS_PINNED_ATTRIBUTES = 'SPAN_DETAILS_PINNED_ATTRIBUTES',

frontend/src/constants/queryBuilder.ts

@@ -1,4 +1,5 @@
 // ** 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';
@@ -177,7 +178,7 @@ export const initialQueryBuilderFormValues: IBuilderQuery = {
 		{
 			metricName: '',
 			temporality: '',
-			timeAggregation: MetricAggregateOperator.COUNT,
+			timeAggregation: MetricAggregateOperator.AVG,
 			spaceAggregation: MetricAggregateOperator.SUM,
 			reduceTo: ReduceOperators.AVG,
 		},
@@ -225,7 +226,7 @@ export const initialQueryBuilderFormMeterValues: IBuilderQuery = {
 		{
 			metricName: '',
 			temporality: '',
-			timeAggregation: MeterAggregateOperator.COUNT,
+			timeAggregation: MeterAggregateOperator.AVG,
 			spaceAggregation: MeterAggregateOperator.SUM,
 			reduceTo: ReduceOperators.AVG,
 		},
@@ -371,6 +372,31 @@ 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/container/CreateAlertV2/CreateAlertHeader/styles.scss

@@ -179,6 +179,19 @@
 		&__input.description {
 			color: var(--text-ink-300);
 		}
+
+		.ant-btn {
+			color: var(--text-ink-400);
+			background: var(--bg-vanilla-100);
+			border: 1px solid var(--bg-vanilla-300);
+
+			&:hover,
+			&:focus {
+				color: var(--text-ink-500);
+				background: var(--bg-vanilla-200);
+				border-color: var(--bg-vanilla-400);
+			}
+		}
 	}
 
 	.edit-alert-header {

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

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

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

@@ -1,3 +1,4 @@
+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';
@@ -8,7 +9,7 @@ interface BaseChartProps {
 	height: number;
 	showTooltip?: boolean;
 	showLegend?: boolean;
-	timezone: string;
+	timezone?: Timezone;
 	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,12 +5,7 @@ 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,
-	LineInterpolation,
-	LineStyle,
-	VisibilityMode,
-} from 'lib/uPlotV2/config/types';
+import { DrawStyle } from 'lib/uPlotV2/config/types';
 import { UPlotConfigBuilder } from 'lib/uPlotV2/config/UPlotConfigBuilder';
 import { get } from 'lodash-es';
 import { Widgets } from 'types/api/dashboard/getAll';
@@ -63,7 +58,12 @@ export function prepareBarPanelConfig({
 	const minStepInterval = Math.min(...Object.values(stepIntervals));
 
 	const builder = buildBaseConfig({
-		widget,
+		id: widget.id,
+		thresholds: widget.thresholds,
+		yAxisUnit: widget.yAxisUnit,
+		softMin: widget.softMin ?? undefined,
+		softMax: widget.softMax ?? undefined,
+		isLogScale: widget.isLogScale,
 		isDarkMode,
 		onClick,
 		onDragSelect,
@@ -98,14 +98,8 @@ 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.value}
+					timezone={timezone}
 					data={chartData as uPlot.AlignedData}
 					width={containerDimensions.width}
 					height={containerDimensions.height}

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

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

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

@@ -82,7 +82,12 @@ export const prepareUPlotConfig = ({
 	const minStepInterval = Math.min(...Object.values(stepIntervals));
 
 	const builder = buildBaseConfig({
-		widget,
+		id: widget.id,
+		thresholds: widget.thresholds,
+		yAxisUnit: widget.yAxisUnit,
+		softMin: widget.softMin ?? undefined,
+		softMax: widget.softMax ?? undefined,
+		isLogScale: widget.isLogScale,
 		isDarkMode,
 		onClick,
 		onDragSelect,
@@ -120,7 +125,6 @@ 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 { buildBaseConfig } from '../baseConfigBuilder';
+import { BaseConfigBuilderProps, buildBaseConfig } from '../baseConfigBuilder';
 
 jest.mock(
 	'container/DashboardContainer/visualization/panels/utils/legendVisibilityUtils',
@@ -27,16 +27,25 @@ jest.mock('lib/uPlotLib/plugins/onClickPlugin', () => ({
 	default: jest.fn().mockReturnValue({ name: 'onClickPlugin' }),
 }));
 
-const createWidget = (overrides: Partial<Widgets> = {}): Widgets =>
-	({
-		id: 'widget-1',
-		yAxisUnit: 'ms',
-		isLogScale: false,
-		softMin: undefined,
-		softMax: undefined,
-		thresholds: [],
-		...overrides,
-	} as Widgets);
+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 createApiResponse = (
 	overrides: Partial<MetricRangePayloadProps> = {},
@@ -47,7 +56,7 @@ const createApiResponse = (
 	} as MetricRangePayloadProps);
 
 const baseProps = {
-	widget: createWidget(),
+	...createBaseConfigBuilderProps(),
 	apiResponse: createApiResponse(),
 	isDarkMode: true,
 	panelMode: PanelMode.DASHBOARD_VIEW,
@@ -63,14 +72,14 @@ describe('buildBaseConfig', () => {
 		expect(typeof builder.getLegendItems).toBe('function');
 	});
 
-	it('configures builder with widgetId and DASHBOARD_VIEW preferences', () => {
+	it('configures builder with id and DASHBOARD_VIEW preferences', () => {
 		const builder = buildBaseConfig({
 			...baseProps,
 			panelMode: PanelMode.DASHBOARD_VIEW,
-			widget: createWidget({ id: 'my-widget' }),
+			...createBaseConfigBuilderProps({ id: 'my-widget' }),
 		});
 
-		expect(builder.getWidgetId()).toBe('my-widget');
+		expect(builder.getId()).toBe('my-widget');
 		expect(builder.getShouldSaveSelectionPreference()).toBe(true);
 	});
 
@@ -127,7 +136,7 @@ describe('buildBaseConfig', () => {
 	it('configures log scale on y axis when widget.isLogScale is true', () => {
 		const builder = buildBaseConfig({
 			...baseProps,
-			widget: createWidget({ isLogScale: true }),
+			...createBaseConfigBuilderProps({ isLogScale: true }),
 		});
 
 		const config = builder.getConfig();
@@ -171,7 +180,7 @@ describe('buildBaseConfig', () => {
 	it('adds thresholds from widget', () => {
 		const builder = buildBaseConfig({
 			...baseProps,
-			widget: createWidget({
+			...createBaseConfigBuilderProps({
 				thresholds: [
 					{
 						thresholdValue: 80,
@@ -179,7 +188,7 @@ describe('buildBaseConfig', () => {
 						thresholdUnit: 'ms',
 						thresholdLabel: 'High',
 					},
-				] as Widgets['thresholds'],
+				] as ThresholdProps[],
 			}),
 		});
 

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

@@ -1,5 +1,6 @@
 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';
@@ -9,28 +10,32 @@ 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 {
-	widget: Widgets;
+	id: string;
+	thresholds?: ThresholdProps[];
 	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({
-	widget,
+	id,
 	isDarkMode,
 	onClick,
 	onDragSelect,
@@ -38,9 +43,14 @@ export function buildBaseConfig({
 	timezone,
 	panelMode,
 	panelType,
+	thresholds,
 	minTimeScale,
 	maxTimeScale,
 	stepInterval,
+	isLogScale,
+	yAxisUnit,
+	softMin,
+	softMax,
 }: BaseConfigBuilderProps): UPlotConfigBuilder {
 	const tzDate = timezone
 		? (timestamp: number): Date =>
@@ -48,28 +58,27 @@ export function buildBaseConfig({
 		: undefined;
 
 	const builder = new UPlotConfigBuilder({
+		id,
 		onDragSelect,
-		widgetId: widget.id,
 		tzDate,
 		shouldSaveSelectionPreference: panelMode === PanelMode.DASHBOARD_VIEW,
-		selectionPreferencesSource: [
-			PanelMode.DASHBOARD_VIEW,
-			PanelMode.STANDALONE_VIEW,
-		].includes(panelMode)
-			? SelectionPreferencesSource.LOCAL_STORAGE
+		selectionPreferencesSource: panelMode
+			? [PanelMode.DASHBOARD_VIEW, PanelMode.STANDALONE_VIEW].includes(panelMode)
+				? SelectionPreferencesSource.LOCAL_STORAGE
+				: SelectionPreferencesSource.IN_MEMORY
 			: SelectionPreferencesSource.IN_MEMORY,
 		stepInterval,
 	});
 
 	const thresholdOptions: ThresholdsDrawHookOptions = {
 		scaleKey: 'y',
-		thresholds: (widget.thresholds || []).map((threshold) => ({
+		thresholds: (thresholds || []).map((threshold) => ({
 			thresholdValue: threshold.thresholdValue ?? 0,
 			thresholdColor: threshold.thresholdColor,
 			thresholdUnit: threshold.thresholdUnit,
 			thresholdLabel: threshold.thresholdLabel,
 		})),
-		yAxisUnit: widget.yAxisUnit,
+		yAxisUnit: yAxisUnit,
 	};
 
 	builder.addThresholds(thresholdOptions);
@@ -79,8 +88,8 @@ export function buildBaseConfig({
 		time: true,
 		min: minTimeScale,
 		max: maxTimeScale,
-		logBase: widget.isLogScale ? 10 : undefined,
-		distribution: widget.isLogScale
+		logBase: isLogScale ? 10 : undefined,
+		distribution: isLogScale
 			? DistributionType.Logarithmic
 			: DistributionType.Linear,
 	});
@@ -91,11 +100,11 @@ export function buildBaseConfig({
 		time: false,
 		min: undefined,
 		max: undefined,
-		softMin: widget.softMin ?? undefined,
-		softMax: widget.softMax ?? undefined,
+		softMin: softMin,
+		softMax: softMax,
 		thresholds: thresholdOptions,
-		logBase: widget.isLogScale ? 10 : undefined,
-		distribution: widget.isLogScale
+		logBase: isLogScale ? 10 : undefined,
+		distribution: isLogScale
 			? DistributionType.Logarithmic
 			: DistributionType.Linear,
 	});
@@ -114,7 +123,7 @@ export function buildBaseConfig({
 		show: true,
 		side: 2,
 		isDarkMode,
-		isLogScale: widget.isLogScale,
+		isLogScale,
 		panelType,
 	});
 
@@ -123,8 +132,8 @@ export function buildBaseConfig({
 		show: true,
 		side: 3,
 		isDarkMode,
-		isLogScale: widget.isLogScale,
-		yAxisUnit: widget.yAxisUnit,
+		isLogScale,
+		yAxisUnit,
 		panelType,
 	});
 

frontend/src/container/Home/Home.styles.scss

@@ -25,51 +25,6 @@
 		background: var(--bg-slate-500);
 	}
 
-	.home-container-banner {
-		position: relative;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: center;
-		padding: 8px 12px;
-		width: 100%;
-		background-color: var(--bg-robin-500);
-
-		.home-container-banner-close {
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			cursor: pointer;
-			color: var(--bg-vanilla-100);
-
-			position: absolute;
-			right: 12px;
-		}
-
-		.home-container-banner-content {
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			gap: 4px;
-			color: var(--bg-vanilla-100);
-			font-family: Inter;
-			font-size: 12px;
-			font-style: normal;
-			font-weight: 400;
-			line-height: 20px;
-
-			.home-container-banner-link {
-				color: var(--bg-vanilla-100);
-				font-size: 12px;
-				font-style: normal;
-				font-weight: 400;
-				line-height: 20px;
-				letter-spacing: -0.07px;
-				text-decoration: underline;
-			}
-		}
-	}
-
 	.home-header-left {
 		display: flex;
 		align-items: center;

frontend/src/container/Home/Home.tsx

@@ -1,13 +1,13 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useMutation, useQuery } from 'react-query';
 import { Color } from '@signozhq/design-tokens';
+import { Compass, Dot, House, Plus, Wrench } from '@signozhq/icons';
 import { Button, Popover } from 'antd';
 import logEvent from 'api/common/logEvent';
 import listUserPreferences from 'api/v1/user/preferences/list';
 import updateUserPreferenceAPI from 'api/v1/user/preferences/name/update';
 import Header from 'components/Header/Header';
 import { ENTITY_VERSION_V5 } from 'constants/app';
-import { LOCALSTORAGE } from 'constants/localStorage';
 import { ORG_PREFERENCES } from 'constants/orgPreferences';
 import { initialQueriesMap, PANEL_TYPES } from 'constants/queryBuilder';
 import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
@@ -15,10 +15,8 @@ import ROUTES from 'constants/routes';
 import { getMetricsListQuery } from 'container/MetricsExplorer/Summary/utils';
 import { useGetMetricsList } from 'hooks/metricsExplorer/useGetMetricsList';
 import { useGetQueryRange } from 'hooks/queryBuilder/useGetQueryRange';
-import { useGetTenantLicense } from 'hooks/useGetTenantLicense';
 import history from 'lib/history';
 import cloneDeep from 'lodash-es/cloneDeep';
-import { CompassIcon, DotIcon, HomeIcon, Plus, Wrench, X } from 'lucide-react';
 import { AnimatePresence } from 'motion/react';
 import * as motion from 'motion/react-client';
 import Card from 'periscope/components/Card/Card';
@@ -51,8 +49,6 @@ export default function Home(): JSX.Element {
 	const [updatingUserPreferences, setUpdatingUserPreferences] = useState(false);
 	const [loadingUserPreferences, setLoadingUserPreferences] = useState(true);
 
-	const { isCommunityUser, isCommunityEnterpriseUser } = useGetTenantLicense();
-
 	const [checklistItems, setChecklistItems] = useState<ChecklistItem[]>(
 		defaultChecklistItemsState,
 	);
@@ -61,13 +57,6 @@ export default function Home(): JSX.Element {
 		false,
 	);
 
-	const [isBannerDismissed, setIsBannerDismissed] = useState(false);
-
-	useEffect(() => {
-		const bannerDismissed = localStorage.getItem(LOCALSTORAGE.BANNER_DISMISSED);
-		setIsBannerDismissed(bannerDismissed === 'true');
-	}, []);
-
 	useEffect(() => {
 		const now = new Date();
 		const startTime = new Date(now.getTime() - homeInterval);
@@ -298,44 +287,13 @@ export default function Home(): JSX.Element {
 		logEvent('Homepage: Visited', {});
 	}, []);
 
-	const hideBanner = (): void => {
-		localStorage.setItem(LOCALSTORAGE.BANNER_DISMISSED, 'true');
-		setIsBannerDismissed(true);
-	};
-
-	const showBanner = useMemo(
-		() => !isBannerDismissed && (isCommunityUser || isCommunityEnterpriseUser),
-		[isBannerDismissed, isCommunityUser, isCommunityEnterpriseUser],
-	);
-
 	return (
 		<div className="home-container">
 			<div className="sticky-header">
-				{showBanner && (
-					<div className="home-container-banner">
-						<div className="home-container-banner-content">
-							Big News: SigNoz Community Edition now available with SSO (Google OAuth)
-							and API keys -
-							<a
-								href="https://signoz.io/blog/open-source-signoz-now-available-with-sso-and-api-keys/"
-								target="_blank"
-								rel="noreferrer"
-								className="home-container-banner-link"
-							>
-								<i>read more</i>
-							</a>
-						</div>
-
-						<div className="home-container-banner-close">
-							<X size={16} onClick={hideBanner} />
-						</div>
-					</div>
-				)}
-
 				<Header
 					leftComponent={
 						<div className="home-header-left">
-							<HomeIcon size={14} /> Home
+							<House size={14} /> Home
 						</div>
 					}
 					rightComponent={
@@ -400,7 +358,7 @@ export default function Home(): JSX.Element {
 									<div className="active-ingestion-card-content-container">
 										<div className="active-ingestion-card-content">
 											<div className="active-ingestion-card-content-icon">
-												<DotIcon size={16} color={Color.BG_FOREST_500} />
+												<Dot size={16} color={Color.BG_FOREST_500} />
 											</div>
 
 											<div className="active-ingestion-card-content-description">
@@ -427,7 +385,7 @@ export default function Home(): JSX.Element {
 												}
 											}}
 										>
-											<CompassIcon size={12} />
+											<Compass size={12} />
 											Explore Logs
 										</div>
 									</div>
@@ -441,7 +399,7 @@ export default function Home(): JSX.Element {
 									<div className="active-ingestion-card-content-container">
 										<div className="active-ingestion-card-content">
 											<div className="active-ingestion-card-content-icon">
-												<DotIcon size={16} color={Color.BG_FOREST_500} />
+												<Dot size={16} color={Color.BG_FOREST_500} />
 											</div>
 
 											<div className="active-ingestion-card-content-description">
@@ -468,7 +426,7 @@ export default function Home(): JSX.Element {
 												}
 											}}
 										>
-											<CompassIcon size={12} />
+											<Compass size={12} />
 											Explore Traces
 										</div>
 									</div>
@@ -482,7 +440,7 @@ export default function Home(): JSX.Element {
 									<div className="active-ingestion-card-content-container">
 										<div className="active-ingestion-card-content">
 											<div className="active-ingestion-card-content-icon">
-												<DotIcon size={16} color={Color.BG_FOREST_500} />
+												<Dot size={16} color={Color.BG_FOREST_500} />
 											</div>
 
 											<div className="active-ingestion-card-content-description">
@@ -509,7 +467,7 @@ export default function Home(): JSX.Element {
 												}
 											}}
 										>
-											<CompassIcon size={12} />
+											<Compass size={12} />
 											Explore Metrics
 										</div>
 									</div>

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

@@ -6,6 +6,7 @@ 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';
@@ -115,27 +116,34 @@ 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">
-				{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>
-				))}
+				{!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>
+					))}
 			</div>
 		</div>
 	);

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

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

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

@@ -69,7 +69,7 @@ function Explorer(): JSX.Element {
 			!isMetricUnitsLoading &&
 			!isMetricUnitsError &&
 			units.length > 0 &&
-			units.every((unit) => unit && unit === units[0]),
+			units.every((unit) => unit === units[0]),
 		[units, isMetricUnitsLoading, isMetricUnitsError],
 	);
 

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

@@ -28,6 +28,7 @@ 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,
@@ -209,7 +210,7 @@ function TimeSeries({
 						{showSaveUnitButton && (
 							<div className="save-unit-container">
 								<Typography.Text>
-									Save the selected unit for this metric?
+									Set the selected unit as the metric unit?
 								</Typography.Text>
 								<Button
 									type="primary"
@@ -229,64 +230,71 @@ function TimeSeries({
 					'time-series-container': changeLayoutForOneChartPerQuery,
 				})}
 			>
-				{responseData.map((datapoint, index) => {
-					const isQueryDataItem = index < metricNames.length;
-					const metricName = isQueryDataItem ? metricNames[index] : undefined;
-					const metricUnit = isQueryDataItem ? metricUnits[index] : undefined;
+				{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;
 
-					// 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>
-											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>
-					);
-				})}
+						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>
+						);
+					})}
 			</div>
 		</>
 	);

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

@@ -0,0 +1,19 @@
+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,7 +8,7 @@ import {
 	MetrictypesTemporalityDTO,
 	MetrictypesTypeDTO,
 } from 'api/generated/services/sigNoz.schemas';
-import { initialQueriesMap, PANEL_TYPES } from 'constants/queryBuilder';
+import { initialQueriesMap } from 'constants/queryBuilder';
 import * as useOptionsMenuHooks from 'container/OptionsMenu';
 import * as useUpdateDashboardHooks from 'hooks/dashboard/useUpdateDashboard';
 import * as useQueryBuilderHooks from 'hooks/queryBuilder/useQueryBuilder';
@@ -157,26 +157,6 @@ 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' }),
@@ -241,20 +221,46 @@ describe('Explorer', () => {
 		expect(yAxisUnitSelector).not.toBeInTheDocument();
 	});
 
-	it('should hide y axis unit selector for multiple metrics with different units', () => {
+	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);
+
 		jest.spyOn(useGetMetricsHooks, 'useGetMetrics').mockReturnValue({
 			isLoading: false,
 			isError: false,
-			metrics: [MOCK_METRIC_METADATA, MOCK_METRIC_METADATA],
+			metrics: [
+				{ ...MOCK_METRIC_METADATA, unit: 'seconds' },
+				{ ...MOCK_METRIC_METADATA, unit: 'bytes' },
+			],
 		});
 
+		(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();
 	});
 
@@ -327,4 +333,53 @@ 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();
+	});
 });

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

@@ -1,4 +1,4 @@
-import { render, RenderResult, screen, waitFor } from '@testing-library/react';
+import { render, screen } 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> = {},
-): RenderResult {
+): ReturnType<typeof render> {
 	return render(
 		<TimeSeries
 			showOneChartPerQuery={false}
@@ -84,45 +84,57 @@ 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', () => {
-		const user = userEvent.setup();
-		const { container } = renderTimeSeries({
+		renderTimeSeries({
 			metricUnits: ['', 'count'],
 			metricNames: ['metric1', 'metric2'],
 			metrics: [undefined, undefined],
 		});
 
-		const alertIcon = container.querySelector('.no-unit-warning') as HTMLElement;
-		user.hover(alertIcon);
-		waitFor(() =>
-			expect(
-				screen.findByText('This metric does not have a unit'),
-			).toBeInTheDocument(),
-		);
+		expect(
+			screen.getByRole('img', { name: 'no unit warning' }),
+		).toBeInTheDocument();
 	});
 
-	it('clicking on warning icon tooltip should open metric details modal', async () => {
+	it('warning tooltip shows metric details link', async () => {
 		const user = userEvent.setup();
-		const { container } = renderTimeSeries({
+		renderTimeSeries({
 			metricUnits: ['', 'count'],
 			metricNames: ['metric1', 'metric2'],
 			metrics: [MOCK_METRIC_METADATA, MOCK_METRIC_METADATA],
 			yAxisUnit: 'seconds',
 		});
 
-		const alertIcon = container.querySelector('.no-unit-warning') as HTMLElement;
-		user.hover(alertIcon);
+		const alertIcon = screen.getByRole('img', { name: 'no unit warning' });
+		await user.hover(alertIcon);
 
-		const metricDetailsLink = await screen.findByText('metric details');
-		user.click(metricDetailsLink);
-
-		waitFor(() =>
-			expect(mockSetIsMetricDetailsOpen).toHaveBeenCalledWith('metric1'),
-		);
+		expect(await screen.findByText('metric details')).toBeInTheDocument();
 	});
 
-	it('shows Save unit button when metric had no unit but one is selected', async () => {
-		const { findByText, getByRole } = renderTimeSeries({
+	it('shows save unit prompt with enabled button when metric has no unit and a unit is selected', async () => {
+		renderTimeSeries({
 			metricUnits: [undefined],
 			metricNames: ['metric1'],
 			metrics: [MOCK_METRIC_METADATA],
@@ -131,38 +143,10 @@ describe('TimeSeries', () => {
 		});
 
 		expect(
-			await findByText('Save the selected unit for this metric?'),
+			await screen.findByText('Set the selected unit as the metric unit?'),
 		).toBeInTheDocument();
 
-		const yesButton = getByRole('button', { name: 'Yes' });
-		expect(yesButton).toBeInTheDocument();
+		const yesButton = screen.getByRole('button', { name: 'Yes' });
 		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,4 +139,14 @@ 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 { AggregatorFilter } from 'container/QueryBuilder/filters';
+import { MetricNameSelector } 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>
-			<AggregatorFilter
+			<MetricNameSelector
 				defaultValue={searchText ?? ''}
 				query={initialQueriesMap[DataSource.METRICS].builder.queryData[0]}
 				onSelect={handleSetMetricName}

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

@@ -1,8 +1,9 @@
 import { QueryClient, QueryClientProvider } from 'react-query';
 // eslint-disable-next-line no-restricted-imports
 import { Provider } from 'react-redux';
-import { render, screen } from '@testing-library/react';
+import { fireEvent, render, screen, within } 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';
@@ -23,27 +24,31 @@ jest.mock('react-router-dom', () => ({
 	}),
 }));
 
-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('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('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',
@@ -123,6 +128,24 @@ 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}>
@@ -137,8 +160,12 @@ describe('QueryBuilder', () => {
 
 		expect(screen.getByText('From')).toBeInTheDocument();
 
-		const selectButton = screen.getByTestId('select-metric-button');
-		await user.click(selectButton);
+		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);
 
 		expect(mockSetCurrentMetricName).toHaveBeenCalledWith('test_metric_2');
 	});

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

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

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

@@ -1,7 +1,6 @@
 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';
@@ -39,7 +38,6 @@ 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(
@@ -62,21 +60,13 @@ export function AllAttributesValue({
 					break;
 				case 'copy-value':
 					handleCopyWithFeedback(attribute);
-					notifications.success({
-						message: 'Value copied!',
-					});
 					break;
 				default:
 					break;
 			}
 			setAttributePopoverKey(null);
 		},
-		[
-			goToMetricsExploreWithAppliedAttribute,
-			filterKey,
-			handleCopyWithFeedback,
-			notifications,
-		],
+		[goToMetricsExploreWithAppliedAttribute, filterKey, handleCopyWithFeedback],
 	);
 
 	const attributePopoverContent = useCallback(
@@ -169,26 +159,35 @@ export function AllAttributesValue({
 
 	return (
 		<div className="all-attributes-value">
-			{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.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.length > INITIAL_VISIBLE_COUNT && (
 				<Popover
 					content={allValuesPopoverContent}

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

@@ -9,9 +9,7 @@ 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';
 
@@ -20,7 +18,6 @@ import { DashboardsAndAlertsPopoverProps } from './types';
 function DashboardsAndAlertsPopover({
 	metricName,
 }: DashboardsAndAlertsPopoverProps): JSX.Element | null {
-	const { safeNavigate } = useSafeNavigate();
 	const params = useUrlQuery();
 
 	const {
@@ -75,7 +72,7 @@ function DashboardsAndAlertsPopover({
 						key={alert.alertId}
 						onClick={(): void => {
 							params.set(QueryParams.ruleId, alert.alertId);
-							history.push(`${ROUTES.ALERT_OVERVIEW}?${params.toString()}`);
+							window.open(`${ROUTES.ALERT_OVERVIEW}?${params.toString()}`, '_blank');
 						}}
 						className="dashboards-popover-content-item"
 					>
@@ -95,10 +92,11 @@ function DashboardsAndAlertsPopover({
 					<Typography.Link
 						key={dashboard.dashboardId}
 						onClick={(): void => {
-							safeNavigate(
+							window.open(
 								generatePath(ROUTES.DASHBOARD, {
 									dashboardId: dashboard.dashboardId,
 								}),
+								'_blank',
 							);
 						}}
 						className="dashboards-popover-content-item"
@@ -109,7 +107,7 @@ function DashboardsAndAlertsPopover({
 			}));
 		}
 		return null;
-	}, [dashboards, safeNavigate]);
+	}, [dashboards]);
 
 	if (isLoadingAlerts || isLoadingDashboards) {
 		return (

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

@@ -245,6 +245,18 @@
 							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;
@@ -398,9 +410,8 @@
 					}
 
 					.all-attributes-key {
-						.ant-typography:last-child {
-							color: var(--bg-vanilla-200);
-							background-color: var(--bg-robin-300);
+						.all-attributes-contribution {
+							color: var(--bg-slate-400);
 						}
 					}
 				}
@@ -582,6 +593,14 @@
 			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,7 +80,14 @@ function MetricDetails({
 
 	const goToMetricsExplorerwithSelectedMetric = useCallback(() => {
 		if (metricName) {
-			const compositeQuery = getMetricDetailsQuery(metricName, metadata?.type);
+			const compositeQuery = getMetricDetailsQuery(
+				metricName,
+				metadata?.type,
+				undefined,
+				undefined,
+				undefined,
+				metadata?.isMonotonic,
+			);
 			handleExplorerTabChange(
 				PANEL_TYPES.TIME_SERIES,
 				{
@@ -89,6 +96,7 @@ function MetricDetails({
 					id: metricName,
 				},
 				ROUTES.METRICS_EXPLORER_EXPLORER,
+				true,
 			);
 			logEvent(MetricsExplorerEvents.OpenInExplorerClicked, {
 				[MetricsExplorerEventKeys.MetricName]: metricName,
@@ -96,7 +104,12 @@ function MetricDetails({
 				[MetricsExplorerEventKeys.Modal]: 'metric-details',
 			});
 		}
-	}, [metricName, handleExplorerTabChange, metadata?.type]);
+	}, [
+		metricName,
+		handleExplorerTabChange,
+		metadata?.type,
+		metadata?.isMonotonic,
+	]);
 
 	useEffect(() => {
 		logEvent(MetricsExplorerEvents.ModalOpened, {
@@ -182,6 +195,7 @@ 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,12 +14,8 @@ import {
 	MOCK_METRIC_NAME,
 } from './testUtlls';
 
-const mockSafeNavigate = jest.fn();
-jest.mock('hooks/useSafeNavigate', () => ({
-	useSafeNavigate: (): any => ({
-		safeNavigate: mockSafeNavigate,
-	}),
-}));
+const mockWindowOpen = jest.fn();
+Object.defineProperty(window, 'open', { value: mockWindowOpen });
 const mockSetQuery = jest.fn();
 const mockUrlQuery = {
 	set: mockSetQuery,
@@ -43,6 +39,7 @@ describe('DashboardsAndAlertsPopover', () => {
 	beforeEach(() => {
 		useGetMetricAlertsMock.mockReturnValue(getMockAlertsData());
 		useGetMetricDashboardsMock.mockReturnValue(getMockDashboardsData());
+		mockWindowOpen.mockClear();
 	});
 
 	it('renders the popover correctly with multiple dashboards and alerts', () => {
@@ -140,9 +137,10 @@ describe('DashboardsAndAlertsPopover', () => {
 		// Click on the first dashboard
 		await userEvent.click(screen.getByText(MOCK_DASHBOARD_1.dashboardName));
 
-		// Should navigate to the dashboard
-		expect(mockSafeNavigate).toHaveBeenCalledWith(
+		// Should open dashboard in new tab
+		expect(mockWindowOpen).toHaveBeenCalledWith(
 			`/dashboard/${MOCK_DASHBOARD_1.dashboardId}`,
+			'_blank',
 		);
 	});
 
@@ -158,11 +156,12 @@ describe('DashboardsAndAlertsPopover', () => {
 		// Click on the first alert rule
 		await userEvent.click(screen.getByText(MOCK_ALERT_1.alertName));
 
-		// Should navigate to the alert rule
+		// Should open alert in new tab
 		expect(mockSetQuery).toHaveBeenCalledWith(
 			QueryParams.ruleId,
 			MOCK_ALERT_1.alertId,
 		);
+		expect(mockWindowOpen).toHaveBeenCalled();
 	});
 
 	it('renders unique dashboards even when there are duplicates', async () => {

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

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

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

@@ -34,6 +34,7 @@ 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 } from 'constants/queryBuilder';
+import { initialQueriesMap, toAttributeType } 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,15 +88,25 @@ 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:
-			timeAggregation = 'rate';
-			spaceAggregation = 'sum';
-			aggregateOperator = 'rate';
+			if (isNonMonotonicSum) {
+				timeAggregation = 'avg';
+				spaceAggregation = 'avg';
+				aggregateOperator = 'avg';
+			} else {
+				timeAggregation = 'rate';
+				spaceAggregation = 'sum';
+				aggregateOperator = 'rate';
+			}
 			break;
 		case MetrictypesTypeDTO.gauge:
 			timeAggregation = 'avg';
@@ -121,6 +131,8 @@ export function getMetricDetailsQuery(
 			break;
 	}
 
+	const attributeType = toAttributeType(metricType, isMonotonic);
+
 	return {
 		...initialQueriesMap[DataSource.METRICS],
 		builder: {
@@ -129,8 +141,8 @@ export function getMetricDetailsQuery(
 					...initialQueriesMap[DataSource.METRICS].builder.queryData[0],
 					aggregateAttribute: {
 						key: metricName,
-						type: metricType ?? '',
-						id: `${metricName}----${metricType}---string--`,
+						type: attributeType,
+						id: `${metricName}----${attributeType}---string--`,
 						dataType: DataTypes.String,
 					},
 					aggregations: [

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

@@ -312,7 +312,9 @@ function Summary(): JSX.Element {
 				/>
 				{showFullScreenLoading ? (
 					<MetricsLoading />
-				) : isMetricsListDataEmpty && isMetricsTreeMapDataEmpty ? (
+				) : isMetricsListDataEmpty &&
+				  isMetricsTreeMapDataEmpty &&
+				  !appliedFilterExpression ? (
 					<NoLogs dataSource={DataSource.METRICS} />
 				) : (
 					<>

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

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

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

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

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

@@ -0,0 +1,887 @@
+import { useEffect, useState } from 'react';
+import { fireEvent, render, screen, 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();
+	});
+});
+
+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

@@ -0,0 +1,266 @@
+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 || '');
+	}, [defaultValue, currentMetricName]);
+
+	useEffect(() => {
+		if (prevSignalSourceRef.current !== signalSource) {
+			prevSignalSourceRef.current = signalSource;
+			setSearchText('');
+			setInputValue('');
+		}
+	}, [signalSource]);
+
+	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;
+		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?.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

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

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

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

frontend/src/hooks/queryBuilder/useQueryBuilderOperations.ts

@@ -248,19 +248,12 @@ export const useQueryOperations: UseQueryOperations = ({
 	);
 
 	const handleChangeAggregatorAttribute = useCallback(
-		(
-			value: BaseAutocompleteData,
-			isEditMode?: boolean,
-			attributeKeys?: BaseAutocompleteData[],
-		): void => {
+		(value: BaseAutocompleteData, isEditMode?: boolean): 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
@@ -311,9 +304,7 @@ export const useQueryOperations: UseQueryOperations = ({
 					// Get current metric info
 					const currentMetricType = newQuery.aggregateAttribute?.type || '';
 
-					const prevMetricType = previousMetricInfo?.type
-						? previousMetricInfo.type
-						: getAttributeKeyFromMetricName(previousMetricInfo?.name || '');
+					const prevMetricType = previousMetricInfo?.type || '';
 
 					// Check if metric type has changed by comparing with tracked previous values
 					const metricTypeChanged =
@@ -374,7 +365,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 - 'rate', space - 'sum', op - 'count'
+						// If not typed - time - 'avg', space - 'sum'
 						if (isEmpty(newQuery.aggregateAttribute?.type)) {
 							if (!isEmpty(newQuery.aggregateAttribute?.key)) {
 								newQuery.aggregations = [
@@ -388,7 +379,7 @@ export const useQueryOperations: UseQueryOperations = ({
 							} else {
 								newQuery.aggregations = [
 									{
-										timeAggregation: MetricAggregateOperator.COUNT,
+										timeAggregation: MetricAggregateOperator.AVG,
 										metricName: newQuery.aggregateAttribute?.key || '',
 										temporality: '',
 										spaceAggregation: MetricAggregateOperator.SUM,
@@ -408,6 +399,29 @@ 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,6 +20,7 @@ export const useHandleExplorerTabChange = (): {
 		type: string,
 		querySearchParameters?: ICurrentQueryData,
 		redirectToUrl?: typeof ROUTES[keyof typeof ROUTES],
+		newTab?: boolean,
 	) => void;
 } => {
 	const {
@@ -63,6 +64,7 @@ export const useHandleExplorerTabChange = (): {
 			type: string,
 			currentQueryData?: ICurrentQueryData,
 			redirectToUrl?: typeof ROUTES[keyof typeof ROUTES],
+			newTab?: boolean,
 		) => {
 			const newPanelType = type as PANEL_TYPES;
 
@@ -81,13 +83,21 @@ 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,
-				});
+				redirectWithQueryBuilderData(
+					query,
+					{
+						[QueryParams.panelTypes]: newPanelType,
+						[QueryParams.viewName]: currentQueryData?.name || viewName,
+						[QueryParams.viewKey]: currentQueryData?.id || viewKey,
+					},
+					undefined,
+					undefined,
+					newTab,
+				);
 			}
 		},
 		[panelType, getUpdateQuery, redirectWithQueryBuilderData, viewName, viewKey],

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

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

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

@@ -4,6 +4,7 @@ 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';
 
@@ -22,6 +23,14 @@ 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) {
@@ -33,10 +42,10 @@ export default function Tooltip({
 			return null;
 		}
 		return dayjs(data[0][cursorIdx] * 1000)
-			.tz(timezone)
+			.tz(resolvedTimezone)
 			.format(DATE_TIME_FORMATS.MONTH_DATETIME_SECONDS);
 	}, [
-		timezone,
+		resolvedTimezone,
 		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: 'UTC',
+		timezone: { value: 'UTC', name: 'UTC', offset: '0', searchIndex: '0' },
 		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,
-			widgetId: config.getWidgetId(),
+			id: config.getId(),
 			shouldSaveSelectionPreference: config.getShouldSaveSelectionPreference(),
 		});
 

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

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

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

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

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

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

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

@@ -1,4 +1,3 @@
-import { PANEL_TYPES } from 'constants/queryBuilder';
 import { themeColors } from 'constants/theme';
 import { generateColor } from 'lib/uPlotLib/utils/generateColor';
 import { calculateWidthBasedOnStepInterval } from 'lib/uPlotV2/utils';
@@ -23,6 +22,9 @@ 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);
@@ -53,7 +55,7 @@ export class UPlotSeriesBuilder extends ConfigBuilder<SeriesProps, Series> {
 		const { lineWidth, lineStyle, lineCap, fillColor } = this.props;
 		const lineConfig: Partial<Series> = {
 			stroke: resolvedLineColor,
-			width: lineWidth ?? 2,
+			width: lineWidth ?? DEFAULT_LINE_WIDTH,
 		};
 
 		if (lineStyle === LineStyle.Dashed) {
@@ -66,9 +68,9 @@ export class UPlotSeriesBuilder extends ConfigBuilder<SeriesProps, Series> {
 
 		if (fillColor) {
 			lineConfig.fill = fillColor;
-		} else if (this.props.panelType === PANEL_TYPES.BAR) {
+		} else if (this.props.drawStyle === DrawStyle.Bar) {
 			lineConfig.fill = resolvedLineColor;
-		} else if (this.props.panelType === PANEL_TYPES.HISTOGRAM) {
+		} else if (this.props.drawStyle === DrawStyle.Histogram) {
 			lineConfig.fill = `${resolvedLineColor}40`;
 		}
 
@@ -137,10 +139,19 @@ 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: !pointSize || pointSize < (lineWidth ?? 2) ? undefined : pointSize,
+			size: resolvedPointSize,
 			filter: pointsFilter || undefined,
 		};
 
@@ -231,7 +242,7 @@ function getPathBuilder({
 		throw new Error('Required uPlot path builders are not available');
 	}
 
-	if (drawStyle === DrawStyle.Bar) {
+	if (drawStyle === DrawStyle.Bar || drawStyle === DrawStyle.Histogram) {
 		const pathBuilders = uPlot.paths;
 		return getBarPathBuilder({
 			pathBuilders,

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

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

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

@@ -1,4 +1,3 @@
-import { PANEL_TYPES } from 'constants/queryBuilder';
 import { themeColors } from 'constants/theme';
 import uPlot from 'uplot';
 
@@ -9,7 +8,7 @@ import {
 	LineStyle,
 	VisibilityMode,
 } from '../types';
-import { UPlotSeriesBuilder } from '../UPlotSeriesBuilder';
+import { POINT_SIZE_FACTOR, UPlotSeriesBuilder } from '../UPlotSeriesBuilder';
 
 const createBaseProps = (
 	overrides: Partial<SeriesProps> = {},
@@ -19,7 +18,6 @@ const createBaseProps = (
 	colorMapping: {},
 	drawStyle: DrawStyle.Line,
 	isDarkMode: false,
-	panelType: PANEL_TYPES.TIME_SERIES,
 	...overrides,
 });
 
@@ -137,7 +135,6 @@ describe('UPlotSeriesBuilder', () => {
 		const smallPointsBuilder = new UPlotSeriesBuilder(
 			createBaseProps({
 				lineWidth: 4,
-				pointSize: 2,
 			}),
 		);
 		const largePointsBuilder = new UPlotSeriesBuilder(
@@ -150,7 +147,7 @@ describe('UPlotSeriesBuilder', () => {
 		const smallConfig = smallPointsBuilder.getConfig();
 		const largeConfig = largePointsBuilder.getConfig();
 
-		expect(smallConfig.points?.size).toBeUndefined();
+		expect(smallConfig.points?.size).toBe(4 * POINT_SIZE_FACTOR); // should be lineWidth * POINT_SIZE_FACTOR, when pointSize is not provided
 		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 {
-	widgetId?: string;
+	id: string;
 	onDragSelect?: (startTime: number, endTime: number) => void;
 	tzDate?: uPlot.LocalDateFromUnix;
 	selectionPreferencesSource?: SelectionPreferencesSource;
@@ -112,6 +112,7 @@ export enum DrawStyle {
 	Line = 'line',
 	Points = 'points',
 	Bar = 'bar',
+	Histogram = 'histogram',
 }
 
 export enum LineInterpolation {
@@ -168,7 +169,6 @@ 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;
-	widgetId?: string;
+	id?: 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 widgetIdRef = useRef<string | undefined>(undefined);
+	const idRef = useRef<string | undefined>(undefined);
 	const shouldSavePreferencesRef = useRef<boolean>(false);
 
 	const setPlotContextInitialState = useCallback(
 		({
 			uPlotInstance,
-			widgetId,
+			id,
 			shouldSaveSelectionPreference,
 		}: PlotContextInitialState): void => {
 			uPlotInstanceRef.current = uPlotInstance;
-			widgetIdRef.current = widgetId;
+			idRef.current = id;
 			activeSeriesIndex.current = undefined;
 			shouldSavePreferencesRef.current = !!shouldSaveSelectionPreference;
 		},
@@ -50,7 +50,7 @@ export const PlotContextProvider = ({
 
 	const syncSeriesVisibilityToLocalStorage = useCallback((): void => {
 		const plot = uPlotInstanceRef.current;
-		if (!plot || !widgetIdRef.current) {
+		if (!plot || !idRef.current) {
 			return;
 		}
 
@@ -61,7 +61,7 @@ export const PlotContextProvider = ({
 			}),
 		);
 
-		updateSeriesVisibilityToLocalStorage(widgetIdRef.current, seriesVisibility);
+		updateSeriesVisibilityToLocalStorage(idRef.current, seriesVisibility);
 	}, []);
 
 	const onToggleSeriesVisibility = useCallback(
@@ -84,7 +84,7 @@ export const PlotContextProvider = ({
 						show: isReset || currentSeriesIndex === seriesIndex,
 					});
 				});
-				if (widgetIdRef.current && shouldSavePreferencesRef.current) {
+				if (idRef.current && shouldSavePreferencesRef.current) {
 					syncSeriesVisibilityToLocalStorage();
 				}
 			});
@@ -104,7 +104,7 @@ export const PlotContextProvider = ({
 				return;
 			}
 			plot.setSeries(seriesIndex, { show: !series.show });
-			if (widgetIdRef.current && shouldSavePreferencesRef.current) {
+			if (idRef.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;
-	widgetId?: string;
+	id?: string;
 	shouldSaveSelectionPreference?: boolean;
 }
 
 const TestComponent = ({
 	plot,
-	widgetId,
+	id,
 	shouldSaveSelectionPreference,
 }: TestComponentProps): JSX.Element => {
 	const {
@@ -49,17 +49,13 @@ const TestComponent = ({
 		onFocusSeries,
 	} = usePlotContext();
 	const handleInit = (): void => {
-		if (
-			!plot ||
-			!widgetId ||
-			typeof shouldSaveSelectionPreference !== 'boolean'
-		) {
+		if (!plot || !id || typeof shouldSaveSelectionPreference !== 'boolean') {
 			return;
 		}
 
 		setPlotContextInitialState({
 			uPlotInstance: plot,
-			widgetId,
+			id,
 			shouldSaveSelectionPreference,
 		});
 	};
@@ -148,11 +144,7 @@ describe('PlotContext', () => {
 
 		render(
 			<PlotContextProvider>
-				<TestComponent
-					plot={plot}
-					widgetId="widget-123"
-					shouldSaveSelectionPreference
-				/>
+				<TestComponent plot={plot} id="widget-123" shouldSaveSelectionPreference />
 			</PlotContextProvider>,
 		);
 
@@ -199,7 +191,7 @@ describe('PlotContext', () => {
 				<PlotContextProvider>
 					<TestComponent
 						plot={plot}
-						widgetId="widget-visibility"
+						id="widget-visibility"
 						shouldSaveSelectionPreference
 					/>
 				</PlotContextProvider>,
@@ -240,7 +232,7 @@ describe('PlotContext', () => {
 				<PlotContextProvider>
 					<TestComponent
 						plot={plot}
-						widgetId="widget-reset"
+						id="widget-reset"
 						shouldSaveSelectionPreference
 					/>
 				</PlotContextProvider>,
@@ -290,7 +282,7 @@ describe('PlotContext', () => {
 				<PlotContextProvider>
 					<TestComponent
 						plot={plot}
-						widgetId="widget-toggle"
+						id="widget-toggle"
 						shouldSaveSelectionPreference
 					/>
 				</PlotContextProvider>,
@@ -316,7 +308,7 @@ describe('PlotContext', () => {
 				<PlotContextProvider>
 					<TestComponent
 						plot={plot}
-						widgetId="widget-missing-series"
+						id="widget-missing-series"
 						shouldSaveSelectionPreference
 					/>
 				</PlotContextProvider>,
@@ -341,7 +333,7 @@ describe('PlotContext', () => {
 				<PlotContextProvider>
 					<TestComponent
 						plot={plot}
-						widgetId="widget-no-persist"
+						id="widget-no-persist"
 						shouldSaveSelectionPreference={false}
 					/>
 				</PlotContextProvider>,
@@ -379,7 +371,7 @@ describe('PlotContext', () => {
 				<PlotContextProvider>
 					<TestComponent
 						plot={plot}
-						widgetId="widget-focus"
+						id="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();
+	return new TestConfigBuilder({ id: 'test-widget' });
 }
 
 function getHandler(config: ConfigMock, hookName: string): HookHandler {

frontend/src/pages/AlertDetails/AlertDetails.styles.scss

@@ -252,4 +252,23 @@
 			}
 		}
 	}
+
+	.alert-details-v2 {
+		.tabs-and-filters {
+			.ant-tabs {
+				.ant-tabs-tab {
+					.ant-tabs-tab-btn {
+						border: 1px solid var(--bg-vanilla-300);
+						background: var(--bg-vanilla-100);
+						color: var(--text-ink-400) !important;
+
+						&[aria-selected='true'] {
+							background: var(--bg-vanilla-200);
+							color: var(--text-robin-500) !important;
+						}
+					}
+				}
+			}
+		}
+	}
 }

frontend/src/pages/MetricsApplication/MetricsApplication.styles.scss

@@ -24,3 +24,25 @@
 		}
 	}
 }
+
+.lightMode {
+	.service-route-tab {
+		.ant-tabs-nav {
+			&::before {
+				border-bottom: 1px solid var(--bg-vanilla-300);
+			}
+
+			.ant-tabs-nav-wrap {
+				.ant-tabs-nav-list {
+					.ant-tabs-tab {
+						color: var(--text-ink-400);
+					}
+
+					.ant-tabs-tab.ant-tabs-tab-active .ant-tabs-tab-btn {
+						color: var(--text-robin-500);
+					}
+				}
+			}
+		}
+	}
+}

frontend/src/providers/QueryBuilder.tsx

@@ -947,6 +947,7 @@ 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)
@@ -1013,7 +1014,7 @@ export function QueryBuilderProvider({
 				? `${redirectingUrl}?${urlQuery}`
 				: `${location.pathname}?${urlQuery}`;
 
-			safeNavigate(generatedUrl);
+			safeNavigate(generatedUrl, { newTab });
 		},
 		[location.pathname, safeNavigate, urlQuery],
 	);

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

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

frontend/src/types/common/queryBuilder.ts

@@ -278,6 +278,7 @@ 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,6 +14,7 @@ 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"
@@ -56,11 +57,81 @@ func NewModule(ts telemetrystore.TelemetryStore, telemetryMetadataStore telemetr
 	}
 }
 
+// TODO(srikanthccv): use metadata store to fetch metric metadata
 func (m *module) ListMetrics(ctx context.Context, orgID valuer.UUID, params *metricsexplorertypes.ListMetricsParams) (*metricsexplorertypes.ListMetricsResponse, error) {
 	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")
 
@@ -715,9 +786,8 @@ func (m *module) buildFilterClause(ctx context.Context, filter *qbtypes.Filter,
 		Logger:           m.logger,
 		FieldMapper:      m.fieldMapper,
 		ConditionBuilder: m.condBuilder,
-		FullTextColumn: &telemetrytypes.TelemetryFieldKey{
-			Name: "labels"},
-		FieldKeys: keys,
+		FullTextColumn:   &telemetrytypes.TelemetryFieldKey{Name: "metric_name", FieldContext: telemetrytypes.FieldContextMetric},
+		FieldKeys:        keys,
 	}
 
 	startNs := querybuilder.ToNanoSecs(uint64(startMillis))

pkg/querier/promql_query.go

@@ -242,9 +242,6 @@ func (q *promqlQuery) Execute(ctx context.Context) (*qbv5.Result, error) {
 		var s qbv5.TimeSeries
 		lbls := make([]*qbv5.Label, 0, len(v.Metric))
 		for name, value := range v.Metric.Copy().Map() {
-			if strings.HasPrefix(name, "__") || name == "fingerprint" {
-				continue
-			}
 			lbls = append(lbls, &qbv5.Label{
 				Key:   telemetrytypes.TelemetryFieldKey{Name: name},
 				Value: value,

pkg/telemetrymetadata/metadata.go

@@ -1631,8 +1631,10 @@ func (t *telemetryMetaStore) FetchTemporalityAndTypeMulti(ctx context.Context, q
 	if err != nil {
 		return nil, nil, err
 	}
-	// TODO: return error after table migration are run
-	meterMetricsTemporality, meterMetricsTypes, _ := t.fetchMeterSourceMetricsTemporalityAndType(ctx, metricNames...)
+	meterMetricsTemporality, meterMetricsTypes, err := t.fetchMeterSourceMetricsTemporalityAndType(ctx, metricNames...)
+	if err != nil {
+		return nil, nil, err
+	}
 
 	// For metrics not found in the database, set to Unknown
 	for _, metricName := range metricNames {
@@ -1728,6 +1730,7 @@ func (t *telemetryMetaStore) fetchMeterSourceMetricsTemporalityAndType(ctx conte
 		"metric_name",
 		"argMax(temporality, unix_milli) as temporality",
 		"any(type) AS type",
+		"any(is_monotonic) as is_monotonic",
 	).From(t.meterDBName + "." + t.meterFieldsTblName)
 
 	// Filter by metric names (in the temporality column due to data mix-up)

pkg/types/metricsexplorertypes/metricsexplorer.go

@@ -301,6 +301,7 @@ type ListMetricsParams struct {
 	End    *int64 `query:"end"`
 	Limit  int    `query:"limit"`
 	Search string `query:"searchText"`
+	Source string `query:"source"`
 }
 
 // Validate ensures ListMetricsParams contains acceptable values.

pkg/types/querybuildertypes/querybuildertypesv5/builder_elements.go

@@ -447,7 +447,7 @@ type MetricAggregation struct {
 	// space aggregation to apply to the query
 	SpaceAggregation metrictypes.SpaceAggregation `json:"spaceAggregation"`
 	// param for space aggregation if needed
-	ComparisonSpaceAggregationParam *metrictypes.ComparisonSpaceAggregationParam `json:"comparisonSpaceAggregationParam"`
+	ComparisonSpaceAggregationParam *metrictypes.ComparisonSpaceAggregationParam `json:"comparisonSpaceAggregationParam,omitempty"`
 	// table hints to use for the query
 	TableHints *metrictypes.MetricTableHints `json:"-"`
 	// value filter to apply to the query

tests/integration/conftest.py

@@ -15,6 +15,7 @@ pytest_plugins = [
     "fixtures.logs",
     "fixtures.traces",
     "fixtures.metrics",
+    "fixtures.meter",
     "fixtures.driver",
     "fixtures.idp",
     "fixtures.idputils",

tests/integration/fixtures/meter.py

@@ -0,0 +1,121 @@
+import hashlib
+import json
+from datetime import datetime, timedelta
+from typing import Any, Callable, Generator, List
+
+import numpy as np
+import pytest
+
+from fixtures import types
+
+
+class MeterSample:
+    temporality: str
+    metric_name: str
+    description: str
+    unit: str
+    type: str
+    is_monotonic: bool
+    labels: str
+    fingerprint: np.uint64
+    unix_milli: np.int64
+    value: np.float64
+
+    def __init__(
+        self,
+        metric_name: str,
+        labels: dict[str, str],
+        timestamp: datetime,
+        value: float,
+        temporality: str = "Delta",
+        description: str = "",
+        unit: str = "",
+        type_: str = "Sum",
+        is_monotonic: bool = True,
+    ) -> None:
+        self.temporality = temporality
+        self.metric_name = metric_name
+        self.description = description
+        self.unit = unit
+        self.type = type_
+        self.is_monotonic = is_monotonic
+        self.labels = json.dumps(labels, separators=(",", ":"))
+        self.unix_milli = np.int64(int(timestamp.timestamp() * 1e3))
+        self.value = np.float64(value)
+
+        fingerprint_str = metric_name + self.labels
+        self.fingerprint = np.uint64(
+            int(hashlib.md5(fingerprint_str.encode()).hexdigest()[:16], 16)
+        )
+
+    def to_samples_row(self) -> list:
+        return [
+            self.temporality,
+            self.metric_name,
+            self.description,
+            self.unit,
+            self.type,
+            self.is_monotonic,
+            self.labels,
+            self.fingerprint,
+            self.unix_milli,
+            self.value,
+        ]
+
+
+def make_meter_samples(
+    metric_name: str,
+    labels: dict[str, str],
+    now: datetime,
+    count: int = 60,
+    base_value: float = 100.0,
+    **kwargs,
+) -> List[MeterSample]:
+    samples = []
+    for i in range(count):
+        ts = now - timedelta(minutes=count - i)
+        samples.append(
+            MeterSample(
+                metric_name=metric_name,
+                labels=labels,
+                timestamp=ts,
+                value=base_value + i,
+                **kwargs,
+            )
+        )
+    return samples
+
+
+@pytest.fixture(name="insert_meter_samples", scope="function")
+def insert_meter_samples(
+    clickhouse: types.TestContainerClickhouse,
+) -> Generator[Callable[[List[MeterSample]], None], Any, None]:
+    def _insert_meter_samples(samples: List[MeterSample]) -> None:
+        if len(samples) == 0:
+            return
+
+        clickhouse.conn.insert(
+            database="signoz_meter",
+            table="distributed_samples",
+            column_names=[
+                "temporality",
+                "metric_name",
+                "description",
+                "unit",
+                "type",
+                "is_monotonic",
+                "labels",
+                "fingerprint",
+                "unix_milli",
+                "value",
+            ],
+            data=[s.to_samples_row() for s in samples],
+        )
+
+    yield _insert_meter_samples
+
+    cluster = clickhouse.env["SIGNOZ_TELEMETRYSTORE_CLICKHOUSE_CLUSTER"]
+    for table in ["samples", "samples_agg_1d"]:
+        clickhouse.conn.query(
+            f"TRUNCATE TABLE signoz_meter.{table} ON CLUSTER '{cluster}' SYNC"
+        )

tests/integration/fixtures/querier.py

@@ -54,6 +54,7 @@ def build_builder_query(
     *,
     comparisonSpaceAggregationParam: Optional[Dict] = None,
     temporality: Optional[str] = None,
+    source: Optional[str] = None,
     step_interval: int = DEFAULT_STEP_INTERVAL,
     group_by: Optional[List[str]] = None,
     filter_expression: Optional[str] = None,
@@ -73,10 +74,14 @@ def build_builder_query(
         "stepInterval": step_interval,
         "disabled": disabled,
     }
+    if source:
+        spec["source"] = source
     if temporality:
         spec["aggregations"][0]["temporality"] = temporality
     if comparisonSpaceAggregationParam:
-        spec["aggregations"][0]["comparisonSpaceAggregationParam"] = comparisonSpaceAggregationParam
+        spec["aggregations"][0][
+            "comparisonSpaceAggregationParam"
+        ] = comparisonSpaceAggregationParam
     if group_by:
         spec["groupBy"] = [
             {

tests/integration/src/querier/08_metrics_histogram.py

@@ -2,7 +2,6 @@
 Look at the histogram_data_1h.jsonl file for the relevant data
 """
 
-import random
 from datetime import datetime, timedelta, timezone
 from http import HTTPStatus
 from typing import Callable, List
@@ -22,6 +21,7 @@ from fixtures.utils import get_testdata_file_path
 
 FILE = get_testdata_file_path("histogram_data_1h.jsonl")
 
+
 @pytest.mark.parametrize(
     "threshold, operator, first_value, last_value",
     [
@@ -29,12 +29,22 @@ FILE = get_testdata_file_path("histogram_data_1h.jsonl")
         (100, "<=", 1.1, 6.9),
         (7500, "<=", 16.75, 74.75),
         (8000, "<=", 17, 75),
-        (80000, "<=", 17, 75), ## cuz we don't know the max value in infinity, all numbers beyond the biggest finite bucket will report the same answer
+        (
+            80000,
+            "<=",
+            17,
+            75,
+        ),  ## cuz we don't know the max value in infinity, all numbers beyond the biggest finite bucket will report the same answer
         (1000, ">", 7, 7),
         (100, ">", 16.9, 69.1),
         (7500, ">", 1.25, 1.25),
         (8000, ">", 1, 1),
-        (80000, ">", 1, 1), ## cuz we don't know the max value in infinity, all numbers beyond the biggest finite bucket will report the same answer
+        (
+            80000,
+            ">",
+            1,
+            1,
+        ),  ## cuz we don't know the max value in infinity, all numbers beyond the biggest finite bucket will report the same answer
     ],
 )
 def test_histogram_count_for_one_endpoint(
@@ -65,10 +75,7 @@ def test_histogram_count_for_one_endpoint(
         metric_name,
         "increase",
         "count",
-        comparisonSpaceAggregationParam={
-            "threshold": threshold,
-            "operator": operator
-        },
+        comparisonSpaceAggregationParam={"threshold": threshold, "operator": operator},
         filter_expression='endpoint = "/health"',
     )
 
@@ -81,6 +88,7 @@ def test_histogram_count_for_one_endpoint(
     assert result_values[0]["value"] == first_value
     assert result_values[-1]["value"] == last_value
 
+
 @pytest.mark.parametrize(
     "threshold, operator, first_value, last_value",
     [
@@ -88,12 +96,22 @@ def test_histogram_count_for_one_endpoint(
         (100, "<=", 2.2, 13.8),
         (7500, "<=", 33.5, 149.5),
         (8000, "<=", 34, 150),
-        (80000, "<=", 34, 150), ## cuz we don't know the max value in infinity, all numbers beyond the biggest finite bucket will report the same answer
+        (
+            80000,
+            "<=",
+            34,
+            150,
+        ),  ## cuz we don't know the max value in infinity, all numbers beyond the biggest finite bucket will report the same answer
         (1000, ">", 14, 14),
         (100, ">", 33.8, 138.2),
         (7500, ">", 2.5, 2.5),
         (8000, ">", 2, 2),
-        (80000, ">", 2, 2), ## cuz we don't know the max value in infinity, all numbers beyond the biggest finite bucket will report the same answer
+        (
+            80000,
+            ">",
+            2,
+            2,
+        ),  ## cuz we don't know the max value in infinity, all numbers beyond the biggest finite bucket will report the same answer
     ],
 )
 def test_histogram_count_for_one_service(
@@ -124,10 +142,7 @@ def test_histogram_count_for_one_service(
         metric_name,
         "increase",
         "count",
-        comparisonSpaceAggregationParam={
-            "threshold": threshold,
-            "operator": operator
-        },
+        comparisonSpaceAggregationParam={"threshold": threshold, "operator": operator},
         filter_expression='service = "api"',
     )
 
@@ -140,6 +155,7 @@ def test_histogram_count_for_one_service(
     assert result_values[0]["value"] == first_value
     assert result_values[-1]["value"] == last_value
 
+
 @pytest.mark.parametrize(
     "threshold, operator, zeroth_value, first_value, last_value",
     [
@@ -147,12 +163,24 @@ def test_histogram_count_for_one_service(
         (100, "<=", 1234.5, 1.1, 6.9),
         (7500, "<=", 12345, 16.75, 74.75),
         (8000, "<=", 12345, 17, 75),
-        (80000, "<=", 12345, 17, 75), ## cuz we don't know the max value in infinity, all numbers beyond the biggest finite bucket will report the same answer
+        (
+            80000,
+            "<=",
+            12345,
+            17,
+            75,
+        ),  ## cuz we don't know the max value in infinity, all numbers beyond the biggest finite bucket will report the same answer
         (1000, ">", 0, 7, 7),
         (100, ">", 11110.5, 16.9, 69.1),
         (7500, ">", 0, 1.25, 1.25),
         (8000, ">", 0, 1, 1),
-        (80000, ">", 0, 1, 1), ## cuz we don't know the max value in infinity, all numbers beyond the biggest finite bucket will report the same answer
+        (
+            80000,
+            ">",
+            0,
+            1,
+            1,
+        ),  ## cuz we don't know the max value in infinity, all numbers beyond the biggest finite bucket will report the same answer
     ],
 )
 def test_histogram_count_for_delta_service(
@@ -184,10 +212,7 @@ def test_histogram_count_for_delta_service(
         metric_name,
         "increase",
         "count",
-        comparisonSpaceAggregationParam={
-            "threshold": threshold,
-            "operator": operator
-        },
+        comparisonSpaceAggregationParam={"threshold": threshold, "operator": operator},
         filter_expression='service = "web"',
     )
 
@@ -196,11 +221,16 @@ def test_histogram_count_for_delta_service(
 
     data = response.json()
     result_values = sorted(get_series_values(data, "A"), key=lambda x: x["timestamp"])
-    assert len(result_values) == 60 ## in delta, the value at 10:01 will also be reported
+    assert (
+        len(result_values) == 60
+    )  ## in delta, the value at 10:01 will also be reported
     assert result_values[0]["value"] == zeroth_value
-    assert result_values[1]["value"] == first_value ## to keep parallel to the cumulative test cases, first_value refers to the value at 10:02
+    assert (
+        result_values[1]["value"] == first_value
+    )  ## to keep parallel to the cumulative test cases, first_value refers to the value at 10:02
     assert result_values[-1]["value"] == last_value
 
+
 @pytest.mark.parametrize(
     "threshold, operator, zeroth_value, first_value, last_value",
     [
@@ -245,10 +275,7 @@ def test_histogram_count_for_all_services(
         metric_name,
         "increase",
         "count",
-        comparisonSpaceAggregationParam={
-            "threshold": threshold,
-            "operator": operator
-        },
+        comparisonSpaceAggregationParam={"threshold": threshold, "operator": operator},
         ## no services filter, this tests for multitemporality handling as well
     )
 
@@ -257,11 +284,16 @@ def test_histogram_count_for_all_services(
 
     data = response.json()
     result_values = sorted(get_series_values(data, "A"), key=lambda x: x["timestamp"])
-    assert len(result_values) == 60 ## in delta, the value at 10:01 will also be reported
+    assert (
+        len(result_values) == 60
+    )  ## in delta, the value at 10:01 will also be reported
     assert result_values[0]["value"] == zeroth_value
-    assert result_values[1]["value"] == first_value ## to keep parallel to the cumulative test cases, first_value refers to the value at 10:02
+    assert (
+        result_values[1]["value"] == first_value
+    )  ## to keep parallel to the cumulative test cases, first_value refers to the value at 10:02
     assert result_values[-1]["value"] == last_value
 
+
 def test_histogram_count_no_param(
     signoz: types.SigNoz,
     create_user_admin: None,  # pylint: disable=unused-argument
@@ -308,8 +340,26 @@ def test_histogram_count_no_param(
         set(le_buckets.keys()) == expected_buckets
     ), f"Expected endpoints {expected_buckets}, got {set(le_buckets.keys())}"
 
-    first_values = {"1000": 33, "1500": 36, "2000": 39, "4000": 42, "5000": 45, "6000": 48, "8000": 51, "+Inf": 54}
-    last_values = {"1000": 207, "1500": 210, "2000": 213, "4000": 216, "5000": 219, "6000": 222, "8000": 225, "+Inf": 228}
+    first_values = {
+        "1000": 33,
+        "1500": 36,
+        "2000": 39,
+        "4000": 42,
+        "5000": 45,
+        "6000": 48,
+        "8000": 51,
+        "+Inf": 54,
+    }
+    last_values = {
+        "1000": 207,
+        "1500": 210,
+        "2000": 213,
+        "4000": 216,
+        "5000": 219,
+        "6000": 222,
+        "8000": 225,
+        "+Inf": 228,
+    }
     for le, values in le_buckets.items():
         assert len(values) == 60
 
@@ -318,5 +368,7 @@ def test_histogram_count_no_param(
                 v["value"] >= 0
             ), f"Count for {le} should not be negative: {v['value']}"
         assert values[0]["value"] == 12345
-        assert values[1]["value"] == first_values[le] ## to keep parallel to the cumulative test cases, first_value refers to the value at 10:02
-        assert values[-1]["value"] == last_values[le] 
+        assert (
+            values[1]["value"] == first_values[le]
+        )  ## to keep parallel to the cumulative test cases, first_value refers to the value at 10:02
+        assert values[-1]["value"] == last_values[le]

tests/integration/src/querier/09_metrics_gauge.py

@@ -1,4 +1,3 @@
-import random
 from datetime import datetime, timedelta, timezone
 from http import HTTPStatus
 from typing import Callable, List
@@ -10,7 +9,6 @@ from fixtures.auth import USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD
 from fixtures.metrics import Metrics
 from fixtures.querier import (
     build_builder_query,
-    get_all_series,
     get_series_values,
     make_query_request,
 )
@@ -18,6 +16,7 @@ from fixtures.utils import get_testdata_file_path
 
 FILE = get_testdata_file_path("gauge_data_1h.jsonl")
 
+
 @pytest.mark.parametrize(
     "time_agg, space_agg, service, num_elements, start_val, first_val, twentieth_min_val, after_twentieth_min_val",
     [
@@ -50,7 +49,7 @@ def test_for_one_service(
     start_val: float,
     first_val: float,
     twentieth_min_val: float,
-    after_twentieth_min_val: float ## web service has a gap of 10 mins after the 20th minute
+    after_twentieth_min_val: float,  ## web service has a gap of 10 mins after the 20th minute
 ) -> None:
     now = datetime.now(tz=timezone.utc).replace(second=0, microsecond=0)
     start_ms = int((now - timedelta(minutes=65)).timestamp() * 1000)
@@ -84,6 +83,7 @@ def test_for_one_service(
     assert result_values[19]["value"] == twentieth_min_val
     assert result_values[20]["value"] == after_twentieth_min_val
 
+
 @pytest.mark.parametrize(
     "time_agg, space_agg, start_val, first_val, twentieth_min_val, twenty_first_min_val, thirty_first_min_val",
     [
@@ -105,8 +105,8 @@ def test_for_multiple_aggregations(
     start_val: float,
     first_val: float,
     twentieth_min_val: float,
-    twenty_first_min_val: float, ## web service has a gap of 10 mins after the 20th minute
-    thirty_first_min_val: float
+    twenty_first_min_val: float,  ## web service has a gap of 10 mins after the 20th minute
+    thirty_first_min_val: float,
 ) -> None:
     now = datetime.now(tz=timezone.utc).replace(second=0, microsecond=0)
     start_ms = int((now - timedelta(minutes=65)).timestamp() * 1000)
@@ -138,4 +138,4 @@ def test_for_multiple_aggregations(
     assert result_values[1]["value"] == first_val
     assert result_values[19]["value"] == twentieth_min_val
     assert result_values[20]["value"] == twenty_first_min_val
-    assert result_values[30]["value"] == thirty_first_min_val
+    assert result_values[30]["value"] == thirty_first_min_val

tests/integration/src/querier/10_metrics_rate_delta_counter.py

@@ -53,7 +53,9 @@ def test_rate_with_steady_values_and_reset(
 
     data = response.json()
     result_values = sorted(get_series_values(data, "A"), key=lambda x: x["timestamp"])
-    assert len(result_values) == 60 ## total 61 minutes covered, and 30th minute is missing
+    assert (
+        len(result_values) == 60
+    )  ## total 61 minutes covered, and 30th minute is missing
     assert (
         result_values[30]["value"] == 0.0333
     )  # reset happens and [30] is for 31st minute. 2/60 cuz delta divides by step interval
@@ -61,9 +63,7 @@ def test_rate_with_steady_values_and_reset(
         result_values[31]["value"] == 0.133
     )  # i.e 8/60 i.e 31st to 32nd minute changes
     count_of_steady_rate = sum(1 for v in result_values if v["value"] == 0.0833)
-    assert (
-        count_of_steady_rate == 58
-    )  # 1 reset + 1 high rate are excluded
+    assert count_of_steady_rate == 58  # 1 reset + 1 high rate are excluded
     # All rates should be non-negative (stale periods = 0 rate)
     for v in result_values:
         assert v["value"] >= 0, f"Rate should not be negative: {v['value']}"

tests/integration/src/querier/11_cost_meter.py

@@ -0,0 +1,110 @@
+from datetime import datetime, timedelta, timezone
+from http import HTTPStatus
+from typing import Callable, List
+
+import requests
+
+from fixtures import types
+from fixtures.auth import USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD
+from fixtures.meter import MeterSample, make_meter_samples
+from fixtures.querier import (
+    build_builder_query,
+    get_series_values,
+    make_query_request,
+)
+
+
+def test_query_range_cost_meter(
+    signoz: types.SigNoz,
+    create_user_admin: None,  # pylint: disable=unused-argument
+    get_token: Callable[[str, str], str],
+    insert_meter_samples: Callable[[List[MeterSample]], None],
+) -> None:
+    now = datetime.now(tz=timezone.utc).replace(second=0, microsecond=0)
+    start_ms = int((now - timedelta(minutes=65)).timestamp() * 1000)
+    end_ms = int(now.timestamp() * 1000)
+
+    metric_name = "signoz_cost_test_query_range"
+    labels = {"service": "test-service", "environment": "production"}
+
+    samples = make_meter_samples(
+        metric_name,
+        labels,
+        now,
+        count=60,
+        base_value=100.0,
+        temporality="Delta",
+        type_="Sum",
+        is_monotonic=True,
+    )
+    insert_meter_samples(samples)
+
+    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
+    query = build_builder_query(
+        "A",
+        metric_name,
+        "sum",
+        "sum",
+        source="meter",
+        temporality="delta",
+    )
+
+    response = make_query_request(signoz, token, start_ms, end_ms, [query])
+    assert response.status_code == HTTPStatus.OK
+
+    data = response.json()
+    result_values = get_series_values(data, "A")
+    assert len(result_values) > 0, f"Expected non-empty results, got: {data}"
+
+    for val in result_values:
+        assert val["value"] >= 0, f"Expected non-negative value, got: {val['value']}"
+
+
+def test_list_meter_metric_names(
+    signoz: types.SigNoz,
+    create_user_admin: None,  # pylint: disable=unused-argument
+    get_token: Callable[[str, str], str],
+    insert_meter_samples: Callable[[List[MeterSample]], None],
+) -> None:
+    now = datetime.now(tz=timezone.utc).replace(second=0, microsecond=0)
+    start_ms = int((now - timedelta(minutes=65)).timestamp() * 1000)
+    end_ms = int(now.timestamp() * 1000)
+
+    metric_name = "cost_test_list_metrics"
+    labels = {"service": "billing-service"}
+
+    samples = make_meter_samples(
+        metric_name,
+        labels,
+        now,
+        count=5,
+        base_value=50.0,
+        temporality="Delta",
+        type_="Sum",
+        is_monotonic=True,
+    )
+    insert_meter_samples(samples)
+
+    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
+
+    response = requests.get(
+        signoz.self.host_configs["8080"].get("/api/v2/metrics"),
+        params={
+            "start": start_ms,
+            "end": end_ms,
+            "limit": 100,
+            "searchText": "cost_test_list",
+            "source": "meter",
+        },
+        headers={"authorization": f"Bearer {token}"},
+        timeout=30,
+    )
+
+    assert response.status_code == HTTPStatus.OK
+
+    data = response.json()
+    metrics = data.get("data", {}).get("metrics", [])
+    metric_names = [m["metricName"] for m in metrics]
+    assert (
+        metric_name in metric_names
+    ), f"Expected {metric_name} in metric names, got: {metric_names}"