appmap 0.68.2 → 0.70.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e87a42863f68312980ff6e9689b74489b147b283854463abbf1e2cf6be4fe29
-  data.tar.gz: 0d5a7e86d9cea6ba154e6bc1ceb920fcba978074afd4351663832946d0ab0f30
+  metadata.gz: d65574736497b9626d5d45bedee98bf5b4e810dada23199cb3b6857928c609a7
+  data.tar.gz: d90ebdbb5978d36a9fa78aab06df63578645d600dc26e8a3c3e78e5a9c3f198d
 SHA512:
-  metadata.gz: bc509802c9b69cca4cc88560b23b0d56e6c72f852e21dc414f5732e6e4cbfe8867b7dcfa132673e2a647f072bcafbe0086e2cbc15b2280eb3b5e3fcaef2db577
-  data.tar.gz: e48934b5719439fa61970e7d239b163c6f42c0e9f5bd7c4a7959f73b62ff9e610fb967b124698129c96271a124d8288e9069e073f1cdeeffc53060270cf30c26
+  metadata.gz: e6645bda09b9fb033825c4230518322b537b013d96ec5c76de25736729a10d2338fd3361481901c804472c23f68552f5f6822d487dbd935ab8c45b67810b4a7a
+  data.tar.gz: a831e8748e982cf7ebb65f0a3bc0a9209a7e8b1991b85716d4fc43898685749304eeb5450b5e84a4657187b95f38b05c936a49b35ad18e30e8070110ddccf7ee

data/CHANGELOG.md

