pyroscope_beta 0.2.1-x86_64-linux → 0.2.2-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66a67fb83d5c7521fbffac4e8a98ca6ce915c4399087199e3e780c87f680bc9d
-  data.tar.gz: a85ccb74dfba31d6f8bad7e3516a9460a4b7c05f2b215f039b8a7412bb91ab8e
+  metadata.gz: 702b2dab6aad1a14a9c9e5ac62869a351a216bf9152b9cfe1e5b13503572a24b
+  data.tar.gz: d5e24f18ef95403ef1a88614a7420f4c81c8ae3c1e1e635658c9662c3b28282f
 SHA512:
-  metadata.gz: 8bd793d7fc4cbbb41fcdf7bc747636ea9ebb3df4788c377dcd518c435a55e7c7154a1dbcfbcd7fa2374b700c249883be136ee2e43a43dabd758351aaf2e3732b
-  data.tar.gz: 68a6a7eb06eaeb1292f5797dd1e7a50a10c8c0d17ea22b5085ea1124f1d8b55f0f85c0e060b965afda5bf67cbaf0026c0b23b36b505ed8959ec73c2cbdc7e18f
+  metadata.gz: 6fa5635126297466e3b8dc55f9f563a6eba480c06edc2d10ab5762125c7469f5eb688d1d5d734eca237f42c881692cd20ec0c4da5e32f8657093722d351add86
+  data.tar.gz: b936e9ff462fd1caebe926a78c89d6ee5a9ced584cfc4a0dcf0d877ac668a94234faf49e94374f0968cdb8ce8a5c66dffcc84d202183e7868c8e5a45f00767cf

data/ext/rbspy/Cargo.lock

