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

Remove shadow dependency from jaeger-b3 #309

Merged
merged 3 commits into from
Feb 1, 2018
Merged

Conversation

vprithvi
Copy link
Contributor

jaeger-b3 depended on a shadow version of jaeger-core that packaged
okhttp to prevent an incompatibility with io.zipkin.brave:brave-http

The version of brave-http that we depend on currently doesn't have
this incompatibility, so depending on the shadow is unnecessary.

Fixes #279

Signed-off-by: Prithvi Raj p.r@uber.com

`jaeger-b3` depended on a shadow version of `jaeger-core` that packaged
`okhttp` to prevent an incompatibility with `io.zipkin.brave:brave-http`

The version of `brave-http` that we depend on currently doesn't have
this incompatibility, so depending on the shadow is unnecessary.

Fixes #279

Signed-off-by: Prithvi Raj <p.r@uber.com>
@ghost ghost assigned vprithvi Dec 12, 2017
@ghost ghost added the review label Dec 12, 2017
@vprithvi vprithvi requested a review from a team December 12, 2017 17:01
@codecov
Copy link

codecov bot commented Dec 12, 2017

Codecov Report

Merging #309 into master will increase coverage by 0.04%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##             master     #309      +/-   ##
============================================
+ Coverage     83.79%   83.84%   +0.04%     
- Complexity      563      564       +1     
============================================
  Files            91       91              
  Lines          2222     2222              
  Branches        257      257              
============================================
+ Hits           1862     1863       +1     
+ Misses          258      257       -1     
  Partials        102      102
Impacted Files Coverage Δ Complexity Δ
...va/com/uber/jaeger/propagation/B3TextMapCodec.java 80.64% <0%> (+3.22%) 12% <0%> (+1%) ⬆️

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 8687cd8...f3b0ab9. Read the comment docs.

@yurishkuro yurishkuro merged commit eb70712 into master Feb 1, 2018
@ghost ghost removed the review label Feb 1, 2018
@pavolloffay pavolloffay deleted the fix-b3-dependency branch April 9, 2018 16:25
# for free to subscribe to this conversation on GitHub. Already have an account? #.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants