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

Fixes #494 - removed unwanted classes from jaeger-thrift shadowed jar #498

Merged
merged 2 commits into from
Jul 23, 2018
Merged

Conversation

mdvorak
Copy link
Contributor

@mdvorak mdvorak commented Jul 20, 2018

Moved relocated packages to io.jaegertracing.vendor
Excluded lombok and animal-sniffer from shadow plugin in jaeger-thrift
Added slf4j as runtime non-relocated dependency
Removed unused dependencies from jaeger-crossdock

I really believe slf4j-api should be normal runtime dependency, having it shadowed is not a good idea - it depends on external loggers to work. Relocating slf4j-api breaks that at best, crashes at worst.
(note: slf4j-api is transitive dependency of libthrift)

Moved relocated packages to io.jaegertracing.vendor
Excluded lombok and animal-sniffer from shadow plugin in jaeger-thrift
Added slf4j as runtime non-relocated dependency
Removed unused dependencies from jaeger-crossdock (change suggested by @jpkrohling)

Signed-off-by: Michal Dvorak <mikee@mdvorak.org>
@codecov
Copy link

codecov bot commented Jul 20, 2018

Codecov Report

Merging #498 into master will decrease coverage by 0.1%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##             master     #498      +/-   ##
============================================
- Coverage     88.32%   88.21%   -0.11%     
  Complexity      498      498              
============================================
  Files            65       65              
  Lines          1859     1859              
  Branches        242      242              
============================================
- Hits           1642     1640       -2     
- Misses          139      141       +2     
  Partials         78       78
Impacted Files Coverage Δ Complexity Δ
...egertracing/internal/reporters/RemoteReporter.java 83.33% <0%> (-2.39%) 7% <0%> (ø)

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 a16cd8b...b78c6b8. Read the comment docs.

Copy link
Collaborator

@jpkrohling jpkrohling left a comment

Choose a reason for hiding this comment

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

On a first look, looks good to me, but I'll run this with a tester project for a sanity check.

@@ -6,6 +6,8 @@ description = 'Library to send data to Jaeger backend components via Thrift'
dependencies {
compile project(':jaeger-core')

compile group: 'org.slf4j', name: 'slf4j-api'
Copy link
Collaborator

Choose a reason for hiding this comment

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

Shouldn't it be compileOnly? Try to run a mvn dependency:tree (or ./gradlew dependencies, if that's what your consumer application uses) and check if this version of jaeger-thrift (or jaeger-client) brings this dependency.

@@ -13,9 +13,6 @@ compileJava {
dependencies {
compile project(':jaeger-client')

compile group: 'org.apache.thrift', name: 'libthrift', version: apacheThriftVersion
Copy link
Collaborator

Choose a reason for hiding this comment

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

+1, I think I had to add this in some iteration of the previous work, to get the tests to compile/run. Apparently, it's not needed now :)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It was your request to remove it :)

Copy link
Collaborator

Choose a reason for hiding this comment

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

Er... oops :)

#494 (comment)

Signed-off-by: Michal Dvorak <mikee@mdvorak.org>
@mdvorak
Copy link
Contributor Author

mdvorak commented Jul 20, 2018

I've forgotten slf4j version in the dependency, added.

compile type dependency should generate <scope>compile</scope>, which is what we want for slf4j. Same as jaeger-core.

Copy link
Collaborator

@jpkrohling jpkrohling left a comment

Choose a reason for hiding this comment

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

LGTM

@jpkrohling jpkrohling merged commit efd00c9 into jaegertracing:master Jul 23, 2018
@jpkrohling
Copy link
Collaborator

Thanks!

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