Remove features with _ #31688

antiguru · 2025-02-27T15:24:13Z

We used feature names ending in _ to disambiguate them from dependencies.
This is not necessary anymore since cargo supports the dep: syntax to
distinguish dependencies from features.

Checklist

This PR has adequate test coverage / QA involvement has been duly considered. (trigger-ci for additional test/nightly runs)
This PR has an associated up-to-date design doc, is a design doc (template), or is sufficiently small to not require a design.
If this PR evolves an existing $T ⇔ Proto$T mapping (possibly in a backwards-incompatible way), then it is tagged with a T-proto label.
If this PR will require changes to cloud orchestration or tests, there is a companion cloud PR to account for those changes that is tagged with the release-blocker label (example).
If this PR includes major user-facing behavior changes, I have pinged the relevant PM to schedule a changelog post.

We used feature names ending in _ to disambiguate them from dependencies. This is not necessary anymore since cargo supports the `dep:` syntax to distinguish dependencies from features. Signed-off-by: Moritz Hoffmann <mh@materialize.com> # Conflicts: # src/compute/Cargo.toml # src/timely-util/Cargo.toml diff --git c/src/adapter/Cargo.toml i/src/adapter/Cargo.toml index 5f3b00ec0d..465a5c4806 100644 --- c/src/adapter/Cargo.toml +++ i/src/adapter/Cargo.toml @@ -48,7 +48,7 @@ mz-kafka-util = { path = "../kafka-util" } mz-metrics = { path = "../metrics" } mz-mysql-util = { path = "../mysql-util" } mz-orchestrator = { path = "../orchestrator" } -mz-ore = { path = "../ore", features = ["chrono", "async", "process", "tracing_"] } +mz-ore = { path = "../ore", features = ["chrono", "async", "process", "tracing"] } mz-persist-types = { path = "../persist-types" } mz-persist-client = { path = "../persist-client" } mz-pgcopy = { path = "../pgcopy" } @@ -56,7 +56,7 @@ mz-pgrepr = { path = "../pgrepr" } mz-pgwire-common = { path = "../pgwire-common" } mz-postgres-util = { path = "../postgres-util" } mz-proto = { path = "../proto" } -mz-repr = { path = "../repr", features = ["tracing_"] } +mz-repr = { path = "../repr", features = ["tracing"] } mz-rocksdb-types = { path = "../rocksdb-types" } mz-secrets = { path = "../secrets" } mz-segment = { path = "../segment" } diff --git c/src/catalog/Cargo.toml i/src/catalog/Cargo.toml index b6e9b9c456..455354a163 100644 --- c/src/catalog/Cargo.toml +++ i/src/catalog/Cargo.toml @@ -35,13 +35,13 @@ mz-durable-cache = { path = "../durable-cache" } mz-dyncfg = { path = "../dyncfg" } mz-expr = { path = "../expr" } mz-orchestrator = { path = "../orchestrator" } -mz-ore = { path = "../ore", features = ["chrono", "async", "tracing_"] } +mz-ore = { path = "../ore", features = ["chrono", "async", "tracing"] } mz-persist-client = { path = "../persist-client" } mz-persist-types = { path = "../persist-types" } mz-pgrepr = { path = "../pgrepr" } mz-pgtz = { path = "../pgtz" } mz-proto = { path = "../proto" } -mz-repr = { path = "../repr", features = ["tracing_"] } +mz-repr = { path = "../repr", features = ["tracing"] } mz-sql = { path = "../sql" } mz-sql-parser = { path = "../sql-parser" } mz-storage-client = { path = "../storage-client" } diff --git c/src/cluster-client/Cargo.toml i/src/cluster-client/Cargo.toml index 95caf44c46..7c231083d7 100644 --- c/src/cluster-client/Cargo.toml +++ i/src/cluster-client/Cargo.toml @@ -12,7 +12,7 @@ workspace = true [dependencies] anyhow = "1.0.95" http = "1.2.0" -mz-ore = { path = "../ore", features = ["tracing_"] } +mz-ore = { path = "../ore", features = ["tracing"] } mz-proto = { path = "../proto" } prometheus = { version = "0.13.3", default-features = false } proptest = { version = "1.6.0", default-features = false, features = ["std"] } diff --git c/src/cluster/Cargo.toml i/src/cluster/Cargo.toml index fcbbd94170..97062373e6 100644 --- c/src/cluster/Cargo.toml +++ i/src/cluster/Cargo.toml @@ -16,7 +16,7 @@ crossbeam-channel = "0.5.14" differential-dataflow = "0.13.6" futures = "0.3.25" mz-cluster-client = { path = "../cluster-client" } -mz-ore = { path = "../ore", features = ["async", "process", "tracing_"] } +mz-ore = { path = "../ore", features = ["async", "process", "tracing"] } mz-service = { path = "../service" } regex = "1.10.6" timely = "0.18.1" diff --git c/src/clusterd/Cargo.toml i/src/clusterd/Cargo.toml index d90566aa0e..709bf2db60 100644 --- c/src/clusterd/Cargo.toml +++ i/src/clusterd/Cargo.toml @@ -28,7 +28,7 @@ mz-dyncfgs = { path = "../dyncfgs" } mz-http-util = { path = "../http-util" } mz-metrics = { path = "../metrics" } mz-orchestrator-tracing = { path = "../orchestrator-tracing" } -mz-ore = { path = "../ore", features = ["async", "tracing_"] } +mz-ore = { path = "../ore", features = ["async", "tracing"] } mz-persist-client = { path = "../persist-client" } mz-prof-http = { path = "../prof-http" } mz-service = { path = "../service" } diff --git c/src/compute-client/Cargo.toml i/src/compute-client/Cargo.toml index ebe568942a..9f13137110 100644 --- c/src/compute-client/Cargo.toml +++ i/src/compute-client/Cargo.toml @@ -25,12 +25,12 @@ mz-controller-types = { path = "../controller-types" } mz-dyncfg = { path = "../dyncfg" } mz-dyncfgs = { path = "../dyncfgs" } mz-expr = { path = "../expr" } -mz-ore = { path = "../ore", features = ["tracing_", "chrono"] } +mz-ore = { path = "../ore", features = ["tracing", "chrono"] } mz-persist = { path = "../persist" } mz-persist-client = { path = "../persist-client" } mz-persist-types = { path = "../persist-types" } mz-proto = { path = "../proto" } -mz-repr = { path = "../repr", features = ["tracing_"] } +mz-repr = { path = "../repr", features = ["tracing"] } mz-service = { path = "../service" } mz-storage-client = { path = "../storage-client" } mz-storage-types = { path = "../storage-types" } diff --git c/src/compute-types/Cargo.toml i/src/compute-types/Cargo.toml index 106b8aa22f..da3ea9d6ef 100644 --- c/src/compute-types/Cargo.toml +++ i/src/compute-types/Cargo.toml @@ -16,9 +16,9 @@ differential-dataflow = "0.13.6" itertools = "0.12.1" mz-dyncfg = { path = "../dyncfg" } mz-expr = { path = "../expr" } -mz-ore = { path = "../ore", features = ["tracing_", "metrics"] } +mz-ore = { path = "../ore", features = ["tracing", "metrics"] } mz-proto = { path = "../proto" } -mz-repr = { path = "../repr", features = ["tracing_"] } +mz-repr = { path = "../repr", features = ["tracing"] } mz-storage-types = { path = "../storage-types" } proptest = { version = "1.6.0", default-features = false, features = ["std"] } proptest-derive = { version = "0.5.1", features = ["boxed_union"] } diff --git c/src/compute/Cargo.toml i/src/compute/Cargo.toml index 8d79884324..af3bd06e88 100644 --- c/src/compute/Cargo.toml +++ i/src/compute/Cargo.toml @@ -28,7 +28,7 @@ mz-dyncfg = { path = "../dyncfg" } mz-dyncfgs = { path = "../dyncfgs" } mz-expr = { path = "../expr" } mz-metrics = { path = "../metrics" } -mz-ore = { path = "../ore", features = ["async", "flatcontainer", "process", "tracing_"] } +mz-ore = { path = "../ore", features = ["async", "flatcontainer", "process", "tracing"] } mz-persist-client = { path = "../persist-client" } mz-persist-types = { path = "../persist-types" } mz-repr = { path = "../repr" } diff --git c/src/environmentd/Cargo.toml i/src/environmentd/Cargo.toml index 0d3e82cf88..d9f8bbd8bb 100644 --- c/src/environmentd/Cargo.toml +++ i/src/environmentd/Cargo.toml @@ -58,7 +58,7 @@ mz-orchestrator-kubernetes = { path = "../orchestrator-kubernetes" } mz-orchestrator-process = { path = "../orchestrator-process" } mz-orchestrator-tracing = { path = "../orchestrator-tracing" } mz-orchestratord = { path = "../orchestratord", default-features = false } -mz-ore = { path = "../ore", features = ["async", "process", "tracing_"] } +mz-ore = { path = "../ore", features = ["async", "process", "tracing"] } mz-persist-client = { path = "../persist-client" } mz-pgrepr = { path = "../pgrepr" } mz-pgwire = { path = "../pgwire" } diff --git c/src/http-util/Cargo.toml i/src/http-util/Cargo.toml index f3e3f54a21..b26e1ab2c7 100644 --- c/src/http-util/Cargo.toml +++ i/src/http-util/Cargo.toml @@ -18,7 +18,7 @@ headers = "0.4.0" http = "1.2.0" hyper = { version = "1.4.1", features = ["http1", "server"] } include_dir = "0.7.3" -mz-ore = { path = "../ore", default-features = false, features = ["metrics", "tracing_"] } +mz-ore = { path = "../ore", default-features = false, features = ["metrics", "tracing"] } prometheus = { version = "0.13.3", default-features = false } serde = "1.0.218" serde_json = { version = "1.0.125" } diff --git c/src/orchestrator-tracing/Cargo.toml i/src/orchestrator-tracing/Cargo.toml index 48cff7f8d9..89d007815a 100644 --- c/src/orchestrator-tracing/Cargo.toml +++ i/src/orchestrator-tracing/Cargo.toml @@ -19,7 +19,7 @@ http = "1.2.0" humantime = { version = "2.1.0" } mz-build-info = { path = "../build-info", default-features = false } mz-orchestrator = { path = "../orchestrator", default-features = false } -mz-ore = { path = "../ore", default-features = false, features = ["tracing_", "cli", "test"] } +mz-ore = { path = "../ore", default-features = false, features = ["tracing", "cli", "test"] } mz-repr = { path = "../repr", default-features = false, optional = true } mz-service = { path = "../service", default-features = false } mz-tracing = { path = "../tracing", default-features = false } diff --git c/src/ore/BUILD.bazel i/src/ore/BUILD.bazel index 3816635544..dc637499cc 100644 --- c/src/ore/BUILD.bazel +++ i/src/ore/BUILD.bazel @@ -30,7 +30,6 @@ rust_library( "async-trait", "bytemuck", "bytes", - "bytes_", "capture", "chrono", "clap", @@ -77,7 +76,6 @@ rust_library( "tracing-capture", "tracing-opentelemetry", "tracing-subscriber", - "tracing_", "uuid", "yansi", ], @@ -113,7 +111,6 @@ rust_test( "async-trait", "bytemuck", "bytes", - "bytes_", "capture", "chrono", "clap", @@ -160,7 +157,6 @@ rust_test( "tracing-capture", "tracing-opentelemetry", "tracing-subscriber", - "tracing_", "uuid", "yansi", ], diff --git c/src/ore/Cargo.toml i/src/ore/Cargo.toml index 0df5453f46..ca1ce05180 100644 --- c/src/ore/Cargo.toml +++ i/src/ore/Cargo.toml @@ -22,7 +22,7 @@ async-trait = { version = "0.1.83", optional = true } bytemuck = { version = "1.21.0", optional = true } bytes = { version = "1.3.0", optional = true } chrono = { version = "0.4.39", default-features = false, features = [ - "std", + "std", ], optional = true } clap = { version = "4.5.23", features = ["env", "string"], optional = true } compact_bytes = { version = "0.1.3", optional = true } @@ -44,7 +44,7 @@ paste = "1.0.11" pin-project = "1.0.12" prometheus = { version = "0.13.3", default-features = false, optional = true } proptest = { version = "1.6.0", default-features = false, features = [ - "std", + "std", ], optional = true } rand = { version = "0.8.5", optional = true } smallvec = { version = "1.10.0", optional = true } @@ -52,11 +52,11 @@ stacker = { version = "0.1.17", optional = true } sentry = { version = "0.29.1", optional = true, features = ["debug-images"] } serde = { version = "1.0.218", features = ["derive"] } tokio = { version = "1.38.0", features = [ - "io-util", - "net", - "rt-multi-thread", - "sync", - "time", + "io-util", + "net", + "rt-multi-thread", + "sync", + "time", ], optional = true } tokio-openssl = { version = "0.6.5", optional = true } thiserror = "1.0.37" @@ -68,10 +68,10 @@ tracing-capture = { version = "0.1.0", optional = true } # Note that this feature is distinct from `tracing`'s `log` feature, which has `tracing` macros emit `log` records if # there is no global `tracing` subscriber. tracing-subscriber = { version = "0.3.19", default-features = false, features = [ - "env-filter", - "fmt", - "json", - "tracing-log", + "env-filter", + "fmt", + "json", + "tracing-log", ], optional = true } uuid = { version = "1.7.0", optional = true } url = { version = "2.3.1", features = ["serde"] } @@ -89,7 +89,7 @@ hyper-util = { version = "0.1.6", optional = true } opentelemetry = { version = "0.24.0", features = ["trace"], optional = true } opentelemetry-otlp = { version = "0.17.0", optional = true } opentelemetry_sdk = { version = "0.24.1", features = [ - "rt-tokio", + "rt-tokio", ], optional = true } console-subscriber = { version = "0.4.0", optional = true } sentry-tracing = { version = "0.29.1", optional = true } @@ -109,37 +109,37 @@ tracing-subscriber = "0.3.19" [features] default = ["tokio-console", "workspace-hack", "mz-ore-proc/workspace-hack"] async = [ - "async-trait", - "futures", - "metrics", - "openssl", - "tokio-openssl", - "tokio", - "tracing", + "async-trait", + "futures", + "metrics", + "openssl", + "tokio-openssl", + "tokio", + "dep:tracing", ] -bytes_ = ["bytes", "compact_bytes", "smallvec", "smallvec/const_generics", "region", "tracing_"] -network = ["async", "bytes", "smallvec", "tonic", "tracing"] +bytes = ["dep:bytes", "compact_bytes", "smallvec", "smallvec/const_generics", "region", "tracing"] +network = ["async", "dep:bytes", "smallvec", "tonic", "dep:tracing"] process = ["libc"] region = ["dep:lgalloc", "dep:bytemuck"] -tracing_ = [ - "anyhow", - "tracing", - "tracing-subscriber", - "tracing-subscriber/ansi", - "tracing-opentelemetry", - "tokio-native-tls", - "native-tls", - "http", - "hyper-tls", - "hyper-util", - "metrics", - "opentelemetry", - "opentelemetry-otlp", - "opentelemetry_sdk", - "tonic", - "sentry", - "sentry-tracing", - "yansi", +tracing = [ + "anyhow", + "dep:tracing", + "tracing-subscriber", + "tracing-subscriber/ansi", + "tracing-opentelemetry", + "tokio-native-tls", + "native-tls", + "http", + "hyper-tls", + "hyper-util", + "metrics", + "opentelemetry", + "opentelemetry-otlp", + "opentelemetry_sdk", + "tonic", + "sentry", + "sentry-tracing", + "yansi", ] tokio-console = ["console-subscriber", "tokio", "tokio/tracing", "network"] cli = ["clap"] @@ -165,7 +165,7 @@ harness = false [[bench]] name = "bytes" harness = false -required-features = ["bytes_", "region", "tracing_", "lgalloc", "derivative"] +required-features = ["bytes", "region", "tracing", "derivative"] [package.metadata.cargo-udeps.ignore] normal = ["workspace-hack"] diff --git c/src/ore/src/lib.rs i/src/ore/src/lib.rs index cac9d79dac..b9e5cbf98b 100644 --- c/src/ore/src/lib.rs +++ i/src/ore/src/lib.rs @@ -26,8 +26,8 @@ #[cfg(feature = "assert")] pub mod assert; pub mod bits; -#[cfg_attr(nightly_doc_features, doc(cfg(feature = "bytes_")))] -#[cfg(feature = "bytes_")] +#[cfg_attr(nightly_doc_features, doc(cfg(feature = "bytes")))] +#[cfg(feature = "bytes")] pub mod bytes; pub mod cast; #[cfg_attr(nightly_doc_features, doc(cfg(feature = "async")))] @@ -54,9 +54,9 @@ pub mod iter; pub mod lex; #[cfg_attr( nightly_doc_features, - doc(cfg(all(feature = "bytes_", feature = "region"))) + doc(cfg(all(feature = "bytes", feature = "region"))) )] -#[cfg(all(feature = "bytes_", feature = "region", feature = "tracing_"))] +#[cfg(all(feature = "bytes", feature = "region", feature = "tracing"))] pub mod lgbytes; #[cfg_attr(nightly_doc_features, doc(cfg(feature = "metrics")))] #[cfg(feature = "metrics")] @@ -94,8 +94,8 @@ pub mod task; pub mod test; pub mod thread; pub mod time; -#[cfg_attr(nightly_doc_features, doc(cfg(feature = "tracing_")))] -#[cfg(feature = "tracing_")] +#[cfg_attr(nightly_doc_features, doc(cfg(feature = "tracing")))] +#[cfg(feature = "tracing")] pub mod tracing; pub mod url; pub mod vec; @@ -104,7 +104,7 @@ pub use mz_ore_proc::{instrument, static_list, test}; #[doc(hidden)] pub mod __private { - #[cfg(feature = "tracing_")] + #[cfg(feature = "tracing")] pub use tracing; } diff --git c/src/ore/src/process.rs i/src/ore/src/process.rs index d7d9a7dec9..c8df9a87bd 100644 --- c/src/ore/src/process.rs +++ i/src/ore/src/process.rs @@ -36,8 +36,8 @@ /// tap into the existing whole-process retry logic. Use halt judiciously in /// these cases, as restarting a process can be inefficient (e.g., mandatory /// restart backoff, rehydrating expensive state). -#[cfg_attr(nightly_doc_features, doc(cfg(feature = "tracing_")))] -#[cfg(feature = "tracing_")] +#[cfg_attr(nightly_doc_features, doc(cfg(feature = "tracing")))] +#[cfg(feature = "tracing")] #[macro_export] macro_rules! halt { ($($arg:expr),* $(,)?) => {{ @@ -50,8 +50,8 @@ macro_rules! halt { /// /// `exit!` forwards the provided arguments to the [`tracing::info`] macro, then /// terminates the process with given exit code. -#[cfg_attr(nightly_doc_features, doc(cfg(feature = "tracing_")))] -#[cfg(feature = "tracing_")] +#[cfg_attr(nightly_doc_features, doc(cfg(feature = "tracing")))] +#[cfg(feature = "tracing")] #[macro_export] macro_rules! exit { ($exit_code:literal, $($arg:expr),* $(,)?) => {{ diff --git c/src/persist-cli/Cargo.toml i/src/persist-cli/Cargo.toml index 2153d48c92..504c30f1b2 100644 --- c/src/persist-cli/Cargo.toml +++ i/src/persist-cli/Cargo.toml @@ -28,7 +28,7 @@ futures = "0.3.25" humantime = "2.1.0" mz-http-util = { path = "../http-util" } mz-orchestrator-tracing = { path = "../orchestrator-tracing" } -mz-ore = { path = "../ore", features = ["bytes_", "network", "tracing_", "test"] } +mz-ore = { path = "../ore", features = ["bytes", "network", "tracing", "test"] } mz-persist = { path = "../persist" } mz-persist-client = { path = "../persist-client" } mz-persist-types = { path = "../persist-types" } diff --git c/src/persist-client/Cargo.toml i/src/persist-client/Cargo.toml index a3afe2b403..012ee3ccab 100644 --- c/src/persist-client/Cargo.toml +++ i/src/persist-client/Cargo.toml @@ -43,7 +43,7 @@ hex = "0.4.3" itertools = "0.12.1" mz-build-info = { path = "../build-info" } mz-dyncfg = { path = "../dyncfg" } -mz-ore = { path = "../ore", features = ["bytes_", "process", "test", "tracing_"] } +mz-ore = { path = "../ore", features = ["bytes", "process", "test", "tracing"] } mz-persist = { path = "../persist" } mz-persist-proc = { path = "../persist-proc" } mz-persist-types = { path = "../persist-types" } diff --git c/src/persist/Cargo.toml i/src/persist/Cargo.toml index 46e9eb9640..b26bb13677 100644 --- c/src/persist/Cargo.toml +++ i/src/persist/Cargo.toml @@ -43,7 +43,7 @@ futures-util = "0.3.31" md-5 = "0.10.5" mz-aws-util = { path = "../aws-util", features = ["s3"] } mz-dyncfg = { path = "../dyncfg" } -mz-ore = { path = "../ore", default-features = false, features = ["metrics", "async", "bytes_", "region", "parquet"] } +mz-ore = { path = "../ore", default-features = false, features = ["metrics", "async", "bytes", "region", "parquet"] } mz-persist-types = { path = "../persist-types" } mz-postgres-client = { path = "../postgres-client" } mz-proto = { path = "../proto" } diff --git c/src/pgwire/Cargo.toml i/src/pgwire/Cargo.toml index 601d94f01d..f2400e238f 100644 --- c/src/pgwire/Cargo.toml +++ i/src/pgwire/Cargo.toml @@ -21,7 +21,7 @@ itertools = "0.12.1" mz-adapter = { path = "../adapter" } mz-adapter-types = { path = "../adapter-types" } mz-frontegg-auth = { path = "../frontegg-auth" } -mz-ore = { path = "../ore", features = ["tracing_"] } +mz-ore = { path = "../ore", features = ["tracing"] } mz-pgcopy = { path = "../pgcopy" } mz-pgrepr = { path = "../pgrepr" } mz-pgwire-common = { path = "../pgwire-common" } diff --git c/src/postgres-client/Cargo.toml i/src/postgres-client/Cargo.toml index 0d28e857f6..3f670b178b 100644 --- c/src/postgres-client/Cargo.toml +++ i/src/postgres-client/Cargo.toml @@ -12,9 +12,9 @@ workspace = true [dependencies] anyhow = { version = "1.0.95", features = ["backtrace"] } deadpool-postgres = "0.10.3" -mz-ore = { path = "../ore", default-features = false, features = ["metrics", "async", "bytes_"] } +mz-ore = { path = "../ore", default-features = false, features = ["metrics", "async", "bytes"] } mz-tls-util = { path = "../tls-util" } -prometheus = { version = "0.13.3", default-features = false} +prometheus = { version = "0.13.3", default-features = false } tokio = { version = "1.38.0", default-features = false, features = ["fs", "macros", "sync", "rt", "rt-multi-thread"] } tracing = "0.1.37" workspace-hack = { version = "0.0.0", path = "../workspace-hack", optional = true } diff --git c/src/repr/BUILD.bazel i/src/repr/BUILD.bazel index f8c168a8d8..a3812ed818 100644 --- c/src/repr/BUILD.bazel +++ i/src/repr/BUILD.bazel @@ -25,8 +25,8 @@ rust_library( compile_data = ["Cargo.toml"], crate_features = [ "default", + "tracing", "tracing-subscriber", - "tracing_", ], data = [], disable_pipelining = False, @@ -64,8 +64,8 @@ rust_test( crate = ":mz_repr", crate_features = [ "default", + "tracing", "tracing-subscriber", - "tracing_", ], data = [] + glob(["src/adt/snapshots/*"]), env = {"INSTA_WORKSPACE_ROOT": "."}, diff --git c/src/repr/Cargo.toml i/src/repr/Cargo.toml index f9bfbaee6c..4a9893e596 100644 --- c/src/repr/Cargo.toml +++ i/src/repr/Cargo.toml @@ -43,14 +43,14 @@ hex = "0.4.3" itertools = "0.12.1" mz-lowertest = { path = "../lowertest", default-features = false } mz-ore = { path = "../ore", features = [ - "bytes_", + "bytes", "flatcontainer", "id_gen", "smallvec", "region", "stack", "test", - "tracing_", + "tracing", ], default-features = false } mz-persist-types = { path = "../persist-types", default-features = false } mz-pgtz = { path = "../pgtz", default-features = false } @@ -78,7 +78,7 @@ proptest-derive = { version = "0.5.1", features = ["boxed_union"] } thiserror = "1.0.37" tracing = { version = "0.1.37" } -# for the tracing_ feature +# for the tracing feature tracing-subscriber = { version = "0.3.19", default-features = false, optional = true } workspace-hack = { version = "0.0.0", path = "../workspace-hack", optional = true } @@ -100,7 +100,7 @@ default = [ "mz-proto/default", "workspace-hack", ] -tracing_ = ["tracing-subscriber"] +tracing = ["tracing-subscriber"] [package.metadata.cargo-udeps.ignore] normal = ["workspace-hack"] diff --git c/src/repr/src/explain.rs i/src/repr/src/explain.rs index 4c1d2c934b..3b5112a33b 100644 --- c/src/repr/src/explain.rs +++ i/src/repr/src/explain.rs @@ -50,10 +50,10 @@ use crate::{ColumnType, GlobalId, ScalarType}; pub mod dot; pub mod json; pub mod text; -#[cfg(feature = "tracing_")] +#[cfg(feature = "tracing")] pub mod tracing; -#[cfg(feature = "tracing_")] +#[cfg(feature = "tracing")] pub use crate::explain::tracing::trace_plan; /// Possible output formats for an explanation. diff --git c/src/repr/src/row/encode.rs i/src/repr/src/row/encode.rs index e263da17e5..0b0860cded 100644 --- c/src/repr/src/row/encode.rs +++ i/src/repr/src/row/encode.rs @@ -2038,7 +2038,7 @@ impl RowPacker<'_> { // We plan to remove the `Dummy` variant soon (materialize#17099). To prepare for that, we // emit a log to Sentry here, to notify us of any instances that might have // been made durable. - #[cfg(feature = "tracing_")] + #[cfg(feature = "tracing")] tracing::error!("protobuf decoding found Dummy datum"); self.push(Datum::Dummy); } diff --git c/src/sql/Cargo.toml i/src/sql/Cargo.toml index d850be2685..58c6bbf68a 100644 --- c/src/sql/Cargo.toml +++ i/src/sql/Cargo.toml @@ -54,7 +54,7 @@ mz-pgrepr = { path = "../pgrepr" } mz-pgwire-common = { path = "../pgwire-common" } mz-postgres-util = { path = "../postgres-util" } mz-proto = { path = "../proto" } -mz-repr = { path = "../repr", features = ["tracing_"] } +mz-repr = { path = "../repr", features = ["tracing"] } mz-rocksdb-types = { path = "../rocksdb-types" } mz-secrets = { path = "../secrets" } mz-sql-parser = { path = "../sql-parser" } diff --git c/src/sqllogictest/Cargo.toml i/src/sqllogictest/Cargo.toml index 9fc6b4a03e..4cb2bd5cdc 100644 --- c/src/sqllogictest/Cargo.toml +++ i/src/sqllogictest/Cargo.toml @@ -26,7 +26,7 @@ mz-catalog = { path = "../catalog" } mz-controller = { path = "../controller" } mz-dyncfgs = { path = "../dyncfgs" } mz-environmentd = { path = "../environmentd", default-features = false } -mz-ore = { path = "../ore", features = ["async", "tracing_"] } +mz-ore = { path = "../ore", features = ["async", "tracing"] } mz-orchestrator = { path = "../orchestrator" } mz-orchestrator-process = { path = "../orchestrator-process" } mz-orchestrator-tracing = { path = "../orchestrator-tracing" } @@ -50,9 +50,9 @@ time = "0.3.17" tracing = "0.1.37" tokio = "1.38.0" tokio-postgres = { version = "0.7.8", features = [ - "with-chrono-0_4", - "with-uuid-1", - "with-serde_json-1", + "with-chrono-0_4", + "with-uuid-1", + "with-serde_json-1", ] } tokio-stream = { version = "0.1.17", features = ["net"] } tower-http = { version = "0.5.2", features = ["cors"] } diff --git c/src/storage-client/Cargo.toml i/src/storage-client/Cargo.toml index ce1c067627..267d72aaa4 100644 --- c/src/storage-client/Cargo.toml +++ i/src/storage-client/Cargo.toml @@ -22,7 +22,7 @@ mz-ccsr = { path = "../ccsr" } mz-cluster-client = { path = "../cluster-client" } mz-dyncfgs = { path = "../dyncfgs" } mz-kafka-util = { path = "../kafka-util" } -mz-ore = { path = "../ore", features = ["async", "process", "tracing_"] } +mz-ore = { path = "../ore", features = ["async", "process", "tracing"] } mz-persist-client = { path = "../persist-client" } mz-persist-types = { path = "../persist-types" } mz-proto = { path = "../proto", features = ["tokio-postgres"] } diff --git c/src/storage-controller/Cargo.toml i/src/storage-controller/Cargo.toml index ae82f7a705..dabcfe6dca 100644 --- c/src/storage-controller/Cargo.toml +++ i/src/storage-controller/Cargo.toml @@ -23,7 +23,7 @@ mz-cluster-client = { path = "../cluster-client" } mz-controller-types = { path = "../controller-types" } mz-dyncfg = { path = "../dyncfg" } mz-dyncfgs = { path = "../dyncfgs" } -mz-ore = { path = "../ore", features = ["async", "chrono", "tracing_"] } +mz-ore = { path = "../ore", features = ["async", "chrono", "tracing"] } mz-persist-client = { path = "../persist-client" } mz-persist-types = { path = "../persist-types" } mz-proto = { path = "../proto", features = ["tokio-postgres"] } diff --git c/src/storage-operators/Cargo.toml i/src/storage-operators/Cargo.toml index e0ad758cdd..d22703404c 100644 --- c/src/storage-operators/Cargo.toml +++ i/src/storage-operators/Cargo.toml @@ -29,7 +29,7 @@ mz-aws-util = { path = "../aws-util" } mz-arrow-util = { path = "../arrow-util" } mz-dyncfg = { path = "../dyncfg" } mz-expr = { path = "../expr" } -mz-ore = { path = "../ore", features = ["async", "tracing_"] } +mz-ore = { path = "../ore", features = ["async", "tracing"] } mz-persist-client = { path = "../persist-client" } mz-persist-types = { path = "../persist-types" } mz-pgcopy = { path = "../pgcopy" } diff --git c/src/storage-types/Cargo.toml i/src/storage-types/Cargo.toml index e46f372579..38961bf402 100644 --- c/src/storage-types/Cargo.toml +++ i/src/storage-types/Cargo.toml @@ -37,7 +37,7 @@ mz-dyncfg = { path = "../dyncfg" } mz-expr = { path = "../expr" } mz-interchange = { path = "../interchange" } mz-kafka-util = { path = "../kafka-util" } -mz-ore = { path = "../ore", features = ["async", "tracing_"] } +mz-ore = { path = "../ore", features = ["async", "tracing"] } mz-mysql-util = { path = "../mysql-util" } mz-persist-types = { path = "../persist-types" } mz-pgcopy = { path = "../pgcopy" } diff --git c/src/storage/Cargo.toml i/src/storage/Cargo.toml index 8000557365..48bc3d924e 100644 --- c/src/storage/Cargo.toml +++ i/src/storage/Cargo.toml @@ -43,7 +43,7 @@ mz-cluster = { path = "../cluster" } mz-interchange = { path = "../interchange" } mz-kafka-util = { path = "../kafka-util" } mz-mysql-util = { path = "../mysql-util" } -mz-ore = { path = "../ore", features = ["async", "tracing_", "chrono", "metrics"] } +mz-ore = { path = "../ore", features = ["async", "tracing", "chrono", "metrics"] } mz-persist = { path = "../persist" } mz-persist-client = { path = "../persist-client" } mz-persist-types = { path = "../persist-types" } diff --git c/src/timely-util/Cargo.toml i/src/timely-util/Cargo.toml index 61b87dc306..597bfac89c 100644 --- c/src/timely-util/Cargo.toml +++ i/src/timely-util/Cargo.toml @@ -19,7 +19,7 @@ differential-dataflow = "0.13.6" either = "1" futures-util = "0.3.31" lgalloc = "0.5" -mz-ore = { path = "../ore", features = ["async", "process", "tracing_", "test"] } +mz-ore = { path = "../ore", features = ["async", "process", "tracing", "test"] } num-traits = "0.2" proptest = { version = "1.6.0", default-features = false, features = ["std"] } serde = { version = "1.0.218", features = ["derive"] } diff --git c/src/timestamp-oracle/Cargo.toml i/src/timestamp-oracle/Cargo.toml index de6323878f..473357b2a4 100644 --- c/src/timestamp-oracle/Cargo.toml +++ i/src/timestamp-oracle/Cargo.toml @@ -16,10 +16,10 @@ dec = "0.4.8" deadpool-postgres = "0.10.3" futures = "0.3.25" mz-adapter-types = { path = "../adapter-types" } -mz-ore = { path = "../ore", features = ["chrono", "async", "tracing_"] } +mz-ore = { path = "../ore", features = ["chrono", "async", "tracing"] } mz-pgrepr = { path = "../pgrepr" } mz-postgres-client = { path = "../postgres-client" } -mz-repr = { path = "../repr", features = ["tracing_"] } +mz-repr = { path = "../repr", features = ["tracing"] } postgres-protocol = { version = "0.6.5" } rand = "0.8.5" serde = "1.0.218" diff --git c/src/tracing/Cargo.toml i/src/tracing/Cargo.toml index 6cc1486443..ab9b092b08 100644 --- c/src/tracing/Cargo.toml +++ i/src/tracing/Cargo.toml @@ -10,7 +10,7 @@ publish = false workspace = true [dependencies] -mz-ore = { path = "../ore", default-features = false, features = ["test", "tracing_"] } +mz-ore = { path = "../ore", default-features = false, features = ["test", "tracing"] } mz-proto = { path = "../proto", default-features = false } prost = { version = "0.13.4", features = ["no-recursion-limit"] } proptest = { version = "1.6.0", default-features = false, features = ["std"] } diff --git c/src/transform/Cargo.toml i/src/transform/Cargo.toml index 16181db9cb..20fc3be596 100644 --- c/src/transform/Cargo.toml +++ i/src/transform/Cargo.toml @@ -16,7 +16,7 @@ itertools = "0.12.1" mz-compute-types = { path = "../compute-types" } mz-expr = { path = "../expr" } mz-ore = { path = "../ore" } -mz-repr = { path = "../repr", features = ["tracing_"] } +mz-repr = { path = "../repr", features = ["tracing"] } mz-sql = { path = "../sql" } ordered-float = { version = "4.6.0", features = ["serde"] } paste = "1.0.11"

antiguru requested review from a team as code owners February 27, 2025 15:24

antiguru requested a review from aljoscha February 27, 2025 15:24

ParkMyCar approved these changes Feb 27, 2025

View reviewed changes

antiguru force-pushed the mz_ore_features branch from 5f9d15a to a0d55a6 Compare February 27, 2025 19:19

antiguru enabled auto-merge (squash) February 27, 2025 19:20

antiguru force-pushed the mz_ore_features branch from a0d55a6 to 0ef3f22 Compare February 28, 2025 08:01

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove features with _ #31688

Remove features with _ #31688

antiguru commented Feb 27, 2025

Remove features with _ #31688

Are you sure you want to change the base?

Remove features with _ #31688

Conversation

antiguru commented Feb 27, 2025

Checklist