chore: use rbspy fork crate instead of submodule (#118)

Author: korniltsev

.drone/drone.yml

@@ -5,10 +5,6 @@ platform:
   arch: amd64
   os: linux
 steps:
-- commands:
-  - git submodule update --init --recursive
-  image: alpine/git
-  name: submodules
 - commands:
   - uname -a
   - make test
@@ -25,10 +21,6 @@ platform:
   arch: arm64
   os: linux
 steps:
-- commands:
-  - git submodule update --init --recursive
-  image: alpine/git
-  name: submodules
 - commands:
   - uname -a
   - make test
@@ -40,6 +32,6 @@ trigger:
 type: docker
 ---
 kind: signature
-hmac: f38ec1847fa65566c19f685da7928d2eb5cdc68295236e9a18080032a49edeca
+hmac: afb4cb757c4a553f765b97688bd67b2fe94528e404540d2cbd3c0683e4e0b0a0
 
 ...

.drone/pipelines/test.jsonnet

@@ -8,11 +8,6 @@ local pipelines = import '../util/pipelines.jsonnet';
       event: ['pull_request'],
     },
     steps: [
-      {
-        name: 'submodules',
-        image: 'alpine/git',
-        commands: ['git submodule update --init --recursive'],
-      },
       {
         name: 'make cli/test',
         image: build_image.linux,
@@ -25,11 +20,6 @@ local pipelines = import '../util/pipelines.jsonnet';
       event: ['pull_request'],
     },
     steps: [
-      {
-        name: 'submodules',
-        image: 'alpine/git',
-        commands: ['git submodule update --init --recursive'],
-      },
       {
         name: 'make cli/test',
         image: build_image.linux,

Cargo.lock

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

pyroscope_backends/pyroscope_rbspy/Cargo.toml

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