pyroscope_beta 0.1.4 → 0.1.7

data/ext/rbspy/Cargo.toml

@@ -8,6 +8,5 @@ name = "rbspy"
 crate-type = ["cdylib"]
 
 [dependencies]
-rutie = "0.8.3"
-pyroscope = {version = "0.5" }
+pyroscope = {version = "0.5.2" }
 pyroscope_rbspy = { version = "0.2" }

data/ext/rbspy/Rakefile

@@ -2,7 +2,7 @@
 
 require "shellwords"
 
-class RakeCargoHelper
+class RbspyRakeCargoHelper
   attr_reader :gemname
 
   def initialize(gemname=File.basename(__dir__))
@@ -104,18 +104,19 @@ class RakeCargoHelper
 
 end
 
-task default: [:install, :clean]
+task default: [:rbspy_install, :rbspy_clean]
+task rbspy: [:rbspy_install, :rbspy_clean]
 
 desc "set dev mode for subsequent task, run like `rake dev install`"
-task :dev do
+task :rbspy_dev do
   @dev = true
 end
 
 desc "build gem native extension and copy to lib"
-task install: [:cd, :build] do
-  helper = RakeCargoHelper.new
+task rbspy_install: [:rbspy_cd, :rbspy_build] do
+  helper = RbspyRakeCargoHelper.new
   profile_dir = @dev ? "debug" : "release"
-  source = File.join(RakeCargoHelper.cargo_target_dir, profile_dir, helper.rust_name)
+  source = File.join(RbspyRakeCargoHelper.cargo_target_dir, profile_dir, helper.rust_name)
   dest = File.join(helper.install_dir, helper.ruby_name)
   mkdir_p(helper.install_dir)
   rm(dest) if File.exist?(dest)
@@ -123,35 +124,35 @@ task install: [:cd, :build] do
 end
 
 desc "build gem native extension"
-task build: [:cargo, :cd] do
-  sh "cargo", "rustc", *(["--locked", "--release"] unless @dev), "--", *RakeCargoHelper.flags
+task rbspy_build: [:rbspy_cargo, :rbspy_cd] do
+  sh "cargo", "rustc", *(["--locked", "--release"] unless @dev), "--", *RbspyRakeCargoHelper.flags
 end
 
 desc "clean up release build artifacts"
-task clean: [:cargo, :cd] do
+task rbspy_clean: [:rbspy_cargo, :rbspy_cd] do
   sh "cargo clean --release"
 end
 
 desc "clean up build artifacts"
-task clobber: [:cargo, :cd] do
+task rbspy_clobber: [:rbspy_cargo, :rbspy_cd] do
   sh "cargo clean"
 end
 
 desc "check for cargo"
-task :cargo do
-  raise <<-MSG unless RakeCargoHelper.command?("cargo")
+task :rbspy_cargo do
+  raise <<-MSG unless RbspyRakeCargoHelper.command?("cargo")
     This gem requires a Rust compiler and the `cargo' build tool to build the
     gem's native extension. See https://www.rust-lang.org/tools/install for
     how to install Rust. `cargo' is usually part of the Rust installation.
   MSG
 
-  raise <<-MSG if Gem.win_platform? && RakeCargoHelper.rust_toolchain !~ /gnu/
-    Found Rust toolchain `#{RakeCargoHelper.rust_toolchain}' but the gem native
+  raise <<-MSG if Gem.win_platform? && RbspyRakeCargoHelper.rust_toolchain !~ /gnu/
+    Found Rust toolchain `#{RbspyRakeCargoHelper.rust_toolchain}' but the gem native
     extension requires the gnu toolchain on Windows.
   MSG
 end
 
 # ensure task is running in the right dir
-task :cd do
+task :rbspy_cd do
   cd(__dir__) unless __dir__ == pwd
 end

data/ext/rbspy/src/lib.rs

@@ -94,7 +94,6 @@ pub extern "C" fn initialize_agent(
     true
 }
 
