pyroscope 0.3.0-x86_64-darwin → 0.3.1-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e84fc97aa6cefe333774dcb6d7ad8724fb221f26ccd543be6c1bd30afe7cc399
-  data.tar.gz: f8bb6265d46a0858d3d85284f9cea439dfe366f656ed103f3734388daae48d56
+  metadata.gz: d3c209f07a7c2a8f5643b5ce70bfa9cf2d61d78629c364c81ec32543d39591f4
+  data.tar.gz: daeb1e34fd663d13a7abb493a47c7028ea12a403a9c49ec21be4e8defa619fb1
 SHA512:
-  metadata.gz: 83ea2678705ba209a55511404bf81d15dd474743056d7a343cd970697710bd651731e6678a4a849a698dcdf23f77c36f2b874e0103a7f193763b2ceb19b83b5f
-  data.tar.gz: 304f15c84b484ccd3a699bc995233fca5250fcaaa2d13d3d030ce6754b2271e522b5e61989329acea028dad7432dfcffa00e25ba5552bf4f217305f3aa6476a6
+  metadata.gz: ea99b834b681c16c97b546f09985d3a426c939dd411c8edf7876e9e7fbb8eb17c1bb7b8c41baa700883d7c13873eb7320d9fc1a82be0bdb722a869ada6d849ad
+  data.tar.gz: fd56410a4654104fee590751eb27c548d101b98191f3c9d0c00978c32d594919d49ae10e32acedcec619799a7642d81618a87ab2937f5a79102e87a597964992

data/elflib/rbspy/manylinux.sh

@@ -2,20 +2,20 @@
 set -e
 
 # Install tooling
-#yum -y -q install wget gcc libffi-devel openssl-devel
+yum -y -q install wget gcc libffi-devel openssl-devel
 
 # Install Rust
-#curl https://sh.rustup.rs -sSf | sh -s -- -y
-#export PATH=~/.cargo/bin:$PATH
+curl https://sh.rustup.rs -sSf | sh -s -- -y
+export PATH=~/.cargo/bin:$PATH
 
 # Build wheels
-#/opt/python/cp37-cp37m/bin/python setup.py bdist_wheel
+/opt/python/cp37-cp37m/bin/python setup.py bdist_wheel
 
 # Audit wheels
