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

6670: Harmonize ~ Unclassifiable ~ across Flame View and Stacktrace View #38

Conversation

@mirage22
Copy link
Contributor

mirage22 commented Jan 19, 2020

6670 : Harmonize ~ Unclassifiable ~ across Flame View and Stacktrace View
https://bugs.openjdk.java.net/browse/JMC-6670

Progress

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

Issue

JMC-6670: Harmonize ~ Unclassifiable ~ across Flame View and Stacktrace View

Approvers

  • Marcus Hirt (hirt - Reviewer)
@thegreystone

This comment has been minimized.

Do we really need this? We can keep the data structure smaller by just setting name or packageName to UNCLASSIFIABLE_FRAME, and take care of it in the JSon generation.

This comment has been minimized.

Copy link
Owner Author

mirage22 replied Jan 19, 2020

I've been thinking about two options, it was the one. I've a change the code to the second. TraceNode stays without any changes.

@thegreystone

This comment has been minimized.

Shouldn't we just add a tooltip override when needed (pretty much once), instead of adding empty d nodes all over?

This comment has been minimized.

Copy link
Owner Author

mirage22 replied Jan 19, 2020

this part is in my focus due to unnecessary content generation.

This comment has been minimized.

Copy link
Owner Author

mirage22 replied Jan 19, 2020

I've add different rendering strategies. the field d is present only in case when description is available otherwise the Json element doesn't contain it. The Tooltip is properly generated based on the Json element

@thegreystone

This comment has been minimized.

I think we want to use STACKTRACE_UNCLASSIFIABLE_FRAME for both the stacktrace view and the flame view, instead of having a copy in two places. Find a better home for it.

This comment has been minimized.

Copy link
Owner Author

mirage22 replied Jan 19, 2020

I've corrected the code there is only one STACKTRACE_UNCLASSIFIABLE_FRAME used

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 19, 2020

👋 Welcome back mwengner! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request (refresh this page to view it).

@mirage22 mirage22 changed the title Feature/6670 harmonize unclassifiable across flameview 6670: harmonize unclassifiable across flameview Jan 19, 2020
@openjdk openjdk bot added the rfr label Jan 19, 2020
@mirage22 mirage22 changed the title 6670: harmonize unclassifiable across flameview 6670: Harmonize ~ Unclassifiable ~ across Flame View and Stacktrace View Jan 19, 2020
@mlbridge
Copy link

mlbridge bot commented Jan 19, 2020

mirage22 added 6 commits Jan 20, 2020
mirage22 added 5 commits Jan 21, 2020
@openjdk openjdk bot removed the rfr label Jan 23, 2020
@openjdk
Copy link

openjdk bot commented Jan 23, 2020

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

6670: Harmonize ~ Unclassifiable ~ across Flame View and Stacktrace View

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 /solves command.

Since the source branch of this PR was last updated there has been 1 commit pushed to the master branch. Since there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to do this manually, please merge master into your branch first.

As you do not have Committer status in this project, an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@thegreystone) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready label Jan 23, 2020
@mirage22
Copy link
Contributor Author

mirage22 commented Jan 24, 2020

/integrate

@openjdk
Copy link

openjdk bot commented Jan 24, 2020

@mirage22
Your change (at version fc80b57) is now ready to be sponsored by a Committer.

@openjdk openjdk bot added the sponsor label Jan 24, 2020
@thegreystone
Copy link
Collaborator

thegreystone commented Jan 24, 2020

/sponsor

@openjdk openjdk bot closed this Jan 24, 2020
@openjdk openjdk bot added integrated and removed sponsor ready labels Jan 24, 2020
@openjdk
Copy link

openjdk bot commented Jan 24, 2020

@thegreystone @mirage22 The following commits have been pushed to master since your change was applied:

  • 2dd271f: 6572: Make mbean functions protected by permission checks

Your commit was automatically rebased without conflicts.

Pushed as commit 875abcd.

@mlbridge
Copy link

mlbridge bot commented Jan 24, 2020

Mailing list message from Marcus Hirt on jmc-dev:

Changeset: 875abcd
Author: Miroslav Wengner <mwengner at openjdk.org>
Committer: Marcus Hirt <hirt at openjdk.org>
Date: 2020-01-24 13:37:30 +0000
URL: https://git.openjdk.java.net/jmc/commit/875abcd3

6670: Harmonize ~ Unclassifiable ~ across Flame View and Stacktrace View

Reviewed-by: hirt

! application/org.openjdk.jmc.flightrecorder.flameview/src/main/java/org/openjdk/jmc/flightrecorder/flameview/tree/TraceTreeUtils.java
! application/org.openjdk.jmc.flightrecorder.flameview/src/main/java/org/openjdk/jmc/flightrecorder/flameview/views/FlameGraphView.java
! application/org.openjdk.jmc.flightrecorder.flameview/src/main/js/flameviewColoring.js
! core/org.openjdk.jmc.flightrecorder/META-INF/MANIFEST.MF
+ core/org.openjdk.jmc.flightrecorder/src/main/java/org/openjdk/jmc/flightrecorder/stacktrace/Messages.java
! core/org.openjdk.jmc.flightrecorder/src/main/java/org/openjdk/jmc/flightrecorder/stacktrace/StacktraceFormatToolkit.java
! core/org.openjdk.jmc.flightrecorder/src/main/java/org/openjdk/jmc/flightrecorder/stacktrace/messages/internal/Messages.java
+ core/org.openjdk.jmc.flightrecorder/src/main/resources/org/openjdk/jmc/flightrecorder/stacktrace/messages.properties
! core/org.openjdk.jmc.flightrecorder/src/main/resources/org/openjdk/jmc/flightrecorder/stacktrace/messages/internal/messages.properties
! core/org.openjdk.jmc.flightrecorder/src/main/resources/org/openjdk/jmc/flightrecorder/stacktrace/messages/internal/messages_ja.properties
! core/org.openjdk.jmc.flightrecorder/src/main/resources/org/openjdk/jmc/flightrecorder/stacktrace/messages/internal/messages_zh_CN.properties
+ core/org.openjdk.jmc.flightrecorder/src/main/resources/org/openjdk/jmc/flightrecorder/stacktrace/messages_ja.properties
+ core/org.openjdk.jmc.flightrecorder/src/main/resources/org/openjdk/jmc/flightrecorder/stacktrace/messages_zh_CN.properties

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.