-#[link(name = "pyroscope_ffi", vers = "0.1")]
 #[no_mangle]
 pub extern "C" fn drop_agent() -> bool {
     let s = signalpass();
@@ -102,7 +101,6 @@ pub extern "C" fn drop_agent() -> bool {
     true
 }
 
-#[link(name = "pyroscope_ffi", vers = "0.1")]
 #[no_mangle]
 pub extern "C" fn add_tag(thread_id: u64, key: *const c_char, value: *const c_char) -> bool {
     let s = signalpass();
@@ -119,7 +117,6 @@ pub extern "C" fn add_tag(thread_id: u64, key: *const c_char, value: *const c_ch
     true
 }
 
-#[link(name = "pyroscope_ffi", vers = "0.1")]
 #[no_mangle]
 pub extern "C" fn remove_tag(thread_id: u64, key: *const c_char, value: *const c_char) -> bool {
     let s = signalpass();

data/ext/thread_id/Cargo.lock

@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "libc"
-version = "0.2.125"
+version = "0.2.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b"
+checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
 
 [[package]]
 name = "thread_id"

data/ext/thread_id/Rakefile

@@ -2,7 +2,7 @@
 
 require "shellwords"
 
-class RakeCargoHelper
+class ThreadIdRakeCargoHelper
   attr_reader :gemname
 
   def initialize(gemname=File.basename(__dir__))
@@ -104,18 +104,19 @@ class RakeCargoHelper
 
 end
 
-task default: [:install, :clean]
+task default: [:thread_id_install, :thread_id_clean]
+task thread_id: [:thread_id_install, :thread_id_clean]
 
 desc "set dev mode for subsequent task, run like `rake dev install`"
-task :dev do
+task :thread_id_dev do
   @dev = true
 end
 
 desc "build gem native extension and copy to lib"
-task install: [:cd, :build] do
-  helper = RakeCargoHelper.new
+task thread_id_install: [:thread_id_cd, :thread_id_build] do
+  helper = ThreadIdRakeCargoHelper.new
   profile_dir = @dev ? "debug" : "release"
-  source = File.join(RakeCargoHelper.cargo_target_dir, profile_dir, helper.rust_name)
+  source = File.join(ThreadIdRakeCargoHelper.cargo_target_dir, profile_dir, helper.rust_name)
   dest = File.join(helper.install_dir, helper.ruby_name)
   mkdir_p(helper.install_dir)
   rm(dest) if File.exist?(dest)
@@ -123,35 +124,35 @@ task install: [:cd, :build] do
 end
 
 desc "build gem native extension"
-task build: [:cargo, :cd] do
-  sh "cargo", "rustc", *(["--locked", "--release"] unless @dev), "--", *RakeCargoHelper.flags
+task thread_id_build: [:thread_id_cargo, :thread_id_cd] do
+  sh "cargo", "rustc", *(["--locked", "--release"] unless @dev), "--", *ThreadIdRakeCargoHelper.flags
 end
 
 desc "clean up release build artifacts"
-task clean: [:cargo, :cd] do
+task thread_id_clean: [:thread_id_cargo, :thread_id_cd] do
   sh "cargo clean --release"
 end
 
 desc "clean up build artifacts"
-task clobber: [:cargo, :cd] do
+task thread_id_clobber: [:thread_id_cargo, :thread_id_cd] do
   sh "cargo clean"
 end
 
 desc "check for cargo"
-task :cargo do
-  raise <<-MSG unless RakeCargoHelper.command?("cargo")
+task :thread_id_cargo do
+  raise <<-MSG unless ThreadIdRakeCargoHelper.command?("cargo")
     This gem requires a Rust compiler and the `cargo' build tool to build the
     gem's native extension. See https://www.rust-lang.org/tools/install for
     how to install Rust. `cargo' is usually part of the Rust installation.
   MSG
 
-  raise <<-MSG if Gem.win_platform? && RakeCargoHelper.rust_toolchain !~ /gnu/
-    Found Rust toolchain `#{RakeCargoHelper.rust_toolchain}' but the gem native
+  raise <<-MSG if Gem.win_platform? && ThreadIdRakeCargoHelper.rust_toolchain !~ /gnu/
+    Found Rust toolchain `#{ThreadIdRakeCargoHelper.rust_toolchain}' but the gem native
     extension requires the gnu toolchain on Windows.
   MSG
 end
 
 # ensure task is running in the right dir
-task :cd do
+task :thread_id_cd do
   cd(__dir__) unless __dir__ == pwd
 end

data/lib/pyroscope/version.rb

@@ -1,3 +1,3 @@
 module Pyroscope
-  VERSION = '0.1.4'.freeze
+  VERSION = '0.1.7'.freeze
 end

data/lib/pyroscope_beta.rb

@@ -1,12 +1,12 @@
 require 'ffi'
 require 'fiddle'
 
-$libm = Fiddle.dlopen(File.expand_path(File.dirname(__FILE__)) + '/thread_id/thread_id.so')
+$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.' + FFI::Platform::LIBSUFFIX
+  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 :add_tag, [:uint64, :string, :string], :bool
   attach_function :remove_tag, [:uint64, :string, :string], :bool

data/pyroscope.gemspec

@@ -0,0 +1,43 @@
+require_relative "lib/pyroscope/version"
+
+Gem::Specification.new do |s|
+  s.name = 'pyroscope_beta'
+  s.version = Pyroscope::VERSION
+  s.summary = 'Pyroscope Beta'
+  s.description = 'Pyroscope FFI Integration for Ruby'
+  s.authors = ['Pyroscope Team']
+  s.email = ['contact@pyroscope.io']
+  s.homepage = 'https://pyroscope.io'
+  s.license = 'Apache-2.0'
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  #s.files = Dir.chdir(__dir__) do
+    #`git ls-files -z`.split("\x0").reject do |f|
+      #(f == __FILE__) || f.match(%r{\A(?:(?:bin|test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
+    #end
+  #end
+  s.files = `git ls-files -z`.split("\0").reject { |f| f =~ /^(\.|G|spec|Rakefile)/ }
+
+  s.platform = Gem::Platform::RUBY
+
+  s.required_ruby_version = ">= 2.7.0"
+
+  s.extensions = ['ext/rbspy/extconf.rb', 'ext/thread_id/extconf.rb']
+
+  s.add_dependency 'ffi', '~> 1.9'
+  s.add_dependency 'fiddle', '~> 1.1'
+
+  s.add_development_dependency 'bundler'
+  s.add_development_dependency 'github-release'
+  s.add_development_dependency 'guard-rspec'
+  s.add_development_dependency 'rake', '~> 13.0'
+  s.add_development_dependency 'rake-compiler', '~> 1.2'
+  s.add_development_dependency 'rake-compiler-dock', '~> 1.2'
+  s.add_development_dependency 'rb-inotify', '~> 0.9'
+  s.add_development_dependency 'rb_sys', '~> 0.1'
+  s.add_development_dependency 'redcarpet'
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'yard'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pyroscope_beta
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.7
 platform: ruby
 authors:
 - Pyroscope Team
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-03 00:00:00.000000000 Z
+date: 2022-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -38,20 +38,174 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: github-release
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler-dock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: rb-inotify
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: rb_sys
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :runtime
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 description: Pyroscope FFI Integration for Ruby
 email:
 - contact@pyroscope.io
@@ -61,11 +215,8 @@ extensions:
 - ext/thread_id/extconf.rb
 extra_rdoc_files: []
 files:
-- Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
-- Rakefile
 - ext/rbspy/Cargo.lock
 - ext/rbspy/Cargo.toml
 - ext/rbspy/Rakefile
@@ -78,11 +229,12 @@ files:
 - ext/thread_id/src/lib.rs
 - lib/pyroscope/version.rb
 - lib/pyroscope_beta.rb
+- pyroscope.gemspec
 homepage: https://pyroscope.io
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -90,15 +242,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.8
-signing_key:
+rubygems_version: 3.3.7
+signing_key: 
 specification_version: 4
 summary: Pyroscope Beta
 test_files: []

data/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'ffi'
-gem 'fiddle'

data/Gemfile.lock

@@ -1,15 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ffi (1.15.5)
-    fiddle (1.1.0)
-
-PLATFORMS
-  x86_64-linux
-
-DEPENDENCIES
-  ffi
-  fiddle
-
-BUNDLED WITH
-   2.3.12

data/Rakefile

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-load File.expand_path('./ext/rbspy/Rakefile', __dir__)
-load File.expand_path('./ext/thread_id/Rakefile', __dir__)
-
-task default: %w[hello]
-
-task :hello do
-  puts 'Hello!'
-end