-#for wheel in dist/*.whl; do
-  #auditwheel repair $wheel -w dist/
-  #rm $wheel
-#done
+for wheel in dist/*.whl; do
+  auditwheel repair $wheel -w dist/
+  rm $wheel
+done
 
 # Extract wheels
 for wheel in dist/*.whl; do

data/elflib/thread_id/manylinux.sh

@@ -2,20 +2,20 @@
 set -e
 
 # Install tooling
-#yum -y -q install wget gcc libffi-devel openssl-devel
+yum -y -q install wget gcc libffi-devel openssl-devel
 
 # Install Rust
-#curl https://sh.rustup.rs -sSf | sh -s -- -y
-#export PATH=~/.cargo/bin:$PATH
+curl https://sh.rustup.rs -sSf | sh -s -- -y
+export PATH=~/.cargo/bin:$PATH
 
 # Build wheels
-#/opt/python/cp37-cp37m/bin/python setup.py bdist_wheel
+/opt/python/cp37-cp37m/bin/python setup.py bdist_wheel
 
 # Audit wheels
-#for wheel in dist/*.whl; do
-  #auditwheel repair $wheel -w dist/
-  #rm $wheel
-#done
+for wheel in dist/*.whl; do
+  auditwheel repair $wheel -w dist/
+  rm $wheel
+done
 
 # Extract wheels
 for wheel in dist/*.whl; do

data/ext/rbspy/Cargo.toml

@@ -12,6 +12,8 @@ crate-type = ["cdylib"]
 pyroscope = { path = "../../../../" }
 #pyroscope_rbspy = { version = "0.2" }
 pyroscope_rbspy = { path = "../../../../pyroscope_backends/pyroscope_rbspy" }
+ffikit = { path = "../../../ffikit" }
+pretty_env_logger = "0.4.0"
 
 [patch.crates-io]
 read-process-memory = {git = "https://github.com/omarabid/read-process-memory.git", branch = "0.1.4-fix"}

data/ext/rbspy/src/lib.rs

@@ -1,38 +1,11 @@
+use ffikit::Signal;
 use pyroscope::backend::Tag;
 use pyroscope::PyroscopeAgent;
 use pyroscope_rbspy::{rbspy_backend, RbspyConfig};
+use std::collections::hash_map::DefaultHasher;
 use std::ffi::CStr;
-use std::mem::MaybeUninit;
+use std::hash::Hasher;
 use std::os::raw::c_char;
-use std::sync::mpsc::{sync_channel, Receiver, SyncSender};
-use std::sync::{Mutex, Once};
-
-pub enum Signal {
-    Kill,
-    AddTag(u64, String, String),
-    RemoveTag(u64, String, String),
-}
-
-pub struct SignalPass {
-    inner_sender: Mutex<SyncSender<Signal>>,
-    inner_receiver: Mutex<Receiver<Signal>>,
-}
-
-fn signalpass() -> &'static SignalPass {
-    static mut SIGNAL_PASS: MaybeUninit<SignalPass> = MaybeUninit::uninit();
-    static ONCE: Once = Once::new();
-
-    ONCE.call_once(|| unsafe {
-        let (sender, receiver) = sync_channel(1);
-        let singleton = SignalPass {
-            inner_sender: Mutex::new(sender),
-            inner_receiver: Mutex::new(receiver),
-        };
-        SIGNAL_PASS = MaybeUninit::new(singleton);
-    });
-
-    unsafe { SIGNAL_PASS.assume_init_ref() }
-}
 
 #[no_mangle]
 pub extern "C" fn initialize_agent(
@@ -40,6 +13,9 @@ pub extern "C" fn initialize_agent(
     sample_rate: u32, detect_subprocesses: bool, on_cpu: bool, report_pid: bool,
     report_thread_id: bool, tags: *const c_char,
 ) -> bool {
+    // Initialize FFIKit
+    let recv = ffikit::initialize_ffi().unwrap();
+
     let application_name = unsafe { CStr::from_ptr(application_name) }
         .to_str()
         .unwrap()
@@ -62,44 +38,50 @@ pub extern "C" fn initialize_agent(
 
     let pid = std::process::id();
 
-    let s = signalpass();
+    let rbspy_config = RbspyConfig::new(pid.try_into().unwrap())
+        .sample_rate(sample_rate)
+        .lock_process(false)
+        .with_subprocesses(detect_subprocesses)
+        .on_cpu(on_cpu)
+        .report_pid(report_pid)
+        .report_thread_id(report_thread_id);
 
-    std::thread::spawn(move || {
-        let rbspy_config = RbspyConfig::new(pid.try_into().unwrap())
-            .sample_rate(sample_rate)
-            .lock_process(false)
-            .with_subprocesses(detect_subprocesses)
-            .on_cpu(on_cpu)
-            .report_pid(report_pid)
-            .report_thread_id(report_thread_id);
-
-        let tags_ref = tags_string.as_str();
-        let tags = string_to_tags(tags_ref);
-        let rbspy = rbspy_backend(rbspy_config);
-
-        let mut agent_builder = PyroscopeAgent::builder(server_address, application_name)
-            .backend(rbspy)
-            .tags(tags);
-
-        if auth_token != "" {
-            agent_builder = agent_builder.auth_token(auth_token);
-        }
+    let tags_ref = tags_string.as_str();
+    let tags = string_to_tags(tags_ref);
+    let rbspy = rbspy_backend(rbspy_config);
+
+    let mut agent_builder = PyroscopeAgent::builder(server_address, application_name)
+        .backend(rbspy)
+        .tags(tags);
 
-        let agent = agent_builder.build().unwrap();
+    if auth_token != "" {
+        agent_builder = agent_builder.auth_token(auth_token);
+    }
+
+    let agent = agent_builder.build().unwrap();
 
-        let agent_running = agent.start().unwrap();
+    let agent_running = agent.start().unwrap();
 
-        while let Ok(signal) = s.inner_receiver.lock().unwrap().recv() {
+    std::thread::spawn(move || {
+        while let Ok(signal) = recv.recv() {
             match signal {
                 Signal::Kill => {
                     agent_running.stop().unwrap();
                     break;
                 }
-                Signal::AddTag(thread_id, key, value) => {
+                Signal::AddGlobalTag(name, value) => {
+                    agent_running.add_global_tag(Tag::new(name, value)).unwrap();
+                }
+                Signal::RemoveGlobalTag(name, value) => {
+                    agent_running
+                        .remove_global_tag(Tag::new(name, value))
+                        .unwrap();
+                }
+                Signal::AddThreadTag(thread_id, key, value) => {
                     let tag = Tag::new(key, value);
                     agent_running.add_thread_tag(thread_id, tag).unwrap();
                 }
-                Signal::RemoveTag(thread_id, key, value) => {
+                Signal::RemoveThreadTag(thread_id, key, value) => {
                     let tag = Tag::new(key, value);
                     agent_running.remove_thread_tag(thread_id, tag).unwrap();
                 }
@@ -112,40 +94,73 @@ pub extern "C" fn initialize_agent(
 
 #[no_mangle]
 pub extern "C" fn drop_agent() -> bool {
-    let s = signalpass();
-    s.inner_sender.lock().unwrap().send(Signal::Kill).unwrap();
+    // Send Kill signal to the FFI merge channel.
+    ffikit::send(ffikit::Signal::Kill).unwrap();
+
     true
 }
 
 #[no_mangle]
-pub extern "C" fn add_tag(thread_id: u64, key: *const c_char, value: *const c_char) -> bool {
-    let s = signalpass();
+pub extern "C" fn add_thread_tag(thread_id: u64, key: *const c_char, value: *const c_char) -> bool {
     let key = unsafe { CStr::from_ptr(key) }.to_str().unwrap().to_owned();
     let value = unsafe { CStr::from_ptr(value) }
         .to_str()
         .unwrap()
         .to_owned();
-    s.inner_sender
-        .lock()
+
+    let pid = std::process::id();
+    let mut hasher = DefaultHasher::new();
+    hasher.write_u64(thread_id % pid as u64);
+    let id = hasher.finish();
+
+    ffikit::send(ffikit::Signal::AddThreadTag(id, key, value)).unwrap();
+
+    true
+}
+
+#[no_mangle]
+pub extern "C" fn remove_thread_tag(
+    thread_id: u64, key: *const c_char, value: *const c_char,
+) -> bool {
+    let key = unsafe { CStr::from_ptr(key) }.to_str().unwrap().to_owned();
+    let value = unsafe { CStr::from_ptr(value) }
+        .to_str()
         .unwrap()
-        .send(Signal::AddTag(thread_id, key, value))
-        .unwrap();
+        .to_owned();
+
+    let pid = std::process::id();
+    let mut hasher = DefaultHasher::new();
+    hasher.write_u64(thread_id % pid as u64);
+    let id = hasher.finish();
+
+    ffikit::send(ffikit::Signal::RemoveThreadTag(id, key, value)).unwrap();
+
     true
 }
 
 #[no_mangle]
-pub extern "C" fn remove_tag(thread_id: u64, key: *const c_char, value: *const c_char) -> bool {
-    let s = signalpass();
+pub extern "C" fn add_global_tag(key: *const c_char, value: *const c_char) -> bool {
     let key = unsafe { CStr::from_ptr(key) }.to_str().unwrap().to_owned();
     let value = unsafe { CStr::from_ptr(value) }
         .to_str()
         .unwrap()
         .to_owned();
-    s.inner_sender
-        .lock()
+
+    ffikit::send(ffikit::Signal::AddGlobalTag(key, value)).unwrap();
+
+    true
+}
+
+#[no_mangle]
+pub extern "C" fn remove_global_tag(key: *const c_char, value: *const c_char) -> bool {
+    let key = unsafe { CStr::from_ptr(key) }.to_str().unwrap().to_owned();
+    let value = unsafe { CStr::from_ptr(value) }
+        .to_str()
         .unwrap()
-        .send(Signal::RemoveTag(thread_id, key, value))
-        .unwrap();
+        .to_owned();
+
+    ffikit::send(ffikit::Signal::RemoveGlobalTag(key, value)).unwrap();
+
     true
 }
 

data/lib/pyroscope/version.rb

@@ -1,3 +1,3 @@
 module Pyroscope
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.3.1'.freeze
 end

data/lib/pyroscope.rb

@@ -1,34 +1,36 @@
 require 'ffi'
 
-module Rust
-  extend FFI::Library
-  ffi_lib File.expand_path(File.dirname(__FILE__)) + "/rbspy/rbspy.#{RbConfig::CONFIG["DLEXT"]}"
-  attach_function :initialize_agent, [:string, :string, :string, :int, :bool, :bool, :bool, :bool, :string], :bool
-  attach_function :add_tag, [:uint64, :string, :string], :bool
-  attach_function :remove_tag, [:uint64, :string, :string], :bool
-  attach_function :drop_agent, [], :bool
-end
+module Pyroscope
+  module Rust
+    extend FFI::Library
+    ffi_lib File.expand_path(File.dirname(__FILE__)) + "/rbspy/rbspy.#{RbConfig::CONFIG["DLEXT"]}"
+    attach_function :initialize_agent, [:string, :string, :string, :int, :bool, :bool, :bool, :bool, :string], :bool
+    attach_function :add_thread_tag, [:uint64, :string, :string], :bool
+    attach_function :remove_thread_tag, [:uint64, :string, :string], :bool
+    attach_function :add_global_tag, [:string, :string], :bool
+    attach_function :remove_global_tag, [:string, :string], :bool
+    attach_function :drop_agent, [], :bool
+  end
 
-module Utils
-  extend FFI::Library
-  ffi_lib File.expand_path(File.dirname(__FILE__)) + "/thread_id/thread_id.#{RbConfig::CONFIG["DLEXT"]}"
-  attach_function :thread_id, [], :uint64
-end
+  module Utils
+    extend FFI::Library
+    ffi_lib File.expand_path(File.dirname(__FILE__)) + "/thread_id/thread_id.#{RbConfig::CONFIG["DLEXT"]}"
+    attach_function :thread_id, [], :uint64
+  end
 
-module Pyroscope
   Config = Struct.new(:application_name, :app_name, :server_address, :auth_token, :sample_rate, :detect_subprocesses, :on_cpu, :report_pid, :report_thread_id, :log_level, :tags) do
     def initialize(*)
+      self.application_name = ''
+      self.server_address = 'http://localhost:4040'
+      self.auth_token = ''
+      self.sample_rate = 100
+      self.detect_subprocesses = false
+      self.on_cpu = true
+      self.report_pid = false
+      self.report_thread_id = false
+      self.log_level = 'info'
+      self.tags = {}
       super
-      self.application_name ||= ''
-      self.server_address ||= 'http://localhost:4040'
-      self.auth_token ||= ''
-      self.sample_rate ||= 100
-      self.detect_subprocesses ||= true
-      self.on_cpu ||= true
-      self.report_pid ||= false
-      self.report_thread_id ||= false
-      self.log_level ||= 'info'
-      self.tags ||= []
     end
   end
 
@@ -40,15 +42,15 @@ module Pyroscope
       yield @config
 
       Rust.initialize_agent(
-        @config.app_name || @config.application_name,
-        @config.server_address,
-        @config.auth_token,
-        @config.sample_rate,
-        @config.detect_subprocesses,
-        @config.on_cpu,
-        @config.report_pid,
-        @config.report_thread_id,
-        tags_to_string(@config.tags)
+        @config.app_name || @config.application_name || "",
+        @config.server_address || "",
+        @config.auth_token || "",
+        @config.sample_rate || 100,
+        @config.detect_subprocesses || false,
+        @config.on_cpu || false,
+        @config.report_pid || false,
+        @config.report_thread_id || false,
+        tags_to_string(@config.tags || {})
       )
     end
 
@@ -83,14 +85,14 @@ module Pyroscope
     # add tags
     def _add_tags(thread_id, tags)
       tags.each do |tag_name, tag_value|
-        Rust.add_tag(thread_id, tag_name.to_s, tag_value.to_s)
+        Rust.add_thread_tag(thread_id, tag_name.to_s, tag_value.to_s)
       end
     end
 
     # remove tags
     def _remove_tags(thread_id, tags)
       tags.each do |tag_name, tag_value|
-        Rust.remove_tag(thread_id, tag_name.to_s, tag_value.to_s)
+        Rust.remove_thread_tag(thread_id, tag_name.to_s, tag_value.to_s)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pyroscope
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: x86_64-darwin
 authors:
 - Pyroscope Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-30 00:00:00.000000000 Z
+date: 2022-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Pyroscope