[to #556] metrics: attach cluster label to metrics by iosmanthus · Pull Request #558 · tikv/client-java

iosmanthus · 2022-03-18T05:47:13Z

Signed-off-by: iosmanthus myosmanthustree@gmail.com

What problem does this PR solve?

Issue Number: to #556

Problem Description:

code change for client-java
code change for grafana panel

Add cluster label for metrics in client-java with the value of cluster id.

Need to cherry-pick to the release branch

Signed-off-by: iosmanthus <myosmanthustree@gmail.com>

…h-cluster-id Signed-off-by: iosmanthus <myosmanthustree@gmail.com>

Signed-off-by: iosmanthus <myosmanthustree@gmail.com>

codecov · 2022-03-21T11:11:07Z

Codecov Report

Merging #558 (13f61cf) into master (f4e7c30) will decrease coverage by 0.07%.
The diff coverage is 77.82%.

@@             Coverage Diff              @@
##             master     #558      +/-   ##
============================================
- Coverage     33.13%   33.05%   -0.08%     
+ Complexity     1339     1328      -11     
============================================
  Files           270      270              
  Lines         17054    17131      +77     
  Branches       1950     1950              
============================================
+ Hits           5651     5663      +12     
- Misses        10794    10866      +72     
+ Partials        609      602       -7

Impacted Files	Coverage Δ
src/main/java/org/tikv/common/Snapshot.java	`12.24% <0.00%> (-0.26%)`	⬇️
src/main/java/org/tikv/common/log/SlowLog.java	`100.00% <ø> (ø)`
...ain/java/org/tikv/common/log/SlowLogEmptyImpl.java	`50.00% <0.00%> (-7.15%)`	⬇️
src/main/java/org/tikv/common/log/SlowLogImpl.java	`97.05% <0.00%> (-1.45%)`	⬇️
...ommon/operation/iterator/ConcreteScanIterator.java	`0.00% <0.00%> (ø)`
src/main/java/org/tikv/common/util/BackOffer.java	`100.00% <ø> (ø)`
src/main/java/org/tikv/txn/TTLManager.java	`0.00% <0.00%> (ø)`
src/main/java/org/tikv/txn/TwoPhaseCommitter.java	`5.38% <0.00%> (-0.08%)`	⬇️
src/main/java/org/tikv/txn/TxnKVClient.java	`15.68% <0.00%> (ø)`
.../main/java/org/tikv/common/AbstractGRPCClient.java	`45.94% <20.68%> (+0.49%)`	⬆️
... and 25 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f4e7c30...13f61cf. Read the comment docs.

Signed-off-by: iosmanthus <myosmanthustree@gmail.com>

zz-jason

since each session is connected to a tikv cluster, can you init the cluster id when TiSession is created?

src/main/java/org/tikv/common/ClusterIdRecorder.java

marsishandsome

LGTM

src/main/java/org/tikv/common/ClusterIdRecorder.java

src/main/java/org/tikv/common/PDClient.java

Signed-off-by: iosmanthus <myosmanthustree@gmail.com>

src/main/java/org/tikv/common/util/ConcreteBackOffer.java

…h-cluster-id Signed-off-by: iosmanthus <myosmanthustree@gmail.com>

zz-jason

LGTM

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

ti-srebot · 2022-03-28T01:21:42Z

cherry pick to release-3.1 in PR #579

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

ti-srebot · 2022-03-28T01:22:35Z

cherry pick to release-3.2 in PR #580

Signed-off-by: iosmanthus <myosmanthustree@gmail.com>

Co-authored-by: iosmanthus <dengliming@pingcap.com> Co-authored-by: iosmanthus <myosmanthustree@gmail.com> Co-authored-by: Jian Zhang <zjsariel@gmail.com>

Co-authored-by: iosmanthus <myosmanthustree@gmail.com> Co-authored-by: Jian Zhang <zjsariel@gmail.com>

iosmanthus added 3 commits March 16, 2022 19:30

slowlog: attach cluster_id and pd_addresses to slow log properties

cdd24de

Signed-off-by: iosmanthus <myosmanthustree@gmail.com>

slowlog: remove extra empty line

254aaaf

Signed-off-by: iosmanthus <myosmanthustree@gmail.com>

metrics: add cluster label for metrics

07d3319

Signed-off-by: iosmanthus <myosmanthustree@gmail.com>

github-actions bot added component/common component/rawkv labels Mar 18, 2022

iosmanthus mentioned this pull request Mar 18, 2022

Attach cluster info to slow log and metrics #556

Open

2 tasks

iosmanthus requested a review from marsishandsome March 18, 2022 07:13

iosmanthus added 3 commits March 21, 2022 18:52

metrics: attach cluster id to backoffer

9ab0377

Signed-off-by: iosmanthus <myosmanthustree@gmail.com>

Merge branch 'master' of github.com:tikv/client-java into metrics-wit…

d23ea81

…h-cluster-id Signed-off-by: iosmanthus <myosmanthustree@gmail.com>

metrics: remove String.valueof()

86ee92d

Signed-off-by: iosmanthus <myosmanthustree@gmail.com>

iosmanthus changed the title ~~[to #556] [WIP] metrics: attach cluster label to metrics~~ [to #556] metrics: attach cluster label to metrics Mar 21, 2022

./dev/javafmt

1111695

Signed-off-by: iosmanthus <myosmanthustree@gmail.com>

grafana: add cluster template

534c4ff

Signed-off-by: iosmanthus <myosmanthustree@gmail.com>

zz-jason reviewed Mar 22, 2022

View reviewed changes

src/main/java/org/tikv/common/ClusterIdRecorder.java Outdated Show resolved Hide resolved

marsishandsome reviewed Mar 23, 2022

View reviewed changes

src/main/java/org/tikv/common/ClusterIdRecorder.java Outdated Show resolved Hide resolved

ti-srebot added the status/LGT1 label Mar 23, 2022

marsishandsome previously approved these changes Mar 23, 2022

View reviewed changes

marsishandsome added needs-cherry-pick-3.1 labels Mar 23, 2022

zz-jason reviewed Mar 23, 2022

View reviewed changes

src/main/java/org/tikv/common/PDClient.java Outdated Show resolved Hide resolved

backoffer: inject cluster id in constructor

e85ae32

Signed-off-by: iosmanthus <myosmanthustree@gmail.com>

iosmanthus dismissed marsishandsome’s stale review via e85ae32 March 23, 2022 08:23

github-actions bot added the component/txnkv label Mar 23, 2022

zz-jason reviewed Mar 23, 2022

View reviewed changes

src/main/java/org/tikv/common/util/ConcreteBackOffer.java Show resolved Hide resolved

src/main/java/org/tikv/common/util/ConcreteBackOffer.java Show resolved Hide resolved

Merge branch 'master' of github.com:tikv/client-java into metrics-wit…

0bf82ff

…h-cluster-id Signed-off-by: iosmanthus <myosmanthustree@gmail.com>

iosmanthus mentioned this pull request Mar 24, 2022

BackOffer is a mess #574

Open

zz-jason approved these changes Mar 25, 2022

View reviewed changes

ti-srebot removed the status/LGT1 label Mar 25, 2022

ti-srebot approved these changes Mar 25, 2022

View reviewed changes

ti-srebot added the status/LGT2 label Mar 25, 2022

zz-jason enabled auto-merge (squash) March 28, 2022 01:00

Merge branch 'master' into metrics-with-cluster-id

13f61cf

zz-jason merged commit 6cbf56a into tikv:master Mar 28, 2022

ti-srebot pushed a commit to ti-srebot/client-java that referenced this pull request Mar 28, 2022

cherry pick tikv#558 to release-3.1

81f3800

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

ti-srebot mentioned this pull request Mar 28, 2022

[to #556] metrics: attach cluster label to metrics (#558) #579

Merged

2 tasks

ti-srebot pushed a commit to ti-srebot/client-java that referenced this pull request Mar 28, 2022

cherry pick tikv#558 to release-3.2

2beabbd

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

ti-srebot mentioned this pull request Mar 28, 2022

[to #556] metrics: attach cluster label to metrics (#558) #580

Merged

2 tasks

iosmanthus added a commit to ti-srebot/client-java that referenced this pull request Mar 28, 2022

cherry-pick tikv#558

a33c1bb

Signed-off-by: iosmanthus <myosmanthustree@gmail.com>

zz-jason added a commit that referenced this pull request Mar 29, 2022

[to #556] metrics: attach cluster label to metrics (#558) (#579)

1dc906b

Co-authored-by: iosmanthus <myosmanthustree@gmail.com> Co-authored-by: Jian Zhang <zjsariel@gmail.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[to #556] metrics: attach cluster label to metrics#558

[to #556] metrics: attach cluster label to metrics#558
zz-jason merged 11 commits intotikv:masterfrom
iosmanthus:metrics-with-cluster-id

iosmanthus commented Mar 18, 2022 •

edited

Loading

Uh oh!

codecov bot commented Mar 21, 2022 •

edited

Loading

Uh oh!

zz-jason left a comment

Uh oh!

Uh oh!

marsishandsome left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

zz-jason left a comment

Uh oh!

ti-srebot commented Mar 28, 2022

Uh oh!

ti-srebot commented Mar 28, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

iosmanthus commented Mar 18, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What problem does this PR solve?

Uh oh!

codecov bot commented Mar 21, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

zz-jason left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

marsishandsome left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

zz-jason left a comment

Choose a reason for hiding this comment

Uh oh!

ti-srebot commented Mar 28, 2022

Uh oh!

ti-srebot commented Mar 28, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

iosmanthus commented Mar 18, 2022 •

edited

Loading

codecov bot commented Mar 21, 2022 •

edited

Loading