linkerd
/
linkerd2-proxy
mirror of https://github.com/linkerd/linkerd2-proxy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore(deps): define `tracing` workspace dependency (#3834) 

this commit hoists `tracing`, used liberally throughout our project,
such that it is managed as a single workspace dependency.

this will be helpful someday when a 0.2 release happens.

Signed-off-by: katelyn martin <kate@buoyant.io>
This commit is contained in:
katelyn martin 2025-05-12 16:00:34 -04:00 committed by GitHub
parent 00b5de1936
commit 7b7ffbc69d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
62 changed files with 62 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.toml
View File

@ -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"

2
linkerd/addr/fuzz/Cargo.toml
View File

@ -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]

2
linkerd/app/Cargo.toml
View File

@ -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 }

2
linkerd/app/admin/Cargo.toml
View File

@ -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" }

2
linkerd/app/core/Cargo.toml
View File

@ -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"

2
linkerd/app/gateway/Cargo.toml
View File

@ -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"] }

2
linkerd/app/inbound/Cargo.toml
View File

@ -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"

2
linkerd/app/inbound/fuzz/Cargo.toml
View File

@ -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]

2
linkerd/app/integration/Cargo.toml
View File

@ -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

2
linkerd/app/outbound/Cargo.toml
View File

@ -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 }

2
linkerd/app/test/Cargo.toml
View File

@ -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]

2
linkerd/distribute/Cargo.toml
View File

@ -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"

2
linkerd/dns/Cargo.toml
View File

@ -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)'] }

2
linkerd/dns/fuzz/Cargo.toml
View File

@ -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

2
linkerd/duplex/Cargo.toml
View File

@ -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" }

2
linkerd/http/access-log/Cargo.toml
View File

@ -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" }

2
linkerd/http/classify/Cargo.toml
View File

@ -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" }

2
linkerd/http/detect/Cargo.toml
View File

@ -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" }

2
linkerd/http/metrics/Cargo.toml
View File

@ -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" }

2
linkerd/http/override-authority/Cargo.toml
View File

@ -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" }

2
linkerd/http/retry/Cargo.toml
View File

@ -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" }

2
linkerd/http/route/Cargo.toml
View File

@ -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]

2
linkerd/http/stream-timeouts/Cargo.toml
View File

@ -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" }

2
linkerd/http/upgrade/Cargo.toml
View File

@ -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" }

2
linkerd/identity/Cargo.toml
View File

@ -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" }

2
linkerd/idle-cache/Cargo.toml
View File

@ -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 = [

2
linkerd/meshtls/Cargo.toml
View File

@ -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" }

2
linkerd/meshtls/boring/Cargo.toml
View File

@ -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"]

2
linkerd/meshtls/rustls/Cargo.toml
View File

@ -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" }

2
linkerd/meshtls/verifier/Cargo.toml
View File

@ -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" }

2
linkerd/metrics/Cargo.toml
View File

@ -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 }

2
linkerd/opencensus/Cargo.toml
View File

@ -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 }

2
linkerd/opentelemetry/Cargo.toml
View File

@ -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 }

2
linkerd/pool/mock/Cargo.toml
View File

@ -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 = ".." }

2
linkerd/pool/p2c/Cargo.toml
View File

@ -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" }

2
linkerd/proxy/api-resolve/Cargo.toml
View File

@ -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 }

2
linkerd/proxy/balance/Cargo.toml
View File

@ -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" }

2
linkerd/proxy/balance/queue/Cargo.toml
View File

@ -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" }

2
linkerd/proxy/dns-resolve/Cargo.toml
View File

@ -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 }

2
linkerd/proxy/http/Cargo.toml
View File

@ -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" }

2
linkerd/proxy/identity-client/Cargo.toml
View File

@ -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 }

2
linkerd/proxy/resolve/Cargo.toml
View File

@ -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"

2
linkerd/proxy/spire-client/Cargo.toml
View File

@ -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"

2
linkerd/proxy/tap/Cargo.toml
View File

@ -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]

2
linkerd/proxy/transport/Cargo.toml
View File

@ -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"

2
linkerd/reconnect/Cargo.toml
View File

@ -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]

2
linkerd/retry/Cargo.toml
View File

@ -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 }

2
linkerd/router/Cargo.toml
View File

@ -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" }

2
linkerd/service-profiles/Cargo.toml
View File

@ -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" }

2
linkerd/signal/Cargo.toml
View File

@ -8,4 +8,4 @@ publish = { workspace = true }
[dependencies]
tokio = { version = "1", features = ["macros", "signal"] }
tracing = "0.1"
tracing = { workspace = true }

2
linkerd/stack/Cargo.toml
View File

@ -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"] }

2
linkerd/stack/tracing/Cargo.toml
View File

@ -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 }

2
linkerd/tls/Cargo.toml
View File

@ -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]

2
linkerd/tls/route/Cargo.toml
View File

@ -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" }

2
linkerd/tonic-stream/Cargo.toml
View File

@ -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"] }

2
linkerd/tonic-watch/Cargo.toml
View File

@ -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" }

2
linkerd/trace-context/Cargo.toml
View File

@ -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 }

2
linkerd/tracing/Cargo.toml
View File

@ -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]

2
linkerd/transport-header/Cargo.toml
View File

@ -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"] }

2
linkerd/transport-header/fuzz/Cargo.toml
View File

@ -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

2
linkerd/transport-metrics/Cargo.toml
View File

@ -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 }

2
linkerd2-proxy/Cargo.toml
View File

@ -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" }