fix: update clauses

Signed-off-by: Shivanshu Raj Shrivastava <[email protected]>

Author: shivanshuraj1333

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
 }
 

pkg/query-service/app/traces/v3/query_builder.go

@@ -193,8 +193,12 @@ func buildTracesFilterQuery(fs *v3.FilterSet) (string, error) {
 	}
 	queryString := strings.Join(conditions, " AND ")
 
+	// Don't add AND prefix if the query string is empty or if it's being used in a WHERE clause that already has AND
 	if len(queryString) > 0 {
-		queryString = " AND " + queryString
+		// Only add AND if the query string doesn't already start with AND
+		if !strings.HasPrefix(strings.TrimSpace(queryString), "AND") {
+			queryString = " AND " + queryString
+		}
 	}
 	return queryString, nil
 }