-
Notifications
You must be signed in to change notification settings - Fork 4.5k
[BEAM-7406] Include slf4j-jdk14 in Dataflow worker uber jar #8668
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
Conversation
| // Each included dependency should have a matching relocation rule below that ensures | ||
| // that the shaded jar is correctly built. | ||
|
|
||
| dependencies { |
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.
This will fail the shadowJarValidationExcludes defined above.
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.
Fixed.
|
The |
lukecwik
left a comment
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.
Could you also add a test that ensures that slf4j-jdk14 is always included in the uber jar. The logic would be quite similar to the validateShadowJar task defined here
| project.task('validateShadedJarDoesntLeakNonProjectClasses', dependsOn: 'shadowJar') { |
kennknowles
left a comment
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.
I added the test you suggested and confirmed that without the runtime dependency it fails.
| // Each included dependency should have a matching relocation rule below that ensures | ||
| // that the shaded jar is correctly built. | ||
|
|
||
| dependencies { |
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.
Fixed.
| shadowTest library.java.mockito_core | ||
| } | ||
|
|
||
| project.task('validateShadedJarContainsSlf4jJdk14', dependsOn: 'shadowJar') { |
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.
worst camel case ever...
:-)
There is no logging by default since 2.10.0
I don't totally understand why, but the
:workershadow jar already contains the JDK14 adapter while the:legacy-workerdoes not. I did check that this fixes the jar but have not run a job - I will let Jenkins do that work.Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily:
R: @username).[BEAM-XXX] Fixes bug in ApproximateQuantiles, where you replaceBEAM-XXXwith the appropriate JIRA issue, if applicable. This will automatically link the pull request to the issue.Post-Commit Tests Status (on master branch)
Pre-Commit Tests Status (on master branch)
See .test-infra/jenkins/README for trigger phrase, status and link of all Jenkins jobs.