diff --git a/promql/query_logger.go b/promql/query_logger.go index 1ae1bec5f3..657f9db01d 100644 --- a/promql/query_logger.go +++ b/promql/query_logger.go @@ -43,7 +43,7 @@ const ( entrySize int = 1000 ) -func parseBrokenJSON(brokenJSON []byte) (bool, string) { +func parseBrokenJSON(brokenJSON []byte) (string, bool) { queries := strings.ReplaceAll(string(brokenJSON), "\x00", "") if len(queries) > 0 { queries = queries[:len(queries)-1] + "]" @@ -51,10 +51,10 @@ func parseBrokenJSON(brokenJSON []byte) (bool, string) { // Conditional because of implementation detail: len() = 1 implies file consisted of a single char: '['. if len(queries) <= 1 { - return false, "[]" + return "[]", false } - return true, queries + return queries, true } func logUnfinishedQueries(filename string, filesize int, logger log.Logger) { @@ -72,7 +72,7 @@ func logUnfinishedQueries(filename string, filesize int, logger log.Logger) { return } - queriesExist, queries := parseBrokenJSON(brokenJSON) + queries, queriesExist := parseBrokenJSON(brokenJSON) if !queriesExist { return } diff --git a/promql/query_logger_test.go b/promql/query_logger_test.go index 640e945410..57d9b00218 100644 --- a/promql/query_logger_test.go +++ b/promql/query_logger_test.go @@ -162,7 +162,7 @@ func TestParseBrokenJSON(t *testing.T) { }, } { t.Run("", func(t *testing.T) { - ok, out := parseBrokenJSON(tc.b) + out, ok := parseBrokenJSON(tc.b) if tc.ok != ok { t.Fatalf("expected %t, got %t", tc.ok, ok) return