Skip to content

Commit

Permalink
deps: Promote tracing to workspace dependency
Browse files Browse the repository at this point in the history
Promote tracing to workspace dependency to make mananging depencencies easier.

Pull-Request: #5231.
  • Loading branch information
drHuangMHT authored Apr 6, 2024
1 parent 47e19f7 commit c92966d
Show file tree
Hide file tree
Showing 54 changed files with 55 additions and 54 deletions.
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ quick-protobuf-codec = { version = "0.3.1", path = "misc/quick-protobuf-codec" }
quickcheck = { package = "quickcheck-ext", path = "misc/quickcheck-ext" }
rw-stream-sink = { version = "0.4.0", path = "misc/rw-stream-sink" }
unsigned-varint = { version = "0.8.0" }
tracing = "0.1.37"

[patch.crates-io]

Expand Down
2 changes: 1 addition & 1 deletion core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ rw-stream-sink = { workspace = true }
serde = { version = "1", optional = true, features = ["derive"] }
smallvec = "1.13.2"
thiserror = "1.0"
tracing = "0.1.37"
tracing = { workspace = true }
unsigned-varint = { workspace = true }
void = "1"

Expand Down
2 changes: 1 addition & 1 deletion examples/autonat/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ tokio = { version = "1.37", features = ["full"] }
clap = { version = "4.5.4", features = ["derive"] }
futures = "0.3.30"
libp2p = { path = "../../libp2p", features = ["tokio", "tcp", "noise", "yamux", "autonat", "identify", "macros"] }
tracing = "0.1.37"
tracing = { workspace = true }
tracing-subscriber = { version = "0.3", features = ["env-filter"] }

[lints]
Expand Down
2 changes: 1 addition & 1 deletion examples/browser-webrtc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ crate-type = ["cdylib"]
anyhow = "1.0.81"
futures = "0.3.30"
rand = "0.8"
tracing = "0.1.37"
tracing = { workspace = true }
tracing-subscriber = { version = "0.3", features = ["env-filter"] }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
Expand Down
2 changes: 1 addition & 1 deletion examples/chat/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ tokio = { version = "1.37", features = ["full"] }
async-trait = "0.1"
futures = "0.3.30"
libp2p = { path = "../../libp2p", features = [ "tokio", "gossipsub", "mdns", "noise", "macros", "tcp", "yamux", "quic"] }
tracing = "0.1.37"
tracing = { workspace = true }
tracing-subscriber = { version = "0.3", features = ["env-filter"] }

[lints]
Expand Down
2 changes: 1 addition & 1 deletion examples/dcutr/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ futures-timer = "3.0"
libp2p = { path = "../../libp2p", features = [ "dns", "dcutr", "identify", "macros", "noise", "ping", "quic", "relay", "rendezvous", "tcp", "tokio", "yamux"] }
log = "0.4"
tokio = { version = "1.37", features = ["macros", "net", "rt", "signal"] }
tracing = "0.1.37"
tracing = { workspace = true }
tracing-subscriber = { version = "0.3", features = ["env-filter"] }

[lints]
Expand Down
2 changes: 1 addition & 1 deletion examples/distributed-key-value-store/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ async-std = { version = "1.12", features = ["attributes"] }
async-trait = "0.1"
futures = "0.3.30"
libp2p = { path = "../../libp2p", features = [ "async-std", "dns", "kad", "mdns", "noise", "macros", "tcp", "yamux"] }
tracing = "0.1.37"
tracing = { workspace = true }
tracing-subscriber = { version = "0.3", features = ["env-filter"] }

[lints]
Expand Down
2 changes: 1 addition & 1 deletion examples/file-sharing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ tokio = { version = "1.37.0", features = ["full"] }
clap = { version = "4.5.4", features = ["derive"] }
futures = "0.3.30"
libp2p = { path = "../../libp2p", features = [ "tokio", "cbor", "dns", "kad", "noise", "macros", "request-response", "tcp", "websocket", "yamux"] }
tracing = "0.1.37"
tracing = { workspace = true }
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
void = "1.0.2"

Expand Down
2 changes: 1 addition & 1 deletion examples/identify/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ async-std = { version = "1.12", features = ["attributes"] }
async-trait = "0.1"
futures = "0.3.30"
libp2p = { path = "../../libp2p", features = ["async-std", "dns", "dcutr", "identify", "macros", "noise", "ping", "relay", "rendezvous", "tcp", "tokio","yamux"] }
tracing = "0.1.37"
tracing = { workspace = true }
tracing-subscriber = { version = "0.3", features = ["env-filter"] }

