pyroscope 0.0.10 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e792f0a158e3a62701182d85fc321ae2be3a4c8f94ae00a4dc42d8ae8585a66
-  data.tar.gz: cf973d165b8bf31688e458f808683d58f838502f559e2bd338fb3bc7a31de65a
+  metadata.gz: 36bb83e12718ebaaceda2abd73fe6aa04b7118186a2532a9a84334a8d9ea78a9
+  data.tar.gz: b7c5269520ffb6692ef147d781f7ebc1d1ee71f0810367ab8e9dd39149a5043a
 SHA512:
-  metadata.gz: 7ba0c187bd82a3f2a8706bcf095a2a913dca8adb5c81b3bb95a4a142fa3cb0ef0a7d61d849d7faabe940fcb90011d1508c3d4bc515d7c5b7a0d0bbc7802cadec
-  data.tar.gz: 157f08858a63c8293c5472dd5e0994753f8801e2e0f6836a4f295cd2e43e9b4e81cd0c8c06ea6226f6303d0bf8edc5479132041bfc57a449379559d1cc128777
+  metadata.gz: 50d07468d065727335c16c76fec8365f79aee6e10f924dfc8613b2bc2c8307a71db6586bd5efe15391288e86e1132c2bcdfd58b75d3972c9a519080bf4c63306
+  data.tar.gz: afd0327de15581b6cb6a48ea34472ce9c3b7ceeb1b39c197ba62b33e4b6fb0125d603d2595fe34a0757e0bb4b60b059a723a9d5fa787097753fd311269c56f26

data/Gemfile.lock

@@ -34,6 +34,7 @@ GEM
 PLATFORMS
   arm64-darwin-20
   x86_64-darwin-20
+  x86_64-linux
 
 DEPENDENCIES
   bundler

data/Rakefile

@@ -42,7 +42,19 @@ task :build   => [:clean, :compile]
 task :default => [:build, :spec]
 
 task :test do
-  system "rake build && gem install pkg/pyroscope-#{Pyroscope::VERSION}.gem && sudo -E ruby test.rb"
+  system "rsync -a /home/dmitry/rbspy/ /home/dmitry/pyroscope/third_party/local-clones/rbspy"
+  # system "cd ../pyroscope && DOCKER_BUILDKIT=1 docker build -f Dockerfile.static-libs --output type=local,dest=out ." if RUBY_PLATFORM.include?("linux")
+  system "cd ../pyroscope && rm out/*.a"
+  system "cd ../pyroscope && ENABLED_SPIES=rbspy make build-rust-dependencies"
+  system "cd ../pyroscope && make build-rbspy-static-library"
+  system "cd ../pyroscope && cp third_party/rustdeps/target/x86_64-unknown-linux-gnu/release/librustdeps.a ./out/librustdeps.a"
+
+  system "PYROSCOPE_RUBY_LOCAL=1 rake build && PYROSCOPE_RUBY_LOCAL=1 sudo -E gem install pkg/pyroscope-#{Pyroscope::VERSION}.gem && sudo -E 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

data/ext/pyroscope/extconf.rb

@@ -9,7 +9,7 @@ HEADER_DIRS = [INCLUDEDIR]
 
 LIB_DIRS = [LIBDIR, File.expand_path(File.join(File.dirname(__FILE__), "lib"))]
 
-COMMIT = "24effc7"
+COMMIT = "bfb9a32"
 
 # TODO: this is not very accurate, but it works for now
 OS = RUBY_PLATFORM.include?("darwin") ? "mac" : "linux"
@@ -19,24 +19,27 @@ PREFIX = "/static-libs/#{COMMIT}/#{OS}-#{ARCH}"
 
 ROOT = File.expand_path("..", __FILE__)
 
-Net::HTTP.start("dl.pyroscope.io", 443, :use_ssl => true) do |http|
-  res1 = http.get(PREFIX+"/libpyroscope.rbspy.a")
-  raise "HTTP error: #{res1.code}" unless res1.code == "200"
-  lib1 = res1.body
-  File.binwrite(File.join(ROOT, "lib/libpyroscope.rbspy.a"), lib1)
-
-  res2 = http.get(PREFIX+"/librustdeps.a")
-  raise "HTTP error: #{res2.code}" unless res2.code == "200"
-  lib2 = res2.body
-  File.binwrite(File.join(ROOT, "lib/librustdeps.a"), lib2)
+if ENV["PYROSCOPE_RUBY_LOCAL"]
+  puts "PYROSCOPE_RUBY_LOCAL yes"
+  system "cp #{ENV["HOME"]}/pyroscope/out/libpyroscope.rbspy.a #{File.join(ROOT, "lib/libpyroscope.rbspy.a")}"
+  system "cp #{ENV["HOME"]}/pyroscope/out/librustdeps.a #{File.join(ROOT, "lib/librustdeps.a")}"
+else
+  Net::HTTP.start("dl.pyroscope.io", 443, :use_ssl => true) do |http|
+    res1 = http.get(PREFIX+"/libpyroscope.rbspy.a")
+    raise "HTTP error: #{res1.code}" unless res1.code == "200"
+    lib1 = res1.body
+    File.binwrite(File.join(ROOT, "lib/libpyroscope.rbspy.a"), lib1)
+
+    res2 = http.get(PREFIX+"/librustdeps.a")
+    raise "HTTP error: #{res2.code}" unless res2.code == "200"
+    lib2 = res2.body
+    File.binwrite(File.join(ROOT, "lib/librustdeps.a"), lib2)
+  end
 end
 
 # TODO: figure out how to fix this bug
 system "strip --strip-debug #{File.join(ROOT, "lib/libpyroscope.rbspy.a")}"
 
