From a3f366ee3628b05afbc6ad1b4159ab8e4d8522e3 Mon Sep 17 00:00:00 2001 From: eKuG Date: Mon, 18 Aug 2025 15:35:45 +0530 Subject: [PATCH] feat: resolved conflicts --- pkg/telemetrytraces/trace_operator_cte_builder.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/telemetrytraces/trace_operator_cte_builder.go b/pkg/telemetrytraces/trace_operator_cte_builder.go index 62a673e573e2..420d053963dd 100644 --- a/pkg/telemetrytraces/trace_operator_cte_builder.go +++ b/pkg/telemetrytraces/trace_operator_cte_builder.go @@ -533,6 +533,8 @@ func (b *traceOperatorCTEBuilder) buildTimeSeriesQuery(selectFromCTE string) (*q b.stmtBuilder.cb, keys, telemetrytypes.FieldDataTypeString, + "", + nil, ) if err != nil { return nil, errors.NewInvalidInputf( @@ -618,6 +620,8 @@ func (b *traceOperatorCTEBuilder) buildTraceQuery(selectFromCTE string) (*qbtype b.stmtBuilder.cb, keys, telemetrytypes.FieldDataTypeString, + "", + nil, ) if err != nil { return nil, errors.NewInvalidInputf(