rbspy: get rid of fork (#193)

Author: korniltsev

Cargo.lock

@@ -1,6 +1,21 @@
-ARG BASE
-
-FROM ${BASE} as builder-native
+ARG PLATFORM=x86_64
+FROM quay.io/pypa/manylinux2014_${PLATFORM} AS builder
+
+ENV RUST_VERSION=1.82
+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
+ENV PATH=/root/.cargo/bin:$PATH
+RUN yum -y install gcc libffi-devel openssl-devel wget gcc-c++ glibc-devel make
+
+# for python
+ENV LIBUNWIND_VERSION=1.8.1
+RUN wget https://github.com/libunwind/libunwind/releases/download/v${LIBUNWIND_VERSION}/libunwind-${LIBUNWIND_VERSION}.tar.gz \
+    && tar -zxvf libunwind-${LIBUNWIND_VERSION}.tar.gz \
+    && cd libunwind-${LIBUNWIND_VERSION} \
+    && ./configure --disable-minidebuginfo --enable-ptrace --disable-tests --disable-documentation \
+    && make \
+    && make install
 
 WORKDIR /pyroscope-rs
 
@@ -14,7 +29,7 @@ ADD src src
 ADD pyroscope_backends pyroscope_backends
 ADD pyroscope_cli pyroscope_cli
 ADD pyroscope_ffi/ pyroscope_ffi/
-RUN cargo build -p rbspy --release
+RUN cargo build -p ffiruby --release
 RUN cargo build -p thread_id --release
 
 FROM ruby:3.3 as builder-gem
@@ -23,8 +38,8 @@ ADD pyroscope_ffi/ruby /gem/
 
 RUN bundle install
 
-COPY --from=builder-native /pyroscope-rs/target/release/librbspy.so lib/rbspy/rbspy.so
-COPY --from=builder-native /pyroscope-rs/target/release/libthread_id.so lib/thread_id/thread_id.so
+COPY --from=builder /pyroscope-rs/target/release/librbspy.so lib/rbspy/rbspy.so
+COPY --from=builder /pyroscope-rs/target/release/libthread_id.so lib/thread_id/thread_id.so
 ARG TARGET_TASK
 RUN rake ${TARGET_TASK}
 

docker/Dockerfile.manylinux2014_aarch64

@@ -47,7 +47,7 @@ wheel/mac/arm64:
 .phony: gem/linux/amd64
 gem/linux/amd64: pyroscope_ffi/clean
 	docker buildx build \
-		--build-arg=BASE=$(MANYLINUX_PREFIX)_$(BUILD_ARCH_AMD):$(MANYLINUX_VERSION) \
+		--build-arg=PLATFORM=x86_64 \
 		--build-arg="TARGET_TASK=x86_64_linux:gem" \
 		--output=pyroscope_ffi/ruby \
 	 	--platform=linux/amd64 \
@@ -57,7 +57,7 @@ gem/linux/amd64: pyroscope_ffi/clean
 .phony: gem/linux/arm64
 gem/linux/arm64: pyroscope_ffi/clean
 	docker buildx build  \
-		--build-arg=BASE=$(MANYLINUX_PREFIX)_$(BUILD_ARCH_ARM):$(MANYLINUX_VERSION) \
+		--build-arg=PLATFORM=aarch64 \
 		--build-arg="TARGET_TASK=aarch64_linux:gem" \
 		--output=pyroscope_ffi/ruby \
 		--platform=linux/arm64 \

docker/Dockerfile.manylinux2014_x86_64

@@ -17,7 +17,7 @@ readme = "README.md"
 [dependencies]
 pprof2 = "0.13"
 pyroscope = { version = "0.5.7", path = "../..", default-features = false }
-thiserror ="1.0"
+thiserror = "2.0.11"
 log = "0.4"
 
 [features]

docker/gem.Dockerfile

@@ -16,9 +16,9 @@ readme = "README.md"
 [dependencies]
 py-spy = "0.4.0"
 pyroscope = { version = "0.5.7", path = "../../" , default-features = false }
-thiserror ="1.0"
+thiserror = "2.0.11"
 log = "0.4"
-inferno = "0.11.21"
+inferno = "0.12.1"
 
 [features]
 default = ["pyroscope/default"]

ffi.mk

@@ -14,7 +14,7 @@ repository = "https://github.com/pyroscope-io/pyroscope-rs"
 readme = "README.md"
 
 [dependencies]
-pyroscope-rbspy-oncpu = { version="0.19.1" }
+rbspy = { version="0.31.0" }
 pyroscope = { version = "0.5.7", path = "../../", default-features = false }
 thiserror ="1.0"
 log = "0.4"

pyroscope_backends/pyroscope_pprofrs/Cargo.toml

@@ -5,7 +5,7 @@ use pyroscope::{
     },
     error::{PyroscopeError, Result},
 };
