diff options
| author | Cristian Le <git@lecris.dev> | 2025-11-18 05:04:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-17 20:04:24 -0800 |
| commit | e33b3de2536d3d9c71869c407de11f88a16f6b9b (patch) | |
| tree | 38c45ac3025a3148bbdab953634f9e96f386e80e /crates/atuin-server/src/handlers | |
| parent | build(nix): update rust toolchain hash (#2990) (diff) | |
| download | atuin-e33b3de2536d3d9c71869c407de11f88a16f6b9b.zip | |
chore(deps): Update some packages realated to ring and aws-lc (#2991)
After `aws-lc-rs 0.15` it seems the illumos issue is resolved, so
reviving the `metrics` et.al. update PR, specifically:
- Update `metrics` to 0.24 and `metrics-exporter-prometheus` to 0.17
- Drop the `ring` feature from `rustls`
- Update `reqwest` to 0.12 (dropping `rustls 0.21` from the lock file)
There still seem to be `ring` dependencies, but not sure if these can be
dropped
---------
Co-authored-by: Helmut K. C. Tessarek <tessarek@evermeet.cx>
Diffstat (limited to 'crates/atuin-server/src/handlers')
| -rw-r--r-- | crates/atuin-server/src/handlers/history.rs | 8 | ||||
| -rw-r--r-- | crates/atuin-server/src/handlers/user.rs | 4 | ||||
| -rw-r--r-- | crates/atuin-server/src/handlers/v0/record.rs | 6 | ||||
| -rw-r--r-- | crates/atuin-server/src/handlers/v0/store.rs | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/crates/atuin-server/src/handlers/history.rs b/crates/atuin-server/src/handlers/history.rs index 5547a180..bdafcc60 100644 --- a/crates/atuin-server/src/handlers/history.rs +++ b/crates/atuin-server/src/handlers/history.rs @@ -65,7 +65,7 @@ pub async fn list<DB: Database>( if req.sync_ts.unix_timestamp_nanos() < 0 || req.history_ts.unix_timestamp_nanos() < 0 { error!("client asked for history from < epoch 0"); - counter!("atuin_history_epoch_before_zero", 1); + counter!("atuin_history_epoch_before_zero").increment(1); return Err( ErrorResponse::reply("asked for history from before epoch 0") @@ -95,7 +95,7 @@ pub async fn list<DB: Database>( user.id ); - counter!("atuin_history_returned", history.len() as u64); + counter!("atuin_history_returned").increment(history.len() as u64); Ok(Json(SyncHistoryResponse { history })) } @@ -131,7 +131,7 @@ pub async fn add<DB: Database>( let State(AppState { database, settings }) = state; debug!("request to add {} history items", req.len()); - counter!("atuin_history_uploaded", req.len() as u64); + counter!("atuin_history_uploaded").increment(req.len() as u64); let mut history: Vec<NewHistory> = req .into_iter() @@ -151,7 +151,7 @@ pub async fn add<DB: Database>( // Don't return an error here. We want to insert as much of the // history list as we can, so log the error and continue going. if !keep { - counter!("atuin_history_too_long", 1); + counter!("atuin_history_too_long").increment(1); tracing::warn!( "history too long, got length {}, max {}", diff --git a/crates/atuin-server/src/handlers/user.rs b/crates/atuin-server/src/handlers/user.rs index e493e714..4edd1787 100644 --- a/crates/atuin-server/src/handlers/user.rs +++ b/crates/atuin-server/src/handlers/user.rs @@ -146,7 +146,7 @@ pub async fn register<DB: Database>( .await; } - counter!("atuin_users_registered", 1); + counter!("atuin_users_registered").increment(1); match db.add_session(&new_session).await { Ok(_) => Ok(Json(RegisterResponse { session: token })), @@ -173,7 +173,7 @@ pub async fn delete<DB: Database>( .with_status(StatusCode::INTERNAL_SERVER_ERROR)); }; - counter!("atuin_users_deleted", 1); + counter!("atuin_users_deleted").increment(1); Ok(Json(DeleteUserResponse {})) } diff --git a/crates/atuin-server/src/handlers/v0/record.rs b/crates/atuin-server/src/handlers/v0/record.rs index 01b91599..5c57910b 100644 --- a/crates/atuin-server/src/handlers/v0/record.rs +++ b/crates/atuin-server/src/handlers/v0/record.rs @@ -25,14 +25,14 @@ pub async fn post<DB: Database>( "request to add records" ); - counter!("atuin_record_uploaded", records.len() as u64); + counter!("atuin_record_uploaded").increment(records.len() as u64); let keep = records .iter() .all(|r| r.data.data.len() <= settings.max_record_size || settings.max_record_size == 0); if !keep { - counter!("atuin_record_too_large", 1); + counter!("atuin_record_too_large").increment(1); return Err( ErrorResponse::reply("could not add records; record too large") @@ -108,7 +108,7 @@ pub async fn next<DB: Database>( } }; - counter!("atuin_record_downloaded", records.len() as u64); + counter!("atuin_record_downloaded").increment(records.len() as u64); Ok(Json(records)) } diff --git a/crates/atuin-server/src/handlers/v0/store.rs b/crates/atuin-server/src/handlers/v0/store.rs index 941f2487..6ca455d7 100644 --- a/crates/atuin-server/src/handlers/v0/store.rs +++ b/crates/atuin-server/src/handlers/v0/store.rs @@ -24,14 +24,14 @@ pub async fn delete<DB: Database>( }) = state; if let Err(e) = database.delete_store(&user).await { - counter!("atuin_store_delete_failed", 1); + counter!("atuin_store_delete_failed").increment(1); error!("failed to delete store {e:?}"); return Err(ErrorResponse::reply("failed to delete store") .with_status(StatusCode::INTERNAL_SERVER_ERROR)); } - counter!("atuin_store_deleted", 1); + counter!("atuin_store_deleted").increment(1); Ok(()) } |
