Skip to content
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

Improve Error Prone configuration #24930

Merged
merged 2 commits into from
Jan 11, 2023
Merged

Improve Error Prone configuration #24930

merged 2 commits into from
Jan 11, 2023

Conversation

cushon
Copy link
Contributor

@cushon cushon commented Jan 6, 2023

Pass the required --add-exports= flags whenever the current JDK supports them, instead of relying on java17Home being set.

Also upgrade the Error Prone version, and remove obsolete 'errorproneJavac' configuration.


Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily:

  • Mention the appropriate issue in your description (for example: addresses #123), if applicable. This will automatically add a link to the pull request in the issue. If you would like the issue to automatically close on merging the pull request, comment fixes #<ISSUE NUMBER> instead.
  • Update CHANGES.md with noteworthy changes.
  • If this contribution is large, please file an Apache Individual Contributor License Agreement.

See the Contributor Guide for more tips on how to make review process smoother.

To check the build health, please visit https://github.com/apache/beam/blob/master/.test-infra/BUILD_STATUS.md

GitHub Actions Tests Status (on master branch)

Build python source distribution and wheels
Python tests
Java tests
Go tests

See CI.md for more information about GitHub Actions CI.

@codecov
Copy link

codecov bot commented Jan 6, 2023

Codecov Report

Merging #24930 (89f1b0f) into master (a388568) will decrease coverage by 0.00%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master   #24930      +/-   ##
==========================================
- Coverage   73.07%   73.06%   -0.01%     
==========================================
  Files         735      735              
  Lines       98133    98133              
==========================================
- Hits        71708    71704       -4     
- Misses      25065    25069       +4     
  Partials     1360     1360              
Flag Coverage Δ
python 82.68% <ø> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
sdks/python/apache_beam/utils/interactive_utils.py 95.12% <0.00%> (-2.44%) ⬇️
.../python/apache_beam/transforms/periodicsequence.py 97.01% <0.00%> (-1.50%) ⬇️
...python/apache_beam/runners/worker/worker_status.py 75.33% <0.00%> (-1.34%) ⬇️
sdks/python/apache_beam/runners/direct/executor.py 96.46% <0.00%> (-0.55%) ⬇️
...hon/apache_beam/runners/worker/bundle_processor.py 93.54% <0.00%> (-0.13%) ⬇️
sdks/python/apache_beam/io/source_test_utils.py 89.86% <0.00%> (+1.38%) ⬆️

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@github-actions
Copy link
Contributor

github-actions bot commented Jan 7, 2023

Assigning reviewers. If you would like to opt out of this review, comment assign to next reviewer:

R: @damccorm for label build.

Available commands:

  • stop reviewer notifications - opt out of the automated review tooling
  • remind me after tests pass - tag the comment author after tests pass
  • waiting on author - shift the attention set back to the author (any comment or push by the author will return the attention set to the reviewers)

The PR bot will only process comments in the main thread (not review comments).

@cushon cushon force-pushed the errorprone branch 4 times, most recently from 7bc86e9 to 2bf2178 Compare January 8, 2023 17:53
Pass the required `--add-exports=` flags when running on JDK 17,
even if `java17Home` is unset.
// This logic handles builds running on JDK 17, notusing -Djava17Home.
// The -J prefix is not needed if forkOptions.javaHome is unset,
// see http://github.com/gradle/gradle/issues/22747
if (JavaVersion.VERSION_1_8.compareTo(JavaVersion.current()) < 0
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this actually specific to JDK 17? If so, we should probably do exact equality, if not the comment should be updated.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I update the comment. The flags should be passed to all Java versions that support modules (Java 9 and up), and became mandatory for Java 17 and newer versions. So checking for version > 8 instead of version == 17 is deliberate.

@damccorm
Copy link
Contributor

damccorm commented Jan 9, 2023

R: @kileys could you take a look since this is a Java 17 change?

@github-actions
Copy link
Contributor

github-actions bot commented Jan 9, 2023

Stopping reviewer notifications for this pull request: review requested by someone other than the bot, ceding control

@kileys
Copy link
Contributor

kileys commented Jan 9, 2023

Run Java PreCommit

@@ -778,6 +778,7 @@ class BeamModulePlugin implements Plugin<Project> {
// Disabling checks since this property is only used for Jenkins tests
// https://github.com/tbroyer/gradle-errorprone-plugin#jdk-16-support
options.errorprone.errorproneArgs.add("-XepDisableAllChecks")
// The -J prefix is needed to workaround https://github.com/gradle/gradle/issues/22747
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this the right issue?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Is this the right issue?

Thanks, that should have been gradle/gradle#22746, I pushed a fix

@kileys
Copy link
Contributor

kileys commented Jan 9, 2023

LGTM

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

Successfully merging this pull request may close these issues.

3 participants