diff --git a/Cargo.toml b/Cargo.toml index c0c45d3c0..458fc8fd2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -123,6 +123,7 @@ tonic-build = { version = "0.12", default-features = false } tower = { version = "0.5", default-features = false } tower-service = { version = "0.3" } tower-test = { version = "0.4" } +tracing = { version = "0.1" } [workspace.dependencies.http-body-util] version = "0.1.3" diff --git a/linkerd/addr/fuzz/Cargo.toml b/linkerd/addr/fuzz/Cargo.toml index 11a20575a..b36c31c94 100644 --- a/linkerd/addr/fuzz/Cargo.toml +++ b/linkerd/addr/fuzz/Cargo.toml @@ -13,7 +13,7 @@ cargo-fuzz = true libfuzzer-sys = "0.4" linkerd-addr = { path = ".." } linkerd-tracing = { path = "../../tracing", features = ["ansi"] } -tracing = "0.1" +tracing = { workspace = true } # Prevent this from interfering with workspaces [workspace] diff --git a/linkerd/app/Cargo.toml b/linkerd/app/Cargo.toml index a9b1571c7..7be77901c 100644 --- a/linkerd/app/Cargo.toml +++ b/linkerd/app/Cargo.toml @@ -36,4 +36,4 @@ tokio = { version = "1", features = ["rt"] } tokio-stream = { version = "0.1", features = ["time", "sync"] } tonic = { workspace = true, default-features = false, features = ["prost"] } tower = { workspace = true } -tracing = "0.1" +tracing = { workspace = true } diff --git a/linkerd/app/admin/Cargo.toml b/linkerd/app/admin/Cargo.toml index 6781600a1..c509cee26 100644 --- a/linkerd/app/admin/Cargo.toml +++ b/linkerd/app/admin/Cargo.toml @@ -27,7 +27,7 @@ serde = "1" serde_json = "1" thiserror = "2" tokio = { version = "1", features = ["macros", "sync", "parking_lot"] } -tracing = "0.1" +tracing = { workspace = true } linkerd-app-core = { path = "../core" } linkerd-app-inbound = { path = "../inbound" } diff --git a/linkerd/app/core/Cargo.toml b/linkerd/app/core/Cargo.toml index 17fe5f2b4..6daa8b20b 100644 --- a/linkerd/app/core/Cargo.toml +++ b/linkerd/app/core/Cargo.toml @@ -29,7 +29,7 @@ thiserror = "2" tokio = { version = "1", features = ["macros", "sync", "parking_lot"] } tokio-stream = { version = "0.1", features = ["time"] } tonic = { workspace = true, default-features = false, features = ["prost"] } -tracing = "0.1" +tracing = { workspace = true } parking_lot = "0.12" pin-project = "1" diff --git a/linkerd/app/gateway/Cargo.toml b/linkerd/app/gateway/Cargo.toml index c35521c1b..08673f896 100644 --- a/linkerd/app/gateway/Cargo.toml +++ b/linkerd/app/gateway/Cargo.toml @@ -18,7 +18,7 @@ thiserror = "2" tokio = { version = "1", features = ["sync"] } tonic = { workspace = true, default-features = false } tower = { workspace = true, default-features = false } -tracing = "0.1" +tracing = { workspace = true } [dev-dependencies] linkerd-app-inbound = { path = "../inbound", features = ["test-util"] } diff --git a/linkerd/app/inbound/Cargo.toml b/linkerd/app/inbound/Cargo.toml index 9e7f697c1..5fae7151a 100644 --- a/linkerd/app/inbound/Cargo.toml +++ b/linkerd/app/inbound/Cargo.toml @@ -38,7 +38,7 @@ thiserror = "2" tokio = { version = "1", features = ["sync"] } tonic = { workspace = true, default-features = false } tower = { workspace = true, features = ["util"] } -tracing = "0.1" +tracing = { workspace = true } [dependencies.linkerd-proxy-server-policy] path = "../../proxy/server-policy" diff --git a/linkerd/app/inbound/fuzz/Cargo.toml b/linkerd/app/inbound/fuzz/Cargo.toml index f26cb9132..36676e32a 100644 --- a/linkerd/app/inbound/fuzz/Cargo.toml +++ b/linkerd/app/inbound/fuzz/Cargo.toml @@ -24,7 +24,7 @@ linkerd-meshtls-rustls = { path = "../../../meshtls/rustls", features = [ ] } linkerd-tracing = { path = "../../../tracing", features = ["ansi"] } tokio = { version = "1", features = ["full"] } -tracing = "0.1" +tracing = { workspace = true } # Prevent this from interfering with workspaces [workspace] diff --git a/linkerd/app/integration/Cargo.toml b/linkerd/app/integration/Cargo.toml index a5981561f..a15da4458 100644 --- a/linkerd/app/integration/Cargo.toml +++ b/linkerd/app/integration/Cargo.toml @@ -40,7 +40,7 @@ tokio-rustls = { workspace = true } tokio-stream = { version = "0.1", features = ["sync"] } tonic = { workspace = true, features = ["transport"], default-features = false } tower = { workspace = true, default-features = false } -tracing = "0.1" +tracing = { workspace = true } [dependencies.hyper] workspace = true diff --git a/linkerd/app/outbound/Cargo.toml b/linkerd/app/outbound/Cargo.toml index 071db77e5..e5c1179fc 100644 --- a/linkerd/app/outbound/Cargo.toml +++ b/linkerd/app/outbound/Cargo.toml @@ -32,7 +32,7 @@ thiserror = "2" tokio = { version = "1", features = ["sync"] } tonic = { workspace = true, default-features = false } tower = { workspace = true, features = ["util"] } -tracing = "0.1" +tracing = { workspace = true } linkerd-app-core = { path = "../core" } linkerd-app-test = { path = "../test", optional = true } diff --git a/linkerd/app/test/Cargo.toml b/linkerd/app/test/Cargo.toml index a9c52fef4..6dc968087 100644 --- a/linkerd/app/test/Cargo.toml +++ b/linkerd/app/test/Cargo.toml @@ -33,7 +33,7 @@ tokio-test = "0.4" tokio-stream = { version = "0.1", features = ["sync"] } tonic = { workspace = true, default-features = false, optional = true } tower = { workspace = true, default-features = false } -tracing = "0.1" +tracing = { workspace = true } thiserror = "2" [dependencies.tracing-subscriber] diff --git a/linkerd/distribute/Cargo.toml b/linkerd/distribute/Cargo.toml index 910ab049c..0d624aab5 100644 --- a/linkerd/distribute/Cargo.toml +++ b/linkerd/distribute/Cargo.toml @@ -12,7 +12,7 @@ linkerd-stack = { path = "../stack" } parking_lot = "0.12" rand = { version = "0.9", features = ["small_rng"] } tokio = { version = "1", features = ["macros"] } -tracing = "0.1" +tracing = { workspace = true } [dev-dependencies] tokio-test = "0.4" diff --git a/linkerd/dns/Cargo.toml b/linkerd/dns/Cargo.toml index d5f377ba6..1b6422183 100644 --- a/linkerd/dns/Cargo.toml +++ b/linkerd/dns/Cargo.toml @@ -14,7 +14,7 @@ linkerd-error = { path = "../error" } prometheus-client = { workspace = true } thiserror = "2" tokio = { version = "1", features = ["rt", "sync", "time"] } -tracing = "0.1" +tracing = { workspace = true } [lints.rust] unexpected_cfgs = { level = "warn", check-cfg = ['cfg(fuzzing)'] } diff --git a/linkerd/dns/fuzz/Cargo.toml b/linkerd/dns/fuzz/Cargo.toml index 6f7cfdd21..ede45b0c2 100644 --- a/linkerd/dns/fuzz/Cargo.toml +++ b/linkerd/dns/fuzz/Cargo.toml @@ -13,7 +13,7 @@ cargo-fuzz = true libfuzzer-sys = "0.4" linkerd-dns = { path = ".." } tokio = { version = "1", features = ["rt", "time", "io-util"] } -tracing = "0.1" +tracing = { workspace = true } linkerd-tracing = { path = "../../tracing", features = ["ansi"] } # Prevent this from interfering with workspaces diff --git a/linkerd/duplex/Cargo.toml b/linkerd/duplex/Cargo.toml index 384f586e9..2436eaa30 100644 --- a/linkerd/duplex/Cargo.toml +++ b/linkerd/duplex/Cargo.toml @@ -11,5 +11,5 @@ bytes = { workspace = true } futures = { version = "0.3", default-features = false } tokio = { version = "1", features = ["io-util"] } pin-project = "1" -tracing = "0.1" +tracing = { workspace = true } linkerd-io = { path = "../io" } diff --git a/linkerd/http/access-log/Cargo.toml b/linkerd/http/access-log/Cargo.toml index 399b3c03d..31d4f07b0 100644 --- a/linkerd/http/access-log/Cargo.toml +++ b/linkerd/http/access-log/Cargo.toml @@ -12,7 +12,7 @@ http = { workspace = true } jiff = { version = "0.2", features = ["std"] } pin-project = "1" tokio = { version = "1", features = ["time"] } -tracing = "0.1" +tracing = { workspace = true } linkerd-stack = { path = "../../stack" } linkerd-identity = { path = "../../identity" } diff --git a/linkerd/http/classify/Cargo.toml b/linkerd/http/classify/Cargo.toml index a12f860fc..e50028f5e 100644 --- a/linkerd/http/classify/Cargo.toml +++ b/linkerd/http/classify/Cargo.toml @@ -12,7 +12,7 @@ http = { workspace = true } http-body = { workspace = true } pin-project = "1" tokio = { version = "1", default-features = false } -tracing = "0.1" +tracing = { workspace = true } linkerd-error = { path = "../../error" } linkerd-http-box = { path = "../../http/box" } diff --git a/linkerd/http/detect/Cargo.toml b/linkerd/http/detect/Cargo.toml index bdb2d11f5..b8be73235 100644 --- a/linkerd/http/detect/Cargo.toml +++ b/linkerd/http/detect/Cargo.toml @@ -12,7 +12,7 @@ httparse = "1" prometheus-client = { workspace = true } thiserror = "2" tokio = { version = "1", features = ["time"] } -tracing = { version = "0.1" } +tracing = { workspace = true } linkerd-error = { path = "../../error" } linkerd-http-variant = { path = "../variant" } diff --git a/linkerd/http/metrics/Cargo.toml b/linkerd/http/metrics/Cargo.toml index 5940607bb..1c0ab01a3 100644 --- a/linkerd/http/metrics/Cargo.toml +++ b/linkerd/http/metrics/Cargo.toml @@ -19,7 +19,7 @@ parking_lot = "0.12" pin-project = "1" tokio = { version = "1", features = ["time"] } tower = { workspace = true } -tracing = "0.1" +tracing = { workspace = true } linkerd-error = { path = "../../error" } linkerd-http-classify = { path = "../classify" } diff --git a/linkerd/http/override-authority/Cargo.toml b/linkerd/http/override-authority/Cargo.toml index 36d017291..ece45e5d6 100644 --- a/linkerd/http/override-authority/Cargo.toml +++ b/linkerd/http/override-authority/Cargo.toml @@ -12,6 +12,6 @@ Tower middleware to override request authorities. [dependencies] http = { workspace = true } tower = { workspace = true, default-features = false } -tracing = "0.1" +tracing = { workspace = true } linkerd-stack = { path = "../../stack" } diff --git a/linkerd/http/retry/Cargo.toml b/linkerd/http/retry/Cargo.toml index c2ef5d51e..bb3a34260 100644 --- a/linkerd/http/retry/Cargo.toml +++ b/linkerd/http/retry/Cargo.toml @@ -16,7 +16,7 @@ parking_lot = "0.12" pin-project = "1" tokio = { version = "1", features = ["macros", "rt"] } tower = { workspace = true, features = ["retry"] } -tracing = "0.1" +tracing = { workspace = true } thiserror = "2" linkerd-http-box = { path = "../box" } diff --git a/linkerd/http/route/Cargo.toml b/linkerd/http/route/Cargo.toml index e4ddace37..da2aa6d29 100644 --- a/linkerd/http/route/Cargo.toml +++ b/linkerd/http/route/Cargo.toml @@ -14,7 +14,7 @@ http = { workspace = true } regex = "1" rand = "0.9" thiserror = "2" -tracing = "0.1" +tracing = { workspace = true } url = "2" [dependencies.linkerd2-proxy-api] diff --git a/linkerd/http/stream-timeouts/Cargo.toml b/linkerd/http/stream-timeouts/Cargo.toml index 8d34a8cfe..b2e25de75 100644 --- a/linkerd/http/stream-timeouts/Cargo.toml +++ b/linkerd/http/stream-timeouts/Cargo.toml @@ -17,7 +17,7 @@ parking_lot = "0.12" pin-project = "1" thiserror = "2" tokio = { version = "1", default-features = false } -tracing = "0.1" +tracing = { workspace = true } linkerd-error = { path = "../../error" } linkerd-stack = { path = "../../stack" } diff --git a/linkerd/http/upgrade/Cargo.toml b/linkerd/http/upgrade/Cargo.toml index 0756483e4..35ecaed97 100644 --- a/linkerd/http/upgrade/Cargo.toml +++ b/linkerd/http/upgrade/Cargo.toml @@ -24,7 +24,7 @@ pin-project = "1" thiserror = "2" tokio = { version = "1", default-features = false } tower = { workspace = true, default-features = false } -tracing = "0.1" +tracing = { workspace = true } try-lock = "0.2" linkerd-duplex = { path = "../../duplex" } diff --git a/linkerd/identity/Cargo.toml b/linkerd/identity/Cargo.toml index 5c3542bc6..3019e4ca5 100644 --- a/linkerd/identity/Cargo.toml +++ b/linkerd/identity/Cargo.toml @@ -9,7 +9,7 @@ publish = { workspace = true } [dependencies] prometheus-client = { workspace = true } thiserror = "2" -tracing = "0.1" +tracing = { workspace = true } url = "2.5.4" linkerd-dns-name = { path = "../dns/name" } diff --git a/linkerd/idle-cache/Cargo.toml b/linkerd/idle-cache/Cargo.toml index 90fe48e49..60e0180bc 100644 --- a/linkerd/idle-cache/Cargo.toml +++ b/linkerd/idle-cache/Cargo.toml @@ -21,7 +21,7 @@ tokio = { version = "1", default-features = false, features = [ "time", ] } tower = { workspace = true, default-features = false, features = ["util"] } -tracing = "0.1" +tracing = { workspace = true } [dev-dependencies] tokio = { version = "1", default-features = false, features = [ diff --git a/linkerd/meshtls/Cargo.toml b/linkerd/meshtls/Cargo.toml index 47ebf7901..722260261 100644 --- a/linkerd/meshtls/Cargo.toml +++ b/linkerd/meshtls/Cargo.toml @@ -31,7 +31,7 @@ linkerd-tls = { path = "../tls" } [dev-dependencies] tokio = { version = "1", features = ["macros", "net", "rt-multi-thread"] } -tracing = "0.1" +tracing = { workspace = true } rcgen = "0.13.2" linkerd-conditional = { path = "../conditional" } diff --git a/linkerd/meshtls/boring/Cargo.toml b/linkerd/meshtls/boring/Cargo.toml index 71ee19c77..b24e712d5 100644 --- a/linkerd/meshtls/boring/Cargo.toml +++ b/linkerd/meshtls/boring/Cargo.toml @@ -20,7 +20,7 @@ linkerd-meshtls-verifier = { path = "../verifier" } tokio = { version = "1", features = ["macros", "sync"] } tokio-boring = "4" -tracing = "0.1" +tracing = { workspace = true } [features] fips = ["boring/fips"] diff --git a/linkerd/meshtls/rustls/Cargo.toml b/linkerd/meshtls/rustls/Cargo.toml index fd0897b41..dc811d120 100644 --- a/linkerd/meshtls/rustls/Cargo.toml +++ b/linkerd/meshtls/rustls/Cargo.toml @@ -21,7 +21,7 @@ rustls-webpki = { version = "0.103.1", default-features = false, features = ["st thiserror = "2" tokio = { version = "1", features = ["macros", "rt", "sync"] } tokio-rustls = { workspace = true } -tracing = "0.1" +tracing = { workspace = true } linkerd-dns-name = { path = "../../dns/name" } linkerd-error = { path = "../../error" } diff --git a/linkerd/meshtls/verifier/Cargo.toml b/linkerd/meshtls/verifier/Cargo.toml index 602c66f02..759841e2a 100644 --- a/linkerd/meshtls/verifier/Cargo.toml +++ b/linkerd/meshtls/verifier/Cargo.toml @@ -7,7 +7,7 @@ edition = { workspace = true } publish = { workspace = true } [dependencies] -tracing = "0.1" +tracing = { workspace = true } x509-parser = "0.17.0" linkerd-error = { path = "../../error" } diff --git a/linkerd/metrics/Cargo.toml b/linkerd/metrics/Cargo.toml index 3b3a646ce..897684f7b 100644 --- a/linkerd/metrics/Cargo.toml +++ b/linkerd/metrics/Cargo.toml @@ -23,7 +23,7 @@ kubert-prometheus-process = { version = "0.2", optional = true } parking_lot = "0.12" prometheus-client = { workspace = true } tokio = { version = "1", features = ["time"] } -tracing = "0.1" +tracing = { workspace = true } linkerd-http-box = { path = "../http/box" } linkerd-stack = { path = "../stack", optional = true } diff --git a/linkerd/opencensus/Cargo.toml b/linkerd/opencensus/Cargo.toml index 5e388dd2b..feb89f707 100644 --- a/linkerd/opencensus/Cargo.toml +++ b/linkerd/opencensus/Cargo.toml @@ -19,4 +19,4 @@ tonic = { workspace = true, default-features = false, features = [ ] } tokio = { version = "1", features = ["macros", "sync", "time"] } tokio-stream = { version = "0.1", features = ["sync"] } -tracing = "0.1" +tracing = { workspace = true } diff --git a/linkerd/opentelemetry/Cargo.toml b/linkerd/opentelemetry/Cargo.toml index 790135fd3..86259a721 100644 --- a/linkerd/opentelemetry/Cargo.toml +++ b/linkerd/opentelemetry/Cargo.toml @@ -20,4 +20,4 @@ tonic = { workspace = true, default-features = false, features = [ "codegen", ] } tokio = { version = "1", features = ["macros", "sync", "time"] } -tracing = "0.1" +tracing = { workspace = true } diff --git a/linkerd/pool/mock/Cargo.toml b/linkerd/pool/mock/Cargo.toml index 5dcbdab36..a888f800d 100644 --- a/linkerd/pool/mock/Cargo.toml +++ b/linkerd/pool/mock/Cargo.toml @@ -11,7 +11,7 @@ parking_lot = "0.12" thiserror = "2" tokio = { version = "1", features = ["sync", "time"] } tower-test = { workspace = true } -tracing = "0.1" +tracing = { workspace = true } linkerd-error = { path = "../../error" } linkerd-pool = { path = ".." } diff --git a/linkerd/pool/p2c/Cargo.toml b/linkerd/pool/p2c/Cargo.toml index bf8afc1ea..3c6746ca7 100644 --- a/linkerd/pool/p2c/Cargo.toml +++ b/linkerd/pool/p2c/Cargo.toml @@ -13,7 +13,7 @@ indexmap = "2" prometheus-client = { workspace = true } rand = { version = "0.9", features = ["small_rng"] } tokio = { version = "1", features = ["rt", "sync", "time"] } -tracing = "0.1" +tracing = { workspace = true } linkerd-error = { path = "../../error" } linkerd-metrics = { path = "../../metrics" } diff --git a/linkerd/proxy/api-resolve/Cargo.toml b/linkerd/proxy/api-resolve/Cargo.toml index df860c91b..579d18d57 100644 --- a/linkerd/proxy/api-resolve/Cargo.toml +++ b/linkerd/proxy/api-resolve/Cargo.toml @@ -26,4 +26,4 @@ pin-project = "1" prost = { workspace = true } tonic = { workspace = true, default-features = false } tower = { workspace = true, default-features = false } -tracing = "0.1" +tracing = { workspace = true } diff --git a/linkerd/proxy/balance/Cargo.toml b/linkerd/proxy/balance/Cargo.toml index 1afdba688..707334953 100644 --- a/linkerd/proxy/balance/Cargo.toml +++ b/linkerd/proxy/balance/Cargo.toml @@ -10,7 +10,7 @@ publish = { workspace = true } futures = { version = "0.3", default-features = false } rand = "0.9" tokio = { version = "1", features = ["time"] } -tracing = "0.1" +tracing = { workspace = true } linkerd-error = { path = "../../error" } linkerd-metrics = { path = "../../metrics" } diff --git a/linkerd/proxy/balance/queue/Cargo.toml b/linkerd/proxy/balance/queue/Cargo.toml index 6ae63c728..09195832b 100644 --- a/linkerd/proxy/balance/queue/Cargo.toml +++ b/linkerd/proxy/balance/queue/Cargo.toml @@ -14,7 +14,7 @@ prometheus-client = { workspace = true } thiserror = "2" tokio = { version = "1", features = ["rt", "sync", "time"] } tokio-util = "0.7" -tracing = "0.1" +tracing = { workspace = true } linkerd-error = { path = "../../../error" } linkerd-metrics = { path = "../../../metrics" } diff --git a/linkerd/proxy/dns-resolve/Cargo.toml b/linkerd/proxy/dns-resolve/Cargo.toml index 89a674378..9c9087f40 100644 --- a/linkerd/proxy/dns-resolve/Cargo.toml +++ b/linkerd/proxy/dns-resolve/Cargo.toml @@ -19,4 +19,4 @@ linkerd-stack = { path = "../../stack" } tokio = { version = "1", features = ["sync"] } tokio-stream = { version = "0.1", features = ["sync"] } tower = { workspace = true } -tracing = "0.1" +tracing = { workspace = true } diff --git a/linkerd/proxy/http/Cargo.toml b/linkerd/proxy/http/Cargo.toml index cb04df260..d1d4f7bac 100644 --- a/linkerd/proxy/http/Cargo.toml +++ b/linkerd/proxy/http/Cargo.toml @@ -41,7 +41,7 @@ rand = "0.9" thiserror = "2" tokio = { version = "1", features = ["rt", "sync", "time"] } tower = { workspace = true, default-features = false } -tracing = "0.1" +tracing = { workspace = true } try-lock = "0.2" linkerd-duplex = { path = "../../duplex" } diff --git a/linkerd/proxy/identity-client/Cargo.toml b/linkerd/proxy/identity-client/Cargo.toml index e954bf164..51cdae9f1 100644 --- a/linkerd/proxy/identity-client/Cargo.toml +++ b/linkerd/proxy/identity-client/Cargo.toml @@ -19,5 +19,5 @@ pin-project = "1" thiserror = "2" tokio = { version = "1", features = ["time", "sync"] } tonic = { workspace = true, default-features = false } -tracing = "0.1" +tracing = { workspace = true } http-body = { workspace = true } diff --git a/linkerd/proxy/resolve/Cargo.toml b/linkerd/proxy/resolve/Cargo.toml index fe6f94f1e..b9e9cb737 100644 --- a/linkerd/proxy/resolve/Cargo.toml +++ b/linkerd/proxy/resolve/Cargo.toml @@ -15,5 +15,5 @@ linkerd-error = { path = "../../error" } linkerd-proxy-core = { path = "../core" } thiserror = "2" tower = { workspace = true } -tracing = "0.1" +tracing = { workspace = true } pin-project = "1" diff --git a/linkerd/proxy/spire-client/Cargo.toml b/linkerd/proxy/spire-client/Cargo.toml index 4e16d03ed..e2e4d886a 100644 --- a/linkerd/proxy/spire-client/Cargo.toml +++ b/linkerd/proxy/spire-client/Cargo.toml @@ -18,7 +18,7 @@ linkerd-stack = { path = "../../stack" } tokio = { version = "1", features = ["time", "sync"] } tonic = { workspace = true } tower = { workspace = true } -tracing = "0.1" +tracing = { workspace = true } x509-parser = "0.17.0" asn1 = { version = "0.6", package = "simple_asn1" } thiserror = "2" diff --git a/linkerd/proxy/tap/Cargo.toml b/linkerd/proxy/tap/Cargo.toml index 6c45368b8..265eca2d9 100644 --- a/linkerd/proxy/tap/Cargo.toml +++ b/linkerd/proxy/tap/Cargo.toml @@ -29,7 +29,7 @@ thiserror = "2" tokio = { version = "1", features = ["time"] } tower = { workspace = true, default-features = false } tonic = { workspace = true, default-features = false } -tracing = "0.1" +tracing = { workspace = true } pin-project = "1" [dev-dependencies] diff --git a/linkerd/proxy/transport/Cargo.toml b/linkerd/proxy/transport/Cargo.toml index 4baf0caa1..d6f6b004e 100644 --- a/linkerd/proxy/transport/Cargo.toml +++ b/linkerd/proxy/transport/Cargo.toml @@ -18,7 +18,7 @@ socket2 = "0.5" thiserror = "2" tokio = { version = "1", features = ["macros", "net"] } tokio-stream = { version = "0.1", features = ["net"] } -tracing = "0.1" +tracing = { workspace = true } [target.'cfg(target_os = "linux")'.dependencies] libc = "0.2" diff --git a/linkerd/reconnect/Cargo.toml b/linkerd/reconnect/Cargo.toml index 9f75484d9..690975081 100644 --- a/linkerd/reconnect/Cargo.toml +++ b/linkerd/reconnect/Cargo.toml @@ -11,7 +11,7 @@ linkerd-error = { path = "../error" } linkerd-stack = { path = "../stack" } futures = { version = "0.3", default-features = false } tower = { workspace = true, default-features = false } -tracing = "0.1" +tracing = { workspace = true } pin-project = "1" [dev-dependencies] diff --git a/linkerd/retry/Cargo.toml b/linkerd/retry/Cargo.toml index abd52c592..db01c1c05 100644 --- a/linkerd/retry/Cargo.toml +++ b/linkerd/retry/Cargo.toml @@ -11,4 +11,4 @@ futures = { version = "0.3", default-features = false } linkerd-error = { path = "../error" } linkerd-stack = { path = "../stack" } tower = { workspace = true, default-features = false, features = ["retry"] } -tracing = "0.1" +tracing = { workspace = true } diff --git a/linkerd/router/Cargo.toml b/linkerd/router/Cargo.toml index b797c93c2..b172d09ac 100644 --- a/linkerd/router/Cargo.toml +++ b/linkerd/router/Cargo.toml @@ -11,6 +11,6 @@ ahash = "0.8" futures = { version = "0.3", default-features = false } parking_lot = "0.12" thiserror = "2" -tracing = "0.1" +tracing = { workspace = true } linkerd-error = { path = "../error" } linkerd-stack = { path = "../stack" } diff --git a/linkerd/service-profiles/Cargo.toml b/linkerd/service-profiles/Cargo.toml index 33c02a960..f2fd526e0 100644 --- a/linkerd/service-profiles/Cargo.toml +++ b/linkerd/service-profiles/Cargo.toml @@ -23,7 +23,7 @@ tokio-stream = { version = "0.1", features = ["sync"] } tonic = { workspace = true, default-features = false } tower = { workspace = true, features = ["retry", "util"] } thiserror = "2" -tracing = "0.1" +tracing = { workspace = true } linkerd-addr = { path = "../addr" } linkerd-dns-name = { path = "../dns/name" } diff --git a/linkerd/signal/Cargo.toml b/linkerd/signal/Cargo.toml index 04ca9ebf0..ee4789dfe 100644 --- a/linkerd/signal/Cargo.toml +++ b/linkerd/signal/Cargo.toml @@ -8,4 +8,4 @@ publish = { workspace = true } [dependencies] tokio = { version = "1", features = ["macros", "signal"] } -tracing = "0.1" +tracing = { workspace = true } diff --git a/linkerd/stack/Cargo.toml b/linkerd/stack/Cargo.toml index 581c08d9e..d87d70a24 100644 --- a/linkerd/stack/Cargo.toml +++ b/linkerd/stack/Cargo.toml @@ -21,7 +21,7 @@ thiserror = "2" tokio = { version = "1", features = ["macros", "rt", "sync", "time"] } tokio-util = { version = "0.7" } tower = { workspace = true, features = ["buffer", "filter", "spawn-ready", "util"] } -tracing = "0.1" +tracing = { workspace = true } [dev-dependencies] linkerd-tracing = { path = "../tracing", features = ["ansi"] } diff --git a/linkerd/stack/tracing/Cargo.toml b/linkerd/stack/tracing/Cargo.toml index 3a20c0c75..5319f570f 100644 --- a/linkerd/stack/tracing/Cargo.toml +++ b/linkerd/stack/tracing/Cargo.toml @@ -11,4 +11,4 @@ futures = { version = "0.3", default-features = false } linkerd-error = { path = "../../error" } linkerd-stack = { path = ".." } tower = { workspace = true } -tracing = "0.1" +tracing = { workspace = true } diff --git a/linkerd/tls/Cargo.toml b/linkerd/tls/Cargo.toml index ad59fb9b8..caa2bc469 100644 --- a/linkerd/tls/Cargo.toml +++ b/linkerd/tls/Cargo.toml @@ -20,7 +20,7 @@ pin-project = "1" thiserror = "2" tokio = { version = "1", features = ["macros", "time"] } tower = { workspace = true } -tracing = "0.1" +tracing = { workspace = true } untrusted = "0.9" [dev-dependencies] diff --git a/linkerd/tls/route/Cargo.toml b/linkerd/tls/route/Cargo.toml index 143ae5f95..290b5b99c 100644 --- a/linkerd/tls/route/Cargo.toml +++ b/linkerd/tls/route/Cargo.toml @@ -13,7 +13,7 @@ proto = ["linkerd2-proxy-api"] regex = "1" rand = "0.9" thiserror = "2" -tracing = "0.1" +tracing = { workspace = true } linkerd-tls = { path = "../" } linkerd-dns = { path = "../../dns" } diff --git a/linkerd/tonic-stream/Cargo.toml b/linkerd/tonic-stream/Cargo.toml index 2eaccc26c..5856751b7 100644 --- a/linkerd/tonic-stream/Cargo.toml +++ b/linkerd/tonic-stream/Cargo.toml @@ -12,7 +12,7 @@ linkerd-stack = { path = "../stack" } pin-project = "1" tonic = { workspace = true, default-features = false } tokio = { version = "1", features = ["time"] } -tracing = "0.1" +tracing = { workspace = true } [dev-dependencies] tokio = { version = "1", features = ["macros"] } diff --git a/linkerd/tonic-watch/Cargo.toml b/linkerd/tonic-watch/Cargo.toml index 9b3610797..9ec1f4ec8 100644 --- a/linkerd/tonic-watch/Cargo.toml +++ b/linkerd/tonic-watch/Cargo.toml @@ -15,7 +15,7 @@ linkerd-error = { path = "../error" } linkerd-stack = { path = "../stack" } tonic = { workspace = true, default-features = false } tokio = { version = "1", features = ["macros", "rt", "sync", "time"] } -tracing = "0.1" +tracing = { workspace = true } [dev-dependencies] linkerd-tracing = { path = "../tracing" } diff --git a/linkerd/trace-context/Cargo.toml b/linkerd/trace-context/Cargo.toml index f4dbce5ca..3fb5f9168 100644 --- a/linkerd/trace-context/Cargo.toml +++ b/linkerd/trace-context/Cargo.toml @@ -17,4 +17,4 @@ linkerd-stack = { path = "../stack" } rand = "0.8" thiserror = "1" tower = { workspace = true, default-features = false, features = ["util"] } -tracing = "0.1" +tracing = { workspace = true } diff --git a/linkerd/tracing/Cargo.toml b/linkerd/tracing/Cargo.toml index af6acff0d..c495a48dd 100644 --- a/linkerd/tracing/Cargo.toml +++ b/linkerd/tracing/Cargo.toml @@ -16,7 +16,7 @@ linkerd-error = { path = "../error" } slab = { version = "0.4", optional = true } thingbuf = { version = "0.1.6", features = ["std"], optional = true } tokio = { version = "1", features = ["time"] } -tracing = "0.1" +tracing = { workspace = true } tracing-log = "0.2" [dependencies.tracing-subscriber] diff --git a/linkerd/transport-header/Cargo.toml b/linkerd/transport-header/Cargo.toml index ead088abd..6aa7137ad 100644 --- a/linkerd/transport-header/Cargo.toml +++ b/linkerd/transport-header/Cargo.toml @@ -16,7 +16,7 @@ linkerd-io = { path = "../io" } linkerd-stack = { path = "../stack" } prost = { workspace = true } tokio = { version = "1", features = ["time"] } -tracing = "0.1" +tracing = { workspace = true } [target.'cfg(fuzzing)'.dependencies] arbitrary = { version = "1", features = ["derive"] } diff --git a/linkerd/transport-header/fuzz/Cargo.toml b/linkerd/transport-header/fuzz/Cargo.toml index d2b3e81d2..5a31af13b 100644 --- a/linkerd/transport-header/fuzz/Cargo.toml +++ b/linkerd/transport-header/fuzz/Cargo.toml @@ -14,7 +14,7 @@ arbitrary = { version = "1", features = ["derive"] } libfuzzer-sys = { version = "0.4", features = ["arbitrary-derive"] } linkerd-transport-header = { path = ".." } tokio = { version = "1", features = ["full"] } -tracing = "0.1" +tracing = { workspace = true } linkerd-tracing = { path = "../../tracing", features = ["ansi"] } # Prevent this from interfering with workspaces diff --git a/linkerd/transport-metrics/Cargo.toml b/linkerd/transport-metrics/Cargo.toml index eb020bb29..bf92ec444 100644 --- a/linkerd/transport-metrics/Cargo.toml +++ b/linkerd/transport-metrics/Cargo.toml @@ -16,4 +16,4 @@ linkerd-stack = { path = "../stack" } parking_lot = "0.12" pin-project = "1" tokio = { version = "1", features = ["time"] } -tracing = "0.1" +tracing = { workspace = true } diff --git a/linkerd2-proxy/Cargo.toml b/linkerd2-proxy/Cargo.toml index d5a2960b8..8932e1ab8 100644 --- a/linkerd2-proxy/Cargo.toml +++ b/linkerd2-proxy/Cargo.toml @@ -28,7 +28,7 @@ linkerd-meshtls = { path = "../linkerd/meshtls" } linkerd-signal = { path = "../linkerd/signal" } num_cpus = "1" tokio = { version = "1", features = ["rt", "rt-multi-thread", "time", "net"] } -tracing = "0.1" +tracing = { workspace = true } [target.x86_64-unknown-linux-gnu.dependencies] jemallocator = { version = "0.5" }