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

8261160: Add a deserialization JFR event #1150

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Jun 15, 2022

I backport this for parity with 11.0.17-oracle.

It needed a row of adaptions, but none touching the base functionality.

src/java.base/share/classes/java/io/ObjectInputStream.java
Resolved an import. Trivial.

src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/JDKEvents.java
In this file some cleanup wrt alphabetic ordering was made that does
not apply to 11. (ProcessStartEvent not in 11.)

test/jdk/jdk/jfr/event/io/TestDeserializationEvent.java
I adapted this test to Java 11 syntax.
It used records and modern instanceof statements.
Also, I included /test/lib/jdk/test/lib/serial/SerialObjectBuilder.java
from "JDK-8254234: Add test library stream object builder".
In that file, I also removed the record and replaced
Class.descriptorString() by a local implementation. DescriptorString() was
introduced in 12. Backporting 8254234
as prerequisite makes no sense as the adapted test is not
in 11, thus the backport would be quite incomplete.

test/jdk/jdk/jfr/event/metadata/TestDefaultConfigurations.java
test/jdk/jdk/jfr/event/runtime/TestActiveSettingEvent.java
Resolved due to context (ProcessStartEvent not in 11.)

test/lib/jdk/test/lib/jfr/EventNames.java
Resolved due to context (DirectBufferStatistics not in 11.)


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/jdk11u-dev pull/1150/head:pull/1150
$ git checkout pull/1150

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1150

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 15, 2022

👋 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 3dc6f52a89e4baab1a5501880824f8d1a68e6356 8261160: Add a deserialization JFR event Jun 15, 2022
@openjdk
Copy link

openjdk bot commented Jun 15, 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 Jun 15, 2022
@mlbridge
Copy link

mlbridge bot commented Jun 15, 2022

Webrevs

Copy link
Member

@phohensee phohensee 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 Jun 16, 2022

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

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

8261160: Add a deserialization JFR event

Reviewed-by: phh

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

  • 8e94c68: 8172065: javax/swing/JTree/4908142/bug4908142.java The selected index should be "aad"
  • ffd8dc2: 8225122: Test AncestorResized.java fails when Windows desktop is scaled.
  • 538794f: Merge
  • 1dd942d: 8278346: java/nio/file/Files/probeContentType/Basic.java fails on Linux SLES15 machine
  • c64f12c: 8285515: (dc) DatagramChannel.disconnect fails with "Invalid argument" on macOS 12.4
  • 2632f54: 8287109: Distrust.java failed with CertificateExpiredException

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 Jun 16, 2022
@GoeLin
Copy link
Member Author

GoeLin commented Jun 21, 2022

Thanks for the review!
/integrate

@openjdk
Copy link

openjdk bot commented Jun 21, 2022

Going to push as commit 765c5b4.
Since your change was applied there have been 16 commits pushed to the master branch:

  • 661236d: 8236823: Ensure that API documentation uses minified libraries
  • 8c37d06: 8226976: SessionTimeOutTests uses == operator for String value check
  • 674e717: 8220744: [TESTBUG] Move RedefineTests from runtime to serviceability
  • 9307c8c: 8217332: JTREG: Clean up, use generics instead of raw types
  • 9f059ee: 8213695: gc/TestAllocateHeapAtMultiple.java is slow in some configs
  • 1bdba34: 8219149: ProcessTools.ProcessBuilder should print timing info for subprocesses
  • 87ba1ef: 8282538: PKCS11 tests fail on CentOS Stream 9
  • 4fbe635: 8251551: Use .md filename extension for README
  • 246f48e: 8212904: JTextArea line wrapping incorrect when using UI scale
  • 684f12e: 8283849: AsyncGetCallTrace may crash JVM on guarantee
  • ... and 6 more: https://git.openjdk.org/jdk11u-dev/compare/68f6fbb7125e1cb8aa6aae8ec30458dcf9bb5bc6...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 21, 2022

@GoeLin Pushed as commit 765c5b4.

💡 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_8261160 branch June 21, 2022 12:58
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