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

metrics: remove metrics proxy #6948

Merged
merged 3 commits into from Sep 6, 2022
Merged

Conversation

GMHDBJD
Copy link
Contributor

@GMHDBJD GMHDBJD commented Sep 1, 2022

What problem does this PR solve?

Issue Number: ref #4287

What is changed and how it works?

  • remove metrics proxy
  • upgrade promethus and use DeletePartialMatch if we want to delete by partial labels.

Check List

Tests

Manaully test

None

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Sep 1, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • buchuitoudegou
  • lance6716

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Sep 1, 2022
@GMHDBJD
Copy link
Contributor Author

GMHDBJD commented Sep 1, 2022

/run-all-tests

@codecov-commenter
Copy link

codecov-commenter commented Sep 1, 2022

Codecov Report

Merging #6948 (bbbfe93) into master (9398176) will increase coverage by 0.0732%.
The diff coverage is 69.1891%.

Additional details and impacted files
Flag Coverage Δ
cdc 67.2586% <ø> (+0.0626%) ⬆️
dm 51.9451% <25.0000%> (-0.0028%) ⬇️
engine 62.5776% <73.3727%> (+0.3154%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

@@               Coverage Diff                @@
##             master      #6948        +/-   ##
================================================
+ Coverage   59.8253%   59.8985%   +0.0732%     
================================================
  Files           791        788         -3     
  Lines         90221      90301        +80     
================================================
+ Hits          53975      54089       +114     
+ Misses        31498      31470        -28     
+ Partials       4748       4742         -6     

@GMHDBJD
Copy link
Contributor Author

GMHDBJD commented Sep 2, 2022

/run-engine-integration-test

@CharlesCheung96
Copy link
Contributor

The integration test is fixed in this pr, please rebase this branch and trigger engine tests again.

@lance6716 lance6716 added the area/dm Issues or PRs related to DM. label Sep 5, 2022
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Sep 5, 2022
@GMHDBJD
Copy link
Contributor Author

GMHDBJD commented Sep 5, 2022

cc @D3Hunter @buchuitoudegou

Copy link
Contributor

@buchuitoudegou buchuitoudegou left a comment

Choose a reason for hiding this comment

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

Would you mind introduce a bit below this comment about why we used this before and why we abandon it now?

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Sep 6, 2022
@GMHDBJD
Copy link
Contributor Author

GMHDBJD commented Sep 6, 2022

Would you mind introduce a bit below this comment about why we used this before and why we abandon it now?

see pingcap/dm#575 for more detail. We want to remove metrics when task/source stopped. However, our metrics don't quite fit the specification. e.g. txnHistogram is created with target_schema/target_table label, but we need to remove them when their task/source is deleted, so we need delete the metrics when label is partial match. pingcap/dm#575 wraps metrics and label with a Map, which has perfomance issue. Promethus support DeletePartialMatch now. prometheus/client_golang#1013

@GMHDBJD
Copy link
Contributor Author

GMHDBJD commented Sep 6, 2022

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: d689bae

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 6, 2022
@ti-chi-bot ti-chi-bot merged commit 7774275 into pingcap:master Sep 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/dm Issues or PRs related to DM. release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants