pyroscope 0.0.13 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42f5e0729331e9002034247e8e90daf55c4efee52fd9c73a09bcf97ea3faf073
-  data.tar.gz: a15a4611dd40f44d1a3dd82d3fc15fe92efd3ac61bcba0ea4eb94e94748a34e4
+  metadata.gz: 15d405da85cfd950ffe3b25c9ea6a3b5df68c57cfb52cd0b53f91cf26f22a955
+  data.tar.gz: 76422633bd992c1a1b148f66a9be25c6974bb47fba0d70e38e09c749fa389109
 SHA512:
-  metadata.gz: 702c84e56457539ce3872df0b9639c0f1ca3d8f70b6a5053a62056bec9cfb52272a99f8a4b9b795fc340dca5b34d9d1b2c02985f4a36ff96ae65f2981da69413
-  data.tar.gz: 3c8bef0ab7f2bd2a86e8971eed949ea22e6a4edf1c0ad5bd274ab91c0f8d4538cef49a9ee441c54d0941b173329bd364ba434a17ffa49e2afe9919c52acd3143
+  metadata.gz: 67550275be573ffe4dac71dc62386dc917bed9cb0be052b155cd33d11d18107100e1323c0454d3dd55eaaa269c2c3a58b039fa48a54ba07170d755ac2f4d768c
+  data.tar.gz: a4d1a8a11ffc44762a7dcb30ea7d946960696e35e77936e56c67f520d94744161cde0255cdf6457482b6c419522341ba46051b569c36c9580f1dee0f89a48c58

data/Rakefile

@@ -42,14 +42,8 @@ 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 "PYROSCOPE_RUBY_LOCAL=1 rake build && PYROSCOPE_RUBY_LOCAL=1 sudo -E gem install pkg/pyroscope-#{Pyroscope::VERSION}.gem && sudo -E ruby test.rb"
+  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

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 = "df45c48"
 
 # TODO: this is not very accurate, but it works for now
 OS = RUBY_PLATFORM.include?("darwin") ? "mac" : "linux"
@@ -19,38 +19,49 @@ 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 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")}"
+  # TODO: make configurable
+  pyroscope_path = "#{ENV["HOME"]}/pyroscope"
+  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|
-    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 +71,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/ext/pyroscope/pyroscope.c

@@ -6,46 +6,82 @@ static VALUE rb_Pyroscope;
 #include <stdio.h>
 #include <string.h>
 
-int Start(char*, int, char*, char*);
-int Stop(int);
-int ChangeName(char*, int);
+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 pid, VALUE serverAddress) {
+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_pid = FIX2INT(pid);
+  int c_sampleRate = FIX2INT(sampleRate);
+  int c_withSubprocesses = FIX2INT(withSubprocesses);
 
   VALUE r_serverAddress = StringValue(serverAddress);
   char *c_serverAddress = RSTRING_PTR(r_serverAddress);
 
-  int res = Start(c_appName, c_pid, "rbspy", c_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, VALUE pid) {
-  int c_pid = FIX2INT(pid);
-  int res = Stop(c_pid);
+pyroscope_stop(VALUE self) {
+  int res = Stop();
   return INT2FIX(res);
 }
 
 static VALUE
-pyroscope_change_name(VALUE self, VALUE appName, VALUE pid) {
+pyroscope_change_name(VALUE self, VALUE appName) {
   VALUE r_appName = StringValue(appName);
   char *c_appName = RSTRING_PTR(r_appName);
-  int c_pid = FIX2INT(pid);
 
-  int res = ChangeName(c_appName, c_pid);
+  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, 3);
-  rb_define_module_function(rb_Pyroscope, "_stop", pyroscope_stop, 1);
-  rb_define_module_function(rb_Pyroscope, "_change_name", pyroscope_change_name, 2);
+  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/lib/pyroscope/version.rb

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

data/lib/pyroscope.rb

@@ -2,23 +2,58 @@ require "pyroscope/version"
 require "pyroscope_c"
 
 module Pyroscope
-  Config = Struct.new(:app_name, :server_address)
-
-  def self.configure
-    @configuration = Config.new
-    yield @configuration
-    _start(
-      @configuration.app_name,
-      Process.pid,
-      @configuration.server_address,
-    )
-  end
+  Config = Struct.new(:app_name, :server_address, :auth_token, :sample_rate, :with_subprocesses, :log_level)
 
-  def self.stop
-    _stop(Process.pid)
-  end
+  class << self
+    def configure
+      @configuration = Config.new
+      yield @configuration
+      _start(
+        @configuration.app_name,
+        @configuration.server_address,
+        @configuration.auth_token || "",
+        @configuration.sample_rate || 100,
+        @configuration.with_subprocesses || 0,
+        @configuration.log_level || "error",
+      )
+    end
+
+    def stop
+      _stop
+    end
+
+    def change_name(new_name)
+      _change_name(new_name)
+    end
+
+    def tag_wrapper(tags)
+      tag(tags)
+
+      begin
+        yield
+      ensure
+        remove_tags(*tags.keys)
+      end
+    end
+
+    def tag(tags)
+      tags.each_pair do |key, val|
+        _set_tag(key, val)
+      end
+    end
+
+    def remove_tags(*keys)
+      keys.each do |key|
+        _set_tag(key, "")
+      end
+    end
+
+    def test_logger
+      _test_logger
+    end
 
-  def self.change_name(new_name)
-    _change_name(new_name, Process.pid)
+    def build_summary
+      _build_summary
+    end
   end
 end

data/test.rb

@@ -1,15 +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
-
-puts "start"
-iteration=0
-st = Time.new
+Pyroscope.configure do |config|
+  config.app_name = "test.ruby.app{}"
+  config.server_address = "http://localhost:4040/"
+end
 
 def work(n)
   i = 0
@@ -18,34 +14,19 @@ def work(n)
   end
 end
 
-def job_0
-  work(rand()*1_000_000)
-end
-
-def job_1
-  work(rand()*2_000_000)
+def fast_function
+  Pyroscope.tag_wrapper({ "function" => "fast"}) do
+    work(20_000)
+  end
 end
 
-def sleep_job
-  sleep(rand()*10)
+def slow_function
+  Pyroscope.tag({ "function" => "slow"})
+  work(80_000)
+  Pyroscope.remove_tags("function")
 end
 
-
 while true
-  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
+  fast_function
+  slow_function
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pyroscope
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.1.0
 platform: ruby
 authors:
 - Pyroscope Team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-30 00:00:00.000000000 Z
+date: 2021-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -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
@@ -106,7 +107,7 @@ homepage: http://rubygems.org/gems/pyroscope
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -122,8 +123,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: pyroscope
 test_files: []