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

8254711: Add java.security.Provider.getService JFR Event #2202

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Oct 20, 2023

I backport this for parity with 11.0.20-oracle.

Finally I managed to craft an almost clean backport.
I backported the change made in 17. It includes JDK-8294673

I had to do two trivial adaptions:

Deleting an import in JDKEvent.java skipped as it does not exist anyways.
Resolve due to context in EventNames.java


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8294673 needs maintainer approval
  • JDK-8254711 needs maintainer approval

Issues

  • JDK-8254711: Add java.security.Provider.getService JFR Event (Enhancement - P4 - Approved)
  • JDK-8294673: JFR: Add SecurityProviderService#threshold to TestActiveSettingEvent.java (Bug - P4 - Approved)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk11u-dev.git pull/2202/head:pull/2202
$ git checkout pull/2202

Update a local copy of the PR:
$ git checkout pull/2202
$ git pull https://git.openjdk.org/jdk11u-dev.git pull/2202/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2202

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk11u-dev/pull/2202.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 20, 2023

👋 Welcome back goetz! 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 openjdk bot changed the title Backport bc2af47e1e4e6e96020e03a60ce098ddd17f63ba 8254711: Add java.security.Provider.getService JFR Event Oct 20, 2023
@openjdk
Copy link

openjdk bot commented Oct 20, 2023

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Oct 20, 2023
@mlbridge
Copy link

mlbridge bot commented Oct 20, 2023

Webrevs

@openjdk
Copy link

openjdk bot commented Oct 23, 2023

@GoeLin Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

@GoeLin
Copy link
Member Author

GoeLin commented Oct 24, 2023

/issue JDK-8294673

@openjdk
Copy link

openjdk bot commented Oct 24, 2023

@GoeLin
Adding additional issue to issue list: 8294673: JFR: Add SecurityProviderService#threshold to TestActiveSettingEvent.java.

Copy link
Member

@MBaesken MBaesken left a comment

Choose a reason for hiding this comment

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

LGTM

@openjdk
Copy link

openjdk bot commented Oct 24, 2023

⚠️ @GoeLin This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added the approval label Oct 24, 2023
@openjdk
Copy link

openjdk bot commented Oct 24, 2023

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

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

8254711: Add java.security.Provider.getService JFR Event
8294673: JFR: Add SecurityProviderService#threshold to TestActiveSettingEvent.java

Reviewed-by: mbaesken

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 2 new commits pushed to the master branch:

  • c124213: 8153090: TAB key cannot change input focus after the radio button in the Color Selection dialog
  • fb8676a: 8223788: [macos] JSpinner buttons in JColorChooser dialog may capture focus using TAB Key.

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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 ready Pull request is ready to be integrated and removed approval labels Oct 24, 2023
@GoeLin
Copy link
Member Author

GoeLin commented Oct 25, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Oct 25, 2023

Going to push as commit 2835c6a.
Since your change was applied there have been 3 commits pushed to the master branch:

  • 129e856: 8266249: javax/swing/JPopupMenu/7156657/bug7156657.java fails on macOS
  • c124213: 8153090: TAB key cannot change input focus after the radio button in the Color Selection dialog
  • fb8676a: 8223788: [macos] JSpinner buttons in JColorChooser dialog may capture focus using TAB Key.

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Oct 25, 2023
@openjdk openjdk bot closed this Oct 25, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Oct 25, 2023
@openjdk
Copy link

openjdk bot commented Oct 25, 2023

@GoeLin Pushed as commit 2835c6a.

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

@GoeLin GoeLin deleted the goetz_backport_8254711 branch October 25, 2023 08:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
2 participants