diff --git a/Cargo.lock b/Cargo.lock index f90302cbf0..2d5a104e37 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1202,7 +1202,6 @@ dependencies = [ "remote_storage", "serde", "serde_json", - "serde_with", "utils", "workspace_hack", ] @@ -1245,7 +1244,6 @@ dependencies = [ "tracing-utils", "url", "utils", - "vm_monitor", "workspace_hack", "zstd", ] @@ -1315,12 +1313,9 @@ dependencies = [ name = "consumption_metrics" version = "0.1.0" dependencies = [ - "anyhow", "chrono", "rand 0.8.5", "serde", - "serde_with", - "utils", "workspace_hack", ] @@ -1355,7 +1350,6 @@ dependencies = [ "serde_json", "serde_with", "storage_broker", - "tar", "thiserror", "tokio", "tokio-postgres", @@ -1996,16 +1990,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "fs2" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "fsevent-sys" version = "4.1.0" @@ -3775,7 +3759,6 @@ dependencies = [ "chrono", "clap", "const_format", - "consumption_metrics", "criterion", "crossbeam-utils", "either", @@ -3795,10 +3778,8 @@ dependencies = [ "rand 0.8.5", "smallvec", "svg_fmt", - "sync_wrapper", "thiserror", "tokio", - "tokio-io-timeout", "tokio-util", "tracing", "tracing-error", @@ -3892,35 +3873,12 @@ dependencies = [ "syn 2.0.52", ] -[[package]] -name = "password-hash" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" -dependencies = [ - "base64ct", - "rand_core 0.6.4", - "subtle", -] - [[package]] name = "paste" version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" -[[package]] -name = "pbkdf2" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ca0b5a68607598bf3bad68f32227a8164f6254833f84eafaac409cd6746c31" -dependencies = [ - "digest", - "hmac", - "password-hash", - "sha2", -] - [[package]] name = "peeking_take_while" version = "0.1.2" @@ -4362,7 +4320,6 @@ dependencies = [ "ipnet", "itertools", "lasso", - "md5", "measured", "metrics", "native-tls", @@ -4371,7 +4328,6 @@ dependencies = [ "parking_lot 0.12.1", "parquet", "parquet_derive", - "pbkdf2", "pin-project-lite", "postgres-native-tls", "postgres-protocol", @@ -4401,7 +4357,6 @@ dependencies = [ "socket2 0.5.5", "subtle", "sync_wrapper", - "task-local-extensions", "thiserror", "tikv-jemalloc-ctl", "tikv-jemallocator", @@ -4420,7 +4375,6 @@ dependencies = [ "utils", "uuid", "walkdir", - "webpki-roots 0.25.2", "workspace_hack", "x509-parser", ] @@ -5179,7 +5133,6 @@ dependencies = [ "crc32c", "desim", "fail", - "fs2", "futures", "git-version", "hex", @@ -5202,7 +5155,6 @@ dependencies = [ "sd-notify", "serde", "serde_json", - "serde_with", "sha2", "signal-hook", "storage_broker", @@ -5227,7 +5179,6 @@ version = "0.1.0" dependencies = [ "const_format", "serde", - "serde_with", "utils", "workspace_hack", ] @@ -5943,15 +5894,6 @@ dependencies = [ "xattr", ] -[[package]] -name = "task-local-extensions" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba323866e5d033818e3240feeb9f7db2c4296674e4d9e16b97b7bf8f490434e8" -dependencies = [ - "pin-utils", -] - [[package]] name = "tempfile" version = "3.5.0" @@ -6577,7 +6519,6 @@ dependencies = [ "opentelemetry-otlp", "opentelemetry-semantic-conventions", "opentelemetry_sdk", - "reqwest 0.12.4", "tokio", "tracing", "tracing-opentelemetry", @@ -6793,7 +6734,6 @@ dependencies = [ "humantime", "hyper 0.14.26", "jsonwebtoken", - "leaky-bucket", "metrics", "nix 0.27.1", "once_cell", @@ -6808,7 +6748,6 @@ dependencies = [ "serde_assert", "serde_json", "serde_path_to_error", - "serde_with", "signal-hook", "strum", "strum_macros", @@ -7424,7 +7363,6 @@ dependencies = [ "aws-smithy-types", "axum", "base64 0.21.1", - "base64ct", "bytes", "cc", "chrono", diff --git a/Cargo.toml b/Cargo.toml index 1594a947f5..62644d3ddb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -124,7 +124,6 @@ opentelemetry-semantic-conventions = "0.14.0" parking_lot = "0.12" parquet = { version = "49.0.0", default-features = false, features = ["zstd"] } parquet_derive = "49.0.0" -pbkdf2 = { version = "0.12.1", features = ["simple", "std"] } pin-project-lite = "0.2" procfs = "0.14" prometheus = {version = "0.13", default_features=false, features = ["process"]} # removes protobuf dependency @@ -163,7 +162,6 @@ strum_macros = "0.26" svg_fmt = { git = "https://github.com/neondatabase/fork--nical--rust_debug", branch = "neon" } sync_wrapper = "0.1.2" tar = "0.4" -task-local-extensions = "0.1.4" test-context = "0.3" thiserror = "1.0" tikv-jemallocator = "0.5" @@ -189,7 +187,6 @@ url = "2.2" urlencoding = "2.1" uuid = { version = "1.6.1", features = ["v4", "v7", "serde"] } walkdir = "2.3.2" -webpki-roots = "0.25" x509-parser = "0.15" ## TODO replace this with tracing diff --git a/compute_tools/Cargo.toml b/compute_tools/Cargo.toml index 06efc8de5e..b5e6c41bb7 100644 --- a/compute_tools/Cargo.toml +++ b/compute_tools/Cargo.toml @@ -39,7 +39,7 @@ utils.workspace = true workspace_hack.workspace = true toml_edit.workspace = true remote_storage = { version = "0.1", path = "../libs/remote_storage/" } -vm_monitor = { version = "0.1", path = "../libs/vm_monitor/" } +# vm_monitor = { version = "0.1", path = "../libs/vm_monitor/" } zstd = "0.13" bytes = "1.0" rust-ini = "0.20.0" diff --git a/control_plane/Cargo.toml b/control_plane/Cargo.toml index e62f3b8a47..c3ec2cd838 100644 --- a/control_plane/Cargo.toml +++ b/control_plane/Cargo.toml @@ -25,7 +25,6 @@ scopeguard.workspace = true serde.workspace = true serde_json.workspace = true serde_with.workspace = true -tar.workspace = true thiserror.workspace = true toml.workspace = true toml_edit.workspace = true diff --git a/libs/compute_api/Cargo.toml b/libs/compute_api/Cargo.toml index b377bd2cce..8a0ba9b4ce 100644 --- a/libs/compute_api/Cargo.toml +++ b/libs/compute_api/Cargo.toml @@ -8,7 +8,6 @@ license.workspace = true anyhow.workspace = true chrono.workspace = true serde.workspace = true -serde_with.workspace = true serde_json.workspace = true regex.workspace = true diff --git a/libs/consumption_metrics/Cargo.toml b/libs/consumption_metrics/Cargo.toml index 3f290821c2..55796c56ce 100644 --- a/libs/consumption_metrics/Cargo.toml +++ b/libs/consumption_metrics/Cargo.toml @@ -5,11 +5,8 @@ edition = "2021" license = "Apache-2.0" [dependencies] -anyhow.workspace = true chrono.workspace = true rand.workspace = true serde.workspace = true -serde_with.workspace = true -utils.workspace = true workspace_hack.workspace = true diff --git a/libs/safekeeper_api/Cargo.toml b/libs/safekeeper_api/Cargo.toml index 327d98ee77..df6f932c06 100644 --- a/libs/safekeeper_api/Cargo.toml +++ b/libs/safekeeper_api/Cargo.toml @@ -6,7 +6,6 @@ license.workspace = true [dependencies] serde.workspace = true -serde_with.workspace = true const_format.workspace = true utils.workspace = true diff --git a/libs/tenant_size_model/Cargo.toml b/libs/tenant_size_model/Cargo.toml index 15e78932a8..451a836a78 100644 --- a/libs/tenant_size_model/Cargo.toml +++ b/libs/tenant_size_model/Cargo.toml @@ -8,6 +8,8 @@ license.workspace = true [dependencies] anyhow.workspace = true serde.workspace = true -serde_json.workspace = true workspace_hack.workspace = true + +[dev-dependencies] +serde_json.workspace = true diff --git a/libs/tracing-utils/Cargo.toml b/libs/tracing-utils/Cargo.toml index dcbd7e0347..80dac7d3b7 100644 --- a/libs/tracing-utils/Cargo.toml +++ b/libs/tracing-utils/Cargo.toml @@ -10,7 +10,6 @@ opentelemetry.workspace = true opentelemetry_sdk = { workspace = true, features=["rt-tokio"] } opentelemetry-otlp = { workspace = true, default_features=false, features = ["http-proto", "trace", "http", "reqwest-client"] } opentelemetry-semantic-conventions.workspace = true -reqwest = { workspace = true, default-features = false, features = ["rustls-tls"] } tokio = { workspace = true, features = ["rt", "rt-multi-thread"] } tracing.workspace = true tracing-opentelemetry.workspace = true diff --git a/libs/utils/Cargo.toml b/libs/utils/Cargo.toml index a6a081c5c1..f0159989e6 100644 --- a/libs/utils/Cargo.toml +++ b/libs/utils/Cargo.toml @@ -27,7 +27,6 @@ hyper = { workspace = true, features = ["full"] } fail.workspace = true futures = { workspace = true} jsonwebtoken.workspace = true -leaky-bucket.workspace = true nix.workspace = true once_cell.workspace = true pin-project-lite.workspace = true @@ -44,7 +43,6 @@ tracing.workspace = true tracing-error.workspace = true tracing-subscriber = { workspace = true, features = ["json", "registry"] } rand.workspace = true -serde_with.workspace = true strum.workspace = true strum_macros.workspace = true url.workspace = true diff --git a/pageserver/compaction/Cargo.toml b/pageserver/compaction/Cargo.toml index 0fd1d81845..6875eb8f87 100644 --- a/pageserver/compaction/Cargo.toml +++ b/pageserver/compaction/Cargo.toml @@ -16,7 +16,6 @@ bytes.workspace = true chrono = { workspace = true, features = ["serde"] } clap = { workspace = true, features = ["string"] } const_format.workspace = true -consumption_metrics.workspace = true crossbeam-utils.workspace = true either.workspace = true flate2.workspace = true @@ -33,10 +32,8 @@ pin-project-lite.workspace = true rand.workspace = true smallvec = { workspace = true, features = ["write"] } svg_fmt.workspace = true -sync_wrapper.workspace = true thiserror.workspace = true tokio = { workspace = true, features = ["process", "sync", "fs", "rt", "io-util", "time"] } -tokio-io-timeout.workspace = true tokio-util.workspace = true tracing.workspace = true tracing-error.workspace = true diff --git a/proxy/Cargo.toml b/proxy/Cargo.toml index 79d29c6e6d..965f36fef8 100644 --- a/proxy/Cargo.toml +++ b/proxy/Cargo.toml @@ -44,7 +44,6 @@ indexmap.workspace = true ipnet.workspace = true itertools.workspace = true lasso = { workspace = true, features = ["multi-threaded"] } -md5.workspace = true measured = { workspace = true, features = ["lasso"] } metrics.workspace = true once_cell.workspace = true @@ -52,7 +51,6 @@ opentelemetry.workspace = true parking_lot.workspace = true parquet.workspace = true parquet_derive.workspace = true -pbkdf2 = { workspace = true, features = ["simple", "std"] } pin-project-lite.workspace = true postgres_backend.workspace = true pq_proto.workspace = true @@ -77,7 +75,6 @@ smallvec.workspace = true socket2.workspace = true subtle.workspace = true sync_wrapper.workspace = true -task-local-extensions.workspace = true thiserror.workspace = true tikv-jemallocator.workspace = true tikv-jemalloc-ctl = { workspace = true, features = ["use_std"] } @@ -94,7 +91,6 @@ url.workspace = true urlencoding.workspace = true utils.workspace = true uuid.workspace = true -webpki-roots.workspace = true x509-parser.workspace = true native-tls.workspace = true postgres-native-tls.workspace = true diff --git a/safekeeper/Cargo.toml b/safekeeper/Cargo.toml index c8b732fee1..a5747e97c6 100644 --- a/safekeeper/Cargo.toml +++ b/safekeeper/Cargo.toml @@ -23,7 +23,6 @@ clap = { workspace = true, features = ["derive"] } const_format.workspace = true crc32c.workspace = true fail.workspace = true -fs2.workspace = true git-version.workspace = true hex.workspace = true humantime.workspace = true @@ -39,7 +38,6 @@ scopeguard.workspace = true reqwest = { workspace = true, features = ["json"] } serde.workspace = true serde_json.workspace = true -serde_with.workspace = true signal-hook.workspace = true thiserror.workspace = true tokio = { workspace = true, features = ["fs"] } diff --git a/workspace_hack/Cargo.toml b/workspace_hack/Cargo.toml index 9aa714a49f..b86c74c1c8 100644 --- a/workspace_hack/Cargo.toml +++ b/workspace_hack/Cargo.toml @@ -22,7 +22,6 @@ aws-smithy-http = { version = "0.60", default-features = false, features = ["eve aws-smithy-types = { version = "1", default-features = false, features = ["byte-stream-poll-next", "http-body-0-4-x", "http-body-1-x", "rt-tokio", "test-util"] } axum = { version = "0.6", features = ["ws"] } base64 = { version = "0.21", features = ["alloc"] } -base64ct = { version = "1", default-features = false, features = ["std"] } bytes = { version = "1", features = ["serde"] } chrono = { version = "0.4", default-features = false, features = ["clock", "serde", "wasmbind"] } clap = { version = "4", features = ["derive", "string"] }