From 1e70c43cbdb8435cff0289f8d69b7a22f4bfc07d Mon Sep 17 00:00:00 2001
From: Quentin Gliech <quenting@element.io>
Date: Fri, 11 Apr 2025 15:40:00 +0200
Subject: [PATCH] Upgrade the Prometheus crate to 0.14.0

---
 Cargo.lock | 27 +++------------------------
 Cargo.toml |  2 +-
 deny.toml  |  4 ----
 3 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e97867b69..c673728e0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3190,7 +3190,7 @@ dependencies = [
  "opentelemetry-semantic-conventions",
  "opentelemetry-stdout",
  "opentelemetry_sdk",
- "prometheus 0.13.4",
+ "prometheus",
  "rand 0.8.5",
  "rand_chacha 0.3.1",
  "reqwest",
@@ -4146,7 +4146,7 @@ dependencies = [
  "once_cell",
  "opentelemetry",
  "opentelemetry_sdk",
- "prometheus 0.14.0",
+ "prometheus",
  "tracing",
 ]
 
@@ -4664,21 +4664,6 @@ dependencies = [
  "yansi",
 ]
 
-[[package]]
-name = "prometheus"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1"
-dependencies = [
- "cfg-if",
- "fnv",
- "lazy_static",
- "memchr",
- "parking_lot",
- "protobuf 2.28.0",
- "thiserror 1.0.69",
-]
-
 [[package]]
 name = "prometheus"
 version = "0.14.0"
@@ -4690,7 +4675,7 @@ dependencies = [
  "lazy_static",
  "memchr",
  "parking_lot",
- "protobuf 3.7.2",
+ "protobuf",
  "thiserror 2.0.12",
 ]
 
@@ -4717,12 +4702,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "protobuf"
-version = "2.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94"
-
 [[package]]
 name = "protobuf"
 version = "3.7.2"
diff --git a/Cargo.toml b/Cargo.toml
index 39fe4e9fe..325a5e7fe 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -429,7 +429,7 @@ version = "0.30.0"
 default-features = false
 
 [workspace.dependencies.prometheus]
-version = "0.13.4"
+version = "0.14.0"
 
 # URL manipulation
 [workspace.dependencies.url]
diff --git a/deny.toml b/deny.toml
index 804879465..4b2704f3f 100644
--- a/deny.toml
+++ b/deny.toml
@@ -18,10 +18,6 @@ ignore = [
     # `paste`, as used by `aws-lc-rs` is unmaintained, but we're not concerned
     # about it having a security vulnerability
     "RUSTSEC-2024-0436",
-
-    # rust-protobuf has an infinite recursion issue when parsing inputs. We only
-    # use protobuf for opentelemetry output, so we are not affected
-    "RUSTSEC-2024-0437",
 ]
 
 [licenses]