pyroscope 0.2.0 → 0.3.2

data/scripts/docker.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+set -ex
+
+BUILD_DIR="/work"
+
+docker run \
+        -w /work/pyroscope_ffi/ruby/elflib/rbspy \
+        -v `pwd`:/work \
+        quay.io/pypa/${BUILD_ARCH} \
+        sh manylinux.sh
+
+docker run \
+        -w /work/pyroscope_ffi/ruby/elflib/thread_id \
+        -v `pwd`:/work \
+        quay.io/pypa/${BUILD_ARCH} \
+        sh manylinux.sh

metadata

@@ -1,51 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: pyroscope
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Pyroscope Team
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-22 00:00:00.000000000 Z
+date: 2022-07-22 00:00:00.000000000 Z
 dependencies:
 - !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: rake
-  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-compiler
+  name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -53,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubygems-tasks
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,64 +39,77 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: pyroscope client integration for ruby
-email: contact@pyroscope.io
+        version: '13.0'
+description: Pyroscope FFI Integration for Ruby
+email:
+- contact@pyroscope.io
 executables: []
 extensions:
-- ext/pyroscope/extconf.rb
+- ext/rbspy/extconf.rb
+- ext/thread_id/extconf.rb
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
-- Rakefile
-- ext/pyroscope/extconf.rb
-- ext/pyroscope/lib/.gitkeep
-- ext/pyroscope/lib/libpyroscope.rbspy.a
-- ext/pyroscope/lib/libpyroscope.rbspy.combo.a
-- ext/pyroscope/lib/librustdeps.a
-- ext/pyroscope/pyroscope.c
+- elflib/rbspy/manylinux.sh
+- elflib/rbspy/pyproject.toml
+- elflib/rbspy/rbspy/__init__.py
+- elflib/rbspy/setup.cfg
+- elflib/rbspy/setup.py
+- elflib/thread_id/manylinux.sh
+- elflib/thread_id/pyproject.toml
+- elflib/thread_id/setup.cfg
+- elflib/thread_id/setup.py
+- elflib/thread_id/thread_id/__init__.py
+- ext/rbspy/Cargo.toml
+- ext/rbspy/Rakefile
+- ext/rbspy/build.rs
+- ext/rbspy/cbindgen.toml
+- ext/rbspy/extconf.rb
+- ext/rbspy/src/lib.rs
+- ext/thread_id/Cargo.toml
+- ext/thread_id/Rakefile
+- ext/thread_id/build.rs
+- ext/thread_id/cbindgen.toml
+- ext/thread_id/extconf.rb
+- ext/thread_id/src/lib.rs
 - lib/pyroscope.rb
 - lib/pyroscope/version.rb
 - pyroscope.gemspec
-- test.rb
-homepage: http://rubygems.org/gems/pyroscope
+- scripts/docker.sh
+homepage: https://pyroscope.io
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
-- ext/pyroscope
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.9
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
-signing_key:
+rubygems_version: 3.3.7
+signing_key: 
 specification_version: 4
-summary: pyroscope
+summary: Pyroscope
 test_files: []

data/.gitignore

