Skip to content
This repository has been archived by the owner on Jul 11, 2022. It is now read-only.

Fix B3Codec's trace_id zero-padding for 32bit IDs #322

Merged
merged 4 commits into from
Aug 29, 2021

Conversation

mizhexiaoxiao
Copy link
Contributor

@mizhexiaoxiao mizhexiaoxiao commented Aug 28, 2021

Which problem is this PR solving?

  • Solve the problem of incorrect traceid injection when the traceid is 128bit and starts with 0

Short description of the changes

For example, if the traceid is 023f352eaefd8b887a06732f5312e2de, it will inject as 23f352eaefd8b887a06732f5312e2de, which will cause the trace to split into two because the traceid is different

Signed-off-by: mizhexiaoxiao 1157861072@qq.com

@yurishkuro yurishkuro changed the title fix B3Codec inject bug for traceid Fix B3Codec's trace_id zero-padding for 32bit IDs Aug 28, 2021
@yurishkuro
Copy link
Member

Also, please fix the DCO (see CONTRIBUTING.md)

@mizhexiaoxiao
Copy link
Contributor Author

Thanks for the review!
Unit tests have been added

@yurishkuro
Copy link
Member

The DCO check is still failing, please sign all commits (see CONTRIBUTING)

Signed-off-by: mizhexiaoxiao <1157861072@qq.com>
Signed-off-by: mizhexiaoxiao <1157861072@qq.com>
@mizhexiaoxiao
Copy link
Contributor Author

Thank you for your patient reply, it should be ok now

Signed-off-by: mizhexiaoxiao <1157861072@qq.com>
@yurishkuro
Copy link
Member

You can run "make lint" locally before submitting

Signed-off-by: mizhexiaoxiao <1157861072@qq.com>
@mizhexiaoxiao
Copy link
Contributor Author

done :)

@codecov
Copy link

codecov bot commented Aug 29, 2021

Codecov Report

Merging #322 (1c7d59a) into master (9ccc29c) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #322   +/-   ##
=======================================
  Coverage   95.42%   95.43%           
=======================================
  Files          25       25           
  Lines        1967     1971    +4     
  Branches      272      273    +1     
=======================================
+ Hits         1877     1881    +4     
  Misses         56       56           
  Partials       34       34           
Impacted Files Coverage Δ
jaeger_client/codecs.py 97.05% <100.00%> (+0.05%) ⬆️
jaeger_client/config.py 95.60% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9ccc29c...1c7d59a. Read the comment docs.

@yurishkuro yurishkuro merged commit 143e77a into jaegertracing:master Aug 29, 2021
@yurishkuro
Copy link
Member

Thanks!

@yurishkuro
Copy link
Member

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants