diff --git a/Cargo.lock b/Cargo.lock index 5cd683e90b..807f3aba1e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.7.7" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ "getrandom", "once_cell", @@ -68,7 +68,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" dependencies = [ - "libc 0.2.152", + "libc 0.2.149", ] [[package]] @@ -85,9 +85,9 @@ checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anyhow" -version = "1.0.79" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "assert-type-eq" @@ -103,13 +103,13 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "async-trait" -version = "0.1.77" +version = "0.1.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.38", ] [[package]] @@ -119,7 +119,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ "hermit-abi 0.1.19", - "libc 0.2.152", + "libc 0.2.149", "winapi", ] @@ -183,23 +183,29 @@ dependencies = [ "addr2line", "cc", "cfg-if", - "libc 0.2.152", + "libc 0.2.149", "miniz_oxide", - "object 0.32.2", + "object 0.32.1", "rustc-demangle", ] [[package]] name = "base64" -version = "0.21.7" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "basic-toml" -version = "0.1.8" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2db21524cad41c5591204d22d75e1970a2d1f71060214ca931dc7d5afe2c14e5" +checksum = "7bfc506e7a2370ec239e1d072507b2a80c833083699d3c6fa176fbb4de8448c6" dependencies = [ "serde", ] @@ -219,20 +225,20 @@ version = "0.66.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.4.0", "cexpr", "clang-sys", "lazy_static", "lazycell", "log", "peeking_take_while", - "prettyplease 0.2.16", + "prettyplease 0.2.15", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 2.0.48", + "syn 2.0.38", "which", ] @@ -250,9 +256,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "bitmaps" @@ -312,7 +318,7 @@ version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ - "libc 0.2.152", + "libc 0.2.149", ] [[package]] @@ -346,8 +352,10 @@ checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", + "js-sys", "num-traits", - "windows-targets 0.48.5", + "wasm-bindgen", + "windows-targets", ] [[package]] @@ -379,12 +387,12 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.7.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" +checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" dependencies = [ "glob", - "libc 0.2.152", + "libc 0.2.149", "libloading", ] @@ -405,21 +413,21 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.18" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" +checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.4.18" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" +checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" dependencies = [ "anstyle", - "clap_lex 0.6.0", + "clap_lex 0.5.1", ] [[package]] @@ -433,9 +441,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" [[package]] name = "common-multipart-rfc7578" @@ -491,19 +499,19 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.9.4" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" dependencies = [ "core-foundation-sys", - "libc 0.2.152", + "libc 0.2.149", ] [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpu-time" @@ -511,7 +519,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9e393a7668fe1fad3075085b86c781883000b4ede868f43627b34a87c8b7ded" dependencies = [ - "libc 0.2.152", + "libc 0.2.149", "winapi", ] @@ -533,7 +541,7 @@ dependencies = [ "anes", "cast", "ciborium", - "clap 4.4.18", + "clap 4.4.6", "criterion-plot", "is-terminal", "itertools", @@ -572,37 +580,46 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.11" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ + "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.5" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ + "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.18" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ + "autocfg", + "cfg-if", "crossbeam-utils", + "memoffset 0.9.0", + "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +dependencies = [ + "cfg-if", +] [[package]] name = "csv" @@ -636,7 +653,7 @@ dependencies = [ "futures", "glibc_version", "io-lifetimes", - "libc 0.2.152", + "libc 0.2.149", "memfd", "nix 0.26.4", "page_size", @@ -659,7 +676,7 @@ name = "datadog-ipc-macros" version = "0.0.1" dependencies = [ "quote", - "syn 2.0.48", + "syn 2.0.38", ] [[package]] @@ -679,9 +696,9 @@ dependencies = [ "datadog-profiling", "ddcommon 5.0.0", "env_logger", - "indexmap 2.1.0", + "indexmap 2.0.2", "lazy_static", - "libc 0.2.152", + "libc 0.2.149", "log", "once_cell", "ouroboros", @@ -711,7 +728,7 @@ dependencies = [ "hyper", "hyper-multipart-rfc7578", "indexmap 1.9.3", - "libc 0.2.152", + "libc 0.2.149", "lz4_flex", "mime", "mime_guess", @@ -721,7 +738,7 @@ dependencies = [ "serde", "serde_json", "tokio", - "tokio-util 0.7.10", + "tokio-util 0.7.9", ] [[package]] @@ -730,6 +747,7 @@ version = "0.0.1" dependencies = [ "anyhow", "bytes", + "chrono", "console-subscriber", "datadog-ipc", "datadog-ipc-macros", @@ -745,11 +763,12 @@ dependencies = [ "hyper", "io-lifetimes", "lazy_static", - "libc 0.2.152", + "libc 0.2.149", "manual_future", "nix 0.26.4", "pin-project", "prctl", + "priority-queue", "rand 0.8.5", "regex", "rmp-serde", @@ -760,8 +779,9 @@ dependencies = [ "sys-info", "tempfile", "tokio", - "tokio-util 0.7.10", + "tokio-util 0.7.9", "tracing", + "tracing-log", "tracing-subscriber", "uuid", "zwohash", @@ -779,7 +799,7 @@ dependencies = [ "ddtelemetry", "ddtelemetry-ffi", "hyper", - "libc 0.2.152", + "libc 0.2.149", "paste", "tempfile", ] @@ -789,7 +809,7 @@ name = "datadog-sidecar-macros" version = "0.0.1" dependencies = [ "quote", - "syn 2.0.48", + "syn 2.0.38", ] [[package]] @@ -909,7 +929,7 @@ dependencies = [ "serde_json", "sys-info", "tokio", - "tokio-util 0.7.10", + "tokio-util 0.7.9", "tracing", "tracing-subscriber", "uuid", @@ -922,7 +942,7 @@ dependencies = [ "ddcommon 0.0.1", "ddcommon-ffi", "ddtelemetry", - "libc 0.2.152", + "libc 0.2.149", "paste", "tempfile", ] @@ -931,7 +951,7 @@ dependencies = [ name = "ddtrace-php" version = "0.0.1" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.4.0", "cbindgen", "cc_utils", "datadog-sidecar", @@ -940,12 +960,17 @@ dependencies = [ "ddcommon-ffi", "ddtelemetry", "ddtelemetry-ffi", + "env_logger", "json", "lazy_static", + "log", "paste", "sidecar_mockgen", "spawn_worker", "tempfile", + "tracing", + "tracing-core", + "tracing-subscriber", "uuid", ] @@ -1004,7 +1029,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.38", ] [[package]] @@ -1028,12 +1053,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" dependencies = [ - "libc 0.2.152", - "windows-sys 0.52.0", + "libc 0.2.149", + "windows-sys", ] [[package]] @@ -1050,9 +1075,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", "miniz_oxide", @@ -1072,9 +1097,9 @@ checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" [[package]] name = "futures" -version = "0.3.30" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", @@ -1087,9 +1112,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -1097,15 +1122,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" dependencies = [ "futures-core", "futures-task", @@ -1114,38 +1139,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.38", ] [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-test" -version = "0.3.30" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce388237b32ac42eca0df1ba55ed3bbda4eaf005d7d4b5dbc0b20ab962928ac9" +checksum = "84af27744870a4a325fa342ce65a940dfba08957b260b790ec278c1d81490349" dependencies = [ "futures-core", "futures-executor", @@ -1160,9 +1185,9 @@ dependencies = [ [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-channel", "futures-core", @@ -1178,20 +1203,20 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", - "libc 0.2.152", + "libc 0.2.149", "wasi", ] [[package]] name = "gimli" -version = "0.28.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "glibc_version" @@ -1210,9 +1235,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "h2" -version = "0.3.24" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" dependencies = [ "bytes", "fnv", @@ -1220,10 +1245,10 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 2.1.0", + "indexmap 1.9.3", "slab", "tokio", - "tokio-util 0.7.10", + "tokio-util 0.7.9", "tracing", ] @@ -1239,22 +1264,22 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash 0.7.7", + "ahash 0.7.6", ] [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" [[package]] name = "hdrhistogram" -version = "7.5.4" +version = "7.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d" +checksum = "7f19b9f54f7c7f55e31401bb647626ce0cf0f67b0004982ce815b3ee72a02aa8" dependencies = [ - "base64", + "base64 0.13.1", "byteorder", "flate2", "nom 7.1.3", @@ -1273,14 +1298,14 @@ version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" dependencies = [ - "libc 0.2.152", + "libc 0.2.149", ] [[package]] name = "hermit-abi" -version = "0.3.4" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "hex" @@ -1290,18 +1315,18 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "home" -version = "0.5.9" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys", ] [[package]] name = "http" -version = "0.2.11" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes", "fnv", @@ -1310,9 +1335,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.6" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", "http", @@ -1339,9 +1364,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.28" +version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ "bytes", "futures-channel", @@ -1354,7 +1379,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2", + "socket2 0.4.9", "tokio", "tower-service", "tracing", @@ -1402,16 +1427,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.59" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core", + "windows", ] [[package]] @@ -1435,12 +1460,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.1", ] [[package]] @@ -1455,20 +1480,20 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.4", - "libc 0.2.152", - "windows-sys 0.48.0", + "hermit-abi 0.3.3", + "libc 0.2.149", + "windows-sys", ] [[package]] name = "is-terminal" -version = "0.4.10" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.4", + "hermit-abi 0.3.3", "rustix", - "windows-sys 0.52.0", + "windows-sys", ] [[package]] @@ -1482,15 +1507,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "js-sys" -version = "0.3.67" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -1521,18 +1546,18 @@ checksum = "e32a70cf75e5846d53a673923498228bbec6a8624708a9ea5645f075d6276122" [[package]] name = "libc" -version = "0.2.152" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libloading" -version = "0.8.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ "cfg-if", - "windows-sys 0.48.0", + "winapi", ] [[package]] @@ -1543,15 +1568,15 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ "autocfg", "scopeguard", @@ -1604,9 +1629,9 @@ checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[package]] name = "memchr" -version = "2.7.1" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memfd" @@ -1635,6 +1660,15 @@ dependencies = [ "autocfg", ] +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + [[package]] name = "mime" version = "0.3.17" @@ -1672,9 +1706,9 @@ version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ - "libc 0.2.152", + "libc 0.2.149", "wasi", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -1701,7 +1735,7 @@ checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ "bitflags 1.3.2", "cfg-if", - "libc 0.2.152", + "libc 0.2.149", "memoffset 0.6.5", ] @@ -1713,7 +1747,7 @@ checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ "bitflags 1.3.2", "cfg-if", - "libc 0.2.152", + "libc 0.2.149", "memoffset 0.7.1", "pin-utils", ] @@ -1724,9 +1758,9 @@ version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.4.0", "cfg-if", - "libc 0.2.152", + "libc 0.2.149", ] [[package]] @@ -1796,8 +1830,8 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.4", - "libc 0.2.152", + "hermit-abi 0.3.3", + "libc 0.2.149", ] [[package]] @@ -1813,18 +1847,18 @@ dependencies = [ [[package]] name = "object" -version = "0.32.2" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.19.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "oorandom" @@ -1894,9 +1928,9 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.6.1" +version = "6.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" +checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac" [[package]] name = "ouroboros" @@ -1919,7 +1953,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.38", ] [[package]] @@ -1934,7 +1968,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b7663cbd190cfd818d08efa8497f6cd383076688c49a391ef7c0d03cd12b561" dependencies = [ - "libc 0.2.152", + "libc 0.2.149", "winapi", ] @@ -1950,15 +1984,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", - "libc 0.2.152", + "libc 0.2.149", "redox_syscall", "smallvec", - "windows-targets 0.48.5", + "windows-targets", ] [[package]] @@ -1975,9 +2009,9 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "percent-encoding" -version = "2.3.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "perfcnt" @@ -1986,7 +2020,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ba1fd955270ca6f8bd8624ec0c4ee1a251dd3cc0cc18e1e2665ca8f5acb1501" dependencies = [ "bitflags 1.3.2", - "libc 0.2.152", + "libc 0.2.149", "mmap", "nom 4.2.3", "x86", @@ -1999,7 +2033,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.1.0", + "indexmap 2.0.2", ] [[package]] @@ -2057,7 +2091,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.38", ] [[package]] @@ -2112,7 +2146,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "059a34f111a9dee2ce1ac2826a68b24601c4298cfeb1a587c3cb493d5ab46f52" dependencies = [ - "libc 0.2.152", + "libc 0.2.149", "nix 0.27.1", ] @@ -2138,12 +2172,22 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.16" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5" +checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ "proc-macro2", - "syn 2.0.48", + "syn 2.0.38", +] + +[[package]] +name = "priority-queue" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fff39edfcaec0d64e8d0da38564fad195d2d51b680940295fcc307366e101e61" +dependencies = [ + "autocfg", + "indexmap 1.9.3", ] [[package]] @@ -2172,9 +2216,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -2285,9 +2329,9 @@ checksum = "9653c3ed92974e34c5a6e0a510864dab979760481714c172e0a34e437cb98804" [[package]] name = "quote" -version = "1.0.35" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -2299,7 +2343,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" dependencies = [ "fuchsia-cprng", - "libc 0.2.152", + "libc 0.2.149", "rand_core 0.3.1", "rdrand", "winapi", @@ -2311,7 +2355,7 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ - "libc 0.2.152", + "libc 0.2.149", "rand_chacha", "rand_core 0.6.4", ] @@ -2371,9 +2415,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.8.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -2381,9 +2425,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.1" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -2400,23 +2444,23 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "regex" -version = "1.10.2" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "d119d7c7ca818f8a53c300863d4f87566aac09943aef5b355bb83969dae75d87" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.3", - "regex-syntax 0.8.2", + "regex-automata 0.4.1", + "regex-syntax 0.8.1", ] [[package]] @@ -2430,13 +2474,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "465c6fc0621e4abc4187a2bda0937bfd4f722c2730b29562e19689ea796c9a4b" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax 0.8.1", ] [[package]] @@ -2447,9 +2491,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "56d84fdd47036b038fc80dd333d10b6aab10d5d31f4a366e20014def75328d33" [[package]] name = "remove_dir_all" @@ -2467,7 +2511,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" dependencies = [ "cc", - "libc 0.2.152", + "libc 0.2.149", "once_cell", "spin 0.5.2", "untrusted 0.7.1", @@ -2477,16 +2521,16 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.7" +version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +checksum = "9babe80d5c16becf6594aa32ad2be8fe08498e7ae60b77de8df700e67f191d7e" dependencies = [ "cc", "getrandom", - "libc 0.2.152", + "libc 0.2.149", "spin 0.9.8", "untrusted 0.9.0", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -2495,7 +2539,7 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7278a1ec8bfd4a4e07515c589f5ff7b309a373f987393aef44813d9dcf87aa3" dependencies = [ - "libc 0.2.152", + "libc 0.2.149", ] [[package]] @@ -2534,15 +2578,15 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.30" +version = "0.38.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" +checksum = "5a74ee2d7c2581cd139b42447d7d9389b889bdaad3a73f1ebb16f2a3237bb19c" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.4.0", "errno", - "libc 0.2.152", + "libc 0.2.149", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys", ] [[package]] @@ -2571,11 +2615,11 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.4" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64", + "base64 0.21.4", ] [[package]] @@ -2597,9 +2641,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "same-file" @@ -2612,11 +2656,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys 0.52.0", + "windows-sys", ] [[package]] @@ -2627,12 +2671,12 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" -version = "0.7.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "ring 0.17.7", - "untrusted 0.9.0", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -2644,7 +2688,7 @@ dependencies = [ "bitflags 1.3.2", "core-foundation", "core-foundation-sys", - "libc 0.2.152", + "libc 0.2.149", "security-framework-sys", ] @@ -2655,7 +2699,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", - "libc 0.2.152", + "libc 0.2.149", ] [[package]] @@ -2664,44 +2708,44 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "604b71b8fc267e13bb3023a2c901126c8f349393666a6d98ac1ae5729b701798" dependencies = [ - "libc 0.2.152", + "libc 0.2.149", "tokio", ] [[package]] name = "serde" -version = "1.0.195" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde_bytes" -version = "0.11.14" +version = "0.11.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" +checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.195" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.38", ] [[package]] name = "serde_json" -version = "1.0.111" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa", "ryu", @@ -2736,7 +2780,7 @@ version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" dependencies = [ - "libc 0.2.152", + "libc 0.2.149", ] [[package]] @@ -2756,9 +2800,19 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.12.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2593d31f82ead8df961d8bd23a64c2ccf2eb5dd34b0a34bfb4dd54011c72009e" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" + +[[package]] +name = "socket2" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +dependencies = [ + "libc 0.2.149", + "winapi", +] [[package]] name = "socket2" @@ -2766,8 +2820,8 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ - "libc 0.2.152", - "windows-sys 0.48.0", + "libc 0.2.149", + "windows-sys", ] [[package]] @@ -2820,9 +2874,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -2842,7 +2896,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b3a0d0aba8bf96a0e1ddfdc352fc53b3df7f39318c71854910c3c4b024ae52c" dependencies = [ "cc", - "libc 0.2.152", + "libc 0.2.149", ] [[package]] @@ -2870,7 +2924,7 @@ dependencies = [ "thiserror", "tokio", "tokio-serde", - "tokio-util 0.7.10", + "tokio-util 0.7.9", "tracing", "tracing-opentelemetry", "tracing-subscriber", @@ -2902,22 +2956,22 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.9.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", "fastrand", "redox_syscall", "rustix", - "windows-sys 0.52.0", + "windows-sys", ] [[package]] name = "termcolor" -version = "1.4.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" dependencies = [ "winapi-util", ] @@ -2930,22 +2984,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.56" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.38", ] [[package]] @@ -2998,16 +3052,16 @@ checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" dependencies = [ "backtrace", "bytes", - "libc 0.2.152", + "libc 0.2.149", "mio", "num_cpus", "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2", + "socket2 0.5.5", "tokio-macros", "tracing", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -3028,7 +3082,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.38", ] [[package]] @@ -3085,9 +3139,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" dependencies = [ "bytes", "futures-core", @@ -3115,7 +3169,7 @@ checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" dependencies = [ "async-trait", "axum", - "base64", + "base64 0.21.4", "bytes", "futures-core", "futures-util", @@ -3149,7 +3203,7 @@ dependencies = [ "rand 0.8.5", "slab", "tokio", - "tokio-util 0.7.10", + "tokio-util 0.7.9", "tower-layer", "tower-service", "tracing", @@ -3169,10 +3223,11 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ + "cfg-if", "log", "pin-project-lite", "tracing-attributes", @@ -3181,13 +3236,13 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.27" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.38", ] [[package]] @@ -3244,15 +3299,15 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.5" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "trybuild" -version = "1.0.89" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a9d3ba662913483d6722303f619e75ea10b7855b0f8e0d72799cf8621bb488f" +checksum = "196a58260a906cedb9bf6d8034b6379d0c11f552416960452f267402ceeddff1" dependencies = [ "basic-toml", "glob", @@ -3302,9 +3357,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "uuid" -version = "1.6.1" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" dependencies = [ "getrandom", ] @@ -3354,9 +3409,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.90" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -3364,24 +3419,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.90" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.38", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.90" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3389,28 +3444,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.90" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.90" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "web-sys" -version = "0.3.67" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", @@ -3422,7 +3477,7 @@ version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" dependencies = [ - "ring 0.17.7", + "ring 0.17.3", "untrusted 0.9.0", ] @@ -3470,12 +3525,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows-core" -version = "0.52.0" +name = "windows" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.52.0", + "windows-targets", ] [[package]] @@ -3484,16 +3539,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.0", + "windows-targets", ] [[package]] @@ -3502,28 +3548,13 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" -dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] @@ -3532,84 +3563,42 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" - [[package]] name = "windows_aarch64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" - [[package]] name = "windows_i686_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" -[[package]] -name = "windows_i686_gnu" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" - [[package]] name = "windows_i686_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" -[[package]] -name = "windows_i686_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" - [[package]] name = "windows_x86_64_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" - [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" - [[package]] name = "windows_x86_64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" - [[package]] name = "x86" version = "0.47.0" @@ -3648,7 +3637,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.38", ] [[package]] diff --git a/appsec/src/extension/ddappsec.c b/appsec/src/extension/ddappsec.c index 88c74e7c46..586a5b54ce 100644 --- a/appsec/src/extension/ddappsec.c +++ b/appsec/src/extension/ddappsec.c @@ -41,6 +41,8 @@ #include "tags.h" #include "user_tracking.h" +#include + #if ZTS static atomic_int _thread_count; #endif @@ -171,10 +173,12 @@ static PHP_GSHUTDOWN_FUNCTION(ddappsec) if (prev == 1) { dd_log_shutdown(); zai_config_mshutdown(); + zai_json_shutdown_bindings(); } #else dd_log_shutdown(); zai_config_mshutdown(); + zai_json_shutdown_bindings(); #endif memset(ddappsec_globals, '\0', sizeof(*ddappsec_globals)); // NOLINT diff --git a/appsec/tests/integration/src/main/groovy/com/datadog/appsec/php/docker/AppSecContainer.groovy b/appsec/tests/integration/src/main/groovy/com/datadog/appsec/php/docker/AppSecContainer.groovy index 6c3192d6b2..33c2d6b856 100644 --- a/appsec/tests/integration/src/main/groovy/com/datadog/appsec/php/docker/AppSecContainer.groovy +++ b/appsec/tests/integration/src/main/groovy/com/datadog/appsec/php/docker/AppSecContainer.groovy @@ -70,6 +70,7 @@ class AppSecContainer> extends GenericContain withEnv 'DD_TRACE_ENABLED', '1' withEnv 'DD_SERVICE', 'appsec_int_tests' withEnv 'DD_ENV', 'integration' + withEnv 'DD_TRACE_LOG_LEVEL', 'info,startup=off' withEnv 'DD_TRACE_AGENT_FLUSH_AFTER_N_REQUESTS', '0' withEnv 'DD_TRACE_AGENT_FLUSH_INTERVAL', '0' withEnv 'DD_TRACE_DEBUG', '1' diff --git a/components-rs/Cargo.toml b/components-rs/Cargo.toml index 9f856ec3b7..6678261089 100644 --- a/components-rs/Cargo.toml +++ b/components-rs/Cargo.toml @@ -18,10 +18,18 @@ spawn_worker = { path = "../libdatadog/spawn_worker" } bitflags = "2.3.3" json = "0.12.4" lazy_static = "1.4" +log = "0.4.20" +env_logger = "0.10.1" uuid = { version = "1.0", features = ["v4"] } paste = "1" tempfile = {version = "3.3"} - +tracing = { version = "0.1", default-features = false, features = ["std"] } +tracing-core = "0.1.32" +tracing-subscriber = { version = "0.3", default-features = false, features = [ + "std", + "fmt", + "env-filter", +] } [build-dependencies] cbindgen = "0.24" diff --git a/components-rs/ddtrace.h b/components-rs/ddtrace.h index 71a003be48..5be6450297 100644 --- a/components-rs/ddtrace.h +++ b/components-rs/ddtrace.h @@ -8,13 +8,19 @@ #include "telemetry.h" #include "sidecar.h" -#define ddog_Log_None (ddog_Log){ .bits = (uint32_t)0 } -#define ddog_Log_Once (ddog_Log){ .bits = (uint32_t)(1 << 0) } -#define ddog_Log_Error (ddog_Log){ .bits = (uint32_t)(1 << 1) } -#define ddog_Log_Warn (ddog_Log){ .bits = (uint32_t)(1 << 2) } -#define ddog_Log_Info (ddog_Log){ .bits = (uint32_t)(1 << 3) } -#define ddog_Log_Deprecated (ddog_Log){ .bits = (uint32_t)((1 << 4) | 1) } -#define ddog_Log_Startup (ddog_Log){ .bits = (uint32_t)(1 << 5) } +#define ddog_Log_Error (ddog_Log){ .bits = (uint32_t)1 } +#define ddog_Log_Warn (ddog_Log){ .bits = (uint32_t)2 } +#define ddog_Log_Info (ddog_Log){ .bits = (uint32_t)3 } +#define ddog_Log_Debug (ddog_Log){ .bits = (uint32_t)4 } +#define ddog_Log_Trace (ddog_Log){ .bits = (uint32_t)5 } +#define ddog_Log_Once (ddog_Log){ .bits = (uint32_t)(1 << 3) } +#define ddog_Log__Deprecated (ddog_Log){ .bits = (uint32_t)(3 | (1 << 4)) } +#define ddog_Log_Deprecated (ddog_Log){ .bits = (uint32_t)((3 | (1 << 4)) | (1 << 3)) } +#define ddog_Log_Startup (ddog_Log){ .bits = (uint32_t)(3 | (2 << 4)) } +#define ddog_Log_Startup_Warn (ddog_Log){ .bits = (uint32_t)(1 | (2 << 4)) } +#define ddog_Log_Span (ddog_Log){ .bits = (uint32_t)(4 | (3 << 4)) } +#define ddog_Log_Span_Trace (ddog_Log){ .bits = (uint32_t)(5 | (3 << 4)) } +#define ddog_Log_Hook_Trace (ddog_Log){ .bits = (uint32_t)(5 | (4 << 4)) } typedef uint64_t ddog_QueueId; @@ -127,7 +133,7 @@ typedef ddog_Bytes ddog_Uuid; extern ddog_Uuid ddtrace_runtime_id; -extern void (*ddog_log_callback)(struct ddog_Log, ddog_CharSlice); +extern void (*ddog_log_callback)(ddog_CharSlice); /** * # Safety @@ -141,13 +147,11 @@ ddog_CharSlice ddtrace_get_container_id(void); void ddtrace_set_container_cgroup_path(ddog_CharSlice path); -bool ddog_shall_log(struct ddog_Log level); +bool ddog_shall_log(struct ddog_Log category); -void ddog_set_log_category(struct ddog_Log level); +void ddog_set_error_log_level(bool once); -void ddog_parse_log_category(const ddog_CharSlice *category_names, - uintptr_t num, - bool startup_logs_by_default); +void ddog_set_log_level(ddog_CharSlice level, bool once); void ddog_log(struct ddog_Log category, ddog_CharSlice msg); @@ -158,7 +162,10 @@ bool ddtrace_detect_composer_installed_json(ddog_SidecarTransport **transport, const ddog_QueueId *queue_id, ddog_CharSlice path); -ddog_MaybeError ddog_sidecar_connect_php(ddog_SidecarTransport **connection, bool enable_telemetry); +ddog_MaybeError ddog_sidecar_connect_php(ddog_SidecarTransport **connection, + const char *error_path, + ddog_CharSlice log_level, + bool enable_telemetry); struct ddog_TelemetryActionsBuffer *ddog_sidecar_telemetry_buffer_alloc(void); diff --git a/components-rs/lib.rs b/components-rs/lib.rs index 10e04b0f91..c4cef40f3c 100644 --- a/components-rs/lib.rs +++ b/components-rs/lib.rs @@ -1,4 +1,5 @@ #![feature(allow_internal_unstable)] +#![feature(local_key_cell_methods)] pub mod log; pub mod telemetry; diff --git a/components-rs/log.rs b/components-rs/log.rs index 7108eb5580..9925cc7121 100644 --- a/components-rs/log.rs +++ b/components-rs/log.rs @@ -1,8 +1,15 @@ use std::cell::RefCell; use std::collections::BTreeSet; use std::ffi::c_char; -use std::slice; +use std::fmt::Debug; use bitflags::bitflags; +use tracing::Level; +use tracing_core::{Event, Field, LevelFilter, Subscriber}; +use tracing_subscriber::EnvFilter; +use tracing_subscriber::fmt::{FmtContext, FormatEvent, FormatFields}; +use tracing_subscriber::fmt::format::Writer; +use tracing_subscriber::registry::LookupSpan; +use tracing_subscriber::util::SubscriberInitExt; use ddcommon_ffi::CharSlice; use ddcommon_ffi::slice::AsBytes; @@ -10,105 +17,173 @@ bitflags! { #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] #[repr(C)] pub struct Log: u32 { - const None = 0; - const Once = 1 << 0; // I.e. once per request - const Error = 1 << 1; - const Warn = 1 << 2; - const Info = 1 << 3; - const Deprecated = (1 << 4) | 1 /* Once */; - const Startup = 1 << 5; - } -} - -#[macro_export] -macro_rules! log { - ($source:ident, $msg:expr) => { if ($crate::ddog_shall_log($crate::Log::$source)) { $crate::log($crate::Log::$source, $msg) } } -} - -#[allow_internal_unstable(thread_local)] -macro_rules! thread_local { - ($($tokens:tt)*) => { - #[thread_local] - $($tokens)* + const Error = 1; + const Warn = 2; + const Info = 3; + const Debug = 4; + const Trace = 5; + const Once = 1 << 3; // I.e. once per request + const _Deprecated = 3 | (1 << 4); + const Deprecated = 3 | (1 << 4) | (1 << 3) /* Once */; + const Startup = 3 | (2 << 4); + const Startup_Warn = 1 | (2 << 4); + const Span = 4 | (3 << 4); + const Span_Trace = 5 | (3 << 4); + const Hook_Trace = 5 | (4 << 4); } } #[no_mangle] #[allow(non_upper_case_globals)] -pub static mut ddog_log_callback: Option = None; +pub static mut ddog_log_callback: Option = None; // Avoid RefCell for performance -thread_local! { static mut LOG_CATEGORY: Log = Log::Once.union(Log::Error); } std::thread_local! { static LOGGED_MSGS: RefCell> = RefCell::default(); + static TRACING_GUARDS: RefCell> = RefCell::default(); +} + +macro_rules! with_target { + ($cat:ident, tracing::$p:ident!($($t:tt)*)) => { + match $cat { + Log::Error => tracing::$p!(target: "ddtrace", Level::ERROR, $($t)*), + Log::Warn => tracing::$p!(target: "ddtrace", Level::WARN, $($t)*), + Log::Info => tracing::$p!(target: "ddtrace", Level::INFO, $($t)*), + Log::Debug => tracing::$p!(target: "ddtrace", Level::DEBUG, $($t)*), + Log::Trace => tracing::$p!(target: "ddtrace", Level::TRACE, $($t)*), + Log::_Deprecated => tracing::$p!(target: "deprecated", Level::INFO, $($t)*), + Log::Startup => tracing::$p!(target: "startup", Level::INFO, $($t)*), + Log::Span => tracing::$p!(target: "span", Level::DEBUG, $($t)*), + Log::Span_Trace => tracing::$p!(target: "span", Level::TRACE, $($t)*), + Log::Hook_Trace => tracing::$p!(target: "hook", Level::TRACE, $($t)*), + _ => unreachable!() + } + } } #[no_mangle] -pub extern "C" fn ddog_shall_log(level: Log) -> bool { - unsafe { LOG_CATEGORY }.contains(level & !Log::Once) +pub extern "C" fn ddog_shall_log(category: Log) -> bool { + let category = category & !Log::Once; + with_target!(category, tracing::event_enabled!()) } -pub fn log(level: Log, msg: S) where S: AsRef { - ddog_log(level, CharSlice::from(msg.as_ref())) +pub fn log(category: Log, msg: S) where S: AsRef + tracing::Value { + let once = !(category & Log::Once).is_empty(); + let category = category & !Log::Once; + if once { + with_target!(category, tracing::event!(once = true, msg)); + } else { + with_target!(category, tracing::event!(msg)); + } } -#[no_mangle] -pub extern "C" fn ddog_set_log_category(level: Log) { - unsafe { LOG_CATEGORY = level; } +struct LogFormatter { + pub once: bool, } -#[no_mangle] -pub unsafe extern "C" fn ddog_parse_log_category(category_names: *const CharSlice, num: usize, startup_logs_by_default: bool) { - let mut categories = Log::None; - let category_names = slice::from_raw_parts(category_names, num); - - if category_names.len() == 1 { - let first_level = category_names[0].to_utf8_lossy(); - if first_level == "1" || first_level == "true" || first_level == "On" { - categories = Log::Error | Log::Warn | Log::Info | Log::Deprecated; - if startup_logs_by_default { - categories |= Log::Startup; - } - } +struct LogVisitor { + pub msg: Option, + pub once: bool, +} + +impl tracing_core::field::Visit for LogVisitor { + fn record_bool(&mut self, _field: &Field, value: bool) { + self.once = value; } - for category_name in category_names { - for (name, category) in Log::all().iter_names() { - if name.eq_ignore_ascii_case(&category_name.to_utf8_lossy()) { - categories |= category; - } - } + fn record_str(&mut self, _field: &Field, msg: &str) { + self.msg = Some(msg.to_string()); } - // Info always implies warn - if categories.contains(Log::Info) { - categories |= Log::Warn; + fn record_debug(&mut self, _field: &Field, value: &dyn Debug) { + self.msg = Some(format!("{value:?}")); } - // Warn always implies error - if categories.contains(Log::Warn) { - categories |= Log::Error; +} + +impl FormatEvent for LogFormatter + where + S: Subscriber + for<'a> LookupSpan<'a>, + N: for<'a> FormatFields<'a> + 'static { + fn format_event( + &self, + _ctx: &FmtContext<'_, S, N>, + _writer: Writer<'_>, + event: &Event<'_> + ) -> core::fmt::Result { + let mut visitor = LogVisitor { msg: None, once: false }; + event.record(&mut visitor); + + fn fmt_msg(event: &Event<'_>, msg: &str, suffix: &str) -> String { + let data = event.metadata(); + let target = if data.target() == "ddtrace" { + match *data.level() { + Level::ERROR => "error", + Level::WARN => "warning", + Level::INFO => "info", + Level::DEBUG => "debug", + Level::TRACE => "trace", + } + } else { + data.target() + }; + format!("[ddtrace] [{}] {}{}\0", target, msg, suffix) + } + + if let Some(msg) = visitor.msg { + if let Some(cb) = unsafe { ddog_log_callback } { + let msg = if self.once && visitor.once { + if let Some(formatted) = LOGGED_MSGS.with(|logged| { + let mut logged = logged.borrow_mut(); + if logged.contains(msg.as_str()) { + return None; + } + let formatted = Some(fmt_msg(event, &msg, "; This message is only displayed once. Specify DD_TRACE_ONCE_LOGS=0 to show all messages.")); + logged.insert(msg); + formatted + }) { + formatted + } else { + return Ok(()); + } + } else { + fmt_msg(event, &msg, "") + }; + cb(unsafe { CharSlice::new(msg.as_ptr() as *const c_char, msg.len() - 1) }); + } + } + Ok(()) } +} - ddog_set_log_category(categories); +#[no_mangle] +pub unsafe extern "C" fn ddog_set_error_log_level(once: bool) { + let subscriber = tracing_subscriber::fmt() + .with_max_level(LevelFilter::ERROR) + .event_format(LogFormatter { once }); + set_log_subscriber(subscriber) } #[no_mangle] -pub extern "C" fn ddog_log(category: Log, msg: CharSlice) { - if let Some(cb) = unsafe { ddog_log_callback } { - if category.contains(Log::Once) && !unsafe { LOG_CATEGORY }.contains(Log::Once) { - LOGGED_MSGS.with(|logged| { - let mut logged = logged.borrow_mut(); - let msgstr = unsafe { msg.to_utf8_lossy() }; - if !logged.contains(msgstr.as_ref()) { - let msg = msgstr.to_string(); - let once_msg = format!("{}; This message is only displayed once. Specify DD_TRACE_ONCE_LOGS=0 to show all messages.\0", msg); - cb(category, unsafe { CharSlice::new(once_msg.as_ptr() as *const c_char, once_msg.len() - 1) }); - logged.insert(msg); - } - }); - } else { - cb(category, msg); - } +pub unsafe extern "C" fn ddog_set_log_level(level: CharSlice, once: bool) { + let subscriber = tracing_subscriber::fmt() + .with_env_filter(EnvFilter::builder().parse_lossy(level.to_utf8_lossy())) + .event_format(LogFormatter { once }); + set_log_subscriber(subscriber) +} + +fn set_log_subscriber(subscriber: S) where S: SubscriberInitExt { + TRACING_GUARDS.replace(None); // drop first to avoid a prior guard to reset the thread local subscriber it upon replace() + TRACING_GUARDS.replace(Some(subscriber.set_default())); +} + +#[no_mangle] +pub unsafe extern "C" fn ddog_log(category: Log, msg: CharSlice) { + let once = !(category & Log::Once).is_empty(); + let category = category & !Log::Once; + if once { + with_target!(category, tracing::event!(once = true, "{}", msg.to_utf8_lossy())); + } else { + with_target!(category, tracing::event!("{}", msg.to_utf8_lossy())); } } diff --git a/components-rs/sidecar.h b/components-rs/sidecar.h index a4904742af..23ffd7b95c 100644 --- a/components-rs/sidecar.h +++ b/components-rs/sidecar.h @@ -119,7 +119,9 @@ ddog_MaybeError ddog_sidecar_session_set_config(ddog_SidecarTransport **transpor const struct ddog_Endpoint *endpoint, uint64_t flush_interval_milliseconds, uintptr_t force_flush_size, - uintptr_t force_drop_size); + uintptr_t force_drop_size, + ddog_CharSlice log_level, + ddog_CharSlice log_path); ddog_MaybeError ddog_sidecar_send_trace_v04_shm(ddog_SidecarTransport **transport, const struct ddog_InstanceId *instance_id, @@ -131,4 +133,6 @@ ddog_MaybeError ddog_sidecar_send_trace_v04_bytes(ddog_SidecarTransport **transp ddog_CharSlice data, const struct ddog_TracerHeaderTags *tracer_header_tags); +ddog_CharSlice ddog_sidecar_dump(ddog_SidecarTransport **transport); + #endif /* DDOG_SIDECAR_H */ diff --git a/components-rs/telemetry.rs b/components-rs/telemetry.rs index f85e497cc0..ffbcf30fd3 100644 --- a/components-rs/telemetry.rs +++ b/components-rs/telemetry.rs @@ -12,6 +12,9 @@ use spawn_worker::LibDependency; use std::error::Error; use std::path::Path; use std::{fs, io}; +use std::ffi::{c_char, CStr, OsStr}; +use std::os::unix::ffi::OsStrExt; +use datadog_sidecar::config::LogMethod; #[must_use] #[no_mangle] @@ -76,10 +79,18 @@ fn run_sidecar(cfg: config::Config) -> io::Result { #[no_mangle] pub extern "C" fn ddog_sidecar_connect_php( connection: &mut *mut SidecarTransport, + error_path: *const c_char, + log_level: CharSlice, enable_telemetry: bool, ) -> MaybeError { let mut cfg = config::FromEnv::config(); cfg.self_telemetry = enable_telemetry; + unsafe { + if *error_path != 0 { + cfg.log_method = LogMethod::File(OsStr::from_bytes(CStr::from_ptr(error_path).to_bytes()).into()) + } + cfg.child_env.insert(OsStr::new("DD_TRACE_LOG_LEVEL").into(), OsStr::from_bytes(log_level.as_bytes()).into()); + } let stream = Box::new(try_c!(run_sidecar(cfg))); *connection = Box::into_raw(stream); diff --git a/config.m4 b/config.m4 index d18189d7a7..a366b24fc7 100644 --- a/config.m4 +++ b/config.m4 @@ -289,7 +289,7 @@ if test "$PHP_DDTRACE" != "no"; then cat <> Makefile.fragments \$(builddir)/target/$ddtrace_cargo_profile/libddtrace_php.a: $( (find "$ext_srcdir/components-rs" -name "*.c" -o -name "*.rs" -o -name "Cargo.toml"; find "$ext_srcdir/../../libdatadog" -name "*.rs" -not -path "*/target/*"; find "$ext_srcdir/libdatadog" -name "*.rs" -not -path "*/target/*"; echo "$all_object_files" ) 2>/dev/null | xargs ) - (cd "$ext_srcdir/components-rs"; $ddtrace_mock_sources CARGO_TARGET_DIR=\$(builddir)/target/ RUSTC_BOOTSTRAP=1 \$(DDTRACE_CARGO) build $(test "$ddtrace_cargo_profile" == debug || echo --profile tracer-release) \$(shell echo "\$(MAKEFLAGS)" | $EGREP -o "[[-]]j[[0-9]]+") && test "$PHP_DDTRACE_RUST_SYMBOLS" == yes || strip -d \$(builddir)/target/$ddtrace_cargo_profile/libddtrace_php.a) + (cd "$ext_srcdir/components-rs"; $ddtrace_mock_sources CARGO_TARGET_DIR=\$(builddir)/target/ RUSTFLAGS="${RUSTFLAGS:-} --cfg tokio_unstable $([[ $host_os == linux* ]] && echo "--cfg tokio_taskdump")" RUSTC_BOOTSTRAP=1 \$(DDTRACE_CARGO) build $(test "$ddtrace_cargo_profile" == debug || echo --profile tracer-release) \$(shell echo "\$(MAKEFLAGS)" | $EGREP -o "[[-]]j[[0-9]]+") && test "$PHP_DDTRACE_RUST_SYMBOLS" == yes || strip -d \$(builddir)/target/$ddtrace_cargo_profile/libddtrace_php.a) EOT if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then diff --git a/docker-compose.yml b/docker-compose.yml index 542ed98cc5..05be4a192a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -37,6 +37,7 @@ x-aliases: - PHP_IDE_CONFIG=serverName=docker - DD_TRACE_DOCKER_DEBUG - DATADOG_HAVE_DEV_ENV=1 + - DD_SPAWN_WORKER_USE_EXEC=1 cap_add: - SYS_PTRACE security_opt: diff --git a/ext/compatibility.h b/ext/compatibility.h index 96e47066e2..e50e5d7398 100644 --- a/ext/compatibility.h +++ b/ext/compatibility.h @@ -4,6 +4,7 @@ #include #include #include +#include #include "ext/standard/base64.h" @@ -86,6 +87,13 @@ static inline zend_long zval_get_long(zval *op) { } return _zval_get_long(op); } + +#include +#if defined(DBL_MANT_DIG) && defined(DBL_MIN_EXP) +#define PHP_DOUBLE_MAX_LENGTH (3 + DBL_MANT_DIG - DBL_MIN_EXP) +#else +#define PHP_DOUBLE_MAX_LENGTH 1080 +#endif #endif #if PHP_VERSION_ID < 70200 @@ -110,7 +118,6 @@ static zend_always_inline zend_string *zend_string_init_interned(const char *str typedef void zend_type; -#include static inline void smart_str_append_printf(smart_str *dest, const char *format, ...) { va_list arg; va_start(arg, format); @@ -324,6 +331,19 @@ static zend_always_inline zend_result add_next_index_object(zval *arg, zend_obje return zend_hash_next_index_insert(Z_ARRVAL_P(arg), &tmp) ? SUCCESS : FAILURE; } +#include
+#define zend_gcvt php_gcvt +#define ZEND_DOUBLE_MAX_LENGTH PHP_DOUBLE_MAX_LENGTH +static inline void smart_str_append_double(smart_str *str, double num, int precision, bool zero_fraction) { + char buf[ZEND_DOUBLE_MAX_LENGTH]; + /* Model snprintf precision behavior. */ + zend_gcvt(num, precision ? precision : 1, '.', 'E', buf); + smart_str_appends(str, buf); + if (zero_fraction && zend_finite(num) && !strchr(buf, '.')) { + smart_str_appendl(str, ".0", 2); + } +} + #endif #if PHP_VERSION_ID < 80200 @@ -357,6 +377,8 @@ static inline zend_string *ddtrace_strpprintf(size_t max_len, const char *format #undef zend_strpprintf #define zend_strpprintf ddtrace_strpprintf +#define ZEND_HASH_ELEMENT(ht, idx) (&ht->arData[idx].val) + #if PHP_VERSION_ID >= 80000 #define zend_weakrefs_hash_add zend_weakrefs_hash_add_fallback #define zend_weakrefs_hash_del zend_weakrefs_hash_del_fallback @@ -392,4 +414,8 @@ static zend_always_inline zend_result zend_call_function_with_return_value(zend_ #define zend_zval_value_name zend_zval_type_name #endif +#if PHP_VERSION_ID < 80400 +#define zend_parse_arg_func(arg, dest_fci, dest_fcc, check_null, error, free_trampoline) zend_parse_arg_func(arg, dest_fci, dest_fcc, check_null, error) +#endif + #endif // DD_COMPATIBILITY_H diff --git a/ext/configuration.c b/ext/configuration.c index a333482d24..da7e260d47 100644 --- a/ext/configuration.c +++ b/ext/configuration.c @@ -132,6 +132,7 @@ static void dd_ini_env_to_ini_name(const zai_str env_name, zai_config_name *ini_ bool ddtrace_config_minit(int module_number) { if (!zai_config_minit(config_entries, (sizeof config_entries / sizeof *config_entries), dd_ini_env_to_ini_name, module_number)) { + ddtrace_log_ginit(); LOG(Error, "Unable to load configuration; likely due to json symbols failing to resolve."); return false; } @@ -141,7 +142,7 @@ bool ddtrace_config_minit(int module_number) { // arduous way of accessing the decoded_value directly from zai_config_memoized_entries. zai_config_first_time_rinit(); - ddtrace_alter_dd_trace_debug(NULL, &zai_config_memoized_entries[DDTRACE_CONFIG_DD_TRACE_DEBUG].decoded_value); + ddtrace_log_ginit(); return true; } diff --git a/ext/configuration.h b/ext/configuration.h index aa1e4af662..47d158fbb6 100644 --- a/ext/configuration.h +++ b/ext/configuration.h @@ -145,8 +145,8 @@ enum ddtrace_sampling_rules_format { CONFIG(BOOL, DD_LOG_BACKTRACE, "false") \ CONFIG(BOOL, DD_TRACE_GENERATE_ROOT_SPAN, "true", .ini_change = ddtrace_span_alter_root_span_config) \ CONFIG(INT, DD_TRACE_SPANS_LIMIT, "1000") \ - CONFIG(BOOL, DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED, "true") \ - CONFIG(BOOL, DD_TRACE_128_BIT_TRACEID_LOGGING_ENABLED, "false") \ + CONFIG(BOOL, DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED, "true") \ + CONFIG(BOOL, DD_TRACE_128_BIT_TRACEID_LOGGING_ENABLED, "false") \ CONFIG(INT, DD_TRACE_AGENT_MAX_CONSECUTIVE_FAILURES, \ DD_CFG_EXPSTR(DD_TRACE_CIRCUIT_BREAKER_DEFAULT_MAX_CONSECUTIVE_FAILURES)) \ CONFIG(INT, DD_TRACE_AGENT_ATTEMPT_RETRY_TIME_MSEC, \ @@ -182,6 +182,8 @@ enum ddtrace_sampling_rules_format { CONFIG(BOOL, DD_TRACE_WORDPRESS_CALLBACKS, "false") \ CONFIG(BOOL, DD_TRACE_WORDPRESS_ENHANCED_INTEGRATION, "false") \ CONFIG(BOOL, DD_TRACE_OTEL_ENABLED, "false") \ + CONFIG(STRING, DD_TRACE_LOG_FILE, "", .ini_change = zai_config_system_ini_change) \ + CONFIG(STRING, DD_TRACE_LOG_LEVEL, "error", .ini_change = ddtrace_alter_dd_trace_log_level) \ DD_INTEGRATIONS #define CALIAS CONFIG diff --git a/ext/ddtrace.c b/ext/ddtrace.c index 518f86ee5b..9ff65f2e5e 100644 --- a/ext/ddtrace.c +++ b/ext/ddtrace.c @@ -459,13 +459,90 @@ static PHP_GINIT_FUNCTION(ddtrace) { zai_hook_ginit(); } +#if defined(COMPILE_DL_DDTRACE) && defined(__GLIBC__) && __GLIBC_MINOR__ +#define CXA_THREAD_ATEXIT_WRAPPER 1 +#endif +#ifdef CXA_THREAD_ATEXIT_WRAPPER +struct dd_rust_thread_destructor { + void (*dtor)(void *); + void *obj; + struct dd_rust_thread_destructor *next; +}; +ZEND_TLS struct dd_rust_thread_destructor *dd_rust_thread_destructors = NULL; +ZEND_TLS bool dd_is_main_thread = false; + +static void dd_run_rust_thread_destructors(void *unused) { + UNUSED(unused); + struct dd_rust_thread_destructor *entry = dd_rust_thread_destructors; + while (entry) { + struct dd_rust_thread_destructor *cur = entry; + cur->dtor(cur->obj); + entry = entry->next; + free(cur); + } +} +#endif + static PHP_GSHUTDOWN_FUNCTION(ddtrace) { if (ddtrace_globals->remote_config_reader) { ddog_agent_remote_config_reader_drop(ddtrace_globals->remote_config_reader); } zai_hook_gshutdown(); + +#ifdef CXA_THREAD_ATEXIT_WRAPPER + if (!dd_is_main_thread) { + dd_run_rust_thread_destructors(NULL); + } +#endif +} + +// Rust code will call __cxa_thread_atexit_impl. This is a weak symbol; it's defined by glibc. +// The problem is that calls to __cxa_thread_atexit_impl cause shared libraries to remain referenced until the calling thread terminates. +// However in NTS builds the calling thread is the main thread and thus the shared object (i.e. ddtrace.so) WILL remain loaded. +// This is problematic with e.g. apache which, upon reloading will unload all PHP modules including PHP itself, then reload. +// This prevents us from a) having the weak symbols updated to the new locations and b) having ddtrace updates going live without hard restart. +// Thus, we need to intercept it: define it ourselves so that the linker will force the rust code to call our code here. +// Then we can collect the callbacks and invoke them ourselves right at thread shutdown, i.e. GSHUTDOWN. +#ifdef CXA_THREAD_ATEXIT_WRAPPER +#define CXA_THREAD_ATEXIT_PHP ((void *)0) +#define CXA_THREAD_ATEXIT_UNINITIALIZED ((void *)1) +#define CXA_THREAD_ATEXIT_UNAVAILABLE ((void *)2) + +static int (*glibc__cxa_thread_atexit_impl)(void (*func)(void *), void *obj, void *dso_symbol) = CXA_THREAD_ATEXIT_UNINITIALIZED; +static pthread_key_t dd_cxa_thread_atexit_key; // fallback for sidecar + +// Note: this symbol is not public +int __cxa_thread_atexit_impl(void (*func)(void *), void *obj, void *dso_symbol) { + if (glibc__cxa_thread_atexit_impl == CXA_THREAD_ATEXIT_UNINITIALIZED) { + glibc__cxa_thread_atexit_impl = DL_FETCH_SYMBOL(NULL, "__cxa_thread_atexit_impl"); + if (glibc__cxa_thread_atexit_impl == NULL) { + // no race condition here: logging is initialized in MINIT, at which point only a single thread lives + glibc__cxa_thread_atexit_impl = CXA_THREAD_ATEXIT_UNAVAILABLE; + pthread_key_create(&dd_cxa_thread_atexit_key, dd_run_rust_thread_destructors); + } + } + + if (glibc__cxa_thread_atexit_impl != CXA_THREAD_ATEXIT_PHP && glibc__cxa_thread_atexit_impl != CXA_THREAD_ATEXIT_UNAVAILABLE) { + return glibc__cxa_thread_atexit_impl(func, obj, dso_symbol); + } + + if (glibc__cxa_thread_atexit_impl == CXA_THREAD_ATEXIT_UNAVAILABLE) { + pthread_setspecific(dd_cxa_thread_atexit_key, (void *)0x1); // needs to be non-NULL + } + + struct dd_rust_thread_destructor *entry = malloc(sizeof(struct dd_rust_thread_destructor)); + entry->dtor = func; + entry->obj = obj; + entry->next = dd_rust_thread_destructors; + dd_rust_thread_destructors = entry; + return 0; } +static void dd_clean_main_thread_locals() { + dd_run_rust_thread_destructors(NULL); +} +#endif + /* DDTrace\SpanLink */ zend_class_entry *ddtrace_ce_span_link; @@ -898,7 +975,11 @@ static void dd_disable_if_incompatible_sapi_detected(void) { static PHP_MINIT_FUNCTION(ddtrace) { UNUSED(type); - ddtrace_log_init(); +#ifdef CXA_THREAD_ATEXIT_WRAPPER + dd_is_main_thread = true; + glibc__cxa_thread_atexit_impl = CXA_THREAD_ATEXIT_PHP; + atexit(dd_clean_main_thread_locals); +#endif zai_hook_minit(); zai_uhook_minit(module_number); @@ -921,6 +1002,8 @@ static PHP_MINIT_FUNCTION(ddtrace) { } // config initialization needs to be at the top + // This also initialiyzed logging, so no logs may be emitted before this. + ddtrace_log_init(); if (!ddtrace_config_minit(module_number)) { return FAILURE; } @@ -961,7 +1044,7 @@ static PHP_MINIT_FUNCTION(ddtrace) { ddtrace_initialize_span_sampling_limiter(); ddtrace_limiter_create(); - ddtrace_bgs_log_minit(); + ddtrace_log_minit(); ddtrace_dogstatsd_client_minit(); ddshared_minit(); @@ -995,6 +1078,7 @@ static PHP_MSHUTDOWN_FUNCTION(ddtrace) { if (DDTRACE_G(disable) == 1) { zai_config_mshutdown(); + zai_json_shutdown_bindings(); return SUCCESS; } @@ -1011,16 +1095,17 @@ static PHP_MSHUTDOWN_FUNCTION(ddtrace) { ddtrace_coms_mshutdown(); if (ddtrace_coms_flush_shutdown_writer_synchronous()) { ddtrace_coms_curl_shutdown(); - - ddtrace_bgs_log_mshutdown(); } } + ddtrace_log_mshutdown(); + ddtrace_engine_hooks_mshutdown(); ddtrace_shutdown_span_sampling_limiter(); ddtrace_limiter_destroy(); zai_config_mshutdown(); + zai_json_shutdown_bindings(); ddtrace_user_req_shutdown(); @@ -1081,9 +1166,7 @@ static void dd_initialize_request(void) { ddtrace_internal_handlers_rinit(); - if (!get_global_DD_TRACE_SIDECAR_TRACE_SENDER()) { - ddtrace_bgs_log_rinit(PG(error_log)); - } + ddtrace_log_rinit(PG(error_log)); ddtrace_dogstatsd_client_rinit(); @@ -1909,6 +1992,13 @@ PHP_FUNCTION(dd_trace_internal_fn) { } else if (FUNCTION_NAME_MATCHES("finalize_telemetry")) { dd_finalize_telemtry(); RETVAL_TRUE; + } else if (FUNCTION_NAME_MATCHES("dump_sidecar")) { + if (!ddtrace_sidecar) { + RETURN_FALSE; + } + ddog_CharSlice slice = ddog_sidecar_dump(&ddtrace_sidecar); + RETVAL_STRINGL(slice.ptr, slice.len); + free((void *) slice.ptr); } else if (params_count == 1 && FUNCTION_NAME_MATCHES("detect_composer_installed_json")) { ddog_CharSlice path = dd_zend_string_to_CharSlice(Z_STR_P(ZVAL_VARARG_PARAM(params, 0))); ddtrace_detect_composer_installed_json(&ddtrace_sidecar, ddtrace_sidecar_instance_id, &DDTRACE_G(telemetry_queue_id), path); @@ -2444,7 +2534,7 @@ static ddtrace_distributed_tracing_result dd_parse_distributed_tracing_headers_f ZEND_PARSE_PARAMETERS_START(1, 1) DD_PARAM_PROLOGUE(0, 0); - if (UNEXPECTED(!zend_parse_arg_func(_arg, &func.fci, &func.fcc, false, &_error))) { + if (UNEXPECTED(!zend_parse_arg_func(_arg, &func.fci, &func.fcc, false, &_error, true))) { if (!_error) { zend_argument_type_error(1, "must be a valid callback or of type array, %s given", zend_zval_value_name(_arg)); _error_code = ZPP_ERROR_FAILURE; diff --git a/ext/ddtrace.stub.php b/ext/ddtrace.stub.php index d49efec536..ecefa48a9a 100644 --- a/ext/ddtrace.stub.php +++ b/ext/ddtrace.stub.php @@ -885,9 +885,9 @@ function dd_trace_coms_trigger_writer_flush(): int {} * @internal * @param string $functionName Internal function name * @param mixed $args,... Arguments of the function - * @return bool 'true' if void function was properly executed, else the return value of it + * @return mixed false if void function was properly executed, else the return value of it */ - function dd_trace_internal_fn(string $functionName, mixed ...$args): bool {} + function dd_trace_internal_fn(string $functionName, mixed ...$args) {} /** * Set the distributed trace id diff --git a/ext/ddtrace_arginfo.h b/ext/ddtrace_arginfo.h index 2e24804993..1b43361a6e 100644 --- a/ext/ddtrace_arginfo.h +++ b/ext/ddtrace_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 1354719701dbfb97c14995b1f228acc33caa343e */ + * Stub hash: e3dd0b069a9bb83a90454e9bd2a74e87ebb208e5 */ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_DDTrace_trace_method, 0, 3, _IS_BOOL, 0) ZEND_ARG_TYPE_INFO(0, className, IS_STRING, 0) @@ -218,7 +218,7 @@ ZEND_END_ARG_INFO() #define arginfo_dd_trace_coms_trigger_writer_flush arginfo_dd_trace_dd_get_memory_limit -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_dd_trace_internal_fn, 0, 1, _IS_BOOL, 0) +ZEND_BEGIN_ARG_INFO_EX(arginfo_dd_trace_internal_fn, 0, 0, 1) ZEND_ARG_TYPE_INFO(0, functionName, IS_STRING, 0) ZEND_ARG_VARIADIC_TYPE_INFO(0, args, IS_MIXED, 0) ZEND_END_ARG_INFO() diff --git a/ext/hook/uhook.c b/ext/hook/uhook.c index 708a032f1a..3e26714c4d 100644 --- a/ext/hook/uhook.c +++ b/ext/hook/uhook.c @@ -238,6 +238,17 @@ static void dd_zend_interrupt_function(zend_execute_data *ex) } #endif +void dd_uhook_log_invocation(void (*log)(const char *, ...), zend_execute_data *execute_data, const char *type, zend_object *closure) { + const zend_function *func = zend_get_closure_method_def(closure); + log("Running a %s hook function from %s:%d on %s %s%s%s", + type, + ZSTR_VAL(func->op_array.filename), func->op_array.line_start, + ZEND_USER_CODE(EX(func)->type) && EX(func)->op_array.filename ? "file" : (EX(func)->common.scope ? "method" : "function"), + EX(func)->common.scope ? ZSTR_VAL(EX(func)->common.scope->name) : "", + EX(func)->common.scope ? "::" : "", + EX(func)->common.function_name ? ZSTR_VAL(EX(func)->op_array.function_name) : (EX(func)->op_array.filename ? "" : ZSTR_VAL(EX(func)->op_array.filename))); +} + static bool dd_uhook_begin(zend_ulong invocation, zend_execute_data *execute_data, void *auxiliary, void *dynamic) { dd_uhook_def *def = auxiliary; dd_uhook_dynamic *dyn = dynamic; @@ -272,6 +283,8 @@ static bool dd_uhook_begin(zend_ulong invocation, zend_execute_data *execute_dat if (def->begin && !def->running) { dyn->hook_data->execute_data = execute_data; + LOGEV(Hook_Trace, dd_uhook_log_invocation(log, execute_data, "begin", def->begin);); + def->running = true; dd_uhook_call_hook(execute_data, def->begin, dyn->hook_data); def->running = false; @@ -391,6 +404,8 @@ static void dd_uhook_end(zend_ulong invocation, zend_execute_data *execute_data, } zval_ptr_dtor(&tmp); + LOGEV(Hook_Trace, dd_uhook_log_invocation(log, execute_data, "end", def->end);); + def->running = true; dyn->hook_data->retval_ptr = retval; keep_span = dd_uhook_call_hook(execute_data, def->end, dyn->hook_data); @@ -498,7 +513,7 @@ PHP_FUNCTION(DDTrace_install_hook) { } else if (Z_TYPE_P(_arg) == IS_ARRAY || Z_TYPE_P(_arg) == IS_OBJECT) { #define INSTALL_HOOK_TYPES "string|callable|Generator|Closure" char *func_error = NULL; - if (zend_parse_arg_func(_arg, &fci, &fcc, false, &func_error)) { + if (zend_parse_arg_func(_arg, &fci, &fcc, false, &func_error, true)) { if (!fcc.function_handler) { // This is a trampoline function, we cannot hook this, not without hooking other things too // Technically for e.g. __call one *could* hook the __call handler, then distinguish on the passed method name. @@ -582,6 +597,14 @@ PHP_FUNCTION(DDTrace_install_hook) { dd_uhook_begin, dd_uhook_end, ZAI_HOOK_AUX(def, dd_uhook_dtor), sizeof(dd_uhook_dynamic)); + LOG(Hook_Trace, "Installing a hook function %d at %s:%d on runtime %s %s%s%s", + id, + zend_get_executed_filename(), zend_get_executed_lineno(), + resolved->common.scope ? "method" : "function", + resolved->common.scope ? ZSTR_VAL(resolved->common.scope->name) : "", + resolved->common.scope ? "::" : "", + resolved->common.function_name ? ZSTR_VAL(resolved->common.function_name) : ""); + if (id >= 0 && closure && (flags & HOOK_INSTANCE)) { def->closure = closure; @@ -644,6 +667,16 @@ PHP_FUNCTION(DDTrace_install_hook) { dd_uhook_end, ZAI_HOOK_AUX(def, dd_uhook_dtor), sizeof(dd_uhook_dynamic)); + + if (id >= 0) { + LOG(Hook_Trace, "Installing a hook function %d at %s:%d on %s %s%s%s", + id, + zend_get_executed_filename(), zend_get_executed_lineno(), + def->file ? "file" : (def->scope ? "method" : "function"), + def->scope ? ZSTR_VAL(def->scope) : "", + def->scope ? "::" : "", + def->file ? ZSTR_VAL(def->file) : ZSTR_VAL(def->function)); + } } if (id < 0) { @@ -680,8 +713,25 @@ PHP_FUNCTION(DDTrace_remove_hook) { zend_string *lower = zend_string_tolower(location); zai_hook_exclude_class(scope, function, id, lower); zend_string_release(lower); + + LOG(Hook_Trace, "Excluding class %s from hook %d at %s:%d on %s %s%s%s", + ZSTR_VAL(location), + id, + zend_get_executed_filename(), zend_get_executed_lineno(), + def->file ? "file" : (def->scope ? "method" : "function"), + def->scope ? ZSTR_VAL(def->scope) : "", + def->scope ? "::" : "", + def->file ? ZSTR_VAL(def->file) : ZSTR_VAL(def->function)); } else { zai_hook_remove(scope, function, id); + + LOG(Hook_Trace, "Removing hook %d at %s:%d on %s %s%s%s", + id, + zend_get_executed_filename(), zend_get_executed_lineno(), + def->file ? "file" : (def->scope ? "method" : "function"), + def->scope ? ZSTR_VAL(def->scope) : "", + def->scope ? "::" : "", + def->file ? ZSTR_VAL(def->file) : ZSTR_VAL(def->function)); } } else { if (location && ZSTR_LEN(location)) { @@ -690,6 +740,14 @@ PHP_FUNCTION(DDTrace_remove_hook) { zend_string_release(lower); } else { zai_hook_remove_resolved(def->install_address, id); + + LOG(Hook_Trace, "Removing hook %d at %s:%d on %s %s%s%s", + id, + zend_get_executed_filename(), zend_get_executed_lineno(), + def->file ? "file" : (def->scope ? "method" : "function"), + def->scope ? ZSTR_VAL(def->scope) : "", + def->scope ? "::" : "", + def->file ? ZSTR_VAL(def->file) : ZSTR_VAL(def->function)); } } } diff --git a/ext/hook/uhook.h b/ext/hook/uhook.h index ae359c42b0..64366c6ca6 100644 --- a/ext/hook/uhook.h +++ b/ext/hook/uhook.h @@ -6,6 +6,7 @@ HashTable *dd_uhook_collect_args(zend_execute_data *execute_data); void dd_uhook_report_sandbox_error(zend_execute_data *execute_data, zend_object *closure); +void dd_uhook_log_invocation(void (*log)(const char *, ...), zend_execute_data *execute_data, const char *type, zend_object *closure); void zai_uhook_rinit(); void zai_uhook_rshutdown(); diff --git a/ext/hook/uhook_legacy.c b/ext/hook/uhook_legacy.c index 1d188052a3..70750090c8 100644 --- a/ext/hook/uhook_legacy.c +++ b/ext/hook/uhook_legacy.c @@ -107,6 +107,8 @@ static bool dd_uhook_begin(zend_ulong invocation, zend_execute_data *execute_dat } if (def->begin) { + LOGEV(Hook_Trace, dd_uhook_log_invocation(log, execute_data, "begin", def->begin);); + dyn->dropped_span = !dd_uhook_call(def->begin, def->tracing, dyn, execute_data, &EG(uninitialized_zval)); if (def->tracing && dyn->dropped_span) { ddtrace_clear_execute_data_span(invocation, false); @@ -139,6 +141,7 @@ static void dd_uhook_generator_resumption(zend_ulong invocation, zend_execute_da } if (def->begin) { + LOGEV(Hook_Trace, dd_uhook_log_invocation(log, execute_data, "generator resume", def->begin);); dyn->dropped_span = !dd_uhook_call(def->begin, def->tracing, dyn, execute_data, value); if (def->tracing && dyn->dropped_span) { ddtrace_clear_execute_data_span(invocation, false); @@ -175,6 +178,7 @@ static void dd_uhook_generator_yield(zend_ulong invocation, zend_execute_data *e } if (def->end && (!def->tracing || !dyn->dropped_span)) { + LOGEV(Hook_Trace, dd_uhook_log_invocation(log, execute_data, "generator yield", def->end);); bool keep_span = dd_uhook_call(def->end, def->tracing, dyn, execute_data, value); if (def->tracing && !dyn->dropped_span) { ddtrace_clear_execute_data_span(invocation, keep_span); @@ -222,6 +226,7 @@ static void dd_uhook_end(zend_ulong invocation, zend_execute_data *execute_data, profiling_interrupt_function(execute_data); } + LOGEV(Hook_Trace, dd_uhook_log_invocation(log, execute_data, "end", def->end);); keep_span = dd_uhook_call(def->end, def->tracing, dyn, execute_data, retval); } @@ -383,6 +388,13 @@ static void dd_uhook(INTERNAL_FUNCTION_PARAMETERS, bool tracing, bool method) { if (!success) { dd_uhook_dtor(def); + } else { + LOG(Hook_Trace, "Installing a hook function at %s:%d on %s %s%s%s", + zend_get_executed_filename(), zend_get_executed_lineno(), + method ? "method" : "function", + method ? ZSTR_VAL(class_name) : "", + method ? "::" : "", + ZSTR_VAL(method_name)); } RETURN_BOOL(success); } @@ -421,5 +433,12 @@ PHP_FUNCTION(dd_untrace) { } zai_hook_iterator_free(&it); + LOG(Hook_Trace, "Removing all hook functions installed by hook&trace_%s at %s:%d on %s %s%s%s", + class_name ? "method" : "function", + zend_get_executed_filename(), zend_get_executed_lineno(), + class_name ? ZSTR_VAL(class_name) : "", + class_name ? "::" : "", + ZSTR_VAL(method_name)); + RETURN_TRUE; } diff --git a/ext/logging.c b/ext/logging.c index 956629c556..f886e67a9f 100644 --- a/ext/logging.c +++ b/ext/logging.c @@ -1,6 +1,7 @@ #include "logging.h" +#include "sidecar.h" -#include +#include #include #include #include @@ -8,90 +9,163 @@ #include "configuration.h" #include
-static inline ddog_CharSlice dd_zend_string_to_CharSlice(zend_string *str) { - return (ddog_CharSlice){ .len = str->len, .ptr = str->val }; + +static void dd_log_set_level(bool debug) { + bool once = runtime_config_first_init ? get_DD_TRACE_ONCE_LOGS() : get_global_DD_TRACE_ONCE_LOGS(); + if (debug) { + if (strcmp("cli", sapi_module.name) != 0 && (runtime_config_first_init ? get_DD_TRACE_STARTUP_LOGS() : get_global_DD_TRACE_STARTUP_LOGS())) { + ddog_set_log_level(DDOG_CHARSLICE_C("debug"), once); + } else { + ddog_set_log_level(DDOG_CHARSLICE_C("debug,startup=error"), once); + } + } else if (runtime_config_first_init) { + ddog_set_log_level(dd_zend_string_to_CharSlice(get_DD_TRACE_LOG_LEVEL()), once); + } else if (zend_string_equals_literal_ci(Z_STR(zai_config_memoized_entries[DDTRACE_CONFIG_DD_TRACE_LOG_LEVEL].decoded_value), "error")) { + ddog_set_error_log_level(once); // optimized handling without parsing + } else { + ddog_set_log_level(dd_zend_string_to_CharSlice(get_global_DD_TRACE_LOG_LEVEL()), once); + } } -atomic_uintptr_t php_ini_error_log; +// We need to ensure that logging is initialized (i.e. set) at least once per thread. +void ddtrace_log_ginit(void) { + dd_log_set_level(get_global_DD_TRACE_DEBUG()); +} -void ddtrace_bgs_log_minit(void) { atomic_store(&php_ini_error_log, (uintptr_t)NULL); } +atomic_int ddtrace_error_log_fd = -1; +atomic_uintmax_t dd_error_log_fd_rotated = 0; + +void ddtrace_log_minit(void) { + if (ZSTR_LEN(get_global_DD_TRACE_LOG_FILE())) { + int fd = VCWD_OPEN_MODE(ZSTR_VAL(get_global_DD_TRACE_LOG_FILE()), O_CREAT | O_RDWR | O_APPEND, 0666); + if (fd >= 0) { + atomic_store(&ddtrace_error_log_fd, fd); + + time_t now; + time(&now); + atomic_store(&dd_error_log_fd_rotated, (uintmax_t) now); + } + } + + // no need to call dd_log_set_level here, ddtrace_config_minit() inits the debug config +} + +void ddtrace_log_rinit(char *error_log) { + if (atomic_load(&ddtrace_error_log_fd) != -1) { + return; + } -void ddtrace_bgs_log_rinit(char *error_log) { if (!error_log || strcasecmp(error_log, "syslog") == 0 || strlen(error_log) == 0) { return; } - uintptr_t desired = (uintptr_t)zend_strndup(error_log, strlen(error_log)); - uintptr_t expected = (uintptr_t)NULL; - if (!atomic_compare_exchange_strong(&php_ini_error_log, &expected, desired)) { - // if it didn't exchange, then we need to free our duplicated string - free((char *)desired); + int desired = VCWD_OPEN_MODE(error_log, O_CREAT | O_RDWR | O_APPEND, 0666); + time_t now; + time(&now); + atomic_store(&dd_error_log_fd_rotated, (uintmax_t) now); + int expected = -1; + if (!atomic_compare_exchange_strong(&ddtrace_error_log_fd, &expected, desired)) { + // if it didn't exchange, then we need to free it + close(desired); + } +} + +int ddtrace_get_fd_path(int fd, char *buf) { +#ifdef F_GETPATH + return fcntl(fd, F_GETPATH, buf); +#else + char pathbuf[PATH_MAX]; + snprintf(pathbuf, PATH_MAX, "/proc/self/fd/%d", fd); + int len = readlink(pathbuf, buf, PATH_MAX); + if (len >= 0) { + buf[len] = 0; + } + return len; +#endif +} + +void ddtrace_log_mshutdown(void) { + int error_log_fd = atomic_load(&ddtrace_error_log_fd); + atomic_store(&ddtrace_error_log_fd, -1); + if (error_log_fd != -1) { + close(error_log_fd); } } -void ddtrace_bgs_log_mshutdown(void) { - char *error_log = (char *)atomic_load(&php_ini_error_log); - atomic_store(&php_ini_error_log, (uintptr_t)NULL); - free(error_log); +int ddtrace_log_with_time(int fd, const char *msg, int msg_len) { + // todo: we only need 20-ish for the main part, but how much for the timezone? + // Wish PHP printed -hhmm or +hhmm instead of the name + char *msgbuf = malloc(msg_len + 70); + + time_t now; + time(&now); + struct tm *now_local = localtime(&now); + char *p = msgbuf; + *(p++) = '['; + int time_len = (int)strftime(p, 64, "%d-%b-%Y %H:%M:%S %Z", now_local); + if (time_len > 0) { + p += time_len; + } + *(p++) = ']'; + *(p++) = ' '; + memcpy(p, msg, msg_len); + p += msg_len; + *(p++) = '\n'; + + uintmax_t last_check = atomic_exchange(&dd_error_log_fd_rotated, (uintmax_t) now); + if (last_check < (uintmax_t)now - 60) { // 1x/min + char pathbuf[PATH_MAX + 1]; + if (ddtrace_get_fd_path(fd, pathbuf) >= 0) { + int new_fd = VCWD_OPEN_MODE(pathbuf, O_CREAT | O_RDWR | O_APPEND, 0666); + dup2(new_fd, fd); // atomic replace + close(new_fd); + } + } + + int ret = write(fd, msgbuf, p - msgbuf); + + free(msgbuf); + return ret; } #undef ddtrace_bgs_logf int ddtrace_bgs_logf(const char *fmt, ...) { int ret = 0; - char *error_log = (char *)atomic_load(&php_ini_error_log); - if (error_log) { - FILE *fh = fopen(error_log, "a"); + int error_log_fd = atomic_load(&ddtrace_error_log_fd); + if (error_log_fd != -1) { + va_list args, args_copy; + va_start(args, fmt); - if (fh) { - va_list args, args_copy; - va_start(args, fmt); + va_copy(args_copy, args); + int needed_len = vsnprintf(NULL, 0, fmt, args_copy); + va_end(args_copy); - va_copy(args_copy, args); - int needed_len = vsnprintf(NULL, 0, fmt, args_copy); - va_end(args_copy); + char *msgbuf = malloc(needed_len); + vsnprintf(msgbuf, needed_len, fmt, args); + va_end(args); - char *msgbuf = malloc(needed_len); - vsnprintf(msgbuf, needed_len, fmt, args); - va_end(args); + ret = ddtrace_log_with_time(error_log_fd, msgbuf, needed_len); - time_t now; - time(&now); - struct tm *now_local = localtime(&now); - // todo: we only need 20-ish for the main part, but how much for the timezone? - // Wish PHP printed -hhmm or +hhmm instead of the name - char timebuf[64]; - int time_len = strftime(timebuf, sizeof timebuf, "%d-%b-%Y %H:%M:%S %Z", now_local); - if (time_len > 0) { - ret = fprintf(fh, "[%s] %s\n", timebuf, msgbuf); - } - - free(msgbuf); - fclose(fh); - } + free(msgbuf); } return ret; } -static void ddtrace_log_callback(ddog_Log log, ddog_CharSlice msg) { - const char *name = "debug"; - uint32_t bits = log.bits & ~ddog_Log_Once.bits; - if (bits == (ddog_Log_Deprecated.bits & ~ddog_Log_Once.bits)) { - name = "deprecated"; - } else if (bits == ddog_Log_Warn.bits) { - name = "warning"; - } else if (bits == ddog_Log_Info.bits) { - name = "info"; - } else if (bits == ddog_Log_Startup.bits) { - name = "startup"; +static void ddtrace_log_callback(ddog_CharSlice msg) { + char *message = (char*)msg.ptr; + int error_log_fd = atomic_load(&ddtrace_error_log_fd); + if (error_log_fd != -1) { + ddtrace_log_with_time(error_log_fd, message, (int)msg.len); } else { - name = "error"; + if (msg.ptr[msg.len]) { + message = strndup(msg.ptr, msg.len); + php_log_err(message); + free(message); + } else { + php_log_err(message); + } } - - char *message; - asprintf(&message, "[ddtrace] [%s] %.*s", name, (int)msg.len, msg.ptr); - php_log_err(message); - free(message); } @@ -102,32 +176,18 @@ void ddtrace_log_init(void) { bool ddtrace_alter_dd_trace_debug(zval *old_value, zval *new_value) { UNUSED(old_value); - /* Multiple log categories, maybe do it some day? - ALLOCA_FLAG(use_heap); - size_t num_categories = zend_hash_num_elements(Z_ARR_P(new_value)); - ddog_CharSlice *categories = do_alloca(num_categories * sizeof(ddog_CharSlice), use_heap); - - zend_string *log_category; - int i = 0; - ZEND_HASH_FOREACH_STR_KEY(Z_ARR_P(new_value), log_category) { - categories[i++] = dd_zend_string_to_CharSlice(log_category); - } ZEND_HASH_FOREACH_END(); + dd_log_set_level(Z_TYPE_P(new_value) == IS_TRUE); - ddog_parse_log_categories(categories, num_categories, strcmp("cli", sapi_module.name) != 0 && get_global_DD_TRACE_STARTUP_LOGS()); - free_alloca(categories, use_heap); - */ + return true; +} - ddog_Log log = ddog_Log_Error; - if (Z_TYPE_P(new_value) == IS_TRUE) { - log.bits = ddog_Log_Error.bits | ddog_Log_Warn.bits | ddog_Log_Deprecated.bits | ddog_Log_Info.bits; - if (strcmp("cli", sapi_module.name) != 0 && (runtime_config_first_init ? get_DD_TRACE_STARTUP_LOGS() : get_global_DD_TRACE_STARTUP_LOGS())) { - log.bits |= ddog_Log_Startup.bits; - } - } - if (!(runtime_config_first_init ? get_DD_TRACE_ONCE_LOGS() : get_global_DD_TRACE_ONCE_LOGS())) { - log.bits |= ddog_Log_Once.bits; +bool ddtrace_alter_dd_trace_log_level(zval *old_value, zval *new_value) { + UNUSED(old_value); + if (runtime_config_first_init ? get_DD_TRACE_DEBUG() : get_global_DD_TRACE_DEBUG()) { + return true; } - ddog_set_log_category(log); + + ddog_set_log_level(dd_zend_string_to_CharSlice(Z_STR_P(new_value)), runtime_config_first_init ? get_DD_TRACE_ONCE_LOGS() : get_global_DD_TRACE_ONCE_LOGS()); return true; } diff --git a/ext/logging.h b/ext/logging.h index 41e7d8818e..bf3b055522 100644 --- a/ext/logging.h +++ b/ext/logging.h @@ -3,12 +3,17 @@ #include #include "configuration.h" +#include + +extern atomic_int ddtrace_error_log_fd; /* These are used by the background sender; use other log component from PHP thread. * {{{ */ -void ddtrace_bgs_log_minit(void); -void ddtrace_bgs_log_rinit(char *error_log); -void ddtrace_bgs_log_mshutdown(void); +void ddtrace_log_minit(void); +void ddtrace_log_ginit(void); +void ddtrace_log_rinit(char *error_log); +void ddtrace_log_mshutdown(void); +int ddtrace_get_fd_path(int fd, char *buf); int ddtrace_bgs_logf(const char *fmt, ...); /* variadic functions cannot be inlined; we use a macro to essentially inline @@ -18,5 +23,6 @@ int ddtrace_bgs_logf(const char *fmt, ...); void ddtrace_log_init(void); bool ddtrace_alter_dd_trace_debug(zval *old_value, zval *new_value); +bool ddtrace_alter_dd_trace_log_level(zval *old_value, zval *new_value); #endif // DD_LOGGING_H diff --git a/ext/priority_sampling/priority_sampling.c b/ext/priority_sampling/priority_sampling.c index e6685ed86a..6536818bbb 100644 --- a/ext/priority_sampling/priority_sampling.c +++ b/ext/priority_sampling/priority_sampling.c @@ -12,6 +12,7 @@ #include "ddshared.h" #include "ddtrace.h" #include "span.h" +#include "components/log/log.h" ZEND_EXTERN_MODULE_GLOBALS(ddtrace); @@ -154,6 +155,22 @@ void ddtrace_decide_on_closed_span_sampling(ddtrace_span_data *span) { ddtrace_rule_result result = dd_match_rules(span, &root->span == span && !root->parent_id, root->sampling_rule.rule); if (result.rule != INT32_MAX) { + LOGEV(Debug, { + smart_str buf = {0}; + const char *rule_str = ""; + if (result.rule == -2) { + rule_str = "manual.keep"; + } else if (result.rule == -1) { + rule_str = "manual.drop"; + } else { + zval *rule = ZEND_HASH_ELEMENT(get_DD_TRACE_SAMPLING_RULES(), result.rule); + zai_json_encode(&buf, rule, 0); + smart_str_0(&buf); + rule_str = ZSTR_VAL(buf.s); + } + log("Evaluated sampling rules for span %" PRIu64 " on trace %s. Matched rule %s.", span->span_id, Z_STRVAL(span->root->property_trace_id), rule_str); + smart_str_free(&buf); + }); root->sampling_rule = result; } } @@ -182,8 +199,7 @@ static ddtrace_rule_result dd_decide_on_open_span_sampling(ddtrace_root_span_dat static void dd_decide_on_sampling(ddtrace_root_span_data *span) { int priority; bool is_trace_root = !span->parent_id; - // manual if it's not just inherited, otherwise this value is irrelevant (as sampling priority will be default) - enum dd_sampling_mechanism mechanism = DD_MECHANISM_MANUAL; + enum dd_sampling_mechanism mechanism; ddtrace_rule_result result = dd_decide_on_open_span_sampling(span); double sample_rate = 0; @@ -213,6 +229,13 @@ static void dd_decide_on_sampling(ddtrace_root_span_data *span) { if (!sample_rate_zv) { // Default rate if no service+env pair matches sample_rate_zv = zend_hash_str_find(DDTRACE_G(agent_rate_by_service), ZEND_STRL("service:,env:")); + if (sample_rate_zv) { + LOG(Debug, "Evaluated agent sampling rules for root span for trace %s and applied a default sample_rate of %f", + Z_STRVAL(span->property_trace_id), zval_get_double(sample_rate_zv)); + } + } else { + LOG(Debug, "Evaluated agent sampling rules for root span for trace %s (service: %s, env: %s) and found a sample_rate of %f", + Z_STRVAL(span->property_trace_id), Z_STR_P(service), Z_STR_P(env), zval_get_double(sample_rate_zv)); } if (sample_rate_zv) { sample_rate = zval_get_double(sample_rate_zv); @@ -259,6 +282,7 @@ static void dd_decide_on_sampling(ddtrace_root_span_data *span) { zend_hash_str_del(metrics, ZEND_STRL("_dd.agent_psr")); } else { + // manual if it's not just inherited, otherwise this value is irrelevant (as sampling priority will be default) mechanism = DDTRACE_G(agent_rate_by_service) ? DD_MECHANISM_AGENT_RATE : DD_MECHANISM_DEFAULT; priority = sampling && !limited ? PRIORITY_SAMPLING_AUTO_KEEP : PRIORITY_SAMPLING_AUTO_REJECT; diff --git a/ext/random.c b/ext/random.c index 0ff8b5e33a..3dc7aca3cf 100644 --- a/ext/random.c +++ b/ext/random.c @@ -3,8 +3,12 @@ #include #include +#if PHP_VERSION_ID < 80400 #include #include +#else +#include +#endif #include "configuration.h" #include "ddtrace.h" diff --git a/ext/serializer.c b/ext/serializer.c index f4a3cbd1d9..aaf1d3f1a3 100644 --- a/ext/serializer.c +++ b/ext/serializer.c @@ -1639,6 +1639,49 @@ void ddtrace_serialize_span_to_array(ddtrace_span_data *span, zval *array) { add_assoc_double(&metrics_zv, "php.compilation.total_time_ms", ddtrace_compile_time_get() / 1000.); } + LOGEV(Span, { + zend_string *key; + zval *tag_zv; + zval *serialized_meta = zend_hash_str_find(Z_ARR_P(el), ZEND_STRL("meta")); + smart_str meta_str = {0}; + if (serialized_meta) { + ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARR_P(serialized_meta), key, tag_zv) { + if (meta_str.s) { + smart_str_appends(&meta_str, ", "); + } + smart_str_append(&meta_str, key); + smart_str_appends(&meta_str, "='"); + smart_str_append(&meta_str, Z_STR_P(tag_zv)); + smart_str_appendc(&meta_str, '\''); + } ZEND_HASH_FOREACH_END(); + smart_str_0(&meta_str); + } + smart_str metrics_str = {0}; + if (zend_hash_num_elements(Z_ARR(metrics_zv))) { + ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARR(metrics_zv), key, tag_zv) { + if (metrics_str.s) { + smart_str_appends(&metrics_str, ", "); + } + smart_str_append(&metrics_str, key); + smart_str_appends(&metrics_str, "='"); + smart_str_append_double(&metrics_str, Z_DVAL_P(tag_zv), 12, false); + smart_str_appendc(&metrics_str, '\''); + } ZEND_HASH_FOREACH_END(); + smart_str_0(&metrics_str); + } + prop_name = zend_hash_str_find(Z_ARR_P(el), ZEND_STRL("name")); // refetch, array may have been rehashed + log("Encoding span %" PRIu64 ": trace_id=%s, name='%s', service='%s', resource: '%s', type '%s' with tags: %s; and metrics: %s", + span->span_id, + Z_STRVAL(span->root->property_trace_id), Z_TYPE_P(prop_name) == IS_STRING ? Z_STRVAL_P(prop_name) : "", + Z_TYPE(prop_service_as_string) == IS_STRING ? Z_STRVAL(prop_service_as_string) : "", + Z_TYPE(prop_resource_as_string) == IS_STRING ? Z_STRVAL(prop_resource_as_string) : "", + Z_TYPE(prop_type_as_string) == IS_STRING ? Z_STRVAL(prop_type_as_string) : "", + meta_str.s ? ZSTR_VAL(meta_str.s) : "-", + metrics_str.s ? ZSTR_VAL(metrics_str.s) : "-"); + smart_str_free(&meta_str); + smart_str_free(&metrics_str); + }) + if (zend_hash_num_elements(Z_ARR(metrics_zv))) { zend_hash_str_add_new(Z_ARR_P(el), ZEND_STRL("metrics"), &metrics_zv); } else { diff --git a/ext/sidecar.c b/ext/sidecar.c index 90fc3f8e07..217b7f6de0 100644 --- a/ext/sidecar.c +++ b/ext/sidecar.c @@ -20,7 +20,13 @@ static void ddtrace_set_sidecar_globals(void) { } static bool dd_sidecar_connection_init(void) { - if (!ddtrace_ffi_try("Failed connecting to the sidecar", ddog_sidecar_connect_php(&ddtrace_sidecar, get_global_DD_INSTRUMENTATION_TELEMETRY_ENABLED()))) { + char logpath[PATH_MAX + 1]; + int error_fd = atomic_load(&ddtrace_error_log_fd); + if (error_fd == -1 || ddtrace_get_fd_path(error_fd, logpath) < 0) { + *logpath = 0; + } + + if (!ddtrace_ffi_try("Failed connecting to the sidecar", ddog_sidecar_connect_php(&ddtrace_sidecar, logpath, dd_zend_string_to_CharSlice(get_global_DD_TRACE_LOG_LEVEL()), get_global_DD_INSTRUMENTATION_TELEMETRY_ENABLED()))) { ddtrace_sidecar = NULL; return false; } @@ -51,7 +57,9 @@ static bool dd_sidecar_connection_init(void) { ddog_sidecar_session_set_config(&ddtrace_sidecar, session_id, ddtrace_endpoint, get_global_DD_TRACE_AGENT_FLUSH_INTERVAL(), get_global_DD_TRACE_AGENT_STACK_INITIAL_SIZE(), - get_global_DD_TRACE_AGENT_STACK_BACKLOG() * get_global_DD_TRACE_AGENT_MAX_PAYLOAD_SIZE()); + get_global_DD_TRACE_AGENT_STACK_BACKLOG() * get_global_DD_TRACE_AGENT_MAX_PAYLOAD_SIZE(), + get_global_DD_TRACE_DEBUG() ? DDOG_CHARSLICE_C("debug") : dd_zend_string_to_CharSlice(get_global_DD_TRACE_LOG_LEVEL()), + (ddog_CharSlice){ .ptr = logpath, .len = strlen(logpath) }); return true; } diff --git a/ext/span.c b/ext/span.c index f08972b347..01d89f6f39 100644 --- a/ext/span.c +++ b/ext/span.c @@ -39,6 +39,13 @@ static void dd_drop_span_nodestroy(ddtrace_span_data *span, bool silent) { span->notify_user_req_end = false; } span->duration = silent ? DDTRACE_SILENTLY_DROPPED_SPAN : DDTRACE_DROPPED_SPAN; + + if (span->std.ce == ddtrace_ce_root_span_data) { + ddtrace_root_span_data *root = ROOTSPANDATA(&span->std); + LOG(Span_Trace, "Dropping root span: trace_id=%s, span_id=%" PRIu64, Z_STRVAL(root->property_trace_id), span->span_id); + } else { + LOG(Span_Trace, "Dropping span: trace_id=%s, span_id=%" PRIu64, Z_STRVAL(span->root->property_trace_id), span->span_id); + } } static void dd_drop_span(ddtrace_span_data *span, bool silent) { @@ -225,6 +232,13 @@ ddtrace_span_data *ddtrace_open_span(enum ddtrace_span_dataype type) { ddtrace_set_global_span_properties(span); + if (root_span) { + ddtrace_root_span_data *root = ROOTSPANDATA(&span->std); + LOG(Span_Trace, "Starting new root span: trace_id=%s, span_id=%" PRIu64 ", parent_id=%" PRIu64 ", SpanStack=%d, parent_SpanStack=%d", Z_STRVAL(root->property_trace_id), span->span_id, root->parent_id, root->stack->std.handle, root->stack->parent_stack->std.handle); + } else { + LOG(Span_Trace, "Starting new span: trace_id=%s, span_id=%" PRIu64 ", parent_id=%" PRIu64 ", SpanStack=%d", Z_STRVAL(span->root->property_trace_id), span->span_id, SPANDATA(span->parent)->span_id, span->stack->std.handle); + } + return span; } @@ -312,6 +326,13 @@ void ddtrace_clear_execute_data_span(zend_ulong index, bool keep) { } void ddtrace_switch_span_stack(ddtrace_span_stack *target_stack) { + if (target_stack->active) { + ddtrace_span_data *span = SPANDATA(target_stack->active); + LOG(Span_Trace, "Switching to different SpanStack: %d, top of stack: trace_id=%s, span_id=%" PRIu64, target_stack->std.handle, Z_STRVAL(span->root->property_trace_id), span->span_id); + } else { + LOG(Span_Trace, "Switching to different SpanStack: %d", target_stack->std.handle); + } + GC_ADDREF(&target_stack->std); OBJ_RELEASE(&DDTRACE_G(active_stack)->std); DDTRACE_G(active_stack) = target_stack; @@ -342,6 +363,9 @@ ddtrace_span_stack *ddtrace_init_root_span_stack(void) { ZVAL_NULL(&span_stack->property_active); span_stack->root_stack = span_stack; span_stack->root_span = NULL; + + LOG(Span_Trace, "Creating new root SpanStack: %d, parent_stack: %d", span_stack->std.handle, span_stack->parent_stack ? span_stack->parent_stack->std.handle : 0); + return span_stack; } @@ -351,6 +375,9 @@ ddtrace_span_stack *ddtrace_init_span_stack(void) { ZVAL_COPY(&span_stack->property_active, &DDTRACE_G(active_stack)->property_active); span_stack->root_stack = DDTRACE_G(active_stack)->root_stack; span_stack->root_span = DDTRACE_G(active_stack)->root_span; + + LOG(Span_Trace, "Creating new SpanStack: %d, parent_stack: %d", span_stack->std.handle, span_stack->parent_stack ? span_stack->parent_stack->std.handle : 0); + return span_stack; } @@ -590,6 +617,13 @@ void ddtrace_close_top_span_without_stack_swap(ddtrace_span_data *span) { span->notify_user_req_end = false; } + if (span->std.ce == ddtrace_ce_root_span_data) { + ddtrace_root_span_data *root = ROOTSPANDATA(&span->std); + LOG(Span_Trace, "Closing root span: trace_id=%s, span_id=%" PRIu64, Z_STRVAL(root->property_trace_id), span->span_id); + } else { + LOG(Span_Trace, "Closing span: trace_id=%s, span_id=%" PRIu64, Z_STRVAL(span->root->property_trace_id), span->span_id); + } + if (!stack->active || SPANDATA(stack->active)->stack != stack) { dd_close_entry_span_of_stack(stack); } @@ -630,6 +664,7 @@ void ddtrace_close_all_open_spans(bool force_close_root_span) { ddtrace_span_data *span; while (stack->active && (span = SPANDATA(stack->active))->stack == stack) { + LOG(Span_Trace, "Automatically finishing the next span (in shutdown or force flush requested)"); if (get_DD_AUTOFINISH_SPANS() || (force_close_root_span && span->type == DDTRACE_AUTOROOT_SPAN)) { dd_trace_stop_span_time(span); ddtrace_close_span(span); diff --git a/libdatadog b/libdatadog index b5eddd6fd0..0eaf342aee 160000 --- a/libdatadog +++ b/libdatadog @@ -1 +1 @@ -Subproject commit b5eddd6fd04e905905279a5ede9fcab89839f410 +Subproject commit 0eaf342aee7f9336107ed5a508b12caedd42141e diff --git a/profiling/src/lib.rs b/profiling/src/lib.rs index 85aeb0eb13..69fa35727a 100644 --- a/profiling/src/lib.rs +++ b/profiling/src/lib.rs @@ -839,9 +839,10 @@ extern "C" fn shutdown(_extension: *mut ZendExtension) { // data race condition. unsafe { config::shutdown() }; - // SAFETY: zai_config_mshutdown should be safe to cal in shutdown instead + // SAFETY: zai_config_mshutdown should be safe to call in shutdown instead // of mshutdown. unsafe { bindings::zai_config_mshutdown() }; + unsafe { bindings::zai_json_shutdown_bindings() }; } /// Notifies the profiler a trace has finished so it can update information diff --git a/profiling/src/php_ffi.h b/profiling/src/php_ffi.h index 49c188d3d8..33fd4eddb8 100644 --- a/profiling/src/php_ffi.h +++ b/profiling/src/php_ffi.h @@ -17,6 +17,8 @@ // Profiling needs ZAI config for INI support. #include +// And json to cleanup json state for graceful restart +#include // Used to communicate strings from C -> Rust. #include diff --git a/tests/Common/WebFrameworkTestCase.php b/tests/Common/WebFrameworkTestCase.php index 37b853add3..b4ad44920f 100644 --- a/tests/Common/WebFrameworkTestCase.php +++ b/tests/Common/WebFrameworkTestCase.php @@ -140,6 +140,15 @@ private static function tearDownWebServer() } } + protected function reloadAppServer() + { + if (\method_exists(self::$appServer, "reload")) { + self::$appServer->reload(); + } else { + $this->markTestSkipped("Webserver reload not supported"); + } + } + /** * Executed a call to the test web server. * diff --git a/tests/Integrations/Custom/NotAutoloaded/ApacheReloadTest.php b/tests/Integrations/Custom/NotAutoloaded/ApacheReloadTest.php new file mode 100644 index 0000000000..6bb5a02341 --- /dev/null +++ b/tests/Integrations/Custom/NotAutoloaded/ApacheReloadTest.php @@ -0,0 +1,43 @@ + 'custom_no_autoloaded_app', + 'DD_TRACE_NO_AUTOLOADER' => 'true', + ]); + } + + public function testWebserverReload() + { + $traces = $this->tracesFromWebRequest(function () { + $this->call(GetSpec::create('A web request to a framework not using auto loaders', '/')); + }); + + $this->assertSpans($traces, [ + SpanAssertion::exists('web.request'), + ]); + + $this->reloadAppServer(); + + $traces = $this->tracesFromWebRequest(function () { + $this->call(GetSpec::create('A web request to a framework not using auto loaders', '/')); + }); + + $this->assertSpans($traces, [ + SpanAssertion::exists('web.request'), + ]); + } +} diff --git a/tests/Metrics/SigSegV/SigSegVTest.php b/tests/Metrics/SigSegV/SigSegVTest.php index 040c6a8915..76efdc7cbe 100644 --- a/tests/Metrics/SigSegV/SigSegVTest.php +++ b/tests/Metrics/SigSegV/SigSegVTest.php @@ -45,6 +45,6 @@ public function testGet() self::assertFileExists($log); $contents = \file_get_contents($log); - self::assertRegExp("/.*Segmentation fault\n.*sigsegv health metric sent/", $contents); + self::assertRegExp("/.*Segmentation fault/", $contents); } } diff --git a/tests/Sapi/PhpApache/PhpApache.php b/tests/Sapi/PhpApache/PhpApache.php index 70c9b88632..356a2ed18e 100644 --- a/tests/Sapi/PhpApache/PhpApache.php +++ b/tests/Sapi/PhpApache/PhpApache.php @@ -149,6 +149,12 @@ public function start() $this->configChanged = false; } + public function reload() + { + $this->process->signal(SIGUSR1); + usleep(10000); + } + public function stop() { // I do not understand why we get a SIGTERM when we try to send a SIGTERM to apache. diff --git a/tests/WebServer.php b/tests/WebServer.php index 3bbe216c25..df137755ee 100644 --- a/tests/WebServer.php +++ b/tests/WebServer.php @@ -9,6 +9,7 @@ use DDTrace\Tests\Sapi\PhpFpm\PhpFpm; use DDTrace\Tests\Sapi\Roadrunner\RoadrunnerServer; use DDTrace\Tests\Sapi\Sapi; +use PHPUnit\Framework\Assert; /** * A controllable php server running in a separate process. @@ -180,6 +181,15 @@ public function start() usleep(500000); } + public function reload() + { + if (\method_exists($this->sapi, "reload")) { + $this->sapi->reload(); + } else { + Assert::markTestSkipped("Webserver reload not supported"); + } + } + /** * Teardown promptly. */ diff --git a/tests/ext/background-sender/agent_headers.phpt b/tests/ext/background-sender/agent_headers.phpt index 0541ae08da..69e5e947b5 100644 --- a/tests/ext/background-sender/agent_headers.phpt +++ b/tests/ext/background-sender/agent_headers.phpt @@ -3,7 +3,7 @@ HTTP headers are sent to the Agent from the background sender --SKIPIF-- --ENV-- -DD_TRACE_DEBUG=1 +DD_TRACE_LOG_LEVEL=info,startup=off DD_TRACE_BGS_ENABLED=1 DD_AGENT_HOST=request-replayer DD_TRACE_AGENT_PORT=80 diff --git a/tests/ext/background-sender/agent_headers_container_id.phpt b/tests/ext/background-sender/agent_headers_container_id.phpt index b5b19f906a..bee4f5b481 100644 --- a/tests/ext/background-sender/agent_headers_container_id.phpt +++ b/tests/ext/background-sender/agent_headers_container_id.phpt @@ -5,7 +5,7 @@ The container ID is sent via HTTP headers to the Agent --INI-- ddtrace.cgroup_file={PWD}/stubs/cgroup.docker --ENV-- -DD_TRACE_DEBUG=1 +DD_TRACE_LOG_LEVEL=info,startup=off DD_TRACE_BGS_ENABLED=1 DD_AGENT_HOST=request-replayer DD_TRACE_AGENT_PORT=80 diff --git a/tests/ext/background-sender/agent_headers_container_id_empty.phpt b/tests/ext/background-sender/agent_headers_container_id_empty.phpt index 02ecedb470..46c61eb031 100644 --- a/tests/ext/background-sender/agent_headers_container_id_empty.phpt +++ b/tests/ext/background-sender/agent_headers_container_id_empty.phpt @@ -5,7 +5,7 @@ An empty container ID is not sent via HTTP headers to the Agent --INI-- ddtrace.cgroup_file={PWD}/stubs/cgroup.empty --ENV-- -DD_TRACE_DEBUG=1 +DD_TRACE_LOG_LEVEL=info,startup=off DD_TRACE_BGS_ENABLED=1 DD_AGENT_HOST=request-replayer DD_TRACE_AGENT_PORT=80 diff --git a/tests/ext/background-sender/agent_headers_container_id_fargate.phpt b/tests/ext/background-sender/agent_headers_container_id_fargate.phpt index eae21f586a..8175b81179 100644 --- a/tests/ext/background-sender/agent_headers_container_id_fargate.phpt +++ b/tests/ext/background-sender/agent_headers_container_id_fargate.phpt @@ -5,7 +5,7 @@ The Fargate 1.4+ container ID is sent via HTTP headers to the Agent --INI-- ddtrace.cgroup_file={PWD}/stubs/cgroup.fargate.1.4 --ENV-- -DD_TRACE_DEBUG=1 +DD_TRACE_LOG_LEVEL=info,startup=off DD_TRACE_BGS_ENABLED=1 DD_AGENT_HOST=request-replayer DD_TRACE_AGENT_PORT=80 diff --git a/tests/ext/background-sender/agent_headers_ignore_userland.phpt b/tests/ext/background-sender/agent_headers_ignore_userland.phpt index 97cd03cbfa..9d8161fa9b 100644 --- a/tests/ext/background-sender/agent_headers_ignore_userland.phpt +++ b/tests/ext/background-sender/agent_headers_ignore_userland.phpt @@ -6,7 +6,7 @@ include __DIR__ . '/../includes/skipif_no_dev_env.inc'; if (dd_trace_env_config('DD_TRACE_SIDECAR_TRACE_SENDER')) die("skip: background-sender only test"); ?> --ENV-- -DD_TRACE_DEBUG=1 +DD_TRACE_LOG_LEVEL=info,startup=off DD_TRACE_BGS_ENABLED=1 DD_AGENT_HOST=request-replayer DD_TRACE_AGENT_PORT=80 diff --git a/tests/ext/background-sender/agent_sampling.phpt b/tests/ext/background-sender/agent_sampling.phpt index 554b402fb9..f5e6c01c16 100644 --- a/tests/ext/background-sender/agent_sampling.phpt +++ b/tests/ext/background-sender/agent_sampling.phpt @@ -3,7 +3,7 @@ The background sender informs about changes to the agent sample rate --SKIPIF-- --ENV-- -DD_TRACE_DEBUG=1 +DD_TRACE_LOG_LEVEL=info,startup=off DD_AGENT_HOST=request-replayer DD_TRACE_AGENT_PORT=80 DD_TRACE_AGENT_FLUSH_INTERVAL=333 diff --git a/tests/ext/background-sender/default_unix_domain_socket_agent.phpt b/tests/ext/background-sender/default_unix_domain_socket_agent.phpt index 29ea2336ad..c0a08dd4d7 100644 --- a/tests/ext/background-sender/default_unix_domain_socket_agent.phpt +++ b/tests/ext/background-sender/default_unix_domain_socket_agent.phpt @@ -15,7 +15,7 @@ if (!file_exists("/var/run/datadog/apm.socket")) { RequestReplayer::launchUnixProxy("/var/run/datadog/apm.socket"); } -$logs = dd_get_startup_logs([], ['DD_TRACE_DEBUG=1']); +$logs = dd_get_startup_logs([], ['DD_TRACE_LOG_LEVEL=error,startup=info']); dd_dump_startup_logs($logs, [ 'agent_error', // should be absent diff --git a/tests/ext/close_spans_until.phpt b/tests/ext/close_spans_until.phpt index 10d16d3e80..33f5209ba1 100644 --- a/tests/ext/close_spans_until.phpt +++ b/tests/ext/close_spans_until.phpt @@ -1,7 +1,7 @@ --TEST-- Test DDTrace\close_spans_until --ENV-- -DD_TRACE_DEBUG=1 +DD_TRACE_LOG_LEVEL=info,span=trace,startup=off --FILE-- --EXPECTF-- +[ddtrace] [span] Creating new root SpanStack: %d, parent_stack: 0 +[ddtrace] [span] Creating new root SpanStack: %d, parent_stack: %d +[ddtrace] [span] Switching to different SpanStack: %d +[ddtrace] [span] Starting new root span: trace_id=%s, span_id=%d, parent_id=0, SpanStack=%d, parent_SpanStack=%d +[ddtrace] [span] Starting new span: trace_id=%s, span_id=%d, parent_id=%d, SpanStack=%d +[ddtrace] [span] Starting new span: trace_id=%s, span_id=%d, parent_id=%d, SpanStack=%d +[ddtrace] [span] Starting new span: trace_id=%s, span_id=%d, parent_id=%d, SpanStack=%d bool(false) +[ddtrace] [span] Closing span: trace_id=%s, span_id=%d +[ddtrace] [span] Closing span: trace_id=%s, span_id=%d int(2) +[ddtrace] [span] Starting new span: trace_id=%s, span_id=%d, parent_id=%d, SpanStack=%d +[ddtrace] [span] Starting new span: trace_id=%s, span_id=%d, parent_id=%d, SpanStack=%d +[ddtrace] [span] Starting new span: trace_id=%s, span_id=%d, parent_id=%d, SpanStack=%d +[ddtrace] [span] Closing span: trace_id=%s, span_id=%d +[ddtrace] [span] Closing span: trace_id=%s, span_id=%d int(2) +[ddtrace] [span] Closing span: trace_id=%s, span_id=%d +[ddtrace] [span] Closing span: trace_id=%s, span_id=%d +[ddtrace] [span] Closing root span: trace_id=%s, span_id=%d +[ddtrace] [span] Switching to different SpanStack: %d int(1) int(0) +[ddtrace] [span] Encoding span %d: trace_id=%s, name='close_spans_until.php', service='close_spans_until.php', resource: 'close_spans_until.php', type 'cli' with tags: runtime-id='%s', _dd.p.dm='-0', _dd.p.tid='%s'; and metrics: process_id='%d', _dd.agent_psr='1', _sampling_priority_v1='1', php.compilation.total_time_ms='%f' +[ddtrace] [span] Encoding span %d: trace_id=%s, name='traced', service='close_spans_until.php', resource: 'traced', type 'cli' with tags: -; and metrics: - +[ddtrace] [span] Encoding span %d: trace_id=%s, name='', service='close_spans_until.php', resource: '', type 'cli' with tags: -; and metrics: - +[ddtrace] [span] Encoding span %d: trace_id=%s, name='', service='close_spans_until.php', resource: '', type 'cli' with tags: -; and metrics: - +[ddtrace] [span] Encoding span %d: trace_id=%s, name='', service='close_spans_until.php', resource: '', type 'cli' with tags: -; and metrics: - +[ddtrace] [span] Encoding span %d: trace_id=%s, name='', service='close_spans_until.php', resource: '', type 'cli' with tags: -; and metrics: - +[ddtrace] [span] Encoding span %d: trace_id=%s, name='', service='close_spans_until.php', resource: '', type 'cli' with tags: -; and metrics: - [ddtrace] [info] Flushing trace of size 7 to send-queue for %s \ No newline at end of file diff --git a/tests/ext/dd_trace_log_file.phpt b/tests/ext/dd_trace_log_file.phpt new file mode 100644 index 0000000000..0c282cf1e5 --- /dev/null +++ b/tests/ext/dd_trace_log_file.phpt @@ -0,0 +1,23 @@ +--TEST-- +Using DD_TRACE_LOG_FILE +--SKIPIF-- + +--INI-- +datadog.trace.log_file={PWD}/dd_trace_log_file.log +datadog.trace.log_level="Off,span=Trace" +datadog.trace.generate_root_span=0 +--FILE-- + +--EXPECTF-- +[%s] [ddtrace] [span] Creating new root SpanStack: %d, parent_stack: 0 +--CLEAN-- + diff --git a/tests/ext/dd_trace_serialize_msgpack_error.phpt b/tests/ext/dd_trace_serialize_msgpack_error.phpt index 229fb17b79..229215e630 100644 --- a/tests/ext/dd_trace_serialize_msgpack_error.phpt +++ b/tests/ext/dd_trace_serialize_msgpack_error.phpt @@ -1,7 +1,7 @@ --TEST-- dd_trace_serialize_msgpack() error conditions --ENV-- -DD_TRACE_DEBUG=1 +DD_TRACE_LOG_LEVEL=info,startup=off --FILE-- = 70300 && PHP_VERSION_ID < 70400) die('skip: Bailing out in autoloaders is fundamentally broken in PHP 7.3'); ?> --ENV-- -DD_TRACE_DEBUG=1 +DD_TRACE_LOG_LEVEL=info,startup=off --FILE-- --EXPECTF-- [ddtrace] [warning] UnwindExit thrown in ddtrace's closure defined at %s:%d for x(): +[ddtrace] [span] Encoding span %d: trace_id=%s, name='die_in_sandbox.php', service='die_in_sandbox.php', resource: 'die_in_sandbox.php', type 'cli' with tags: runtime-id='%s', _dd.p.dm='-0', _dd.p.tid='%s'; and metrics: process_id='%d', _dd.agent_psr='1', _sampling_priority_v1='1', php.compilation.total_time_ms='%f' +[ddtrace] [span] Encoding span %d: trace_id=%s, name='x', service='die_in_sandbox.php', resource: 'x', type 'cli' with tags: -; and metrics: - [ddtrace] [info] Flushing trace of size 2 to send-queue for %s diff --git a/tests/ext/sandbox/exception_error_log.phpt b/tests/ext/sandbox/exception_error_log.phpt index 2b850bae62..df00bf8e1c 100644 --- a/tests/ext/sandbox/exception_error_log.phpt +++ b/tests/ext/sandbox/exception_error_log.phpt @@ -1,7 +1,7 @@ --TEST-- Exception in tracing closure gets logged --ENV-- -DD_TRACE_DEBUG=1 +DD_TRACE_LOG_LEVEL=info,startup=off DD_TRACE_TRACED_INTERNAL_FUNCTIONS=array_sum --FILE-- --EXPECTF-- -[ddtrace] [warning] DDTrace\hook_function was given neither prehook nor posthook in %s on line %d +[ddtrace] [warning] DDTrace\hook_function was given neither prehook nor posthook in %s on line %d; This message is only displayed once. Specify DD_TRACE_ONCE_LOGS=0 to show all messages. bool(false) Hello, Datadog. [ddtrace] [info] Flushing trace of size 1 to send-queue for %s diff --git a/tests/ext/sandbox/hook_function/hook_does_not_leak_error.phpt b/tests/ext/sandbox/hook_function/hook_does_not_leak_error.phpt index 98e14e4ec9..757f5c22f0 100644 --- a/tests/ext/sandbox/hook_function/hook_does_not_leak_error.phpt +++ b/tests/ext/sandbox/hook_function/hook_does_not_leak_error.phpt @@ -5,7 +5,7 @@ Check that sandboxed hooks do not invoke error handlers or set the error code --GET-- this+must+run+via+cgi --INI-- -datadog.trace.debug=1 +datadog.trace.log_level=info,startup=off --FILE-- --EXPECTF-- -[ddtrace] [warning] DDTrace\hook_method was given neither prehook nor posthook in %s on line %d +[ddtrace] [warning] DDTrace\hook_method was given neither prehook nor posthook in %s on line %d; This message is only displayed once. Specify DD_TRACE_ONCE_LOGS=0 to show all messages. bool(false) Hello, Datadog. [ddtrace] [info] Flushing trace of size 1 to send-queue for %s diff --git a/tests/ext/sandbox/hook_method/posthook_07.phpt b/tests/ext/sandbox/hook_method/posthook_07.phpt index 3a0939d699..a1544929f5 100644 --- a/tests/ext/sandbox/hook_method/posthook_07.phpt +++ b/tests/ext/sandbox/hook_method/posthook_07.phpt @@ -8,7 +8,7 @@ In this one, we're making sure that a tracing closure still works when: - It is defined inside another closure that does have a scope. - It is targeting a method. --ENV-- -DD_TRACE_DEBUG=1 +DD_TRACE_LOG_LEVEL=info,startup=off --FILE-- --ENV-- -DD_TRACE_DEBUG=1 +DD_TRACE_LOG_LEVEL=info,startup=off DD_TRACE_GENERATE_ROOT_SPAN=0 --FILE-- --EXPECT-- -[ddtrace] [error] Cannot run tracing closure for dd_trace_serialize_closed_spans(); spans out of sync +[ddtrace] [error] Cannot run tracing closure for dd_trace_serialize_closed_spans(); spans out of sync; This message is only displayed once. Specify DD_TRACE_ONCE_LOGS=0 to show all messages. array(0) { } Done. diff --git a/tests/ext/sandbox/spans_out_of_sync_02.phpt b/tests/ext/sandbox/spans_out_of_sync_02.phpt index 2c5f6ef296..e9f54330f1 100644 --- a/tests/ext/sandbox/spans_out_of_sync_02.phpt +++ b/tests/ext/sandbox/spans_out_of_sync_02.phpt @@ -1,7 +1,7 @@ --TEST-- Gracefully handle out-of-sync spans from traced function [internal][default properties] --ENV-- -DD_TRACE_DEBUG=1 +DD_TRACE_LOG_LEVEL=info,startup=off DD_TRACE_TRACED_INTERNAL_FUNCTIONS=dd_trace_serialize_closed_spans --FILE-- --EXPECT-- -[ddtrace] [error] Cannot run tracing closure for dd_trace_serialize_closed_spans(); spans out of sync +[ddtrace] [error] Cannot run tracing closure for dd_trace_serialize_closed_spans(); spans out of sync; This message is only displayed once. Specify DD_TRACE_ONCE_LOGS=0 to show all messages. array(0) { } Done. diff --git a/tests/ext/sandbox/spans_out_of_sync_03.phpt b/tests/ext/sandbox/spans_out_of_sync_03.phpt index eeacd665d8..2e361c0714 100644 --- a/tests/ext/sandbox/spans_out_of_sync_03.phpt +++ b/tests/ext/sandbox/spans_out_of_sync_03.phpt @@ -1,7 +1,7 @@ --TEST-- Gracefully handle out-of-sync spans from traced function [user] --ENV-- -DD_TRACE_DEBUG=1 +DD_TRACE_LOG_LEVEL=info,startup=off --FILE-- handle, "php_json_encode"); if (zai_json_encode == NULL) { zai_json_encode = DL_FETCH_SYMBOL(json_me->handle, "_php_json_encode"); @@ -138,6 +142,13 @@ bool zai_json_setup_bindings(void) { return zai_json_encode != NULL; } +void zai_json_shutdown_bindings(void) { + if (zai_json_dynamic_bindings) { + zai_json_dynamic_bindings = false; + php_json_serializable_ce = NULL; + } +} + void zai_json_release_persistent_array(HashTable *ht) { #if PHP_VERSION_ID < 70300 if (--GC_REFCOUNT(ht) == 0) diff --git a/zend_abstract_interface/json/json.h b/zend_abstract_interface/json/json.h index 848a2c4354..0d395330c3 100644 --- a/zend_abstract_interface/json/json.h +++ b/zend_abstract_interface/json/json.h @@ -45,5 +45,6 @@ extern __attribute__((weak)) zend_class_entry *php_json_serializable_ce; void zai_json_release_persistent_array(HashTable *ht); void zai_json_dtor_pzval(zval *pval); bool zai_json_setup_bindings(void); +void zai_json_shutdown_bindings(void); #endif // ZAI_JSON_H diff --git a/zend_abstract_interface/uri_normalization/uri_normalization.c b/zend_abstract_interface/uri_normalization/uri_normalization.c index 2a78606288..40e0666db1 100644 --- a/zend_abstract_interface/uri_normalization/uri_normalization.c +++ b/zend_abstract_interface/uri_normalization/uri_normalization.c @@ -24,6 +24,14 @@ static inline zend_string *zai_php_pcre_replace(zend_string *regex, zend_string php_pcre_replace(regex, subj, subjstr, subjlen, replace, limit, (int *)replacements) #endif +#if PHP_VERSION_ID < 80400 +#if PHP_VERSION_ID < 70400 +#define php_pcre_match_impl(pce, subject_str, return_value, subpats, global, flags, start_offset) php_pcre_match_impl(pce, ZSTR_VAL(subject_str), ZSTR_LEN(subject_str), return_value, subpats, global != 0, 0, flags, start_offset) +#else +#define php_pcre_match_impl(pce, subject_str, return_value, subpats, global, flags, start_offset) php_pcre_match_impl(pce, subject_str, return_value, subpats, global != 0, 0, flags, start_offset) +#endif +#endif + static zend_bool zai_starts_with_protocol(zend_string *str) { // See: https://tools.ietf.org/html/rfc3986#page-17 if (ZSTR_VAL(str)[0] < 'a' || ZSTR_VAL(str)[0] > 'z') { @@ -229,11 +237,7 @@ bool zai_match_regex(zend_string *pattern, zend_string *subject) { } zval ret; -#if PHP_VERSION_ID < 70400 - php_pcre_match_impl(pce, ZSTR_VAL(subject), ZSTR_LEN(subject), &ret, NULL, 0, 0, 0, 0); -#else - php_pcre_match_impl(pce, subject, &ret, NULL, 0, 0, 0, 0); -#endif + php_pcre_match_impl(pce, subject, &ret, NULL, 0, 0, 0); zend_string_release(regex); return Z_TYPE(ret) == IS_LONG && Z_LVAL(ret) > 0; }