diff --git a/Cargo.lock b/Cargo.lock index 92d490b..30cacfd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7,12 +7,21 @@ name = "addr2line" version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" +dependencies = [ + "gimli 0.31.1", +] + +[[package]] +name = "addr2line" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b" dependencies = [ "cpp_demangle", "fallible-iterator", - "gimli", + "gimli 0.32.3", "memmap2 0.9.8", - "object 0.36.7", + "object 0.37.3", "rustc-demangle", "smallvec", "typed-arena", @@ -191,7 +200,7 @@ version = "0.3.75" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002" dependencies = [ - "addr2line", + "addr2line 0.24.2", "cfg-if", "libc", "miniz_oxide", @@ -474,15 +483,15 @@ dependencies = [ [[package]] name = "console" -version = "0.15.11" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "054ccb5b10f9f2cbf51eb355ca1d05c2d279ce1804688d0db74b4733a5aeafd8" +checksum = "b430743a6eb14e9764d4260d4c0d8123087d504eeb9c48f2b2a5e810dd369df4" dependencies = [ "encode_unicode", "libc", "once_cell", "unicode-width", - "windows-sys 0.59.0", + "windows-sys 0.61.1", ] [[package]] @@ -824,7 +833,7 @@ dependencies = [ "arrayvec", "cfg-if", "fallible-iterator", - "gimli", + "gimli 0.31.1", "macho-unwind-info", "pe-unwind-info", ] @@ -927,21 +936,20 @@ dependencies = [ ] [[package]] -name = "glob" -version = "0.3.2" +name = "gimli" +version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" +checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7" +dependencies = [ + "fallible-iterator", + "stable_deref_trait", +] [[package]] -name = "goblin" -version = "0.9.3" +name = "glob" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daa0a64d21a7eb230583b4c5f4e23b7e4e57974f96620f42a7e75e08ae66d745" -dependencies = [ - "log", - "plain", - "scroll 0.12.0", -] +checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" [[package]] name = "goblin" @@ -951,7 +959,7 @@ checksum = "d6a80adfd63bd7ffd94fefc3d22167880c440a724303080e5aa686fa36abaa96" dependencies = [ "log", "plain", - "scroll 0.13.0", + "scroll", ] [[package]] @@ -1293,40 +1301,17 @@ dependencies = [ [[package]] name = "indicatif" -version = "0.17.11" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "183b3088984b400f4cfac3620d5e076c84da5364016b4f49473de574b2586235" +checksum = "ade6dfcba0dfb62ad59e59e7241ec8912af34fd29e0e743e3db992bd278e8b65" dependencies = [ "console", - "number_prefix", "portable-atomic", "unicode-width", + "unit-prefix", "web-time", ] -[[package]] -name = "inferno" -version = "0.11.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "232929e1d75fe899576a3d5c7416ad0d88dbfbb3c3d6aa00873a7408a50ddb88" -dependencies = [ - "ahash", - "clap 4.5.47", - "crossbeam-channel", - "crossbeam-utils", - "dashmap", - "env_logger 0.11.8", - "indexmap 2.9.0", - "is-terminal", - "itoa", - "log", - "num-format", - "once_cell", - "quick-xml 0.26.0", - "rgb", - "str_stack", -] - [[package]] name = "inferno" version = "0.12.3" @@ -1344,7 +1329,7 @@ dependencies = [ "log", "num-format", "once_cell", - "quick-xml 0.37.5", + "quick-xml", "rgb", "str_stack", ] @@ -1769,12 +1754,6 @@ dependencies = [ "libm", ] -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - [[package]] name = "object" version = "0.29.0" @@ -1790,6 +1769,15 @@ name = "object" version = "0.36.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" +dependencies = [ + "memchr", +] + +[[package]] +name = "object" +version = "0.37.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe" dependencies = [ "flate2", "memchr", @@ -1864,6 +1852,16 @@ version = "6.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" +[[package]] +name = "page_size" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30d5b2194ed13191c1999ae0704b7839fb18384fa22e49b57eeaa97d79ce40da" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "parking" version = "2.2.1" @@ -2119,8 +2117,9 @@ dependencies = [ [[package]] name = "py-spy" -version = "0.4.0" -source = "git+https://github.com/grafana/py-spy?rev=062d827#062d8279c15e949f507e22dce17414ab083ef477" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e50f52bc859d3fd245aed0ef3f9c3ae43db9a95d43a1762c7fd93de72a99c92" dependencies = [ "anyhow", "chrono", @@ -2129,16 +2128,17 @@ dependencies = [ "console", "cpp_demangle", "ctrlc", - "env_logger 0.10.2", - "goblin 0.9.3", + "env_logger 0.11.8", + "goblin", "indicatif", - "inferno 0.11.21", + "inferno", "lazy_static", "libc", "log", "lru", "memmap2 0.9.8", "num-traits", + "page_size", "proc-maps", "rand 0.8.5", "rand_distr", @@ -2194,15 +2194,6 @@ dependencies = [ "pyroscope", ] -[[package]] -name = "quick-xml" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f50b1c63b38611e7d4d7f68b82d3ad0cc71a2ad2e7f61fc10f1328d917c93cd" -dependencies = [ - "memchr", -] - [[package]] name = "quick-xml" version = "0.37.5" @@ -2364,7 +2355,7 @@ dependencies = [ "directories", "env_logger 0.11.8", "flate2", - "inferno 0.12.3", + "inferno", "lazy_static", "libc", "libproc", @@ -2456,13 +2447,13 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "remoteprocess" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6194770c7afc1d2ca42acde19267938eb7d52ccb5b727f1a2eafa8d4d00ff20" +checksum = "8192fa1e574a067848e404651275f19603ac4ec0d8957997597a0495614ddc85" dependencies = [ - "addr2line", + "addr2line 0.25.1", "cfg-if", - "goblin 0.9.3", + "goblin", "lazy_static", "libc", "libproc", @@ -2471,7 +2462,7 @@ dependencies = [ "mach_o_sys", "memmap2 0.9.8", "nix 0.26.4", - "object 0.36.7", + "object 0.37.3", "proc-maps", "read-process-memory", "regex", @@ -2650,9 +2641,9 @@ checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d" [[package]] name = "ruzstd" -version = "0.7.3" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad02996bfc73da3e301efe90b1837be9ed8f4a462b6ed410aa35d00381de89f" +checksum = "e5ff0cc5e135c8870a775d3320910cd9b564ec036b4dc0b8741629020be63f01" dependencies = [ "twox-hash", ] @@ -2678,33 +2669,13 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "scroll" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ab8598aa408498679922eff7fa985c25d58a90771bd6be794434c5277eab1a6" -dependencies = [ - "scroll_derive 0.12.1", -] - [[package]] name = "scroll" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1257cd4248b4132760d6524d6dda4e053bc648c9070b960929bf50cfb1e7add" dependencies = [ - "scroll_derive 0.13.1", -] - -[[package]] -name = "scroll_derive" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1783eabc414609e28a5ba76aee5ddd52199f7107a0b24c2e9746a1ecc34a683d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.101", + "scroll_derive", ] [[package]] @@ -2876,7 +2847,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b10cf0107e78203246e1872c161ec8d74ba119ff28d03709324cda5409c6403" dependencies = [ "anyhow", - "goblin 0.10.1", + "goblin", "lazy_static", "libc", "log", @@ -2892,12 +2863,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - [[package]] name = "str_stack" version = "0.1.0" @@ -3288,13 +3253,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "twox-hash" -version = "1.6.3" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" -dependencies = [ - "cfg-if", - "static_assertions", -] +checksum = "9ea3136b675547379c4bd395ca6b938e5ad3c3d20fad76e7fe85f9e0d011419c" [[package]] name = "typed-arena" @@ -3314,6 +3275,12 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" +[[package]] +name = "unit-prefix" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "323402cff2dd658f39ca17c789b502021b3f18707c91cdf22e3838e1b4023817" + [[package]] name = "untrusted" version = "0.9.0" diff --git a/Cargo.toml b/Cargo.toml index 9f4b001..c32e857 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -93,6 +93,3 @@ rpath = false lto = true debug-assertions = false codegen-units = 1 - -[patch.crates-io] -py-spy = { git = "https://github.com/grafana/py-spy", rev = "062d827" } diff --git a/docker/gem.Dockerfile b/docker/gem.Dockerfile index 94ae2b8..2a562ce 100644 --- a/docker/gem.Dockerfile +++ b/docker/gem.Dockerfile @@ -1,7 +1,7 @@ ARG PLATFORM=x86_64 FROM quay.io/pypa/manylinux2014_${PLATFORM} AS builder -ENV RUST_VERSION=1.85 +ENV RUST_VERSION=1.87 RUN curl https://static.rust-lang.org/rustup/dist/$(arch)-unknown-linux-musl/rustup-init -o ./rustup-init \ && chmod +x ./rustup-init \ && ./rustup-init -y --default-toolchain=${RUST_VERSION} --default-host=$(arch)-unknown-linux-gnu diff --git a/docker/wheel.Dockerfile b/docker/wheel.Dockerfile index fc6812b..1a4ed73 100644 --- a/docker/wheel.Dockerfile +++ b/docker/wheel.Dockerfile @@ -1,7 +1,7 @@ ARG PLATFORM=x86_64 FROM quay.io/pypa/manylinux2014_${PLATFORM} AS builder -ENV RUST_VERSION=1.85 +ENV RUST_VERSION=1.87 RUN curl https://static.rust-lang.org/rustup/dist/$(arch)-unknown-linux-musl/rustup-init -o ./rustup-init \ && chmod +x ./rustup-init \ && ./rustup-init -y --default-toolchain=${RUST_VERSION} --default-host=$(arch)-unknown-linux-gnu diff --git a/pyroscope_ffi/python/lib/Cargo.toml b/pyroscope_ffi/python/lib/Cargo.toml index 79b7a8a..e997978 100644 --- a/pyroscope_ffi/python/lib/Cargo.toml +++ b/pyroscope_ffi/python/lib/Cargo.toml @@ -11,7 +11,7 @@ crate-type = ["cdylib"] [dependencies] pyroscope = { path = "../../../" } -py-spy = "0.4.0" +py-spy = "0.4.1" ffikit = { path = "../../ffikit" } pretty_env_logger = "0.5.0" log = "0.4"