-# system "cp /Users/dmitry/Dev/ps/pyroscope/out/libpyroscope.rbspy.a #{File.join(ROOT, "lib/libpyroscope.rbspy.a")}"
-# system "cp /Users/dmitry/Dev/ps/pyroscope/third_party/rustdeps/target/release/librustdeps.a #{File.join(ROOT, "lib/librustdeps.a")}"
-
 dir_config('pyroscope', HEADER_DIRS, LIB_DIRS)
 
 libs = ['-lpyroscope.rbspy', '-lrustdeps']

data/ext/pyroscope/pyroscope.c

@@ -8,7 +8,7 @@ static VALUE rb_Pyroscope;
 
 int Start(char*, int, char*, char*);
 int Stop(int);
-int ChangeName(char*);
+int ChangeName(char*, int);
 
 static VALUE
 pyroscope_start(VALUE self, VALUE appName, VALUE pid, VALUE serverAddress) {
@@ -33,10 +33,12 @@ pyroscope_stop(VALUE self, VALUE pid) {
 }
 
 static VALUE
-pyroscope_change_name(VALUE self, VALUE appName) {
+pyroscope_change_name(VALUE self, VALUE appName, VALUE pid) {
   VALUE r_appName = StringValue(appName);
   char *c_appName = RSTRING_PTR(r_appName);
-  int res = ChangeName(c_appName);
+  int c_pid = FIX2INT(pid);
+
+  int res = ChangeName(c_appName, c_pid);
   return INT2FIX(res);
 }
 
@@ -45,5 +47,5 @@ Init_pyroscope_c() {
   rb_Pyroscope = rb_define_module("Pyroscope");
   rb_define_module_function(rb_Pyroscope, "_start", pyroscope_start, 3);
   rb_define_module_function(rb_Pyroscope, "_stop", pyroscope_stop, 1);
-  rb_define_module_function(rb_Pyroscope, "_change_name", pyroscope_change_name, 1);
+  rb_define_module_function(rb_Pyroscope, "_change_name", pyroscope_change_name, 2);
 }

data/lib/pyroscope.rb

@@ -19,6 +19,6 @@ module Pyroscope
   end
 
   def self.change_name(new_name)
-    _change_name(new_name)
+    _change_name(new_name, Process.pid)
   end
 end

data/lib/pyroscope/version.rb

@@ -1,3 +1,3 @@
 module Pyroscope
-  VERSION = "0.0.10".freeze
+  VERSION = "0.0.12".freeze
 end

data/test.rb

@@ -3,19 +3,49 @@ require 'pyroscope'
 puts "prestart #{Process.pid}"
 
 Pyroscope.configure do |config|
-  config.app_name = "test.app.ruby2.cpu{}"
+  config.app_name = "test.ruby.app{}"
   config.server_address = "http://localhost:4040/"
 end
 
 puts "start"
-i=0
+iteration=0
 st = Time.new
+
+def work(n)
+  i = 0
+  while i < n
+    i += 1
+  end
+end
+
+def job_0
+  work(rand()*1_000_000)
+end
+
+def job_1
+  work(rand()*2_000_000)
+end
+
+def sleep_job
+  sleep(rand()*10)
+end
+
+
 while true
-  i+=1
-  # puts Time.new - st
-  if Time.new - st > 5
-    puts "new name " + "test.app.ruby2.cpu{iteration=#{i}}"
-    Pyroscope.change_name("test.app.ruby2.cpu{iteration=#{i}}")
-    st = Time.new
+  iteration+=1
+
+  r = rand
+  if r < 0.1
+    sleep_job
+  elsif r < 0.5
+    puts(" * test.ruby.app{job=0}")
+    Pyroscope.change_name("test.ruby.app{job=0}")
+    job_0
+    Pyroscope.change_name("test.ruby.app{}")
+  else
+    puts(" * test.ruby.app{job=1}")
+    Pyroscope.change_name("test.ruby.app{job=1}")
+    job_1
+    Pyroscope.change_name("test.ruby.app{}")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pyroscope
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.12
 platform: ruby
 authors:
 - Pyroscope Team
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-15 00:00:00.000000000 Z
+date: 2021-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -104,7 +104,7 @@ homepage: http://rubygems.org/gems/pyroscope
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.15
-signing_key:
+signing_key: 
 specification_version: 4
 summary: pyroscope
 test_files: []