@@ -1,7 +0,0 @@
-*.gem
-.DS_Store
-lib/pyroscope_c.bundle
-/build
-/pkg
-/ext/pyroscope/lib/*.a
-/ext/pyroscope/lib/*.bundle

data/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in wrap_c_example.gemspec
-gemspec

data/Gemfile.lock

@@ -1,48 +0,0 @@
-PATH
-  remote: .
-  specs:
-    pyroscope (0.2.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    diff-lcs (1.4.4)
-    io-console (0.5.9)
-    irb (1.3.6)
-      reline (>= 0.2.5)
-    rake (13.0.4)
-    rake-compiler (1.1.1)
-      rake
-    reline (0.2.6)
-      io-console (~> 0.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    rubygems-tasks (0.2.5)
-      irb (~> 1.0)
-
-PLATFORMS
-  arm64-darwin-20
-  x86_64-darwin-20
-  x86_64-linux
-
-DEPENDENCIES
-  bundler
-  pyroscope!
-  rake
-  rake-compiler
-  rspec
-  rubygems-tasks
-
-BUNDLED WITH
-   2.2.15

data/Rakefile

@@ -1,56 +0,0 @@
-require "bundler/gem_tasks"
-require "rubygems/package_task"
-require "rake/extensiontask"
-require "rake/testtask"
-require "rspec/core/rake_task"
-require "rake/clean"
-require_relative "./lib/pyroscope/version"
-
-CLEAN.include(
-  "ext/pyroscope/*.o",
-  "ext/pyroscope/*.bundle"
-)
-
-CLOBBER.include(
-  "ext/pyroscope/Makefile",
-  "pkg"
-)
-
-BUILD_DIR = 'build'
-
-def gem_spec
-  @gem_spec ||= Gem::Specification.load('pyroscope.gemspec')
-end
-
-Gem::PackageTask.new(gem_spec) do |pkg|
-  pkg.need_zip = true
-  pkg.need_tar = true
-end
-
-Rake::ExtensionTask.new("pyroscope_c", gem_spec) do |ext|
-#  ext.name    = 'pyroscope'
-  ext.ext_dir = './ext/pyroscope'
-#  ext.lib_dir = 'lib/pyroscope'
-  ext.tmp_dir = BUILD_DIR
-  ext.config_script = "extconf.rb"
-end
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :build   => [:clean, :compile]
-
-task :default => [:build, :spec]
-
-task :test do
-  sudo = RUBY_PLATFORM =~ /darwin/ ? "sudo -E" : ""
-  system "rake build && #{sudo} gem install pkg/pyroscope-#{Pyroscope::VERSION}.gem && #{sudo} ruby test.rb"
-end
-
-task :test_exec do
-  # system "cd ../pyroscope && DOCKER_BUILDKIT=1 docker build -f Dockerfile.static-libs --output type=local,dest=out ." if RUBY_PLATFORM.include?("linux")
-  system "sudo -E pyroscope exec ruby test.rb"
-end
-
-task :publish do
-  system "rake build && gem install pkg/pyroscope-#{Pyroscope::VERSION}.gem && gem push pkg/pyroscope-#{Pyroscope::VERSION}.gem"
-end

data/ext/pyroscope/extconf.rb

@@ -1,78 +0,0 @@
-require "mkmf"
-
-require 'net/http'
-
-LIBDIR     = RbConfig::CONFIG['libdir']
-INCLUDEDIR = RbConfig::CONFIG['includedir']
-
-HEADER_DIRS = [INCLUDEDIR]
-
-LIB_DIRS = [LIBDIR, File.expand_path(File.join(File.dirname(__FILE__), "lib"))]
-
-COMMIT = "e44f13d9"
-
-# TODO: this is not very accurate, but it works for now
-OS = RUBY_PLATFORM.include?("darwin") ? "mac" : "linux"
-ARCH = RUBY_PLATFORM.include?("arm64") ? "arm64" : "amd64"
-
-PREFIX = "/static-libs/#{COMMIT}/#{OS}-#{ARCH}"
-
-ROOT = File.expand_path("..", __FILE__)
-
-def run(str)
-  system(str) || fail("command failed: #{str}")
-end
-
-if ENV["PYROSCOPE_RUBY_LOCAL"]
-  puts "PYROSCOPE_RUBY_LOCAL using path #{ENV['PYROSCOPE_RUBY_LOCAL']}}"
-  pyroscope_path = ENV["PYROSCOPE_RUBY_LOCAL"]
-  run("rm -rf #{File.join(ROOT, "build")}")
-  run("cd #{pyroscope_path} && make build-rust-dependencies-docker")
-  run("cp #{pyroscope_path}/out/libpyroscope.rbspy.a #{File.join(ROOT, "lib/libpyroscope.rbspy.a")}")
-  run("cp #{pyroscope_path}/out/librustdeps.a #{File.join(ROOT, "lib/librustdeps.a")}")
-else
-  Net::HTTP.start("dl.pyroscope.io", 443, :use_ssl => true) do |http|
-    ["libpyroscope.rbspy.a", "librustdeps.a"].each do |name|
-      url = PREFIX+"/#{name}.gz"
-      req = Net::HTTP::Get.new(url)
-      http.request(req) do |resp|
-        raise "HTTP error: #{resp.code}" unless resp.code == "200"
-
-        r, w = IO.pipe
-
-        t = Thread.new do
-          zreader = Zlib::GzipReader.new(r)
-          File.open(File.join(ROOT, "lib/#{name}"), "wb") do |f|
-            loop do
-              begin
-                chunk = zreader.readpartial(32768)
-                break if chunk.nil?
-              rescue EOFError
-                break
-              end
-              f.write(chunk)
-            end
-          end
-        end
-
-        resp.read_body do |chunk|
-          w.write(chunk)
-        end
-
-        t.join
-      end
-    end
-  end
-end
-
-# this is now done upstream
-# system "strip --strip-debug #{File.join(ROOT, "lib/libpyroscope.rbspy.combo.a")}"
-
-dir_config('pyroscope', HEADER_DIRS, LIB_DIRS)
-
-libs = ['-lpyroscope.rbspy', '-lrustdeps']
-libs.each do |lib|
-  $LOCAL_LIBS << "#{lib} "
-end
-
-create_makefile('pyroscope_c')

data/ext/pyroscope/pyroscope.c

@@ -1,87 +0,0 @@
-#include <stdlib.h>
-#include <ruby.h>
-
-static VALUE rb_Pyroscope;
-
-#include <stdio.h>
-#include <string.h>
-
-int Start(char*, char*, char*, char*, int, int, char*);
-int Stop();
-int ChangeName(char*);
-int SetTag(char*, char*);
-int TestLogger();
-char* BuildSummary();
-
-static VALUE
-pyroscope_start(VALUE self, VALUE appName, VALUE serverAddress, VALUE authToken, VALUE sampleRate, VALUE withSubprocesses, VALUE logLevel) {
-  VALUE r_appName = StringValue(appName);
-  char *c_appName = RSTRING_PTR(r_appName);
-
-  int c_sampleRate = FIX2INT(sampleRate);
-  int c_withSubprocesses = FIX2INT(withSubprocesses);
-
-  VALUE r_serverAddress = StringValue(serverAddress);
-  char *c_serverAddress = RSTRING_PTR(r_serverAddress);
-
-  VALUE r_authToken = StringValue(authToken);
-  char *c_authToken = RSTRING_PTR(r_authToken);
-
-  VALUE r_logLevel = StringValue(logLevel);
-  char *c_logLevel = RSTRING_PTR(r_logLevel);
-
-  int res = Start(c_appName, "rbspy", c_serverAddress, c_authToken, c_sampleRate, c_withSubprocesses, c_logLevel);
-
-  return INT2FIX(res);
-}
-
-static VALUE
-pyroscope_stop(VALUE self) {
-  int res = Stop();
-  return INT2FIX(res);
-}
-
-static VALUE
-pyroscope_change_name(VALUE self, VALUE appName) {
-  VALUE r_appName = StringValue(appName);
-  char *c_appName = RSTRING_PTR(r_appName);
-
-  int res = ChangeName(c_appName);
-  return INT2FIX(res);
-}
-
-static VALUE
-pyroscope_set_tag(VALUE self, VALUE key, VALUE val) {
-  VALUE r_key = StringValue(key);
-  char *c_key = RSTRING_PTR(r_key);
-  VALUE r_val = StringValue(val);
-  char *c_val = RSTRING_PTR(r_val);
-
-  int res = SetTag(c_key, c_val);
-  return INT2FIX(res);
-}
-
-static VALUE
-pyroscope_test_logger(VALUE self) {
-  int res = TestLogger();
-  return INT2FIX(res);
-}
-
-static VALUE
-pyroscope_build_summary(VALUE self) {
-  char *c_summary = BuildSummary();
-  VALUE r_summary = rb_str_new_cstr(c_summary);
-  free(c_summary);
-  return r_summary;
-}
-
-void
-Init_pyroscope_c() {
-  rb_Pyroscope = rb_define_module("Pyroscope");
-  rb_define_module_function(rb_Pyroscope, "_start", pyroscope_start, 6);
-  rb_define_module_function(rb_Pyroscope, "_stop", pyroscope_stop, 0);
-  rb_define_module_function(rb_Pyroscope, "_change_name", pyroscope_change_name, 1);
-  rb_define_module_function(rb_Pyroscope, "_set_tag", pyroscope_set_tag, 2);
-  rb_define_module_function(rb_Pyroscope, "_test_logger", pyroscope_test_logger, 0);
-  rb_define_module_function(rb_Pyroscope, "_build_summary", pyroscope_build_summary, 0);
-}

data/test.rb

@@ -1,32 +0,0 @@
-require "pyroscope"
-
-Pyroscope.configure do |config|
-  config.app_name = "test.ruby.app"
-  config.server_address = "http://pyroscope:4040/"
-  config.tags = {
-    :region => "us-east-1",
-    :hostname => ENV["hostname"]
-  }
-end
-
-def work(n)
-  i = 0
-  while i < n
-    i += 1
-  end
-end
-
-def fast_function
-  work(20000)
-end
-
-def slow_function
-  work(80000)
-end
-
-Pyroscope.tag({ "region" => "us-east-1" })
-
-while true
-  fast_function
-  slow_function
-end