Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Loki Query Frontend #1442

Merged
merged 21 commits into from
Jan 7, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Improve tests and rollback change in loghttp package.
Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
  • Loading branch information
cyriltovena committed Jan 6, 2020
commit fd70eb47b707cc1adcd7c508913b3d405953b856
2 changes: 1 addition & 1 deletion pkg/loghttp/query.go
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ func (e *Entry) UnmarshalJSON(data []byte) error {
return err
}

e.Timestamp = time.Unix(0, t).UTC()
e.Timestamp = time.Unix(0, t)
e.Line = unmarshal[1]

return nil
Expand Down
2 changes: 1 addition & 1 deletion pkg/logql/unmarshal/legacy/unmarshal_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ var pushTests = []struct {
"entries":[
{
"ts": "2019-09-13T18:32:22.380001319Z",
"line": "super line"
"line": "super line"
}
]
}
Expand Down
4 changes: 4 additions & 0 deletions pkg/querier/queryrange/codec_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ import (
"github.com/stretchr/testify/require"
)

func init() {
time.Local = nil // for easier tests comparison
}

var (
start = testTime // Marshalling the time drops the monotonic clock so we can't use time.Now
end = start.Add(1 * time.Hour)
Expand Down