From 16b2ff72322afab044f17f46805bc3a452dd260a Mon Sep 17 00:00:00 2001 From: Oliver Gould Date: Tue, 11 Mar 2025 15:38:39 -0700 Subject: [PATCH] chore(cargo): make prometheus-client a workspace dependency (#3743) --- Cargo.toml | 1 + linkerd/app/core/Cargo.toml | 2 +- linkerd/app/outbound/Cargo.toml | 2 +- linkerd/http/detect/Cargo.toml | 2 +- linkerd/http/prom/Cargo.toml | 2 +- linkerd/identity/Cargo.toml | 2 +- linkerd/metrics/Cargo.toml | 2 +- linkerd/pool/p2c/Cargo.toml | 2 +- linkerd/proxy/balance/gauge-endpoints/Cargo.toml | 2 +- linkerd/proxy/balance/queue/Cargo.toml | 2 +- 10 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 3a10123e3..9e7df9fe9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -105,6 +105,7 @@ h2 = { version = "0.3" } http = { version = "0.2" } http-body = { version = "0.4" } hyper = { version = "0.14.32", default-features = false } +prometheus-client = { version = "0.23" } prost = { version = "0.12" } prost-build = { version = "0.12", default-features = false } prost-types = { version = "0.12" } diff --git a/linkerd/app/core/Cargo.toml b/linkerd/app/core/Cargo.toml index a66e7dce0..530260cbf 100644 --- a/linkerd/app/core/Cargo.toml +++ b/linkerd/app/core/Cargo.toml @@ -20,7 +20,7 @@ http-body = { workspace = true } hyper = { workspace = true, features = ["deprecated", "http1", "http2"] } futures = { version = "0.3", default-features = false } ipnet = "2.11" -prometheus-client = "0.23" +prometheus-client = { workspace = true } regex = "1" serde_json = "1" thiserror = "2" diff --git a/linkerd/app/outbound/Cargo.toml b/linkerd/app/outbound/Cargo.toml index 0f44a54ab..bcb8458fe 100644 --- a/linkerd/app/outbound/Cargo.toml +++ b/linkerd/app/outbound/Cargo.toml @@ -26,7 +26,7 @@ linkerd2-proxy-api = { workspace = true, features = ["outbound"] } once_cell = "1" parking_lot = "0.12" pin-project = "1" -prometheus-client = "0.23" +prometheus-client = { workspace = true } thiserror = "2" tokio = { version = "1", features = ["sync"] } tonic = { workspace = true, default-features = false } diff --git a/linkerd/http/detect/Cargo.toml b/linkerd/http/detect/Cargo.toml index 9307f664c..69cdb2aaa 100644 --- a/linkerd/http/detect/Cargo.toml +++ b/linkerd/http/detect/Cargo.toml @@ -7,7 +7,7 @@ publish = false [dependencies] bytes = { workspace = true } httparse = "1" -prometheus-client = "0.23" +prometheus-client = { workspace = true } thiserror = "2" tokio = { version = "1", features = ["time"] } tracing = { version = "0.1" } diff --git a/linkerd/http/prom/Cargo.toml b/linkerd/http/prom/Cargo.toml index 7e0d62c14..34940532e 100644 --- a/linkerd/http/prom/Cargo.toml +++ b/linkerd/http/prom/Cargo.toml @@ -19,7 +19,7 @@ http = { workspace = true } http-body = { workspace = true } parking_lot = "0.12" pin-project = "1" -prometheus-client = "0.23" +prometheus-client = { workspace = true } thiserror = "2" tokio = { version = "1", features = ["time"] } diff --git a/linkerd/identity/Cargo.toml b/linkerd/identity/Cargo.toml index 772ac4595..4693e1cc4 100644 --- a/linkerd/identity/Cargo.toml +++ b/linkerd/identity/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" publish = false [dependencies] -prometheus-client = "0.23" +prometheus-client = { workspace = true } thiserror = "2" tracing = "0.1" url = "2.5.4" diff --git a/linkerd/metrics/Cargo.toml b/linkerd/metrics/Cargo.toml index 6f0c3ac5d..264ba38b3 100644 --- a/linkerd/metrics/Cargo.toml +++ b/linkerd/metrics/Cargo.toml @@ -19,7 +19,7 @@ http-body = { workspace = true } hyper = { workspace = true, features = ["deprecated", "http1", "http2"] } kubert-prometheus-process = { version = "0.2", optional = true } parking_lot = "0.12" -prometheus-client = "0.23" +prometheus-client = { workspace = true } tokio = { version = "1", features = ["time"] } tracing = "0.1" diff --git a/linkerd/pool/p2c/Cargo.toml b/linkerd/pool/p2c/Cargo.toml index efc009a8f..8b1598532 100644 --- a/linkerd/pool/p2c/Cargo.toml +++ b/linkerd/pool/p2c/Cargo.toml @@ -10,7 +10,7 @@ publish = false ahash = "0.8" futures = { version = "0.3", default-features = false } indexmap = "2" -prometheus-client = "0.23" +prometheus-client = { workspace = true } rand = { version = "0.9", features = ["small_rng"] } tokio = { version = "1", features = ["rt", "sync", "time"] } tracing = "0.1" diff --git a/linkerd/proxy/balance/gauge-endpoints/Cargo.toml b/linkerd/proxy/balance/gauge-endpoints/Cargo.toml index 0ad2a8148..073de2f50 100644 --- a/linkerd/proxy/balance/gauge-endpoints/Cargo.toml +++ b/linkerd/proxy/balance/gauge-endpoints/Cargo.toml @@ -6,6 +6,6 @@ license = "Apache-2.0" publish = false [dependencies] -prometheus-client = "0.23" +prometheus-client = { workspace = true } linkerd-stack = { path = "../../../stack" } diff --git a/linkerd/proxy/balance/queue/Cargo.toml b/linkerd/proxy/balance/queue/Cargo.toml index 94305ad36..d03254990 100644 --- a/linkerd/proxy/balance/queue/Cargo.toml +++ b/linkerd/proxy/balance/queue/Cargo.toml @@ -10,7 +10,7 @@ publish = false futures = { version = "0.3", default-features = false } parking_lot = "0.12" pin-project = "1" -prometheus-client = "0.23" +prometheus-client = { workspace = true } thiserror = "2" tokio = { version = "1", features = ["rt", "sync", "time"] } tokio-util = "0.7"