8302858: Polish FlightRecorderMXBeanImpl #12656

minborg · 2023-02-20T10:51:29Z

This PR proposes some polishing of the FlightRecorderMXBeanImpl class.

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

JDK-8302858: Polish FlightRecorderMXBeanImpl

Reviewers

Erik Gahlin (@egahlin - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/12656/head:pull/12656
$ git checkout pull/12656

Update a local copy of the PR:
$ git checkout pull/12656
$ git pull https://git.openjdk.org/jdk pull/12656/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 12656

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/12656.diff

bridgekeeper · 2023-02-20T10:52:47Z

👋 Welcome back pminborg! 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 · 2023-02-20T10:55:45Z

@minborg The following label will be automatically applied to this pull request:

hotspot-jfr

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

mlbridge · 2023-02-20T10:59:15Z

Webrevs

kevinjwalls · 2023-02-20T15:04:49Z

src/jdk.management.jfr/share/classes/jdk/management/jfr/FlightRecorderMXBeanImpl.java

@@ -303,12 +303,12 @@ public void setRecordingOptions(long recording, Map<String, String> options) thr
        validateOption(ops, OPTION_DESTINATION, x -> MBeanUtils.destination(r, x));

        // All OK, now set them.atomically


As this is a tidyup, could we remove the dot from "them.atomically" which is a typo.
I didn't see what was atomic at first. If all options are valid, we set them all, which is great, but not really atomic. Could just remove the word "atomically"?

egahlin · 2023-02-20T16:43:32Z

src/jdk.management.jfr/share/classes/jdk/management/jfr/FlightRecorderMXBeanImpl.java

@@ -282,14 +282,14 @@ public void setRecordingOptions(long recording, Map<String, String> options) thr
        for (Map.Entry<String, String> entry : ops.entrySet()) {
            Object key = entry.getKey();
            Object value = entry.getValue();
-            if (!(key instanceof String)) {
-                throw new IllegalArgumentException("Option key must not be null, or other type than " + String.class);


Why is the type check removed?

Because it must be a String as we are iterating over Map.Entry<String, String>

Only at compile time. A user could send data over the network using other types.

Thanks for clarifying this. I have reverted accordingly.

openjdk · 2023-02-20T18:41:32Z

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

8302858: Polish FlightRecorderMXBeanImpl

Reviewed-by: egahlin

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

0bf3a53: 8302599: Extend ASan support to Microsoft Visual C++
c7517b3: 8302525: Write a test to check various components send Events while mouse and key are used simultaneously
9a79722: 8299234: JMX Repository.query performance
e47e9ec: 8300658: memory_and_swap_limit() reporting wrong values on systems with swapaccount=0
7cf7e0a: 8302070: Factor null-check into load_klass() calls
e731695: 8302882: Newly added test javax/swing/JFileChooser/JFileChooserFontReset.java fails with HeadlessException
b5a7426: 8301749: Tracking malloc pooled memory size
6ac5e05: 8302068: Serial: Refactor oop closures used in Young GC
71cf7c4: 8302518: Add missing Op_RoundDoubleMode in VectorNode::vector_operands()
98716e2: 8302709: Remove explicit remembered set verification in G1
... and 8 more: https://git.openjdk.org/jdk/compare/432cf68c4dd1dcce478fccb85163aa0d824474d7...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.

kevinjwalls · 2023-02-20T18:47:50Z

Updates look good 8-)

minborg · 2023-02-22T10:31:23Z

/integrate

openjdk · 2023-02-22T10:34:12Z

Going to push as commit 861eea9.
Since your change was applied there have been 58 commits pushed to the master branch:

60a3581: 8302856: Typo in FlightRecorderMXBeanImpl
3f3a1f5: 8302815: Use new Math.clamp method in core libraries
5e1d1b7: 8302870: More information needed from failures in vmTestbase ThreadUtils.waitThreadState
7f35389: 8302888: containers/docker/TestJcmd.java fails when run as root under podman
b6ecca1: 8280113: (dc) DatagramSocket.receive does not always throw when the channel is closed
f54e108: 8302831: PPC: compiler/codecache/TestStressCodeBuffers.java fails after JDK-8301819
cba817a: 8302838: jabswitch main() should avoid calling exit explicitly
2c52cf0: 8041447: Test javax/swing/dnd/7171812/bug7171812.java fails with java.lang.RuntimeException: Test failed, scroll on drag doesn't work
180b94c: 8302907: [PPC64] Use more constexpr in class Register
f319c92: 8303016: Invalid escapes in grep patterns
... and 48 more: https://git.openjdk.org/jdk/compare/432cf68c4dd1dcce478fccb85163aa0d824474d7...master

Your commit was automatically rebased without conflicts.

openjdk · 2023-02-22T10:34:34Z

@minborg Pushed as commit 861eea9.

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

Cleanup FlightRecorderMXBeanImpl

4ccfcb1

openjdk bot added the rfr Pull request is ready for review label Feb 20, 2023

openjdk bot added the hotspot-jfr hotspot-jfr-dev@openjdk.org label Feb 20, 2023

kevinjwalls reviewed Feb 20, 2023

View reviewed changes

egahlin reviewed Feb 20, 2023

View reviewed changes

minborg added 3 commits February 20, 2023 18:11

Rollback value check

8a86ffc

Remove typo

c094981

Revoke key check

0d5ecaa

egahlin approved these changes Feb 20, 2023

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Feb 20, 2023

openjdk bot added the integrated Pull request has been integrated label Feb 22, 2023

openjdk bot closed this Feb 22, 2023

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Feb 22, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8302858: Polish FlightRecorderMXBeanImpl #12656

8302858: Polish FlightRecorderMXBeanImpl #12656

minborg commented Feb 20, 2023 •

edited by openjdk bot

Loading

bridgekeeper bot commented Feb 20, 2023

openjdk bot commented Feb 20, 2023

mlbridge bot commented Feb 20, 2023 •

edited

Loading

kevinjwalls Feb 20, 2023

egahlin Feb 20, 2023

minborg Feb 20, 2023

egahlin Feb 20, 2023

minborg Feb 20, 2023

openjdk bot commented Feb 20, 2023

kevinjwalls commented Feb 20, 2023

minborg commented Feb 22, 2023

openjdk bot commented Feb 22, 2023

openjdk bot commented Feb 22, 2023

		@@ -303,12 +303,12 @@ public void setRecordingOptions(long recording, Map<String, String> options) thr
		validateOption(ops, OPTION_DESTINATION, x -> MBeanUtils.destination(r, x));

		// All OK, now set them.atomically

8302858: Polish FlightRecorderMXBeanImpl #12656

8302858: Polish FlightRecorderMXBeanImpl #12656

Conversation

minborg commented Feb 20, 2023 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Feb 20, 2023

openjdk bot commented Feb 20, 2023

mlbridge bot commented Feb 20, 2023 • edited Loading

Webrevs

kevinjwalls Feb 20, 2023

Choose a reason for hiding this comment

egahlin Feb 20, 2023

Choose a reason for hiding this comment

minborg Feb 20, 2023

Choose a reason for hiding this comment

egahlin Feb 20, 2023

Choose a reason for hiding this comment

minborg Feb 20, 2023

Choose a reason for hiding this comment

openjdk bot commented Feb 20, 2023

kevinjwalls commented Feb 20, 2023

minborg commented Feb 22, 2023

openjdk bot commented Feb 22, 2023

openjdk bot commented Feb 22, 2023

minborg commented Feb 20, 2023 •

edited by openjdk bot

Loading

mlbridge bot commented Feb 20, 2023 •

edited

Loading