@@ -204,9 +204,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "3.1.18"
+version = "3.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2dbdf4bdacb33466e854ce889eee8dfd5729abf7ccd7664d0a2d60cd384440b"
+checksum = "a836566fa5f52f7ddf909a8a2f9029b9f78ca584cd95cf7e87f8073110f4c5c9"
 dependencies = [
  "atty",
  "bitflags",
@@ -221,9 +221,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "3.1.18"
+version = "3.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25320346e922cffe59c0bbc5410c8d8784509efb321488971081313cb1e1a33c"
+checksum = "986fd75d1dfd2c34eb8c9275ae38ad87ea9478c9b79e87f1801f7d866dfb1e37"
 dependencies = [
  "heck",
  "proc-macro-error",
@@ -234,9 +234,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.2.0"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a37c35f1112dad5e6e0b1adaff798507497a18fceeb30cceb3bae7d1427b9213"
+checksum = "5538cd660450ebeb4234cfecf8f2284b844ffc4c50531e66d584ad5b91293613"
 dependencies = [
  "os_str_bytes",
 ]
@@ -708,7 +708,7 @@ checksum = "1a3cb215599901c8f491666421d44ffaed08d6872b4c7ced6f425683b951271e"
 dependencies = [
  "ahash",
  "atty",
- "clap 3.1.18",
+ "clap 3.2.1",
  "crossbeam-channel",
  "crossbeam-utils",
  "dashmap",
@@ -931,7 +931,7 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e7d66043b25d4a6cccb23619d10c19c25304b355a7dccd4a8e11423dd2382146"
 dependencies = [
- "clap 3.1.18",
+ "clap 3.2.1",
  "rand 0.8.5",
 ]
 
@@ -1343,7 +1343,7 @@ checksum = "bcbebdf0037de5a92722b0bca2965ce0a76cd5c962225cf355e31ac668ea653f"
 dependencies = [
  "anyhow",
  "chrono",
- "clap 3.1.18",
+ "clap 3.2.1",
  "ctrlc",
  "directories",
  "elf",

data/ext/rbspy/Rakefile

@@ -44,6 +44,7 @@ class RbspyRakeCargoHelper
 
   def self.flags
     cc_flags = Shellwords.split(RbConfig.expand(RbConfig::MAKEFILE_CONFIG["CC"].dup))
+    puts RbConfig::MAKEFILE_CONFIG.inspect
 
     ["-C", "linker=#{cc_flags.shift}",
       *cc_flags.flat_map {|a| ["-C", "link-arg=#{a}"] },

data/ext/rbspy/src/lib.rs

@@ -36,17 +36,24 @@ fn signalpass() -> &'static SignalPass {
 
 #[no_mangle]
 pub extern "C" fn initialize_agent(
-    application_name: *const c_char, server_address: *const c_char, sample_rate: u32,
-    detect_subprocesses: bool, tags: *const c_char,
+    application_name: *const c_char, server_address: *const c_char, auth_token: *const c_char,
+    sample_rate: u32, detect_subprocesses: bool, tags: *const c_char,
 ) -> bool {
     let application_name = unsafe { CStr::from_ptr(application_name) }
         .to_str()
         .unwrap()
         .to_string();
+
     let server_address = unsafe { CStr::from_ptr(server_address) }
         .to_str()
         .unwrap()
         .to_string();
+
+    let auth_token = unsafe { CStr::from_ptr(auth_token) }
+        .to_str()
+        .unwrap()
+        .to_string();
+
     let tags_string = unsafe { CStr::from_ptr(tags) }
         .to_str()
         .unwrap()
@@ -65,11 +72,16 @@ pub extern "C" fn initialize_agent(
         let tags_ref = tags_string.as_str();
         let tags = string_to_tags(tags_ref);
         let rbspy = rbspy_backend(rbspy_config);
-        let agent = PyroscopeAgent::builder(server_address, application_name)
+
+        let mut agent_builder = PyroscopeAgent::builder(server_address, application_name)
             .backend(rbspy)
-            .tags(tags)
-            .build()
-            .unwrap();
+            .tags(tags);
+
+        if auth_token != "" {
+            agent_builder = agent_builder.auth_token(auth_token);
+        }
+
+        let agent = agent_builder.build().unwrap();
 
         let agent_running = agent.start().unwrap();
 

data/lib/pyroscope/version.rb

@@ -1,3 +1,3 @@
 module Pyroscope
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.2.2'.freeze
 end

data/lib/pyroscope_beta.rb

@@ -1,24 +1,27 @@
 require 'ffi'
-require 'fiddle'
-
-$libm = Fiddle.dlopen(File.expand_path(File.dirname(__FILE__)) + "/thread_id/thread_id.#{RbConfig::CONFIG["DLEXT"]}")
-
 
 module Rust
   extend FFI::Library
   ffi_lib File.expand_path(File.dirname(__FILE__)) + "/rbspy/rbspy.#{RbConfig::CONFIG["DLEXT"]}"
-  attach_function :initialize_agent, [:string, :string, :int, :bool, :string], :bool
+  attach_function :initialize_agent, [:string, :string, :string, :int, :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 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, :server_address, :sample_rate, :detect_subprocesses, :log_level, :tags) do
+  Config = Struct.new(:application_name, :server_address, :auth_token, :sample_rate, :detect_subprocesses, :log_level, :tags) do
     def initialize(*)
       super
       self.application_name ||= ''
       self.server_address ||= 'http://localhost:4040'
+      self.auth_token ||= ''
       self.sample_rate ||= 100
       self.detect_subprocesses ||= true
       self.log_level ||= 'info'
@@ -36,6 +39,7 @@ module Pyroscope
       Rust.initialize_agent(
         @config.application_name,
         @config.server_address,
+        @config.auth_token,
         @config.sample_rate,
         @config.detect_subprocesses,
         tags_to_string(@config.tags)
@@ -66,8 +70,7 @@ end
 
 # get thread id
 def thread_id
-  thread_id = Fiddle::Function.new($libm['thread_id'], [], Fiddle::TYPE_LONG_LONG)
-  thread_id.call
+  return Utils.thread_id()
 end
 
 # add tags

data/pyroscope.gemspec

@@ -26,7 +26,6 @@ Gem::Specification.new do |s|
   s.extensions = ['ext/rbspy/extconf.rb', 'ext/thread_id/extconf.rb']
 
   s.add_dependency 'ffi'
-  s.add_dependency 'fiddle'
 
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'rake', '~> 13.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pyroscope_beta
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: x86_64-linux
 authors:
 - Pyroscope Team
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: fiddle
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement