appmap 0.94.1 → 0.95.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca46315eb8aa31221cee8a1d656187a4e4355e63f6b2be1d591829dddb76f7e0
-  data.tar.gz: d038130a2827f01f573bf69dbe32ab837d7ff68b28dce7a6076a80eee2f4550e
+  metadata.gz: a3f036b61b1750e2820f676694a15af9461404dc9b8f048add0b9b7291dd1d4a
+  data.tar.gz: f40f6587ecbf21c250952b1ecfc51349d6ad3cf53276d6cf30d9a97f859295b2
 SHA512:
-  metadata.gz: 58a84ec34e17b22acf37fd0b9f964fb93f82531cb7f800721d33214b1bc434b81e47cbf7202f87ddeade990644d4cc512898125bc59851e82f035f9093c31eb2
-  data.tar.gz: a8a0bfa9cf83dc59d6e3848228f602bf8030c01601755a853a55ee4b452a970e2de1c823649da1fc0b557b8b9b6ba24c142f324975a20a222aadc239d37958b1
+  metadata.gz: bd45853f98e82f90b6885b615931f73b125a5194041221c0bf9f21b41ab1f2285489ef3b7e1915905b41e434e65d607eebdf232d53a6bc1e1b75f516f73d2222
+  data.tar.gz: 3465e8521239b8eadc1145e06847bb454a1f6b43ef0adf6ed50f8d2fb6eccb63ac79a86b913628db7344b10c8b68980dd6c3aa5ac9741eac4bfef6b39d109a76

data/.gitignore

@@ -2,12 +2,14 @@
 /html/
 .bundle
 /.yardoc
+/.yarn
 /_yardoc/
 /coverage/
 /doc/
 /pkg/
 /spec/reports/
 tmp/
+appmap_hook.log
 vendor
 node_modules
 Gemfile.lock

data/.nvmrc

@@ -0,0 +1 @@
+14

data/.ruby-version

@@ -0,0 +1 @@
+3.0.2

data/.rufo

