Two tests are left

grafana · Nov 13, 2023 · 5a8ff21 · 5a8ff21
1 parent ce67404
commit 5a8ff21
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/pkg/logql/syntax/serialize.go b/pkg/logql/syntax/serialize.go
@@ -84,6 +84,7 @@ func (v *JSONSerializer) VisitBinOp(e *BinOpExpr) {
 		}
 
 		v.WriteObjectEnd()
+		v.Flush()
 
 	}
 
@@ -268,6 +269,7 @@ func encodeGrouping(s *jsoniter.Stream, g *Grouping) {
 	s.WriteObjectStart()
 	s.WriteObjectField("without")
 	s.WriteBool(g.Without)
+
 	s.WriteMore()
 	s.WriteObjectField("groups")
 	s.WriteArrayStart()
@@ -467,7 +469,6 @@ func encodeVectorMatching(s *jsoniter.Stream, vm *VectorMatching) {
 	s.WriteObjectEnd()
 }
 
-
 func decodeVectorMatching(iter *jsoniter.Iterator) *VectorMatching {
 	vm := &VectorMatching{}
 

diff --git a/pkg/logql/syntax/serialize_test.go b/pkg/logql/syntax/serialize_test.go
@@ -43,7 +43,7 @@ func TestJSONSerializationRoundTrip(t *testing.T) {
 		},
 		"post filters": {
 			query: `quantile_over_time(0.99998,{app="foo"} |= "bar" | json | latency >= 250ms or ( status_code < 500 and status_code > 200)
-			| line_format "blip{{ .foo }}blop {{.status_code}}" | label_format foo=bar,status_code="buzz{{.bar}}" | unwrap foo | __error__ !~".+"[5m]) by (namespace,instance)`,
+				| line_format "blip{{ .foo }}blop {{.status_code}}" | label_format foo=bar,status_code="buzz{{.bar}}" | unwrap foo | __error__ !~".+"[5m]) by (namespace,instance)`,
 		},
 	}
 
@@ -62,7 +62,7 @@ func TestJSONSerializationRoundTrip(t *testing.T) {
 			actual, err := DecodeJSON(buf.String())
 			require.NoError(t, err)
 
-			require.Equal(t, test.query, actual.String())
+			require.Equal(t, expr.Pretty(0), actual.Pretty(0))
 		})
 	}
 }