diff --git a/CHANGELOG.md b/CHANGELOG.md index 688e623..fb4d2f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), ### Added - The `iocaine_garbage_served` metric will have the same labels applied to it as `iocaine_requests_total`. +- When metrics are enabled, process metrics such as CPU seconds used, memory usage, etc, are also emitted. ## [1.0.0] - 2025-03-01 diff --git a/Cargo.lock b/Cargo.lock index 0da3a63..4315b95 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -17,18 +17,6 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "once_cell", - "version_check", - "zerocopy 0.7.35", -] - [[package]] name = "aho-corasick" version = "1.1.3" @@ -147,31 +135,6 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" -[[package]] -name = "aws-lc-rs" -version = "1.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2b7ddaa2c56a367ad27a094ad8ef4faacf8a617c2575acb2ba88949df999ca" -dependencies = [ - "aws-lc-sys", - "paste", - "zeroize", -] - -[[package]] -name = "aws-lc-sys" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71b2ddd3ada61a305e1d8bb6c005d1eaa7d14d903681edfc400406d523a9b491" -dependencies = [ - "bindgen", - "cc", - "cmake", - "dunce", - "fs_extra", - "paste", -] - [[package]] name = "axum" version = "0.7.9" @@ -300,29 +263,6 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" -[[package]] -name = "bindgen" -version = "0.69.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" -dependencies = [ - "bitflags", - "cexpr", - "clang-sys", - "itertools 0.12.1", - "lazy_static", - "lazycell", - "log", - "prettyplease", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn", - "which", -] - [[package]] name = "bitflags" version = "2.6.0" @@ -348,12 +288,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bumpalo" -version = "3.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" - [[package]] name = "bytemuck" version = "1.20.0" @@ -372,43 +306,12 @@ version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" -[[package]] -name = "cc" -version = "1.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8293772165d9345bdaaa39b45b2109591e63fe5e6fbc23c6ff930a048aa310b" -dependencies = [ - "jobserver", - "libc", - "shlex", -] - -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - [[package]] name = "cfg-if" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "clang-sys" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" -dependencies = [ - "glob", - "libc", - "libloading", -] - [[package]] name = "clap" version = "4.5.23" @@ -449,15 +352,6 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" -[[package]] -name = "cmake" -version = "0.1.53" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e24a03c8b52922d68a1589ad61032f2c1aa5a8158d2aa0d93c6e9534944bbad6" -dependencies = [ - "cc", -] - [[package]] name = "colorchoice" version = "1.0.3" @@ -503,22 +397,6 @@ dependencies = [ "tracing-subscriber", ] -[[package]] -name = "core-foundation" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" - [[package]] name = "cpufeatures" version = "0.2.16" @@ -546,15 +424,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "crossbeam-epoch" -version = "0.9.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "crossbeam-utils" version = "0.8.20" @@ -647,12 +516,6 @@ dependencies = [ "crypto-common", ] -[[package]] -name = "dunce" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" - [[package]] name = "either" version = "1.13.0" @@ -714,12 +577,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "foldhash" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f" - [[package]] name = "form_urlencoded" version = "1.2.1" @@ -729,12 +586,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "fs_extra" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" - [[package]] name = "futures-channel" version = "0.3.31" @@ -813,12 +664,6 @@ version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" -[[package]] -name = "glob" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" - [[package]] name = "globset" version = "0.4.15" @@ -880,9 +725,6 @@ name = "hashbrown" version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" -dependencies = [ - "foldhash", -] [[package]] name = "hdrhistogram" @@ -904,13 +746,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] -name = "home" -version = "0.5.11" +name = "hex" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf" -dependencies = [ - "windows-sys 0.59.0", -] +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "http" @@ -985,24 +824,6 @@ dependencies = [ "want", ] -[[package]] -name = "hyper-rustls" -version = "0.27.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2" -dependencies = [ - "futures-util", - "http", - "hyper", - "hyper-util", - "rustls", - "rustls-native-certs", - "rustls-pki-types", - "tokio", - "tokio-rustls", - "tower-service", -] - [[package]] name = "hyper-timeout" version = "0.5.2" @@ -1078,8 +899,7 @@ dependencies = [ "figment", "figment_file_provider_adapter", "handlebars", - "metrics", - "metrics-exporter-prometheus", + "prometheus", "rand 0.9.0", "rand_chacha 0.9.0", "regex", @@ -1093,27 +913,12 @@ dependencies = [ "tracing-subscriber", ] -[[package]] -name = "ipnet" -version = "2.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" - [[package]] name = "is_terminal_polyfill" version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.13.0" @@ -1129,59 +934,34 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" -[[package]] -name = "jobserver" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" -dependencies = [ - "libc", -] - -[[package]] -name = "js-sys" -version = "0.3.77" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" -dependencies = [ - "once_cell", - "wasm-bindgen", -] - [[package]] name = "lazy_static" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - [[package]] name = "libc" version = "0.2.168" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d" -[[package]] -name = "libloading" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" -dependencies = [ - "cfg-if", - "windows-targets", -] - [[package]] name = "linux-raw-sys" version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + [[package]] name = "log" version = "0.4.22" @@ -1215,53 +995,6 @@ version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" -[[package]] -name = "metrics" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a7deb012b3b2767169ff203fadb4c6b0b82b947512e5eb9e0b78c2e186ad9e3" -dependencies = [ - "ahash", - "portable-atomic", -] - -[[package]] -name = "metrics-exporter-prometheus" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd7399781913e5393588a8d8c6a2867bf85fb38eaf2502fdce465aad2dc6f034" -dependencies = [ - "base64 0.22.1", - "http-body-util", - "hyper", - "hyper-rustls", - "hyper-util", - "indexmap 2.7.0", - "ipnet", - "metrics", - "metrics-util", - "quanta", - "thiserror 1.0.69", - "tokio", - "tracing", -] - -[[package]] -name = "metrics-util" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbd4884b1dd24f7d6628274a2f5ae22465c337c5ba065ec9b6edccddf8acc673" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", - "hashbrown 0.15.2", - "metrics", - "quanta", - "rand 0.8.5", - "rand_xoshiro", - "sketches-ddsketch", -] - [[package]] name = "mime" version = "0.3.17" @@ -1353,12 +1086,6 @@ version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - [[package]] name = "overload" version = "0.1.1" @@ -1366,10 +1093,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] -name = "paste" -version = "1.0.15" +name = "parking_lot" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets", +] [[package]] name = "pear" @@ -1477,12 +1221,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "portable-atomic" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6" - [[package]] name = "ppv-lite86" version = "0.2.20" @@ -1492,16 +1230,6 @@ dependencies = [ "zerocopy 0.7.35", ] -[[package]] -name = "prettyplease" -version = "0.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033" -dependencies = [ - "proc-macro2", - "syn", -] - [[package]] name = "proc-macro2" version = "1.0.92" @@ -1524,6 +1252,46 @@ dependencies = [ "yansi", ] +[[package]] +name = "procfs" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4" +dependencies = [ + "bitflags", + "hex", + "lazy_static", + "procfs-core", + "rustix", +] + +[[package]] +name = "procfs-core" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29" +dependencies = [ + "bitflags", + "hex", +] + +[[package]] +name = "prometheus" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1" +dependencies = [ + "cfg-if", + "fnv", + "lazy_static", + "libc", + "memchr", + "parking_lot", + "procfs", + "protobuf", + "thiserror 1.0.69", +] + [[package]] name = "prost" version = "0.13.4" @@ -1541,7 +1309,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "157c5a9d7ea5c2ed2d9fb8f495b64759f7816c7eaea54ba3978f0d63000162e3" dependencies = [ "anyhow", - "itertools 0.13.0", + "itertools", "proc-macro2", "quote", "syn", @@ -1557,19 +1325,10 @@ dependencies = [ ] [[package]] -name = "quanta" -version = "0.12.5" +name = "protobuf" +version = "2.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bd1fe6824cea6538803de3ff1bc0cf3949024db3d43c9643024bfb33a807c0e" -dependencies = [ - "crossbeam-utils", - "libc", - "once_cell", - "raw-cpuid", - "wasi 0.11.0+wasi-snapshot-preview1", - "web-sys", - "winapi", -] +checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" [[package]] name = "quote" @@ -1642,19 +1401,10 @@ dependencies = [ ] [[package]] -name = "rand_xoshiro" -version = "0.6.0" +name = "redox_syscall" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" -dependencies = [ - "rand_core 0.6.4", -] - -[[package]] -name = "raw-cpuid" -version = "11.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6928fa44c097620b706542d428957635951bade7143269085389d42c8a4927e" +checksum = "0b8c0c260b63a8219631167be35e6a988e9554dbd323f8bd08439c8ed1302bd1" dependencies = [ "bitflags", ] @@ -1703,21 +1453,6 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" -[[package]] -name = "ring" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" -dependencies = [ - "cc", - "cfg-if", - "getrandom 0.2.15", - "libc", - "spin", - "untrusted", - "windows-sys 0.52.0", -] - [[package]] name = "rust-embed" version = "8.5.0" @@ -1759,12 +1494,6 @@ version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - [[package]] name = "rustix" version = "0.38.43" @@ -1778,50 +1507,6 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "rustls" -version = "0.23.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b" -dependencies = [ - "aws-lc-rs", - "once_cell", - "rustls-pki-types", - "rustls-webpki", - "subtle", - "zeroize", -] - -[[package]] -name = "rustls-native-certs" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3" -dependencies = [ - "openssl-probe", - "rustls-pki-types", - "schannel", - "security-framework", -] - -[[package]] -name = "rustls-pki-types" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37" - -[[package]] -name = "rustls-webpki" -version = "0.102.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" -dependencies = [ - "aws-lc-rs", - "ring", - "rustls-pki-types", - "untrusted", -] - [[package]] name = "rustversion" version = "1.0.18" @@ -1844,36 +1529,10 @@ dependencies = [ ] [[package]] -name = "schannel" -version = "0.1.27" +name = "scopeguard" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" -dependencies = [ - "windows-sys 0.59.0", -] - -[[package]] -name = "security-framework" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32" -dependencies = [ - "core-foundation-sys", - "libc", -] +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" @@ -1968,12 +1627,6 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - [[package]] name = "signal-hook-registry" version = "1.4.2" @@ -1983,12 +1636,6 @@ dependencies = [ "libc", ] -[[package]] -name = "sketches-ddsketch" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e9a774a6c28142ac54bb25d25562e6bcf957493a184f15ad4eebccb23e410a" - [[package]] name = "slab" version = "0.4.9" @@ -2014,24 +1661,12 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" - [[package]] name = "strsim" version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" -[[package]] -name = "subtle" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" - [[package]] name = "syn" version = "2.0.90" @@ -2128,16 +1763,6 @@ dependencies = [ "syn", ] -[[package]] -name = "tokio-rustls" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37" -dependencies = [ - "rustls", - "tokio", -] - [[package]] name = "tokio-stream" version = "0.1.17" @@ -2398,12 +2023,6 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - [[package]] name = "utf8parse" version = "0.2.2" @@ -2456,85 +2075,6 @@ dependencies = [ "wit-bindgen-rt", ] -[[package]] -name = "wasm-bindgen" -version = "0.2.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" -dependencies = [ - "cfg-if", - "once_cell", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" -dependencies = [ - "bumpalo", - "log", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "web-sys" -version = "0.3.77" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix", -] - [[package]] name = "winapi" version = "0.3.9" @@ -2712,9 +2252,3 @@ dependencies = [ "quote", "syn", ] - -[[package]] -name = "zeroize" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" diff --git a/Cargo.toml b/Cargo.toml index 79c2aa1..b0e143c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,8 +20,7 @@ figment = { version = "0.10.19", features = ["toml", "env"] } figment_file_provider_adapter = "0.1.1" handlebars = { version = "6.3.0", features = ["dir_source", "rust-embed"] } - metrics = "0.24.1" - metrics-exporter-prometheus = "0.16.2" + prometheus = { version = "0.13.4", features = ["process"] } rand = "0.9.0" rand_chacha = "0.9.0" regex = "1.11.1" diff --git a/src/app.rs b/src/app.rs index c628a3c..9f6dfa8 100644 --- a/src/app.rs +++ b/src/app.rs @@ -7,7 +7,6 @@ use anyhow::Result; use axum::{ extract::{Path, State}, http::StatusCode, - middleware, response::{Html, IntoResponse, Response}, routing::get, Router, @@ -15,11 +14,18 @@ use axum::{ use std::sync::Arc; use crate::{ - assembled_statistical_sequences::AssembledStatisticalSequences, config::Config, - garglebargle::GargleBargle, tenx_programmer, wurstsalat_generator_pro::WurstsalatGeneratorPro, + assembled_statistical_sequences::AssembledStatisticalSequences, + config::Config, + garglebargle::GargleBargle, + tenx_programmer::{TenXProgrammer, TenXProgrammerCounters}, + wurstsalat_generator_pro::WurstsalatGeneratorPro, }; -pub type StatefulIocaine = Arc; +#[derive(Debug, Clone)] +pub struct IocaineState { + pub iocaine: Arc, + pub counters: Option, +} #[derive(Debug)] pub struct Iocaine { @@ -45,45 +51,48 @@ impl Iocaine { }) } - fn main_app(self) -> Router { - let state: StatefulIocaine = Arc::new(self); + fn main_app(self, counters: Option) -> Router { + let state = IocaineState { + iocaine: Arc::new(self), + counters, + }; - let mut app = Router::new() + Router::new() .route("/", get(poison)) .route("/{*path}", get(poison)) - .layer(tower_http::trace::TraceLayer::new_for_http()); - - if state.config.metrics.enable { - app = app.route_layer(middleware::from_fn_with_state( - state.clone(), - tenx_programmer::track_metrics, - )); - } - - app.with_state(state) + .layer(tower_http::trace::TraceLayer::new_for_http()) + .with_state(state) } - async fn start_main_server(self) -> std::result::Result<(), std::io::Error> { + async fn start_server(self) -> std::result::Result<(), std::io::Error> { let bind = &self.config.server.bind.clone(); + let metrics_bind = self.config.metrics.bind.clone(); + let metrics_enabled = self.config.metrics.enable; - let app = self.main_app(); + let metrics = TenXProgrammer::new(&self.config.metrics); + + let app = self.main_app(metrics.as_ref().map(|v| v.counters.clone())); let listener = tokio::net::TcpListener::bind(bind).await?; - axum::serve(listener, app) - .with_graceful_shutdown(shutdown_signal()) - .await + let main_server = axum::serve(listener, app).with_graceful_shutdown(shutdown_signal()); + + if metrics_enabled { + let metrics_listener = tokio::net::TcpListener::bind(metrics_bind).await?; + let metrics_app = metrics.unwrap().app(); + + let metrics_server = axum::serve(metrics_listener, metrics_app) + .with_graceful_shutdown(shutdown_signal()); + + let _ = tokio::join!(main_server, metrics_server); + + Ok(()) + } else { + Ok(main_server.await?) + } } pub async fn run(self) -> Result<()> { - if self.config.metrics.enable { - let metrics_bind = &self.config.metrics.bind.clone(); - let metrics_server = tenx_programmer::start_metrics_server(metrics_bind.to_string()); - let (main_server, _metrics_server) = - tokio::join!(self.start_main_server(), metrics_server); - Ok(main_server?) - } else { - let main_server = self.start_main_server().await; - Ok(main_server?) - } + self.start_server().await.unwrap(); + Ok(()) } } @@ -109,21 +118,23 @@ pub async fn shutdown_signal() { async fn poison( headers: axum::http::HeaderMap, - State(iocaine): State, + State(state): State, path: Option>, ) -> std::result::Result, AppError> { let default_host = axum::http::HeaderValue::from_static(""); let host = headers.get("host").unwrap_or(&default_host).to_str()?; let path = path.unwrap_or(Path("/".to_string())); - let garbage = AssembledStatisticalSequences::generate(&iocaine, host, &path)?; + let garbage = AssembledStatisticalSequences::generate(&state.iocaine, host, &path)?; - if iocaine.config.metrics.enable { - tenx_programmer::add_garbage_metrics( - &iocaine.config.metrics, - &headers, - garbage.len() as u64, - )?; + if let Some(counters) = state.counters { + let labels = TenXProgrammer::build_label_values(&state.iocaine.config.metrics, &headers)?; + + counters.request_counter.with_label_values(&labels).inc(); + counters + .garbage_served_counter + .with_label_values(&labels) + .inc_by(garbage.len() as u64); } Ok(Html(garbage)) @@ -155,9 +166,3 @@ impl From for AppError { Self(e.into()) } } - -impl From for AppError { - fn from(e: metrics_exporter_prometheus::BuildError) -> Self { - Self(e.into()) - } -} diff --git a/src/tenx_programmer.rs b/src/tenx_programmer.rs index 0a5c9fd..2b8675f 100644 --- a/src/tenx_programmer.rs +++ b/src/tenx_programmer.rs @@ -3,98 +3,135 @@ // // SPDX-License-Identifier: MIT -use axum::{ - body::Body, - extract::{Request, State}, - middleware::Next, - response::Response, - routing::get, - Router, -}; -use metrics_exporter_prometheus::PrometheusBuilder; -use std::time::{SystemTime, UNIX_EPOCH}; +use axum::{routing::get, Router}; use crate::{ - app::{shutdown_signal, AppError, StatefulIocaine}, + app::AppError, config::{MetricsConfig, MetricsLabel}, }; -fn build_labels( - config: &MetricsConfig, - headers: &axum::http::HeaderMap, -) -> Result, AppError> { - let mut labels = Vec::new(); - if config.labels.contains(&MetricsLabel::Host) { - if let Some(host) = headers.get("host") { - let host = host.to_str()?.to_string(); - labels.push(("host", host)); +use prometheus::{Encoder, IntCounterVec, Opts, Registry, TextEncoder}; + +#[derive(Debug, Clone)] +pub struct TenXProgrammer { + pub registry: Registry, + pub counters: TenXProgrammerCounters, +} + +#[derive(Debug, Clone)] +pub struct TenXProgrammerCounters { + pub request_counter: IntCounterVec, + pub garbage_served_counter: IntCounterVec, +} + +impl TenXProgrammer { + fn build_label_names(config: &MetricsConfig) -> Vec<&'static str> { + let mut labels = Vec::new(); + + if config.labels.contains(&MetricsLabel::Host) { + labels.push("host"); } + if config.labels.contains(&MetricsLabel::UserAgent) { + labels.push("user_agent"); + } + if config.labels.contains(&MetricsLabel::UserAgentGroup) { + labels.push("user_agent_group"); + } + + labels } - if config.labels.contains(&MetricsLabel::UserAgent) - || config.labels.contains(&MetricsLabel::UserAgentGroup) - { - if let Some(ua) = headers.get("user-agent") { - let user_agent = ua.to_str()?.to_string(); + pub fn build_label_values<'a>( + config: &'a MetricsConfig, + headers: &'a axum::http::HeaderMap, + ) -> Result, AppError> { + let mut values = Vec::new(); + + if config.labels.contains(&MetricsLabel::Host) { + if let Some(host) = headers.get("host") { + let host = host.to_str()?; + values.push(host); + } else { + values.push(""); + } + } + + if config.labels.contains(&MetricsLabel::UserAgent) + || config.labels.contains(&MetricsLabel::UserAgentGroup) + { + let ua = match headers.get("user-agent") { + Some(agent) => agent.to_str()?, + _ => "", + }; if config.labels.contains(&MetricsLabel::UserAgent) { - labels.push(("user-agent", user_agent.clone())); + values.push(ua); } - if config.labels.contains(&MetricsLabel::UserAgentGroup) { - if let Some(group) = config + let group = config .agent_group .iter() - .find(|agent_group_config| agent_group_config.agent.is_match(&user_agent)) - { - labels.push(("user-agent-group", group.group.clone())); - } + .find(|agent_group_config| agent_group_config.agent.is_match(ua)); + + let group = match group { + Some(cfg) => &cfg.group, + _ => "", + }; + values.push(group); } } + + Ok(values) } - Ok(labels) -} - -pub fn add_garbage_metrics( - config: &MetricsConfig, - headers: &axum::http::HeaderMap, - garbage: u64, -) -> Result<(), AppError> { - let labels = build_labels(config, headers)?; - - metrics::counter!("iocaine_garbage_served", &labels).increment(garbage); - - Ok(()) -} - -pub async fn track_metrics( - State(iocaine): State, - req: Request, - next: Next, -) -> Result, AppError> { - let headers = req.headers().clone(); - let response = next.run(req).await; - - let labels = build_labels(&iocaine.config.metrics, &headers)?; - - metrics::counter!("iocaine_requests_total", &labels).increment(1); - - Ok(response) -} - -pub async fn start_metrics_server(metrics_bind: String) -> std::result::Result<(), AppError> { - let metrics_listener = tokio::net::TcpListener::bind(metrics_bind).await?; - let recorder_handle = PrometheusBuilder::new().install_recorder()?; - let app = Router::new().route("/metrics", get(|| async move { recorder_handle.render() })); - - let ts = SystemTime::now() - .duration_since(UNIX_EPOCH) - .expect("Time went backwards"); - let labels = [("service", "iocaine".to_string())]; - metrics::gauge!("process_start_time_seconds", &labels).set(ts); - - Ok(axum::serve(metrics_listener, app) - .with_graceful_shutdown(shutdown_signal()) - .await?) + pub fn new(config: &MetricsConfig) -> Option { + if !config.enable { + return None; + } + + let labels = Self::build_label_names(config); + let registry = Registry::new(); + + let request_counter_opts = + Opts::new("iocaine_requests_total", "Total number of requests served"); + let request_counter = IntCounterVec::new(request_counter_opts, &labels).unwrap(); + registry + .register(Box::new(request_counter.clone())) + .unwrap(); + + let garbage_served_counter_opts = Opts::new( + "iocaine_garbage_served", + "Total amount of garbage served (in bytes)", + ); + let garbage_served_counter = + IntCounterVec::new(garbage_served_counter_opts, &labels).unwrap(); + registry + .register(Box::new(garbage_served_counter.clone())) + .unwrap(); + + Some(Self { + registry, + counters: TenXProgrammerCounters { + request_counter, + garbage_served_counter, + }, + }) + } + + pub fn app(self) -> Router { + Router::new().route( + "/metrics", + get(|| async move { + let encoder = TextEncoder::new(); + let mut buffer = Vec::::new(); + + let metrics = self.registry.gather(); + encoder.encode(&metrics, &mut buffer).unwrap(); + let metrics = prometheus::gather(); + encoder.encode(&metrics, &mut buffer).unwrap(); + + String::from_utf8(buffer).unwrap() + }), + ) + } }