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

6890: defineEventProbes should throw exception on malformed probe definitions #227

Closed
wants to merge 2 commits into from

Conversation

Josh-Matsuoka
Copy link
Collaborator

@Josh-Matsuoka Josh-Matsuoka commented Mar 11, 2021

This PR addresses JMC-6890 (defineEventProbes should throw exception on malformed probe definitions) [1]. Previously the exception would be swallowed by DefaultTransformRegistry when the XML failed validation, and would simply return null. With this change the exception is rethrown and can be handled accordingly by the AgentController, which rethrows it, and the user. I've added a test for the AgentController and updated the test for DefaultTransformRegistry accordingly.

[1] https://bugs.openjdk.java.net/browse/JMC-6890


Progress

  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JMC-6890: defineEventProbes should throw exception on malformed probe definitions

Reviewers

Download

To checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jmc pull/227/head:pull/227
$ git checkout pull/227

To update a local copy of the PR:
$ git checkout pull/227
$ git pull https://git.openjdk.java.net/jmc pull/227/head

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 11, 2021

👋 Welcome back jmatsuoka! 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 added the rfr label Mar 11, 2021
@Josh-Matsuoka Josh-Matsuoka changed the title 6890: defineEventProbes should throw exception on malformed probes 6890: defineEventProbes should throw exception on malformed probe definitions Mar 11, 2021
@mlbridge
Copy link

mlbridge bot commented Mar 11, 2021

Webrevs

@thegreystone
Copy link
Member

Don't forget to update the copyright years.

@openjdk
Copy link

openjdk bot commented Mar 18, 2021

@Josh-Matsuoka 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:

6890: defineEventProbes should throw exception on malformed probe definitions

Reviewed-by: hirt

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

  • acbc1e6: 7158: [JFR Writer] Improve single-value types handling
  • 2111820: 7156: [JFR Writer] Allow providing extra recording settings
  • 20d8777: 7155: [JFR Writer] Complete the annotation handling code
  • e97d985: 7154: [JFR Writer] Improve lazy evaluation of the type defining block
  • c1937f1: 7139: Prepare new and noteworthy for JMC 8.0.0

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 label Mar 18, 2021
@Josh-Matsuoka
Copy link
Collaborator Author

/integrate

@openjdk openjdk bot closed this Mar 18, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Mar 18, 2021
@openjdk
Copy link

openjdk bot commented Mar 18, 2021

@Josh-Matsuoka Since your change was applied there have been 5 commits pushed to the master branch:

  • acbc1e6: 7158: [JFR Writer] Improve single-value types handling
  • 2111820: 7156: [JFR Writer] Allow providing extra recording settings
  • 20d8777: 7155: [JFR Writer] Complete the annotation handling code
  • e97d985: 7154: [JFR Writer] Improve lazy evaluation of the type defining block
  • c1937f1: 7139: Prepare new and noteworthy for JMC 8.0.0

Your commit was automatically rebased without conflicts.

Pushed as commit 6149b48.

💡 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
Development

Successfully merging this pull request may close these issues.

2 participants