Skip to content

Commit eec033f

Browse files
committed
fix: bump metrics crate to 0.24.3 to fix Rust compiler error
metrics 0.24.1 has a lifetime issue (rust-lang/rust#141402) that causes compilation failures on recent Rust versions.
1 parent 806eb59 commit eec033f

File tree

5 files changed

+8
-19
lines changed

5 files changed

+8
-19
lines changed

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/cipherstash-proxy-integration/src/connection_resilience.rs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
/// - Blocked backend connections don't affect other proxy connections
88
#[cfg(test)]
99
mod tests {
10-
use crate::common::{connect_with_tls, PROXY, PG_PORT};
10+
use crate::common::{connect_with_tls, PG_PORT, PROXY};
1111
use std::sync::Arc;
1212
use std::time::Instant;
1313
use tokio::sync::Notify;
@@ -27,10 +27,7 @@ mod tests {
2727

2828
// Connection A: run a slow query
2929
let a_handle = tokio::spawn(async move {
30-
client_a
31-
.simple_query("SELECT pg_sleep(5)")
32-
.await
33-
.unwrap();
30+
client_a.simple_query("SELECT pg_sleep(5)").await.unwrap();
3431
});
3532

3633
// Brief pause to ensure A's query is in flight
@@ -89,10 +86,7 @@ mod tests {
8986
for _ in 0..5 {
9087
join_set.spawn(async {
9188
let client = connect_with_tls(PROXY).await;
92-
client
93-
.simple_query("SELECT pg_sleep(3)")
94-
.await
95-
.unwrap();
89+
client.simple_query("SELECT pg_sleep(3)").await.unwrap();
9690
});
9791
}
9892

packages/cipherstash-proxy/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ eql-mapper = { path = "../eql-mapper" }
2424
exitcode = "1.1.2"
2525
hex = "0.4.3"
2626
md-5 = "0.10.6"
27-
metrics = "0.24.1"
27+
metrics = "0.24.3"
2828
metrics-exporter-prometheus = "0.17"
2929
moka = { version = "0.12", features = ["future"] }
3030
oid-registry = "0.8"

packages/cipherstash-proxy/src/config/database.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,7 @@ mod tests {
117117
#[test]
118118
fn connection_timeout_defaults_to_120_seconds() {
119119
let config = DatabaseConfig::for_testing();
120-
assert_eq!(
121-
config.connection_timeout(),
122-
Some(Duration::from_secs(120))
123-
);
120+
assert_eq!(config.connection_timeout(), Some(Duration::from_secs(120)));
124121
}
125122

126123
#[test]

packages/cipherstash-proxy/src/postgresql/error_handler.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,7 @@ pub trait PostgreSqlErrorHandler {
5353
Error::Encrypt(EncryptError::UnknownKeysetIdentifier { .. }) => {
5454
ErrorResponse::system_error(err.to_string())
5555
}
56-
Error::ConnectionTimeout { .. } => {
57-
ErrorResponse::connection_timeout(err.to_string())
58-
}
56+
Error::ConnectionTimeout { .. } => ErrorResponse::connection_timeout(err.to_string()),
5957
_ => ErrorResponse::system_error(err.to_string()),
6058
}
6159
}

0 commit comments

Comments
 (0)