perfetto 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7384eed21d076be3de57b5afa9fc886e979ccc4d89e167afc61e2800314d61f4
-  data.tar.gz: f6c71a99835e93c07734bfd790aba1d80fa86879327f2357007c184edbd0a619
+  metadata.gz: 39a086e467a4a552a3cc5f297463efd645b6b9f84f2aa12a3cefac8220cf8bc5
+  data.tar.gz: fb857cf75960f71c666f5559e57a500f5c077e155d154de291f74390f362ac17
 SHA512:
-  metadata.gz: c77bd5af96cb578659982e03d292893426a64d7d8ef7618ea5ab782005c519c6e2244b4d6cd7885fc2b9f2e76f6551e1fb3bd67b803552df3c8b8e861f671c38
-  data.tar.gz: e33c6fe69f65d1dcd2ed3a81ba6e2e699b85b89932511233638900514921d310dbf305f17bb0bb899fe39ac2593bac48667fcca452fa53f9fdf0467cf7a90923
+  metadata.gz: d0c4891e4896d3b8e35039d7bc91911ecf839c2f76434bdde2385b1b38c97a6a94b5620a8c6c8ab571178cabd99b65ed0b34e3b24c826125105cb334d3f4b85a
+  data.tar.gz: b4a5c367b82bf931813c762b0f83e156c2a1985a03d5f03ec2cd72ae395eeb2f11f347a9d3345d89f0b3c5d9e8b143dffe295f2bbd08406823c5b5d29f3d7861

data/README.md

@@ -94,16 +94,15 @@ Perfetto.stop_tracing "example.pftrace"
 require "sinatra/base"
 require "perfetto"
 
-Perfetto.setup enable_tracing: true
-
 class Server < Sinatra::Base
-  use Perfetto::Middleware
+  use Perfetto::Middleware, env_proc: ->(env) { env.to_json }
 
   get "/" do
     "Hello World"
   end
 end
 
+Perfetto.setup enable_tracing: true
 Perfetto.start_tracing
 Server.run!
 Perfetto.stop_tracing "middleware.pftrace"

data/example/example.rb

@@ -59,9 +59,16 @@ class Foo
 end
 
 class Bar < Foo
+  def self.buf2
+    puts "buf2"
+    sleep 0.1
+  end
+
   def say
     puts "hello"
     sleep 0.1
+    Bar.buf2
+    Foo.buf
   end
 end
 

data/lib/perfetto/interceptor.rb

@@ -62,27 +62,31 @@ module Perfetto
 
         perfetto_traced_class_methods << method_name
 
-        original_method = method(method_name)
+        original_method = singleton_class.instance_method(method_name)
         singleton_class.send(:alias_method, "_pfc_#{method_name}", method_name)
 
         define_singleton_method(method_name) do |*args, **kwargs, &block|
           category = name
           task_name = "#{name}.#{method_name}"
           Perfetto.trace_event_begin category, task_name
-          original_method.call(*args, **kwargs, &block)
+          original_method.bind(self).call(*args, **kwargs, &block)
         ensure
           Perfetto.trace_event_end name
         end
       end
 
       def perfetto_trace_all
+        original_method_added = singleton_class.instance_method(:method_added)
         define_singleton_method(:method_added) do |method_name|
+          original_method_added.bind(self).call(method_name)
           return if perfetto_traced_instance_method?(method_name)
 
           perfetto_trace_instance_method method_name
         end
 
+        original_singleton_method_added = singleton_class.instance_method(:singleton_method_added)
         define_singleton_method(:singleton_method_added) do |method_name|
+          original_singleton_method_added.bind(self).call(method_name)
           return if perfetto_traced_class_method?(method_name)
 
           perfetto_trace_class_method method_name

data/lib/perfetto/middleware.rb

@@ -1,32 +1,35 @@
 # frozen_string_literal: true
 
