From 1c8a6e77cc2e43832d2f45056d60f43a980872be Mon Sep 17 00:00:00 2001
From: Shivanshu Raj Shrivastava <shivanshu1333@gmail.com>
Date: Tue, 3 Jun 2025 07:47:01 +0530
Subject: [PATCH] fix: update clauses

Signed-off-by: Shivanshu Raj Shrivastava <shivanshu1333@gmail.com>
---
 pkg/modules/tracefunnel/query.go                 | 6 +++++-
 pkg/query-service/app/traces/v4/query_builder.go | 5 +----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkg/modules/tracefunnel/query.go b/pkg/modules/tracefunnel/query.go
index 0a083e9c7b..0ec98b6faa 100644
--- a/pkg/modules/tracefunnel/query.go
+++ b/pkg/modules/tracefunnel/query.go
@@ -9,11 +9,15 @@ import (
 	"github.com/SigNoz/signoz/pkg/types/tracefunneltypes"
 )
 
-// sanitizeClause adds AND prefix to non-empty clauses
+// sanitizeClause adds AND prefix to non-empty clauses if not already present
 func sanitizeClause(clause string) string {
 	if clause == "" {
 		return ""
 	}
+	// Check if clause already starts with AND
+	if strings.HasPrefix(strings.TrimSpace(clause), "AND") {
+		return clause
+	}
 	return "AND " + clause
 }
 
diff --git a/pkg/query-service/app/traces/v4/query_builder.go b/pkg/query-service/app/traces/v4/query_builder.go
index f67390b071..38a6bd8570 100644
--- a/pkg/query-service/app/traces/v4/query_builder.go
+++ b/pkg/query-service/app/traces/v4/query_builder.go
@@ -153,7 +153,6 @@ func BuildTracesFilter(fs *v3.FilterSet) (string, error) {
 
 	if fs != nil && len(fs.Items) != 0 {
 		for _, item := range fs.Items {
-
 			val := item.Value
 			// generate the key
 			columnName := getColumnName(item.Key)
@@ -199,9 +198,7 @@ func BuildTracesFilter(fs *v3.FilterSet) (string, error) {
 			}
 		}
 	}
-	queryString := strings.Join(conditions, " AND ")
-
-	return queryString, nil
+	return strings.Join(conditions, " AND "), nil
 }
 
 func handleEmptyValuesInGroupBy(groupBy []v3.AttributeKey) (string, error) {