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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 11 commits into from
Mar 28, 2022
Merged

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

merged 11 commits into from
Mar 28, 2022

Conversation

iosmanthus
Copy link
Member

@iosmanthus iosmanthus commented Mar 18, 2022 •
edited
Loading

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

@iosmanthus
slowlog: attach cluster_id and pd_addresses to slow log properties
cdd24de 
Signed-off-by: iosmanthus <myosmanthustree@gmail.com>
@iosmanthus
slowlog: remove extra empty line
254aaaf 
Signed-off-by: iosmanthus <myosmanthustree@gmail.com>
@iosmanthus
metrics: add cluster label for metrics
07d3319 
Signed-off-by: iosmanthus <myosmanthustree@gmail.com>
@iosmanthus iosmanthus mentioned this pull request Mar 18, 2022
Open
2 tasks
@iosmanthus
metrics: attach cluster id to backoffer
9ab0377 
Signed-off-by: iosmanthus <myosmanthustree@gmail.com>
@iosmanthus
Merge branch 'master' of github.com:tikv/client-java into metrics-wit…
d23ea81 
…h-cluster-id

Signed-off-by: iosmanthus <myosmanthustree@gmail.com>
@iosmanthus
metrics: remove String.valueof()
86ee92d 
Signed-off-by: iosmanthus <myosmanthustree@gmail.com>
@iosmanthus iosmanthus changed the title [to #556] [WIP] metrics: attach cluster label to metrics [to #556] metrics: attach cluster label to metrics Mar 21, 2022
@iosmanthus
./dev/javafmt
1111695 
Signed-off-by: iosmanthus <myosmanthustree@gmail.com>
@codecov
Copy link

codecov bot commented Mar 21, 2022 •
edited
Loading

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.

@iosmanthus
grafana: add cluster template
534c4ff 
Signed-off-by: iosmanthus <myosmanthustree@gmail.com>
zz-jason
zz-jason reviewed Mar 22, 2022
View reviewed changes
Copy link
Member

@zz-jason zz-jason left a comment

Choose a reason for hiding this comment

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

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 Outdated Show resolved Hide resolved
marsishandsome
marsishandsome reviewed Mar 23, 2022
View reviewed changes
Copy link
Collaborator

@marsishandsome marsishandsome left a comment

Choose a reason for hiding this comment

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

LGTM

src/main/java/org/tikv/common/ClusterIdRecorder.java Outdated Show resolved Hide resolved
marsishandsome
marsishandsome previously approved these changes Mar 23, 2022
View reviewed changes
@iosmanthus
backoffer: inject cluster id in constructor
e85ae32 
Signed-off-by: iosmanthus <myosmanthustree@gmail.com>
@iosmanthus
Merge branch 'master' of github.com:tikv/client-java into metrics-wit…
0bf82ff 
…h-cluster-id

Signed-off-by: iosmanthus <myosmanthustree@gmail.com>
@iosmanthus iosmanthus mentioned this pull request Mar 24, 2022
Open
zz-jason
zz-jason approved these changes Mar 25, 2022
View reviewed changes
Copy link
Member

@zz-jason zz-jason left a comment

Choose a reason for hiding this comment

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

LGTM

@zz-jason zz-jason enabled auto-merge (squash) March 28, 2022 01:00
@zz-jason 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
@iosmanthus @ti-srebot
cherry pick tikv#558 to release-3.1
81f3800 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Mar 28, 2022
Merged
2 tasks
@ti-srebot
Copy link
Collaborator

cherry pick to release-3.1 in PR #579

ti-srebot pushed a commit to ti-srebot/client-java that referenced this pull request Mar 28, 2022
@iosmanthus @ti-srebot
cherry pick tikv#558 to release-3.2
2beabbd 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Mar 28, 2022
Merged
2 tasks
@ti-srebot
Copy link
Collaborator

cherry pick to release-3.2 in PR #580

iosmanthus added a commit to ti-srebot/client-java that referenced this pull request Mar 28, 2022
@iosmanthus
cherry-pick tikv#558
a33c1bb 
Signed-off-by: iosmanthus <myosmanthustree@gmail.com>
zz-jason added a commit that referenced this pull request Mar 28, 2022
@ti-srebot @iosmanthus @zz-jason
[to #556] metrics: attach cluster label to metrics (#558) (#580)
d4ecb2c 
Co-authored-by: iosmanthus <dengliming@pingcap.com>
Co-authored-by: iosmanthus <myosmanthustree@gmail.com>
Co-authored-by: Jian Zhang <zjsariel@gmail.com>
zz-jason added a commit that referenced this pull request Mar 29, 2022
@ti-srebot @iosmanthus @zz-jason
[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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zz-jason zz-jason zz-jason approved these changes

@ti-srebot ti-srebot ti-srebot approved these changes

@marsishandsome marsishandsome marsishandsome left review comments

Assignees
No one assigned
Labels
component/common component/rawkv component/txnkv status/LGT2
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@iosmanthus @ti-srebot @zz-jason @marsishandsome