External/signoz
1
0
Fork 0
mirror of https://github.com/SigNoz/signoz.git synced 2025-12-21 09:26:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: resolved conflicts

Browse Source
This commit is contained in:
eKuG 2025-08-20 12:18:37 +05:30
parent f55aeb5b5a
commit 675b66a7b9
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/telemetrytraces/trace_operator_cte_builder.go
View File

@ -155,6 +155,10 @@ func (b *traceOperatorCTEBuilder) buildBaseSpansCTE() error {
if fieldName == "service.name" { if fieldName == "service.name" {
continue continue
} }
// Skip span scope fields (isRoot, isEntryPoint) as they are computed conditions, not actual columns
if strings.ToLower(fieldName) == SpanSearchScopeRoot || strings.ToLower(fieldName) == SpanSearchScopeEntryPoint {
continue
}
sb.SelectMore(sqlbuilder.Escape(fieldName)) sb.SelectMore(sqlbuilder.Escape(fieldName))
} }
@ -345,7 +349,7 @@ func (b *traceOperatorCTEBuilder) buildAndCTE(leftCTE, rightCTE string) (string,
sb.JoinWithOption( sb.JoinWithOption(
sqlbuilder.InnerJoin, sqlbuilder.InnerJoin,
fmt.Sprintf("%s AS r", rightCTE), fmt.Sprintf("%s AS r", rightCTE),
"l.trace_id = r.trace_id AND l.span_id = r.span_id", "l.trace_id = r.trace_id",
) )
sql, args := sb.BuildWithFlavor(sqlbuilder.ClickHouse) sql, args := sb.BuildWithFlavor(sqlbuilder.ClickHouse)
@ -376,7 +380,7 @@ func (b *traceOperatorCTEBuilder) buildNotCTE(leftCTE, rightCTE string) (string,
) )
sb.From(fmt.Sprintf("%s AS l", leftCTE)) sb.From(fmt.Sprintf("%s AS l", leftCTE))
sb.Where(fmt.Sprintf( sb.Where(fmt.Sprintf(
"NOT EXISTS (SELECT 1 FROM %s AS r WHERE r.trace_id = l.trace_id AND r.span_id = l.span_id)", "NOT EXISTS (SELECT 1 FROM %s AS r WHERE r.trace_id = l.trace_id)",
rightCTE, rightCTE,
)) ))