pyroscope 0.5.0-x86_64-darwin → 0.5.1-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cbeb9dcf8fc529aed335f7d5f94439c67a8fa49b3ff8a8746cf5aadbc7bb543
-  data.tar.gz: b6491f129c7cbb4410dad521b7acbe9c7295f0c712e80a8405a841e702e8530b
+  metadata.gz: 9cb87b3d680d036992d9e4dc5c24623005acfc2025ec4578b3d87f62af60eef1
+  data.tar.gz: bf83c8dd6257c99e2a9e6bb288a446bbbddbc3b322ab4fed8a81b7a9422bf54f
 SHA512:
-  metadata.gz: b89cfb96c15042be8d5d13f91caf8ddfe7210a00e44a3c4d27a04ac9bb9d814b0f8e72bd8daceaaff08431826748de27f6d11d75668ff2b3a497ada0cf51e6f8
-  data.tar.gz: 428caa044a687356eb5332acbbd5aa79c6f6d05df1711086fd546f313c6e7d597c89cdf7480e02efdcd9a5e559654318870a56b2516a10581cb7789af8b563fa
+  metadata.gz: 78b08c983b3e61158df1a9b8cf80ae79c4f947d10d6b868bf9f8d8c600f1d2c6112783ebe0b2d7c3412bc731fdb0a121170c2abc73981337e1487d2ccbe7c603
+  data.tar.gz: df6ea2ce9a7aeea50718f47ed8feada39324fea35e56bcfd59608d673832ea825077bcc793fee507cb7edf641dd9e272e71e91554a7f52807aacce58e099fd5d

data/lib/pyroscope/version.rb

@@ -1,3 +1,3 @@
 module Pyroscope
-  VERSION = '0.5.0'.freeze
+  VERSION = '0.5.1'.freeze
 end

data/lib/pyroscope.rb

@@ -22,7 +22,32 @@ module Pyroscope
     attach_function :thread_id, [], :uint64
   end
 
-  Config = Struct.new(:application_name, :app_name, :server_address, :auth_token, :log_level, :sample_rate, :detect_subprocesses, :oncpu, :report_pid, :report_thread_id, :tags, :compression, :report_encoding) do
+  if defined?(::Rails::Engine)
+    class Engine < ::Rails::Engine
+      config.after_initialize do
+        next unless ::Pyroscope.current_config && ::Pyroscope.current_config.autoinstrument_rails
+
+        ::Pyroscope.initialize_rails_hooks
+      end
+    end
+  end
+
+  Config = Struct.new(
+    :application_name,
+    :app_name,
+    :server_address,
+    :auth_token,
+    :log_level,
+    :sample_rate,
+    :detect_subprocesses,
+    :oncpu,
+    :report_pid,
+    :report_thread_id,
+    :tags,
+    :compression,
+    :report_encoding,
+    :autoinstrument_rails,
+  ) do
     def initialize(*)
       super
       # defaults:
@@ -38,10 +63,15 @@ module Pyroscope
       self.tags = {}
       self.compression = 'gzip'
       self.report_encoding = 'pprof'
+      self.autoinstrument_rails = true
     end
   end
 
   class << self
+    def current_config
+      @config
+    end
+
     def configure
       @config = Config.new
 
@@ -64,11 +94,8 @@ module Pyroscope
         @log_level = 50
       end
 
-      # Initialize Logging
       Rust.initialize_logging(@log_level)
 
-
-      # initialize Pyroscope Agent
       Rust.initialize_agent(
         # these are defaults in case user-provided values are nil:
         @config.app_name || @config.application_name || "",
@@ -85,6 +112,17 @@ module Pyroscope
       )
     end
 
+    def initialize_rails_hooks
+      block = lambda do |ctrl, action|
+        Pyroscope.tag_wrapper({
+          "action" => "#{ctrl.controller_name}/#{ctrl.action_name}"
+        }, &action)
+      end
+
+      ActionController::API.__send__(:around_action, block) if defined? ActionController::API
+      ActionController::Base.__send__(:around_action, block) if defined? ActionController::Base
+    end
+
     def tag_wrapper(tags)
       tid = thread_id
       _add_tags(tid, tags)
@@ -103,32 +141,34 @@ module Pyroscope
       warn("deprecated. Use `Pyroscope.tag_wrapper` instead.")
     end
 
-    # convert tags object to string
-    def tags_to_string(tags)
-      tags.map { |k, v| "#{k}=#{v}" }.join(',')
-    end
-
-    # get thread id
     def thread_id
       return Utils.thread_id
     end
 
-    # add tags
     def _add_tags(thread_id, tags)
       tags.each do |tag_name, tag_value|
         Rust.add_thread_tag(thread_id, tag_name.to_s, tag_value.to_s)
       end
     end
 
-    # remove tags
     def _remove_tags(thread_id, tags)
       tags.each do |tag_name, tag_value|
         Rust.remove_thread_tag(thread_id, tag_name.to_s, tag_value.to_s)
       end
     end
 
-    def shutdown
+    def stop
       Rust.drop_agent
     end
+
+    def shutdown
+      stop
+    end
+
+    private
+
+    def tags_to_string(tags)
+      tags.map { |k, v| "#{k}=#{v}" }.join(',')
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pyroscope
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: x86_64-darwin
 authors:
 - Pyroscope Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-06 00:00:00.000000000 Z
+date: 2022-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi