Merge branch 'main' into limit-for-empty-key-search

.devenv/docker/clickhouse/compose.yaml

@@ -40,7 +40,7 @@ services:
       timeout: 5s
       retries: 3
   schema-migrator-sync:
-    image: signoz/signoz-schema-migrator:v0.129.0
+    image: signoz/signoz-schema-migrator:v0.128.2
     container_name: schema-migrator-sync
     command:
       - sync
@@ -53,7 +53,7 @@ services:
         condition: service_healthy
     restart: on-failure
   schema-migrator-async:
-    image: signoz/signoz-schema-migrator:v0.129.0
+    image: signoz/signoz-schema-migrator:v0.128.2
     container_name: schema-migrator-async
     command:
       - async

.devenv/docker/signoz-otel-collector/compose.yaml

@@ -1,29 +0,0 @@
-services:
-  signoz-otel-collector:
-    image: signoz/signoz-otel-collector:v0.128.2
-    container_name: signoz-otel-collector-dev
-    command:
-      - --config=/etc/otel-collector-config.yaml
-      - --feature-gates=-pkg.translator.prometheus.NormalizeName
-    volumes:
-      - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml
-    environment:
-      - OTEL_RESOURCE_ATTRIBUTES=host.name=signoz-host,os.type=linux
-      - LOW_CARDINAL_EXCEPTION_GROUPING=false
-    ports:
-      - "4317:4317" # OTLP gRPC receiver
-      - "4318:4318" # OTLP HTTP receiver
-      - "13133:13133" # health check extension
-    healthcheck:
-      test:
-        - CMD
-        - wget
-        - --spider
-        - -q
-        - localhost:13133
-      interval: 30s
-      timeout: 5s
-      retries: 3
-    restart: unless-stopped
-    extra_hosts:
-      - "host.docker.internal:host-gateway"

.devenv/docker/signoz-otel-collector/otel-collector-config.yaml

@@ -1,96 +0,0 @@
-receivers:
-  otlp:
-    protocols:
-      grpc:
-        endpoint: 0.0.0.0:4317
-      http:
-        endpoint: 0.0.0.0:4318
-  prometheus:
-    config:
-      global:
-        scrape_interval: 60s
-      scrape_configs:
-        - job_name: otel-collector
-          static_configs:
-          - targets:
-              - localhost:8888
-            labels:
-              job_name: otel-collector
-
-processors:
-  batch:
-    send_batch_size: 10000
-    send_batch_max_size: 11000
-    timeout: 10s
-  resourcedetection:
-    # Using OTEL_RESOURCE_ATTRIBUTES envvar, env detector adds custom labels.
-    detectors: [env, system]
-    timeout: 2s
-  signozspanmetrics/delta:
-    metrics_exporter: signozclickhousemetrics
-    metrics_flush_interval: 60s
-    latency_histogram_buckets: [100us, 1ms, 2ms, 6ms, 10ms, 50ms, 100ms, 250ms, 500ms, 1000ms, 1400ms, 2000ms, 5s, 10s, 20s, 40s, 60s ]
-    dimensions_cache_size: 100000
-    aggregation_temporality: AGGREGATION_TEMPORALITY_DELTA
-    enable_exp_histogram: true
-    dimensions:
-      - name: service.namespace
-        default: default
-      - name: deployment.environment
-        default: default
-      # This is added to ensure the uniqueness of the timeseries
-      # Otherwise, identical timeseries produced by multiple replicas of
-      # collectors result in incorrect APM metrics
-      - name: signoz.collector.id
-      - name: service.version
-      - name: browser.platform
-      - name: browser.mobile
-      - name: k8s.cluster.name
-      - name: k8s.node.name
-      - name: k8s.namespace.name
-      - name: host.name
-      - name: host.type
-      - name: container.name
-
-extensions:
-  health_check:
-    endpoint: 0.0.0.0:13133
-  pprof:
-    endpoint: 0.0.0.0:1777
-
-exporters:
-  clickhousetraces:
-    datasource: tcp://host.docker.internal:9000/signoz_traces
-    low_cardinal_exception_grouping: ${env:LOW_CARDINAL_EXCEPTION_GROUPING}
-    use_new_schema: true
-  signozclickhousemetrics:
-    dsn: tcp://host.docker.internal:9000/signoz_metrics
-  clickhouselogsexporter:
-    dsn: tcp://host.docker.internal:9000/signoz_logs
-    timeout: 10s
-    use_new_schema: true
-
-service:
-  telemetry:
-    logs:
-      encoding: json
-  extensions:
-    - health_check
-    - pprof
-  pipelines:
-    traces:
-      receivers: [otlp]
-      processors: [signozspanmetrics/delta, batch]
-      exporters: [clickhousetraces]
-    metrics:
-      receivers: [otlp]
-      processors: [batch]
-      exporters: [signozclickhousemetrics]
-    metrics/prometheus:
-      receivers: [prometheus]
-      processors: [batch]
-      exporters: [signozclickhousemetrics]
-    logs:
-      receivers: [otlp]
-      processors: [batch]
-      exporters: [clickhouselogsexporter]

Makefile

@@ -61,17 +61,6 @@ devenv-postgres: ## Run postgres in devenv
 	@cd .devenv/docker/postgres; \
 	docker compose -f compose.yaml up -d
 
-.PHONY: devenv-signoz-otel-collector
-devenv-signoz-otel-collector: ## Run signoz-otel-collector in devenv (requires clickhouse to be running)
-	@cd .devenv/docker/signoz-otel-collector; \
-	docker compose -f compose.yaml up -d
-
-.PHONY: devenv-up
-devenv-up: devenv-clickhouse devenv-signoz-otel-collector ## Start both clickhouse and signoz-otel-collector for local development
-	@echo "Development environment is ready!"
-	@echo "   - ClickHouse: http://localhost:8123"
-	@echo "   - Signoz OTel Collector: grpc://localhost:4317, http://localhost:4318"
-
 ##############################################################
 # go commands
 ##############################################################

conf/example.yaml

@@ -122,7 +122,6 @@ telemetrystore:
       max_bytes_to_read: 0
       max_result_rows: 0
       ignore_data_skipping_indices: ""
-      secondary_indices_enable_bulk_filtering: false
 
 ##################### Prometheus #####################
 prometheus:

deploy/docker-swarm/docker-compose.ha.yaml

@@ -174,7 +174,7 @@ services:
       # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
   signoz:
     !!merge <<: *db-depend
-    image: signoz/signoz:v0.92.1
+    image: signoz/signoz:v0.91.0
     command:
       - --config=/root/config/prometheus.yml
     ports:
@@ -207,7 +207,7 @@ services:
       retries: 3
   otel-collector:
     !!merge <<: *db-depend
-    image: signoz/signoz-otel-collector:v0.129.0
+    image: signoz/signoz-otel-collector:v0.128.2
     command:
       - --config=/etc/otel-collector-config.yaml
       - --manager-config=/etc/manager-config.yaml
@@ -231,7 +231,7 @@ services:
       - signoz
   schema-migrator:
     !!merge <<: *common
-    image: signoz/signoz-schema-migrator:v0.129.0
+    image: signoz/signoz-schema-migrator:v0.128.2
     deploy:
       restart_policy:
         condition: on-failure

deploy/docker-swarm/docker-compose.yaml

@@ -115,7 +115,7 @@ services:
       # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
   signoz:
     !!merge <<: *db-depend
-    image: signoz/signoz:v0.92.1
+    image: signoz/signoz:v0.91.0
     command:
       - --config=/root/config/prometheus.yml
     ports:
@@ -148,7 +148,7 @@ services:
       retries: 3
   otel-collector:
     !!merge <<: *db-depend
-    image: signoz/signoz-otel-collector:v0.129.0
+    image: signoz/signoz-otel-collector:v0.128.2
     command:
       - --config=/etc/otel-collector-config.yaml
       - --manager-config=/etc/manager-config.yaml
@@ -174,7 +174,7 @@ services:
       - signoz
   schema-migrator:
     !!merge <<: *common
-    image: signoz/signoz-schema-migrator:v0.129.0
+    image: signoz/signoz-schema-migrator:v0.128.2
     deploy:
       restart_policy:
         condition: on-failure

deploy/docker/docker-compose.ha.yaml

@@ -177,7 +177,7 @@ services:
       # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
   signoz:
     !!merge <<: *db-depend
-    image: signoz/signoz:${VERSION:-v0.92.1}
+    image: signoz/signoz:${VERSION:-v0.91.0}
     container_name: signoz
     command:
       - --config=/root/config/prometheus.yml
@@ -211,7 +211,7 @@ services:
   # TODO: support otel-collector multiple replicas. Nginx/Traefik for loadbalancing?
   otel-collector:
     !!merge <<: *db-depend
-    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.129.0}
+    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.128.2}
     container_name: signoz-otel-collector
     command:
       - --config=/etc/otel-collector-config.yaml
@@ -237,7 +237,7 @@ services:
         condition: service_healthy
   schema-migrator-sync:
     !!merge <<: *common
-    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.129.0}
+    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.128.2}
     container_name: schema-migrator-sync
     command:
       - sync
@@ -248,7 +248,7 @@ services:
         condition: service_healthy
   schema-migrator-async:
     !!merge <<: *db-depend
-    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.129.0}
+    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.128.2}
     container_name: schema-migrator-async
     command:
       - async

deploy/docker/docker-compose.yaml

@@ -110,7 +110,7 @@ services:
       # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
   signoz:
     !!merge <<: *db-depend
-    image: signoz/signoz:${VERSION:-v0.92.1}
+    image: signoz/signoz:${VERSION:-v0.91.0}
     container_name: signoz
     command:
       - --config=/root/config/prometheus.yml
@@ -143,7 +143,7 @@ services:
       retries: 3
   otel-collector:
     !!merge <<: *db-depend
-    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.129.0}
+    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.128.2}
     container_name: signoz-otel-collector
     command:
       - --config=/etc/otel-collector-config.yaml
@@ -165,7 +165,7 @@ services:
         condition: service_healthy
   schema-migrator-sync:
     !!merge <<: *common
-    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.129.0}
+    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.128.2}
     container_name: schema-migrator-sync
     command:
       - sync
@@ -177,7 +177,7 @@ services:
     restart: on-failure
   schema-migrator-async:
     !!merge <<: *db-depend
-    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.129.0}
+    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.128.2}
     container_name: schema-migrator-async
     command:
       - async

docs/contributing/development.md

@@ -44,35 +44,20 @@ Before diving in, make sure you have these tools installed:
 
 SigNoz has three main components: Clickhouse, Backend, and Frontend. Let's set them up one by one.
 
-### 1. Setting up ClickHouse
+### 1. Setting up Clickhouse
 
-First, we need to get ClickHouse running:
+First, we need to get Clickhouse running:
 
 ```bash
 make devenv-clickhouse
 ```
 
 This command:
-- Starts ClickHouse in a single-shard, single-replica cluster
+- Starts Clickhouse in a single-shard, single-replica cluster
 - Sets up Zookeeper
 - Runs the latest schema migrations
 
-### 2. Setting up SigNoz OpenTelemetry Collector
-
-Next, start the OpenTelemetry Collector to receive telemetry data:
-
-```bash
-make devenv-signoz-otel-collector
-```
-
-This command:
-- Starts the SigNoz OpenTelemetry Collector
-- Listens on port 4317 (gRPC) and 4318 (HTTP) for incoming telemetry data
-- Forwards data to ClickHouse for storage
-
-> 💡 **Quick Setup**: Use `make devenv-up` to start both ClickHouse and OTel Collector together
-
-### 3. Starting the Backend
+### 2. Starting the Backend
 
 1. Run the backend server:
    ```bash
@@ -88,7 +73,7 @@ This command:
 
 > 💡 **Tip**: The API server runs at `http://localhost:8080/` by default
 
-### 4. Setting up the Frontend
+### 3. Setting up the Frontend
 
 1. Navigate to the frontend directory:
    ```bash
@@ -113,25 +98,3 @@ This command:
 > 💡 **Tip**: `yarn dev` will automatically rebuild when you make changes to the code
 
 Now you're all set to start developing! Happy coding! 🎉
-
-## Verifying Your Setup
-To verify everything is working correctly:
-
-1. **Check ClickHouse**: `curl http://localhost:8123/ping` (should return "Ok.")
-2. **Check OTel Collector**: `curl http://localhost:13133` (should return health status)
-3. **Check Backend**: `curl http://localhost:8080/api/v1/health` (should return `{"status":"ok"}`)
-4. **Check Frontend**: Open `http://localhost:3301` in your browser
-
-## How to send test data?
-
-You can now send telemetry data to your local SigNoz instance:
-
-- **OTLP gRPC**: `localhost:4317`
-- **OTLP HTTP**: `localhost:4318`
-
-For example, using `curl` to send a test trace:
-```bash
-curl -X POST http://localhost:4318/v1/traces \
-  -H "Content-Type: application/json" \
-  -d '{"resourceSpans":[{"resource":{"attributes":[{"key":"service.name","value":{"stringValue":"test-service"}}]},"scopeSpans":[{"spans":[{"traceId":"12345678901234567890123456789012","spanId":"1234567890123456","name":"test-span","startTimeUnixNano":"1609459200000000000","endTimeUnixNano":"1609459201000000000"}]}]}]}'
-```

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

@@ -46,8 +46,5 @@
 	"ALERT_HISTORY": "SigNoz | Alert Rule History",
 	"ALERT_OVERVIEW": "SigNoz | Alert Rule Overview",
 	"INFRASTRUCTURE_MONITORING_HOSTS": "SigNoz | Infra Monitoring",
-	"INFRASTRUCTURE_MONITORING_KUBERNETES": "SigNoz | Infra Monitoring",
-	"METER_EXPLORER": "SigNoz | Meter Explorer",
-	"METER_EXPLORER_VIEWS": "SigNoz | Meter Explorer",
-	"METER_EXPLORER_BASE": "SigNoz | Meter Explorer"
+	"INFRASTRUCTURE_MONITORING_KUBERNETES": "SigNoz | Infra Monitoring"
 }

frontend/public/locales/en/titles.json

@@ -69,8 +69,5 @@
 	"METRICS_EXPLORER": "SigNoz | Metrics Explorer",
 	"METRICS_EXPLORER_EXPLORER": "SigNoz | Metrics Explorer",
 	"METRICS_EXPLORER_VIEWS": "SigNoz | Metrics Explorer",
-	"API_MONITORING": "SigNoz | External APIs",
-	"METER_EXPLORER": "SigNoz | Meter Explorer",
-	"METER_EXPLORER_VIEWS": "SigNoz | Meter Explorer",
-	"METER_EXPLORER_BASE": "SigNoz | Meter Explorer"
+	"API_MONITORING": "SigNoz | External APIs"
 }

frontend/src/AppRoutes/routes.ts

@@ -1,6 +1,5 @@
 import ROUTES from 'constants/routes';
 import MessagingQueues from 'pages/MessagingQueues';
