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

8292177: InitialSecurityProperty JFR event #1004

Closed
wants to merge 3 commits into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Dec 30, 2022

I backport this for parity with 17.0.7-oracle.

I resolved the following code:

src/java.base/share/classes/module-info.java
Trivial resolve.

src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/JDKEvents.java
Resolved imports.

test/lib/jdk/test/lib/jfr/EventNames.java
Does not match because,
for example, later change 8295419: JFR: Change name of jdk.JitRestart was already backported.

This was tedious to resolve, because the larger part of the
change is a cleanup exchanging "final static" by "static final".
Besides that I spotted the addition of a single new
line for "InitialSecurityProperty".


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

Issue

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1004

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 30, 2022

👋 Welcome back goetz! A progress list of the required criteria for merging this PR into pr/996 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 8c40b7dc8cd7b6a6d0c9349b991e0e01b69349c3 8292177: InitialSecurityProperty JFR event Dec 30, 2022
@openjdk
Copy link

openjdk bot commented Dec 30, 2022

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 Dec 30, 2022
@mlbridge
Copy link

mlbridge bot commented Dec 30, 2022

Webrevs

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/996 to master January 2, 2023 12:37
@openjdk-notifier
Copy link

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout goetz_backport_8292177
git fetch https://git.openjdk.org/jdk17u-dev master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

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;
probably the related release note should mention 17.0.X after this gets pushed.

@openjdk
Copy link

openjdk bot commented Jan 4, 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:

8292177: InitialSecurityProperty JFR event

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

  • 1f4fc33: 8275843: Random crashes while the UI code is executed
  • 298fef7: 8277485: Zero: Fix fast{i,f}access_0 bytecodes handling
  • a395cf7: 8008243: Zero: Implement fast bytecodes
  • 0916032: 8298035: Provide better descriptions for JIT compiler JFR events
  • ef94eb7: 8280132: Incorrect comparator com.sun.beans.introspect.MethodInfo.MethodOrder
  • 0ac93eb: 8295066: Folding of loads is broken in C2 after JDK-8242115
  • abfa08f: 8242115: C2 SATB barriers are not safepoint-safe

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 Jan 4, 2023
@GoeLin
Copy link
Member Author

GoeLin commented Jan 4, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Jan 4, 2023

Going to push as commit 95f23f7.
Since your change was applied there have been 17 commits pushed to the master branch:

  • c95dda4: 8286800: Assert in PhaseIdealLoop::dump_real_LCA is too strong
  • 0ce1205: 8294947: Use 64bit atomics in patch_verified_entry on x86_64
  • 3a019fd: 8294217: Assertion failure: parsing found no loops but there are some
  • c9bbd55: 8292159: TYPE_USE annotations on generic type arguments of record components discarded
  • 013709f: 8294538: missing is_unloading() check in SharedRuntime::fixup_callers_callsite()
  • 6469c30: 8295414: [Aarch64] C2: assert(false) failed: bad AD file
  • 26f0348: 8280868: LineBodyHandlerTest.java creates and discards too many clients
  • d3c4a14: 8280553: resourcehogs/serviceability/sa/TestHeapDumpForLargeArray.java can fail if GC occurs
  • 3762bd0: 8270476: Make floating-point test infrastructure more lambda and method reference friendly
  • bd58dd8: 8212961: [TESTBUG] vmTestbase/nsk/stress/jni/ native code cleanup
  • ... and 7 more: https://git.openjdk.org/jdk17u-dev/compare/0aa62ae777c1c55062b864f22d1857f0cb5f23e4...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jan 4, 2023
@openjdk openjdk bot closed this Jan 4, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jan 4, 2023
@GoeLin GoeLin deleted the goetz_backport_8292177 branch January 4, 2023 20:39
@openjdk
Copy link

openjdk bot commented Jan 4, 2023

@GoeLin Pushed as commit 95f23f7.

💡 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
backport integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants