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 #1260

Closed
wants to merge 3 commits into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Apr 18, 2023

I backport this for parity with 17.0.8-oracle.

src/java.base/share/classes/java/security/Provider.java
I had to redo the change for getService().
I basically changed the control flow to only
return at the end and then added the Event
generation before the return.

src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/JDKEvents.java
Resolved three hunks due to context.

test/lib/jdk/test/lib/jfr/EventNames.java
Resolved three hunks due to context.

I added JDK-8294673 JFR: Add SecurityProviderService#threshold to TestActiveSettingEvent.java. Else that test is failing.


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

Issues

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

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1260

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 18, 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 Apr 18, 2023
@openjdk
Copy link

openjdk bot commented Apr 18, 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 Apr 18, 2023
@mlbridge
Copy link

mlbridge bot commented Apr 18, 2023

Webrevs

@GoeLin
Copy link
Member Author

GoeLin commented Apr 19, 2023

/issue JDK-8294673

@openjdk
Copy link

openjdk bot commented Apr 19, 2023

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

@GoeLin
Copy link
Member Author

GoeLin commented Apr 20, 2023

Pre-submit failures:
2xwin: Run Visual Studio Installer Error: Process completed with exit code 1.
2xlinux: Unable to connect to azure.archive.ubuntu.com
Infra issues, unrelated.

@MBaesken
Copy link
Member

Hi Götz, regarding Provider.java, do we need the legacyMap.remove that can be found in head ? I do not see it in your coding, but maybe it is not needed in 17 ?

@GoeLin
Copy link
Member Author

GoeLin commented Apr 24, 2023

Hi @MBaesken,
In head, legacyMap.remove is not added by the change. It is only embraced
in another if (s == null). It was added by "8276660: Scalability bottleneck in java.security.Provider.getService()"
which is a rather large change not suitable for 17 I think.

@openjdk
Copy link

openjdk bot commented Apr 25, 2023

@GoeLin 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:

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

  • 1dee04a: 8278146: G1: Rework VM_G1Concurrent VMOp to clearly identify it as pause
  • a000b2d: 8238274: (sctp) JDK-7118373 is not fixed for SctpChannel
  • f969f81: 8301998: Update HarfBuzz to 7.0.1
  • ebde2fb: 8306543: GHA: MSVC installation is failing

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 the ready Pull request is ready to be integrated label Apr 25, 2023
@GoeLin
Copy link
Member Author

GoeLin commented Apr 27, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Apr 27, 2023

Going to push as commit 394a756.
Since your change was applied there have been 13 commits pushed to the master branch:

  • 243e643: 8306768: CodeCache Analytics reports wrong threshold
  • e132605: 8296545: C2 Blackholes should allow load optimizations
  • d5cbf22: 8306658: GHA: MSVC installation could be optional since it might already be pre-installed
  • bf0606a: 8283566: G1: Improve G1BarrierSet::enqueue performance
  • e6e6bed: 8252990: Intrinsify Unsafe.storeStoreFence
  • 24e91c1: 8302594: use-after-free in Node::destruct
  • d964229: 8302172: [JVMCI] HotSpotResolvedJavaMethodImpl.canBeInlined must respect ForceInline
  • 3e0e4f0: 8301338: Identical branch conditions in CompileBroker::print_heapinfo
  • ee63f83: 8296412: Special case infinite loops with unmerged backedges in IdealLoopTree::check_safepts
  • 1dee04a: 8278146: G1: Rework VM_G1Concurrent VMOp to clearly identify it as pause
  • ... and 3 more: https://git.openjdk.org/jdk17u-dev/compare/9d6f1d716ef13987cf4b36b6072b33d1c1aa5522...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Apr 27, 2023

@GoeLin Pushed as commit 394a756.

💡 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 April 27, 2023 06:50
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