@@ -0,0 +1,2 @@
+# .rufo
+quote_style :single

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+# [0.95.0](https://github.com/getappmap/appmap-ruby/compare/v0.94.1...v0.95.0) (2022-12-15)
+
+
+### Bug Fixes
+
+* Disable active_record hooks ([239986d](https://github.com/getappmap/appmap-ruby/commit/239986deded12e65384b441033180c30a3ffe698))
+* Fix Array#pack hook ([2a8b2ed](https://github.com/getappmap/appmap-ruby/commit/2a8b2ed4d9fb047213e6a3fd427d846c5d312e2f))
+* Fix name of rails7 test database ([6581b65](https://github.com/getappmap/appmap-ruby/commit/6581b65c088ee8415fd150d11c4ab6793173f0e2))
+* Typo in label configuration ([999b25b](https://github.com/getappmap/appmap-ruby/commit/999b25b75057a7f6061cfbc9cdc04616f5aeb998))
+
+
+### Features
+
+* Enable deserialize.safe labels ([62be78a](https://github.com/getappmap/appmap-ruby/commit/62be78a0502d83c9b5a2b7d97abd17d144bd41c5))
+* Enhance the hook log a lot ([c93d91c](https://github.com/getappmap/appmap-ruby/commit/c93d91c5be86b9195e14ef40741600c633638b40))
+* Enhancing hook logging and profiling ([01dbe4b](https://github.com/getappmap/appmap-ruby/commit/01dbe4bb973b71fea0885f55d17b80d6b6b8fb6e))
+
 ## [0.94.1](https://github.com/getappmap/appmap-ruby/compare/v0.94.0...v0.94.1) (2022-11-23)
 
 

data/lib/appmap/builtin_hooks/{activesupport.yml → active_support.yml}

@@ -19,6 +19,6 @@
 - method: ActiveSupport::MessageEncryptor#encrypt_and_sign
   require_name: active_support/message_encryptor
   force: true
-- method: ActiveSupport::MessageEncryptor#decrypt_and_verifdy
+- method: ActiveSupport::MessageEncryptor#decrypt_and_verify
   require_name: active_support/message_encryptor
   force: true

data/lib/appmap/builtin_hooks/ruby.yml

@@ -7,9 +7,9 @@
 - method: Marshal#dump
   require_name: ruby
   label: serialize
-- method: String#pack
+- method: Array#pack
   require_name: ruby
-  label: string.pack
+  label: array.pack
 - methods:
   - String#unpack
   - String#unpack1

data/lib/appmap/config.rb

@@ -8,6 +8,7 @@ require 'appmap/handler'
 require 'appmap/service/guesser'
 require 'appmap/swagger/configuration'
 require 'appmap/depends/configuration'
+require_relative './hook_log'
 
 module AppMap
   class Config
@@ -499,7 +500,11 @@ module AppMap
 
     def never_hook?(cls, method)
       _, separator, = ::AppMap::Hook.qualify_method_name(method)
-      return true if exclude.member?(cls.name) || exclude.member?([ cls.name, separator, method.name ].join)
+      if exclude.member?(cls.name) || exclude.member?([ cls.name, separator, method.name ].join)
+        HookLog.log "Hooking of #{method} disabled by configuration" if HookLog.enabled?
+        return true
+      end
+      false
     end
   end
 end

data/lib/appmap/gem_hooks/rails.yml

@@ -1,2 +1,2 @@
 - method: Rails::Application#config_for
-#  label: deserialize.safe
+  label: deserialize.safe

data/lib/appmap/gem_hooks/railties.yml

@@ -1,2 +1,2 @@
 - method: Rails::Application::Configuration#database_configuration
-#  label: deserialize.safe
+  label: deserialize.safe

data/lib/appmap/hook/method.rb

@@ -38,13 +38,13 @@ module AppMap
       end
 
       def activate
-        if Hook::LOG
+        if HookLog.enabled?
           msg = if method_display_name
-                  "#{method_display_name}"
-                else
-                  "#{hook_method.name} (class resolution deferred)"
-                end
-          warn "AppMap: Hooking #{msg} at line #{(hook_method.source_location || []).join(':')}"
+              "#{method_display_name}"
+            else
+              "#{hook_method.name} (class resolution deferred)"
+            end
+          HookLog.log "Hooking #{msg} at line #{(hook_method.source_location || []).join(':')}"
         end
 
         hook_method_parameters = hook_method.parameters.dup.freeze
@@ -65,8 +65,7 @@ module AppMap
       protected
 
       def defining_class(hook_class)
-        cls = \
-          if RUBY_MAJOR_VERSION == 2 && RUBY_MINOR_VERSION <= 5
+        cls = if RUBY_MAJOR_VERSION == 2 && RUBY_MINOR_VERSION <= 5
             hook_class
               .ancestors
               .select { |cls| cls.method_defined?(hook_method.name) }

data/lib/appmap/hook.rb

@@ -1,17 +1,15 @@
 # frozen_string_literal: true
 
 require 'English'
+require_relative './hook_log'
 
 module AppMap
   class Hook
-    LOG = (ENV['APPMAP_DEBUG'] == 'true' || ENV['DEBUG'] == 'true')
-    LOG_HOOK = (ENV['DEBUG_HOOK'] == 'true')
-
     OBJECT_INSTANCE_METHODS = %i[! != !~ <=> == === =~ __id__ __send__ class clone define_singleton_method display dup
                                  enum_for eql? equal? extend freeze frozen? hash inspect instance_eval instance_exec instance_of? instance_variable_defined? instance_variable_get instance_variable_set instance_variables is_a? itself kind_of? method methods nil? object_id private_methods protected_methods public_method public_methods public_send remove_instance_variable respond_to? send singleton_class singleton_method singleton_methods taint tainted? tap then to_enum to_s to_h to_a trust untaint untrust untrusted? yield_self].freeze
     OBJECT_STATIC_METHODS = %i[! != !~ < <= <=> == === =~ > >= __id__ __send__ alias_method allocate ancestors attr
                                attr_accessor attr_reader attr_writer autoload autoload? class class_eval class_exec class_variable_defined? class_variable_get class_variable_set class_variables clone const_defined? const_get const_missing const_set constants define_method define_singleton_method deprecate_constant display dup enum_for eql? equal? extend freeze frozen? hash include include? included_modules inspect instance_eval instance_exec instance_method instance_methods instance_of? instance_variable_defined? instance_variable_get instance_variable_set instance_variables is_a? itself kind_of? method method_defined? methods module_eval module_exec name new nil? object_id prepend private_class_method private_constant private_instance_methods private_method_defined? private_methods protected_instance_methods protected_method_defined? protected_methods public_class_method public_constant public_instance_method public_instance_methods public_method public_method_defined? public_methods public_send remove_class_variable remove_instance_variable remove_method respond_to? send singleton_class singleton_class? singleton_method singleton_methods superclass taint tainted? tap then to_enum to_s trust undef_method untaint untrust untrusted? yield_self].freeze
-    SLOW_PACKAGE_THRESHOLD = 0.05
+    SLOW_PACKAGE_THRESHOLD = 0.001
 
     @unbound_method_arity = ::UnboundMethod.instance_method(:arity)
     @method_arity = ::Method.instance_method(:arity)
@@ -21,7 +19,7 @@ module AppMap
         Mutex.new.synchronize do
           @hook_builtins = true if @hook_builtins.nil?
 
-          return false unless @hook_builtins
+          next false unless @hook_builtins
 
           @hook_builtins = false
           true
@@ -41,9 +39,9 @@ module AppMap
       def qualify_method_name(method)
         if method.owner.singleton_class?
           class_name = singleton_method_owner_name(method)
-          [ class_name, '.', method.name ]
+          [class_name, '.', method.name]
         else
-          [ method.owner.name, '#', method.name ]
+          [method.owner.name, '#', method.name]
         end
       end
     end
@@ -69,19 +67,23 @@ module AppMap
       @slow_packages = Set.new
 
       if ENV['APPMAP_PROFILE_HOOK'] == 'true'
+        dump_times = lambda do
+          @module_load_times
+            .keys
+            .select { |key| !@slow_packages.member?(key) }
+            .each do |key|
+            elapsed = @module_load_times[key]
+            if elapsed >= SLOW_PACKAGE_THRESHOLD
+              @slow_packages.add(key)
+              warn "AppMap: Package #{key} took #{@module_load_times[key]} seconds to hook"
+            end
+          end
+        end
+
+        at_exit &dump_times
         Thread.new do
-          sleep 1
           while true
-            @module_load_times
-              .keys
-              .select { |key| !@slow_packages.member?(key) }
-              .each do |key|
-              elapsed = @module_load_times[key]
-              if elapsed >= SLOW_PACKAGE_THRESHOLD
-                @slow_packages.add(key)
-                warn "AppMap: Package #{key} took #{@module_load_times[key]} seconds to hook"
-              end
-            end
+            dump_times.call
             sleep 5
           end
         end
@@ -99,45 +101,51 @@ module AppMap
       hook_loaded_code = lambda do |hooks_by_class, builtin|
         hooks_by_class.each do |class_name, hooks|
           Array(hooks).each do |hook|
-            if builtin && hook.package.require_name && hook.package.require_name != 'ruby'
-              require hook.package.require_name
-            end
-
-            Array(hook.method_names).each do |method_name|
-              method_name = method_name.to_sym
-
-              warn "AppMap: Initiating hook for builtin #{class_name} #{method_name}" if LOG
-
+            HookLog.builtin class_name do
+              if builtin && hook.package.require_name && hook.package.require_name != 'ruby'
+                begin
+                  require hook.package.require_name
+                rescue
+                  HookLog.load_error hook.package.require_name, "Unable to require #{hook.package.require_name}: #{$!}" if HookLog.enabled?
+                  next
+                end
+              end
+  
               begin
                 base_cls = Object.const_get class_name
               rescue NameError
+                HookLog.load_error class_name, "Class #{class_name} not found in global scope" if HookLog.enabled?
                 next
               end
-
-              hook_method = lambda do |entry|
-                cls, method = entry
-                next if config.never_hook?(cls, method)
-
-                hook.package.handler_class.new(hook.package, cls, method).activate
-              end
-
-              methods = []
-              # irb(main):001:0> Kernel.public_instance_method(:system)
-              # (irb):1:in `public_instance_method': method `system' for module `Kernel' is  private (NameError)
-              if base_cls == Kernel
-                methods << [ base_cls, base_cls.instance_method(method_name) ] rescue nil
-              end
-              methods << [ base_cls, base_cls.public_instance_method(method_name) ] rescue nil
-              methods << [ base_cls, base_cls.protected_instance_method(method_name) ] rescue nil
-              if base_cls.respond_to?(:singleton_class)
-                methods << [ base_cls.singleton_class, base_cls.singleton_class.public_instance_method(method_name) ] rescue nil
-                methods << [ base_cls.singleton_class, base_cls.singleton_class.protected_instance_method(method_name) ] rescue nil
-              end
-              methods.compact!
-              if methods.empty?
-                warn "Method #{method_name} not found on #{base_cls.name}" if LOG
-              else
-                methods.each(&hook_method)
+  
+              Array(hook.method_names).each do |method_name|
+                method_name = method_name.to_sym
+  
+                hook_method = lambda do |entry|
+                  cls, method = entry
+                  next if config.never_hook?(cls, method)
+  
+                  hook.package.handler_class.new(hook.package, cls, method).activate
+                end
+  
+                methods = []
+                # irb(main):001:0> Kernel.public_instance_method(:system)
+                # (irb):1:in `public_instance_method': method `system' for module `Kernel' is  private (NameError)
+                if base_cls == Kernel
+                  methods << [base_cls, base_cls.instance_method(method_name)] rescue nil
+                end
+                methods << [base_cls, base_cls.public_instance_method(method_name)] rescue nil
+                methods << [base_cls, base_cls.protected_instance_method(method_name)] rescue nil
+                if base_cls.respond_to?(:singleton_class)
+                  methods << [base_cls.singleton_class, base_cls.singleton_class.public_instance_method(method_name)] rescue nil
+                  methods << [base_cls.singleton_class, base_cls.singleton_class.protected_instance_method(method_name)] rescue nil
+                end
+                methods.compact!
+                if methods.empty?
+                  HookLog.load_error [ base_cls.name, method_name ].join('[#.]'), "Method #{method_name} not found on #{base_cls.name}" if HookLog.enabled?
+                else
+                  methods.each(&hook_method)
+                end
               end
             end
           end
@@ -145,89 +153,93 @@ module AppMap
       end
 
       hook_loaded_code.(config.builtin_hooks, true)
-      hook_loaded_code.(config.gem_hooks, false)
     end
 
     protected
 
     def trace_location(trace_point)
-      [ trace_point.path, trace_point.lineno ].join(':')
+      [trace_point.path, trace_point.lineno].join(':')
     end
 
     def trace_end(trace_point)
       location = trace_location(trace_point)
-      warn "Class or module ends at location #{location}" if Hook::LOG || Hook::LOG_HOOK
       return unless @trace_locations.add?(location)
-
-      path = trace_point.path
-      enabled = !@notrace_paths.member?(path) && config.path_enabled?(path)
-      unless enabled
-        warn 'Not hooking - path is not enabled' if Hook::LOG || Hook::LOG_HOOK
-        @notrace_paths << path
-        return
-      end
-
-      cls = trace_point.self
-
-      instance_methods = cls.public_instance_methods(false) + cls.protected_instance_methods(false) - OBJECT_INSTANCE_METHODS
-      # NoMethodError: private method `singleton_class' called for Rack::MiniProfiler:Class
-      class_methods = begin
-        if cls.respond_to?(:singleton_class)
-          cls.singleton_class.public_instance_methods(false) + cls.singleton_class.protected_instance_methods(false) - instance_methods - OBJECT_STATIC_METHODS
-        else
-          []
+      HookLog.on_load location do
+        path = trace_point.path
+        enabled = !@notrace_paths.member?(path) && config.path_enabled?(path)
+        unless enabled
+          HookLog.log 'Not hooking - path is not enabled' if HookLog.enabled?
+          @notrace_paths << path
+          next
         end
-      rescue NameError
-        []
-      end
 
-      hook = lambda do |hook_cls|
-        lambda do |method_id|
-          method = \
-            begin
-              hook_cls.instance_method(method_id)
-            rescue NameError
-              warn "AppMap: Method #{hook_cls} #{fn} is not accessible: #{$!}" if LOG
-              next
+        cls = trace_point.self
+
+        instance_methods = cls.public_instance_methods(false) + cls.protected_instance_methods(false) - OBJECT_INSTANCE_METHODS
+        # NoMethodError: private method `singleton_class' called for Rack::MiniProfiler:Class
+        class_methods = begin
+            if cls.respond_to?(:singleton_class)
+              cls.singleton_class.public_instance_methods(false) + cls.singleton_class.protected_instance_methods(false) - instance_methods - OBJECT_STATIC_METHODS
+            else
+              []
             end
+          rescue NameError
+            []
+          end
 
-          package = config.lookup_package(hook_cls, method)
-          # doing this check first returned early in 98.7% of cases in sample_app_6th_ed
-          next unless package
+        hook = lambda do |hook_cls|
+          lambda do |method_id|
+            method = begin
+                hook_cls.instance_method(method_id)
+              rescue NameError
+                HookLog.load_error [ hook_cls, method_id ].join('[#.]'), "Method #{hook_cls} #{method_id} is not accessible: #{$!}" if HookLog.enabled?
+                next
+              end
 
-          # Don't try and trace the AppMap methods or there will be
-          # a stack overflow in the defined hook method.
-          next if %w[Marshal AppMap ActiveSupport].member?((hook_cls&.name || '').split('::')[0])
+            package = config.lookup_package(hook_cls, method)
+            # doing this check first returned early in 98.7% of cases in sample_app_6th_ed
+            next unless package
 
-          next if method_id == :call
+            # Don't try and trace the AppMap methods or there will be
+            # a stack overflow in the defined hook method.
+            next if %w[Marshal AppMap ActiveSupport].member?((hook_cls&.name || '').split('::')[0])
 
-          next if self.class.already_hooked?(method)
+            next if method_id == :call
 
-          warn "AppMap: Examining #{hook_cls} #{method.name}" if LOG
+            next if self.class.already_hooked?(method)
 
-          disasm = RubyVM::InstructionSequence.disasm(method)
-          # Skip methods that have no instruction sequence, as they are either have no body or they are or native.
-          # TODO: Figure out how to tell the difference?
-          next unless disasm
+            HookLog.log "Examining #{hook_cls} #{method.name}" if HookLog.enabled?
 
-          package.handler_class.new(package, hook_cls, method).activate
+            disasm = RubyVM::InstructionSequence.disasm(method)
+            # Skip methods that have no instruction sequence, as they are either have no body or they are or native.
+            # TODO: Figure out how to tell the difference?
+            next unless disasm
+
+            package.handler_class.new(package, hook_cls, method).activate
+          end
         end
-      end
 
-      start = Time.now
-      instance_methods.each(&hook.(cls))
-      begin
-        # NoMethodError: private method `singleton_class' called for Rack::MiniProfiler:Class
-        class_methods.each(&hook.(cls.singleton_class)) if cls.respond_to?(:singleton_class)
-      rescue NameError
-        # NameError:
-        #   uninitialized constant Faraday::Connection
-        warn "NameError in #{__FILE__}: #{$!.message}"
-      end
-      elapsed = Time.now - start
-      if location.index(Bundler.bundle_path.to_s) == 0
-        package_tokens = location[Bundler.bundle_path.to_s.length + 1..-1].split('/')
-        @module_load_times[package_tokens[1]] += elapsed
+        start = Time.now
+        instance_methods.each(&hook.(cls))
+        begin
+          # NoMethodError: private method `singleton_class' called for Rack::MiniProfiler:Class
+          class_methods.each(&hook.(cls.singleton_class)) if cls.respond_to?(:singleton_class)
+        rescue NameError
+          # NameError:
+          #   uninitialized constant Faraday::Connection
+          warn "NameError in #{__FILE__}: #{$!.message}"
+        end
+        elapsed = Time.now - start
+        if location.index(Bundler.bundle_path.to_s) == 0
+          package_tokens = location[Bundler.bundle_path.to_s.length + 1..-1].split('/')
+          @module_load_times[package_tokens[1]] += elapsed
+        else
+          file_path = location[Dir.pwd.length + 1..-1]
+          if file_path
+            location = file_path.split('/', 3)[0..1].join('/')
+            @module_load_times[location] += elapsed
+          end
+        end
       end
     end
   end

data/lib/appmap/hook_log.rb

@@ -0,0 +1,99 @@
+module AppMap
+  class HookLog
+    LOG = (ENV['APPMAP_DEBUG'] == 'true' || ENV['DEBUG'] == 'true')
+    LOG_HOOK = (ENV['DEBUG_HOOK'] == 'true' || ENV['APPMAP_LOG_HOOK'] == 'true')
+    LOG_HOOK_FILE = (ENV['APPMAP_LOG_HOOK_FILE'] || 'appmap_hook.log')
+
+    def initialize
+      @file_handle = self.class.send :open_log_file
+      @elapsed = Hash.new { |h, k| h[k] = [] }
+
+      at_exit do
+        @file_handle.puts 'Elapsed time:'
+        @elapsed.keys.each do |k|
+          @file_handle.puts "#{k}:\t#{@elapsed[k].sum}"
+        end
+        @file_handle.flush
+        @file_handle.close
+      end
+    end
+
+    def start_time(timer)
+      @elapsed[timer] << [Util.gettime]
+    end
+
+    def end_time(timer)
+      unless @elapsed[timer].last.is_a?(Array)
+        warn "AppMap: Unbalanced timing data in hook log"
+        @elapsed[timer].pop
+        return
+      end
+
+      @elapsed[timer][-1] = Util.gettime - @elapsed[timer].last[0]
+    end
+
+    class << self
+      def enabled?
+        LOG || LOG_HOOK
+      end
+
+      def builtin(class_name, &block)
+        return yield unless enabled?
+
+        begin
+          log "eager\tbegin\tInitiating eager hook for #{class_name}"
+          @hook_log.start_time :eager
+
+          yield
+        ensure
+          @hook_log.end_time :eager
+          log "eager\tend\tCompleted eager hook for #{class_name}"
+        end
+      end
+
+      def on_load(location, &block)
+        return yield unless enabled?
+
+        begin
+          log "on-load\tbegin\tInitiating on-load hook for class or module defined at location #{location}"
+          @hook_log.start_time :on_load
+
+          yield
+        ensure
+          @hook_log.end_time :on_load
+          log "on-load\tend\tCompleted on-load hook for location #{location}"
+        end
+      end
+
+      def load_error(name, msg)
+        log "load_error\t#{name}\t#{msg}"
+      end
+
+      def log(msg)
+        unless HookLog.enabled?
+          warn "AppMap: HookLog is not enabled. Disregarding message #{msg}"
+          return
+        end
+
+        @hook_log ||= HookLog.new
+        @hook_log.log msg
+      end
+
+      protected def open_log_file
+        if LOG_HOOK_FILE == 'stderr'
+          $stderr
+        else
+          File.open(LOG_HOOK_FILE, 'w')
+        end
+      end
+    end
+
+    def log(msg)
+      if LOG_HOOK_FILE == 'stderr'
+        msg = "AppMap: #{msg}"
+      end
+      msg = "#{Util.gettime}\t#{msg}"
+      @file_handle.puts(msg)
+    end
+  end
+end

data/lib/appmap/version.rb

@@ -3,7 +3,7 @@
 module AppMap
   URL = 'https://github.com/applandinc/appmap-ruby'
 
-  VERSION = '0.94.1'
+  VERSION = '0.95.0'
 
   APPMAP_FORMAT_VERSION = '1.10.0'