[lints]
Expand Down
2 changes: 1 addition & 1 deletion examples/ipfs-kad/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env_logger = "0.10"
futures = "0.3.30"
anyhow = "1.0.81"
libp2p = { path = "../../libp2p", features = [ "tokio", "dns", "kad", "noise", "tcp", "yamux", "rsa"] }
tracing = "0.1.37"
tracing = { workspace = true }
tracing-subscriber = { version = "0.3", features = ["env-filter"] }

[lints]
Expand Down
2 changes: 1 addition & 1 deletion examples/ipfs-private/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ async-trait = "0.1"
either = "1.9"
futures = "0.3.30"
libp2p = { path = "../../libp2p", features = [ "tokio", "gossipsub", "dns", "identify", "kad", "macros", "noise", "ping", "pnet", "tcp", "websocket", "yamux"] }
tracing = "0.1.37"
tracing = { workspace = true }
tracing-subscriber = { version = "0.3", features = ["env-filter"] }

[lints]
Expand Down
2 changes: 1 addition & 1 deletion examples/metrics/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ opentelemetry-otlp = { version = "0.15.0", features = ["metrics"] }
opentelemetry_sdk = { version = "0.22.1", features = ["rt-tokio", "metrics"] }
prometheus-client = { workspace = true }
tokio = { version = "1", features = ["full"] }
tracing = "0.1.37"
tracing = { workspace = true }
tracing-opentelemetry = "0.23.0"
tracing-subscriber = { version = "0.3", features = ["env-filter"] }

Expand Down
2 changes: 1 addition & 1 deletion examples/ping/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ release = false
futures = "0.3.30"
libp2p = { path = "../../libp2p", features = ["noise", "ping", "tcp", "tokio", "yamux"] }
tokio = { version = "1.37.0", features = ["full"] }
tracing = "0.1.37"
tracing = { workspace = true }
tracing-subscriber = { version = "0.3", features = ["env-filter"] }

[lints]
Expand Down
2 changes: 1 addition & 1 deletion examples/relay-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ async-std = { version = "1.12", features = ["attributes"] }
async-trait = "0.1"
futures = "0.3.30"
libp2p = { path = "../../libp2p", features = [ "async-std", "noise", "macros", "ping", "tcp", "identify", "yamux", "relay", "quic"] }
tracing = "0.1.37"
tracing = { workspace = true }
tracing-subscriber = { version = "0.3", features = ["env-filter"] }

[lints]
Expand Down
2 changes: 1 addition & 1 deletion examples/rendezvous/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ async-trait = "0.1"
futures = "0.3.30"
libp2p = { path = "../../libp2p", features = [ "async-std", "identify", "macros", "noise", "ping", "rendezvous", "tcp", "tokio", "yamux"] }
tokio = { version = "1.37", features = ["rt-multi-thread", "macros", "time"] }
tracing = "0.1.37"
tracing = { workspace = true }
tracing-subscriber = { version = "0.3", features = ["env-filter"] }

[lints]
Expand Down
2 changes: 1 addition & 1 deletion examples/stream/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ libp2p = { path = "../../libp2p", features = [ "tokio", "quic"] }
libp2p-stream = { path = "../../protocols/stream", version = "0.1.0-alpha" }
rand = "0.8"
tokio = { version = "1.37", features = ["full"] }
tracing = "0.1.37"
tracing = { workspace = true }
tracing-subscriber = { version = "0.3", features = ["env-filter"] }

