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

8272515: JFR: Names should only be valid Java identifiers #5415

Closed
wants to merge 3 commits into from

Conversation

egahlin
Copy link
Member

@egahlin egahlin commented Sep 8, 2021

Hi,

Could I have a review of change that prevents invalid Java identifiers or type names in JFR events. For rationale and compatibility issues see the CSR request. The only change to java.base is making jdk.modules.internal.Checks::isJavaIdentifier(String) public, so it can be reused by the jdk.jfr module.

Testing: /jdk/jdk/jfr + tier1 + tier2

Thanks
Erik


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8272515: JFR: Names should only be valid Java identifiers

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/5415/head:pull/5415
$ git checkout pull/5415

Update a local copy of the PR:
$ git checkout pull/5415
$ git pull https://git.openjdk.java.net/jdk pull/5415/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5415

View PR using the GUI difftool:
$ git pr show -t 5415

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/5415.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 8, 2021

👋 Welcome back egahlin! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

@openjdk openjdk bot commented Sep 8, 2021

@egahlin The following labels will be automatically applied to this pull request:

  • core-libs
  • hotspot-jfr

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added core-libs hotspot-jfr labels Sep 8, 2021
@egahlin
Copy link
Member Author

@egahlin egahlin commented Sep 8, 2021

/csr

@openjdk openjdk bot added the csr label Sep 8, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 8, 2021

@egahlin this pull request will not be integrated until the CSR request JDK-8272516 for issue JDK-8272515 has been approved.

@egahlin egahlin marked this pull request as ready for review Sep 13, 2021
@openjdk openjdk bot added the rfr label Sep 13, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 13, 2021

Webrevs

@openjdk openjdk bot removed the csr label Sep 18, 2021
Copy link

@mgronlun mgronlun left a comment

Looks good.

@openjdk
Copy link

@openjdk openjdk bot commented Sep 20, 2021

@egahlin This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8272515: JFR: Names should only be valid Java identifiers

Reviewed-by: mgronlun

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 151 new commits pushed to the master branch:

  • 6f3e40c: 8273825: TestIRMatching.java fails after JDK-8266550
  • a561eac: 8273895: compiler/ciReplay/TestVMNoCompLevel.java fails due to wrong data size with TieredStopAtLevel=2,3
  • d2388b7: 8273959: Some metaspace diagnostic switches should be develop
  • dc7f452: 8273815: move have_special_privileges to os_posix for POSIX platforms
  • 7c9868c: 8273454: C2: Transform (-a)(-b) into ab
  • bb9d142: 8273958: gtest/MetaspaceGtests executes unnecessary tests in debug builds
  • 2a2e919: 8273685: Remove jtreg tag manual=yesno for java/awt/Graphics/LCDTextAndGraphicsState.java & show test instruction
  • 8302061: 8273774: CDSPluginTest should only expect classes_nocoops.jsa exists on supported 64-bit platforms
  • 2f8c221: 8273681: Add Vector API vs Arrays.mismatch intrinsic benchmark
  • 17f7a45: 8273913: Problem list some headful client jtreg tests that fail on macOS 12
  • ... and 141 more: https://git.openjdk.java.net/jdk/compare/df05b4d1a13e55755107695ad9ea7a8a1084901a...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready label Sep 20, 2021
@egahlin
Copy link
Member Author

@egahlin egahlin commented Sep 20, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Sep 20, 2021

Going to push as commit 48aff23.
Since your change was applied there have been 158 commits pushed to the master branch:

  • 4d95a5d: 8273933: [TESTBUG] Test must run without preallocated exceptions
  • 9aa12da: 8273934: Remove unused perfcounters
  • 4da45c4: 8270609: [TESTBUG] java/awt/print/Dialog/DialogCopies.java does not show instruction
  • 544193a: 8247980: Exclusive execution of java/util/stream tests slows down tier1
  • 1f8af52: 8273314: Add tier4 test groups
  • 699865f: 8259039: Passing different version to --release flag than javac version output warning
  • f71df14: 8273187: jtools tests fail with missing markerName check
  • 6f3e40c: 8273825: TestIRMatching.java fails after JDK-8266550
  • a561eac: 8273895: compiler/ciReplay/TestVMNoCompLevel.java fails due to wrong data size with TieredStopAtLevel=2,3
  • d2388b7: 8273959: Some metaspace diagnostic switches should be develop
  • ... and 148 more: https://git.openjdk.java.net/jdk/compare/df05b4d1a13e55755107695ad9ea7a8a1084901a...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Sep 20, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Sep 20, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 20, 2021

@egahlin Pushed as commit 48aff23.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs hotspot-jfr integrated
3 participants