Skip to content

Add support for the prometheus-client crate #88

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

Merged
merged 19 commits into from
May 23, 2023
Merged

Add support for the prometheus-client crate #88

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
b255f8c
[WIP]
emschwartz Apr 21, 2023
7cbe053
Update prometheus-client version
emschwartz May 16, 2023
ff161ea
Merge branch 'main' into prometheus-client-2
emschwartz May 16, 2023
9e402eb
Finish support for prometheus-client
emschwartz May 16, 2023
f29aae1
Fix doc links
emschwartz May 16, 2023
11d052f
Ensure that prometheus-client is actually being used
emschwartz May 16, 2023
9817601
Work on fixing tests, remove const_format dep
emschwartz May 16, 2023
8635ad7
Don't use regexes in tests (because different libraries order labels …
emschwartz May 17, 2023
8130657
Make once_cell a required dependency
emschwartz May 17, 2023
49410dc
Rename concurrency tracker to gauge
emschwartz May 17, 2023
537553e
Merge branch 'main' into prometheus-client-2
emschwartz May 17, 2023
ecfe52f
Move PROMETHEUS_CLIENT_REGISTRY to integrations module
emschwartz May 19, 2023
e311510
Run all the other tests first
emschwartz May 19, 2023
ad830c3
Run the tests in the same order
emschwartz May 19, 2023
4406f08
The prometheus-exporter feature needs to depend on the prometheus fea…
emschwartz May 19, 2023
43bea12
Rename export to just REGISTRY
emschwartz May 19, 2023
36f65e2
Mention prometheus-client in readme and changelog
emschwartz May 19, 2023
fb34b11
Merge branch 'main' into prometheus-client-2
emschwartz May 23, 2023
8f263f8
Remove print statements
emschwartz May 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Rename export to just REGISTRY
  • Loading branch information
@emschwartz
emschwartz committed May 19, 2023
commit 43bea12d2f4bce64a930b3c5b8240200fd7fff2a
2 changes: 1 addition & 1 deletion autometrics/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ pub use self::prometheus_exporter::*;
pub mod integrations {
Copy link
Contributor Author

@emschwartz emschwartz May 19, 2023

Choose a reason for hiding this comment

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

Still not sure I like this name, but I can't think of anything better. metrics_libraries, producers, ...

Copy link
Contributor

@mellowagain mellowagain May 22, 2023

Choose a reason for hiding this comment

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

couldn't we just put the integrations as the top level name, getting rid of integrations? so the resolved path would end up being smth like autometrics::prometheus_client instead of autometrics::integrations::prometheus_client

Copy link
Contributor Author

@emschwartz emschwartz May 22, 2023

Choose a reason for hiding this comment

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

Hmm that would also be an option. The main downside with that is we may want some other submodules exported from the crate root that are different, and they could get a bit lost. For example #90. We'd have 4-5 modules that are all related to the metrics libraries and 1-2 that aren't.

Copy link
Contributor

@mellowagain mellowagain May 23, 2023

Choose a reason for hiding this comment

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

seems fine imo

#[cfg(feature = "prometheus-client")]
pub mod prometheus_client {
pub use crate::tracker::prometheus_client::PROMETHEUS_CLIENT_REGISTRY;
pub use crate::tracker::prometheus_client::REGISTRY;
}
}

Expand Down
2 changes: 1 addition & 1 deletion autometrics/src/prometheus_exporter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ impl GlobalPrometheus {
output.push('\n');
prometheus_client::encoding::text::encode(
&mut output,
&crate::tracker::prometheus_client::PROMETHEUS_CLIENT_REGISTRY,
&crate::tracker::prometheus_client::REGISTRY,
)
.map_err(|err| {
Error::Msg(format!(
Expand Down
2 changes: 1 addition & 1 deletion autometrics/src/tracker/prometheus_client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ static REGISTRY_AND_METRICS: Lazy<(Registry, Metrics)> = Lazy::new(|| {
)
});
/// The [`Registry`] used to collect metrics when the `prometheus-client` feature is enabled
pub static PROMETHEUS_CLIENT_REGISTRY: Lazy<&Registry> = Lazy::new(|| &REGISTRY_AND_METRICS.0);
pub static REGISTRY: Lazy<&Registry> = Lazy::new(|| &REGISTRY_AND_METRICS.0);

struct Metrics {
counter: Family<CounterLabels, Counter>,
Expand Down