Merge branch 'main' into indirectDescOperatorImprovement

.devenv/docker/clickhouse/compose.yaml

@@ -42,7 +42,7 @@ services:
       timeout: 5s
       retries: 3
   schema-migrator-sync:
-    image: signoz/signoz-schema-migrator:v0.129.6
+    image: signoz/signoz-schema-migrator:v0.129.5
     container_name: schema-migrator-sync
     command:
       - sync
@@ -55,7 +55,7 @@ services:
         condition: service_healthy
     restart: on-failure
   schema-migrator-async:
-    image: signoz/signoz-schema-migrator:v0.129.6
+    image: signoz/signoz-schema-migrator:v0.129.5
     container_name: schema-migrator-async
     command:
       - async

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

@@ -176,7 +176,7 @@ services:
       # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
   signoz:
     !!merge <<: *db-depend
-    image: signoz/signoz:v0.96.0
+    image: signoz/signoz:v0.95.0
     command:
       - --config=/root/config/prometheus.yml
     ports:
@@ -209,7 +209,7 @@ services:
       retries: 3
   otel-collector:
     !!merge <<: *db-depend
-    image: signoz/signoz-otel-collector:v0.129.6
+    image: signoz/signoz-otel-collector:v0.129.5
     command:
       - --config=/etc/otel-collector-config.yaml
       - --manager-config=/etc/manager-config.yaml
@@ -233,7 +233,7 @@ services:
       - signoz
   schema-migrator:
     !!merge <<: *common
-    image: signoz/signoz-schema-migrator:v0.129.6
+    image: signoz/signoz-schema-migrator:v0.129.5
     deploy:
       restart_policy:
         condition: on-failure

deploy/docker-swarm/docker-compose.yaml

@@ -117,7 +117,7 @@ services:
       # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
   signoz:
     !!merge <<: *db-depend
-    image: signoz/signoz:v0.96.0
+    image: signoz/signoz:v0.95.0
     command:
       - --config=/root/config/prometheus.yml
     ports:
@@ -150,7 +150,7 @@ services:
       retries: 3
   otel-collector:
     !!merge <<: *db-depend
-    image: signoz/signoz-otel-collector:v0.129.6
+    image: signoz/signoz-otel-collector:v0.129.5
     command:
       - --config=/etc/otel-collector-config.yaml
       - --manager-config=/etc/manager-config.yaml
@@ -176,7 +176,7 @@ services:
       - signoz
   schema-migrator:
     !!merge <<: *common
-    image: signoz/signoz-schema-migrator:v0.129.6
+    image: signoz/signoz-schema-migrator:v0.129.5
     deploy:
       restart_policy:
         condition: on-failure

deploy/docker/docker-compose.ha.yaml

@@ -179,7 +179,7 @@ services:
       # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
   signoz:
     !!merge <<: *db-depend
-    image: signoz/signoz:${VERSION:-v0.96.0}
+    image: signoz/signoz:${VERSION:-v0.95.0}
     container_name: signoz
     command:
       - --config=/root/config/prometheus.yml
@@ -213,7 +213,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.6}
+    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.129.5}
     container_name: signoz-otel-collector
     command:
       - --config=/etc/otel-collector-config.yaml
@@ -239,7 +239,7 @@ services:
         condition: service_healthy
   schema-migrator-sync:
     !!merge <<: *common
-    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.129.6}
+    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.129.5}
     container_name: schema-migrator-sync
     command:
       - sync
@@ -250,7 +250,7 @@ services:
         condition: service_healthy
   schema-migrator-async:
     !!merge <<: *db-depend
-    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.129.6}
+    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.129.5}
     container_name: schema-migrator-async
     command:
       - async

deploy/docker/docker-compose.yaml

@@ -111,7 +111,7 @@ services:
       # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
   signoz:
     !!merge <<: *db-depend
-    image: signoz/signoz:${VERSION:-v0.96.0}
+    image: signoz/signoz:${VERSION:-v0.95.0}
     container_name: signoz
     command:
       - --config=/root/config/prometheus.yml
