pyroscope 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42f5e0729331e9002034247e8e90daf55c4efee52fd9c73a09bcf97ea3faf073
-  data.tar.gz: a15a4611dd40f44d1a3dd82d3fc15fe92efd3ac61bcba0ea4eb94e94748a34e4
+  metadata.gz: 619c59b1c6e494e5e1b4b47889ea9de7eed5c44264ec0bd9f1372ea87c6a94d0
+  data.tar.gz: d4c3632f2ee191e8bb60529bd5699e11100500cc3ca1cbb4d119a183c38e279d
 SHA512:
-  metadata.gz: 702c84e56457539ce3872df0b9639c0f1ca3d8f70b6a5053a62056bec9cfb52272a99f8a4b9b795fc340dca5b34d9d1b2c02985f4a36ff96ae65f2981da69413
-  data.tar.gz: 3c8bef0ab7f2bd2a86e8971eed949ea22e6a4edf1c0ad5bd274ab91c0f8d4538cef49a9ee441c54d0941b173329bd364ba434a17ffa49e2afe9919c52acd3143
+  metadata.gz: 98d120335fbe70f9527e4f9eeb3678dd8db7dfac0aefb1e44fb639c499911ddec9370bb91e9f22bd9ecda519cb3fa92e6982dd9eda135e7be9efe3f26042295d
+  data.tar.gz: '09f603d60123a92e983ac22eeefff6468e047edc99f5cffd4278dfa94e51fc837522daa669838430459bf0009f14eef4d31c1aaae8c647b0196bcd4bedeb0cb6'

data/Rakefile

@@ -42,14 +42,16 @@ task :build   => [:clean, :compile]
 task :default => [:build, :spec]
 
 task :test do
-  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 "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"
+  extra_env = "PYROSCOPE_RUBY_LOCAL=1"
+  extra_env = ""
 
-  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"
+  system "#{extra_env} rake build && #{extra_env} sudo -E gem install pkg/pyroscope-#{Pyroscope::VERSION}.gem && sudo -E ruby test.rb"
 end
 
 task :test_exec 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 = "39a3d9c"
+COMMIT = "a263249"
 
 # TODO: this is not very accurate, but it works for now
 OS = RUBY_PLATFORM.include?("darwin") ? "mac" : "linux"
@@ -25,32 +25,35 @@ if ENV["PYROSCOPE_RUBY_LOCAL"]
   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|
-    req = Net::HTTP::Get.new(PREFIX+"/libpyroscope.rbspy.combo.a.gz")
-    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/libpyroscope.rbspy.combo.a"), "wb") do |f|
-          loop do
-            begin
-              chunk = zreader.readpartial(32768)
-              break if chunk.nil?
-            rescue EOFError
-              break
+    ["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
-            f.write(chunk)
           end
         end
-      end
 
-      resp.read_body do |chunk|
-        w.write(chunk)
-      end
+        resp.read_body do |chunk|
+          w.write(chunk)
+        end
 
-      t.join
+        t.join
+      end
     end
   end
 end
@@ -60,7 +63,7 @@ end
 
 dir_config('pyroscope', HEADER_DIRS, LIB_DIRS)
 
-libs = ['-lpyroscope.rbspy.combo']
+libs = ['-lpyroscope.rbspy', '-lrustdeps']
 libs.each do |lib|
   $LOCAL_LIBS << "#{lib} "
 end

data/lib/pyroscope/version.rb

@@ -1,3 +1,3 @@
 module Pyroscope
-  VERSION = "0.0.13".freeze
+  VERSION = "0.0.14".freeze
 end

data/test.rb

@@ -1,11 +1,11 @@
-# require 'pyroscope'
+require 'pyroscope'
 
 puts "prestart #{Process.pid}"
 
-# Pyroscope.configure do |config|
-#   config.app_name = "test.ruby.app{}"
-#   config.server_address = "http://localhost:4040/"
-# end
+Pyroscope.configure do |config|
+  config.app_name = "test.ruby.app{}"
+  config.server_address = "http://localhost:4040/"
+end
 
 puts "start"
 iteration=0
@@ -39,13 +39,13 @@ while true
     sleep_job
   elsif r < 0.5
     puts(" * test.ruby.app{job=0}")
-    # Pyroscope.change_name("test.ruby.app{job=0}")
+    Pyroscope.change_name("test.ruby.app{job=0}")
     job_0
-    # Pyroscope.change_name("test.ruby.app{}")
+    Pyroscope.change_name("test.ruby.app{}")
   else
     puts(" * test.ruby.app{job=1}")
-    # Pyroscope.change_name("test.ruby.app{job=1}")
+    Pyroscope.change_name("test.ruby.app{job=1}")
     job_1
-    # Pyroscope.change_name("test.ruby.app{}")
+    Pyroscope.change_name("test.ruby.app{}")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pyroscope
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Pyroscope Team
@@ -94,6 +94,7 @@ files:
 - Rakefile
 - ext/pyroscope/Makefile.example
 - 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