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

feat: resolved conflicts

Browse Source
This commit is contained in:
eKuG 2025-08-19 11:20:32 +05:30
parent 4be618bcde
commit ea89714cb4
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkg/telemetrytraces/trace_operator_cte_builder.go
View File

@ -138,8 +138,8 @@ func (b *traceOperatorCTEBuilder) buildBaseSpansCTE() error {
"parent_span_id", "parent_span_id",
"name", "name",
"timestamp", "timestamp",
"duration_nano AS durationNano", "duration_nano",
sqlbuilder.Escape("resource_string_service$$name")+" AS serviceName", sqlbuilder.Escape("resource_string_service$$name")+" AS `service.name`",
sqlbuilder.Escape("resource_string_service$$name"), sqlbuilder.Escape("resource_string_service$$name"),
sqlbuilder.Escape("resource_string_service$$name_exists"), sqlbuilder.Escape("resource_string_service$$name_exists"),
) )
@ -245,8 +245,8 @@ func (b *traceOperatorCTEBuilder) buildQueryCTE(queryName string) (string, error
"parent_span_id", "parent_span_id",
"name", "name",
"timestamp", "timestamp",
"durationNano", "duration_nano",
"serviceName", "`service.name`",
fmt.Sprintf("'%s' AS level", cteName), fmt.Sprintf("'%s' AS level", cteName),
) )
sb.From("base_spans AS s") sb.From("base_spans AS s")
@ -331,8 +331,8 @@ func (b *traceOperatorCTEBuilder) buildDirectDescendantCTE(parentCTE, childCTE s
"c.parent_span_id", "c.parent_span_id",
"c.name", "c.name",
"c.timestamp", "c.timestamp",
"c.durationNano", "c.duration_nano",
"c.serviceName", "c.`service.name`",
fmt.Sprintf("'%s' AS level", childCTE), fmt.Sprintf("'%s' AS level", childCTE),
) )
sb.From(fmt.Sprintf("%s AS c", childCTE)) sb.From(fmt.Sprintf("%s AS c", childCTE))
@ -354,8 +354,8 @@ func (b *traceOperatorCTEBuilder) buildAndCTE(leftCTE, rightCTE string) (string,
"l.parent_span_id", "l.parent_span_id",
"l.name", "l.name",
"l.timestamp", "l.timestamp",
"l.durationNano", "l.duration_nano",
"l.serviceName", "l.`service.name`",
"l.level", "l.level",
) )
sb.From(fmt.Sprintf("%s AS l", leftCTE)) sb.From(fmt.Sprintf("%s AS l", leftCTE))
@ -387,8 +387,8 @@ func (b *traceOperatorCTEBuilder) buildNotCTE(leftCTE, rightCTE string) (string,
"l.parent_span_id", "l.parent_span_id",
"l.name", "l.name",
"l.timestamp", "l.timestamp",
"l.durationNano", "l.duration_nano",
"l.serviceName", "l.`service.name`",
"l.level", "l.level",
) )
sb.From(fmt.Sprintf("%s AS l", leftCTE)) sb.From(fmt.Sprintf("%s AS l", leftCTE))
@ -419,14 +419,13 @@ func (b *traceOperatorCTEBuilder) buildFinalQuery(selectFromCTE string, requestT
func (b *traceOperatorCTEBuilder) buildListQuery(selectFromCTE string) (*qbtypes.Statement, error) { func (b *traceOperatorCTEBuilder) buildListQuery(selectFromCTE string) (*qbtypes.Statement, error) {
sb := sqlbuilder.NewSelectBuilder() sb := sqlbuilder.NewSelectBuilder()
// Select default columns
sb.Select( sb.Select(
"timestamp", "timestamp",
"trace_id", "trace_id",
"span_id", "span_id",
"name", "name",
"serviceName", "service.name",
"durationNano", "duration_nano",
"parent_span_id", "parent_span_id",
) )
@ -680,10 +679,10 @@ func (b *traceOperatorCTEBuilder) buildTraceQuery(selectFromCTE string) (*qbtype
sb.Select( sb.Select(
"any(timestamp) as timestamp", "any(timestamp) as timestamp",
"any(serviceName) as `service.name`", "any(`service.name`) as `service.name`",
"any(name) as `name`", "any(name) as `name`",
"count() as span_count", "count() as span_count",
"any(durationNano) as `duration_nano`", "any(duration_nano) as `duration_nano`",
"trace_id as `trace_id`", "trace_id as `trace_id`",
) )