-import MeterExplorer from 'pages/MeterExplorer';
 import { RouteProps } from 'react-router-dom';
 
 import {
@@ -435,28 +434,6 @@ const routes: AppRoutes[] = [
 		key: 'METRICS_EXPLORER_VIEWS',
 		isPrivate: true,
 	},
-
-	{
-		path: ROUTES.METER_EXPLORER_BASE,
-		exact: true,
-		component: MeterExplorer,
-		key: 'METER_EXPLORER_BASE',
-		isPrivate: true,
-	},
-	{
-		path: ROUTES.METER_EXPLORER,
-		exact: true,
-		component: MeterExplorer,
-		key: 'METER_EXPLORER',
-		isPrivate: true,
-	},
-	{
-		path: ROUTES.METER_EXPLORER_VIEWS,
-		exact: true,
-		component: MeterExplorer,
-		key: 'METER_EXPLORER_VIEWS',
-		isPrivate: true,
-	},
 	{
 		path: ROUTES.API_MONITORING,
 		exact: true,

frontend/src/api/queryBuilder/getAggregateAttribute.ts

@@ -17,7 +17,6 @@ export const getAggregateAttribute = async ({
 	aggregateOperator,
 	searchText,
 	dataSource,
-	source,
 }: IGetAggregateAttributePayload): Promise<
 	SuccessResponse<IQueryAutocompleteResponse> | ErrorResponse
 > => {
@@ -28,7 +27,7 @@ export const getAggregateAttribute = async ({
 			`/autocomplete/aggregate_attributes?${createQueryParams({
 				aggregateOperator,
 				searchText,
-				dataSource: source === 'meter' ? 'meter' : dataSource,
+				dataSource,
 			})}`,
 		);
 

frontend/src/api/querySuggestions/getKeySuggestions.ts

@@ -14,7 +14,6 @@ export const getKeySuggestions = (
 		metricName = '',
 		fieldContext = '',
 		fieldDataType = '',
-		signalSource = '',
 	} = props;
 
 	const encodedSignal = encodeURIComponent(signal);
@@ -22,9 +21,8 @@ export const getKeySuggestions = (
 	const encodedMetricName = encodeURIComponent(metricName);
 	const encodedFieldContext = encodeURIComponent(fieldContext);
 	const encodedFieldDataType = encodeURIComponent(fieldDataType);
-	const encodedSource = encodeURIComponent(signalSource);
 
 	return axios.get(
-		`/fields/keys?signal=${encodedSignal}&searchText=${encodedSearchText}&metricName=${encodedMetricName}&fieldContext=${encodedFieldContext}&fieldDataType=${encodedFieldDataType}&source=${encodedSource}`,
+		`/fields/keys?signal=${encodedSignal}&searchText=${encodedSearchText}&metricName=${encodedMetricName}&fieldContext=${encodedFieldContext}&fieldDataType=${encodedFieldDataType}`,
 	);
 };

frontend/src/api/querySuggestions/getValueSuggestion.ts

@@ -8,15 +8,13 @@ import {
 export const getValueSuggestions = (
 	props: QueryKeyValueRequestProps,
 ): Promise<AxiosResponse<QueryKeyValueSuggestionsResponseProps>> => {
-	const { signal, key, searchText, signalSource, metricName } = props;
+	const { signal, key, searchText } = props;
 
 	const encodedSignal = encodeURIComponent(signal);
 	const encodedKey = encodeURIComponent(key);
-	const encodedMetricName = encodeURIComponent(metricName || '');
 	const encodedSearchText = encodeURIComponent(searchText);
-	const encodedSource = encodeURIComponent(signalSource || '');
 
 	return axios.get(
-		`/fields/values?signal=${encodedSignal}&name=${encodedKey}&searchText=${encodedSearchText}&metricName=${encodedMetricName}&source=${encodedSource}`,
+		`/fields/values?signal=${encodedSignal}&name=${encodedKey}&searchText=${encodedSearchText}`,
 	);
 };

frontend/src/api/saveView/getAllViews.ts

@@ -4,6 +4,6 @@ import { AllViewsProps } from 'types/api/saveViews/types';
 import { DataSource } from 'types/common/queryBuilder';
 
 export const getAllViews = (
-	sourcepage: DataSource | 'meter',
+	sourcepage: DataSource,
 ): Promise<AxiosResponse<AllViewsProps>> =>
 	axios.get(`/explorer/views?sourcePage=${sourcepage}`);

frontend/src/api/v5/queryRange/prepareQueryRangePayloadV5.ts

@@ -260,7 +260,6 @@ export function convertBuilderQueriesToV5(
 					spec = {
 						name: queryName,
 						signal: 'metrics' as const,
-						source: queryData.source || '',
 						...baseSpec,
 						aggregations: aggregations as MetricAggregation[],
 						// reduceTo: queryData.reduceTo,

frontend/src/components/PanelDataLoading/PanelDataLoading.styles.scss

@@ -1,19 +0,0 @@
-.loading-panel-data {
-	padding: 24px 0;
-	height: 240px;
-
-	display: flex;
-	justify-content: center;
-	align-items: flex-start;
-
-	.loading-panel-data-content {
-		display: flex;
-		align-items: flex-start;
-		flex-direction: column;
-
-		.loading-gif {
-			height: 72px;
-			margin-left: -24px;
-		}
-	}
-}

frontend/src/components/PanelDataLoading/PanelDataLoading.tsx

@@ -1,19 +0,0 @@
-import './PanelDataLoading.styles.scss';
-
-import { Typography } from 'antd';
-
-export function PanelDataLoading(): JSX.Element {
-	return (
-		<div className="loading-panel-data">
-			<div className="loading-panel-data-content">
-				<img
-					className="loading-gif"
-					src="/Icons/loading-plane.gif"
-					alt="wait-icon"
-				/>
-
-				<Typography.Text>Fetching data...</Typography.Text>
-			</div>
-		</div>
-	);
-}

frontend/src/components/QueryBuilderV2/QueryBuilderV2.tsx

@@ -131,7 +131,6 @@ export const QueryBuilderV2 = memo(function QueryBuilderV2({
 								queryVariant={config?.queryVariant || 'dropdown'}
 								showOnlyWhereClause={showOnlyWhereClause}
 								isListViewPanel={isListViewPanel}
-								signalSource={config?.signalSource || ''}
 							/>
 						))}
 

frontend/src/components/QueryBuilderV2/QueryV2/MerticsAggregateSection/MetricsAggregateSection.tsx

@@ -18,13 +18,11 @@ const MetricsAggregateSection = memo(function MetricsAggregateSection({
 	index,
 	version,
 	panelType,
-	signalSource = '',
 }: {
 	query: IBuilderQuery;
 	index: number;
 	version: string;
 	panelType: PANEL_TYPES | null;
-	signalSource: string;
 }): JSX.Element {
 	const { setAggregationOptions } = useQueryBuilderV2Context();
 	const {
@@ -210,7 +208,6 @@ const MetricsAggregateSection = memo(function MetricsAggregateSection({
 										disabled={!queryAggregation.metricName}
 										query={query}
 										onChange={handleChangeGroupByKeys}
-										signalSource={signalSource}
 									/>
 								</div>
 							</div>
@@ -247,7 +244,6 @@ const MetricsAggregateSection = memo(function MetricsAggregateSection({
 									disabled={!queryAggregation.metricName}
 									query={query}
 									onChange={handleChangeGroupByKeys}
-									signalSource={signalSource}
 								/>
 							</div>
 						</div>

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

@@ -9,12 +9,10 @@ export const MetricsSelect = memo(function MetricsSelect({
 	query,
 	index,
 	version,
-	signalSource,
 }: {
 	query: IBuilderQuery;
 	index: number;
 	version: string;
-	signalSource: 'meter' | '';
 }): JSX.Element {
 	const { handleChangeAggregatorAttribute } = useQueryOperations({
 		index,
@@ -28,7 +26,6 @@ export const MetricsSelect = memo(function MetricsSelect({
 				onChange={handleChangeAggregatorAttribute}
 				query={query}
 				index={index}
-				signalSource={signalSource || ''}
 			/>
 		</div>
 	);

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

@@ -81,12 +81,10 @@ function QuerySearch({
 	queryData,
 	dataSource,
 	onRun,
-	signalSource,
 }: {
 	onChange: (value: string) => void;
 	queryData: IBuilderQuery;
 	dataSource: DataSource;
-	signalSource?: string;
 	onRun?: (query: string) => void;
 }): JSX.Element {
 	const isDarkMode = useIsDarkMode();
@@ -220,7 +218,6 @@ function QuerySearch({
 				signal: dataSource,
 				searchText: searchText || '',
 				metricName: debouncedMetricName ?? undefined,
-				signalSource: signalSource as 'meter' | '',
 			});
 
 			if (response.data.data) {
@@ -248,7 +245,6 @@ function QuerySearch({
 			keySuggestions,
 			toggleSuggestions,
 			queryData.aggregateAttribute?.key,
-			signalSource,
 		],
 	);
 
@@ -382,8 +378,6 @@ function QuerySearch({
 					key,
 					searchText: sanitizedSearchText,
 					signal: dataSource,
-					signalSource: signalSource as 'meter' | '',
-					metricName: debouncedMetricName ?? undefined,
 				});
 
 				// Skip updates if component unmounted or key changed
@@ -471,14 +465,8 @@ function QuerySearch({
 				setIsFetchingCompleteValuesList(false);
 			}
 		},
-		[
-			activeKey,
-			dataSource,
-			isLoadingSuggestions,
-			debouncedMetricName,
-			signalSource,
-			toggleSuggestions,
-		],
+		// eslint-disable-next-line react-hooks/exhaustive-deps
+		[activeKey, dataSource, isFocused],
 	);
 
 	const debouncedFetchValueSuggestions = useMemo(
@@ -1452,7 +1440,6 @@ function QuerySearch({
 
 QuerySearch.defaultProps = {
 	onRun: undefined,
-	signalSource: '',
 };
 
 export default QuerySearch;

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

@@ -28,7 +28,6 @@ export const QueryV2 = memo(function QueryV2({
 	isListViewPanel = false,
 	version,
 	showOnlyWhereClause = false,
-	signalSource = '',
 }: QueryProps & { ref: React.RefObject<HTMLDivElement> }): JSX.Element {
 	const { cloneQuery, panelType } = useQueryBuilder();
 
@@ -176,7 +175,6 @@ export const QueryV2 = memo(function QueryV2({
 										query={query}
 										index={index}
 										version={ENTITY_VERSION_V5}
-										signalSource={signalSource as 'meter' | ''}
 									/>
 								</div>
 							)}
@@ -188,7 +186,6 @@ export const QueryV2 = memo(function QueryV2({
 										onChange={handleSearchChange}
 										queryData={query}
 										dataSource={dataSource}
-										signalSource={signalSource}
 									/>
 								</div>
 
@@ -221,7 +218,6 @@ export const QueryV2 = memo(function QueryV2({
 								index={index}
 								key={`metrics-aggregate-section-${query.queryName}-${query.dataSource}`}
 								version="v4"
-								signalSource={signalSource as 'meter' | ''}
 							/>
 						)}
 

frontend/src/components/QuickFilters/FilterRenderers/Checkbox/Checkbox.tsx

@@ -17,7 +17,6 @@ import { DEBOUNCE_DELAY } from 'constants/queryBuilderFilterConfig';
 import { getOperatorValue } from 'container/QueryBuilder/filters/QueryBuilderSearch/utils';
 import { useGetAggregateValues } from 'hooks/queryBuilder/useGetAggregateValues';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
-import { useGetQueryKeyValueSuggestions } from 'hooks/querySuggestions/useGetQueryKeyValueSuggestions';
 import useDebouncedFn from 'hooks/useDebouncedFunction';
 import { cloneDeep, isArray, isEqual, isFunction } from 'lodash-es';
 import { ChevronDown, ChevronRight } from 'lucide-react';
@@ -74,59 +73,18 @@ export default function CheckboxFilter(props: ICheckboxProps): JSX.Element {
 			searchText: searchText ?? '',
 		},
 		{
-			enabled: isOpen && source !== QuickFiltersSource.METER_EXPLORER,
+			enabled: isOpen,
 			keepPreviousData: true,
 		},
 	);
 
-	const {
-		data: keyValueSuggestions,
-		isLoading: isLoadingKeyValueSuggestions,
-	} = useGetQueryKeyValueSuggestions({
-		key: filter.attributeKey.key,
-		signal: filter.dataSource || DataSource.LOGS,
-		signalSource: 'meter',
-		options: {
-			enabled: isOpen && source === QuickFiltersSource.METER_EXPLORER,
-			keepPreviousData: true,
-		},
-	});
-
 	const attributeValues: string[] = useMemo(() => {
 		const dataType = filter.attributeKey.dataType || DataTypes.String;
-
-		if (source === QuickFiltersSource.METER_EXPLORER && keyValueSuggestions) {
-			// Process the response data
-			const responseData = keyValueSuggestions?.data as any;
-			const values = responseData.data?.values || {};
-			const stringValues = values.stringValues || [];
-			const numberValues = values.numberValues || [];
-
-			// Generate options from string values - explicitly handle empty strings
-			const stringOptions = stringValues
-				// Strict filtering for empty string - we'll handle it as a special case if needed
-				.filter(
-					(value: string | null | undefined): value is string =>
-						value !== null && value !== undefined && value !== '',
-				);
-
-			// Generate options from number values
-			const numberOptions = numberValues
-				.filter(
-					(value: number | null | undefined): value is number =>
-						value !== null && value !== undefined,
-				)
-				.map((value: number) => value.toString());
-
-			// Combine all options and make sure we don't have duplicate labels
-			return [...stringOptions, ...numberOptions];
-		}
-
 		const key = DATA_TYPE_VS_ATTRIBUTE_VALUES_KEY[dataType];
 		return (data?.payload?.[key] || []).filter(
 			(val) => val !== undefined && val !== null,
 		);
-	}, [data?.payload, filter.attributeKey.dataType, keyValueSuggestions, source]);
+	}, [data?.payload, filter.attributeKey.dataType]);
 
 	const currentAttributeKeys = attributeValues.slice(0, visibleItemsCount);
 
@@ -520,14 +478,12 @@ export default function CheckboxFilter(props: ICheckboxProps): JSX.Element {
 					)}
 				</section>
 			</section>
-			{isOpen &&
-				(isLoading || isLoadingKeyValueSuggestions) &&
-				!attributeValues.length && (
-					<section className="loading">
-						<Skeleton paragraph={{ rows: 4 }} />
-					</section>
-				)}
-			{isOpen && !isLoading && !isLoadingKeyValueSuggestions && (
+			{isOpen && isLoading && !attributeValues.length && (
+				<section className="loading">
+					<Skeleton paragraph={{ rows: 4 }} />
+				</section>
+			)}
+			{isOpen && !isLoading && (
 				<>
 					{!isEmptyStateWithDocsEnabled && (
 						<section className="search">

frontend/src/components/QuickFilters/QuickFilters.styles.scss

@@ -1,8 +1,6 @@
 .quick-filters-container {
 	display: flex;
 	height: 100%;
-	position: relative;
-
 	.quick-filters-settings-container {
 		position: relative;
 	}
@@ -104,37 +102,6 @@
 			margin: 8px 12px;
 		}
 	}
-
-	.no-filters-container {
-		display: flex;
-		height: 100%;
-		gap: 8px;
-		align-items: center;
-		padding: 8px;
-	}
-}
-
-.perilin-bg {
-	position: absolute;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-
-	background: radial-gradient(circle, #fff 10%, transparent 0);
-	background-size: 12px 12px;
-	opacity: 1;
-
-	mask-image: radial-gradient(
-		circle at 50% 0,
-		rgba(11, 12, 14, 0.1) 0,
-		rgba(11, 12, 14, 0) 100%
-	);
-	-webkit-mask-image: radial-gradient(
-		circle at 50% 0,
-		rgba(11, 12, 14, 0.1) 0,
-		rgba(11, 12, 14, 0) 100%
-	);
 }
 
 .lightMode {

frontend/src/components/QuickFilters/QuickFilters.tsx

@@ -15,7 +15,7 @@ import { LOCALSTORAGE } from 'constants/localStorage';
 import { useApiMonitoringParams } from 'container/ApiMonitoring/queryParams';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import { cloneDeep, isFunction, isNull } from 'lodash-es';
-import { Frown, Settings2 as SettingsIcon } from 'lucide-react';
+import { Settings2 as SettingsIcon } from 'lucide-react';
 import { useAppContext } from 'providers/App/App';
 import { useMemo, useState } from 'react';
 import { Query } from 'types/api/queryBuilder/queryBuilderData';
@@ -236,13 +236,6 @@ export default function QuickFilters(props: IQuickFiltersProps): JSX.Element {
 											);
 									}
 								})}
-
-								{filterConfig.length === 0 && (
-									<div className="no-filters-container">
-										<Frown size={16} />
-										<Typography.Text>No filters found</Typography.Text>
-									</div>
-								)}
 							</section>
 						</>
 					</OverlayScrollbar>

frontend/src/components/QuickFilters/QuickFiltersSettings/constants.ts

@@ -6,5 +6,4 @@ export const SIGNAL_DATA_SOURCE_MAP = {
 	[SignalType.TRACES]: DataSource.TRACES,
 	[SignalType.EXCEPTIONS]: DataSource.TRACES,
 	[SignalType.API_MONITORING]: DataSource.TRACES,
-	[SignalType.METER_EXPLORER]: DataSource.METRICS,
 };

frontend/src/components/QuickFilters/tests/QuickFilters.test.tsx

@@ -54,7 +54,6 @@ const quickFiltersListURL = `${BASE_URL}/api/v1/orgs/me/filters/${SIGNAL}`;
 const saveQuickFiltersURL = `${BASE_URL}/api/v1/orgs/me/filters`;
 const quickFiltersSuggestionsURL = `${BASE_URL}/api/v3/filter_suggestions`;
 const quickFiltersAttributeValuesURL = `${BASE_URL}/api/v3/autocomplete/attribute_values`;
-const fieldsValuesURL = `${BASE_URL}/api/v1/fields/values`;
 
 const FILTER_OS_DESCRIPTION = 'os.description';
 const FILTER_K8S_DEPLOYMENT_NAME = 'k8s.deployment.name';
@@ -78,11 +77,7 @@ const setupServer = (): void => {
 			putHandler(await req.json());
 			return res(ctx.status(200), ctx.json({}));
 		}),
-
-		rest.get(quickFiltersAttributeValuesURL, (req, res, ctx) =>
-			res(ctx.status(200), ctx.json(quickFiltersAttributeValuesResponse)),
-		),
-		rest.get(fieldsValuesURL, (req, res, ctx) =>
+		rest.get(quickFiltersAttributeValuesURL, (_, res, ctx) =>
 			res(ctx.status(200), ctx.json(quickFiltersAttributeValuesResponse)),
 		),
 	);

frontend/src/components/QuickFilters/types.ts

@@ -23,7 +23,6 @@ export enum SignalType {
 	LOGS = 'logs',
 	API_MONITORING = 'api_monitoring',
 	EXCEPTIONS = 'exceptions',
-	METER_EXPLORER = 'meter',
 }
 
 export interface IQuickFiltersConfig {
@@ -54,5 +53,4 @@ export enum QuickFiltersSource {
 	TRACES_EXPLORER = 'traces-explorer',
 	API_MONITORING = 'api-monitoring',
 	EXCEPTIONS = 'exceptions',
-	METER_EXPLORER = 'meter',
 }

frontend/src/constants/queryBuilder.ts

@@ -23,7 +23,6 @@ import {
 	BoolOperators,
 	DataSource,
 	LogsAggregatorOperator,
-	MeterAggregateOperator,
 	MetricAggregateOperator,
 	NumberOperators,
 	QueryAdditionalFilter,
@@ -37,7 +36,6 @@ import { v4 as uuid } from 'uuid';
 
 import {
 	logsAggregateOperatorOptions,
-	meterAggregateOperatorOptions,
 	metricAggregateOperatorOptions,
 	metricsGaugeAggregateOperatorOptions,
 	metricsGaugeSpaceAggregateOperatorOptions,
@@ -81,7 +79,6 @@ export const mapOfOperators = {
 	metrics: metricAggregateOperatorOptions,
 	logs: logsAggregateOperatorOptions,
 	traces: tracesAggregateOperatorOptions,
-	meter: meterAggregateOperatorOptions,
 };
 
 export const metricsOperatorsByType = {
@@ -196,7 +193,6 @@ export const initialQueryBuilderFormValues: IBuilderQuery = {
 	groupBy: [],
 	legend: '',
 	reduceTo: 'avg',
-	source: '',
 };
 
 const initialQueryBuilderFormLogsValues: IBuilderQuery = {
@@ -213,39 +209,6 @@ const initialQueryBuilderFormTracesValues: IBuilderQuery = {
 	dataSource: DataSource.TRACES,
 };
 
-export const initialQueryBuilderFormMeterValues: IBuilderQuery = {
-	dataSource: DataSource.METRICS,
-	queryName: createNewBuilderItemName({ existNames: [], sourceNames: alphabet }),
-	aggregateOperator: MeterAggregateOperator.COUNT,
-	aggregateAttribute: initialAutocompleteData,
-	timeAggregation: MeterAggregateOperator.RATE,
-	spaceAggregation: MeterAggregateOperator.SUM,
-	filter: { expression: '' },
-	aggregations: [
-		{
-			metricName: '',
-			temporality: '',
-			timeAggregation: MeterAggregateOperator.COUNT,
-			spaceAggregation: MeterAggregateOperator.SUM,
-			reduceTo: 'avg',
-		},
-	],
-	functions: [],
-	filters: { items: [], op: 'AND' },
-	expression: createNewBuilderItemName({
-		existNames: [],
-		sourceNames: alphabet,
-	}),
-	disabled: false,
-	stepInterval: undefined,
-	having: [],
-	limit: null,
-	orderBy: [],
-	groupBy: [],
-	legend: '',
-	reduceTo: 'avg',
-};
-
 export const initialQueryBuilderFormValuesMap: Record<
 	DataSource,
 	IBuilderQuery
@@ -322,19 +285,6 @@ export const initialQueriesMap: Record<DataSource, Query> = {
 	traces: initialQueryTracesWithType,
 };
 
-export const initialQueryMeterWithType: Query = {
-	...initialQueryWithType,
-	builder: {
-		...initialQueryWithType.builder,
-		queryData: [
-			{
-				...initialQueryBuilderFormValuesMap.metrics,
-				source: 'meter',
-			},
-		],
-	},
-};
-
 export const operatorsByTypes: Record<LocalDataType, string[]> = {
 	string: Object.values(StringOperators),
 	number: Object.values(NumberOperators),

frontend/src/constants/queryBuilderOperators.ts

@@ -125,126 +125,6 @@ export const metricAggregateOperatorOptions: SelectOption<string, string>[] = [
 	},
 ];
 
-export const meterAggregateOperatorOptions: SelectOption<string, string>[] = [
-	{
-		value: MetricAggregateOperator.COUNT,
-		label: 'Count',
-	},
-	{
-		value: MetricAggregateOperator.COUNT_DISTINCT,
-		// eslint-disable-next-line sonarjs/no-duplicate-string
-		label: 'Count Distinct',
-	},
-	{
-		value: MetricAggregateOperator.SUM,
-		label: 'Sum',
-	},
-	{
-		value: MetricAggregateOperator.AVG,
-		label: 'Avg',
-	},
-	{
-		value: MetricAggregateOperator.MAX,
-		label: 'Max',
-	},
-	{
-		value: MetricAggregateOperator.MIN,
-		label: 'Min',
-	},
-	{
-		value: MetricAggregateOperator.P05,
-		label: 'P05',
-	},
-	{
-		value: MetricAggregateOperator.P10,
-		label: 'P10',
-	},
-	{
-		value: MetricAggregateOperator.P20,
-		label: 'P20',
-	},
-	{
-		value: MetricAggregateOperator.P25,
-		label: 'P25',
-	},
-	{
-		value: MetricAggregateOperator.P50,
-		label: 'P50',
-	},
-	{
-		value: MetricAggregateOperator.P75,
-		label: 'P75',
-	},
-	{
-		value: MetricAggregateOperator.P90,
-		label: 'P90',
-	},
-	{
-		value: MetricAggregateOperator.P95,
-		label: 'P95',
-	},
-	{
-		value: MetricAggregateOperator.P99,
-		label: 'P99',
-	},
-	{
-		value: MetricAggregateOperator.RATE,
-		label: 'Rate',
-	},
-	{
-		value: MetricAggregateOperator.SUM_RATE,
-		label: 'Sum_rate',
-	},
-	{
-		value: MetricAggregateOperator.AVG_RATE,
-		label: 'Avg_rate',
-	},
-	{
-		value: MetricAggregateOperator.MAX_RATE,
-		label: 'Max_rate',
-	},
-	{
-		value: MetricAggregateOperator.MIN_RATE,
-		label: 'Min_rate',
-	},
-	{
-		value: MetricAggregateOperator.RATE_SUM,
-		label: 'Rate_sum',
-	},
-	{
-		value: MetricAggregateOperator.RATE_AVG,
-		label: 'Rate_avg',
-	},
-	{
-		value: MetricAggregateOperator.RATE_MIN,
-		label: 'Rate_min',
-	},
-	{
-		value: MetricAggregateOperator.RATE_MAX,
-		label: 'Rate_max',
-	},
-	{
-		value: MetricAggregateOperator.HIST_QUANTILE_50,
-		label: 'Hist_quantile_50',
-	},
-	{
-		value: MetricAggregateOperator.HIST_QUANTILE_75,
-		label: 'Hist_quantile_75',
-	},
-	{
-		value: MetricAggregateOperator.HIST_QUANTILE_90,
-		label: 'Hist_quantile_90',
-	},
-	{
-		value: MetricAggregateOperator.HIST_QUANTILE_95,
-		label: 'Hist_quantile_95',
-	},
-	{
-		value: MetricAggregateOperator.HIST_QUANTILE_99,
-		label: 'Hist_quantile_99',
-	},
-];
-
 export const tracesAggregateOperatorOptions: SelectOption<string, string>[] = [
 	{
 		value: TracesAggregatorOperator.COUNT,

frontend/src/constants/routes.ts

@@ -77,9 +77,6 @@ const ROUTES = {
 	API_MONITORING: '/api-monitoring/explorer',
 	METRICS_EXPLORER_BASE: '/metrics-explorer',
 	WORKSPACE_ACCESS_RESTRICTED: '/workspace-access-restricted',
-	METER_EXPLORER_BASE: '/meter-explorer',
-	METER_EXPLORER: '/meter-explorer',
-	METER_EXPLORER_VIEWS: '/meter-explorer/views',
 	HOME_PAGE: '/',
 } as const;
 

frontend/src/constants/shortcuts/globalShortcuts.ts

@@ -6,7 +6,6 @@ export const GlobalShortcuts = {
 	NavigateToAlerts: 'a+shift',
 	NavigateToExceptions: 'e+shift',
 	NavigateToMessagingQueues: 'm+shift',
-	ToggleSidebar: 'b+shift',
 };
 
 export const GlobalShortcutsName = {
@@ -17,7 +16,6 @@ export const GlobalShortcutsName = {
 	NavigateToAlerts: 'shift+a',
 	NavigateToExceptions: 'shift+e',
 	NavigateToMessagingQueues: 'shift+m',
-	ToggleSidebar: 'shift+b',
 };
 
 export const GlobalShortcutsDescription = {
@@ -28,5 +26,4 @@ export const GlobalShortcutsDescription = {
 	NavigateToAlerts: 'Navigate to alerts page',
 	NavigateToExceptions: 'Navigate to Exceptions page',
 	NavigateToMessagingQueues: 'Navigate to Messaging Queues page',
-	ToggleSidebar: 'Toggle sidebar visibility',
 };

frontend/src/container/AppLayout/__tests__/sidebar-toggle-shortcut.test.tsx

@@ -1,176 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import logEvent from 'api/common/logEvent';
-import { GlobalShortcuts } from 'constants/shortcuts/globalShortcuts';
-import { USER_PREFERENCES } from 'constants/userPreferences';
-import {
-	KeyboardHotkeysProvider,
-	useKeyboardHotkeys,
-} from 'hooks/hotkeys/useKeyboardHotkeys';
-import { QueryClient, QueryClientProvider } from 'react-query';
-
-// Mock dependencies
-jest.mock('api/common/logEvent', () => jest.fn());
-
-// Mock the AppContext
-const mockUpdateUserPreferenceInContext = jest.fn();
-
-const SHIFT_B_KEYBOARD_SHORTCUT = '{Shift>}b{/Shift}';
-
-jest.mock('providers/App/App', () => ({
-	useAppContext: jest.fn(() => ({
-		userPreferences: [
-			{
-				name: USER_PREFERENCES.SIDENAV_PINNED,
-				value: false,
-			},
-		],
-		updateUserPreferenceInContext: mockUpdateUserPreferenceInContext,
-	})),
-}));
-
-function TestComponent({
-	mockHandleShortcut,
-}: {
-	mockHandleShortcut: () => void;
-}): JSX.Element {
-	const { registerShortcut } = useKeyboardHotkeys();
-	registerShortcut(GlobalShortcuts.ToggleSidebar, mockHandleShortcut);
-	return <div data-testid="test">Test</div>;
-}
-
-describe('Sidebar Toggle Shortcut', () => {
-	let queryClient: QueryClient;
-
-	beforeEach(() => {
-		queryClient = new QueryClient({
-			defaultOptions: {
-				queries: {
-					retry: false,
-				},
-				mutations: {
-					retry: false,
-				},
-			},
-		});
-
-		jest.clearAllMocks();
-	});
-
-	afterEach(() => {
-		jest.clearAllMocks();
-	});
-
-	describe('Global Shortcuts Constants', () => {
-		it('should have the correct shortcut key combination', () => {
-			expect(GlobalShortcuts.ToggleSidebar).toBe('b+shift');
-		});
-	});
-
-	describe('Keyboard Shortcut Registration', () => {
-		it('should register the sidebar toggle shortcut correctly', async () => {
-			const user = userEvent.setup();
-			const mockHandleShortcut = jest.fn();
-
-			render(
-				<QueryClientProvider client={queryClient}>
-					<KeyboardHotkeysProvider>
-						<TestComponent mockHandleShortcut={mockHandleShortcut} />
-					</KeyboardHotkeysProvider>
-				</QueryClientProvider>,
-			);
-
-			// Trigger the shortcut
-			await user.keyboard(SHIFT_B_KEYBOARD_SHORTCUT);
-
-			expect(mockHandleShortcut).toHaveBeenCalled();
-		});
-
-		it('should not trigger shortcut in input fields', async () => {
-			const user = userEvent.setup();
-			const mockHandleShortcut = jest.fn();
-
-			function TestComponent(): JSX.Element {
-				const { registerShortcut } = useKeyboardHotkeys();
-				registerShortcut(GlobalShortcuts.ToggleSidebar, mockHandleShortcut);
-				return (
-					<div>
-						<input data-testid="input-field" />
-						<div data-testid="test">Test</div>
-					</div>
-				);
-			}
-
-			render(
-				<QueryClientProvider client={queryClient}>
-					<KeyboardHotkeysProvider>
-						<TestComponent />
-					</KeyboardHotkeysProvider>
-				</QueryClientProvider>,
-			);
-
-			// Focus on input field
-			const inputField = screen.getByTestId('input-field');
-			await user.click(inputField);
-
-			// Try to trigger shortcut while focused on input
-			await user.keyboard('{Shift>}b{/Shift}');
-
-			// Should not trigger the shortcut
-			expect(mockHandleShortcut).not.toHaveBeenCalled();
-		});
-	});
-
-	describe('Sidebar Toggle Functionality', () => {
-		it('should log the toggle event with correct parameters', async () => {
-			const user = userEvent.setup();
-			const mockHandleShortcut = jest.fn(() => {
-				logEvent('Global Shortcut: Sidebar Toggle', {
-					previousState: false,
-					newState: true,
-				});
-			});
-
-			render(
-				<QueryClientProvider client={queryClient}>
-					<KeyboardHotkeysProvider>
-						<TestComponent mockHandleShortcut={mockHandleShortcut} />
-					</KeyboardHotkeysProvider>
-				</QueryClientProvider>,
-			);
-
-			await user.keyboard(SHIFT_B_KEYBOARD_SHORTCUT);
-
-			expect(logEvent).toHaveBeenCalledWith('Global Shortcut: Sidebar Toggle', {
-				previousState: false,
-				newState: true,
-			});
-		});
-
-		it('should update user preference in context', async () => {
-			const user = userEvent.setup();
-			const mockHandleShortcut = jest.fn(() => {
-				const save = {
-					name: USER_PREFERENCES.SIDENAV_PINNED,
-					value: true,
-				};
-				mockUpdateUserPreferenceInContext(save);
-			});
-
-			render(
-				<QueryClientProvider client={queryClient}>
-					<KeyboardHotkeysProvider>
-						<TestComponent mockHandleShortcut={mockHandleShortcut} />
-					</KeyboardHotkeysProvider>
-				</QueryClientProvider>,
-			);
-
-			await user.keyboard(SHIFT_B_KEYBOARD_SHORTCUT);
-
-			expect(mockUpdateUserPreferenceInContext).toHaveBeenCalledWith({
-				name: USER_PREFERENCES.SIDENAV_PINNED,
-				value: true,
-			});
-		});
-	});
-});

frontend/src/container/AppLayout/index.tsx

@@ -10,10 +10,8 @@ import setLocalStorageApi from 'api/browser/localstorage/set';
 import getChangelogByVersion from 'api/changelog/getChangelogByVersion';
 import logEvent from 'api/common/logEvent';
 import manageCreditCardApi from 'api/v1/portal/create';
-import updateUserPreference from 'api/v1/user/preferences/name/update';
 import getUserLatestVersion from 'api/v1/version/getLatestVersion';
 import getUserVersion from 'api/v1/version/getVersion';
-import { AxiosError } from 'axios';
 import cx from 'classnames';
 import ChangelogModal from 'components/ChangelogModal/ChangelogModal';
 import ChatSupportGateway from 'components/ChatSupportGateway/ChatSupportGateway';
@@ -24,12 +22,10 @@ import { Events } from 'constants/events';
 import { FeatureKeys } from 'constants/features';
 import { LOCALSTORAGE } from 'constants/localStorage';
 import ROUTES from 'constants/routes';
-import { GlobalShortcuts } from 'constants/shortcuts/globalShortcuts';
 import { USER_PREFERENCES } from 'constants/userPreferences';
 import SideNav from 'container/SideNav';
 import TopNav from 'container/TopNav';
 import dayjs from 'dayjs';
-import { useKeyboardHotkeys } from 'hooks/hotkeys/useKeyboardHotkeys';
 import { useIsDarkMode } from 'hooks/useDarkMode';
 import { useGetTenantLicense } from 'hooks/useGetTenantLicense';
 import { useNotifications } from 'hooks/useNotifications';
@@ -72,10 +68,8 @@ import {
 	LicensePlatform,
 	LicenseState,
 } from 'types/api/licensesV3/getActive';
-import { UserPreference } from 'types/api/preferences/preference';
 import AppReducer from 'types/reducer/app';
 import { USER_ROLES } from 'types/roles';
-import { showErrorNotification } from 'utils/error';
 import { eventEmitter } from 'utils/getEventEmitter';
 import {
 	getFormattedDate,
@@ -668,85 +662,10 @@ function AppLayout(props: AppLayoutProps): JSX.Element {
 		</div>
 	);
 
-	const sideNavPinnedPreference = userPreferences?.find(
+	const sideNavPinned = userPreferences?.find(
 		(preference) => preference.name === USER_PREFERENCES.SIDENAV_PINNED,
 	)?.value as boolean;
 
-	// Add loading state to prevent layout shift during initial load
-	const [isSidebarLoaded, setIsSidebarLoaded] = useState(false);
-
-	// Get sidebar state from localStorage as fallback until preferences are loaded
-	const getSidebarStateFromLocalStorage = useCallback((): boolean => {
-		try {
-			const storedValue = getLocalStorageApi(USER_PREFERENCES.SIDENAV_PINNED);
-			return storedValue === 'true';
-		} catch {
-			return false;
-		}
-	}, []);
-
-	// Set sidebar as loaded after user preferences are fetched
-	useEffect(() => {
-		if (userPreferences !== null) {
-			setIsSidebarLoaded(true);
-		}
-	}, [userPreferences]);
-
-	// Use localStorage value as fallback until preferences are loaded
-	const isSideNavPinned = isSidebarLoaded
-		? sideNavPinnedPreference
-		: getSidebarStateFromLocalStorage();
-
-	const { registerShortcut, deregisterShortcut } = useKeyboardHotkeys();
-	const { updateUserPreferenceInContext } = useAppContext();
-
-	const { mutate: updateUserPreferenceMutation } = useMutation(
-		updateUserPreference,
-		{
-			onError: (error) => {
-				showErrorNotification(notifications, error as AxiosError);
-			},
-		},
-	);
-
-	const handleToggleSidebar = useCallback((): void => {
-		const newState = !isSideNavPinned;
-
-		logEvent('Global Shortcut: Sidebar Toggle', {
-			previousState: isSideNavPinned,
-			newState,
-		});
-
-		// Save to localStorage immediately for instant feedback
-		setLocalStorageApi(USER_PREFERENCES.SIDENAV_PINNED, newState.toString());
-
-		// Update the context immediately
-		const save = {
-			name: USER_PREFERENCES.SIDENAV_PINNED,
-			value: newState,
-		};
-		updateUserPreferenceInContext(save as UserPreference);
-
-		// Make the API call in the background
-		updateUserPreferenceMutation({
-			name: USER_PREFERENCES.SIDENAV_PINNED,
-			value: newState,
-		});
-	}, [
-		isSideNavPinned,
-		updateUserPreferenceInContext,
-		updateUserPreferenceMutation,
-	]);
-
-	// Register the sidebar toggle shortcut
-	useEffect(() => {
-		registerShortcut(GlobalShortcuts.ToggleSidebar, handleToggleSidebar);
-
-		return (): void => {
-			deregisterShortcut(GlobalShortcuts.ToggleSidebar);
-		};
-	}, [registerShortcut, deregisterShortcut, handleToggleSidebar]);
-
 	const SHOW_TRIAL_EXPIRY_BANNER =
 		showTrialExpiryBanner && !showPaymentFailedWarning;
 	const SHOW_WORKSPACE_RESTRICTED_BANNER = showWorkspaceRestricted;
@@ -820,14 +739,14 @@ function AppLayout(props: AppLayoutProps): JSX.Element {
 				className={cx(
 					'app-layout',
 					isDarkMode ? 'darkMode dark' : 'lightMode',
-					isSideNavPinned ? 'side-nav-pinned' : '',
+					sideNavPinned ? 'side-nav-pinned' : '',
 					SHOW_WORKSPACE_RESTRICTED_BANNER ? 'isWorkspaceRestricted' : '',
 					SHOW_TRIAL_EXPIRY_BANNER ? 'isTrialExpired' : '',
 					SHOW_PAYMENT_FAILED_BANNER ? 'isPaymentFailed' : '',
 				)}
 			>
 				{isToDisplayLayout && !renderFullScreen && (
-					<SideNav isPinned={isSideNavPinned} />
+					<SideNav isPinned={sideNavPinned} />
 				)}
 				<div
 					className={cx('app-content', {

frontend/src/container/ExplorerOptions/ExplorerOptionWrapper.tsx

@@ -16,7 +16,6 @@ function ExplorerOptionWrapper({
 	sourcepage,
 	isOneChartPerQuery,
 	splitedQueries,
-	signalSource,
 }: ExplorerOptionsWrapperProps): JSX.Element {
 	const [isExplorerOptionHidden, setIsExplorerOptionHidden] = useState(false);
 
@@ -33,7 +32,6 @@ function ExplorerOptionWrapper({
 			isLoading={isLoading}
 			onExport={onExport}
 			sourcepage={sourcepage}
-			signalSource={signalSource}
 			isExplorerOptionHidden={isExplorerOptionHidden}
 			setIsExplorerOptionHidden={setIsExplorerOptionHidden}
 			isOneChartPerQuery={isOneChartPerQuery}

frontend/src/container/ExplorerOptions/ExplorerOptions.styles.scss

@@ -1,12 +1,12 @@
 .explorer-options-container {
 	position: fixed;
-	bottom: 8px;
+	bottom: 24px;
 	left: calc(50% + 240px);
 	transform: translate(calc(-50% - 120px), 0);
 	transition: left 0.2s linear;
 
 	display: flex;
-	gap: 8px;
+	gap: 16px;
 	background-color: transparent;
 
 	.multi-alert-button,
@@ -33,12 +33,11 @@
 	display: inline-flex;
 	align-items: center;
 	gap: 12px;
-	padding: 10px 12px;
+	padding: 10px 10px;
+	border-radius: 50px;
+	border: 1px solid var(--bg-slate-400);
 	background: rgba(22, 24, 29, 0.6);
-	border: 1px solid var(--bg-slate-500);
-	border-radius: 4px;
 	backdrop-filter: blur(20px);
-	box-sizing: border-box;
 
 	.action-icon {
 		display: flex;
@@ -65,9 +64,9 @@
 
 .explorer-options {
 	padding: 10px 12px;
-	border-radius: 4px;
-	border: 1px solid var(--bg-slate-500);
-	background: var(--bg-ink-400);
+	border: 1px solid var(--bg-slate-400);
+	border-radius: 50px;
+	background: rgba(22, 24, 29, 0.6);
 	backdrop-filter: blur(20px);
 
 	cursor: default;

frontend/src/container/ExplorerOptions/ExplorerOptions.tsx

@@ -93,7 +93,6 @@ function ExplorerOptions({
 	onExport,
 	query,
 	sourcepage,
-	signalSource,
 	isExplorerOptionHidden = false,
 	setIsExplorerOptionHidden,
 	isOneChartPerQuery = false,
@@ -111,7 +110,6 @@ function ExplorerOptions({
 
 	const isLogsExplorer = sourcepage === DataSource.LOGS;
 	const isMetricsExplorer = sourcepage === DataSource.METRICS;
-	const isMeterExplorer = signalSource === 'meter';
 
 	const PRESERVED_VIEW_LOCAL_STORAGE_KEY = LOCALSTORAGE.LAST_USED_SAVED_VIEWS;
 
@@ -122,11 +120,8 @@ function ExplorerOptions({
 		if (isMetricsExplorer) {
 			return PreservedViewsTypes.METRICS;
 		}
-		if (isMeterExplorer) {
-			return PreservedViewsTypes.METER;
-		}
 		return PreservedViewsTypes.TRACES;
-	}, [isLogsExplorer, isMetricsExplorer, isMeterExplorer]);
+	}, [isLogsExplorer, isMetricsExplorer]);
 
 	const onModalToggle = useCallback((value: boolean) => {
 		setIsExport(value);
@@ -155,10 +150,6 @@ function ExplorerOptions({
 				[MetricsExplorerEventKeys.OneChartPerQueryEnabled]: isOneChartPerQuery,
 				panelType,
 			});
-		} else if (isMeterExplorer) {
-			logEvent('Meter Explorer: Save view clicked', {
-				panelType,
-			});
 		}
 		setIsSaveModalOpen(!isSaveModalOpen);
 	};
@@ -252,7 +243,7 @@ function ExplorerOptions({
 		error,
 		isRefetching,
 		refetch: refetchAllView,
-	} = useGetAllViews(isMeterExplorer ? 'meter' : sourcepage);
+	} = useGetAllViews(sourcepage);
 
 	const compositeQuery = mapCompositeQueryFromQuery(currentQuery, panelType);
 
@@ -325,7 +316,7 @@ function ExplorerOptions({
 		compositeQuery,
 		viewKey,
 		extraData: updatedExtraData,
-		sourcePage: isMeterExplorer ? 'meter' : sourcepage,
+		sourcePage: sourcepage,
 		viewName,
 	});
 
@@ -341,7 +332,7 @@ function ExplorerOptions({
 				compositeQuery: mapCompositeQueryFromQuery(currentQuery, panelType),
 				viewKey,
 				extraData: updatedExtraData,
-				sourcePage: isMeterExplorer ? 'meter' : sourcepage,
+				sourcePage: sourcepage,
 				viewName,
 			},
 			{
@@ -468,11 +459,6 @@ function ExplorerOptions({
 				panelType,
 				viewName: option?.value,
 			});
-		} else if (isMeterExplorer) {
-			logEvent('Meter Explorer: Select view', {
-				panelType,
-				viewName: option?.value,
-			});
 		}
 
 		updatePreservedViewInLocalStorage(option);
@@ -519,11 +505,6 @@ function ExplorerOptions({
 					: defaultLogsSelectedColumns,
 		});
 
-		if (signalSource === 'meter') {
-			history.replace(ROUTES.METER_EXPLORER);
-			return;
-		}
-
 		history.replace(DATASOURCE_VS_ROUTES[sourcepage]);
 	};
 
@@ -568,7 +549,7 @@ function ExplorerOptions({
 			redirectWithQueryBuilderData,
 			refetchAllView,
 			saveViewAsync,
-			sourcePage: isMeterExplorer ? 'meter' : sourcepage,
+			sourcePage: sourcepage,
 			viewName: newViewName,
 			setNewViewName,
 		});
@@ -687,7 +668,7 @@ function ExplorerOptions({
 		return `Query ${query.builder.queryData[0].queryName}`;
 	};
 
-	const CreateAlertButton = useMemo(() => {
+	const alertButton = useMemo(() => {
 		if (isOneChartPerQuery) {
 			const selectLabel = (
 				<Button
@@ -740,7 +721,7 @@ function ExplorerOptions({
 		splitedQueries,
 	]);
 
-	const AddToDashboardButton = useMemo(() => {
+	const dashboardButton = useMemo(() => {
 		if (isOneChartPerQuery) {
 			const selectLabel = (
 				<Button
@@ -848,7 +829,7 @@ function ExplorerOptions({
 					style={{
 						background: extraData
 							? `linear-gradient(90deg, rgba(0,0,0,0) -5%, ${rgbaColor} 9%, rgba(0,0,0,0) 30%)`
-							: 'initial',
+							: 'transparent',
 					}}
 				>
 					<div className="view-options">
@@ -903,13 +884,10 @@ function ExplorerOptions({
 
 					<hr className={isEditDeleteSupported ? '' : 'hidden'} />
 
-					{signalSource !== 'meter' && (
-						<div className={cx('actions', isEditDeleteSupported ? '' : 'hidden')}>
-							{CreateAlertButton}
-							{AddToDashboardButton}
-						</div>
-					)}
-
+					<div className={cx('actions', isEditDeleteSupported ? '' : 'hidden')}>
+						{alertButton}
+						{dashboardButton}
+					</div>
 					<div className="actions">
 						{/* Hide the info icon for metrics explorer until we get the docs link */}
 						{!isMetricsExplorer && (
@@ -1015,7 +993,6 @@ export interface ExplorerOptionsProps {
 	query: Query | null;
 	disabled: boolean;
 	sourcepage: DataSource;
-	signalSource?: string;
 	isExplorerOptionHidden?: boolean;
 	setIsExplorerOptionHidden?: Dispatch<SetStateAction<boolean>>;
 	isOneChartPerQuery?: boolean;
@@ -1028,7 +1005,6 @@ ExplorerOptions.defaultProps = {
 	setIsExplorerOptionHidden: undefined,
 	isOneChartPerQuery: false,
 	splitedQueries: [],
-	signalSource: '',
 };
 
 export default ExplorerOptions;

frontend/src/container/ExplorerOptions/constants.ts

@@ -2,5 +2,4 @@ export enum PreservedViewsTypes {
 	LOGS = 'logs',
 	TRACES = 'traces',
 	METRICS = 'metrics',
-	METER = 'meter',
 }

frontend/src/container/ExplorerOptions/types.ts

@@ -13,7 +13,7 @@ import { PreservedViewsTypes } from './constants';
 export interface SaveNewViewHandlerProps {
 	viewName: string;
 	compositeQuery: ICompositeMetricQuery;
-	sourcePage: DataSource | 'meter';
+	sourcePage: DataSource;
 	extraData: SaveViewProps['extraData'];
 	panelType: PANEL_TYPES | null;
 	notifications: NotificationInstance;
@@ -32,8 +32,7 @@ export interface SaveNewViewHandlerProps {
 export type PreservedViewType =
 	| PreservedViewsTypes.LOGS
 	| PreservedViewsTypes.TRACES
-	| PreservedViewsTypes.METRICS
-	| PreservedViewsTypes.METER;
+	| PreservedViewsTypes.METRICS;
 
 export type PreservedViewsInLocalStorage = Partial<
 	Record<PreservedViewType, { key: string; value: string }>

frontend/src/container/ExplorerOptions/utils.ts

@@ -37,7 +37,7 @@ export const saveNewViewHandler = ({
 		{
 			viewName,
 			compositeQuery,
-			sourcePage: sourcePage as DataSource,
+			sourcePage,
 			extraData,
 		},
 		{

frontend/src/container/MeterExplorer/Explorer/Explorer.styles.scss

@@ -1,195 +0,0 @@
-.meter-explorer-container {
-	display: flex;
-	flex-direction: row;
-
-	.meter-explorer-quick-filters-section {
-		width: 280px;
-		border-right: 1px solid var(--bg-slate-500);
-
-		&.hidden {
-			display: none;
-		}
-	}
-
-	.meter-explorer-content-section {
-		width: 100%;
-
-		.explore-header {
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			margin: 4px 0;
-			padding: 0 8px;
-
-			.explore-header-left-actions {
-				display: flex;
-				align-items: flex-start;
-				gap: 10px;
-			}
-
-			.explore-header-right-actions {
-				display: flex;
-				align-items: flex-end;
-				gap: 10px;
-			}
-		}
-
-		.query-section {
-			max-height: 450px;
-			overflow-y: auto;
-
-			.rc-virtual-list-holder {
-				height: 150px;
-			}
-		}
-
-		.explore-tabs {
-			margin: 15px 0;
-			.tab {
-				background-color: var(--bg-slate-500);
-				border-color: var(--bg-ink-200);
-				width: 180px;
-				padding: 16px 0;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-			}
-
-			.tab:first-of-type {
-				border-top-left-radius: 2px;
-			}
-
-			.tab:last-of-type {
-				border-top-right-radius: 2px;
-			}
-
-			.selected-view {
-				background: var(--bg-ink-500);
-			}
-		}
-
-		.explore-content {
-			.ant-space {
-				margin-top: 10px;
-				margin-bottom: 20px;
-			}
-
-			.empty-meter-search {
-				display: flex;
-				flex-direction: column;
-				justify-content: center;
-				align-items: center;
-				width: 100%;
-				height: 100%;
-			}
-
-			.time-series-view-panel {
-				border-radius: 4px;
-				border: 1px solid var(--bg-slate-500);
-				background: var(--bg-ink-400);
-				padding: 8px !important;
-				margin: 8px;
-			}
-
-			.time-series-container {
-				display: grid;
-				grid-template-columns: repeat(
-					auto-fit,
-					minmax(min(100%, calc(50% - 8px)), 1fr)
-				);
-				gap: 16px;
-				width: 100%;
-				height: fit-content;
-			}
-		}
-	}
-
-	&.quick-filters-open {
-		.meter-explorer-content-section {
-			width: calc(100% - 280px);
-		}
-	}
-
-	padding-bottom: 80px;
-}
-
-.meter-time-series-container {
-	display: flex;
-	flex-direction: column;
-	gap: 10px;
-
-	.builder-units-filter {
-		padding: 0 8px;
-		margin-bottom: 0px !important;
-
-		.builder-units-filter-label {
-			margin-bottom: 0px !important;
-			font-size: 13px;
-		}
-	}
-}
-
-.lightMode {
-	.meter-explorer-container {
-		.explore-tabs {
-			.tab {
-				background-color: var(--bg-vanilla-100);
-				border-color: var(--bg-vanilla-400);
-			}
-
-			.selected-view {
-				background: var(--bg-vanilla-500);
-			}
-		}
-	}
-}
-
-.dashboards-and-alerts-popover-container {
-	display: flex;
-	gap: 16px;
-
-	.dashboards-and-alerts-popover {
-		border-radius: 20px;
-		padding: 4px 8px;
-		cursor: pointer;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		gap: 4px;
-
-		&:hover {
-			opacity: 0.8;
-		}
-	}
-
-	.dashboards-popover {
-		border: 1px solid var(--bg-sienna-500);
-		.ant-typography {
-			color: var(--bg-sienna-500);
-		}
-	}
-
-	.alerts-popover {
-		border: 1px solid var(--bg-sakura-500);
-		.ant-typography {
-			color: var(--bg-sakura-500);
-		}
-	}
-}
-
-.no-data-container {
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-	align-items: center;
-	width: 100%;
-	height: 100%;
-	gap: 16px;
-
-	.no-data-text {
-		color: var(--text-vanilla-500);
-		font-size: 14px;
-		line-height: 20px;
-		text-align: center;
-	}
-}

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

@@ -1,182 +0,0 @@
-import './Explorer.styles.scss';
-
-import * as Sentry from '@sentry/react';
-import { Button, Tooltip } from 'antd';
-import logEvent from 'api/common/logEvent';
-import cx from 'classnames';
-import { QueryBuilderV2 } from 'components/QueryBuilderV2/QueryBuilderV2';
-import QuickFilters from 'components/QuickFilters/QuickFilters';
-import { QuickFiltersSource, SignalType } from 'components/QuickFilters/types';
-import { initialQueryMeterWithType, PANEL_TYPES } from 'constants/queryBuilder';
-import ExplorerOptionWrapper from 'container/ExplorerOptions/ExplorerOptionWrapper';
-import RightToolbarActions from 'container/QueryBuilder/components/ToolbarActions/RightToolbarActions';
-import { QueryBuilderProps } from 'container/QueryBuilder/QueryBuilder.interfaces';
-import DateTimeSelector from 'container/TopNav/DateTimeSelectionV2';
-import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
-import { useShareBuilderUrl } from 'hooks/queryBuilder/useShareBuilderUrl';
-import { useSafeNavigate } from 'hooks/useSafeNavigate';
-import { Filter } from 'lucide-react';
-import ErrorBoundaryFallback from 'pages/ErrorBoundaryFallback/ErrorBoundaryFallback';
-import { useCallback, useEffect, useMemo, useState } from 'react';
-import { Dashboard } from 'types/api/dashboard/getAll';
-import { Query } from 'types/api/queryBuilder/queryBuilderData';
-import { DataSource } from 'types/common/queryBuilder';
-import { generateExportToDashboardLink } from 'utils/dashboard/generateExportToDashboardLink';
-import { v4 as uuid } from 'uuid';
-
-import { MeterExplorerEventKeys, MeterExplorerEvents } from '../events';
-import TimeSeries from './TimeSeries';
-import { splitQueryIntoOneChartPerQuery } from './utils';
-
-function Explorer(): JSX.Element {
-	const {
-		handleRunQuery,
-		stagedQuery,
-		updateAllQueriesOperators,
-		currentQuery,
-	} = useQueryBuilder();
-	const { safeNavigate } = useSafeNavigate();
-
-	const [showQuickFilters, setShowQuickFilters] = useState(true);
-
-	const defaultQuery = useMemo(
-		() =>
-			updateAllQueriesOperators(
-				initialQueryMeterWithType,
-				PANEL_TYPES.TIME_SERIES,
-				DataSource.METRICS,
-				'meter' as 'meter' | '',
-			),
-		[updateAllQueriesOperators],
-	);
-
-	const exportDefaultQuery = useMemo(
-		() =>
-			updateAllQueriesOperators(
-				currentQuery || initialQueryMeterWithType,
-				PANEL_TYPES.TIME_SERIES,
-				DataSource.METRICS,
-				'meter' as 'meter' | '',
-			),
-		[currentQuery, updateAllQueriesOperators],
-	);
-
-	useShareBuilderUrl({ defaultValue: defaultQuery });
-
-	const handleExport = useCallback(
-		(
-			dashboard: Dashboard | null,
-			_isNewDashboard?: boolean,
-			queryToExport?: Query,
-		): void => {
-			if (!dashboard) return;
-
-			const widgetId = uuid();
-
-			const dashboardEditView = generateExportToDashboardLink({
-				query: queryToExport || exportDefaultQuery,
-				panelType: PANEL_TYPES.TIME_SERIES,
-				dashboardId: dashboard.id,
-				widgetId,
-			});
-
-			safeNavigate(dashboardEditView);
-		},
-		[exportDefaultQuery, safeNavigate],
-	);
-
-	const splitedQueries = useMemo(
-		() =>
-			splitQueryIntoOneChartPerQuery(stagedQuery || initialQueryMeterWithType),
-		[stagedQuery],
-	);
-
-	useEffect(() => {
-		logEvent(MeterExplorerEvents.TabChanged, {
-			[MeterExplorerEventKeys.Tab]: 'explorer',
-		});
-	}, []);
-
-	const queryComponents = useMemo(
-		(): QueryBuilderProps['queryComponents'] => ({}),
-		[],
-	);
-
-	return (
-		<Sentry.ErrorBoundary fallback={<ErrorBoundaryFallback />}>
-			<div
-				className={cx('meter-explorer-container', {
-					'quick-filters-open': showQuickFilters,
-				})}
-			>
-				<div
-					className={cx('meter-explorer-quick-filters-section', {
-						hidden: !showQuickFilters,
-					})}
-				>
-					<QuickFilters
-						className="qf-meter-explorer"
-						source={QuickFiltersSource.METER_EXPLORER}
-						signal={SignalType.METER_EXPLORER}
-						showFilterCollapse
-						showQueryName={false}
-						handleFilterVisibilityChange={(): void => {
-							setShowQuickFilters(!showQuickFilters);
-						}}
-					/>
-				</div>
-
-				<div className="meter-explorer-content-section">
-					<div className="meter-explorer-explore-content">
-						<div className="explore-header">
-							<div className="explore-header-left-actions">
-								{!showQuickFilters && (
-									<Tooltip title="Show Quick Filters" placement="right" arrow={false}>
-										<Button
-											className="periscope-btn outline"
-											icon={<Filter size={16} />}
-											onClick={(): void => setShowQuickFilters(!showQuickFilters)}
-										/>
-									</Tooltip>
-								)}
-							</div>
-
-							<div className="explore-header-right-actions">
-								<DateTimeSelector showAutoRefresh />
-								<RightToolbarActions
-									onStageRunQuery={(): void => handleRunQuery(true, true)}
-								/>
-							</div>
-						</div>
-						<QueryBuilderV2
-							config={{
-								initialDataSource: DataSource.METRICS,
-								queryVariant: 'static',
-								signalSource: 'meter',
-							}}
-							panelType={PANEL_TYPES.TIME_SERIES}
-							queryComponents={queryComponents}
-							showFunctions={false}
-							version="v3"
-						/>
-
-						<div className="explore-content">
-							<TimeSeries />
-						</div>
-					</div>
-					<ExplorerOptionWrapper
-						disabled={!stagedQuery}
-						query={exportDefaultQuery}
-						sourcepage={DataSource.METRICS}
-						signalSource="meter"
-						onExport={handleExport}
-						isOneChartPerQuery={false}
-						splitedQueries={splitedQueries}
-					/>
-				</div>
-			</div>
-		</Sentry.ErrorBoundary>
-	);
-}
-
-export default Explorer;

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

@@ -1,13 +0,0 @@
-import { Typography } from 'antd';
-import { ChartLine } from 'lucide-react';
-
-export default function NoData(): JSX.Element {
-	return (
-		<div className="no-data-container">
-			<ChartLine size={48} />
-			<Typography.Text className="no-data-text">
-				No data found for the selected query
-			</Typography.Text>
-		</div>
-	);
-}

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

@@ -1,43 +0,0 @@
-import { Button } from 'antd';
-import logEvent from 'api/common/logEvent';
-import { PANEL_TYPES } from 'constants/queryBuilder';
-import { QueryBuilder } from 'container/QueryBuilder';
-import { ButtonWrapper } from 'container/TracesExplorer/QuerySection/styles';
-import { useGetPanelTypesQueryParam } from 'hooks/queryBuilder/useGetPanelTypesQueryParam';
-import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
-import { DataSource } from 'types/common/queryBuilder';
-
-import { MeterExplorerEventKeys, MeterExplorerEvents } from '../events';
-
-function QuerySection(): JSX.Element {
-	const { handleRunQuery } = useQueryBuilder();
-
-	const panelTypes = useGetPanelTypesQueryParam(PANEL_TYPES.TIME_SERIES);
-
-	return (
-		<div className="query-section">
-			<QueryBuilder
-				panelType={panelTypes}
-				config={{ initialDataSource: DataSource.METRICS, queryVariant: 'static' }}
-				version="v4"
-				actions={
-					<ButtonWrapper>
-						<Button
-							onClick={(): void => {
-								handleRunQuery();
-								logEvent(MeterExplorerEvents.QueryBuilderQueryChanged, {
-									[MeterExplorerEventKeys.Tab]: 'explorer',
-								});
-							}}
-							type="primary"
-						>
-							Run Query
-						</Button>
-					</ButtonWrapper>
-				}
-			/>
-		</div>
-	);
-}
-
-export default QuerySection;

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

@@ -1,142 +0,0 @@
-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 { BuilderUnitsFilter } from 'container/QueryBuilder/filters/BuilderUnitsFilter';
-import TimeSeriesView from 'container/TimeSeriesView/TimeSeriesView';
-import { convertDataValueToMs } from 'container/TimeSeriesView/utils';
-import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
-import { GetMetricQueryRange } from 'lib/dashboard/getQueryResults';
-import { useErrorModal } from 'providers/ErrorModalProvider';
-import { useMemo, useState } from 'react';
-import { useQueries } from 'react-query';
-import { useSelector } from 'react-redux';
-import { AppState } from 'store/reducers';
-import { SuccessResponse } from 'types/api';
-import APIError from 'types/api/error';
-import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
-import { DataSource } from 'types/common/queryBuilder';
-import { GlobalReducer } from 'types/reducer/globalTime';
-
-function TimeSeries(): JSX.Element {
-	const { stagedQuery, currentQuery } = useQueryBuilder();
-
-	const { selectedTime: globalSelectedTime, maxTime, minTime } = useSelector<
-		AppState,
-		GlobalReducer
-	>((state) => state.globalTime);
-
-	const [yAxisUnit, setYAxisUnit] = useState<string>('');
-
-	const isValidToConvertToMs = useMemo(() => {
-		const isValid: boolean[] = [];
-
-		currentQuery.builder.queryData.forEach(
-			({ aggregateAttribute, aggregateOperator }) => {
-				const isExistDurationNanoAttribute =
-					aggregateAttribute?.key === 'durationNano' ||
-					aggregateAttribute?.key === 'duration_nano';
-
-				const isCountOperator =
-					aggregateOperator === 'count' || aggregateOperator === 'count_distinct';
-
-				isValid.push(!isCountOperator && isExistDurationNanoAttribute);
-			},
-		);
-
-		return isValid.every(Boolean);
-	}, [currentQuery]);
-
-	const queryPayloads = useMemo(
-		() => [stagedQuery || initialQueryMeterWithType],
-		[stagedQuery],
-	);
-
-	const { showErrorModal } = useErrorModal();
-
-	const queries = useQueries(
-		queryPayloads.map((payload, index) => ({
-			queryKey: [
-				REACT_QUERY_KEY.GET_QUERY_RANGE,
-				payload,
-				ENTITY_VERSION_V5,
-				globalSelectedTime,
-				maxTime,
-				minTime,
-				index,
-			],
-			queryFn: (): Promise<SuccessResponse<MetricRangePayloadProps>> =>
-				GetMetricQueryRange(
-					{
-						query: payload,
-						graphType: PANEL_TYPES.TIME_SERIES,
-						selectedTime: 'GLOBAL_TIME',
-						globalSelectedInterval: globalSelectedTime,
-						params: {
-							dataSource: DataSource.METRICS,
-						},
-					},
-					ENTITY_VERSION_V5,
-				),
-			enabled: !!payload,
-			retry: (failureCount: number, error: Error): boolean => {
-				let status: number | undefined;
-
-				if (error instanceof APIError) {
-					status = error.getHttpStatusCode();
-				} else if (isAxiosError(error)) {
-					status = error.response?.status;
-				}
-
-				if (status && status >= 400 && status < 500) {
-					return false;
-				}
-
-				return failureCount < 3;
-			},
-			onError: (error: APIError): void => {
-				showErrorModal(error);
-			},
-		})),
-	);
-
-	const data = useMemo(() => queries.map(({ data }) => data) ?? [], [queries]);
-
-	const responseData = useMemo(
-		() =>
-			data.map((datapoint) =>
-				isValidToConvertToMs ? convertDataValueToMs(datapoint) : datapoint,
-			),
-		[data, isValidToConvertToMs],
-	);
-
-	const onUnitChangeHandler = (value: string): void => {
-		setYAxisUnit(value);
-	};
-
-	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}
-						/>
-					</div>
-				))}
-			</div>
-		</div>
-	);
-}
-
-export default TimeSeries;

frontend/src/container/MeterExplorer/Explorer/index.ts

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

frontend/src/container/MeterExplorer/Explorer/types.ts

@@ -1,37 +0,0 @@
-import { RelatedMetric } from 'api/metricsExplorer/getRelatedMetrics';
-import { UseQueryResult } from 'react-query';
-import { SuccessResponse } from 'types/api';
-import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
-
-export enum ExplorerTabs {
-	TIME_SERIES = 'time-series',
-	RELATED_METRICS = 'related-metrics',
-}
-
-export interface TimeSeriesProps {
-	showOneChartPerQuery: boolean;
-}
-
-export interface RelatedMetricsProps {
-	metricNames: string[];
-}
-
-export interface RelatedMetricsCardProps {
-	metric: RelatedMetricWithQueryResult;
-}
-
-export interface UseGetRelatedMetricsGraphsProps {
-	selectedMetricName: string | null;
-	startMs: number;
-	endMs: number;
-}
-
-export interface UseGetRelatedMetricsGraphsReturn {
-	relatedMetrics: RelatedMetricWithQueryResult[];
-	isRelatedMetricsLoading: boolean;
-	isRelatedMetricsError: boolean;
-}
-
-export interface RelatedMetricWithQueryResult extends RelatedMetric {
-	queryResult: UseQueryResult<SuccessResponse<MetricRangePayloadProps>, unknown>;
-}

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

@@ -1,37 +0,0 @@
-import { Query } from 'types/api/queryBuilder/queryBuilderData';
-import { v4 as uuid } from 'uuid';
-
-export const splitQueryIntoOneChartPerQuery = (query: Query): Query[] => {
-	const queries: Query[] = [];
-
-	query.builder.queryData.forEach((currentQuery) => {
-		const newQuery = {
-			...query,
-			id: uuid(),
-			builder: {
-				...query.builder,
-				queryData: [currentQuery],
-				queryFormulas: [],
-			},
-		};
-		queries.push(newQuery);
-	});
-
-	query.builder.queryFormulas.forEach((currentFormula) => {
-		const newQuery = {
-			...query,
-			id: uuid(),
-			builder: {
-				...query.builder,
-				queryFormulas: [currentFormula],
-				queryData: query.builder.queryData.map((currentQuery) => ({
-					...currentQuery,
-					disabled: true,
-				})),
-			},
-		};
-		queries.push(newQuery);
-	});
-
-	return queries;
-};

frontend/src/container/MeterExplorer/events.ts

@@ -1,51 +0,0 @@
-/**
- * This file contains all analytics events for the Meter Explorer.
- */
-export enum MeterExplorerEvents {
-	TabChanged = 'Meter Explorer: Tab visited',
-	ModalOpened = 'Meter Explorer: Modal opened',
-	MeterClicked = 'Meter Explorer: Meter clicked',
-	FilterApplied = 'Meter Explorer: Filter applied',
-	TreemapViewChanged = 'Meter Explorer: Treemap view changed',
-	PageNumberChanged = 'Meter Explorer: Page number changed',
-	PageSizeChanged = 'Meter Explorer: Page size changed',
-	OrderByApplied = 'Meter Explorer: Order by applied',
-	MetricMetadataUpdated = 'Meter Explorer: Metric metadata updated',
-	OpenInExplorerClicked = 'Meter Explorer: Open in explorer clicked',
-	InspectViewChanged = 'Meter Explorer: Inspect view changed',
-	InspectQueryChanged = 'Meter Explorer: Inspect query changed',
-	InspectPointClicked = 'Meter Explorer: Inspect point clicked',
-	QueryBuilderQueryChanged = 'Meter Explorer: QueryBuilder query changed',
-	YAxisUnitApplied = 'Meter Explorer: Y axis unit applied',
-	AddToAlertClicked = 'Meter Explorer: Add to alert clicked',
-	AddToDashboardClicked = 'Meter Explorer: Add to dashboard clicked',
-	SaveViewClicked = 'Meter Explorer: Save view clicked',
-	SearchApplied = 'Meter Explorer: Search applied',
-	ViewEdited = 'Meter Explorer: View edited',
-	ViewDeleted = 'Meter Explorer: View deleted',
-}
-
-export enum MeterExplorerEventKeys {
-	Tab = 'tab',
-	Modal = 'modal',
-	View = 'view',
-	Interval = 'interval',
-	ViewType = 'viewType',
-	PageNumber = 'pageNumber',
-	PageSize = 'pageSize',
-	ColumnName = 'columnName',
-	Order = 'order',
-	AttributeKey = 'attributeKey',
-	AttributeValue = 'attributeValue',
-	MetricName = 'metricName',
-	InspectView = 'inspectView',
-	TimeAggregationOption = 'timeAggregationOption',
-	TimeAggregationInterval = 'timeAggregationInterval',
-	SpaceAggregationOption = 'spaceAggregationOption',
-	SpaceAggregationLabels = 'spaceAggregationLabels',
-	OneChartPerQueryEnabled = 'oneChartPerQueryEnabled',
-	YAxisUnit = 'yAxisUnit',
-	ViewName = 'viewName',
-	Filters = 'filters',
-	TimeRange = 'timeRange',
-}

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

@@ -189,7 +189,7 @@ function Explorer(): JSX.Element {
 				query={exportDefaultQuery}
 				sourcepage={DataSource.METRICS}
 				onExport={handleExport}
-				isOneChartPerQuery={false}
+				isOneChartPerQuery={showOneChartPerQuery}
 				splitedQueries={splitedQueries}
 			/>
 		</Sentry.ErrorBoundary>

frontend/src/container/MySettings/index.tsx

@@ -1,7 +1,6 @@
 import './MySettings.styles.scss';
 
 import { Radio, RadioChangeEvent, Switch, Tag } from 'antd';
-import setLocalStorageApi from 'api/browser/localstorage/set';
 import logEvent from 'api/common/logEvent';
 import updateUserPreference from 'api/v1/user/preferences/name/update';
 import { AxiosError } from 'axios';
@@ -110,9 +109,6 @@ function MySettings(): JSX.Element {
 		// Optimistically update the UI
 		setSideNavPinned(checked);
 
-		// Save to localStorage immediately for instant feedback
-		setLocalStorageApi(USER_PREFERENCES.SIDENAV_PINNED, checked.toString());
-
 		// Update the context immediately
 		const save = {
 			name: USER_PREFERENCES.SIDENAV_PINNED,
@@ -134,8 +130,6 @@ function MySettings(): JSX.Element {
 						name: USER_PREFERENCES.SIDENAV_PINNED,
 						value: !checked,
 					} as UserPreference);
-					// Also revert localStorage
-					setLocalStorageApi(USER_PREFERENCES.SIDENAV_PINNED, (!checked).toString());
 					showErrorNotification(notifications, error as AxiosError);
 				},
 			},

frontend/src/container/QueryBuilder/QueryBuilder.interfaces.ts

@@ -17,9 +17,8 @@ export type QueryBuilderConfig =
 	| {
 			queryVariant: 'static';
 			initialDataSource: DataSource;
-			signalSource?: string;
 	  }
-	| { queryVariant: 'dropdown'; signalSource?: string };
+	| { queryVariant: 'dropdown' };
 
 export type QueryBuilderProps = {
 	config?: QueryBuilderConfig;

frontend/src/container/QueryBuilder/components/Query/Query.interfaces.ts

@@ -11,5 +11,4 @@ export type QueryProps = {
 	version: string;
 	showSpanScopeSelector?: boolean;
 	showOnlyWhereClause?: boolean;
-	signalSource?: string;
 } & Pick<QueryBuilderProps, 'filterConfigs' | 'queryComponents'>;

frontend/src/container/QueryBuilder/filters/AggregatorFilter/AggregatorFilter.intefaces.ts

@@ -8,5 +8,4 @@ export type AgregatorFilterProps = Pick<AutoCompleteProps, 'disabled'> & {
 	defaultValue?: string;
 	onSelect?: (value: BaseAutocompleteData) => void;
 	index?: number;
-	signalSource?: 'meter' | '';
 };

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

@@ -38,7 +38,6 @@ export const AggregatorFilter = memo(function AggregatorFilter({
 	defaultValue,
 	onSelect,
 	index,
-	signalSource,
 }: AgregatorFilterProps): JSX.Element {
 	const queryClient = useQueryClient();
 	const [optionsData, setOptionsData] = useState<ExtendedSelectOption[]>([]);
@@ -74,7 +73,6 @@ export const AggregatorFilter = memo(function AggregatorFilter({
 				searchText: debouncedValue,
 				aggregateOperator: queryAggregation.timeAggregation,
 				dataSource: query.dataSource,
-				source: signalSource || '',
 			}),
 		{
 			enabled:
@@ -154,17 +152,10 @@ export const AggregatorFilter = memo(function AggregatorFilter({
 		setSearchText(text);
 	}, []);
 
-	const getPlaceholder = useCallback(() => {
-		if (signalSource === 'meter') {
-			return 'Meter name';
-		}
-
-		if (query.dataSource === DataSource.METRICS) {
-			return 'Metric name';
-		}
-
-		return 'Aggregate attribute';
-	}, [signalSource, query.dataSource]);
+	const placeholder: string =
+		query.dataSource === DataSource.METRICS
+			? `Search metric name`
+			: 'Aggregate attribute';
 
 	const getAttributesData = useCallback(
 		(): BaseAutocompleteData[] =>
@@ -298,7 +289,7 @@ export const AggregatorFilter = memo(function AggregatorFilter({
 	return (
 		<AutoComplete
 			getPopupContainer={popupContainer}
-			placeholder={getPlaceholder()}
+			placeholder={placeholder}
 			style={selectStyle}
 			filterOption={false}
 			onSearch={handleSearchText}

frontend/src/container/QueryBuilder/filters/BuilderUnitsFilter/BuilderUnits.tsx

@@ -30,10 +30,8 @@ function BuilderUnitsFilter({
 	};
 
 	return (
-		<Space className="builder-units-filter">
-			<DefaultLabel className="builder-units-filter-label">
-				Y-axis unit
-			</DefaultLabel>
+		<Space>
+			<DefaultLabel>Y-axis unit</DefaultLabel>
 			<Select
 				getPopupContainer={popupContainer}
 				style={selectStyles}

frontend/src/container/QueryBuilder/filters/GroupByFilter/GroupByFilter.interfaces.ts

@@ -5,5 +5,4 @@ export type GroupByFilterProps = {
 	query: IBuilderQuery;
 	onChange: (values: BaseAutocompleteData[]) => void;
 	disabled: boolean;
-	signalSource?: string;
 };

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

@@ -10,17 +10,9 @@ import { chooseAutocompleteFromCustomValue } from 'lib/newQueryBuilder/chooseAut
 // ** Helpers
 import { transformStringWithPrefix } from 'lib/query/transformStringWithPrefix';
 import { isEqual, uniqWith } from 'lodash-es';
-import {
-	memo,
-	ReactNode,
-	useCallback,
-	useEffect,
-	useMemo,
-	useState,
-} from 'react';
+import { memo, ReactNode, useCallback, useEffect, useState } from 'react';
 import { useQueryClient } from 'react-query';
 import { BaseAutocompleteData } from 'types/api/queryBuilder/queryAutocompleteResponse';
-import { DataSource } from 'types/common/queryBuilder';
 import { SelectOption } from 'types/common/select';
 import { popupContainer } from 'utils/selectPopupContainer';
 
@@ -33,7 +25,6 @@ export const GroupByFilter = memo(function GroupByFilter({
 	query,
 	onChange,
 	disabled,
-	signalSource,
 }: GroupByFilterProps): JSX.Element {
 	const queryClient = useQueryClient();
 	const [searchText, setSearchText] = useState<string>('');
@@ -47,17 +38,10 @@ export const GroupByFilter = memo(function GroupByFilter({
 
 	const debouncedValue = useDebounce(searchText, DEBOUNCE_DELAY);
 
-	const dataSource = useMemo(() => {
-		if (signalSource === 'meter') {
-			return 'meter' as DataSource;
-		}
-		return query.dataSource;
-	}, [signalSource, query.dataSource]);
-
 	const { isFetching } = useGetAggregateKeys(
 		{
 			aggregateAttribute: query.aggregateAttribute?.key || '',
-			dataSource,
+			dataSource: query.dataSource,
 			aggregateOperator: query.aggregateOperator || '',
 			searchText: debouncedValue,
 		},

frontend/src/container/SideNav/menuItems.tsx

@@ -8,7 +8,6 @@ import {
 	Book,
 	Boxes,
 	BugIcon,
-	ChartArea,
 	Cloudy,
 	DraftingCompass,
 	FileKey2,
@@ -114,7 +113,7 @@ const menuItems: SidebarItem[] = [
 		key: ROUTES.METRICS_EXPLORER,
 		label: 'Metrics',
 		icon: <BarChart2 size={16} />,
-		isNew: false,
+		isNew: true,
 		itemKey: 'metrics',
 	},
 	{
@@ -231,7 +230,7 @@ export const defaultMoreMenuItems: SidebarItem[] = [
 		key: ROUTES.METRICS_EXPLORER,
 		label: 'Metrics',
 		icon: <BarChart2 size={16} />,
-		isNew: false,
+		isNew: true,
 		isEnabled: true,
 		itemKey: 'metrics',
 	},
@@ -265,15 +264,6 @@ export const defaultMoreMenuItems: SidebarItem[] = [
 		isEnabled: true,
 		itemKey: 'external-apis',
 	},
-	{
-		key: ROUTES.METER_EXPLORER,
-		label: 'Meter Explorer',
-		icon: <ChartArea size={16} />,
-		isNew: false,
-		isEnabled: false,
-		isBeta: true,
-		itemKey: 'meter-explorer',
-	},
 	{
 		key: ROUTES.MESSAGING_QUEUES_OVERVIEW,
 		label: 'Messaging Queues',

frontend/src/container/SpanDetailsDrawer/SpanDetailsDrawer.styles.scss

@@ -1,7 +1,7 @@
 .span-details-drawer {
 	display: flex;
 	flex-direction: column;
-	width: 450px;
+	width: 330px;
 	border-left: 1px solid var(--bg-slate-400);
 	overflow-y: auto;
 
@@ -176,34 +176,6 @@
 				justify-content: center;
 				width: 100%;
 				padding: 4px 8px;
-				margin-right: 8px;
-				gap: 4px;
-
-				.tab-label {
-					display: flex;
-					align-items: center;
-				}
-
-				.count-badge {
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					min-width: 20px;
-					height: 20px;
-					padding: 0 6px;
-					border-radius: 10px;
-					background: rgba(171, 189, 255, 0.1);
-					color: var(--bg-vanilla-400);
-					font-variant-numeric: lining-nums tabular-nums slashed-zero;
-					font-feature-settings: 'dlig' on, 'salt' on;
-					font-family: Inter;
-					font-size: 13px;
-					font-style: normal;
-					font-weight: 400;
-					line-height: 20px;
-					letter-spacing: -0.065px;
-					text-transform: uppercase;
-				}
 			}
 
 			.attributes-tab-btn:hover,

frontend/src/container/SpanDetailsDrawer/SpanDetailsDrawer.tsx

@@ -54,10 +54,7 @@ function SpanDetailsDrawer(props: ISpanDetailsDrawerProps): JSX.Element {
 						icon={<Bookmark size="14" />}
 						className="attributes-tab-btn"
 					>
-						<span className="tab-label">Attributes</span>
-						<span className="count-badge">
-							{Object.keys(span.tagMap || {}).length}
-						</span>
+						Attributes
 					</Button>
 				),
 				key: 'attributes',
@@ -66,8 +63,7 @@ function SpanDetailsDrawer(props: ISpanDetailsDrawerProps): JSX.Element {
 			{
 				label: (
 					<Button type="text" icon={<Anvil size="14" />} className="events-tab-btn">
-						<span className="tab-label">Events</span>
-						<span className="count-badge">{span.event?.length || 0}</span>
+						Events
 					</Button>
 				),
 				key: 'events',
@@ -86,14 +82,7 @@ function SpanDetailsDrawer(props: ISpanDetailsDrawerProps): JSX.Element {
 						icon={<Link2 size="14" />}
 						className="linked-spans-tab-btn"
 					>
-						<span className="tab-label">Links</span>
-						<span className="count-badge">
-							{
-								(
-									span.references?.filter((ref: any) => ref.refType !== 'CHILD_OF') || []
-								).length
-							}
-						</span>
+						Links
 					</Button>
 				),
 				key: 'linked-spans',

frontend/src/container/TimeSeriesView/TimeSeriesView.tsx

@@ -205,7 +205,6 @@ function TimeSeriesView({
 	return (
 		<div className="time-series-view">
 			{isError && error && <ErrorInPlace error={error as APIError} />}
-
 			<div
 				className="graph-container"
 				style={{ height: '100%', width: '100%' }}

frontend/src/container/TimeSeriesView/index.tsx

@@ -20,7 +20,6 @@ function TimeSeriesViewContainer({
 	dataSource = DataSource.TRACES,
 	isFilterApplied,
 	setWarning,
-	setIsLoadingQueries,
 }: TimeSeriesViewProps): JSX.Element {
 	const { stagedQuery, currentQuery, panelType } = useQueryBuilder();
 
@@ -48,7 +47,7 @@ function TimeSeriesViewContainer({
 		return isValid.every(Boolean);
 	}, [currentQuery]);
 
-	const { data, isLoading, isFetching, isError, error } = useGetQueryRange(
+	const { data, isLoading, isError, error } = useGetQueryRange(
 		{
 			query: stagedQuery || initialQueriesMap[dataSource],
 			graphType: panelType || PANEL_TYPES.TIME_SERIES,
@@ -84,20 +83,12 @@ function TimeSeriesViewContainer({
 		[data, isValidToConvertToMs],
 	);
 
-	useEffect(() => {
-		if (isLoading || isFetching) {
-			setIsLoadingQueries(true);
-		} else {
-			setIsLoadingQueries(false);
-		}
-	}, [isLoading, isFetching, setIsLoadingQueries]);
-
 	return (
 		<TimeSeriesView
 			isFilterApplied={isFilterApplied}
 			isError={isError}
 			error={error as APIError}
-			isLoading={isLoading || isFetching}
+			isLoading={isLoading}
 			data={responseData}
 			yAxisUnit={isValidToConvertToMs ? 'ms' : 'short'}
 			dataSource={dataSource}
@@ -110,7 +101,6 @@ interface TimeSeriesViewProps {
 	dataSource?: DataSource;
 	isFilterApplied: boolean;
 	setWarning: Dispatch<SetStateAction<Warning | undefined>>;
-	setIsLoadingQueries: Dispatch<SetStateAction<boolean>>;
 }
 
 TimeSeriesViewContainer.defaultProps = {

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

@@ -233,9 +233,6 @@ export const routesToSkip = [
 	ROUTES.ALL_ERROR,
 	ROUTES.UN_AUTHORIZED,
 	ROUTES.NOT_FOUND,
-	ROUTES.METER_EXPLORER,
-	ROUTES.METER_EXPLORER_BASE,
-	ROUTES.METER_EXPLORER_VIEWS,
 	ROUTES.SOMETHING_WENT_WRONG,
 ];
 

frontend/src/container/TracesExplorer/ListView/index.tsx

@@ -49,14 +49,9 @@ import { getListColumns, transformDataWithDate } from './utils';
 interface ListViewProps {
 	isFilterApplied: boolean;
 	setWarning: Dispatch<SetStateAction<Warning | undefined>>;
-	setIsLoadingQueries: Dispatch<SetStateAction<boolean>>;
 }
 
-function ListView({
-	isFilterApplied,
-	setWarning,
-	setIsLoadingQueries,
-}: ListViewProps): JSX.Element {
+function ListView({ isFilterApplied, setWarning }: ListViewProps): JSX.Element {
 	const {
 		stagedQuery,
 		panelType: panelTypeFromQueryBuilder,
@@ -167,14 +162,6 @@ function ListView({
 		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [data?.payload, data?.warning]);
 
-	useEffect(() => {
-		if (isLoading || isFetching) {
-			setIsLoadingQueries(true);
-		} else {
-			setIsLoadingQueries(false);
-		}
-	}, [isLoading, isFetching, setIsLoadingQueries]);
-
 	const dataLength =
 		data?.payload?.data?.newResult?.data?.result[0]?.list?.length;
 	const totalCount = useMemo(() => dataLength || 0, [dataLength]);

frontend/src/container/TracesExplorer/TableView/index.tsx

@@ -16,10 +16,8 @@ import { GlobalReducer } from 'types/reducer/globalTime';
 
 function TableView({
 	setWarning,
-	setIsLoadingQueries,
 }: {
 	setWarning: Dispatch<SetStateAction<Warning | undefined>>;
-	setIsLoadingQueries: Dispatch<SetStateAction<boolean>>;
 }): JSX.Element {
 	const { stagedQuery, panelType } = useQueryBuilder();
 
@@ -28,7 +26,7 @@ function TableView({
 		GlobalReducer
 	>((state) => state.globalTime);
 
-	const { data, isLoading, isFetching, isError, error } = useGetQueryRange(
+	const { data, isLoading, isError, error } = useGetQueryRange(
 		{
 			query: stagedQuery || initialQueriesMap.traces,
 			graphType: panelType || PANEL_TYPES.TABLE,
@@ -51,14 +49,6 @@ function TableView({
 		},
 	);
 
-	useEffect(() => {
-		if (isLoading || isFetching) {
-			setIsLoadingQueries(true);
-		} else {
-			setIsLoadingQueries(false);
-		}
-	}, [isLoading, isFetching, setIsLoadingQueries]);
-
 	const queryTableData = useMemo(
 		() =>
 			data?.payload?.data?.newResult?.data?.result ||

frontend/src/container/TracesExplorer/TracesView/index.tsx

@@ -40,13 +40,11 @@ import { ActionsContainer, Container } from './styles';
 interface TracesViewProps {
 	isFilterApplied: boolean;
 	setWarning: Dispatch<SetStateAction<Warning | undefined>>;
-	setIsLoadingQueries: Dispatch<SetStateAction<boolean>>;
 }
 
 function TracesView({
 	isFilterApplied,
 	setWarning,
-	setIsLoadingQueries,
 }: TracesViewProps): JSX.Element {
 	const { stagedQuery, panelType } = useQueryBuilder();
 	const [orderBy, setOrderBy] = useState<string>('timestamp:desc');
@@ -119,14 +117,6 @@ function TracesView({
 		[responseData],
 	);
 
-	useEffect(() => {
-		if (isLoading || isFetching) {
-			setIsLoadingQueries(true);
-		} else {
-			setIsLoadingQueries(false);
-		}
-	}, [isLoading, isFetching, setIsLoadingQueries]);
-
 	useEffect(() => {
 		if (!isLoading && !isFetching && !isError && (tableData || []).length !== 0) {
 			logEvent('Traces Explorer: Data present', {

frontend/src/hooks/querySuggestions/useGetQueryKeyValueSuggestions.ts

@@ -1,44 +1,22 @@
 import { getValueSuggestions } from 'api/querySuggestions/getValueSuggestion';
 import { AxiosError, AxiosResponse } from 'axios';
-import { useQuery, UseQueryOptions, UseQueryResult } from 'react-query';
-import { ErrorResponse } from 'react-router-dom-v5-compat';
-import { SuccessResponse } from 'types/api';
+import { useQuery, UseQueryResult } from 'react-query';
 import { QueryKeyValueSuggestionsResponseProps } from 'types/api/querySuggestions/types';
 
 export const useGetQueryKeyValueSuggestions = ({
 	key,
 	signal,
 	searchText,
-	signalSource,
-	metricName,
 }: {
 	key: string;
 	signal: 'traces' | 'logs' | 'metrics';
 	searchText?: string;
-	signalSource?: 'meter' | '';
-	options?: UseQueryOptions<
-		SuccessResponse<QueryKeyValueSuggestionsResponseProps> | ErrorResponse
-	>;
-	metricName?: string;
 }): UseQueryResult<
 	AxiosResponse<QueryKeyValueSuggestionsResponseProps>,
 	AxiosError
 > =>
 	useQuery<AxiosResponse<QueryKeyValueSuggestionsResponseProps>, AxiosError>({
-		queryKey: [
-			'queryKeyValueSuggestions',
-			key,
-			signal,
-			searchText,
-			signalSource,
-			metricName,
-		],
+		queryKey: ['queryKeyValueSuggestions', key, signal, searchText],
 		queryFn: () =>
-			getValueSuggestions({
-				signal,
-				key,
-				searchText: searchText || '',
-				signalSource: signalSource as 'meter' | '',
-				metricName: metricName || '',
-			}),
+			getValueSuggestions({ signal, key, searchText: searchText || '' }),
 	});

frontend/src/hooks/saveViews/useGetAllViews.ts

@@ -5,9 +5,9 @@ import { AllViewsProps } from 'types/api/saveViews/types';
 import { DataSource } from 'types/common/queryBuilder';
 
 export const useGetAllViews = (
-	sourcepage: DataSource | 'meter',
+	sourcepage: DataSource,
 ): UseQueryResult<AxiosResponse<AllViewsProps>, AxiosError> =>
 	useQuery<AxiosResponse<AllViewsProps>, AxiosError>({
 		queryKey: [{ sourcepage }],
-		queryFn: () => getAllViews(sourcepage as DataSource),
+		queryFn: () => getAllViews(sourcepage),
 	});

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

@@ -490,7 +490,6 @@ export const defaultOutput = {
 				pageSize: 0,
 				queryName: 'A',
 				reduceTo: 'avg',
-				source: '',
 				spaceAggregation: 'sum',
 				stepInterval: 240,
 				timeAggregation: 'rate',

frontend/src/pages/MessagingQueues/MQDetails/MetricPage/MetricPage.tsx

@@ -6,7 +6,7 @@ import cx from 'classnames';
 import { CardContainer } from 'container/GridCardLayout/styles';
 import { useIsDarkMode } from 'hooks/useDarkMode';
 import { ChevronDown, ChevronUp } from 'lucide-react';
-import { useCallback, useRef, useState } from 'react';
+import { useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Widgets } from 'types/api/dashboard/getAll';
 
@@ -129,22 +129,23 @@ function MetricPage(): JSX.Element {
 		},
 	];
 
-	const renderedGraphCountRef = useRef(0);
+	const [renderedGraphCount, setRenderedGraphCount] = useState(0);
 	const hasLoggedRef = useRef(false);
 
-	const checkIfDataExists = useCallback((isDataAvailable: boolean): void => {
+	const checkIfDataExists = (isDataAvailable: boolean): void => {
 		if (isDataAvailable) {
-			renderedGraphCountRef.current += 1;
+			const newCount = renderedGraphCount + 1;
+			setRenderedGraphCount(newCount);
 
 			// Only log when first graph has rendered and we haven't logged yet
-			if (renderedGraphCountRef.current === 1 && !hasLoggedRef.current) {
+			if (newCount === 1 && !hasLoggedRef.current) {
 				logEvent('MQ Kafka: Metric view', {
 					graphRendered: true,
 				});
 				hasLoggedRef.current = true;
 			}
 		}
-	}, []);
+	};
 
 	return (
 		<div className="metric-page">

frontend/src/pages/MeterExplorer/MeterExplorer.styles.scss

@@ -1,16 +0,0 @@
-.meter-explorer-page {
-	.ant-tabs-nav {
-		margin-bottom: 0;
-	}
-
-	.ant-tabs-tab {
-		padding: 8px 16px;
-		margin: 0 8px 0 0 !important;
-
-		.tab-item {
-			display: flex;
-			gap: 8px;
-			align-items: center;
-		}
-	}
-}

frontend/src/pages/MeterExplorer/MeterExplorerPage.tsx

@@ -1,22 +0,0 @@
-import './MeterExplorer.styles.scss';
-
-import RouteTab from 'components/RouteTab';
-import { TabRoutes } from 'components/RouteTab/types';
-import history from 'lib/history';
-import { useLocation } from 'react-use';
-
-import { Explorer, Views } from './constants';
-
-function MeterExplorerPage(): JSX.Element {
-	const { pathname } = useLocation();
-
-	const routes: TabRoutes[] = [Explorer, Views];
-
-	return (
-		<div className="meter-explorer-page">
-			<RouteTab routes={routes} activeKey={pathname} history={history} />
-		</div>
-	);
-}
-
-export default MeterExplorerPage;

frontend/src/pages/MeterExplorer/constants.tsx

@@ -1,32 +0,0 @@
-import { TabRoutes } from 'components/RouteTab/types';
-import ROUTES from 'constants/routes';
-import ExplorerPage from 'container/MeterExplorer/Explorer';
-import { Compass, TowerControl } from 'lucide-react';
-import SaveView from 'pages/SaveView';
-import { PreferenceContextProvider } from 'providers/preferences/context/PreferenceContextProvider';
-
-export const Explorer: TabRoutes = {
-	Component: (): JSX.Element => (
-		<PreferenceContextProvider>
-			<ExplorerPage />
-		</PreferenceContextProvider>
-	),
-	name: (
-		<div className="tab-item">
-			<Compass size={16} /> Explorer
-		</div>
-	),
-	route: ROUTES.METER_EXPLORER,
-	key: ROUTES.METER_EXPLORER,
-};
-
-export const Views: TabRoutes = {
-	Component: SaveView,
-	name: (
-		<div className="tab-item">
-			<TowerControl size={16} /> Views
-		</div>
-	),
-	route: ROUTES.METER_EXPLORER_VIEWS,
-	key: ROUTES.METER_EXPLORER_VIEWS,
-};

frontend/src/pages/MeterExplorer/index.tsx

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

frontend/src/pages/SaveView/constants.ts

@@ -6,7 +6,6 @@ export const SOURCEPAGE_VS_ROUTES: {
 	logs: ROUTES.LOGS_EXPLORER,
 	traces: ROUTES.TRACES_EXPLORER,
 	metrics: ROUTES.METRICS_EXPLORER_EXPLORER,
-	meter: ROUTES.METER_EXPLORER,
 } as const;
 
 export const ROUTES_VS_SOURCEPAGE: {
@@ -15,5 +14,4 @@ export const ROUTES_VS_SOURCEPAGE: {
 	[ROUTES.LOGS_SAVE_VIEWS]: 'logs',
 	[ROUTES.TRACES_SAVE_VIEWS]: 'traces',
 	[ROUTES.METRICS_EXPLORER_VIEWS]: 'metrics',
-	[ROUTES.METER_EXPLORER_VIEWS]: 'meter',
 } as const;

frontend/src/pages/SaveView/index.tsx

@@ -17,10 +17,6 @@ import {
 } from 'components/ExplorerCard/utils';
 import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';
 import { getRandomColor } from 'container/ExplorerOptions/utils';
-import {
-	MeterExplorerEventKeys,
-	MeterExplorerEvents,
-} from 'container/MeterExplorer/events';
 import {
 	MetricsExplorerEventKeys,
 	MetricsExplorerEvents,
@@ -167,10 +163,6 @@ function SaveView(): JSX.Element {
 				logEvent(MetricsExplorerEvents.TabChanged, {
 					[MetricsExplorerEventKeys.Tab]: 'views',
 				});
-			} else if (sourcepage === 'meter') {
-				logEvent(MeterExplorerEvents.TabChanged, {
-					[MeterExplorerEventKeys.Tab]: 'views',
-				});
 			}
 			logEventCalledRef.current = true;
 		}

frontend/src/pages/TracesExplorer/index.tsx

@@ -69,7 +69,6 @@ function TracesExplorer(): JSX.Element {
 
 	// Get panel type from URL
 	const panelTypesFromUrl = useGetPanelTypesQueryParam(PANEL_TYPES.LIST);
-	const [isLoadingQueries, setIsLoadingQueries] = useState<boolean>(false);
 
 	const [selectedView, setSelectedView] = useState<ExplorerViews>(() =>
 		getExplorerViewFromUrl(searchParams, panelTypesFromUrl),
@@ -324,7 +323,6 @@ function TracesExplorer(): JSX.Element {
 							rightActions={
 								<RightToolbarActions
 									onStageRunQuery={(): void => handleRunQuery(true, true)}
-									isLoadingQueries={isLoadingQueries}
 								/>
 							}
 						/>
@@ -346,21 +344,13 @@ function TracesExplorer(): JSX.Element {
 
 						{selectedView === ExplorerViews.LIST && (
 							<div className="trace-explorer-list-view">
-								<ListView
-									isFilterApplied={isFilterApplied}
-									setWarning={setWarning}
-									setIsLoadingQueries={setIsLoadingQueries}
-								/>
+								<ListView isFilterApplied={isFilterApplied} setWarning={setWarning} />
 							</div>
 						)}
 
 						{selectedView === ExplorerViews.TRACE && (
 							<div className="trace-explorer-traces-view">
-								<TracesView
-									isFilterApplied={isFilterApplied}
-									setWarning={setWarning}
-									setIsLoadingQueries={setIsLoadingQueries}
-								/>
+								<TracesView isFilterApplied={isFilterApplied} setWarning={setWarning} />
 							</div>
 						)}
 
@@ -370,17 +360,13 @@ function TracesExplorer(): JSX.Element {
 									dataSource={DataSource.TRACES}
 									isFilterApplied={isFilterApplied}
 									setWarning={setWarning}
-									setIsLoadingQueries={setIsLoadingQueries}
 								/>
 							</div>
 						)}
 
 						{selectedView === ExplorerViews.TABLE && (
 							<div className="trace-explorer-table-view">
-								<TableView
-									setWarning={setWarning}
-									setIsLoadingQueries={setIsLoadingQueries}
-								/>
+								<TableView setWarning={setWarning} />
 							</div>
 						)}
 					</div>

frontend/src/providers/QueryBuilder.tsx

@@ -241,26 +241,12 @@ export function QueryBuilderProvider({
 	);
 
 	const updateAllQueriesOperators = useCallback(
-		(
-			query: Query,
-			panelType: PANEL_TYPES,
-			dataSource: DataSource,
-			signalSource?: 'meter' | '',
-		): Query => {
+		(query: Query, panelType: PANEL_TYPES, dataSource: DataSource): Query => {
 			const queryData = query.builder.queryData?.map((item) =>
 				getElementWithActualOperator(item, dataSource, panelType),
 			);
 
-			return {
-				...query,
-				builder: {
-					...query.builder,
-					queryData: queryData.map((item) => ({
-						...item,
-						source: signalSource,
-					})),
-				},
-			};
+			return { ...query, builder: { ...query.builder, queryData } };
 		},
 
 		[getElementWithActualOperator],
@@ -868,7 +854,6 @@ export function QueryBuilderProvider({
 	const handleRunQuery = useCallback(
 		(shallUpdateStepInterval?: boolean, newQBQuery?: boolean) => {
 			let currentQueryData = currentQuery;
-
 			if (newQBQuery) {
 				currentQueryData = {
 					...currentQueryData,

frontend/src/providers/preferences/loader/usePreferenceLoader.ts

@@ -1,7 +1,6 @@
 /* eslint-disable sonarjs/cognitive-complexity */
 /* eslint-disable no-empty */
 import { TelemetryFieldKey } from 'api/v5/v5';
-import { has } from 'lodash-es';
 import { useEffect, useState } from 'react';
 import { DataSource } from 'types/common/queryBuilder';
 
@@ -9,14 +8,6 @@ import logsLoaderConfig from '../configs/logsLoaderConfig';
 import tracesLoaderConfig from '../configs/tracesLoaderConfig';
 import { FormattingOptions, Preferences } from '../types';
 
-const migrateColumns = (columns: any): any =>
-	columns.map((column: any) => {
-		if (has(column, 'key') && !has(column, 'name')) {
-			return { ...column, name: column.key };
-		}
-		return column;
-	});
-
 // Generic preferences loader that works with any config
 async function preferencesLoader<T>(config: {
 	priority: readonly string[];
@@ -35,16 +26,11 @@ async function preferencesLoader<T>(config: {
 		const validColumnsResult = results.find(
 			({ result }) => result.columns?.length,
 		);
-
 		const validFormattingResult = results.find(({ result }) => result.formatting);
 
-		const migratedColumns = validColumnsResult?.result.columns
-			? migrateColumns(validColumnsResult?.result.columns)
-			: undefined;
-
 		// Combine valid results or fallback to default
 		const finalResult = {
-			columns: migratedColumns || config.default().columns,
+			columns: validColumnsResult?.result.columns || config.default().columns,
 			formatting:
 				validFormattingResult?.result.formatting || config.default().formatting,
 		};

frontend/src/types/api/queryBuilder/getAggregatorAttribute.ts

@@ -4,5 +4,4 @@ export interface IGetAggregateAttributePayload {
 	aggregateOperator: string;
 	dataSource: DataSource;
 	searchText: string;
-	source?: 'meter' | '';
 }

frontend/src/types/api/queryBuilder/queryBuilderData.ts

@@ -87,7 +87,6 @@ export type IBuilderQuery = {
 	pageSize?: number;
 	offset?: number;
 	selectColumns?: BaseAutocompleteData[] | TelemetryFieldKey[];
-	source?: 'meter' | '';
 };
 
 export interface IClickHouseQuery {

frontend/src/types/api/querySuggestions/types.ts

@@ -28,7 +28,6 @@ export interface QueryKeyRequestProps {
 	fieldContext?: 'resource' | 'scope' | 'attribute' | 'span';
 	fieldDataType?: QUERY_BUILDER_KEY_TYPES;
 	metricName?: string;
-	signalSource?: 'meter' | '';
 }
 
 export interface QueryKeyValueSuggestionsProps {
@@ -45,8 +44,4 @@ export interface QueryKeyValueRequestProps {
 	signal: 'traces' | 'logs' | 'metrics';
 	key: string;
 	searchText: string;
-	signalSource?: 'meter' | '';
-	metricName?: string;
 }
-
-export type SignalType = 'traces' | 'logs' | 'metrics';

frontend/src/types/api/v5/queryRange.ts

@@ -239,17 +239,10 @@ export interface MetricBuilderQuery extends BaseBuilderQuery {
 	aggregations?: MetricAggregation[];
 }
 
-export interface MeterBuilderQuery extends BaseBuilderQuery {
-	signal: 'metrics';
-	source: 'meter';
-	aggregations?: MetricAggregation[];
-}
-
 export type BuilderQuery =
 	| TraceBuilderQuery
 	| LogBuilderQuery
-	| MetricBuilderQuery
-	| MeterBuilderQuery;
+	| MetricBuilderQuery;
 
 export interface QueryBuilderFormula {
 	name: string;

frontend/src/types/common/queryBuilder.ts

@@ -105,42 +105,6 @@ export enum MetricAggregateOperator {
 	LATEST = 'latest',
 }
 
-export enum MeterAggregateOperator {
-	EMPTY = '', // used as time aggregator for histograms
-	NOOP = 'noop',
-	COUNT = 'count',
-	COUNT_DISTINCT = 'count_distinct',
-	SUM = 'sum',
-	AVG = 'avg',
-	MAX = 'max',
-	MIN = 'min',
-	P05 = 'p05',
-	P10 = 'p10',
-	P20 = 'p20',
-	P25 = 'p25',
-	P50 = 'p50',
-	P75 = 'p75',
-	P90 = 'p90',
-	P95 = 'p95',
-	P99 = 'p99',
-	RATE = 'rate',
-	SUM_RATE = 'sum_rate',
-	AVG_RATE = 'avg_rate',
-	MAX_RATE = 'max_rate',
-	MIN_RATE = 'min_rate',
-	RATE_SUM = 'rate_sum',
-	RATE_AVG = 'rate_avg',
-	RATE_MIN = 'rate_min',
-	RATE_MAX = 'rate_max',
-	HIST_QUANTILE_50 = 'hist_quantile_50',
-	HIST_QUANTILE_75 = 'hist_quantile_75',
-	HIST_QUANTILE_90 = 'hist_quantile_90',
-	HIST_QUANTILE_95 = 'hist_quantile_95',
-	HIST_QUANTILE_99 = 'hist_quantile_99',
-	INCREASE = 'increase',
-	LATEST = 'latest',
-}
-
 export enum TracesAggregatorOperator {
 	NOOP = 'noop',
 	COUNT = 'count',
@@ -273,7 +237,6 @@ export type QueryBuilderContextType = {
 		queryData: Query,
 		panelType: PANEL_TYPES,
 		dataSource: DataSource,
-		signalSource?: 'meter' | '',
 	) => Query;
 	updateQueriesData: <T extends keyof QueryBuilderData>(
 		query: Query,

frontend/src/utils/permission/index.ts

@@ -123,7 +123,4 @@ export const routePermission: Record<keyof typeof ROUTES, ROLES[]> = {
 	INFRASTRUCTURE_MONITORING_BASE: ['ADMIN', 'EDITOR', 'VIEWER'],
 	API_MONITORING_BASE: ['ADMIN', 'EDITOR', 'VIEWER'],
 	MESSAGING_QUEUES_BASE: ['ADMIN', 'EDITOR', 'VIEWER'],
-	METER_EXPLORER: ['ADMIN', 'EDITOR', 'VIEWER'],
-	METER_EXPLORER_BASE: ['ADMIN', 'EDITOR', 'VIEWER'],
-	METER_EXPLORER_VIEWS: ['ADMIN', 'EDITOR', 'VIEWER'],
 };

pkg/apis/fields/api.go

@@ -31,7 +31,6 @@ func NewAPI(
 		telemetryStore,
 		telemetrytraces.DBName,
 		telemetrytraces.TagAttributesV2TableName,
-		telemetrytraces.SpanAttributesKeysTblName,
 		telemetrytraces.SpanIndexV3TableName,
 		telemetrymetrics.DBName,
 		telemetrymetrics.AttributesMetadataTableName,
@@ -40,8 +39,6 @@ func NewAPI(
 		telemetrylogs.DBName,
 		telemetrylogs.LogsV2TableName,
 		telemetrylogs.TagAttributesV2TableName,
-		telemetrylogs.LogAttributeKeysTblName,
-		telemetrylogs.LogResourceKeysTblName,
 		telemetrymetadata.DBName,
 		telemetrymetadata.AttributesMetadataLocalTableName,
 	)

pkg/querier/signozquerier/provider.go

@@ -50,7 +50,6 @@ func newProvider(
 		telemetryStore,
 		telemetrytraces.DBName,
 		telemetrytraces.TagAttributesV2TableName,
-		telemetrytraces.SpanAttributesKeysTblName,
 		telemetrytraces.SpanIndexV3TableName,
 		telemetrymetrics.DBName,
 		telemetrymetrics.AttributesMetadataTableName,
@@ -59,8 +58,6 @@ func newProvider(
 		telemetrylogs.DBName,
 		telemetrylogs.LogsV2TableName,
 		telemetrylogs.TagAttributesV2TableName,
-		telemetrylogs.LogAttributeKeysTblName,
-		telemetrylogs.LogResourceKeysTblName,
 		telemetrymetadata.DBName,
 		telemetrymetadata.AttributesMetadataLocalTableName,
 	)
@@ -72,13 +69,12 @@ func newProvider(
 	resourceFilterFieldMapper := resourcefilter.NewFieldMapper()
 	resourceFilterConditionBuilder := resourcefilter.NewConditionBuilder(resourceFilterFieldMapper)
 	resourceFilterStmtBuilder := resourcefilter.NewTraceResourceFilterStatementBuilder(
-		settings,
 		resourceFilterFieldMapper,
 		resourceFilterConditionBuilder,
 		telemetryMetadataStore,
 	)
 
-	traceAggExprRewriter := querybuilder.NewAggExprRewriter(settings, nil, traceFieldMapper, traceConditionBuilder, "", nil)
+	traceAggExprRewriter := querybuilder.NewAggExprRewriter(nil, traceFieldMapper, traceConditionBuilder, "", nil)
 	traceStmtBuilder := telemetrytraces.NewTraceQueryStatementBuilder(
 		settings,
 		telemetryMetadataStore,
@@ -93,7 +89,6 @@ func newProvider(
 	logFieldMapper := telemetrylogs.NewFieldMapper()
 	logConditionBuilder := telemetrylogs.NewConditionBuilder(logFieldMapper)
 	logResourceFilterStmtBuilder := resourcefilter.NewLogResourceFilterStatementBuilder(
-		settings,
 		resourceFilterFieldMapper,
 		resourceFilterConditionBuilder,
 		telemetryMetadataStore,
@@ -102,7 +97,6 @@ func newProvider(
 		telemetrylogs.GetBodyJSONKey,
 	)
 	logAggExprRewriter := querybuilder.NewAggExprRewriter(
-		settings,
 		telemetrylogs.DefaultFullTextColumn,
 		logFieldMapper,
 		logConditionBuilder,

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

@@ -385,7 +385,7 @@ func (r *ClickHouseReader) buildResourceSubQuery(tags []model.TagQueryParam, svc
 	return resourceSubQuery, nil
 }
 
-func (r *ClickHouseReader) GetServicesOG(ctx context.Context, queryParams *model.GetServicesParams) (*[]model.ServiceItem, *model.ApiError) {
+func (r *ClickHouseReader) GetServices(ctx context.Context, queryParams *model.GetServicesParams) (*[]model.ServiceItem, *model.ApiError) {
 
 	if r.indexTable == "" {
 		return nil, &model.ApiError{Typ: model.ErrorExec, Err: ErrNoIndexTable}
@@ -428,7 +428,7 @@ func (r *ClickHouseReader) GetServicesOG(ctx context.Context, queryParams *model
 
 			query := fmt.Sprintf(
 				`SELECT
-					toFloat64(quantileExact(0.99)(duration_nano)) as p99,
+					quantile(0.99)(duration_nano) as p99,
 					avg(duration_nano) as avgDuration,
 					count(*) as numCalls
 				FROM %s.%s
@@ -510,274 +510,6 @@ func (r *ClickHouseReader) GetServicesOG(ctx context.Context, queryParams *model
 	return &serviceItems, nil
 }
 
-func (r *ClickHouseReader) GetServices(ctx context.Context, queryParams *model.GetServicesParams) (*[]model.ServiceItem, *model.ApiError) {
-	if r.indexTable == "" {
-		return nil, &model.ApiError{Typ: model.ErrorExec, Err: ErrNoIndexTable}
-	}
-
-	topLevelOps, apiErr := r.GetTopLevelOperations(ctx, *queryParams.Start, *queryParams.End, nil)
-	if apiErr != nil {
-		return nil, apiErr
-	}
-	// Build parallel arrays for arrayZip approach
-	var ops []string
-	var svcs []string
-	serviceOperationsMap := make(map[string][]string)
-
-	for svc, opsList := range *topLevelOps {
-		// Cap operations to 1500 per service (same as original logic)
-		cappedOps := opsList[:int(math.Min(1500, float64(len(opsList))))]
-		serviceOperationsMap[svc] = cappedOps
-
-		// Add to parallel arrays
-		for _, op := range cappedOps {
-			ops = append(ops, op)
-			svcs = append(svcs, svc)
-		}
-	}
-
-	fmt.Printf("Operation pairs count: %d\n", len(ops))
-
-	// Build resource subquery for all services, but only include our target services
-	targetServices := make([]string, 0, len(*topLevelOps))
-	for svc := range *topLevelOps {
-		targetServices = append(targetServices, svc)
-	}
-	resourceSubQuery, err := r.buildResourceSubQueryForServices(queryParams.Tags, targetServices, *queryParams.Start, *queryParams.End)
-	if err != nil {
-		zap.L().Error("Error building resource subquery", zap.Error(err))
-		return nil, &model.ApiError{Typ: model.ErrorExec, Err: err}
-	}
-
-	// Build the optimized single query using arrayZip for tuple creation
-	query := fmt.Sprintf(`
-		SELECT 
-			resource_string_service$$name AS serviceName,
-			toFloat64(quantileExact(0.99)(duration_nano)) AS p99,
-			avg(duration_nano) AS avgDuration,
-			count(*) AS numCalls,
-			countIf(statusCode = 2) AS numErrors
-		FROM %s.%s
-		WHERE (name, resource_string_service$$name) IN arrayZip(@ops, @svcs)
-			AND timestamp >= @start 
-			AND timestamp <= @end
-			AND ts_bucket_start >= @start_bucket 
-			AND ts_bucket_start <= @end_bucket
-			AND (resource_fingerprint GLOBAL IN %s)
-		GROUP BY serviceName
-		ORDER BY numCalls DESC`,
-		r.TraceDB, r.traceTableName, resourceSubQuery,
-	)
-
-	args := []interface{}{
-		clickhouse.Named("start", strconv.FormatInt(queryParams.Start.UnixNano(), 10)),
-		clickhouse.Named("end", strconv.FormatInt(queryParams.End.UnixNano(), 10)),
-		clickhouse.Named("start_bucket", strconv.FormatInt(queryParams.Start.Unix()-1800, 10)),
-		clickhouse.Named("end_bucket", strconv.FormatInt(queryParams.End.Unix(), 10)),
-		// Important: wrap slices with clickhouse.Array for IN/array params
-		clickhouse.Named("ops", ops),
-		clickhouse.Named("svcs", svcs),
-	}
-
-	fmt.Printf("Query: %s\n", query)
-
-	// Execute the single optimized query
-	rows, err := r.db.Query(ctx, query, args...)
-	if err != nil {
-		zap.L().Error("Error executing optimized services query", zap.Error(err))
-		return nil, &model.ApiError{Typ: model.ErrorExec, Err: err}
-	}
-	defer rows.Close()
-
-	// Process results
-	serviceItems := []model.ServiceItem{}
-
-	for rows.Next() {
-		var serviceItem model.ServiceItem
-		err := rows.ScanStruct(&serviceItem)
-		if err != nil {
-			zap.L().Error("Error scanning service item", zap.Error(err))
-			continue
-		}
-
-		// Skip services with zero calls (match original behavior)
-		if serviceItem.NumCalls == 0 {
-			continue
-		}
-
-		// Add data warning for this service
-		if ops, exists := serviceOperationsMap[serviceItem.ServiceName]; exists {
-			serviceItem.DataWarning = model.DataWarning{
-				TopLevelOps: ops,
-			}
-		}
-
-		// Calculate derived fields
-		serviceItem.CallRate = float64(serviceItem.NumCalls) / float64(queryParams.Period)
-		if serviceItem.NumCalls > 0 {
-			serviceItem.ErrorRate = float64(serviceItem.NumErrors) * 100 / float64(serviceItem.NumCalls)
-		}
-
-		serviceItems = append(serviceItems, serviceItem)
-	}
-
-	if err = rows.Err(); err != nil {
-		zap.L().Error("Error iterating over service results", zap.Error(err))
-		return nil, &model.ApiError{Typ: model.ErrorExec, Err: err}
-	}
-
-	// Fetch results from the original GetServicesOG for comparison
-	ogResults, ogErr := r.GetServicesOG(ctx, queryParams)
-	if ogErr != nil {
-		zap.L().Error("Error fetching OG service results", zap.Error(ogErr))
-	} else {
-		// Compare the optimized results with OG results
-		ogMap := make(map[string]model.ServiceItem)
-		for _, ogItem := range *ogResults {
-			ogMap[ogItem.ServiceName] = ogItem
-		}
-
-		for _, optItem := range serviceItems {
-			if ogItem, exists := ogMap[optItem.ServiceName]; exists {
-				// Compare key fields (NumCalls, NumErrors, etc.)
-				if optItem.NumCalls != ogItem.NumCalls ||
-					optItem.NumErrors != ogItem.NumErrors ||
-					int64(optItem.Percentile99) != int64(ogItem.Percentile99) ||
-					int64(optItem.AvgDuration) != int64(ogItem.AvgDuration) {
-					fmt.Printf(
-						"[Discrepancy] Service: %s | optNumCalls: %d, ogNumCalls: %d | optNumErrors: %d, ogNumErrors: %d | optP99: %.2f, ogP99: %.2f | optAvgDuration: %.2f, ogAvgDuration: %.2f\n",
-						optItem.ServiceName,
-						optItem.NumCalls, ogItem.NumCalls,
-						optItem.NumErrors, ogItem.NumErrors,
-						optItem.Percentile99, ogItem.Percentile99,
-						optItem.AvgDuration, ogItem.AvgDuration,
-					)
-				}
-			} else {
-				zap.L().Warn("Service present in optimized results but missing in OG results",
-					zap.String("service", optItem.ServiceName))
-			}
-		}
-
-		// Check for services present in OG but missing in optimized
-		optMap := make(map[string]struct{})
-		for _, optItem := range serviceItems {
-			optMap[optItem.ServiceName] = struct{}{}
-		}
-		for _, ogItem := range *ogResults {
-			if _, exists := optMap[ogItem.ServiceName]; !exists {
-				fmt.Printf("Service present in OG results but missing in optimized results: %s\n", ogItem.ServiceName)
-			}
-		}
-	}
-
-	return &serviceItems, nil
-}
-
-// buildResourceSubQueryForServices builds a resource subquery that includes only specific services
-// This maintains service context while optimizing for multiple services in a single query
-func (r *ClickHouseReader) buildResourceSubQueryForServices(tags []model.TagQueryParam, targetServices []string, start, end time.Time) (string, error) {
-	if len(targetServices) == 0 {
-		return "", fmt.Errorf("no target services provided")
-	}
-
-	if len(tags) == 0 {
-		// For exact parity with per-service behavior, build via resource builder with only service filter
-		filterSet := v3.FilterSet{}
-		filterSet.Items = append(filterSet.Items, v3.FilterItem{
-			Key: v3.AttributeKey{
-				Key:      "service.name",
-				DataType: v3.AttributeKeyDataTypeString,
-				Type:     v3.AttributeKeyTypeResource,
-			},
-			Operator: v3.FilterOperatorIn,
-			Value:    targetServices,
-		})
-
-		resourceSubQuery, err := resource.BuildResourceSubQuery(
-			r.TraceDB,
-			r.traceResourceTableV3,
-			start.Unix()-1800,
-			end.Unix(),
-			&filterSet,
-			[]v3.AttributeKey{},
-			v3.AttributeKey{},
-			false)
-		if err != nil {
-			zap.L().Error("Error building resource subquery for services", zap.Error(err))
-			return "", err
-		}
-		return resourceSubQuery, nil
-	}
-
-	// Convert tags to filter set
-	filterSet := v3.FilterSet{}
-	for _, tag := range tags {
-		// Skip the collector id as we don't add it to traces
-		if tag.Key == "signoz.collector.id" {
-			continue
-		}
-
-		var it v3.FilterItem
-		it.Key = v3.AttributeKey{
-			Key:      tag.Key,
-			DataType: v3.AttributeKeyDataTypeString,
-			Type:     v3.AttributeKeyTypeResource,
-		}
-
-		switch tag.Operator {
-		case model.NotInOperator:
-			it.Operator = v3.FilterOperatorNotIn
-			it.Value = tag.StringValues
-		case model.InOperator:
-			it.Operator = v3.FilterOperatorIn
-			it.Value = tag.StringValues
-		default:
-			return "", fmt.Errorf("operator %s not supported", tag.Operator)
-		}
-
-		filterSet.Items = append(filterSet.Items, it)
-	}
-
-	// Add service filter to limit to our target services
-	filterSet.Items = append(filterSet.Items, v3.FilterItem{
-		Key: v3.AttributeKey{
-			Key:      "service.name",
-			DataType: v3.AttributeKeyDataTypeString,
-			Type:     v3.AttributeKeyTypeResource,
-		},
-		Operator: v3.FilterOperatorIn,
-		Value:    targetServices,
-	})
-
-	// Build resource subquery with service-specific filtering
-	resourceSubQuery, err := resource.BuildResourceSubQuery(
-		r.TraceDB,
-		r.traceResourceTableV3,
-		start.Unix()-1800,
-		end.Unix(),
-		&filterSet,
-		[]v3.AttributeKey{},
-		v3.AttributeKey{},
-		false)
-	if err != nil {
-		zap.L().Error("Error building resource subquery for services", zap.Error(err))
-		return "", err
-	}
-	return resourceSubQuery, nil
-}
-
-// buildServiceInClause creates a properly quoted IN clause for service names
-func (r *ClickHouseReader) buildServiceInClause(services []string) string {
-	var quotedServices []string
-	for _, svc := range services {
-		// Escape single quotes and wrap in quotes
-		escapedSvc := strings.ReplaceAll(svc, "'", "\\'")
-		quotedServices = append(quotedServices, fmt.Sprintf("'%s'", escapedSvc))
-	}
-	return strings.Join(quotedServices, ", ")
-}
-
 func getStatusFilters(query string, statusParams []string, excludeMap map[string]struct{}) string {
 	// status can only be two and if both are selected than they are equivalent to none selected
 	if _, ok := excludeMap["status"]; ok {
@@ -797,6 +529,7 @@ func getStatusFilters(query string, statusParams []string, excludeMap map[string
 	}
 	return query
 }
+
 func createTagQueryFromTagQueryParams(queryParams []model.TagQueryParam) []model.TagQuery {
 	tags := []model.TagQuery{}
 	for _, tag := range queryParams {
@@ -953,6 +686,7 @@ func addExistsOperator(item model.TagQuery, tagMapType string, not bool) (string
 	}
 	return fmt.Sprintf(" AND %s (%s)", notStr, strings.Join(tagOperatorPair, " OR ")), args
 }
+
 func (r *ClickHouseReader) GetEntryPointOperations(ctx context.Context, queryParams *model.GetTopOperationsParams) (*[]model.TopOperationsItem, error) {
 	// Step 1: Get top operations for the given service
 	topOps, err := r.GetTopOperations(ctx, queryParams)
@@ -1021,9 +755,9 @@ func (r *ClickHouseReader) GetTopOperations(ctx context.Context, queryParams *mo
 
 	query := fmt.Sprintf(`
 		SELECT
-			toFloat64(quantileExact(0.5)(durationNano)) as p50,
-			toFloat64(quantileExact(0.95)(durationNano)) as p95,
-			toFloat64(quantileExact(0.99)(durationNano)) as p99,
+			quantile(0.5)(durationNano) as p50,
+			quantile(0.95)(durationNano) as p95,
+			quantile(0.99)(durationNano) as p99,
 			COUNT(*) as numCalls,
 			countIf(status_code=2) as errorCount,
 			name
@@ -1505,11 +1239,11 @@ func (r *ClickHouseReader) GetDependencyGraph(ctx context.Context, queryParams *
 		SELECT
 			src as parent,
 			dest as child,
-			toFloat64(result[1]) AS p50,
-			toFloat64(result[2]) AS p75,
-			toFloat64(result[3]) AS p90,
-			toFloat64(result[4]) AS p95,
-			toFloat64(result[5]) AS p99,
+			result[1] AS p50,
+			result[2] AS p75,
+			result[3] AS p90,
+			result[4] AS p95,
+			result[5] AS p99,
 			sum(total_count) as callCount,
 			sum(total_count)/ @duration AS callRate,
 			sum(error_count)/sum(total_count) * 100 as errorRate
@@ -1541,6 +1275,7 @@ func getLocalTableName(tableName string) string {
 	return tableNameSplit[0] + "." + strings.Split(tableNameSplit[1], "distributed_")[1]
 
 }
+
 func (r *ClickHouseReader) setTTLLogs(ctx context.Context, orgID string, params *model.TTLParams) (*model.SetTTLResponseItem, *model.ApiError) {
 	// uuid is used as transaction id
 	uuidWithHyphen := uuid.New()
@@ -1681,6 +1416,7 @@ func (r *ClickHouseReader) setTTLLogs(ctx context.Context, orgID string, params
 	}(ttlPayload)
 	return &model.SetTTLResponseItem{Message: "move ttl has been successfully set up"}, nil
 }
+
 func (r *ClickHouseReader) setTTLTraces(ctx context.Context, orgID string, params *model.TTLParams) (*model.SetTTLResponseItem, *model.ApiError) {
 	// uuid is used as transaction id
 	uuidWithHyphen := uuid.New()
@@ -2321,6 +2057,7 @@ func (r *ClickHouseReader) ListErrors(ctx context.Context, queryParams *model.Li
 
 	return &getErrorResponses, nil
 }
+
 func (r *ClickHouseReader) CountErrors(ctx context.Context, queryParams *model.CountErrorsParams) (uint64, *model.ApiError) {
 
 	var errorCount uint64
@@ -2432,6 +2169,7 @@ func (r *ClickHouseReader) GetNextPrevErrorIDs(ctx context.Context, queryParams
 	return &getNextPrevErrorIDsResponse, nil
 
 }
+
 func (r *ClickHouseReader) getNextErrorID(ctx context.Context, queryParams *model.GetErrorParams) (string, time.Time, *model.ApiError) {
 
 	var getNextErrorIDReponse []model.NextPrevErrorIDsDBResponse
@@ -3092,6 +2830,7 @@ func (r *ClickHouseReader) GetMetricAttributeKeys(ctx context.Context, req *v3.F
 
 	return &response, nil
 }
+
 func (r *ClickHouseReader) GetMeterAttributeKeys(ctx context.Context, req *v3.FilterAttributeKeyRequest) (*v3.FilterAttributeKeyResponse, error) {
 	var query string
 	var err error
@@ -3166,6 +2905,7 @@ func (r *ClickHouseReader) GetMetricAttributeValues(ctx context.Context, req *v3
 
 	return &attributeValues, nil
 }
+
 func (r *ClickHouseReader) GetMetricMetadata(ctx context.Context, orgID valuer.UUID, metricName, serviceName string) (*v3.MetricMetadataResponse, error) {
 
 	unixMilli := common.PastDayRoundOff()
@@ -3837,6 +3577,7 @@ func readRow(vars []interface{}, columnNames []string, countOfNumberCols int) ([
 	}
 	return groupBy, groupAttributes, groupAttributesArray, nil
 }
+
 func readRowsForTimeSeriesResult(rows driver.Rows, vars []interface{}, columnNames []string, countOfNumberCols int) ([]*v3.Series, error) {
 	// when groupBy is applied, each combination of cartesian product
 	// of attribute values is a separate series. Each item in seriesToPoints
@@ -4632,6 +4373,7 @@ func (r *ClickHouseReader) ReadRuleStateHistoryByRuleID(
 
 	return timeline, nil
 }
+
 func (r *ClickHouseReader) ReadRuleStateHistoryTopContributorsByRuleID(
 	ctx context.Context, ruleID string, params *model.QueryRuleStateHistory) ([]model.RuleStateHistoryContributor, error) {
 	query := fmt.Sprintf(`SELECT
@@ -5220,6 +4962,7 @@ func (r *ClickHouseReader) GetActiveTimeSeriesForMetricName(ctx context.Context,
 	}
 	return timeSeries, nil
 }
+
 func (r *ClickHouseReader) ListSummaryMetrics(ctx context.Context, orgID valuer.UUID, req *metrics_explorer.SummaryListMetricsRequest) (*metrics_explorer.SummaryListMetricsResponse, *model.ApiError) {
 	var args []interface{}
 
@@ -5437,6 +5180,7 @@ func (r *ClickHouseReader) ListSummaryMetrics(ctx context.Context, orgID valuer.
 
 	return &response, nil
 }
+
 func (r *ClickHouseReader) GetMetricsTimeSeriesPercentage(ctx context.Context, req *metrics_explorer.TreeMapMetricsRequest) (*[]metrics_explorer.TreeMapResponseItem, *model.ApiError) {
 	var args []interface{}
 
@@ -6016,6 +5760,7 @@ func (r *ClickHouseReader) GetInspectMetrics(ctx context.Context, req *metrics_e
 		Series: &seriesList,
 	}, nil
 }
+
 func (r *ClickHouseReader) GetInspectMetricsFingerprints(ctx context.Context, attributes []string, req *metrics_explorer.InspectMetricsRequest) ([]string, *model.ApiError) {
 	// Build dynamic key selections and JSON extracts
 	var jsonExtracts []string
@@ -6188,6 +5933,7 @@ func (r *ClickHouseReader) CheckForLabelsInMetric(ctx context.Context, metricNam
 	}
 	return hasLE, nil
 }
+
 func (r *ClickHouseReader) GetUpdatedMetricsMetadata(ctx context.Context, orgID valuer.UUID, metricNames ...string) (map[string]*model.UpdateMetricsMetadata, *model.ApiError) {
 	cachedMetadata := make(map[string]*model.UpdateMetricsMetadata)
 	var missingMetrics []string

pkg/query-service/rules/manager.go

@@ -971,9 +971,7 @@ func (m *Manager) TestNotification(ctx context.Context, orgID valuer.UUID, ruleS
 		RuleStore:        m.ruleStore,
 		MaintenanceStore: m.maintenanceStore,
 		Logger:           m.logger,
-		SLogger:          m.opts.SLogger,
 		Reader:           m.reader,
-		Querier:          m.opts.Querier,
 		Cache:            m.cache,
 		ManagerOpts:      m.opts,
 		NotifyFunc:       m.prepareTestNotifyFunc(),

pkg/querybuilder/agg_rewrite.go

@@ -3,12 +3,10 @@ package querybuilder
 import (
 	"context"
 	"fmt"
-	"log/slog"
 	"strings"
 
 	chparser "github.com/AfterShip/clickhouse-sql-parser/parser"
 	"github.com/SigNoz/signoz/pkg/errors"
-	"github.com/SigNoz/signoz/pkg/factory"
 	qbtypes "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
 	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
 	"github.com/SigNoz/signoz/pkg/valuer"
@@ -16,7 +14,6 @@ import (
 )
 
 type aggExprRewriter struct {
-	logger           *slog.Logger
 	fullTextColumn   *telemetrytypes.TelemetryFieldKey
 	fieldMapper      qbtypes.FieldMapper
 	conditionBuilder qbtypes.ConditionBuilder
@@ -27,17 +24,13 @@ type aggExprRewriter struct {
 var _ qbtypes.AggExprRewriter = (*aggExprRewriter)(nil)
 
 func NewAggExprRewriter(
-	settings factory.ProviderSettings,
 	fullTextColumn *telemetrytypes.TelemetryFieldKey,
 	fieldMapper qbtypes.FieldMapper,
 	conditionBuilder qbtypes.ConditionBuilder,
 	jsonBodyPrefix string,
 	jsonKeyToKey qbtypes.JsonKeyToFieldFunc,
 ) *aggExprRewriter {
-	set := factory.NewScopedProviderSettings(settings, "github.com/SigNoz/signoz/pkg/querybuilder/agg_rewrite")
-
 	return &aggExprRewriter{
-		logger:           set.Logger(),
 		fullTextColumn:   fullTextColumn,
 		fieldMapper:      fieldMapper,
 		conditionBuilder: conditionBuilder,
@@ -77,7 +70,7 @@ func (r *aggExprRewriter) Rewrite(
 		return "", nil, errors.NewInternalf(errors.CodeInternal, "no SELECT items for %q", expr)
 	}
 
-	visitor := newExprVisitor(r.logger, keys,
+	visitor := newExprVisitor(keys,
 		r.fullTextColumn,
 		r.fieldMapper,
 		r.conditionBuilder,
@@ -124,7 +117,6 @@ func (r *aggExprRewriter) RewriteMulti(
 // exprVisitor walks FunctionExpr nodes and applies the mappers.
 type exprVisitor struct {
 	chparser.DefaultASTVisitor
-	logger           *slog.Logger
 	fieldKeys        map[string][]*telemetrytypes.TelemetryFieldKey
 	fullTextColumn   *telemetrytypes.TelemetryFieldKey
 	fieldMapper      qbtypes.FieldMapper
@@ -137,7 +129,6 @@ type exprVisitor struct {
 }
 
 func newExprVisitor(
-	logger *slog.Logger,
 	fieldKeys map[string][]*telemetrytypes.TelemetryFieldKey,
 	fullTextColumn *telemetrytypes.TelemetryFieldKey,
 	fieldMapper qbtypes.FieldMapper,
@@ -146,7 +137,6 @@ func newExprVisitor(
 	jsonKeyToKey qbtypes.JsonKeyToFieldFunc,
 ) *exprVisitor {
 	return &exprVisitor{
-		logger:           logger,
 		fieldKeys:        fieldKeys,
 		fullTextColumn:   fullTextColumn,
 		fieldMapper:      fieldMapper,
@@ -193,7 +183,6 @@ func (v *exprVisitor) VisitFunctionExpr(fn *chparser.FunctionExpr) error {
 		whereClause, err := PrepareWhereClause(
 			origPred,
 			FilterExprVisitorOpts{
-				Logger:           v.logger,
 				FieldKeys:        v.fieldKeys,
 				FieldMapper:      v.fieldMapper,
 				ConditionBuilder: v.conditionBuilder,

pkg/querybuilder/fallback_expr.go

@@ -2,11 +2,7 @@ package querybuilder
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
-	"math"
-	"reflect"
-	"strconv"
 	"strings"
 
 	"github.com/SigNoz/signoz/pkg/errors"
@@ -120,58 +116,3 @@ func GroupByKeys(keys []qbtypes.GroupByKey) []string {
 	}
 	return k
 }
-
-func FormatValueForContains(value any) string {
-	if value == nil {
-		return ""
-	}
-
-	switch v := value.(type) {
-	case string:
-		return v
-	case []byte:
-		return string(v)
-
-	case json.Number:
-		return v.String()
-
-	case float64:
-		if v == math.Trunc(v) && v >= -1e15 && v <= 1e15 {
-			return fmt.Sprintf("%.0f", v)
-		}
-		return strconv.FormatFloat(v, 'f', -1, 64)
-
-	case float32:
-		return strconv.FormatFloat(float64(v), 'f', -1, 32)
-
-	case int, int8, int16, int32, int64:
-		return fmt.Sprintf("%d", v)
-
-	case uint, uint8, uint16, uint32, uint64:
-		return fmt.Sprintf("%d", v)
-
-	case bool:
-		return strconv.FormatBool(v)
-
-	case fmt.Stringer:
-		return v.String()
-
-	default:
-		// fallback - try to convert through reflection
-		rv := reflect.ValueOf(value)
-		switch rv.Kind() {
-		case reflect.Float32, reflect.Float64:
-			f := rv.Float()
-			if f == math.Trunc(f) && f >= -1e15 && f <= 1e15 {
-				return fmt.Sprintf("%.0f", f)
-			}
-			return strconv.FormatFloat(f, 'f', -1, 64)
-		case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-			return strconv.FormatInt(rv.Int(), 10)
-		case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
-			return strconv.FormatUint(rv.Uint(), 10)
-		default:
-			return fmt.Sprintf("%v", value)
-		}
-	}
-}

pkg/querybuilder/format_test.go

@@ -1,275 +0,0 @@
-package querybuilder
-
-import (
-	"encoding/json"
-	"fmt"
-	"math"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-type customStringer struct {
-	value string
-}
-
-func (c customStringer) String() string {
-	return c.value
-}
-
-type customInt int64
-type customFloat float64
-type customUint uint64
-
-func TestFormatValueForContains(t *testing.T) {
-	tests := []struct {
-		name     string
-		input    any
-		expected string
-	}{
-		{
-			name:     "nil value",
-			input:    nil,
-			expected: "",
-		},
-		{
-			name:     "string value",
-			input:    "hello world",
-			expected: "hello world",
-		},
-		{
-			name:     "empty string",
-			input:    "",
-			expected: "",
-		},
-		{
-			name:     "string with special characters",
-			input:    "test@#$%^&*()_+-=",
-			expected: "test@#$%^&*()_+-=",
-		},
-		{
-			name:     "byte slice",
-			input:    []byte("byte slice test"),
-			expected: "byte slice test",
-		},
-		{
-			name:     "empty byte slice",
-			input:    []byte{},
-			expected: "",
-		},
-		{
-			name:     "json.Number integer",
-			input:    json.Number("521509198310"),
-			expected: "521509198310",
-		},
-		{
-			name:     "json.Number float",
-			input:    json.Number("3.14159"),
-			expected: "3.14159",
-		},
-		{
-			name:     "json.Number scientific notation",
-			input:    json.Number("1.23e+10"),
-			expected: "1.23e+10",
-		},
-		{
-			name:     "float64 whole number",
-			input:    float64(42),
-			expected: "42",
-		},
-		{
-			name:     "float64 decimal",
-			input:    float64(3.14159),
-			expected: "3.14159",
-		},
-		{
-			name:     "float64 large whole number",
-			input:    float64(521509198310),
-			expected: "521509198310",
-		},
-		{
-			name:     "float64 at positive threshold",
-			input:    float64(1e15),
-			expected: "1000000000000000",
-		},
-		{
-			name:     "float64 above positive threshold",
-			input:    float64(1e16),
-			expected: "10000000000000000",
-		},
-		{
-			name:     "float64 at negative threshold",
-			input:    float64(-1e15),
-			expected: "-1000000000000000",
-		},
-		{
-			name:     "float64 negative decimal",
-			input:    float64(-123.456),
-			expected: "-123.456",
-		},
-		{
-			name:     "float64 zero",
-			input:    float64(0),
-			expected: "0",
-		},
-		{
-			name:     "float32 whole number",
-			input:    float32(42),
-			expected: "42",
-		},
-		{
-			name:     "float32 decimal",
-			input:    float32(3.14),
-			expected: "3.14",
-		},
-		{
-			name:     "int",
-			input:    int(123),
-			expected: "123",
-		},
-		{
-			name:     "int negative",
-			input:    int(-456),
-			expected: "-456",
-		},
-		{
-			name:     "int8 max",
-			input:    int8(127),
-			expected: "127",
-		},
-		{
-			name:     "int8 min",
-			input:    int8(-128),
-			expected: "-128",
-		},
-		{
-			name:     "int16",
-			input:    int16(32767),
-			expected: "32767",
-		},
-		{
-			name:     "int32",
-			input:    int32(2147483647),
-			expected: "2147483647",
-		},
-		{
-			name:     "int64",
-			input:    int64(9223372036854775807),
-			expected: "9223372036854775807",
-		},
-		{
-			name:     "uint",
-			input:    uint(123),
-			expected: "123",
-		},
-		{
-			name:     "uint8 max",
-			input:    uint8(255),
-			expected: "255",
-		},
-		{
-			name:     "uint16",
-			input:    uint16(65535),
-			expected: "65535",
-		},
-		{
-			name:     "uint32",
-			input:    uint32(4294967295),
-			expected: "4294967295",
-		},
-		{
-			name:     "uint64 large",
-			input:    uint64(18446744073709551615),
-			expected: "18446744073709551615",
-		},
-		{
-			name:     "bool true",
-			input:    true,
-			expected: "true",
-		},
-		{
-			name:     "bool false",
-			input:    false,
-			expected: "false",
-		},
-		{
-			name:     "custom stringer",
-			input:    customStringer{value: "custom string value"},
-			expected: "custom string value",
-		},
-		{
-			name:     "custom int type",
-			input:    customInt(12345),
-			expected: "12345",
-		},
-		{
-			name:     "custom float type whole number",
-			input:    customFloat(67890),
-			expected: "67890",
-		},
-		{
-			name:     "custom float type decimal",
-			input:    customFloat(123.456),
-			expected: "123.456",
-		},
-		{
-			name:     "custom uint type",
-			input:    customUint(99999),
-			expected: "99999",
-		},
-		{
-			name:     "struct fallback",
-			input:    struct{ Name string }{Name: "test"},
-			expected: "{test}",
-		},
-		{
-			name:     "slice fallback",
-			input:    []int{1, 2, 3},
-			expected: "[1 2 3]",
-		},
-		{
-			name:     "map fallback",
-			input:    map[string]int{"a": 1, "b": 2},
-			expected: fmt.Sprintf("%v", map[string]int{"a": 1, "b": 2}),
-		},
-		{
-			name:     "float64 infinity",
-			input:    math.Inf(1),
-			expected: "+Inf",
-		},
-		{
-			name:     "float64 negative infinity",
-			input:    math.Inf(-1),
-			expected: "-Inf",
-		},
-		{
-			name:     "float64 NaN",
-			input:    math.NaN(),
-			expected: "NaN",
-		},
-		{
-			name:     "float64 very small positive",
-			input:    float64(0.000000123),
-			expected: "0.000000123",
-		},
-		{
-			name:     "float64 very small negative",
-			input:    float64(-0.000000123),
-			expected: "-0.000000123",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			result := FormatValueForContains(tt.input)
-			assert.Equal(t, tt.expected, result)
-		})
-	}
-}
-
-func TestFormatValueForContains_LargeNumberScientificNotation(t *testing.T) {
-	largeNumber := float64(521509198310)
-	result := FormatValueForContains(largeNumber)
-	assert.Equal(t, "521509198310", result)
-	assert.NotEqual(t, "5.2150919831e+11", result)
-}

pkg/querybuilder/resourcefilter/condition_builder.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/SigNoz/signoz/pkg/querybuilder"
 	qbtypes "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
 	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
 	"github.com/huandu/go-sqlbuilder"
@@ -35,8 +34,7 @@ func valueForIndexFilter(op qbtypes.FilterOperator, key *telemetrytypes.Telemetr
 		}
 		return values
 	}
-	// resource table expects string value
-	return fmt.Sprintf(`%%%v%%`, value)
+	return value
 }
 
 func keyIndexFilter(key *telemetrytypes.TelemetryFieldKey) any {
@@ -55,16 +53,6 @@ func (b *defaultConditionBuilder) ConditionFor(
 		return "true", nil
 	}
 
-	switch op {
-	case qbtypes.FilterOperatorContains,
-		qbtypes.FilterOperatorNotContains,
-		qbtypes.FilterOperatorILike,
-		qbtypes.FilterOperatorNotILike,
-		qbtypes.FilterOperatorLike,
-		qbtypes.FilterOperatorNotLike:
-		value = querybuilder.FormatValueForContains(value)
-	}
-
 	column, err := b.fm.ColumnFor(ctx, key)
 	if err != nil {
 		return "", err

pkg/querybuilder/resourcefilter/condition_builder_test.go

@@ -5,7 +5,6 @@ import (
 	"testing"
 
 	"github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
-	qbtypes "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
 	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
 	"github.com/huandu/go-sqlbuilder"
 	"github.com/stretchr/testify/assert"
@@ -78,18 +77,6 @@ func TestConditionBuilder(t *testing.T) {
 			expected:     "LOWER(simpleJSONExtractString(labels, 'k8s.namespace.name')) LIKE LOWER(?) AND labels LIKE ? AND LOWER(labels) LIKE LOWER(?)",
 			expectedArgs: []any{"%banana%", "%k8s.namespace.name%", `%k8s.namespace.name%banana%`},
 		},
-		{
-			name: "Contains operator - string attribute number value",
-			key: &telemetrytypes.TelemetryFieldKey{
-				Name:          "company.id",
-				FieldContext:  telemetrytypes.FieldContextResource,
-				FieldDataType: telemetrytypes.FieldDataTypeString,
-			},
-			op:           qbtypes.FilterOperatorContains,
-			value:        521509198310,
-			expected:     "LOWER(simpleJSONExtractString(labels, 'company.id')) LIKE LOWER(?) AND labels LIKE ? AND LOWER(labels) LIKE LOWER(?)",
-			expectedArgs: []any{"%521509198310%", "%company.id%", `%company.id%521509198310%`},
-		},
 		{
 			name: "string_not_contains",
 			key: &telemetrytypes.TelemetryFieldKey{

pkg/querybuilder/resourcefilter/statement_builder.go

@@ -3,10 +3,8 @@ package resourcefilter
 import (
 	"context"
 	"fmt"
-	"log/slog"
 
 	"github.com/SigNoz/signoz/pkg/errors"
-	"github.com/SigNoz/signoz/pkg/factory"
 	"github.com/SigNoz/signoz/pkg/querybuilder"
 	qbtypes "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
 	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
@@ -36,7 +34,6 @@ var signalConfigs = map[telemetrytypes.Signal]signalConfig{
 
 // Generic resource filter statement builder
 type resourceFilterStatementBuilder[T any] struct {
-	logger           *slog.Logger
 	fieldMapper      qbtypes.FieldMapper
 	conditionBuilder qbtypes.ConditionBuilder
 	metadataStore    telemetrytypes.MetadataStore
@@ -55,14 +52,11 @@ var (
 
 // Constructor functions
 func NewTraceResourceFilterStatementBuilder(
-	settings factory.ProviderSettings,
 	fieldMapper qbtypes.FieldMapper,
 	conditionBuilder qbtypes.ConditionBuilder,
 	metadataStore telemetrytypes.MetadataStore,
 ) *resourceFilterStatementBuilder[qbtypes.TraceAggregation] {
-	set := factory.NewScopedProviderSettings(settings, "github.com/SigNoz/signoz/pkg/querybuilder/resourcefilter")
 	return &resourceFilterStatementBuilder[qbtypes.TraceAggregation]{
-		logger:           set.Logger(),
 		fieldMapper:      fieldMapper,
 		conditionBuilder: conditionBuilder,
 		metadataStore:    metadataStore,
@@ -71,7 +65,6 @@ func NewTraceResourceFilterStatementBuilder(
 }
 
 func NewLogResourceFilterStatementBuilder(
-	settings factory.ProviderSettings,
 	fieldMapper qbtypes.FieldMapper,
 	conditionBuilder qbtypes.ConditionBuilder,
 	metadataStore telemetrytypes.MetadataStore,
@@ -79,9 +72,7 @@ func NewLogResourceFilterStatementBuilder(
 	jsonBodyPrefix string,
 	jsonKeyToKey qbtypes.JsonKeyToFieldFunc,
 ) *resourceFilterStatementBuilder[qbtypes.LogAggregation] {
-	set := factory.NewScopedProviderSettings(settings, "github.com/SigNoz/signoz/pkg/querybuilder/resourcefilter")
 	return &resourceFilterStatementBuilder[qbtypes.LogAggregation]{
-		logger:           set.Logger(),
 		fieldMapper:      fieldMapper,
 		conditionBuilder: conditionBuilder,
 		metadataStore:    metadataStore,
@@ -157,7 +148,6 @@ func (b *resourceFilterStatementBuilder[T]) addConditions(
 
 		// warnings would be encountered as part of the main condition already
 		filterWhereClause, err := querybuilder.PrepareWhereClause(query.Filter.Expression, querybuilder.FilterExprVisitorOpts{
-			Logger:             b.logger,
 			FieldMapper:        b.fieldMapper,
 			ConditionBuilder:   b.conditionBuilder,
 			FieldKeys:          keys,

pkg/querybuilder/where_clause_visitor.go

@@ -3,7 +3,6 @@ package querybuilder
 import (
 	"context"
 	"fmt"
-	"log/slog"
 	"strconv"
 	"strings"
 
@@ -21,7 +20,6 @@ var searchTroubleshootingGuideURL = "https://signoz.io/docs/userguide/search-tro
 // filterExpressionVisitor implements the FilterQueryVisitor interface
 // to convert the parsed filter expressions into ClickHouse WHERE clause
 type filterExpressionVisitor struct {
-	logger             *slog.Logger
 	fieldMapper        qbtypes.FieldMapper
 	conditionBuilder   qbtypes.ConditionBuilder
 	warnings           []string
@@ -43,7 +41,6 @@ type filterExpressionVisitor struct {
 }
 
 type FilterExprVisitorOpts struct {
-	Logger             *slog.Logger
 	FieldMapper        qbtypes.FieldMapper
 	ConditionBuilder   qbtypes.ConditionBuilder
 	FieldKeys          map[string][]*telemetrytypes.TelemetryFieldKey
@@ -61,7 +58,6 @@ type FilterExprVisitorOpts struct {
 // newFilterExpressionVisitor creates a new filterExpressionVisitor
 func newFilterExpressionVisitor(opts FilterExprVisitorOpts) *filterExpressionVisitor {
 	return &filterExpressionVisitor{
-		logger:             opts.Logger,
 		fieldMapper:        opts.FieldMapper,
 		conditionBuilder:   opts.ConditionBuilder,
 		fieldKeys:          opts.FieldKeys,
@@ -790,35 +786,15 @@ func (v *filterExpressionVisitor) VisitKey(ctx *grammar.KeyContext) any {
 	}
 
 	if len(fieldKeysForName) > 1 && !v.keysWithWarnings[keyName] {
-		warnMsg := fmt.Sprintf(
-			"Key `%s` is ambiguous, found %d different combinations of field context / data type: %v.",
+		v.mainWarnURL = "https://signoz.io/docs/userguide/field-context-data-types/"
+		// this is warning state, we must have a unambiguous key
+		v.warnings = append(v.warnings, fmt.Sprintf(
+			"key `%s` is ambiguous, found %d different combinations of field context / data type: %v",
 			fieldKey.Name,
 			len(fieldKeysForName),
 			fieldKeysForName,
-		)
-		mixedFieldContext := map[string]bool{}
-		for _, item := range fieldKeysForName {
-			mixedFieldContext[item.FieldContext.StringValue()] = true
-		}
-
-		if mixedFieldContext[telemetrytypes.FieldContextResource.StringValue()] &&
-			mixedFieldContext[telemetrytypes.FieldContextAttribute.StringValue()] {
-			filteredKeys := []*telemetrytypes.TelemetryFieldKey{}
-			for _, item := range fieldKeysForName {
-				if item.FieldContext != telemetrytypes.FieldContextResource {
-					continue
-				}
-				filteredKeys = append(filteredKeys, item)
-			}
-			fieldKeysForName = filteredKeys
-			warnMsg += " " + "Using `resource` context by default. To query attributes explicitly, " +
-				fmt.Sprintf("use the fully qualified name (e.g., 'attribute.%s')", fieldKey.Name)
-		}
-		v.mainWarnURL = "https://signoz.io/docs/userguide/field-context-data-types/"
-		// this is warning state, we must have a unambiguous key
-		v.warnings = append(v.warnings, warnMsg)
+		))
 		v.keysWithWarnings[keyName] = true
-		v.logger.Warn("ambiguous key", "field_key_name", fieldKey.Name) //nolint:sloglint
 	}
 
 	return fieldKeysForName