diff --git a/bottlecap/Cargo.lock b/bottlecap/Cargo.lock index c1fa91401..3d7e4c4c0 100644 --- a/bottlecap/Cargo.lock +++ b/bottlecap/Cargo.lock @@ -411,16 +411,7 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" dependencies = [ - "bit-vec 0.6.3", -] - -[[package]] -name = "bit-set" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3" -dependencies = [ - "bit-vec 0.8.0", + "bit-vec", ] [[package]] @@ -429,12 +420,6 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" -[[package]] -name = "bit-vec" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" - [[package]] name = "bitflags" version = "1.3.2" @@ -493,7 +478,6 @@ dependencies = [ "datadog-opentelemetry", "datadog-protos", "datadog-serverless-logging", - "ddsketch-agent", "dogstatsd", "figment", "flate2", @@ -509,9 +493,7 @@ dependencies = [ "hyper-http-proxy", "hyper-rustls", "hyper-util", - "indexmap", "itertools 0.14.0", - "lazy_static", "libdd-capabilities", "libdd-common", "libdd-trace-normalization", @@ -521,7 +503,6 @@ dependencies = [ "libdd-trace-utils", "libddwaf", "libddwaf-sys", - "log", "mime", "mock_instant", "multipart", @@ -529,7 +510,6 @@ dependencies = [ "opentelemetry-proto", "opentelemetry-semantic-conventions 0.30.0", "ordered_hash_map", - "proptest", "prost 0.14.3", "rand 0.8.6", "regex", @@ -541,7 +521,6 @@ dependencies = [ "rustls-pki-types", "rustls-webpki", "serde", - "serde-aux", "serde_bytes", "serde_html_form", "serde_json", @@ -1974,7 +1953,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55cb077ad656299f160924eb2912aa147d7339ea7d69e1b5517326fdcec3c1ca" dependencies = [ "ascii-canvas", - "bit-set 0.5.3", + "bit-set", "ena", "itertools 0.11.0", "lalrpop-util", @@ -3034,16 +3013,12 @@ version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b45fcc2344c680f5025fe57779faef368840d0bd1f42f216291f0dc4ace4744" dependencies = [ - "bit-set 0.8.0", - "bit-vec 0.8.0", "bitflags 2.11.0", "num-traits", "rand 0.9.4", "rand_chacha 0.9.0", "rand_xorshift", "regex-syntax", - "rusty-fork", - "tempfile", "unarray", ] @@ -3665,18 +3640,6 @@ version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" -[[package]] -name = "rusty-fork" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc6bf79ff24e648f6da1f8d1f011e9cac26491b619e6b9280f2b47f1774e6ee2" -dependencies = [ - "fnv", - "quick-error", - "tempfile", - "wait-timeout", -] - [[package]] name = "ryu" version = "1.0.23" @@ -4679,15 +4642,6 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" -[[package]] -name = "wait-timeout" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ac3b126d3914f9849036f826e054cbabdc8519970b8998ddaf3b5bd3c65f11" -dependencies = [ - "libc", -] - [[package]] name = "walkdir" version = "2.5.0" diff --git a/bottlecap/Cargo.toml b/bottlecap/Cargo.toml index 0e7513b34..ec3238011 100644 --- a/bottlecap/Cargo.toml +++ b/bottlecap/Cargo.toml @@ -4,6 +4,16 @@ version = "0.1.0" edition = "2024" publish = false +# Read by cargo-machete (`cargo machete` in bottlecap/). These entries are version bounds on +# transitive crates, a crate reached only through a re-export (aws-lc-rs via +# `rustls::crypto`), a use cargo-machete cannot see (serde_bytes in a +# `#[serde(with = "...")]` string), or a dependency listed only to enable a +# feature (libddwaf-sys). Keep the reason next to the dependency. +# `time` is also only a version bound, but cargo-machete counts `std::time::` +# as a use, so listing it here triggers an "ignored but used" warning. +[package.metadata.cargo-machete] +ignored = ["aws-lc-rs", "libddwaf-sys", "rustls-native-certs", "rustls-webpki", "serde_bytes"] + [dependencies] anyhow = { version = "1.0", default-features = false } async-trait = { version = "0.1", default-features = false } @@ -18,8 +28,6 @@ hyper-util = { version = "0.1.16", features = ["http1", "client", "client-legacy http-body = { version = "1", default-features = false } http-body-util = { version = "0.1", default-features = false } itertools = { version = "0.14", default-features = false, features = ["use_std"] } -lazy_static = { version = "1.5", default-features = false } -log = { version = "0.4", default-features = false } mime = { version = "0.3", default-features = false } multipart = { version = "0.18", default-features = false, features = ["server"] } nix = { version = "0.26", default-features = false, features = ["feature", "fs"] } @@ -62,7 +70,6 @@ tonic = { version = "0.14", features = ["transport", "codegen", "server", "chann tonic-types = { version = "0.14", default-features = false } zstd = { version = "0.14.3", default-features = false } futures = { version = "0.3.31", default-features = false } -serde-aux = { version = "4.7", default-features = false } serde_html_form = { version = "0.2", default-features = false } opentelemetry-proto = { version = "0.32.0", features = ["trace", "with-serde", "gen-tonic"] } opentelemetry-semantic-conventions = { version = "0.30", features = ["semconv_experimental"] } @@ -76,14 +83,12 @@ tower-http = { version = "0.6.6", default-features = false, features = ["limit"] hyper-http-proxy = { version = "1.1.0", default-features = false, features = [ "rustls-tls-webpki-roots", ] } -indexmap = {version = "2.11.0", default-features = false} # If you are adding or updating a datadog-owned code dependency, please ensure # that it has a clippy.toml rule for disallowing the reqwest::Client::builder # method in favor of our # datadog_fips::reqwest_adapter::create_reqwest_client_builder. An example can # be found in the clippy.toml file adjacent to this Cargo.toml. datadog-protos = { version = "0.1.0", default-features = false, git = "https://github.com/DataDog/saluki/", rev = "f863626dbfe3c59bb390985fa6530b0621c2a0a2"} -ddsketch-agent = { version = "0.1.0", default-features = false, git = "https://github.com/DataDog/saluki/", rev = "f863626dbfe3c59bb390985fa6530b0621c2a0a2"} # Pin the libdd crates used by Bottlecap's trace pipeline to the release line # required by serverless-components PR #196. libdd-capabilities = "4.0.1" @@ -105,7 +110,6 @@ libddwaf-sys = { version = "2.1.0", git = "https://github.com/DataDog/libddwaf-r [dev-dependencies] figment = { version = "0.10", default-features = false, features = ["yaml", "env", "test"] } -proptest = "1.4" httpmock = "0.7" tower = { version = "0.5", features = ["util"] } mock_instant = "0.6" diff --git a/bottlecap/LICENSE-3rdparty.csv b/bottlecap/LICENSE-3rdparty.csv index 0f2fe1353..6682f5859 100644 --- a/bottlecap/LICENSE-3rdparty.csv +++ b/bottlecap/LICENSE-3rdparty.csv @@ -14,8 +14,6 @@ aws-lc-sys,https://github.com/aws/aws-lc-rs,ISC AND (Apache-2.0 OR ISC) AND Apac axum,https://github.com/tokio-rs/axum,MIT,The axum Authors axum-core,https://github.com/tokio-rs/axum,MIT,The axum-core Authors base64,https://github.com/marshallpierce/rust-base64,MIT OR Apache-2.0,Marshall Pierce -bit-set,https://github.com/contain-rs/bit-set,Apache-2.0 OR MIT,Alexis Beingessner -bit-vec,https://github.com/contain-rs/bit-vec,Apache-2.0 OR MIT,Alexis Beingessner bitflags,https://github.com/bitflags/bitflags,MIT OR Apache-2.0,The Rust Project Developers block-buffer,https://github.com/RustCrypto/utils,MIT OR Apache-2.0,RustCrypto Developers borrow-or-share,https://github.com/yescallop/borrow-or-share,MIT-0,Scallop Ye @@ -225,7 +223,6 @@ rustls-platform-verifier,https://github.com/rustls/rustls-platform-verifier,MIT rustls-platform-verifier-android,https://github.com/rustls/rustls-platform-verifier,MIT OR Apache-2.0,The rustls-platform-verifier-android Authors rustls-webpki,https://github.com/rustls/webpki,ISC,The rustls-webpki Authors rustversion,https://github.com/dtolnay/rustversion,MIT OR Apache-2.0,David Tolnay -rusty-fork,https://github.com/altsysrq/rusty-fork,MIT OR Apache-2.0,Jason Lingle ryu,https://github.com/dtolnay/ryu,Apache-2.0 OR BSL-1.0,David Tolnay safemem,https://github.com/abonander/safemem,MIT OR Apache-2.0,Austin Bonander schannel,https://github.com/steffengy/schannel-rs,MIT,"Steven Fackler , Steffen Butzer " @@ -308,7 +305,6 @@ utf8_iter,https://github.com/hsivonen/utf8_iter,Apache-2.0 OR MIT,Henri Sivonen uuid,https://github.com/uuid-rs/uuid,Apache-2.0 OR MIT,"Ashley Mannix, Dylan DPC, Hunar Roop Kahlon" valuable,https://github.com/tokio-rs/valuable,MIT,The valuable Authors value-bag,https://github.com/sval-rs/value-bag,Apache-2.0 OR MIT,Ashley Mannix -wait-timeout,https://github.com/alexcrichton/wait-timeout,MIT OR Apache-2.0,Alex Crichton want,https://github.com/seanmonstar/want,MIT,Sean McArthur wasi,https://github.com/bytecodealliance/wasi,Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT,The Cranelift Project Developers wasip2,https://github.com/bytecodealliance/wasi-rs,Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT,The wasip2 Authors