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

[chore](version) Show binary version in metrics: fe be ms #45490

Merged
merged 2 commits into from
Dec 17, 2024

Conversation

yagagagaga
Copy link
Contributor

@yagagagaga yagagagaga commented Dec 16, 2024

What problem does this PR solve?

Issue Number: close #xxx

Related PR: #xxx

Problem Summary:

Release note

pick from https://github.com/selectdb/selectdb-core/commit/1985902d

before

root@af0e5d234e63:~# curl 127.0.0.1:8030/metrics | grep doris_fe_version

root@af0e5d234e63:~# curl 127.0.0.1:8060/brpc_metrics | grep doris_be_version

root@af0e5d234e63:~#  curl 127.0.0.1:5000/brpc_metrics | grep doris_cloud_version

after

[root@dbb7fecb3b61 output]# curl 127.0.0.1:8030/metrics | grep doris_fe_version
# TYPE doris_fe_version gauge
doris_fe_version 30004


[root@dbb7fecb3b61 output]# curl 127.0.0.1:8060/brpc_metrics | grep doris_be_version
# TYPE doris_be_version gauge
doris_be_version 30004

[root@dbb7fecb3b61 output]# curl 127.0.0.1:5000/brpc_metrics | grep doris_cloud_version
# TYPE doris_cloud_version gauge
doris_cloud_version 30004

Check List (For Author)

  • Test

    • Regression test
    • Unit Test
    • Manual test (add detailed scripts or steps below)
    • No need to test or manual test. Explain why:
      • This is a refactor/code format and no logic has been changed.
      • Previous test can cover this change.
      • No code files have been changed.
      • Other reason
  • Behavior changed:

    • No.
    • Yes. add a number as hotfix version
  • Does this need documentation?

    • No.
    • Yes.

Check List (For Reviewer who merge this PR)

  • Confirm the release note
  • Confirm test cases
  • Confirm document
  • Add branch pick label

@Thearas
Copy link
Contributor

Thearas commented Dec 16, 2024

Thank you for your contribution to Apache Doris.
Don't know what should be done next? See How to process your PR.