@@ -1,3 +1,32 @@
+## [0.70.2](https://github.com/applandinc/appmap-ruby/compare/v0.70.1...v0.70.2) (2022-01-12)
+
+
+### Bug Fixes
+
+* switch to activesupport's deep_dup implementation ([7715f28](https://github.com/applandinc/appmap-ruby/commit/7715f28285fbdabdb4c8d652fb9ac31eb8d86eab))
+
+## [0.70.1](https://github.com/applandinc/appmap-ruby/compare/v0.70.0...v0.70.1) (2021-12-10)
+
+
+### Bug Fixes
+
+* Use require_name as the default package 'path' for builtins ([bcb4367](https://github.com/applandinc/appmap-ruby/commit/bcb4367811992c924c76950a22d11ddc3057c1ee))
+
+# [0.70.0](https://github.com/applandinc/appmap-ruby/compare/v0.69.0...v0.70.0) (2021-12-08)
+
+
+### Features
+
+* Hook protected methods ([a3722b5](https://github.com/applandinc/appmap-ruby/commit/a3722b504b8e5b8c032988b586b13bdd071fe577))
+* Report sub-packages for nested folders ([dce709b](https://github.com/applandinc/appmap-ruby/commit/dce709b077fd64fc2b34f9abb30a65db529f824b))
+
+# [0.69.0](https://github.com/applandinc/appmap-ruby/compare/v0.68.2...v0.69.0) (2021-12-01)
+
+
+### Features
+
+* Add labels for job creation and canceling ([644fafe](https://github.com/applandinc/appmap-ruby/commit/644fafe7f0eab626a9e0a52243ad4faf052a883a))
+
 ## [0.68.2](https://github.com/applandinc/appmap-ruby/compare/v0.68.1...v0.68.2) (2021-11-25)
 
 

data/config-schema.yml

@@ -45,13 +45,25 @@ properties:
       type: object
       additionalProperties: false
       properties:
-        package:
+        method:
           type: string
-        class:
-          type: string
-        function:
+        label:
           type: string
+        methods:
+          type: array
+          items:
+            type: string
         labels:
           type: array
           items:
             type: string
+        require_name:
+          type: string
+        gem:
+          type: string
+        path:
+          type: string
+        builtin:
+          type: boolean
+        force:
+          type: boolean

data/lib/appmap/class_map.rb

@@ -76,24 +76,39 @@ module AppMap
         methods.each do |method|
           add_function root, method
         end
-        root.children.map(&:to_h)
+
+        collapse_package = lambda do |package|
+          return unless package.type == 'package'
+
+          while package.children.length == 1 && package.children.all? { |child| child.type == 'package' }
+            child = package.children[0]
+            package.children.clear
+            child.children.each { |child| package.children << child }
+            package.name = [ package.name, child.name ].join('/')
+          end
+          package.tap do
+            package.children.map(&collapse_package)
+          end
+        end
+
+        root.children.map(&collapse_package).map(&:to_h)
       end
 
       protected
 
       def add_function(root, method)
-        object_infos = [
-          {
-            name: method.package,
-            type: 'package'
-          }
-        ]
-        object_infos += method.class_name.split('::').map do |name|
-          {
-            name: name,
-            type: 'class'
-          }
-        end
+        object_infos = \
+          method.package.split('/').map do |name|
+            {
+              name: name,
+              type: 'package'
+            }
+          end + method.class_name.split('::').map do |name|
+            {
+              name: name,
+              type: 'class'
+            }
+          end
         function_info = {
           name: method.name,
           type: 'function',

data/lib/appmap/config.rb

@@ -44,6 +44,21 @@ module AppMap
         shallow
       end
 
+      # Clones this package into a sub-package, if needed.
+      # For example, suppose the appmap.yml specifies package `app/models`. If some code in
+      # `app/models/dao/user.rb` is mapped, it will be associated with a sub-package
+      # `app/models/dao`.
+      def subpackage(location, config)
+        return self if gem
+
+        path = location.split('/')[0...-1].join('/')
+        clone.tap do |pkg|
+          pkg.name = path
+          pkg.path = path
+          config.packages << pkg
+        end
+      end
+
       class << self
         # Builds a package for a path, such as `app/models` in a Rails app. Generally corresponds to a `path:` entry
         # in appmap.yml. Also used for mapping specific methods via TargetMethods.
@@ -148,7 +163,7 @@ module AppMap
       def package_hooks(methods, path: nil, gem: nil, force: false, builtin: false, handler_class: nil, require_name: nil)
         Array(methods).map do |method|
           package = if builtin
-            Package.build_from_builtin(path, require_name: require_name, labels: method.labels, shallow: false)
+            Package.build_from_builtin(path || require_name, require_name: require_name, labels: method.labels, shallow: false)
           elsif gem
             Package.build_from_gem(gem, require_name: require_name, labels: method.labels, shallow: false, force: force, optional: true)
           elsif path
@@ -191,7 +206,7 @@ module AppMap
         }.compact
 
         handler_class = hook_decl['handler_class']
-        options[:handler_class] = Util::class_from_string(handler_class) if handler_class
+        options[:handler_class] = Util.class_from_string(handler_class) if handler_class
         
         package_hooks(methods, **options)
       end
@@ -215,7 +230,7 @@ module AppMap
         builtin = hook_decl['builtin']
 
         package_options = {}
-        package_options[:labels] = Array(labels).map(&:to_s) if labels if labels
+        package_options[:labels] = Array(labels).map(&:to_s) if labels
         package_options[:require_name] = req
         package_options[:require_name] ||= package if builtin
         tm = TargetMethods.new(functions, Package.build_from_path(package, **package_options))
@@ -449,13 +464,17 @@ module AppMap
         return unless location_file
 
         location_file = AppMap::Util.normalize_path(location_file)
-        config
-          .packages
-          .select { |pkg| pkg.path }
-          .find do |pkg|
-            (location_file.index(pkg.path) == 0) &&
-              !pkg.exclude.find { |p| location_file.index(p) }
-          end
+
+        pkg = config
+              .packages
+              .select { |pkg| pkg.path }
+              .select do |pkg|
+                (location_file.index(pkg.path) == 0) &&
+                  !pkg.exclude.find { |p| location_file.index(p) }
+              end
+              .min { |a, b| b.path <=> a.path } # Longest matching package first
+
+        pkg.subpackage(location_file, config) if pkg
       end
     end
 

data/lib/appmap/gem_hooks/activejob-cancel.yml

@@ -0,0 +1,2 @@
+- method: ActiveJob::Cancel#cancel
+  label: job.cancel

data/lib/appmap/gem_hooks/activejob.yml

@@ -0,0 +1,2 @@
+- method: ActiveJob::Enqueuing#enqueue
+  label: job.create

data/lib/appmap/gem_hooks/resque.yml

@@ -0,0 +1,4 @@
+- method: Resque::Job.create
+  label: job.create
+- method: Resque::Job.destroy
+  label: job.cancel

data/lib/appmap/gem_hooks/sidekiq.yml

@@ -0,0 +1,4 @@
+- method: Sidekiq::Client#push
+  label: job.create
+- method: Sidekiq::Job#delete
+  label: job.cancel

data/lib/appmap/hook.rb

@@ -7,8 +7,10 @@ module AppMap
     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
+    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
 
     @unbound_method_arity = ::UnboundMethod.instance_method(:arity)
@@ -29,7 +31,7 @@ module AppMap
       def already_hooked?(method)
         # After a method is defined, the statement "module_function <the-method>" can convert that method
         # into a module (class) method. The method is hooked first when it's defined, then AppMap will attempt to
-        # hook it again when it's redefined as a module method. So we check the method source location - if it's 
+        # hook it again when it's redefined as a module method. So we check the method source location - if it's
         # part of the AppMap source tree, we ignore it.
         method.source_location && method.source_location[0].index(__dir__) == 0
       end
@@ -63,7 +65,7 @@ module AppMap
       @notrace_paths = Set.new
       # Locations that have already been visited.
       @trace_locations = Set.new
-      @module_load_times = Hash.new {|memo,k| memo[k] = 0}
+      @module_load_times = Hash.new { |memo, k| memo[k] = 0 }
       @slow_packages = Set.new
 
       if ENV['APPMAP_PROFILE_HOOK'] == 'true'
@@ -90,18 +92,20 @@ module AppMap
     end
 
     # hook_builtins builds hooks for code that is built in to the Ruby standard library.
-    # No TracePoint events are emitted for builtins, so a separate hooking mechanism is needed. 
+    # No TracePoint events are emitted for builtins, so a separate hooking mechanism is needed.
     def hook_builtins
       return unless self.class.hook_builtins?
 
       hook_loaded_code = lambda do |hooks_by_class, builtin|
         hooks_by_class.each do |class_name, hooks|
           Array(hooks).each do |hook|
-            require hook.package.require_name if builtin && hook.package.require_name && hook.package.require_name != 'ruby'
+            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
-              base_cls = Util::class_from_string(class_name, must: false)
+              base_cls = Util.class_from_string(class_name, must: false)
               next unless base_cls
 
               hook_method = lambda do |entry|
@@ -113,8 +117,10 @@ module AppMap
 
               methods = []
               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?
@@ -144,19 +150,19 @@ module AppMap
 
       path = trace_point.path
       enabled = !@notrace_paths.member?(path) && config.path_enabled?(path)
-      if !enabled
-        warn "Not hooking - path is not enabled" if Hook::LOG || Hook::LOG_HOOK
+      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) - OBJECT_INSTANCE_METHODS
+      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) - instance_methods - OBJECT_STATIC_METHODS
+          cls.singleton_class.public_instance_methods(false) + cls.singleton_class.protected_instance_methods(false) - instance_methods - OBJECT_STATIC_METHODS
         else
           []
         end
@@ -172,12 +178,13 @@ module AppMap
 
           next if method_id == :call
 
-          method = begin
-            hook_cls.public_instance_method(method_id)
-          rescue NameError
-            warn "AppMap: Method #{hook_cls} #{method.name} is not accessible" if LOG
-            next
-          end
+          method = \
+            begin
+              hook_cls.instance_method(method_id)
+            rescue NameError
+              warn "AppMap: Method #{hook_cls} #{fn} is not accessible: #{$!}" if LOG
+              next
+            end
 
           next if self.class.already_hooked?(method)
 

data/lib/appmap/util.rb

@@ -195,8 +195,7 @@ module AppMap
       end
 
       def deep_dup(hash)
-        # This is a simple way to avoid the need for deep_dup from activesupport.
-        Marshal.load(Marshal.dump(hash))
+        hash.deep_dup
       end
 
       def blank?(obj)

data/lib/appmap/version.rb

@@ -3,7 +3,7 @@
 module AppMap
   URL = 'https://github.com/applandinc/appmap-ruby'
 
-  VERSION = '0.68.2'
+  VERSION = '0.70.2'
 
   APPMAP_FORMAT_VERSION = '1.5.1'
 

data/lib/appmap.rb

@@ -20,6 +20,13 @@
 # - appmap/swagger (Rake task)
 # - appmap/depends (Rake task)
 
+begin
+  require 'active_support'
+  require 'active_support/core_ext'
+rescue NameError
+  warn 'active_support is not available. AppMap execution will continue optimistically without it...'
+end
+
 require 'appmap/version'
 require 'appmap/agent'
 
@@ -60,11 +67,11 @@ lambda do
   if defined?(::Rails)
     require 'appmap/railtie'
   end
-  
+
   if defined?(::RSpec)
     require 'appmap/rspec'
   end
-  
+
   if defined?(::Minitest)
     require 'appmap/minitest'
   end
@@ -73,7 +80,7 @@ lambda do
     require 'appmap/swagger'
     require 'appmap/depends'
   end
-  
+
 end.call unless ENV['APPMAP_AUTOREQUIRE'] == 'false'
 
 AppMap.initialize_configuration if ENV['APPMAP'] == 'true' && ENV['APPMAP_INITIALIZE'] != 'false'

data/spec/class_map_spec.rb

@@ -16,7 +16,7 @@ describe 'AppMap::ClassMap' do
     end
 
     def ruby_method(method)
-      AppMap::Trace::RubyMethod.new AppMap::Config::Package.new, method.receiver.class.name, method, false
+      AppMap::Trace::RubyMethod.new AppMap::Config::Package.new('pkg'), method.receiver.class.name, method, false
     end
 
     def dig_map(map, depth)

data/spec/fixtures/hook/pkg_a/a.rb

@@ -0,0 +1,7 @@
+module PkgA
+  class A
+    def self.hello
+      'hello'
+    end
+  end
+end

data/spec/fixtures/hook/protected_method.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class ProtectedMethod
+  def call_protected
+    protected_method
+  end
+
+  def to_s
+    'Protected Method fixture'
+  end
+
+  class << self
+    def call_protected
+      protected_method
+    end
+
+    protected
+  
+    def protected_method
+      'self.protected'
+    end
+  end
+
+  protected
+  
+  def protected_method
+    'protected'
+  end
+end

data/spec/fixtures/hook/sub_packages.rb

@@ -0,0 +1,7 @@
+require_relative 'pkg_a/a'
+
+module SubPackages
+  def self.invoke_a
+    PkgA::A.hello
+  end
+end

data/spec/hook_spec.rb

@@ -9,7 +9,7 @@ require 'diffy'
 # empty. This make some of the expected YAML below easier to
 # understand.
 module ShowYamlNulls
-  def visit_NilClass(o)
+  def visit_NilClass(_o)
     @emitter.scalar('null', nil, 'tag:yaml.org,2002:null', true, false, Psych::Nodes::Scalar::ANY)
   end
 end
@@ -18,10 +18,10 @@ Psych::Visitors::YAMLTree.prepend(ShowYamlNulls)
 describe 'AppMap class Hooking', docker: false do
   include_context 'collect events'
 
-  def invoke_test_file(file, setup: nil, &block)
+  def invoke_test_file(file, setup: nil, packages: nil)
     AppMap.configuration = nil
-    package = AppMap::Config::Package.build_from_path(file)
-    config = AppMap::Config.new('hook_spec', packages: [ package ])
+    packages ||= [ AppMap::Config::Package.build_from_path(file) ]
+    config = AppMap::Config.new('hook_spec', packages: packages)
     AppMap.configuration = config
     tracer = nil
     AppMap::Hook.new(config).enable do
@@ -153,7 +153,7 @@ describe 'AppMap class Hooking', docker: false do
     class_map = AppMap.class_map(tracer.event_methods).to_yaml
     expect(Diffy::Diff.new(<<~YAML, class_map).to_s).to eq('')
     ---
-    - :name: spec/fixtures/hook/labels.rb
+    - :name: spec/fixtures/hook
       :type: package
       :children:
       - :name: ClassWithLabel
@@ -166,7 +166,41 @@ describe 'AppMap class Hooking', docker: false do
           :labels:
           - has-fn-label
           :comment: "# @label has-fn-label\\n"
-      YAML
+    YAML
+  end
+
+  it 'reports sub-folders as distinct packages' do
+    _, tracer = invoke_test_file 'spec/fixtures/hook/sub_packages.rb',
+                                 packages: [ AppMap::Config::Package.build_from_path('spec/fixtures/hook') ] do
+      SubPackages.invoke_a
+    end
+    class_map = AppMap.class_map(tracer.event_methods).to_yaml
+    expect(Diffy::Diff.new(<<~YAML, class_map).to_s).to eq('')
+    ---
+    - :name: spec/fixtures/hook
+      :type: package
+      :children:
+      - :name: SubPackages
+        :type: class
+        :children:
+        - :name: invoke_a
+          :type: function
+          :location: spec/fixtures/hook/sub_packages.rb:4
+          :static: true
+      - :name: pkg_a
+        :type: package
+        :children:
+        - :name: PkgA
+          :type: class
+          :children:
+          - :name: A
+            :type: class
+            :children:
+            - :name: hello
+              :type: function
+              :location: spec/fixtures/hook/pkg_a/a.rb:3
+              :static: true
+    YAML
   end
 
   it 'hooks an instance method that takes no arguments' do
@@ -210,7 +244,7 @@ describe 'AppMap class Hooking', docker: false do
     class_map = AppMap.class_map(tracer.event_methods).to_yaml
     expect(Diffy::Diff.new(<<~YAML, class_map).to_s).to eq('')
     ---
-    - :name: spec/fixtures/hook/instance_method.rb
+    - :name: spec/fixtures/hook
       :type: package
       :children:
       - :name: InstanceMethod
@@ -243,6 +277,92 @@ describe 'AppMap class Hooking', docker: false do
     end
   end
 
+  it 'records protected instance methods' do
+    events_yaml = <<~YAML
+    ---
+    - :id: 1
+      :event: :call
+      :defined_class: ProtectedMethod
+      :method_id: call_protected
+      :path: spec/fixtures/hook/protected_method.rb
+      :lineno: 4
+      :static: false
+      :parameters: []
+      :receiver:
+        :class: ProtectedMethod
+        :value: Protected Method fixture
+    - :id: 2
+      :event: :call
+      :defined_class: ProtectedMethod
+      :method_id: protected_method
+      :path: spec/fixtures/hook/protected_method.rb
+      :lineno: 26
+      :static: false
+      :parameters: []
+      :receiver:
+        :class: ProtectedMethod
+        :value: Protected Method fixture
+    - :id: 3
+      :event: :return
+      :parent_id: 2
+      :return_value:
+        :class: String
+        :value: protected
+    - :id: 4
+      :event: :return
+      :parent_id: 1
+      :return_value:
+        :class: String
+        :value: protected
+    YAML
+    test_hook_behavior 'spec/fixtures/hook/protected_method.rb', events_yaml do
+      expect(ProtectedMethod.new.call_protected).to eq('protected')
+    end
+  end
+
+  it 'records protected singleton (static) methods' do
+    events_yaml = <<~YAML
+    ---
+    - :id: 1
+      :event: :call
+      :defined_class: ProtectedMethod
+      :method_id: call_protected
+      :path: spec/fixtures/hook/protected_method.rb
+      :lineno: 13
+      :static: true
+      :parameters: []
+      :receiver:
+        :class: Class
+        :value: ProtectedMethod
+    - :id: 2
+      :event: :call
+      :defined_class: ProtectedMethod
+      :method_id: protected_method
+      :path: spec/fixtures/hook/protected_method.rb
+      :lineno: 19
+      :static: true
+      :parameters: []
+      :receiver:
+        :class: Class
+        :value: ProtectedMethod
+    - :id: 3
+      :event: :return
+      :parent_id: 2
+      :return_value:
+        :class: String
+        :value: self.protected
+    - :id: 4
+      :event: :return
+      :parent_id: 1
+      :return_value:
+        :class: String
+        :value: self.protected
+    YAML
+    test_hook_behavior 'spec/fixtures/hook/protected_method.rb', events_yaml do
+      expect(ProtectedMethod.call_protected).to eq('self.protected')
+    end
+  end
+
   it 'hooks an instance method that takes an argument' do
     events_yaml = <<~YAML
     ---
@@ -483,7 +603,6 @@ describe 'AppMap class Hooking', docker: false do
     end
   end
 
-
   it 'hooks an included method' do
     events_yaml = <<~YAML
     ---
@@ -607,11 +726,9 @@ describe 'AppMap class Hooking', docker: false do
         :lineno: 9
     YAML
     test_hook_behavior 'spec/fixtures/hook/exception_method.rb', events_yaml do
-      begin
-        ExceptionMethod.new.raise_exception
-      rescue
-        # don't let the exception fail the test
-      end
+      ExceptionMethod.new.raise_exception
+    rescue
+      # don't let the exception fail the test
     end
   end
 
@@ -639,16 +756,13 @@ describe 'AppMap class Hooking', docker: false do
         :lineno: 59
     YAML
     test_hook_behavior 'spec/fixtures/hook/exception_method.rb', events_yaml do
-      begin
-        ExceptionMethod.new.raise_illegal_utf8_message
-      rescue
-        # don't let the exception fail the test
-      end
+      ExceptionMethod.new.raise_illegal_utf8_message
+    rescue
+      # don't let the exception fail the test
     end
   end
 
   context 'string conversions works for the receiver when' do
-
     it 'is missing #to_s' do
       events_yaml = <<~YAML
       ---
@@ -979,7 +1093,7 @@ describe 'AppMap class Hooking', docker: false do
     end
   end
 
-  it "preserves the arity of hooked methods" do
+  it 'preserves the arity of hooked methods' do
     invoke_test_file 'spec/fixtures/hook/instance_method.rb' do
       expect(InstanceMethod.instance_method(:say_echo).arity).to be(1)
       expect(InstanceMethod.new.method(:say_echo).arity).to be(1)

data/spec/rails_recording_spec.rb

@@ -157,31 +157,31 @@ describe 'Rails' do
             )
 
             expect(appmap['classMap']).to include hash_including(
-              'name' => 'app/views',
+              'name' => 'app',
               'children' => include(hash_including(
-                'name' => 'app_views_users_index_html_haml',
+                'name' => 'views',
                 'children' => include(hash_including(
-                  'name' => 'render',
-                  'type' => 'function',
-                  'location' => 'app/views/users/index.html.haml',
-                  'static' => true,
-                  'labels' => [ 'mvc.template' ]
-                ))
-              ))
-            )
+                  'name' => 'app_views_users_index_html_haml',
+                  'children' => include(hash_including(
+                    'name' => 'render',
+                    'type' => 'function',
+                    'location' => 'app/views/users/index.html.haml',
+                    'static' => true,
+                    'labels' => [ 'mvc.template' ]
+                  )))))))
             expect(appmap['classMap']).to include hash_including(
-              'name' => 'app/views',
+              'name' => 'app',
               'children' => include(hash_including(
-                'name' => 'app_views_layouts_application_html_haml',
+                'name' => 'views',
                 'children' => include(hash_including(
-                  'name' => 'render',
-                  'type' => 'function',
-                  'location' => 'app/views/layouts/application.html.haml',
-                  'static' => true,
-                  'labels' => [ 'mvc.template' ]
-                ))
-              ))
-            )
+                  'name' => 'app_views_layouts_application_html_haml',
+                  'children' => include(hash_including(
+                    'name' => 'render',
+                    'type' => 'function',
+                    'location' => 'app/views/layouts/application.html.haml',
+                    'static' => true,
+                    'labels' => [ 'mvc.template' ]
+                  )))))))
           end
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appmap
 version: !ruby/object:Gem::Version
