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
a3f366ee36
commit
eefbcbd1eb
@ -131,7 +131,7 @@ func TestQueryRangeRequest_UnmarshalJSON(t *testing.T) {
|
|||||||
"filter": {
|
"filter": {
|
||||||
"expression": "trace_duration > 200ms AND span_count >= 5"
|
"expression": "trace_duration > 200ms AND span_count >= 5"
|
||||||
},
|
},
|
||||||
"orderBy": [{
|
"order": [{
|
||||||
"key": {
|
"key": {
|
||||||
"name": "trace_duration"
|
"name": "trace_duration"
|
||||||
},
|
},
|
||||||
@ -230,7 +230,7 @@ func TestQueryRangeRequest_UnmarshalJSON(t *testing.T) {
|
|||||||
"name": "complex_trace_analysis",
|
"name": "complex_trace_analysis",
|
||||||
"expression": "A => (B && NOT C)",
|
"expression": "A => (B && NOT C)",
|
||||||
"filter": { "expression": "trace_duration BETWEEN 100ms AND 5s AND span_count IN (5, 10, 15)" },
|
"filter": { "expression": "trace_duration BETWEEN 100ms AND 5s AND span_count IN (5, 10, 15)" },
|
||||||
"orderBy": [{
|
"order": [{
|
||||||
"key": { "name": "span_count" },
|
"key": { "name": "span_count" },
|
||||||
"direction": "asc"
|
"direction": "asc"
|
||||||
}],
|
}],
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user