diff --git a/Cargo.lock b/Cargo.lock index b4a9b6d86ef49..5221f402f179b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2222,29 +2222,6 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc0b364ead1874514c8c2855ab558056ebfeb775653e7ae45ff72f28f8f3166c" -[[package]] -name = "borsh" -version = "1.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8646f98db542e39fc66e68a20b2144f6a732636df7c2354e74645faaa433ce" -dependencies = [ - "borsh-derive", - "cfg_aliases", -] - -[[package]] -name = "borsh-derive" -version = "1.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdd1d3c0c2f5833f22386f252fe8ed005c7f59fdcddeef025c01b4c3b9fd9ac3" -dependencies = [ - "once_cell", - "proc-macro-crate 3.2.0", - "proc-macro2 1.0.106", - "quote 1.0.45", - "syn 2.0.117", -] - [[package]] name = "brotli" version = "8.0.0" @@ -2698,10 +2675,8 @@ dependencies = [ "async-trait", "bytes", "chrono", - "chrono-tz", "csv-core", "derivative", - "derive_more", "dyn-clone", "flate2", "futures", @@ -2718,9 +2693,7 @@ dependencies = [ "rand 0.9.4", "regex", "rstest", - "rust_decimal", "serde", - "serde-aux", "serde_json", "serde_with", "similar-asserts", @@ -3778,7 +3751,6 @@ dependencies = [ "snafu 0.9.0", "tracing 0.1.44", "vector-common", - "vector-config", "vector-core", "vector-lookup", "vrl", @@ -4256,13 +4228,11 @@ dependencies = [ "futures-util", "glob", "indexmap 2.12.0", - "libc", "quickcheck", "tempfile", "tokio", "tracing 0.1.44", "vector-common", - "winapi", ] [[package]] @@ -4275,7 +4245,6 @@ dependencies = [ "chrono", "crc", "dashmap", - "glob", "libc", "quickcheck", "serde", @@ -7814,7 +7783,6 @@ dependencies = [ "tonic 0.11.0", "tonic-build 0.11.0", "vector-core", - "vector-lookup", "vrl", ] @@ -9838,13 +9806,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61f703d19852dbf87cbc513643fa81428361eb6940f1ac14fd58155d295a3eb0" dependencies = [ "arrayvec", - "borsh", - "bytes", "num-traits", - "rand 0.8.6", - "rkyv", - "serde", - "serde_json", ] [[package]] @@ -10287,18 +10249,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "serde-aux" -version = "4.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "207f67b28fe90fb596503a9bf0bf1ea5e831e21307658e177c5dfcdfc3ab8a0a" -dependencies = [ - "chrono", - "serde", - "serde-value", - "serde_json", -] - [[package]] name = "serde-toml-merge" version = "0.3.11" @@ -12836,7 +12786,6 @@ dependencies = [ "arc-swap", "arr_macro", "arrow 56.2.0", - "arrow-schema 56.2.0", "assert_cmd", "async-compression", "async-nats", @@ -12871,7 +12820,6 @@ dependencies = [ "base64 0.22.1", "bloomy", "bollard", - "byteorder", "bytes", "bytesize", "cfg-if", @@ -12910,13 +12858,11 @@ dependencies = [ "headers 0.3.9", "heim", "hex", - "hickory-proto", "hostname 0.4.2", "http 0.2.12", "http 1.3.1", "http-body 0.4.6", "http-serde", - "humantime", "hyper 0.14.32", "hyper-openssl 0.9.2", "hyper-proxy", @@ -12949,7 +12895,6 @@ dependencies = [ "openssl-src", "ordered-float 4.6.0", "parquet", - "pastey", "percent-encoding", "pin-project", "postgres-openssl", @@ -12976,7 +12921,6 @@ dependencies = [ "roaring", "rstest", "rumqttc", - "rust_decimal", "seahash", "semver", "serde", @@ -13045,7 +12989,6 @@ dependencies = [ name = "vector-api-client" version = "0.2.0" dependencies = [ - "futures", "http 0.2.12", "prost 0.12.6", "prost-build 0.12.6", @@ -13072,7 +13015,6 @@ dependencies = [ "criterion", "crossbeam-queue", "crossbeam-utils", - "dashmap", "derivative", "fslock", "futures", @@ -13082,8 +13024,6 @@ dependencies = [ "metrics-tracing-context", "metrics-util", "num-traits", - "ordered-float 4.6.0", - "pastey", "proptest", "quickcheck", "rand 0.9.4", @@ -13215,7 +13155,6 @@ dependencies = [ "http 0.2.12", "hyper-proxy", "indexmap 2.12.0", - "inventory", "ipnet", "metrics", "metrics-tracing-context", @@ -13355,22 +13294,17 @@ name = "vector-top" version = "0.1.0" dependencies = [ "chrono", - "clap", "crossterm", - "exitcode", "futures", - "futures-util", "glob", "http 0.2.12", "humantime", - "indoc", "num-format", "ratatui", "regex", "tokio", "tokio-stream", "unit-prefix", - "url", "vector-api-client", "vector-common", ] @@ -13451,7 +13385,6 @@ name = "vector-vrl-web-playground" version = "0.1.0" dependencies = [ "cargo-lock", - "enrichment", "getrandom 0.2.15", "getrandom 0.4.2", "gloo-utils", diff --git a/Cargo.toml b/Cargo.toml index 48c227b62ed1e..a37430004228d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -186,7 +186,6 @@ rand_distr = { version = "0.5.1", default-features = false } rdkafka = { version = "0.39.0", default-features = false } regex = { version = "1.12.3", default-features = false, features = ["std", "perf"] } reqwest = { version = "0.11", features = ["json"] } -rust_decimal = { version = "1.40.0", default-features = false, features = ["std"] } semver = { version = "1.0.28", default-features = false, features = ["serde", "std"] } serde = { version = "1.0.219", default-features = false, features = ["alloc", "derive", "rc"] } serde_json = { version = "1.0.149", default-features = false, features = ["preserve_order", "raw_value", "std"] } @@ -230,7 +229,6 @@ reqwest_13 = { package = "reqwest", version = "0.13", default-features = false, clap.workspace = true clap_complete.workspace = true indoc.workspace = true -pastey.workspace = true pin-project.workspace = true proptest = { workspace = true, optional = true } proptest-derive = { workspace = true, optional = true } @@ -358,7 +356,6 @@ greptimedb-ingester = { version = "0.17.0", default-features = false, optional = arc-swap = { workspace = true, default-features = false, optional = true } async-compression = { version = "0.4.27", default-features = false, features = ["tokio", "gzip", "zstd"], optional = true } arrow = { version = "56.2.0", default-features = false, features = ["ipc"], optional = true } -arrow-schema = { version = "56.2.0", default-features = false, optional = true } parquet = { version = "56.2.0", default-features = false, features = [ "arrow", "snap", @@ -398,7 +395,6 @@ http = { version = "0.2.9", default-features = false } http-1 = { package = "http", version = "1.0", default-features = false, features = ["std"] } http-serde = "1.1.3" http-body = { version = "0.4.6", default-features = false } -humantime.workspace = true hyper = { version = "0.14.32", default-features = false, features = ["client", "runtime", "http1", "http2", "server", "stream", "backports", "deprecated"] } hyper-openssl = { version = "0.9.2", default-features = false } hyper-proxy = { version = "0.9.1", default-features = false, features = ["openssl-tls"] } @@ -431,7 +427,6 @@ redis = { version = "0.32.4", default-features = false, features = ["connection- regex.workspace = true roaring = { version = "0.11.2", default-features = false, features = ["std"], optional = true } rumqttc = { version = "0.24.0", default-features = false, features = ["use-rustls"], optional = true } -rust_decimal = { workspace = true, optional = true } seahash = { version = "4.1.0", default-features = false } smallvec = { version = "1", default-features = false, features = ["union", "serde"] } snap = { version = "1.1.1", default-features = false } @@ -443,7 +438,6 @@ syslog = { version = "6.1.1", default-features = false, optional = true } tokio-postgres = { version = "0.7.13", default-features = false, features = ["runtime", "with-chrono-0_4"], optional = true } tokio-tungstenite = { workspace = true, features = ["connect"], optional = true } toml.workspace = true -hickory-proto = { workspace = true, optional = true } tonic = { workspace = true, optional = true } tonic-health = { workspace = true, optional = true } tonic-reflection = { workspace = true, optional = true } @@ -461,7 +455,6 @@ heim = { git = "https://github.com/vectordotdev/heim.git", branch = "update-deps # make sure to update the external docs when the Lua version changes mlua = { version = "0.10.5", default-features = false, features = ["lua54", "send", "vendored", "macros"], optional = true } sysinfo = "0.37.2" -byteorder = "1.5.0" [target.'cfg(windows)'.dependencies] windows-service = "0.8.0" @@ -648,7 +641,7 @@ enrichment-tables-mmdb = ["dep:maxminddb"] enrichment-tables-memory = ["dep:evmap", "dep:evmap-derive", "dep:thread_local"] # Codecs -codecs-arrow = ["dep:arrow", "dep:arrow-schema", "vector-lib/arrow"] +codecs-arrow = ["dep:arrow", "vector-lib/arrow"] codecs-parquet = ["dep:parquet", "codecs-arrow", "vector-lib/parquet"] codecs-opentelemetry = ["vector-lib/opentelemetry"] codecs-syslog = ["vector-lib/syslog"] @@ -720,7 +713,7 @@ sources-aws_s3 = ["aws-core", "dep:aws-sdk-sqs", "dep:aws-sdk-s3", "dep:async-co sources-aws_sqs = ["aws-core", "dep:aws-sdk-sqs"] sources-datadog_agent = ["sources-utils-http-encoding", "protobuf-build", "dep:prost"] sources-demo_logs = ["dep:fakedata"] -sources-dnstap = ["sources-utils-net-tcp", "dep:base64", "dep:hickory-proto", "dep:dnsmsg-parser", "dep:dnstap-parser", "protobuf-build", "dep:prost", "vector-vrl-functions/dnstap"] +sources-dnstap = ["sources-utils-net-tcp", "dep:base64", "dep:dnsmsg-parser", "dep:dnstap-parser", "protobuf-build", "dep:prost", "vector-vrl-functions/dnstap"] sources-docker_logs = ["docker"] sources-eventstoredb_metrics = [] sources-exec = [] @@ -924,7 +917,7 @@ sinks-azure_logs_ingestion = ["dep:azure_core", "dep:azure_identity", "dep:azure sinks-azure_monitor_logs = [] sinks-blackhole = [] sinks-chronicle = [] -sinks-clickhouse = ["dep:nom", "dep:rust_decimal", "codecs-arrow"] +sinks-clickhouse = ["dep:nom", "codecs-arrow"] sinks-console = [] sinks-databend = ["dep:databend-client"] sinks-databricks-zerobus = ["dep:databricks-zerobus-ingest-sdk", "dep:prost-reflect", "dep:base64"] diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv index dec61bb1e82bd..35ef4d3d1b8eb 100644 --- a/LICENSE-3rdparty.csv +++ b/LICENSE-3rdparty.csv @@ -123,8 +123,6 @@ bollard-stubs,https://github.com/fussybeaver/bollard,Apache-2.0,Bollard contribu bon,https://github.com/elastio/bon,MIT OR Apache-2.0,The bon Authors bon-macros,https://github.com/elastio/bon,MIT OR Apache-2.0,The bon-macros Authors borrow-or-share,https://github.com/yescallop/borrow-or-share,MIT-0,Scallop Ye -borsh,https://github.com/near/borsh-rs,MIT OR Apache-2.0,Near Inc -borsh-derive,https://github.com/near/borsh-rs,Apache-2.0,Near Inc brotli,https://github.com/dropbox/rust-brotli,BSD-3-Clause AND MIT,"Daniel Reiter Horn , The Brotli Authors" brotli-decompressor,https://github.com/dropbox/rust-brotli-decompressor,BSD-3-Clause OR MIT,"Daniel Reiter Horn , The Brotli Authors" bs58,https://github.com/Nullus157/bs58-rs,MIT OR Apache-2.0,The bs58 Authors @@ -681,7 +679,6 @@ security-framework-sys,https://github.com/kornelski/rust-security-framework,MIT semver,https://github.com/dtolnay/semver,MIT OR Apache-2.0,David Tolnay seq-macro,https://github.com/dtolnay/seq-macro,MIT OR Apache-2.0,David Tolnay serde,https://github.com/serde-rs/serde,MIT OR Apache-2.0,"Erick Tryzelaar , David Tolnay " -serde-aux,https://github.com/iddm/serde-aux,MIT,Victor Polevoy serde-toml-merge,https://github.com/jdrouet/serde-toml-merge,MIT,Jeremie Drouet serde-value,https://github.com/arcnmx/serde-value,MIT,arcnmx serde_bytes,https://github.com/serde-rs/bytes,MIT OR Apache-2.0,David Tolnay diff --git a/lib/codecs/Cargo.toml b/lib/codecs/Cargo.toml index 6a5f8424a61fd..837cf6bdf57f0 100644 --- a/lib/codecs/Cargo.toml +++ b/lib/codecs/Cargo.toml @@ -25,11 +25,8 @@ parquet = { version = "56.2.0", default-features = false, features = [ async-trait.workspace = true bytes.workspace = true chrono.workspace = true -chrono-tz.workspace = true -rust_decimal.workspace = true csv-core = { version = "0.1.13", default-features = false } derivative.workspace = true -derive_more = { version = "2.1.1", optional = true, features = ["from", "display"] } dyn-clone = { version = "1", default-features = false } flate2.workspace = true futures.workspace = true @@ -47,7 +44,6 @@ regex.workspace = true serde.workspace = true serde_with.workspace = true serde_json.workspace = true -serde-aux = { version = "4.5", optional = true } smallvec = { version = "1", default-features = false, features = ["union"] } snafu.workspace = true strum = { workspace = true, optional = true } @@ -80,5 +76,5 @@ vrl.workspace = true arrow = ["dep:arrow", "arrow/chrono-tz"] parquet = ["dep:parquet", "arrow"] opentelemetry = ["dep:opentelemetry-proto"] -syslog = ["dep:syslog_loose", "dep:strum", "dep:derive_more", "dep:serde-aux", "dep:toml"] +syslog = ["dep:syslog_loose", "dep:strum", "dep:toml"] test = [] diff --git a/lib/file-source-common/Cargo.toml b/lib/file-source-common/Cargo.toml index f7a191d9cae7d..3e89dc1230ffa 100644 --- a/lib/file-source-common/Cargo.toml +++ b/lib/file-source-common/Cargo.toml @@ -11,7 +11,6 @@ libc.workspace = true winapi = { version = "0.3", features = ["winioctl"] } [dependencies] -glob.workspace = true chrono.workspace = true tracing.workspace = true crc = "3.3.0" diff --git a/lib/file-source/Cargo.toml b/lib/file-source/Cargo.toml index a6b6e94c3b27f..dfc92a922c1b8 100644 --- a/lib/file-source/Cargo.toml +++ b/lib/file-source/Cargo.toml @@ -6,10 +6,6 @@ edition = "2024" publish = false license = "MIT" -[target.'cfg(windows)'.dependencies] -libc.workspace = true -winapi = { version = "0.3", features = ["winioctl"] } - [dependencies] glob.workspace = true chrono.workspace = true diff --git a/lib/opentelemetry-proto/Cargo.toml b/lib/opentelemetry-proto/Cargo.toml index 1467a171129ca..e7344864218a7 100644 --- a/lib/opentelemetry-proto/Cargo.toml +++ b/lib/opentelemetry-proto/Cargo.toml @@ -14,7 +14,6 @@ glob.workspace = true bytes.workspace = true chrono.workspace = true hex = { version = "0.4.3", default-features = false, features = ["std"] } -lookup = { package = "vector-lookup", path = "../vector-lookup", default-features = false } ordered-float.workspace = true prost.workspace = true tonic.workspace = true diff --git a/lib/vector-api-client/Cargo.toml b/lib/vector-api-client/Cargo.toml index 260a84a927e76..89d0c8f82280e 100644 --- a/lib/vector-api-client/Cargo.toml +++ b/lib/vector-api-client/Cargo.toml @@ -14,7 +14,6 @@ prost.workspace = true prost-types.workspace = true # Async -futures.workspace = true tokio = { workspace = true, features = ["macros", "rt", "sync"] } tokio-stream = { workspace = true, features = ["sync"] } diff --git a/lib/vector-buffers/Cargo.toml b/lib/vector-buffers/Cargo.toml index 4f27f3ef369e1..7701f79a75bb7 100644 --- a/lib/vector-buffers/Cargo.toml +++ b/lib/vector-buffers/Cargo.toml @@ -23,7 +23,6 @@ futures.workspace = true memmap2 = { version = "0.9.10", default-features = false } metrics.workspace = true num-traits = { version = "0.2.19", default-features = false } -pastey.workspace = true rkyv = { version = "0.7.46", default-features = false, features = ["size_32", "std", "strict", "validation"] } serde.workspace = true snafu.workspace = true @@ -32,8 +31,6 @@ tokio = { workspace = true, features = ["rt", "macros", "rt-multi-thread", "sync tracing = { workspace = true, features = ["attributes"] } vector-config = { path = "../vector-config", default-features = false } vector-common = { path = "../vector-common", default-features = false, features = ["byte_size_of"] } -dashmap.workspace = true -ordered-float.workspace = true [dev-dependencies] clap.workspace = true diff --git a/lib/vector-common/src/internal_event/mod.rs b/lib/vector-common/src/internal_event/mod.rs index e776e89553172..17b652e27e375 100644 --- a/lib/vector-common/src/internal_event/mod.rs +++ b/lib/vector-common/src/internal_event/mod.rs @@ -190,7 +190,7 @@ macro_rules! registered_event { $(fn register($fixed_name:ident: $fixed_tags:ty, $tags_name:ident: $tags:ty) $register_body:block)? ) => { - pastey::paste!{ + $crate::pastey::paste! { #[derive(Clone)] pub struct [<$event Handle>] { $( $field: $type, )* diff --git a/lib/vector-common/src/lib.rs b/lib/vector-common/src/lib.rs index 75849aac75884..b6d27d6f7949d 100644 --- a/lib/vector-common/src/lib.rs +++ b/lib/vector-common/src/lib.rs @@ -12,6 +12,7 @@ #![deny(unused_assignments)] #![deny(unused_comparisons)] +pub use pastey; // Exported so that registered_event! doesn't need pastey in other crates pub use vector_common_macros::NamedInternalEvent; #[cfg(feature = "btreemap")] diff --git a/lib/vector-core/Cargo.toml b/lib/vector-core/Cargo.toml index caf2735d45166..cd0525162c06f 100644 --- a/lib/vector-core/Cargo.toml +++ b/lib/vector-core/Cargo.toml @@ -25,7 +25,6 @@ headers = { version = "0.3.9", default-features = false } http = { version = "0.2.9", default-features = false } hyper-proxy = { version = "0.9.1", default-features = false, features = ["openssl-tls"] } indexmap.workspace = true -inventory.workspace = true ipnet = { version = "2", default-features = false, features = ["serde", "std"] } lookup = { package = "vector-lookup", path = "../vector-lookup" } metrics.workspace = true diff --git a/lib/vector-top/Cargo.toml b/lib/vector-top/Cargo.toml index 869fec71484f1..3ef9da32b6594 100644 --- a/lib/vector-top/Cargo.toml +++ b/lib/vector-top/Cargo.toml @@ -6,16 +6,11 @@ edition = "2024" publish = false [dependencies] -clap.workspace = true chrono.workspace = true -exitcode.workspace = true futures.workspace = true -futures-util = { workspace = true, features = ["alloc"] } glob.workspace = true -indoc.workspace = true tokio = { workspace = true, features = ["full"] } tokio-stream = { workspace = true, features = ["net", "sync", "time"] } -url.workspace = true humantime = { version = "2.2.0", default-features = false } crossterm = { version = "0.29.0", default-features = false, features = ["event-stream", "windows"] } unit-prefix = { version = "0.5.2", default-features = false, features = ["std"] } diff --git a/lib/vector-vrl/dnstap-parser/Cargo.toml b/lib/vector-vrl/dnstap-parser/Cargo.toml index 6e30f22732fd9..11f9e13930a91 100644 --- a/lib/vector-vrl/dnstap-parser/Cargo.toml +++ b/lib/vector-vrl/dnstap-parser/Cargo.toml @@ -15,16 +15,15 @@ hickory-proto.workspace = true prost.workspace = true snafu.workspace = true tracing.workspace = true -vector-config.workspace = true vector-common = { path = "../../vector-common" } vector-lookup = { path = "../../vector-lookup", features = ["test"] } vector-core = { path = "../../vector-core" } vrl.workspace = true -[build-dependencies] -prost-build.workspace = true - [dev-dependencies] anyhow.workspace = true chrono-tz.workspace = true pastey.workspace = true + +[build-dependencies] +prost-build.workspace = true diff --git a/lib/vector-vrl/web-playground/Cargo.toml b/lib/vector-vrl/web-playground/Cargo.toml index 59db0427b3698..75ac022547e71 100644 --- a/lib/vector-vrl/web-playground/Cargo.toml +++ b/lib/vector-vrl/web-playground/Cargo.toml @@ -22,7 +22,6 @@ serde.workspace = true web-sys = { version = "0.3", features = ["Window", "Performance"] } gloo-utils = { version = "0.2", features = ["serde"] } vector-vrl-functions.workspace = true -enrichment = { path = "../enrichment" } # Required per https://docs.rs/getrandom/latest/getrandom/#webassembly-support getrandom = { version = "0.2.15", features = ["js"] } getrandom_v04 = { package = "getrandom", version = "0.4", features = ["wasm_js"] }