-use pyroscope_rbspy_oncpu::sampler::Sampler;
+use rbspy::sampler::Sampler;
 use std::{
     ops::Deref,
     sync::{
@@ -234,8 +234,8 @@ impl Backend for Rbspy {
 
         // Channel for StackTraces generated by the RubySpy Sampler
         let (stack_sender, stack_receiver): (
-            SyncSender<pyroscope_rbspy_oncpu::StackTrace>,
-            Receiver<pyroscope_rbspy_oncpu::StackTrace>,
+            SyncSender<rbspy::StackTrace>,
+            Receiver<rbspy::StackTrace>,
         ) = sync_channel(queue_size);
 
         // Set Error and Stack Receivers
@@ -312,8 +312,8 @@ impl From<StackFrameWrapper> for StackFrame {
     }
 }
 
-impl From<pyroscope_rbspy_oncpu::StackFrame> for StackFrameWrapper {
-    fn from(frame: pyroscope_rbspy_oncpu::StackFrame) -> Self {
+impl From<rbspy::StackFrame> for StackFrameWrapper {
+    fn from(frame: rbspy::StackFrame) -> Self {
         StackFrameWrapper(StackFrame {
             module: None,
             name: Some(frame.name),
@@ -333,8 +333,8 @@ impl From<StackTraceWrapper> for StackTrace {
     }
 }
 
-impl From<(pyroscope_rbspy_oncpu::StackTrace, &BackendConfig)> for StackTraceWrapper {
-    fn from(arg: (pyroscope_rbspy_oncpu::StackTrace, &BackendConfig)) -> Self {
+impl From<(rbspy::StackTrace, &BackendConfig)> for StackTraceWrapper {
+    fn from(arg: (rbspy::StackTrace, &BackendConfig)) -> Self {
         let (trace, config) = arg;
 
         StackTraceWrapper(StackTrace::new(

pyroscope_backends/pyroscope_pyspy/Cargo.toml

@@ -16,17 +16,17 @@ rust-version = "1.64"
 
 
 [dependencies]
-human-panic = "1.0.3"
+human-panic = "2.0.2"
 pretty_env_logger = "0.5.0"
 better-panic = "0.3.0"
-log = "=0.4.17"
-clap_complete = "3.2"
-names= "0.13.0"
+log = "0.4.25"
+clap_complete = "4.5.44"
+names= "0.14.0"
 ctrlc = "3.2.2"
 duct = "0.13.5"
 serde = { version = "1.0", features = ["derive"] }
-thiserror = "1.0.30"
-color-backtrace = "0.5.1"
+thiserror = "2.0.11"
+color-backtrace = "0.6.1"
 config = "=0.11.0"
 lazy_static = "1.4.0"
 slog = "2.7.0"
@@ -41,12 +41,12 @@ pyroscope_pyspy = { path = "../pyroscope_backends/pyroscope_pyspy", default-feat
 serde_json = "1.0.115"
 
 [dependencies.clap]
-version = "3.2"
+version = "4.5.28"
 features = ["cargo", "derive"]
 
 [dev-dependencies]
 assert_cmd = "2.0.4"
-predicates = "2.1.1"
+predicates = "3.1.3"
 
 [features]
 default = ["pyroscope/default", "pyroscope_pprofrs/default", "pyroscope_rbspy/default", "pyroscope_pyspy/default"]