@@ -144,7 +144,7 @@ services:
       retries: 3
   otel-collector:
     !!merge <<: *db-depend
-    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.129.6}
+    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.129.5}
     container_name: signoz-otel-collector
     command:
       - --config=/etc/otel-collector-config.yaml
@@ -166,7 +166,7 @@ services:
         condition: service_healthy
   schema-migrator-sync:
     !!merge <<: *common
-    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.129.6}
+    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.129.5}
     container_name: schema-migrator-sync
     command:
       - sync
@@ -178,7 +178,7 @@ services:
     restart: on-failure
   schema-migrator-async:
     !!merge <<: *db-depend
-    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.129.6}
+    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.129.5}
     container_name: schema-migrator-async
     command:
       - async

frontend/src/components/HeaderRightSection/HeaderRightSection.tsx

@@ -2,7 +2,6 @@ import './HeaderRightSection.styles.scss';
 
 import { Button, Popover } from 'antd';
 import logEvent from 'api/common/logEvent';
-import { useGetTenantLicense } from 'hooks/useGetTenantLicense';
 import { Globe, Inbox, SquarePen } from 'lucide-react';
 import { useCallback, useState } from 'react';
 import { useLocation } from 'react-router-dom';
@@ -21,15 +20,13 @@ function HeaderRightSection({
 	enableAnnouncements,
 	enableShare,
 	enableFeedback,
-}: HeaderRightSectionProps): JSX.Element | null {
+}: HeaderRightSectionProps): JSX.Element {
 	const location = useLocation();
 
 	const [openFeedbackModal, setOpenFeedbackModal] = useState(false);
 	const [openShareURLModal, setOpenShareURLModal] = useState(false);
 	const [openAnnouncementsModal, setOpenAnnouncementsModal] = useState(false);
 
-	const { isCloudUser, isEnterpriseSelfHostedUser } = useGetTenantLicense();
-
 	const handleOpenFeedbackModal = useCallback((): void => {
 		logEvent('Feedback: Clicked', {
 			page: location.pathname,
@@ -66,11 +63,9 @@ function HeaderRightSection({
 		setOpenShareURLModal(open);
 	};
 
-	const isLicenseEnabled = isEnterpriseSelfHostedUser || isCloudUser;
-
 	return (
 		<div className="header-right-section-container">
-			{enableFeedback && isLicenseEnabled && (
+			{enableFeedback && (
 				<Popover
 					rootClassName="header-section-popover-root"
 					className="shareable-link-popover"

frontend/src/components/HeaderRightSection/__tests__/HeaderRightSection.test.tsx

@@ -5,7 +5,6 @@
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import logEvent from 'api/common/logEvent';
-import { useGetTenantLicense } from 'hooks/useGetTenantLicense';
 import { useLocation } from 'react-router-dom';
 
 import HeaderRightSection from '../HeaderRightSection';
@@ -45,13 +44,8 @@ jest.mock('../AnnouncementsModal', () => ({
 	),
 }));
 
-jest.mock('hooks/useGetTenantLicense', () => ({
-	useGetTenantLicense: jest.fn(),
-}));
-
 const mockLogEvent = logEvent as jest.Mock;
 const mockUseLocation = useLocation as jest.Mock;
-const mockUseGetTenantLicense = useGetTenantLicense as jest.Mock;
 
 const defaultProps = {
 	enableAnnouncements: true,
@@ -67,13 +61,6 @@ describe('HeaderRightSection', () => {
 	beforeEach(() => {
 		jest.clearAllMocks();
 		mockUseLocation.mockReturnValue(mockLocation);
-		// Default to licensed user (Enterprise or Cloud)
-		mockUseGetTenantLicense.mockReturnValue({
-			isCloudUser: true,
-			isEnterpriseSelfHostedUser: false,
-			isCommunityUser: false,
-			isCommunityEnterpriseUser: false,
-		});
 	});
 
 	it('should render all buttons when all features are enabled', () => {
@@ -202,84 +189,4 @@ describe('HeaderRightSection', () => {
 		expect(screen.getByTestId('feedback-modal')).toBeInTheDocument();
 		expect(screen.queryByTestId('share-modal')).not.toBeInTheDocument();
 	});
-
-	it('should show feedback button for Cloud users when feedback is enabled', () => {
-		mockUseGetTenantLicense.mockReturnValue({
-			isCloudUser: true,
-			isEnterpriseSelfHostedUser: false,
-			isCommunityUser: false,
-			isCommunityEnterpriseUser: false,
-		});
-
-		render(<HeaderRightSection {...defaultProps} />);
-
-		const feedbackButton = document.querySelector('.lucide-square-pen');
-		expect(feedbackButton).toBeInTheDocument();
-	});
-
-	it('should show feedback button for Enterprise self-hosted users when feedback is enabled', () => {
-		mockUseGetTenantLicense.mockReturnValue({
-			isCloudUser: false,
-			isEnterpriseSelfHostedUser: true,
-			isCommunityUser: false,
-			isCommunityEnterpriseUser: false,
-		});
-
-		render(<HeaderRightSection {...defaultProps} />);
-
-		const feedbackButton = document.querySelector('.lucide-square-pen');
-		expect(feedbackButton).toBeInTheDocument();
-	});
-
-	it('should hide feedback button for Community users even when feedback is enabled', () => {
-		mockUseGetTenantLicense.mockReturnValue({
-			isCloudUser: false,
-			isEnterpriseSelfHostedUser: false,
-			isCommunityUser: true,
-			isCommunityEnterpriseUser: false,
-		});
-
-		render(<HeaderRightSection {...defaultProps} />);
-
-		const feedbackButton = document.querySelector('.lucide-square-pen');
-		expect(feedbackButton).not.toBeInTheDocument();
-	});
-
-	it('should hide feedback button for Community Enterprise users even when feedback is enabled', () => {
-		mockUseGetTenantLicense.mockReturnValue({
-			isCloudUser: false,
-			isEnterpriseSelfHostedUser: false,
-			isCommunityUser: false,
-			isCommunityEnterpriseUser: true,
-		});
-
-		render(<HeaderRightSection {...defaultProps} />);
-
-		const feedbackButton = document.querySelector('.lucide-square-pen');
-		expect(feedbackButton).not.toBeInTheDocument();
-	});
-
-	it('should render correct number of buttons when feedback is hidden due to license', () => {
-		mockUseGetTenantLicense.mockReturnValue({
-			isCloudUser: false,
-			isEnterpriseSelfHostedUser: false,
-			isCommunityUser: true,
-			isCommunityEnterpriseUser: false,
-		});
-
-		render(<HeaderRightSection {...defaultProps} />);
-
-		// Should have 2 buttons (announcements + share) instead of 3
-		const buttons = screen.getAllByRole('button');
-		expect(buttons).toHaveLength(2);
-
-		// Verify which buttons are present
-		expect(screen.getByRole('button', { name: /share/i })).toBeInTheDocument();
-		const inboxIcon = document.querySelector('.lucide-inbox');
-		expect(inboxIcon).toBeInTheDocument();
-
-		// Verify feedback button is not present
-		const feedbackIcon = document.querySelector('.lucide-square-pen');
-		expect(feedbackIcon).not.toBeInTheDocument();
-	});
 });

frontend/src/components/RouteTab/RouteTab.test.tsx

@@ -1,6 +1,6 @@
+import { fireEvent, render, screen } from '@testing-library/react';
 import { createMemoryHistory } from 'history';
 import { Router } from 'react-router-dom';
-import { fireEvent, render, screen } from 'tests/test-utils';
 
 import RouteTab from './index';
 import { RouteTabProps } from './types';

frontend/src/hooks/queryBuilder/useGetExplorerQueryRange.ts

@@ -66,7 +66,13 @@ export const useGetExplorerQueryRange = (
 		ENTITY_VERSION_V5,
 		{
 			...options,
-			queryKey: [key, globalSelectedInterval, requestData, minTime, maxTime],
+			queryKey: [
+				key,
+				selectedTimeInterval ?? globalSelectedInterval,
+				requestData,
+				minTime,
+				maxTime,
+			],
 			enabled: isEnabled,
 		},
 		headers,

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

@@ -1640,12 +1640,6 @@ func (r *ClickHouseReader) SetTTLV2(ctx context.Context, orgID string, params *m
 		return nil, err
 	}
 
-	// Calculate cold storage duration
-	coldStorageDuration := -1
-	if len(params.ColdStorageVolume) > 0 && params.ToColdStorageDuration > 0 {
-		coldStorageDuration = int(params.ToColdStorageDuration) // Already in days
-	}
-
 	tableNames := []string{
 		r.logsDB + "." + r.logsLocalTableV2,
 		r.logsDB + "." + r.logsResourceLocalTableV2,
@@ -1661,47 +1655,25 @@ func (r *ClickHouseReader) SetTTLV2(ctx context.Context, orgID string, params *m
 		}
 	}
 
+	// Build multiIf expressions for both tables
 	multiIfExpr := r.buildMultiIfExpression(params.TTLConditions, params.DefaultTTLDays, false)
 	resourceMultiIfExpr := r.buildMultiIfExpression(params.TTLConditions, params.DefaultTTLDays, true)
 
-	ttlPayload := make(map[string][]string)
-
-	queries := []string{
-		fmt.Sprintf(`ALTER TABLE %s ON CLUSTER %s MODIFY COLUMN _retention_days UInt16 DEFAULT %s`,
+	ttlPayload := map[string]string{
+		tableNames[0]: fmt.Sprintf(`ALTER TABLE %s ON CLUSTER %s MODIFY COLUMN _retention_days UInt16 DEFAULT %s`,
 			tableNames[0], r.cluster, multiIfExpr),
-	}
-
-	if len(params.ColdStorageVolume) > 0 && coldStorageDuration > 0 {
-		queries = append(queries, fmt.Sprintf(`ALTER TABLE %s ON CLUSTER %s MODIFY COLUMN _retention_days_cold UInt16 DEFAULT %d`,
-			tableNames[0], r.cluster, coldStorageDuration))
-
-		queries = append(queries, fmt.Sprintf(`ALTER TABLE %s ON CLUSTER %s MODIFY TTL toDateTime(timestamp / 1000000000) + toIntervalDay(_retention_days) DELETE, toDateTime(timestamp / 1000000000) + toIntervalDay(_retention_days_cold) TO VOLUME '%s'`,
-			tableNames[0], r.cluster, params.ColdStorageVolume))
-	}
-
-	ttlPayload[tableNames[0]] = queries
-
-	resourceQueries := []string{
-		fmt.Sprintf(`ALTER TABLE %s ON CLUSTER %s MODIFY COLUMN _retention_days UInt16 DEFAULT %s`,
+		tableNames[1]: fmt.Sprintf(`ALTER TABLE %s ON CLUSTER %s MODIFY COLUMN _retention_days UInt16 DEFAULT %s`,
 			tableNames[1], r.cluster, resourceMultiIfExpr),
 	}
 
-	if len(params.ColdStorageVolume) > 0 && coldStorageDuration > 0 {
-		resourceQueries = append(resourceQueries, fmt.Sprintf(`ALTER TABLE %s ON CLUSTER %s MODIFY COLUMN _retention_days_cold UInt16 DEFAULT %d`,
-			tableNames[1], r.cluster, coldStorageDuration))
-
-		resourceQueries = append(resourceQueries, fmt.Sprintf(`ALTER TABLE %s ON CLUSTER %s MODIFY TTL toDateTime(seen_at_ts_bucket_start) + toIntervalSecond(1800) + toIntervalDay(_retention_days) DELETE, toDateTime(seen_at_ts_bucket_start) + toIntervalSecond(1800) + toIntervalDay(_retention_days_cold) TO VOLUME '%s'`,
-			tableNames[1], r.cluster, params.ColdStorageVolume))
-	}
-
-	ttlPayload[tableNames[1]] = resourceQueries
-
 	ttlConditionsJSON, err := json.Marshal(params.TTLConditions)
 	if err != nil {
 		return nil, errorsV2.Wrapf(err, errorsV2.TypeInternal, errorsV2.CodeInternal, "error marshalling TTL condition")
 	}
 
-	for tableName, queries := range ttlPayload {
+	// Execute the TTL modifications synchronously
+	for tableName, query := range ttlPayload {
+		// Store the operation in the database
 		customTTL := types.TTLSetting{
 			Identifiable: types.Identifiable{
 				ID: valuer.GenerateUUID(),
@@ -1710,13 +1682,12 @@ func (r *ClickHouseReader) SetTTLV2(ctx context.Context, orgID string, params *m
 				CreatedAt: time.Now(),
 				UpdatedAt: time.Now(),
 			},
-			TransactionID:  uuid,
-			TableName:      tableName,
-			TTL:            params.DefaultTTLDays,
-			Condition:      string(ttlConditionsJSON),
-			Status:         constants.StatusPending,
-			ColdStorageTTL: coldStorageDuration,
-			OrgID:          orgID,
+			TransactionID: uuid,
+			TableName:     tableName,
+			TTL:           params.DefaultTTLDays,
+			Condition:     string(ttlConditionsJSON),
+			Status:        constants.StatusPending,
+			OrgID:         orgID,
 		}
 
 		// Insert TTL setting record
@@ -1726,24 +1697,19 @@ func (r *ClickHouseReader) SetTTLV2(ctx context.Context, orgID string, params *m
 			return nil, errorsV2.Wrapf(dbErr, errorsV2.TypeInternal, errorsV2.CodeInternal, "error inserting TTL settings")
 		}
 
-		if len(params.ColdStorageVolume) > 0 && coldStorageDuration > 0 {
-			err := r.setColdStorage(ctx, tableName, params.ColdStorageVolume)
-			if err != nil {
-				zap.L().Error("error in setting cold storage", zap.Error(err))
-				r.updateCustomRetentionTTLStatus(ctx, orgID, tableName, constants.StatusFailed)
-				return nil, errorsV2.Wrapf(err.Err, errorsV2.TypeInternal, errorsV2.CodeInternal, "error setting cold storage for table %s", tableName)
-			}
-		}
-
-		for i, query := range queries {
-			zap.L().Debug("Executing custom retention TTL request: ", zap.String("request", query), zap.Int("step", i+1))
-			if err := r.db.Exec(ctx, query); err != nil {
-				zap.L().Error("error while setting custom retention ttl", zap.Error(err))
-				r.updateCustomRetentionTTLStatus(ctx, orgID, tableName, constants.StatusFailed)
-				return nil, errorsV2.Wrapf(err, errorsV2.TypeInternal, errorsV2.CodeInternal, "error setting custom retention TTL for table %s, query: %s", tableName, query)
-			}
+		zap.L().Debug("Executing custom retention TTL request: ", zap.String("request", query))
+
+		// Execute the ALTER TABLE query
+		if err := r.db.Exec(ctx, query); err != nil {
+			zap.L().Error("error while setting custom retention ttl", zap.Error(err))
+
+			// Update status to failed
+			r.updateCustomRetentionTTLStatus(ctx, orgID, tableName, constants.StatusFailed)
+
+			return nil, errorsV2.Wrapf(err, errorsV2.TypeInternal, errorsV2.CodeInternal, "error setting custom retention TTL for table %s", tableName)
 		}
 
+		// Update status to success
 		r.updateCustomRetentionTTLStatus(ctx, orgID, tableName, constants.StatusSuccess)
 	}
 
@@ -1875,7 +1841,6 @@ func (r *ClickHouseReader) GetCustomRetentionTTL(ctx context.Context, orgID stri
 		response.DefaultTTLDays = customTTL.TTL
 		response.TTLConditions = ttlConditions
 		response.Status = customTTL.Status
-		response.ColdStorageTTLDays = customTTL.ColdStorageTTL
 
 	} else {
 		// V1 - Traditional TTL

pkg/query-service/model/queryParams.go

@@ -433,10 +433,8 @@ type GetCustomRetentionTTLResponse struct {
 	ExpectedLogsMoveTime int `json:"expected_logs_move_ttl_duration_hrs,omitempty"`
 
 	// V2 fields
-	DefaultTTLDays        int                   `json:"default_ttl_days,omitempty"`
-	TTLConditions         []CustomRetentionRule `json:"ttl_conditions,omitempty"`
-	ColdStorageVolume     string                `json:"cold_storage_volume,omitempty"`
-	ColdStorageTTLDays    int                   `json:"cold_storage_ttl_days,omitempty"`
+	DefaultTTLDays int                   `json:"default_ttl_days,omitempty"`
+	TTLConditions  []CustomRetentionRule `json:"ttl_conditions,omitempty"`
 }
 
 type CustomRetentionTTLResponse struct {

pkg/telemetrytraces/trace_operator_cte_builder.go

@@ -340,7 +340,7 @@ func (b *traceOperatorCTEBuilder) buildDirectDescendantCTE(parentCTE, childCTE s
 }
 
 func (b *traceOperatorCTEBuilder) buildIndirectDescendantCTE(ancestorCTE, descendantCTE string) (string, []string) {
-	sql := fmt.Sprintf(`WITH RECURSIVE up AS (SELECT d.trace_id, d.span_id, d.parent_span_id, 0 AS depth FROM %s AS d UNION ALL SELECT p.trace_id, p.span_id, p.parent_span_id, up.depth + 1 FROM all_spans AS p JOIN up ON p.trace_id = up.trace_id AND p.span_id = up.parent_span_id WHERE up.depth < 100) SELECT DISTINCT a.* FROM %s AS a GLOBAL INNER JOIN (SELECT DISTINCT trace_id, span_id FROM up WHERE depth > 0 ) AS ancestors ON ancestors.trace_id = a.trace_id AND ancestors.span_id = a.span_id`, descendantCTE, ancestorCTE)
+	sql := fmt.Sprintf(`WITH RECURSIVE down AS (SELECT d.trace_id, d.span_id, d.parent_span_id, 0 AS depth FROM %s AS d UNION ALL SELECT p.trace_id, p.span_id, p.parent_span_id, down.depth + 1 FROM all_spans AS p INNER JOIN down ON p.trace_id = down.trace_id AND p.parent_span_id = down.span_id WHERE down.depth < 100) SELECT DISTINCT b.* FROM %s AS b GLOBAL INNER JOIN (SELECT DISTINCT trace_id, span_id FROM down WHERE depth >= 0) AS descendants ON descendants.trace_id = b.trace_id AND descendants.span_id = b.span_id`, ancestorCTE, descendantCTE)
 	return sql, []string{ancestorCTE, descendantCTE, "all_spans"}
 }
 

pkg/telemetrytraces/trace_operator_cte_builder_test.go

@@ -103,7 +103,7 @@ func TestTraceOperatorStatementBuilder(t *testing.T) {
 				},
 			},
 			expected: qbtypes.Statement{
-				Query: "WITH toDateTime64(1747947419000000000, 9) AS t_from, toDateTime64(1747983448000000000, 9) AS t_to, 1747945619 AS bucket_from, 1747983448 AS bucket_to, all_spans AS (SELECT *, resource_string_service$$name AS `service.name` FROM signoz_traces.distributed_signoz_index_v3 WHERE timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ?), __resource_filter_A AS (SELECT fingerprint FROM signoz_traces.distributed_traces_v3_resource WHERE (simpleJSONExtractString(labels, 'service.name') = ? AND labels LIKE ? AND labels LIKE ?) AND seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ?), A AS (SELECT * FROM signoz_traces.distributed_signoz_index_v3 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter_A) AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? AND true), __resource_filter_B AS (SELECT fingerprint FROM signoz_traces.distributed_traces_v3_resource WHERE (simpleJSONExtractString(labels, 'service.name') = ? AND labels LIKE ? AND labels LIKE ?) AND seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ?), B AS (SELECT * FROM signoz_traces.distributed_signoz_index_v3 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter_B) AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? AND true), A_INDIR_DESC_B AS (WITH RECURSIVE up AS (SELECT d.trace_id, d.span_id, d.parent_span_id, 0 AS depth FROM B AS d UNION ALL SELECT p.trace_id, p.span_id, p.parent_span_id, up.depth + 1 FROM all_spans AS p JOIN up ON p.trace_id = up.trace_id AND p.span_id = up.parent_span_id WHERE up.depth < 100) SELECT DISTINCT a.* FROM A AS a GLOBAL INNER JOIN (SELECT DISTINCT trace_id, span_id FROM up WHERE depth > 0 ) AS ancestors ON ancestors.trace_id = a.trace_id AND ancestors.span_id = a.span_id) SELECT timestamp, trace_id, span_id, name, duration_nano, parent_span_id FROM A_INDIR_DESC_B ORDER BY timestamp DESC LIMIT ? SETTINGS distributed_product_mode='allow', max_memory_usage=10000000000",
+				Query: "WITH toDateTime64(1747947419000000000, 9) AS t_from, toDateTime64(1747983448000000000, 9) AS t_to, 1747945619 AS bucket_from, 1747983448 AS bucket_to, all_spans AS (SELECT *, resource_string_service$$name AS `service.name` FROM signoz_traces.distributed_signoz_index_v3 WHERE timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ?), __resource_filter_A AS (SELECT fingerprint FROM signoz_traces.distributed_traces_v3_resource WHERE (simpleJSONExtractString(labels, 'service.name') = ? AND labels LIKE ? AND labels LIKE ?) AND seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ?), A AS (SELECT * FROM signoz_traces.distributed_signoz_index_v3 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter_A) AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? AND true), __resource_filter_B AS (SELECT fingerprint FROM signoz_traces.distributed_traces_v3_resource WHERE (simpleJSONExtractString(labels, 'service.name') = ? AND labels LIKE ? AND labels LIKE ?) AND seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ?), B AS (SELECT * FROM signoz_traces.distributed_signoz_index_v3 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter_B) AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? AND true), A_INDIR_DESC_B AS (WITH RECURSIVE down AS (SELECT d.trace_id, d.span_id, d.parent_span_id, 0 AS depth FROM A AS d UNION ALL SELECT p.trace_id, p.span_id, p.parent_span_id, down.depth + 1 FROM all_spans AS p INNER JOIN down ON p.trace_id = down.trace_id AND p.parent_span_id = down.span_id WHERE down.depth < 100) SELECT DISTINCT b.* FROM B AS b GLOBAL INNER JOIN (SELECT DISTINCT trace_id, span_id FROM down WHERE depth >= 0) AS descendants ON descendants.trace_id = b.trace_id AND descendants.span_id = b.span_id) SELECT timestamp, trace_id, span_id, name, duration_nano, parent_span_id FROM A_INDIR_DESC_B ORDER BY timestamp DESC LIMIT ? SETTINGS distributed_product_mode='allow', max_memory_usage=10000000000",
 				Args:  []any{"1747947419000000000", "1747983448000000000", uint64(1747945619), uint64(1747983448), "gateway", "%service.name%", "%service.name\":\"gateway%", uint64(1747945619), uint64(1747983448), "1747947419000000000", "1747983448000000000", uint64(1747945619), uint64(1747983448), "database", "%service.name%", "%service.name\":\"database%", uint64(1747945619), uint64(1747983448), "1747947419000000000", "1747983448000000000", uint64(1747945619), uint64(1747983448), 5},
 			},
 			expectedErr: nil,