[lints]
Expand Down
2 changes: 1 addition & 1 deletion hole-punching-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ anyhow = "1"
env_logger = "0.10.2"
futures = "0.3.30"
libp2p = { path = "../libp2p", features = ["tokio", "dcutr", "identify", "macros", "noise", "ping", "relay", "tcp", "yamux", "quic"] }
tracing = "0.1.37"
tracing = { workspace = true }
redis = { version = "0.23.0", default-features = false, features = ["tokio-comp"] }
tokio = { version = "1.37.0", features = ["full"] }
serde = { version = "1.0.197", features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion identity/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ bs58 = { version = "0.5.1", optional = true }
ed25519-dalek = { version = "2.1", optional = true }
hkdf = { version = "0.12.4", optional = true }
libsecp256k1 = { version = "0.7.0", optional = true }
tracing = "0.1.37"
tracing = { workspace = true }
multihash = { version = "0.19.1", optional = true }
p256 = { version = "0.13", default-features = false, features = [ "ecdsa", "std", "pem"], optional = true }
quick-protobuf = "0.8.1"
Expand Down
4 changes: 2 additions & 2 deletions interop-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ either = "1.9.0"
futures = "0.3.30"
rand = "0.8.5"
serde = { version = "1", features = ["derive"] }
tracing = "0.1.37"
tracing = { workspace = true }
tracing-subscriber = { version = "0.3", features = ["env-filter"] }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
Expand All @@ -36,7 +36,7 @@ serde_json = "1"
thirtyfour = "=0.32.0-rc.10" # https://github.com/stevepryde/thirtyfour/issues/169
tokio = { version = "1.37.0", features = ["full"] }
tower-http = { version = "0.5", features = ["cors", "fs", "trace"] }
tracing = "0.1.37"
tracing = { workspace = true }
tracing-subscriber = { version = "0.3", features = ["env-filter"] }

[target.'cfg(target_arch = "wasm32")'.dependencies]
Expand Down
2 changes: 1 addition & 1 deletion misc/memory-connection-limits/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ libp2p-core = { workspace = true }
libp2p-swarm = { workspace = true }
libp2p-identity = { workspace = true, features = ["peerid"] }
sysinfo = "0.29"
tracing = "0.1.37"
tracing = { workspace = true }
void = "1"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion misc/multistream-select/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
[dependencies]
bytes = "1"
futures = "0.3"
tracing = "0.1.37"
tracing = { workspace = true }
pin-project = "1.1.5"
smallvec = "1.13.2"
unsigned-varint = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion misc/server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ serde = "1.0.197"
serde_derive = "1.0.125"
serde_json = "1.0"
tokio = { version = "1", features = ["rt-multi-thread", "macros"] }
tracing = "0.1.37"
tracing = { workspace = true }
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
zeroize = "1"

Expand Down
2 changes: 1 addition & 1 deletion misc/webrtc-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ serde = { version = "1.0", features = ["derive"] }
sha2 = "0.10.8"
thiserror = "1"
tinytemplate = "1.2"
tracing = "0.1.37"
tracing = { workspace = true }

[dev-dependencies]
hex-literal = "0.4"
Expand Down
2 changes: 1 addition & 1 deletion muxers/mplex/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ nohash-hasher = "0.2"
parking_lot = "0.12"
rand = "0.8"
smallvec = "1.13.2"
tracing = "0.1.37"
tracing = { workspace = true }
unsigned-varint = { workspace = true, features = ["asynchronous_codec"] }

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion muxers/test-harness/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ libp2p-core = { workspace = true }
futures = "0.3.30"
futures-timer = "3.0.3"
futures_ringbuf = "0.4.0"
tracing = "0.1.37"
tracing = { workspace = true }

[lints]
workspace = true
2 changes: 1 addition & 1 deletion muxers/yamux/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ libp2p-core = { workspace = true }
thiserror = "1.0"
yamux012 = { version = "0.12.1", package = "yamux" }
yamux013 = { version = "0.13.1", package = "yamux" }
tracing = "0.1.37"
tracing = { workspace = true }

[dev-dependencies]
async-std = { version = "1.7.0", features = ["attributes"] }
Expand Down
2 changes: 1 addition & 1 deletion protocols/autonat/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ libp2p-request-response = { workspace = true }
libp2p-identity = { workspace = true }
quick-protobuf = "0.8"
rand = "0.8"
tracing = "0.1.37"
tracing = { workspace = true }
quick-protobuf-codec = { workspace = true }
asynchronous-codec = { workspace = true }

Expand Down
2 changes: 1 addition & 1 deletion protocols/dcutr/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ libp2p-identity = { workspace = true }
quick-protobuf = "0.8"
quick-protobuf-codec = { workspace = true }
thiserror = "1.0"
tracing = "0.1.37"
tracing = { workspace = true }
void = "1"
lru = "0.12.3"
futures-bounded = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion protocols/floodsub/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ quick-protobuf-codec = { workspace = true }
rand = "0.8"
smallvec = "1.13.2"
thiserror = "1.0.58"
tracing = "0.1.37"
tracing = { workspace = true }

# Passing arguments to the docsrs builder in order to properly document cfg's.
# More information: https://docs.rs/about/builds#cross-compiling
Expand Down
2 changes: 1 addition & 1 deletion protocols/gossipsub/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ regex = "1.10.4"
serde = { version = "1", optional = true, features = ["derive"] }
sha2 = "0.10.8"
smallvec = "1.13.2"
tracing = "0.1.37"
tracing = { workspace = true }
void = "1.0.2"

# Metrics dependencies
Expand Down
2 changes: 1 addition & 1 deletion protocols/identify/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ quick-protobuf-codec = { workspace = true }
quick-protobuf = "0.8"
smallvec = "1.13.2"
thiserror = "1.0"
tracing = "0.1.37"
tracing = { workspace = true }
void = "1.0"
either = "1.9.0"

Expand Down
2 changes: 1 addition & 1 deletion protocols/kad/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ futures-timer = "3.0.3"
instant = "0.1.12"
serde = { version = "1.0", optional = true, features = ["derive"] }
thiserror = "1"
tracing = "0.1.37"
tracing = { workspace = true }

[dev-dependencies]
async-std = { version = "1.12.0", features = ["attributes"] }
Expand Down
2 changes: 1 addition & 1 deletion protocols/mdns/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ rand = "0.8.3"
smallvec = "1.13.2"
socket2 = { version = "0.5.6", features = ["all"] }
tokio = { version = "1.37", default-features = false, features = ["net", "time"], optional = true}
tracing = "0.1.37"
tracing = { workspace = true }
hickory-proto = { version = "0.24.0", default-features = false, features = ["mdns"] }
void = "1.0.2"

Expand Down
2 changes: 1 addition & 1 deletion protocols/perf/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ libp2p-yamux = { workspace = true }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
thiserror = "1.0"
tracing = "0.1.37"
tracing = { workspace = true }
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
tokio = { version = "1.37", default-features = false, features = ["macros", "rt", "rt-multi-thread"] }
void = "1"
Expand Down
2 changes: 1 addition & 1 deletion protocols/ping/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ libp2p-core = { workspace = true }
libp2p-swarm = { workspace = true }
libp2p-identity = { workspace = true }
rand = "0.8"
tracing = "0.1.37"
tracing = { workspace = true }
void = "1.0"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion protocols/relay/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ quick-protobuf-codec = { workspace = true }
rand = "0.8.4"
static_assertions = "1"
thiserror = "1.0"
tracing = "0.1.37"
tracing = { workspace = true }
void = "1"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion protocols/rendezvous/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ quick-protobuf = "0.8"
quick-protobuf-codec = { workspace = true }
rand = "0.8"
thiserror = "1"
tracing = "0.1.37"
tracing = { workspace = true }
void = "1"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion protocols/request-response/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ rand = "0.8"
serde = { version = "1.0", optional = true}
serde_json = { version = "1.0.115", optional = true }
smallvec = "1.13.2"
tracing = "0.1.37"
tracing = { workspace = true }
void = "1.0.2"
futures-timer = "3.0.3"
futures-bounded = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion protocols/stream/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ futures = "0.3.29"
libp2p-core = { workspace = true }
libp2p-identity = { workspace = true, features = ["peerid"] }
libp2p-swarm = { workspace = true }
tracing = "0.1.37"
tracing = { workspace = true }
void = "1"
rand = "0.8"

Expand Down
2 changes: 1 addition & 1 deletion protocols/upnp/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ igd-next = "0.14.3"
libp2p-core = { workspace = true }
libp2p-swarm = { workspace = true }
tokio = { version = "1.37", default-features = false, features = ["rt"], optional = true }
tracing = "0.1.37"
tracing = { workspace = true }
void = "1.0.2"

[features]
Expand Down
2 changes: 1 addition & 1 deletion swarm-test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ libp2p-tcp = { workspace = true, features = ["async-io"] }
libp2p-yamux = { workspace = true }
futures = "0.3.30"
rand = "0.8.5"
tracing = "0.1.37"
tracing = { workspace = true }
futures-timer = "3.0.3"

[lints]
Expand Down
2 changes: 1 addition & 1 deletion swarm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ multistream-select = { workspace = true }
once_cell = "1.19.0"
rand = "0.8"
smallvec = "1.13.2"
tracing = "0.1.37"
tracing = { workspace = true }
void = "1"
wasm-bindgen-futures = { version = "0.4.42", optional = true }

Expand Down
2 changes: 1 addition & 1 deletion transports/dns/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ libp2p-identity = { workspace = true }
parking_lot = "0.12.0"
hickory-resolver = { version = "0.24.0", default-features = false, features = ["system-config"] }
smallvec = "1.13.2"
tracing = "0.1.37"
tracing = { workspace = true }

[dev-dependencies]
libp2p-identity = { workspace = true, features = ["rand"] }
Expand Down
Loading

0 comments on commit c92966d

Please sign in to comment.