Skip to content

Commit

Permalink
build: Propagate tracing feature from all crates
Browse files Browse the repository at this point in the history
When running `cargo build --features tracing` with `src/utils`
instrumented errors are produced due to the `log-instrument` optional
dependency not being enabled by the `utils/tracing` feature. This occurs
due to crate build order due to not all dependent crates back
propagating the `tracing` feature to `src/utils`. This commit fixes this
by updating all dependent crates to back propagate the `tracing`
feature.

Signed-off-by: Jonathan Woollett-Light <jcawl@amazon.co.uk>
  • Loading branch information
Jonathan Woollett-Light authored and pb8o committed Dec 4, 2023
1 parent 77aa06d commit a8c7caa
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/api_server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ vmm = { path = "../vmm" }
libc = "0.2.117"

[features]
tracing = ["log-instrument"]
tracing = ["log-instrument", "utils/tracing", "vmm/tracing"]
2 changes: 1 addition & 1 deletion src/cpu-template-helper/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ vmm = { path = "../vmm" }
utils = { path = "../utils" }

[features]
tracing = ["log-instrument"]
tracing = ["log-instrument", "vmm/tracing"]
2 changes: 1 addition & 1 deletion src/jailer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ thiserror = "1.0.50"
utils = { path = "../utils" }

[features]
tracing = ["log-instrument"]
tracing = ["log-instrument", "utils/tracing"]
2 changes: 1 addition & 1 deletion src/rebase-snap/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ thiserror = "1.0.50"
utils = { path = "../utils" }

[features]
tracing = ["log-instrument"]
tracing = ["log-instrument", "utils/tracing"]
2 changes: 1 addition & 1 deletion src/seccompiler/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ thiserror = "1.0.50"
utils = { path = "../utils" }

[features]
tracing = ["log-instrument"]
tracing = ["log-instrument", "utils/tracing"]
2 changes: 1 addition & 1 deletion src/snapshot-editor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ fc_utils = { package = "utils", path = "../utils" }
clap-num = "1.0.2"

[features]
tracing = ["log-instrument"]
tracing = ["log-instrument", "fc_utils/tracing", "vmm/tracing"]

0 comments on commit a8c7caa

Please sign in to comment.