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

Fixes unmarshalling of tailing responses. #3237

Merged
merged 2 commits into from
Jan 26, 2021

Conversation

cyriltovena
Copy link
Contributor

Some websocket were still using old json package.

Signed-off-by: Cyril Tovena cyril.tovena@gmail.com

Some websocket were still using old json package.

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
@codecov-io
Copy link

Codecov Report

Merging #3237 (5324aca) into master (567ccde) will decrease coverage by 0.08%.
The diff coverage is 52.17%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3237      +/-   ##
==========================================
- Coverage   63.14%   63.06%   -0.09%     
==========================================
  Files         197      198       +1     
  Lines       16712    16795      +83     
==========================================
+ Hits        10553    10591      +38     
- Misses       5207     5238      +31     
- Partials      952      966      +14     
Impacted Files Coverage Δ
cmd/docker-driver/config.go 9.34% <0.00%> (ø)
pkg/distributor/http.go 0.00% <0.00%> (ø)
pkg/logcli/query/tail.go 0.00% <0.00%> (ø)
pkg/loki/loki.go 0.00% <0.00%> (ø)
pkg/loki/modules.go 3.24% <0.00%> (-0.02%) ⬇️
pkg/ruler/manager/compat.go 45.83% <0.00%> (ø)
pkg/logql/unmarshal/unmarshal.go 75.00% <50.00%> (-8.34%) ⬇️
pkg/loki/config_handler.go 61.64% <61.64%> (ø)
pkg/distributor/distributor.go 76.38% <100.00%> (ø)
pkg/promtail/targets/file/tailer.go 73.21% <0.00%> (-5.36%) ⬇️
... and 4 more

Copy link
Collaborator

@slim-bean slim-bean left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@cyriltovena cyriltovena merged commit a5cb38d into grafana:master Jan 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants