Merge pull request #5513 from meilisearch/bump-prometheus-protobuf

Bump prometheus protobuf
This commit is contained in:
Tamo 2025-04-16 09:15:29 +00:00 committed by GitHub
commit 8cecc6989a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 27 additions and 12 deletions

33
Cargo.lock generated
View File

@ -4531,22 +4531,21 @@ dependencies = [
[[package]] [[package]]
name = "procfs" name = "procfs"
version = "0.16.0" version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4" checksum = "cc5b72d8145275d844d4b5f6d4e1eef00c8cd889edb6035c21675d1bb1f45c9f"
dependencies = [ dependencies = [
"bitflags 2.9.0", "bitflags 2.9.0",
"hex", "hex",
"lazy_static",
"procfs-core", "procfs-core",
"rustix", "rustix",
] ]
[[package]] [[package]]
name = "procfs-core" name = "procfs-core"
version = "0.16.0" version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29" checksum = "239df02d8349b06fc07398a3a1697b06418223b1c7725085e801e7c0fc6a12ec"
dependencies = [ dependencies = [
"bitflags 2.9.0", "bitflags 2.9.0",
"hex", "hex",
@ -4554,9 +4553,9 @@ dependencies = [
[[package]] [[package]]
name = "prometheus" name = "prometheus"
version = "0.13.4" version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1" checksum = "3ca5326d8d0b950a9acd87e6a3f94745394f62e4dae1b1ee22b2bc0c394af43a"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"fnv", "fnv",
@ -4566,14 +4565,28 @@ dependencies = [
"parking_lot", "parking_lot",
"procfs", "procfs",
"protobuf", "protobuf",
"thiserror 1.0.69", "thiserror 2.0.9",
] ]
[[package]] [[package]]
name = "protobuf" name = "protobuf"
version = "2.28.0" version = "3.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" checksum = "d65a1d4ddae7d8b5de68153b48f6aa3bba8cb002b243dbdbc55a5afbc98f99f4"
dependencies = [
"once_cell",
"protobuf-support",
"thiserror 1.0.69",
]
[[package]]
name = "protobuf-support"
version = "3.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3e36c2f31e0a47f9280fb347ef5e461ffcd2c52dd520d8e216b52f93b0b0d7d6"
dependencies = [
"thiserror 1.0.69",
]
[[package]] [[package]]
name = "ptr_meta" name = "ptr_meta"

View File

@ -60,7 +60,7 @@ parking_lot = "0.12.3"
permissive-json-pointer = { path = "../permissive-json-pointer" } permissive-json-pointer = { path = "../permissive-json-pointer" }
pin-project-lite = "0.2.16" pin-project-lite = "0.2.16"
platform-dirs = "0.3.0" platform-dirs = "0.3.0"
prometheus = { version = "0.13.4", features = ["process"] } prometheus = { version = "0.14.0", features = ["process"] }
rand = "0.8.5" rand = "0.8.5"
rayon = "1.10.0" rayon = "1.10.0"
regex = "1.11.1" regex = "1.11.1"

View File

@ -77,7 +77,9 @@ where
let res = fut.await?; let res = fut.await?;
crate::metrics::MEILISEARCH_HTTP_REQUESTS_TOTAL crate::metrics::MEILISEARCH_HTTP_REQUESTS_TOTAL
.with_label_values(&[&request_method, &metric_path, res.status().as_str()]) .with_label_values(
&[request_method, metric_path, res.status().as_str().to_string()][..],
)
.inc(); .inc();
if let Some(histogram_timer) = histogram_timer { if let Some(histogram_timer) = histogram_timer {