diff --git a/Cargo.lock b/Cargo.lock index 5f611e2..6a58472 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -332,17 +332,14 @@ dependencies = [ "axum-test-helper", "base64", "bytes", - "dashmap", "envconfig", "flate2", "governor", "metrics", "metrics-exporter-prometheus", - "mockall", "rand", "rdkafka", "redis", - "redis-test", "serde", "serde_json", "serde_urlencoded", @@ -350,9 +347,7 @@ dependencies = [ "time", "tokio", "tower-http", - "tower_governor", "tracing", - "tracing-subscriber", "uuid", ] @@ -362,7 +357,6 @@ version = "0.1.0" dependencies = [ "anyhow", "assert-json-diff", - "axum 0.7.4", "capture", "envconfig", "futures", @@ -374,7 +368,6 @@ dependencies = [ "rdkafka", "reqwest", "serde_json", - "time", "tokio", "tracing", "tracing-opentelemetry", @@ -571,12 +564,6 @@ dependencies = [ "serde", ] -[[package]] -name = "difflib" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" - [[package]] name = "digest" version = "0.10.7" @@ -595,12 +582,6 @@ version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" -[[package]] -name = "downcast" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" - [[package]] name = "either" version = "1.9.0" @@ -704,15 +685,6 @@ dependencies = [ "miniz_oxide", ] -[[package]] -name = "float-cmp" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" -dependencies = [ - "num-traits", -] - [[package]] name = "flume" version = "0.11.0" @@ -764,12 +736,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "fragile" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" - [[package]] name = "futures" version = "0.3.30" @@ -1057,7 +1023,6 @@ dependencies = [ "hook-common", "http-body-util", "metrics", - "metrics-exporter-prometheus", "serde", "serde_derive", "serde_json", @@ -1079,10 +1044,8 @@ dependencies = [ "http 0.2.11", "metrics", "metrics-exporter-prometheus", - "regex", "reqwest", "serde", - "serde_derive", "serde_json", "sqlx", "thiserror", @@ -1102,21 +1065,15 @@ dependencies = [ "eyre", "futures", "hook-common", - "http-body-util", "metrics", - "metrics-exporter-prometheus", "rdkafka", - "serde", - "serde_derive", "serde_json", "sqlx", "thiserror", "time", "tokio", - "tower", "tracing", "tracing-subscriber", - "url", ] [[package]] @@ -1131,8 +1088,6 @@ dependencies = [ "http 0.2.11", "metrics", "reqwest", - "serde", - "serde_derive", "sqlx", "thiserror", "time", @@ -1590,33 +1545,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "mockall" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c84490118f2ee2d74570d114f3d0493cbf02790df303d2707606c3e14e07c96" -dependencies = [ - "cfg-if", - "downcast", - "fragile", - "lazy_static", - "mockall_derive", - "predicates", - "predicates-tree", -] - -[[package]] -name = "mockall_derive" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb" -dependencies = [ - "cfg-if", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "native-tls" version = "0.2.11" @@ -1674,12 +1602,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" -[[package]] -name = "normalize-line-endings" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" - [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -2048,36 +1970,6 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" -[[package]] -name = "predicates" -version = "2.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" -dependencies = [ - "difflib", - "float-cmp", - "itertools 0.10.5", - "normalize-line-endings", - "predicates-core", - "regex", -] - -[[package]] -name = "predicates-core" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" - -[[package]] -name = "predicates-tree" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" -dependencies = [ - "predicates-core", - "termtree", -] - [[package]] name = "proc-macro-crate" version = "1.3.1" @@ -2266,15 +2158,6 @@ dependencies = [ "url", ] -[[package]] -name = "redis-test" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aba266ca48ae66978bf439fd2ac0d7a36a8635823754e2bc73afaf9d2fc25272" -dependencies = [ - "redis", -] - [[package]] name = "redox_syscall" version = "0.4.1" @@ -2939,12 +2822,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "termtree" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" - [[package]] name = "thiserror" version = "1.0.56" @@ -3192,26 +3069,6 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" -[[package]] -name = "tower_governor" -version = "0.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6be418f6d18863291f0a7fa1da1de71495a19a54b5fb44969136f731a47e86" -dependencies = [ - "axum 0.6.20", - "forwarded-header-value", - "futures", - "futures-core", - "governor", - "http 0.2.11", - "pin-project", - "thiserror", - "tokio", - "tower", - "tower-layer", - "tracing", -] - [[package]] name = "tracing" version = "0.1.40" diff --git a/Cargo.toml b/Cargo.toml index 3aeacb8..36465f3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,7 +33,6 @@ metrics = "0.22.0" metrics-exporter-prometheus = "0.13.0" rand = "0.8.5" rdkafka = { version = "0.36.0", features = ["cmake-build", "ssl", "tracing"] } -regex = "1.10.2" reqwest = { version = "0.11" } serde = { version = "1.0", features = ["derive"] } serde_derive = { version = "1.0" } @@ -57,7 +56,6 @@ time = { version = "0.3.20", features = [ ] } tokio = { version = "1.34.0", features = ["full"] } tower = "0.4.13" -tower_governor = "0.0.4" tower-http = { version = "0.4.0", features = ["cors", "trace"] } tracing = "0.1.40" tracing-subscriber = "0.3.18" diff --git a/capture-server/Cargo.toml b/capture-server/Cargo.toml index e8aa559..3e69af7 100644 --- a/capture-server/Cargo.toml +++ b/capture-server/Cargo.toml @@ -4,13 +4,11 @@ version = "0.1.0" edition = "2021" [dependencies] -axum = { workspace = true } capture = { path = "../capture" } envconfig = { workspace = true } opentelemetry = { version = "0.21.0", features = ["trace"]} opentelemetry-otlp = "0.14.0" opentelemetry_sdk = { version = "0.21.0", features = ["trace", "rt-tokio"] } -time = { workspace = true } tokio = { workspace = true } tracing = { workspace = true } tracing-opentelemetry = "0.22.0" @@ -24,4 +22,4 @@ once_cell = "1.18.0" rand = { workspace = true } rdkafka = { workspace = true } reqwest = "0.11.22" -serde_json = { workspace = true } \ No newline at end of file +serde_json = { workspace = true } diff --git a/capture/Cargo.toml b/capture/Cargo.toml index bd8f79f..3a0c836 100644 --- a/capture/Cargo.toml +++ b/capture/Cargo.toml @@ -10,11 +10,9 @@ axum = { version = "0.6.15" } # TODO: Bring up to date with the workspace. axum-client-ip = { workspace = true } tokio = { workspace = true } tracing = { workspace = true } -tracing-subscriber = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } governor = { workspace = true } -tower_governor = { workspace = true } time = { workspace = true } tower-http = { workspace = true } bytes = { workspace = true } @@ -35,10 +33,7 @@ redis = { version = "0.23.3", features = [ "cluster-async", ] } envconfig = { workspace = true } -dashmap = "5.5.3" [dev-dependencies] assert-json-diff = { workspace = true } axum-test-helper = "0.2.0" -mockall = "0.11.2" -redis-test = "0.2.3" diff --git a/hook-api/Cargo.toml b/hook-api/Cargo.toml index 96c897c..a596e87 100644 --- a/hook-api/Cargo.toml +++ b/hook-api/Cargo.toml @@ -12,7 +12,6 @@ eyre = { workspace = true } hook-common = { path = "../hook-common" } http-body-util = { workspace = true } metrics = { workspace = true } -metrics-exporter-prometheus = { workspace = true } serde = { workspace = true } serde_derive = { workspace = true } serde_json = { workspace = true } diff --git a/hook-common/Cargo.toml b/hook-common/Cargo.toml index ea7ce2f..8ccf8dd 100644 --- a/hook-common/Cargo.toml +++ b/hook-common/Cargo.toml @@ -13,9 +13,7 @@ http = { workspace = true } metrics = { workspace = true } metrics-exporter-prometheus = { workspace = true } reqwest = { workspace = true } -regex = { workspace = true } serde = { workspace = true } -serde_derive = { workspace = true } serde_json = { workspace = true } sqlx = { workspace = true } time = { workspace = true } diff --git a/hook-janitor/Cargo.toml b/hook-janitor/Cargo.toml index 96a80eb..a29a80c 100644 --- a/hook-janitor/Cargo.toml +++ b/hook-janitor/Cargo.toml @@ -12,18 +12,12 @@ envconfig = { workspace = true } eyre = { workspace = true } futures = { workspace = true } hook-common = { path = "../hook-common" } -http-body-util = { workspace = true } metrics = { workspace = true } -metrics-exporter-prometheus = { workspace = true } rdkafka = { workspace = true } -serde = { workspace = true } -serde_derive = { workspace = true } serde_json = { workspace = true } sqlx = { workspace = true } time = { workspace = true } thiserror = { workspace = true } tokio = { workspace = true } -tower = { workspace = true } tracing = { workspace = true } tracing-subscriber = { workspace = true } -url = { workspace = true } diff --git a/hook-worker/Cargo.toml b/hook-worker/Cargo.toml index 6ed5796..cbfc143 100644 --- a/hook-worker/Cargo.toml +++ b/hook-worker/Cargo.toml @@ -12,8 +12,6 @@ hook-common = { path = "../hook-common" } http = { version = "0.2" } metrics = { workspace = true } reqwest = { workspace = true } -serde = { workspace = true } -serde_derive = { workspace = true } sqlx = { workspace = true } time = { workspace = true } thiserror = { workspace = true }