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

[BugFix] Fix HistogramMetric output in json format (backport #54361) #54427

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 26, 2024

Why I'm doing:

#53735 will output histogram metrics in json format, but doesn't handle HistogramMetric.

What I'm doing:

Fixes https://github.com/StarRocks/StarRocksTest/issues/8971

What type of PR is this:

  • BugFix
  • Feature
  • Enhancement
  • Refactor
  • UT
  • Doc
  • Tool

Does this PR entail a change in behavior?

  • Yes, this PR will result in a change in behavior.
  • No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

  • Interface/UI changes: syntax, type conversion, expression evaluation, display information
  • Parameter changes: default values, similar parameters but with different default values
  • Policy changes: use new policy to replace old one, functionality automatically enabled
  • Feature removed
  • Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

  • I have added test cases for my bug fix or my new feature
  • This pr needs user documentation (for new or modified features or behaviors)
    • I have added documentation for my new feature or new function
  • This is a backport pr

Signed-off-by: shuming.li <[email protected]>
(cherry picked from commit 43fae48)

# Conflicts:
#	fe/fe-core/src/main/java/com/starrocks/metric/HistogramMetric.java
#	fe/fe-core/src/main/java/com/starrocks/metric/JsonMetricVisitor.java
#	fe/fe-core/src/test/java/com/starrocks/metric/MetricsTest.java
@mergify mergify bot added the conflicts label Dec 26, 2024
Copy link
Contributor Author

mergify bot commented Dec 26, 2024

Cherry-pick of 43fae48 has failed:

On branch mergify/bp/branch-3.1/pr-54361
Your branch is up to date with 'origin/branch-3.1'.

You are currently cherry-picking commit 43fae48a13.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   fe/fe-core/src/main/java/com/starrocks/metric/SimpleCoreMetricVisitor.java

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   fe/fe-core/src/main/java/com/starrocks/metric/HistogramMetric.java
	both modified:   fe/fe-core/src/main/java/com/starrocks/metric/JsonMetricVisitor.java
	both modified:   fe/fe-core/src/test/java/com/starrocks/metric/MetricsTest.java

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Copy link
Contributor Author

mergify bot commented Dec 26, 2024

@mergify[bot]: Backport conflict, please reslove the conflict and resubmit the pr

@mergify mergify bot closed this Dec 26, 2024
auto-merge was automatically disabled December 26, 2024 13:41

Pull request was closed

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

Successfully merging this pull request may close these issues.

1 participant