-
Notifications
You must be signed in to change notification settings - Fork 232
Fixes #494 - removed unwanted classes from jaeger-thrift shadowed jar #498
Conversation
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 Report
@@ 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
Continue to review full report at Codecov.
|
There was a problem hiding this 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.
jaeger-thrift/build.gradle
Outdated
@@ -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' |
There was a problem hiding this comment.
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 |
There was a problem hiding this comment.
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 :)
There was a problem hiding this comment.
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 :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Er... oops :)
Signed-off-by: Michal Dvorak <mikee@mdvorak.org>
I've forgotten slf4j version in the dependency, added.
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Thanks! |
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 oflibthrift
)