Please clearly describe your PR:

  1. What problem was fixed (it's best to include specific error reporting information). How it was fixed.
  2. Which behaviors were modified. What was the previous behavior, what is it now, why was it modified, and what possible impacts might there be.
  3. What features were added. Why was this function added?
  4. Which code was refactored and why was this part of the code refactored?
  5. Which functions were optimized and what is the difference before and after the optimization?

Copy link
Contributor

sh-checker report

To get the full details, please check in the job output.

shellcheck errors

'shellcheck ' returned error 1 finding the following syntactical issues:

----------

In gensrc/script/gen_build_version.sh line 38:
if [[ ${build_version_hotfix} > 0 ]]; then
                              ^-- SC2071 (error): > is for string comparisons. Use -gt instead.


In gensrc/script/gen_build_version.sh line 225:
if [[ ${build_version_hotfix} > 0 ]]; then
                              ^-- SC2071 (error): > is for string comparisons. Use -gt instead.

For more information:
  https://www.shellcheck.net/wiki/SC2071 -- > is for string comparisons. Use ...
----------

You can address the above issues in one of three ways:
1. Manually correct the issue in the offending shell script;
2. Disable specific issues by adding the comment:
  # shellcheck disable=NNNN
above the line that contains the issue, where NNNN is the error code;
3. Add '-e NNNN' to the SHELLCHECK_OPTS setting in your .yml action file.



shfmt errors
'shfmt ' found no issues.

Copy link
Contributor

clang-tidy review says "All clean, LGTM! 👍"

@yagagagaga
Copy link
Contributor Author

run buildall

Copy link
Contributor

sh-checker report

To get the full details, please check in the job output.

shellcheck errors

'shellcheck ' returned error 1 finding the following syntactical issues:

----------

In gensrc/script/gen_build_version.sh line 38:
if [[ ${build_version_hotfix} > 0 ]]; then
                              ^-- SC2071 (error): > is for string comparisons. Use -gt instead.


In gensrc/script/gen_build_version.sh line 228:
if [[ ${build_version_hotfix} > 0 ]]; then
                              ^-- SC2071 (error): > is for string comparisons. Use -gt instead.

For more information:
  https://www.shellcheck.net/wiki/SC2071 -- > is for string comparisons. Use ...
----------

You can address the above issues in one of three ways:
1. Manually correct the issue in the offending shell script;
2. Disable specific issues by adding the comment:
  # shellcheck disable=NNNN
above the line that contains the issue, where NNNN is the error code;
3. Add '-e NNNN' to the SHELLCHECK_OPTS setting in your .yml action file.



shfmt errors
'shfmt ' found no issues.

Copy link
Contributor

clang-tidy review says "All clean, LGTM! 👍"

@doris-robot
Copy link

TeamCity be ut coverage result:
Function Coverage: 38.86% (10130/26066)
Line Coverage: 29.76% (85093/285922)
Region Coverage: 28.81% (43645/151489)
Branch Coverage: 25.34% (22164/87454)
Coverage Report: http://coverage.selectdb-in.cc/coverage/d699c1bd6c7657e55c2c212322359a78d3434162_d699c1bd6c7657e55c2c212322359a78d3434162/report/index.html

Copy link
Contributor

@gavinchou gavinchou left a comment

Choose a reason for hiding this comment

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

LGTM, better add a regression test

@github-actions github-actions bot added the approved Indicates a PR has been approved by one committer. label Dec 17, 2024
Copy link
Contributor

PR approved by at least one committer and no changes requested.

Copy link
Contributor

PR approved by anyone and no changes requested.

@yagagagaga
Copy link
Contributor Author

LGTM, better add a regression test

OK, I will post another PR to add a regression test

@gavinchou gavinchou changed the title [cherry-pick](doris-cloud) Patch doris-cloud: version and build script [chore](version) Show binary version in metrics: fe be ms Dec 17, 2024
@gavinchou gavinchou merged commit 038dd93 into apache:master Dec 17, 2024
26 of 31 checks passed
@yagagagaga yagagagaga deleted the core-4962 branch December 18, 2024 08:42
@suxiaogang223 suxiaogang223 mentioned this pull request Dec 18, 2024
16 tasks
hello-stephen pushed a commit that referenced this pull request Dec 18, 2024
### What problem does this PR solve?
Related PR: #45490 

Problem Summary:
```shell
In gensrc/script/gen_build_version.sh line 38:
if [[ ${build_version_hotfix} > 0 ]]; then
                              ^-- SC2071 (error): > is for string comparisons. Use -gt instead.


In gensrc/script/gen_build_version.sh line 228:
if [[ ${build_version_hotfix} > 0 ]]; then
                              ^-- SC2071 (error): > is for string comparisons. Use -gt instead.
```
yagagagaga added a commit to yagagagaga/doris that referenced this pull request Dec 24, 2024
before
```
root@af0e5d234e63:~# curl 127.0.0.1:8030/metrics | grep doris_fe_version

root@af0e5d234e63:~# curl 127.0.0.1:8060/brpc_metrics | grep doris_be_version

root@af0e5d234e63:~#  curl 127.0.0.1:5000/brpc_metrics | grep doris_cloud_version
```

after
```
[root@dbb7fecb3b61 output]# curl 127.0.0.1:8030/metrics | grep doris_fe_version
# TYPE doris_fe_version gauge
doris_fe_version 30004

[root@dbb7fecb3b61 output]# curl 127.0.0.1:8060/brpc_metrics | grep doris_be_version
# TYPE doris_be_version gauge
doris_be_version 30004

[root@dbb7fecb3b61 output]# curl 127.0.0.1:5000/brpc_metrics | grep doris_cloud_version
# TYPE doris_cloud_version gauge
doris_cloud_version 30004
```

Co-authored-by: Gavin Chou <gavineaglechou@gmail.com>

(cherry picked from commit 038dd93)
github-actions bot pushed a commit that referenced this pull request Dec 24, 2024
gavinchou pushed a commit that referenced this pull request Jan 2, 2025
…#45490) (#45841)

before
```
root@af0e5d234e63:~# curl 127.0.0.1:8030/metrics | grep doris_fe_version

root@af0e5d234e63:~# curl 127.0.0.1:8060/brpc_metrics | grep doris_be_version

root@af0e5d234e63:~#  curl 127.0.0.1:5000/brpc_metrics | grep doris_cloud_version
```

after
```
[root@dbb7fecb3b61 output]# curl 127.0.0.1:8030/metrics | grep doris_fe_version
# TYPE doris_fe_version gauge
doris_fe_version 30004

[root@dbb7fecb3b61 output]# curl 127.0.0.1:8060/brpc_metrics | grep doris_be_version
# TYPE doris_be_version gauge
doris_be_version 30004

[root@dbb7fecb3b61 output]# curl 127.0.0.1:5000/brpc_metrics | grep doris_cloud_version
# TYPE doris_cloud_version gauge
doris_cloud_version 30004
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by one committer. dev/3.0.4-merged reviewed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants