pyroscope 0.0.16 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76993115eef4fc1b362e927bebb25727ec82ff9fb7015e344da5746f9c4c76bb
-  data.tar.gz: be474b604626cb0c1818a9f0348bb95941721e4c4ad7fa78c0b50cff7ce52e3d
+  metadata.gz: 6d225c19f37a67a395be38c34385f64890b39a2a62b4e0d2e2fb33ee6ea339bd
+  data.tar.gz: 16c2204608dd53eab9252c90188347524e90c7fa854dd0a51686129127193777
 SHA512:
-  metadata.gz: be636ff348bf2ee331acf07f14ea260de35b0f1e78a2265733a9952124fc0588cc96b286ba0e362c118d17f1085946cb054a9f24feb90e4ae8590ead6b338db8
-  data.tar.gz: 050e2d247e3b5742035f7c0957243d272230d08111927af81d1a638e01ad0334dca886b3c9673d3544b1acaef5f4cdbc2b9bcef6dd61dd301c4370149cae8ce8
+  metadata.gz: 182168268e38e12e25101c30b508c550daa50c3b3406ba8f9409fbdd268b06f584ae28bd92dd73067e288029f962075bff7e4e7fe8446767ab047c70798ea7d4
+  data.tar.gz: daccec7b3a6c262ac4a0d03fd6459907fa4b450c7e0598180d58c4983d9c2148260a04198b7c7da25c962cdc5209e5c9af49748331915d1a3a9e23e89b7b8bed

data/Rakefile

@@ -42,16 +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"
-  extra_env = "PYROSCOPE_RUBY_LOCAL=1"
-  extra_env = ""
-
-  system "#{extra_env} rake build && #{extra_env} 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 = "3ad06ea"
+COMMIT = "df45c48"
 
 # TODO: this is not very accurate, but it works for now
 OS = RUBY_PLATFORM.include?("darwin") ? "mac" : "linux"
@@ -19,10 +19,18 @@ 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|
     ["libpyroscope.rbspy.a", "librustdeps.a"].each do |name|

data/ext/pyroscope/pyroscope.c

@@ -6,46 +6,90 @@ 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();
+int SetLoggerLevel(int);
+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_set_logger_level(VALUE self, VALUE level) {
+  int res = SetLoggerLevel(FIX2INT(level));
+  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, "_set_logger_level", pyroscope_set_logger_level, 1);
+  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.16".freeze
+  VERSION = "0.0.23".freeze
 end

data/lib/pyroscope.rb

@@ -2,23 +2,49 @@ 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 set_tag(key, val)
+      _set_tag(key, val)
+    end
+
+    def test_logger()
+      _test_logger
+    end
+
+    VALID_LOG_LEVELS = %i[none error info debug]
+
+    def set_logger_level(level)
+      i = VALID_LOG_LEVELS.index(level)
+      raise "Unknown log level (#{level.inspect}), valid values are #{VALID_LOG_LEVELS.inspect}" unless i
+
+      _set_logger_level(i - 1)
+    end
 
-  def self.change_name(new_name)
-    _change_name(new_name, Process.pid)
+    def build_summary
+      _build_summary
+    end
   end
 end

data/test.rb

@@ -5,11 +5,17 @@ puts "prestart #{Process.pid}"
 Pyroscope.configure do |config|
   config.app_name = "test.ruby.app{}"
   config.server_address = "http://localhost:4040/"
+  config.log_level = "debug"
 end
 
 puts "start"
-iteration=0
-st = Time.new
+
+puts "Pyroscope.test_logger 1"
+Pyroscope.test_logger
+Pyroscope.set_logger_level(:debug)
+puts "Pyroscope.test_logger 2"
+Pyroscope.test_logger
+
 
 def work(n)
   i = 0
@@ -30,22 +36,57 @@ def sleep_job
   sleep(rand()*10)
 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{}")
+def main_loop(b)
+  puts "Starting main loop from: #{Process.pid}"
+  Pyroscope.set_tag("pid", Process.pid.to_s) if b
+  while true
+    r = rand
+    # if r > 0.9
+    #   Pyroscope.set_logger_level(:test)
+    # end
+    if r < 0.1
+      sleep_job
+    elsif r < 0.5
+      puts(" * test.ruby.app{job=0} #{Process.pid}")
+      Pyroscope.set_tag("job", "0") if b
+      job_0
+      Pyroscope.set_tag("job", "") if b
+    else
+      puts(" * test.ruby.app{job=1} #{Process.pid}")
+      Pyroscope.set_tag("job", "1") if b
+      job_1
+      Pyroscope.set_tag("job", "") if b
+    end
   end
 end
+
+fork do
+  puts "build_summary:"
+  puts Pyroscope.build_summary
+  # Pyroscope.configure do |config|
+  #   config.app_name = "test.ruby.app2{}"
+  #   config.server_address = "http://localhost:4040/"
+  # end
+
+  puts "Hello from fork pid: #{Process.pid}"
+  sleep 15
+  main_loop(false)
+end
+
+# sleep 5
+# if ARGV.first == "subprocess"
+#   main_loop(true)
+# else
+#   ssh_pid = Kernel.spawn("ruby", "test.rb", "subprocess")
+#   puts "spawned #{ssh_pid}"
+
+#   sleep(30)
+#   puts "killing #{ssh_pid}"
+#   Process.kill("TERM", ssh_pid)
+
+
+# end
+
+sleep 15
+puts "The parent process just skips over it: #{Process.pid}"
+main_loop(true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pyroscope
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.23
 platform: ruby
 authors:
 - Pyroscope Team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-30 00:00:00.000000000 Z
+date: 2021-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -107,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
@@ -123,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: []