-require "json"
-
 module Perfetto
   # Rack middleware
   class Middleware
     def initialize(app, options = {})
       @app = app
       @options = options
+      @env_proc = options[:env_proc]
     end
 
-    if Perfetto::Configure.enable_tracing
-      def call(env)
-        category = "RackMiddleware"
-        method = env["REQUEST_METHOD"] || "UNKNOWN"
-        path = env["PATH_INFO"] || "UNKNOWN PATH"
-        task_name = "#{method} #{path}"
-        Perfetto.trace_event_begin_with_debug_info category, task_name, "env", env.to_json
-        begin
-          @app.call(env)
-        ensure
-          Perfetto.trace_event_end category
-        end
-      end
-    else # Stub methods
-      def call(env)
+    # rubocop:disable Metrics/MethodLength
+    def perfetto_traced_call(env)
+      category = "RackMiddleware"
+      method = env["REQUEST_METHOD"] || "UNKNOWN"
+      path = env["PATH_INFO"] || "UNKNOWN PATH"
+      task_name = "#{method} #{path}"
+      env_str = @env_proc&.call(env) || { env: "unknown" }.to_json
+
+      Perfetto.trace_event_begin_with_debug_info category, task_name, "env", env_str
+      begin
         @app.call(env)
+      ensure
+        Perfetto.trace_event_end category
       end
     end
+    # rubocop:enable Metrics/MethodLength
+
+    def call(env)
+      @app.call(env) unless Perfetto::Configure.enable_tracing
+
+      perfetto_traced_call(env)
+    end
   end
 end

data/lib/perfetto/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Perfetto
-  VERSION = "0.1.7"
+  VERSION = "0.1.9"
 end

data/lib/perfetto.rb

@@ -1,10 +1,15 @@
 # frozen_string_literal: true
 
+require "json"
+
 require_relative "perfetto/version"
 
 require_relative "perfetto/core_ext/configurable"
 require_relative "perfetto/configure"
 
+# Rack middleware
+require_relative "perfetto/middleware"
+
 # To minimize the overhead of tracing at runtime
 # we determine whether to enable instrumentations
 # at the first call to 'setup' method instead of
@@ -20,7 +25,5 @@ module Perfetto
     require_relative "perfetto/perfetto"
     # Instrumentation Helper
     require_relative "perfetto/interceptor"
-    # Rack middleware
-    require_relative "perfetto/middleware"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: perfetto
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - Kowalski Dark
@@ -38,7 +38,6 @@ files:
 - lib/perfetto/middleware.rb
 - lib/perfetto/perfetto.rb
 - lib/perfetto/version.rb
-- perfetto.gemspec
 - sig/perfetto.rbs
 homepage: https://github.com/yet-another-ai/perfetto.rb
 licenses: []

data/perfetto.gemspec

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "lib/perfetto/version"
-
-Gem::Specification.new do |spec|
-  spec.name = "perfetto"
-  spec.version = Perfetto::VERSION
-  spec.authors = ["Kowalski Dark"]
-  spec.email = ["github@akenonet.com"]
-
-  spec.summary = "Yet another event tracing library for Ruby."
-  spec.description = "Yet another event tracing library for Ruby."
-  spec.homepage = "https://github.com/yet-another-ai/perfetto.rb"
-  spec.required_ruby_version = ">= 3.3.0"
-
-  spec.metadata["homepage_uri"] = spec.homepage
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(__dir__) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      (File.expand_path(f) == __FILE__) ||
-        f.start_with?(*%w[bin/ test/ spec/ features/ .git .github appveyor Gemfile])
-    end
-  end
-  spec.bindir = "exe"
-  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-  spec.require_paths = %w[lib ext]
-  spec.extensions = ["ext/perfetto/extconf.rb"]
-
-  # For more information and examples about making a new gem, check out our
-  # guide at: https://bundler.io/guides/creating_gem.html
-  spec.metadata["rubygems_mfa_required"] = "true"
-end