Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Harvest the latest metrics when /metrics is requested

Browse source 
Now that we track active projects, if nothing happens to the store
during the activity timeout we would still serve some old metrics
that may not account for the staleness of a project.

This commit changes it so that we grab a mutable reference to the store
before serving the metrics, which has the side effect of updating
all the metrics.
This commit is contained in:
Antonio Scandurra 2022-06-15 10:54:51 +02:00
parent e373e05d27
commit a85f9e74b1
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crates/collab/src/rpc.rs
View file

@ -1670,10 +1670,10 @@ pub fn routes(server: Arc<Server>) -> Router<Body> {
.layer(
ServiceBuilder::new()
.layer(Extension(server.app_state.clone()))
.layer(middleware::from_fn(auth::validate_header))
.layer(Extension(server)),
.layer(middleware::from_fn(auth::validate_header)),
)
.route("/metrics", get(handle_metrics))
.layer(Extension(server))
}
pub async fn handle_websocket_request(
@ -1707,7 +1707,10 @@ pub async fn handle_websocket_request(
})
}
pub async fn handle_metrics() -> axum::response::Response {
pub async fn handle_metrics(Extension(server): Extension<Arc<Server>>) -> axum::response::Response {
// We call `store_mut` here for its side effects of updating metrics.
server.store_mut().await;
let encoder = prometheus::TextEncoder::new();
let metric_families = prometheus::gather();
match encoder.encode_to_string(&metric_families) {

1
crates/collab/src/rpc/store.rs
View file

@ -348,7 +348,6 @@ impl Store {
.get_mut(&project_id)
.ok_or_else(|| anyhow!("no such project"))?;
if project.host_connection_id == connection_id {
project.last_activity = Some(Instant::now());
let mut old_worktrees = mem::take(&mut project.worktrees);
for worktree in worktrees {
if let Some(old_worktree) = old_worktrees.remove(&worktree.id) {