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

Ensure trace propagation in our logs. #1977

Merged
merged 6 commits into from
Apr 27, 2020
Merged

Conversation

cyriltovena
Copy link
Contributor

This ensure we log correctly the traceID when possible. Rest of the fixes is in Cortex.

see cortexproject/cortex#2519 and cortexproject/cortex#2518

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

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
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!

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 #1977 into master will increase coverage by 0.18%.
The diff coverage is 59.04%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1977      +/-   ##
==========================================
+ Coverage   64.28%   64.46%   +0.18%     
==========================================
  Files         131      131              
  Lines       10017    10038      +21     
==========================================
+ Hits         6439     6471      +32     
+ Misses       3095     3084      -11     
  Partials      483      483              
Impacted Files Coverage Δ
pkg/ingester/tailer.go 38.01% <0.00%> (ø)
pkg/logcli/query/query.go 0.00% <0.00%> (ø)
pkg/logql/evaluator.go 91.27% <ø> (ø)
pkg/loki/modules.go 15.78% <0.00%> (ø)
pkg/querier/http.go 10.14% <0.00%> (-0.05%) ⬇️
pkg/querier/queryrange/stats.go 82.75% <0.00%> (ø)
pkg/storage/iterator.go 84.44% <0.00%> (ø)
pkg/storage/stores/local/shipper.go 53.22% <0.00%> (-0.44%) ⬇️
pkg/loghttp/query.go 40.70% <20.00%> (-0.96%) ⬇️
pkg/querier/tail.go 67.64% <33.33%> (+0.23%) ⬆️
... and 11 more

@cyriltovena cyriltovena merged commit 577d8eb into grafana:master Apr 27, 2020
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