Skip to content

fix: make prometheus dep optional#470

Open
johnbchron wants to merge 2 commits intotikv:masterfrom
johnbchron:optional-prometheus
Open

fix: make prometheus dep optional#470
johnbchron wants to merge 2 commits intotikv:masterfrom
johnbchron:optional-prometheus

Conversation

@johnbchron
Copy link

@johnbchron johnbchron commented Dec 1, 2024

Right now the prometheus dependency is present regardless of the prometheus feature flag. This PR excludes the prometheus dependency when the flag is not present.

@ti-chi-bot
Copy link

ti-chi-bot bot commented Dec 1, 2024

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign nrc for approval. For more information see the Code Review Process.

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

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot
Copy link

ti-chi-bot bot commented Dec 1, 2024

Welcome @johnbchron!

It looks like this is your first PR to tikv/client-rust 🎉.

I'm the bot to help you request reviewers, add labels and more, See available commands.

We want to make sure your contribution gets all the attention it needs!



Thank you, and welcome to tikv/client-rust. 😃

@ti-chi-bot ti-chi-bot bot added dco-signoff: no Indicates the PR's author has not signed dco. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Dec 1, 2024
@johnbchron
feat: make prometheus dep optional
2d75f2d 
Signed-off-by: John Lewis <github@jlewis.sh>
@ti-chi-bot ti-chi-bot bot added dco-signoff: yes Indicates the PR's author has signed the dco. and removed dco-signoff: no Indicates the PR's author has not signed dco. labels Dec 1, 2024
@johnbchron
fix: prometheus feature flag fixup
13aafc6 
Signed-off-by: John Lewis <github@jlewis.sh>
@ti-chi-bot ti-chi-bot bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Dec 1, 2024
pingyu
pingyu reviewed Dec 2, 2024
View reviewed changes
src/pd/retry.rs
Ok(r) => return Ok(r),
Err(e) => last_err = Err(e),
}
#[cfg(not(feature = "prometheus"))]
Copy link
Collaborator

@pingyu pingyu Dec 2, 2024

Choose a reason for hiding this comment

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

It looks a little too invasive to me.

How about like this:

Define another DummyRequestStats with no member and empty methods. Then change pd_stats and tikv_stats to return coresponding object accroding to the feature.

Copy link
Author

@johnbchron johnbchron Dec 2, 2024

Choose a reason for hiding this comment

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

Sounds good. I'll get to it this evening.

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

Reviewers

@pingyu pingyu pingyu left review comments

Assignees

No one assigned

Labels

dco-signoff: yes Indicates the PR's author has signed the dco. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@johnbchron @pingyu