mirror of
https://github.com/SigNoz/signoz.git
synced 2025-12-18 07:56:56 +00:00
feat: resolved conflicts
This commit is contained in:
parent
cff547c303
commit
a3f366ee36
@ -533,6 +533,8 @@ func (b *traceOperatorCTEBuilder) buildTimeSeriesQuery(selectFromCTE string) (*q
|
|||||||
b.stmtBuilder.cb,
|
b.stmtBuilder.cb,
|
||||||
keys,
|
keys,
|
||||||
telemetrytypes.FieldDataTypeString,
|
telemetrytypes.FieldDataTypeString,
|
||||||
|
"",
|
||||||
|
nil,
|
||||||
)
|
)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, errors.NewInvalidInputf(
|
return nil, errors.NewInvalidInputf(
|
||||||
@ -618,6 +620,8 @@ func (b *traceOperatorCTEBuilder) buildTraceQuery(selectFromCTE string) (*qbtype
|
|||||||
b.stmtBuilder.cb,
|
b.stmtBuilder.cb,
|
||||||
keys,
|
keys,
|
||||||
telemetrytypes.FieldDataTypeString,
|
telemetrytypes.FieldDataTypeString,
|
||||||
|
"",
|
||||||
|
nil,
|
||||||
)
|
)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, errors.NewInvalidInputf(
|
return nil, errors.NewInvalidInputf(
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user