From f4640e2262864a068be4754ee36a1253bd943c20 Mon Sep 17 00:00:00 2001 From: XieJiSS Date: Mon, 4 Nov 2024 12:41:23 +0800 Subject: [PATCH] feat: bump py-spy to support python 3.12 and 3.13 --- Cargo.lock | 301 ++++++++++-------- pyroscope_backends/pyroscope_pyspy/Cargo.toml | 4 +- pyroscope_backends/pyroscope_rbspy/Cargo.toml | 2 +- pyroscope_ffi/python/lib/Cargo.toml | 2 +- pyroscope_ffi/ruby/ext/rbspy/Cargo.toml | 2 +- 5 files changed, 178 insertions(+), 133 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4764e59..bb17f98 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8,15 +8,31 @@ version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ - "cpp_demangle 0.4.3", + "cpp_demangle", "fallible-iterator", - "gimli", + "gimli 0.28.1", "memmap2 0.5.10", - "object", + "object 0.32.2", "rustc-demangle", "smallvec", ] +[[package]] +name = "addr2line" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" +dependencies = [ + "cpp_demangle", + "fallible-iterator", + "gimli 0.31.1", + "memmap2 0.9.4", + "object 0.36.5", + "rustc-demangle", + "smallvec", + "typed-arena", +] + [[package]] name = "adler" version = "1.0.2" @@ -29,17 +45,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" -[[package]] -name = "ahash" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - [[package]] name = "ahash" version = "0.8.11" @@ -238,12 +243,12 @@ version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ - "addr2line", + "addr2line 0.21.0", "cc", "cfg-if", "libc", "miniz_oxide", - "object", + "object 0.32.2", "rustc-demangle", ] @@ -284,62 +289,59 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.59.2" +version = "0.68.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" +checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "cexpr", "clang-sys", - "clap 2.34.0", - "env_logger 0.9.3", "lazy_static", "lazycell", "log", "peeking_take_while", + "prettyplease", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", + "syn 2.0.58", "which", ] [[package]] name = "bindgen" -version = "0.68.1" +version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ "bitflags 2.5.0", "cexpr", "clang-sys", + "itertools 0.12.1", "lazy_static", "lazycell", - "log", - "peeking_take_while", - "prettyplease", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", "syn 2.0.58", - "which", ] [[package]] name = "bindgen" -version = "0.69.4" +version = "0.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f" dependencies = [ "bitflags 2.5.0", "cexpr", "clang-sys", "itertools 0.12.1", - "lazy_static", - "lazycell", + "log", + "prettyplease", "proc-macro2", "quote", "regex", @@ -666,15 +668,6 @@ version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" -[[package]] -name = "cpp_demangle" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f" -dependencies = [ - "cfg-if", -] - [[package]] name = "cpp_demangle" version = "0.4.3" @@ -720,11 +713,12 @@ dependencies = [ [[package]] name = "dashmap" -version = "5.5.3" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" dependencies = [ "cfg-if", + "crossbeam-utils", "hashbrown 0.14.3", "lock_api", "once_cell", @@ -863,12 +857,12 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.9.3" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" dependencies = [ - "atty", "humantime 2.1.0", + "is-terminal", "log", "regex", "termcolor", @@ -893,17 +887,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" -[[package]] -name = "errno" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" -dependencies = [ - "errno-dragonfly", - "libc", - "winapi", -] - [[package]] name = "errno" version = "0.3.8" @@ -914,16 +897,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "event-listener" version = "4.0.3" @@ -1131,6 +1104,16 @@ dependencies = [ "stable_deref_trait", ] +[[package]] +name = "gimli" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" +dependencies = [ + "fallible-iterator", + "stable_deref_trait", +] + [[package]] name = "glob" version = "0.3.1" @@ -1139,9 +1122,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "goblin" -version = "0.5.4" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7666983ed0dd8d21a6f6576ee00053ca0926fb281a5522577a4dbd0f1b54143" +checksum = "f27c1b4369c2cd341b5de549380158b105a04c331be5db9110eef7b6d2742134" dependencies = [ "log", "plain", @@ -1150,20 +1133,20 @@ dependencies = [ [[package]] name = "goblin" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27c1b4369c2cd341b5de549380158b105a04c331be5db9110eef7b6d2742134" +checksum = "bb07a4ffed2093b118a525b1d8f5204ae274faed5604537caf7135d0f18d9887" dependencies = [ "log", "plain", - "scroll 0.11.0", + "scroll 0.12.0", ] [[package]] name = "goblin" -version = "0.8.0" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb07a4ffed2093b118a525b1d8f5204ae274faed5604537caf7135d0f18d9887" +checksum = "53ab3f32d1d77146981dea5d6b1e8fe31eedcb7013e5e00d6ccd1259a4b4d923" dependencies = [ "log", "plain", @@ -1175,8 +1158,14 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.7.8", + "ahash", ] [[package]] @@ -1428,40 +1417,49 @@ dependencies = [ [[package]] name = "indicatif" -version = "0.16.2" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d207dc617c7a380ab07ff572a6e52fa202a2a8f355860ac9c38e23f8196be1b" +checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" dependencies = [ "console", - "lazy_static", + "instant", "number_prefix", - "regex", + "portable-atomic", + "unicode-width", ] [[package]] name = "inferno" -version = "0.11.14" +version = "0.11.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6e66fa9bb3c52f40d05c11b78919ff2f18993c2305bd8a62556d20cb3e9606f" +checksum = "232929e1d75fe899576a3d5c7416ad0d88dbfbb3c3d6aa00873a7408a50ddb88" dependencies = [ - "ahash 0.8.11", - "atty", - "clap 3.2.25", + "ahash", + "clap 4.5.4", "crossbeam-channel", "crossbeam-utils", "dashmap", - "env_logger 0.9.3", - "indexmap 1.9.3", + "env_logger 0.11.2", + "indexmap 2.2.6", + "is-terminal", "itoa", "log", "num-format", - "num_cpus", "once_cell", "quick-xml", "rgb", "str_stack", ] +[[package]] +name = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +dependencies = [ + "cfg-if", +] + [[package]] name = "interprocess" version = "1.2.1" @@ -1560,9 +1558,9 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "lazycell" @@ -1625,16 +1623,6 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" -[[package]] -name = "libproc" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6466fc1f834276563fbbd4be1c24236ef92bb9efdbd4691e07f1cf85a0b407f0" -dependencies = [ - "errno 0.2.8", - "libc", -] - [[package]] name = "libproc" version = "0.14.6" @@ -1642,7 +1630,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8eb6497078a4c9c2aca63df56d8dce6eb4381d53a960f781a3a748f7ea97436d" dependencies = [ "bindgen 0.69.4", - "errno 0.3.8", + "errno", "libc", ] @@ -1695,11 +1683,11 @@ dependencies = [ [[package]] name = "lru" -version = "0.7.8" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a" +checksum = "718e8fae447df0c7e1ba7f5189829e63fd536945c8988d61444c19039f16b670" dependencies = [ - "hashbrown 0.12.3", + "hashbrown 0.13.2", ] [[package]] @@ -1938,7 +1926,18 @@ checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "flate2", "memchr", - "ruzstd", + "ruzstd 0.5.0", +] + +[[package]] +name = "object" +version = "0.36.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" +dependencies = [ + "flate2", + "memchr", + "ruzstd 0.7.2", ] [[package]] @@ -2120,6 +2119,12 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" +[[package]] +name = "portable-atomic" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" + [[package]] name = "powerfmt" version = "0.2.0" @@ -2248,28 +2253,28 @@ dependencies = [ [[package]] name = "proc-maps" -version = "0.2.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2f62c16ccc63ce2f590b17b8b9b33616f59631b8982ad52ed21e7f6d936c409" +checksum = "0ec8fdc22cb95c02f6a26a91fb1cd60a7a115916c2ed3b09d0a312e11785bd57" dependencies = [ "anyhow", - "bindgen 0.59.2", + "bindgen 0.68.1", "libc", - "libproc 0.10.0", + "libproc", "mach2", "winapi", ] [[package]] name = "proc-maps" -version = "0.3.2" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ec8fdc22cb95c02f6a26a91fb1cd60a7a115916c2ed3b09d0a312e11785bd57" +checksum = "3db44c5aa60e193a25fcd93bb9ed27423827e8f118897866f946e2cf936c44fb" dependencies = [ "anyhow", - "bindgen 0.68.1", + "bindgen 0.70.1", "libc", - "libproc 0.14.6", + "libproc", "mach2", "winapi", ] @@ -2322,31 +2327,32 @@ dependencies = [ [[package]] name = "py-spy" -version = "0.3.14" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08585ad9771560e3243153e5194ba15910507bfb2e8000285cfe0432ae17ba6" +checksum = "c4f4300b4ae8b012f43c3ec196a5c24dfb7921d293b3b47e6856617271ae6d3b" dependencies = [ "anyhow", "chrono", "clap 3.2.25", "clap_complete", "console", - "cpp_demangle 0.3.5", + "cpp_demangle", "ctrlc", - "env_logger 0.9.3", - "goblin 0.5.4", + "env_logger 0.10.2", + "goblin 0.9.2", "indicatif", "inferno", "lazy_static", "libc", "log", "lru", - "memmap", - "proc-maps 0.2.1", + "memmap2 0.9.4", + "num-traits 0.2.18", + "proc-maps 0.4.0", "rand", "rand_distr", "regex", - "remoteprocess", + "remoteprocess 0.5.0", "serde 1.0.197", "serde_derive", "serde_json", @@ -2427,7 +2433,7 @@ dependencies = [ "inferno", "lazy_static", "libc", - "libproc 0.14.6", + "libproc", "log", "memmap2 0.9.4", "nix 0.28.0", @@ -2435,7 +2441,7 @@ dependencies = [ "prost 0.12.3", "rand", "rbspy-ruby-structs", - "remoteprocess", + "remoteprocess 0.4.13", "semver", "serde 1.0.197", "serde_derive", @@ -2643,23 +2649,47 @@ version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8928e7901c7fc6f1f8d697d77a9da0f749f96454714a8d097662531640647409" dependencies = [ - "addr2line", + "addr2line 0.21.0", "goblin 0.7.1", "lazy_static", "libc", - "libproc 0.14.6", + "libproc", "log", "mach", "mach_o_sys", "memmap", "nix 0.26.4", - "object", + "object 0.32.2", "proc-maps 0.3.2", "read-process-memory", "regex", "winapi", ] +[[package]] +name = "remoteprocess" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6194770c7afc1d2ca42acde19267938eb7d52ccb5b727f1a2eafa8d4d00ff20" +dependencies = [ + "addr2line 0.24.2", + "cfg-if", + "goblin 0.9.2", + "lazy_static", + "libc", + "libproc", + "log", + "mach", + "mach_o_sys", + "memmap2 0.9.4", + "nix 0.26.4", + "object 0.36.5", + "proc-maps 0.4.0", + "read-process-memory", + "regex", + "winapi", +] + [[package]] name = "reqwest" version = "0.12.2" @@ -2769,7 +2799,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" dependencies = [ "bitflags 1.3.2", - "errno 0.3.8", + "errno", "io-lifetimes", "libc", "linux-raw-sys 0.3.8", @@ -2783,7 +2813,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ "bitflags 2.5.0", - "errno 0.3.8", + "errno", "libc", "linux-raw-sys 0.4.13", "windows-sys 0.52.0", @@ -2846,6 +2876,15 @@ dependencies = [ "twox-hash", ] +[[package]] +name = "ruzstd" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99c3938e133aac070997ddc684d4b393777d293ba170f2988c8fd5ea2ad4ce21" +dependencies = [ + "twox-hash", +] + [[package]] name = "ryu" version = "1.0.17" @@ -3138,7 +3177,7 @@ dependencies = [ "memmap2 0.9.4", "proc-maps 0.3.2", "regex", - "remoteprocess", + "remoteprocess 0.4.13", ] [[package]] @@ -3201,7 +3240,7 @@ version = "12.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76a99812da4020a67e76c4eb41f08c87364c14170495ff780f30dd519c221a68" dependencies = [ - "cpp_demangle 0.4.3", + "cpp_demangle", "rustc-demangle", "symbolic-common", ] @@ -3572,6 +3611,12 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "typed-arena" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" + [[package]] name = "unicode-bidi" version = "0.3.15" diff --git a/pyroscope_backends/pyroscope_pyspy/Cargo.toml b/pyroscope_backends/pyroscope_pyspy/Cargo.toml index edf4568..ab25b2d 100644 --- a/pyroscope_backends/pyroscope_pyspy/Cargo.toml +++ b/pyroscope_backends/pyroscope_pyspy/Cargo.toml @@ -14,11 +14,11 @@ repository = "https://github.com/pyroscope-io/pyroscope-rs" readme = "README.md" [dependencies] -py-spy = "0.3.14" +py-spy = "0.4.0" pyroscope = { version = "0.5.7", path = "../../" , default-features = false } thiserror ="1.0" log = "0.4" -inferno = "=0.11.14" +inferno = "0.11.21" [features] default = ["pyroscope/default"] diff --git a/pyroscope_backends/pyroscope_rbspy/Cargo.toml b/pyroscope_backends/pyroscope_rbspy/Cargo.toml index 88e90d4..af526d0 100644 --- a/pyroscope_backends/pyroscope_rbspy/Cargo.toml +++ b/pyroscope_backends/pyroscope_rbspy/Cargo.toml @@ -19,7 +19,7 @@ pyroscope = { version = "0.5.7", path = "../../", default-features = false } thiserror ="1.0" log = "0.4" anyhow = "1.0.56" -inferno = "=0.11.14" +inferno = "0.11.21" [features] default = ["pyroscope/default"] diff --git a/pyroscope_ffi/python/lib/Cargo.toml b/pyroscope_ffi/python/lib/Cargo.toml index 5b85965..4e40027 100644 --- a/pyroscope_ffi/python/lib/Cargo.toml +++ b/pyroscope_ffi/python/lib/Cargo.toml @@ -13,7 +13,7 @@ pyroscope = { path = "../../../" } pyroscope_pyspy = { path = "../../../pyroscope_backends/pyroscope_pyspy" } ffikit = { path = "../../ffikit" } pretty_env_logger = "0.4.0" -inferno = "=0.11.14" +inferno = "0.11.21" log = "0.4" diff --git a/pyroscope_ffi/ruby/ext/rbspy/Cargo.toml b/pyroscope_ffi/ruby/ext/rbspy/Cargo.toml index 45535fd..1b04686 100644 --- a/pyroscope_ffi/ruby/ext/rbspy/Cargo.toml +++ b/pyroscope_ffi/ruby/ext/rbspy/Cargo.toml @@ -13,7 +13,7 @@ pyroscope = { path = "../../../../" } pyroscope_rbspy = { path = "../../../../pyroscope_backends/pyroscope_rbspy" } ffikit = { path = "../../../ffikit" } pretty_env_logger = "0.4.0" -inferno = "=0.11.14" +inferno = "0.11.21" log = "0.4" [build-dependencies]