tracia 0.2.7 → 0.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 978a7b204dede4d5be2b8a78975266d59a16c0e93363b3e831d05b4d2cab7584
-  data.tar.gz: eb99548c2f027ca0242c513bb95369b3737fa12adf827c61eeb742341e16bee8
+  metadata.gz: b8d300497cc3f967c73f989925819a051d16ab7a9948b38068d37042aef2058d
+  data.tar.gz: 279e441cef317891df0030997cf88078292bee6544975635abf519d4cfc0f006
 SHA512:
-  metadata.gz: 990222bdcf8274d78bf63d68e97d3a7255c04a6da833f3638a6d82cbebb13f0a5f28aaa4039316975fa1543fac96b4771f630d96633c4bce54e6043c6e8eaea7
-  data.tar.gz: b613ca56e63b58cce4bb5cfca0a91f2c9113a00fbb6206d5f6bab3e7f6010c953c6fdd35966b2de3520477a04cff416188acc22df93b22c2214baacb0485c92e
+  metadata.gz: 194d257a120813ad1a7a676f12652bb1cd5ff25a226314217d7c0657fe526a2100ebe18b095561371d8dbd9fc1cdcb601cff38674dd89a2eb1c614cf9d2269f3
+  data.tar.gz: 7c4d3c5b3cb21bf6299f1358d1fd40ff450fcb073043de436f43332801e48712820a32f2bb9657cf472f99ad7d2307b5be5aaac9d1e8f0bd7ea84fc9eebf7a5d

data/README.md

@@ -76,6 +76,16 @@ Tracia.start(logger: MyLogger.new(db_connection)) do
 end
 ```
 
+### Log `raise`
+
+By default, Tracia log `raise` event via `TracePoint`. You can disable this feature by `trace_point: false`
+
+```ruby
+Tracia.start(trace_point: false) do
+  # ...
+end
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/tracia/fake_trace_point.rb

@@ -0,0 +1,9 @@
+class Tracia
+  class FakeTracePoint
+    def enable
+    end
+
+    def disable
+    end
+  end
+end

data/lib/tracia/gem_paths.rb

@@ -4,9 +4,7 @@ class Tracia
   module GemPaths
     ABSTRACTS = {}
 
-    ::YAML.load(`gem env`.gsub(/=>/, ':'))['RubyGems Environment']
-      .detect{ |hash| hash.has_key?('GEM PATHS') }['GEM PATHS']
-      .each_with_index { |path, i| ABSTRACTS["GemPath#{i}"] = path }
+    ::Gem.path.each_with_index { |path, i| ABSTRACTS["GemPath#{i}"] = path }
 
     class << self
       def shorten(location)

data/lib/tracia/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Tracia
-  VERSION = "0.2.7"
+  VERSION = "0.2.16"
 end

data/lib/tracia.rb

@@ -4,6 +4,7 @@ require "tracia/version"
 require "tracia/gem_paths"
 require "tracia/frame"
 require "tracia/default_logger"
+require "tracia/fake_trace_point"
 
 require "binding_of_callers"
 
@@ -52,12 +53,17 @@ class Tracia
     @backtraces = []
     @level = 0
 
-    enable_trace_point
+    enable_trace_point(opt[:trace_point])
   end
 
-  def enable_trace_point
+  def enable_trace_point(trace_point_opt)
+    return @trace_point = FakeTracePoint.new if trace_point_opt == false
+
     current_thread = Thread.current
     @trace_point = TracePoint.new(:raise) do |point|
+      if Proc === trace_point_opt
+        next if trace_point_opt.call(point, self) == false
+      end
       bd = point.binding
       next unless current_thread == bd.eval('Thread.current')
       backtrace = bd.eval("binding.partial_callers(-#{depth})")
@@ -90,13 +96,33 @@ class Tracia
 
     root = @stack[0]
     if root
-      non_tail_recursion!([root]) if @non_tail_recursion
+      eliminate_tail_recursion!([root]) if @non_tail_recursion
       @logger.call(root)
     end
   end
 
   private
 
+  def eliminate_tail_recursion!(stack)
+    @specific_recursion =
+      case @non_tail_recursion
+      when true
+        -> (_) { true }
+      else
+        target_recursions = Array === @non_tail_recursion ? @non_tail_recursion : [@non_tail_recursion]
+        target_recursions.map!{ |h| Frame.new(h[:klass], h[:call_sym], h[:method_name], nil, nil) }
+        -> (current) do
+          target_recursions.any? do |tr|
+            current.klass == tr.klass &&
+              current.call_sym == tr.call_sym &&
+              current.method_name == tr.method_name
+          end
+        end
+      end
+
+    non_tail_recursion!(stack)
+  end
+
   def non_tail_recursion!(stack)
     current_frame = stack.last
     last_idx = current_frame.children.count - 1
@@ -105,7 +131,9 @@ class Tracia
       next unless Frame === child
       next non_tail_recursion!([child]) if last_idx != idx
 
-      recursion_idx = stack.index{ |frame| frame.same_klass_and_method?(child) }
+      # pp (stack + [child]).map{|f| "#{f.send(:class_and_method)}:#{f.object_id}" }
+
+      recursion_idx = @specific_recursion[child] && stack.rindex{ |frame| frame.same_klass_and_method?(child) }
       if recursion_idx
         parent = stack[recursion_idx - 1]
         parent.children << child
@@ -142,22 +170,17 @@ class Tracia
     @frames_to_reject.any?{ |rj| rj =~ raw_frame.file }
   end
 
+  FAKE_METHOD = Struct.new(:source_location).new([nil, 0])
+
   def convert_to_frames(callers)
     callers.map! do |c|
       _binding = c._binding
+      iseq = _binding.instance_variable_get(:@iseq)
       klass = c.klass
       call_symbol = c.call_symbol
       frame_env = c.frame_env
 
-      source_location =
-        if _binding.frame_type == :method
-          meth = call_symbol == INSTANCE_METHOD_SHARP ? klass.instance_method(frame_env) : klass.method(frame_env)
-          meth.source_location
-        else
-          _binding.source_location
-        end
-
-      Frame.new(klass, call_symbol, frame_env, source_location[0], source_location[1])
+      Frame.new(klass, call_symbol, frame_env, iseq.path, iseq.first_lineno)
     end
 
     callers

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tracia
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.16
 platform: ruby
 authors:
 - ken
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-24 00:00:00.000000000 Z
+date: 2022-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.1.9
 - !ruby/object:Gem::Dependency
   name: binding_of_callers
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,7 @@ files:
 - Rakefile
 - lib/tracia.rb
 - lib/tracia/default_logger.rb
+- lib/tracia/fake_trace_point.rb
 - lib/tracia/frame.rb
 - lib/tracia/gem_paths.rb
 - lib/tracia/version.rb