-  version: 0.68.2
+  version: 0.70.2
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-25 00:00:00.000000000 Z
+date: 2022-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -3429,8 +3429,12 @@ files:
 - lib/appmap/event.rb
 - lib/appmap/gem_hooks/actionpack.yml
 - lib/appmap/gem_hooks/actionview.yml
+- lib/appmap/gem_hooks/activejob-cancel.yml
+- lib/appmap/gem_hooks/activejob.yml
 - lib/appmap/gem_hooks/activesupport.yml
 - lib/appmap/gem_hooks/cancancan.yml
+- lib/appmap/gem_hooks/resque.yml
+- lib/appmap/gem_hooks/sidekiq.yml
 - lib/appmap/handler/function.rb
 - lib/appmap/handler/net_http.rb
 - lib/appmap/handler/rails/request_handler.rb
@@ -3502,10 +3506,13 @@ files:
 - spec/fixtures/hook/kwargs.rb
 - spec/fixtures/hook/labels.rb
 - spec/fixtures/hook/method_named_call.rb
+- spec/fixtures/hook/pkg_a/a.rb
+- spec/fixtures/hook/protected_method.rb
 - spec/fixtures/hook/revoke_api_key.appmap.json
 - spec/fixtures/hook/singleton_method.rb
 - spec/fixtures/hook/spec/api_spec.rb
 - spec/fixtures/hook/spec/user_spec.rb
+- spec/fixtures/hook/sub_packages.rb
 - spec/fixtures/hook/user_page_scenario.appmap.json
 - spec/fixtures/rack_users_app/.dockerignore
 - spec/fixtures/rack_users_app/.gitignore