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

6805: Event emission only on exceptions #92

Closed
wants to merge 8 commits into from
Closed

6805: Event emission only on exceptions #92

wants to merge 8 commits into from

Conversation

Josh-Matsuoka
Copy link
Collaborator

@Josh-Matsuoka Josh-Matsuoka commented Jun 29, 2020

This PR implements JMC-6805 allowing the agent to optionally only emit events when exceptions are thrown by the instrumented method. This is configurable via an added xml option that when set to true will only emit the event in the catch of the injected try-catch block.


Progress

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

Issue

  • JMC-6805: Event emission only on exceptions

Reviewers

  • Marcus Hirt (hirt - Reviewer) ⚠️ Review applies to 1a9c467

Download

$ git fetch https://git.openjdk.java.net/jmc pull/92/head:pull/92
$ git checkout pull/92

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jun 29, 2020

👋 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.

@openjdk
Copy link

@openjdk openjdk bot commented Jun 29, 2020

⚠️ @Josh-Matsuoka a branch with the same name as the source branch for this pull request (master) is present in the target repository. If you eventually integrate this pull request then the branch master in your personal fork will diverge once you sync your personal fork with the upstream repository.

To avoid this situation, create a new branch for your changes and reset the master branch. You can do this by running the following commands in a local repository for your personal fork. Note: you do not have to name the new branch NEW-BRANCH-NAME.

$ git checkout -b NEW-BRANCH-NAME
$ git branch -f master 2edae36405116091e34841ff646b31009c74de84
$ git push -f origin master

Then proceed to create a new pull request with NEW-BRANCH-NAME as the source branch and close this one.

@openjdk openjdk bot added the rfr label Jun 29, 2020
@mlbridge
Copy link

@mlbridge mlbridge bot commented Jun 29, 2020

Webrevs

@@ -0,0 +1,124 @@
/*
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
Copy link
Member

@thegreystone thegreystone Jun 30, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: I think it's fine to set copyright to only 2020.

Copy link
Collaborator Author

@Josh-Matsuoka Josh-Matsuoka Jun 30, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed, thanks!

@@ -0,0 +1,48 @@
/*
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
Copy link
Member

@thegreystone thegreystone Jun 30, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

New file - copyright 2020 only.

Copy link
Collaborator Author

@Josh-Matsuoka Josh-Matsuoka Jun 30, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed, thanks!

Copy link
Member

@thegreystone thegreystone left a comment

Looks good to me - good to go after the copyright year fixes.

@openjdk
Copy link

@openjdk openjdk bot commented Jun 30, 2020

@Josh-Matsuoka This change now passes all automated pre-integration checks. When the change also fulfills all project specific requirements, type /integrate in a new comment to proceed. After integration, the commit message will be:

6805: Event emission only on exceptions

Reviewed-by: hirt
  • If you would like to add a summary, use the /summary command.
  • To credit additional contributors, use the /contributor command.
  • To add additional solved issues, use the /issue command.

Since the source branch of this PR was last updated there have been 4 commits pushed to the master branch:

  • 20462f2: 6699: Remove the photon platform
  • 28b1657: 6710: Add rule to detect if an old version of Lucene is in use
  • 0a1c4b3: 6847: Upgrading to the Eclipse 2020-06 platform
  • 77d4b13: 6833: Tolerate exceptions when loading images

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid automatic rebasing, please merge master into your branch, and then specify the current head hash when integrating, like this: /integrate 20462f2fd78583b423cc129eeaa3ab80f1d5c0f8.

➡️ 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 Jun 30, 2020
@thegreystone
Copy link
Member

@thegreystone thegreystone commented Jul 1, 2020

Feel free to integrate! :)

@Josh-Matsuoka
Copy link
Collaborator Author

@Josh-Matsuoka Josh-Matsuoka commented Jul 2, 2020

/integrate

@openjdk openjdk bot closed this Jul 2, 2020
@openjdk openjdk bot added integrated and removed ready rfr labels Jul 2, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Jul 2, 2020

@Josh-Matsuoka The following commits have been pushed to master since your change was applied:

  • 20462f2: 6699: Remove the photon platform
  • 28b1657: 6710: Add rule to detect if an old version of Lucene is in use
  • 0a1c4b3: 6847: Upgrading to the Eclipse 2020-06 platform
  • 77d4b13: 6833: Tolerate exceptions when loading images

Your commit was automatically rebased without conflicts.

Pushed as commit 3eb5cb2.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants