appmap 0.72.4 → 0.74.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df8cfae5642145ffdf039e46a97b4dc2cf748e35658611237e4f8c86fcfdeb4b
-  data.tar.gz: af8324a534ba90df3ba87467581936e3ce3109e67fcc1952fd3e25912b003be6
+  metadata.gz: eb314cb1f41f3735c773670cd8082bbc8cedb98d9b01c6c71a0c6a2d2b094da5
+  data.tar.gz: fb4f94b03bb6c50465d22db22f5cc1d25bfb95e3638543986306ca63ce5603e7
 SHA512:
-  metadata.gz: c8428c0343bb9a856d96fa332ca6217c9cabb518df36e48562f5855714ef6291c2b2ea7a14f7e8b5ea2a4a01ae3e1ac685a95e7889cca705ab451989c83f226b
-  data.tar.gz: ea54394ee1feb68949a4b92764585a1e170ac35d0fd0b2fb5ef744a0499831f23d1e179f85110b21a7dec029ca0a4cb7258ad64f081fa5273423e6fe178bbbcb
+  metadata.gz: 2da7b411bf29e42b6c81dad1c897021e67e85b4770037543508ea2562a6132d3e8c7d2fe8574971231c06f3ebaaa328264d9db461363f3f59166922d8327060f
+  data.tar.gz: 248770c6d301895621c72d6f46c6e6e1c18abaa368356c7c9deebd480e91ce8bb456374c04bd4547ae7423976d8911f1e627c137d2cffdb6801db50bef55a229

data/CHANGELOG.md

@@ -1,3 +1,38 @@
+# [0.74.0](https://github.com/applandinc/appmap-ruby/compare/v0.73.0...v0.74.0) (2022-03-14)
+
+
+### Bug Fixes
+
+* Apply special case hook handling to Kernel and instance_eval ([25823ff](https://github.com/applandinc/appmap-ruby/commit/25823ff0fb86beff3edc64da251a125ee198ef40))
+* Only apply a method hook to a class that defines the method ([ede2236](https://github.com/applandinc/appmap-ruby/commit/ede22364bfcbf324e8db3aa6d64d5b032f36ace2))
+* Optimize/improve string-ification of values ([c9b6cdb](https://github.com/applandinc/appmap-ruby/commit/c9b6cdb72dfc55cc3a166eda470eba19093e9090))
+
+
+### Features
+
+* Improve hook performance by using bind_call ([e09fce9](https://github.com/applandinc/appmap-ruby/commit/e09fce9f5b3c0b18bc3b81083c1523df6a6932db))
+* Label system.exec, string.pack, string.html_safe ([963c6dd](https://github.com/applandinc/appmap-ruby/commit/963c6ddfa0f607ad219ae8829cfb383b0d5988d0))
+* Log initiation of each builtin hook ([902a736](https://github.com/applandinc/appmap-ruby/commit/902a7360d17c6b49de97f34643c733e8c47c294d))
+
+# [0.73.0](https://github.com/applandinc/appmap-ruby/compare/v0.72.5...v0.73.0) (2022-03-07)
+
+
+### Bug Fixes
+
+* Remove GC before test case execution, because it's slow ([d38695e](https://github.com/applandinc/appmap-ruby/commit/d38695ed9425a5363e48f2b7bdd5dc3853a827bf))
+
+
+### Features
+
+* Use bind_call when its available ([60d4fb5](https://github.com/applandinc/appmap-ruby/commit/60d4fb5919974d977722ee730b141ae398cbe927))
+
+## [0.72.5](https://github.com/applandinc/appmap-ruby/compare/v0.72.4...v0.72.5) (2022-02-17)
+
+
+### Bug Fixes
+
+* Override method accessors to provide the correct signature ([#223](https://github.com/applandinc/appmap-ruby/issues/223)) ([936bba4](https://github.com/applandinc/appmap-ruby/commit/936bba470c5360ee313e0b3e45a65d83acd0b53d))
+
 ## [0.72.4](https://github.com/applandinc/appmap-ruby/compare/v0.72.3...v0.72.4) (2022-02-17)
 
 

data/LICENSE.txt

@@ -1,6 +1,18 @@
-The MIT License (MIT)
+The Software is provided to you by the Licensor under the License, as defined below, subject to the following condition.
 
-Copyright (c) 2018 Kevin Gilpin
+Without limiting other conditions in the License, the grant of rights under the License will not include,
+and the License does not grant to you, the right to Sell the Software.
+
+For purposes of the foregoing, “Sell” means practicing any or all of the rights granted to you under the License to provide to third parties,
+for a fee or other consideration (including without limitation fees for hosting or consulting/ support services related to the Software),
+a product or service whose value derives, entirely or substantially, from the functionality of the Software.
+Any license notice or attribution required by the License must also include this Commons Clause License Condition notice.
+
+Software: AppMap agent for Ruby
+
+License: MIT License
+
+Copyright 2022, AppLand Inc
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/appmap/builtin_hooks/open3.yml

@@ -0,0 +1,13 @@
+- methods:
+  - Open3#capture2
+  - Open3#capture2e
+  - Open3#capture3
+  - Open3#pipeline
+  - Open3#pipeline_r
+  - Open3#pipeline_rw
+  - Open3#pipeline_start
+  - Open3#pipeline_w
+  - Open3#popen2
+  - Open3#popen2e
+  - Open3#popen3
+  label: system.exec

data/lib/appmap/builtin_hooks/ruby.yml

@@ -0,0 +1,39 @@
+- methods:
+  - Marshal#load
+  - Marshal#restore
+  require_name: ruby
+  label: deserialize.unsafe
+- method: Marshal#dump
+  require_name: ruby
+  label: serialize
+- method: String#pack
+  require_name: ruby
+  label: string.pack
+- methods:
+  - String#unpack
+  - String#unpack1
+  require_name: ruby
+  label: string.unpack
+#- methods:
+# TODO: eval does not happen in the right context, and therefore any new constants
+# which are defined are placed on the wrong module/class.
+#  - Kernel#eval
+#  - Binding#eval
+#  - BasicObject#instance_eval
+# These methods cannot be hooked as far as I can tell.
+# Why? When calling one of these functions, the context at the point of 
+# definition is used. It's not possible to bind class_eval to a new context.
+#  - Module#class_eval
+#  - Module#module_eval
+#  require_name: ruby
+#  label: lang.eval
+- methods:
+  - IO#popen
+  - Kernel#exec
+  - Kernel#spawn
+  - Kernel#syscall
+  - Kernel#system
+  - Process#exec
+  - Process#spawn
+  require_name: ruby
+  label: system.exec

data/lib/appmap/cucumber.rb

@@ -51,7 +51,7 @@ module AppMap
         appmap['metadata'] = update_metadata(scenario, appmap['metadata'])
         scenario_filename = AppMap::Util.scenario_filename(appmap['metadata']['name'])
 
-        AppMap::Util.write_appmap(File.join(APPMAP_OUTPUT_DIR, scenario_filename), JSON.generate(appmap))
+        AppMap::Util.write_appmap(File.join(APPMAP_OUTPUT_DIR, scenario_filename), appmap)
       end
 
       def enabled?

data/lib/appmap/event.rb

@@ -20,7 +20,9 @@ module AppMap
     MethodEventStruct = Struct.new(:id, :event, :thread_id)
 
     class MethodEvent < MethodEventStruct
-      LIMIT = 100
+      MAX_ARRAY_ENUMERATION = 10
+      MAX_HASH_ENUMERATION = 10
+      MAX_STRING_LENGTH = 100
 
       class << self
         def build_from_invocation(event_type, event:)
@@ -48,14 +50,14 @@ module AppMap
           end
 
           start = Time.now
-          value_string = custom_display_string(value) || default_display_string(value)
+          value_string, final = custom_display_string(value) || default_display_string(value)
 
           if @times
             elapsed = Time.now - start
             @times[best_class_name(value)] += elapsed
           end
 
-          encode_display_string(value_string)
+          final ? value_string : encode_display_string(value_string)
         end
 
         def object_properties(hash_like)
@@ -80,21 +82,33 @@ module AppMap
         end
 
         def encode_display_string(value)
-          (value||'')[0...LIMIT].encode('utf-8', invalid: :replace, undef: :replace, replace: '_')
+          (value||'')[0...MAX_STRING_LENGTH].encode('utf-8', invalid: :replace, undef: :replace, replace: '_')
         end
 
         def custom_display_string(value)
           case value
           when NilClass, TrueClass, FalseClass, Numeric, Time, Date
-            value.to_s
+            [ value.to_s, true ]
+          when Symbol
+            [ ":#{value}", true ]
           when String
-            value[0...LIMIT].encode('utf-8', invalid: :replace, undef: :replace, replace: '_')
+            result = value[0...MAX_STRING_LENGTH].encode('utf-8', invalid: :replace, undef: :replace, replace: '_')
+            result << " (...#{value.length - MAX_STRING_LENGTH} more characters)" if value.length > MAX_STRING_LENGTH
+            [ result, true ]
+          when Array
+            result = value[0...MAX_ARRAY_ENUMERATION].map{|v| display_string(v)}.join(', ')
+            result << " (...#{value.length - MAX_ARRAY_ENUMERATION} more items)" if value.length > MAX_ARRAY_ENUMERATION
+            [ [ '[', result, ']' ].join, true ]
+          when Hash
+            result = value.keys[0...MAX_HASH_ENUMERATION].map{|key| "#{display_string(key)}=>#{display_string(value[key])}"}.join(', ')
+            result << " (...#{value.size - MAX_HASH_ENUMERATION} more entries)" if value.size > MAX_HASH_ENUMERATION
+            [ [ '{', result, '}' ].join, true ]
           when File
-            "#{value.class}[path=#{value.path}]"
+            [ "#{value.class}[path=#{value.path}]", true ]
           when Net::HTTP
-            "#{value.class}[#{value.address}:#{value.port}]"
+            [ "#{value.class}[#{value.address}:#{value.port}]", true ]
           when Net::HTTPGenericRequest
-            "#{value.class}[#{value.method} #{value.path}]"
+            [ "#{value.class}[#{value.method} #{value.path}]", true ]
           end
         rescue StandardError
           nil

data/lib/appmap/gem_hooks/actionview.yml

@@ -11,3 +11,7 @@
   label: mvc.template.resolver
   handler_class: AppMap::Handler::Rails::Template::ResolverHandler
   require_name: action_view
+- methods:
+  - ActionView::Helpers::SanitizeHelper#sanitize
+  label: string.html_safe
+  require_name: action_view

data/lib/appmap/hook/method.rb

@@ -7,6 +7,23 @@ module AppMap
   end
 
   class Hook
+    SIGNATURES = {}
+
+    LOOKUP_SIGNATURE = lambda do |id|
+      method = super(id)
+    
+      signature = SIGNATURES[[ method.owner, method.name ]]
+      if signature
+        method.singleton_class.module_eval do
+          define_method(:parameters) do
+            signature
+          end
+        end
+      end
+    
+      method
+    end
+    
     class Method
       attr_reader :hook_package, :hook_class, :hook_method
 
@@ -52,22 +69,24 @@ module AppMap
         after_hook = self.method(:after_hook)
         with_disabled_hook = self.method(:with_disabled_hook)
 
-        hook_method_def = Proc.new do |*args, &block|
-          instance_method = hook_method.bind(self).to_proc
-
-          is_array_containing_empty_hash = ->(obj) {
-            obj.is_a?(Array) && obj.length == 1 && obj[0].is_a?(Hash) && obj[0].size == 0
-          }
-
-          call_instance_method = -> {
-            # https://github.com/applandinc/appmap-ruby/issues/153
-            if NEW_RUBY && is_array_containing_empty_hash.(args) && hook_method.arity == 1
-              instance_method.call({}, &block)
+        is_array_containing_empty_hash = ->(obj) {
+          obj.is_a?(Array) && obj.length == 1 && obj[0].is_a?(Hash) && obj[0].size == 0
+        }
+
+        call_instance_method = lambda do |receiver, args, &block|
+          # https://github.com/applandinc/appmap-ruby/issues/153
+          if NEW_RUBY && is_array_containing_empty_hash.(args) && hook_method.arity == 1
+            hook_method.bind_call(receiver, {}, &block)
+          else
+            if NEW_RUBY
+              hook_method.bind_call(receiver, *args, &block)
             else
-              instance_method.call(*args, &block)
+              hook_method.bind(receiver).call(*args, &block)
             end
-          }
+          end
+        end
 
+        hook_method_def = Proc.new do |*args, &block|
           # We may not have gotten the class for the method during
           # initialization (e.g. for a singleton method on an embedded
           # struct), so make sure we have it now.
@@ -79,7 +98,9 @@ module AppMap
 
           enabled = true if AppMap.tracing.enabled? && !reentrant && !disabled_by_shallow_flag.call
 
-          return call_instance_method.call unless enabled
+          enabled = false if %i[instance_eval instance_exec].member?(hook_method.name) && args.empty?
+
+          return call_instance_method.call(self, args, &block) unless enabled
 
           call_event, start_time = with_disabled_hook.call do
             before_hook.call(self, defined_class, args)
@@ -87,7 +108,7 @@ module AppMap
           return_value = nil
           exception = nil
           begin
-            return_value = call_instance_method.call
+            return_value = call_instance_method.call(self, args, &block)
           rescue
             exception = $ERROR_INFO
             raise
@@ -100,11 +121,19 @@ module AppMap
         hook_method_def = hook_method_def.ruby2_keywords if hook_method_def.respond_to?(:ruby2_keywords)
 
         hook_method_parameters = hook_method.parameters.dup.freeze
-        hook_class.ancestors.first.tap do |cls|
-          cls.define_method_with_arity(hook_method.name, hook_method.arity, hook_method_def)
-          redefined_method = cls.instance_method(hook_method.name)
-          redefined_method.singleton_class.module_eval do
-            define_method(:parameters) { hook_method_parameters }
+        SIGNATURES[[ hook_class, hook_method.name ]] = hook_method_parameters
+
+        # irb(main):001:0> Kernel.public_instance_method(:system)
+        # (irb):1:in `public_instance_method': method `system' for module `Kernel' is  private (NameError)
+        if hook_class == Kernel
+          hook_class.define_method_with_arity(hook_method.name, hook_method.arity, hook_method_def)
+        else
+          hook_class.ancestors.find { |cls| cls.method_defined?(hook_method.name, false) }.tap do |cls|
+            if cls
+              cls.define_method_with_arity(hook_method.name, hook_method.arity, hook_method_def)
+            else
+              warn "#{hook_method.name} not found on #{hook_class}"
+            end
           end
         end
       end
@@ -136,4 +165,27 @@ module AppMap
       end
     end
   end
+
+  module ObjectMethods
+    define_method(:method, AppMap::Hook::LOOKUP_SIGNATURE)
+    define_method(:public_method, AppMap::Hook::LOOKUP_SIGNATURE)
+    define_method(:singleton_method, AppMap::Hook::LOOKUP_SIGNATURE)
+  end
+
+  module ModuleMethods
+    define_method(:instance_method, AppMap::Hook::LOOKUP_SIGNATURE)
+    define_method(:public_instance_method, AppMap::Hook::LOOKUP_SIGNATURE)
+  end
+end
+
+unless ENV['APPMAP_NO_PATCH_OBJECT'] == 'true'
+  class Object
+    prepend AppMap::ObjectMethods
+  end
+end
+
+unless ENV['APPMAP_NO_PATCH_MODULE'] == 'true'
+  class Module
+    prepend AppMap::ModuleMethods
+  end
 end

data/lib/appmap/hook.rb

@@ -105,6 +105,9 @@ module AppMap
 
             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
+
               base_cls = Util.class_from_string(class_name, must: false)
               next unless base_cls
 
@@ -116,6 +119,11 @@ module AppMap
               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)

data/lib/appmap/minitest.rb

@@ -120,7 +120,7 @@ module AppMap
         }.compact
         fname = AppMap::Util.scenario_filename(name)
 
-        AppMap::Util.write_appmap(File.join(APPMAP_OUTPUT_DIR, fname), JSON.generate(appmap))
+        AppMap::Util.write_appmap(File.join(APPMAP_OUTPUT_DIR, fname), appmap)
       end
 
       def enabled?
@@ -142,7 +142,6 @@ if AppMap::Minitest.enabled?
     alias run_without_hook run
 
     def run
-      GC.start
       AppMap::Minitest.begin_test self, name
       begin
         run_without_hook

data/lib/appmap/record.rb

@@ -23,5 +23,5 @@ at_exit do
     'classMap' => AppMap.class_map(tracer.event_methods),
     'events' => events
   }
-  AppMap::Util.write_appmap('appmap.json', JSON.generate(appmap))
+  AppMap::Util.write_appmap('appmap.json', appmap)
 end

data/lib/appmap/rspec.rb

@@ -87,7 +87,6 @@ module AppMap
         end
 
         warn "Starting recording of example #{example}@#{source_location}" if AppMap::RSpec::LOG
-        GC.start
         @trace = AppMap.tracing.trace
         @webdriver_port = webdriver_port.()
       end
@@ -206,7 +205,7 @@ module AppMap
         }.compact
         fname = AppMap::Util.scenario_filename(name)
 
-        AppMap::Util.write_appmap(File.join(APPMAP_OUTPUT_DIR, fname), JSON.generate(appmap))
+        AppMap::Util.write_appmap(File.join(APPMAP_OUTPUT_DIR, fname), appmap)
       end
 
       def enabled?

data/lib/appmap/util.rb

@@ -171,7 +171,7 @@ module AppMap
         mode = File::RDWR | File::CREAT | File::EXCL
         ::Dir::Tmpname.create([ 'appmap_', '.json' ]) do |tmpname|
           tempfile = File.open(tmpname, mode)
-          tempfile.write(appmap)
+          tempfile.write(JSON.generate(appmap))
           tempfile.close
           # Atomically move the tempfile into place.
           FileUtils.mv tempfile.path, filename

data/lib/appmap/version.rb

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

data/spec/display_string_spec.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'appmap/event'
+
+include AppMap
+
+describe 'display_string' do
+  def display_string(value)
+    Event::MethodEvent.display_string value
+  end
+
+  def compare_display_string(value, expected)
+    expect(display_string(value)).to eq(expected)
+  end
+
+  context 'for a' do
+    it 'String' do
+      compare_display_string 'foo', 'foo'
+    end
+    it 'long String' do
+      compare_display_string 'foo' * 100, 'foo' * 33 + 'f (...200 more characters)'
+    end
+    it 'Array' do
+      compare_display_string([ 1, 'my', :bar, [ 2, 3 ], { 4 => 5 } ], '[1, my, :bar, [2, 3], {4=>5}]')
+    end
+    it 'large Array' do
+      compare_display_string 50.times.map { |i| i }, '[0, 1, 2, 3, 4, 5, 6, 7, 8, 9 (...40 more items)]'
+    end
+    it 'large Hash' do
+      compare_display_string(50.times.map { |i| [ i*2, i*2+1] }.to_h, '{0=>1, 2=>3, 4=>5, 6=>7, 8=>9, 10=>11, 12=>13, 14=>15, 16=>17, 18=>19 (...40 more entries)}')
+    end
+    it 'Hash' do
+      compare_display_string({ 1 => 2, 'my' => 'neighbor', bar: :baz, ary: [ 1, 2 ]}, '{1=>2, my=>neighbor, :bar=>:baz, :ary=>[1, 2]}')
+    end
+    it 'big Hash' do
+      compare_display_string(50.times.map { |i| [ i*2, i*2+1] }.to_h, '{0=>1, 2=>3, 4=>5, 6=>7, 8=>9, 10=>11, 12=>13, 14=>15, 16=>17, 18=>19 (...40 more entries)}')
+    end
+  end
+end

data/spec/fixtures/hook/report_parameters.rb

@@ -0,0 +1,8 @@
+
+class ReportParameters
+  def to_s; self.class.name; end
+
+  def report_parameters(*args, kw1:, kw2: 'kw2', **kws)
+    method(:report_parameters).parameters
+  end
+end

data/spec/fixtures/rails5_users_app/spec/rails_helper.rb

@@ -47,7 +47,6 @@ RSpec.configure do |config|
   
   config.before(:suite) do
     DatabaseCleaner.strategy = :transaction
-    DatabaseCleaner.clean_with(:truncation)
   end
 
   config.around :each do |example|

data/spec/fixtures/rails6_users_app/spec/rails_helper.rb

@@ -47,7 +47,6 @@ RSpec.configure do |config|
   
   config.before(:suite) do
     DatabaseCleaner.strategy = :transaction
-    DatabaseCleaner.clean_with(:truncation)
   end
 
   config.around :each do |example|

data/spec/hook_spec.rb

@@ -225,6 +225,12 @@ describe 'AppMap class Hooking', docker: false do
         :value: default
     YAML
     test_hook_behavior 'spec/fixtures/hook/instance_method.rb', events_yaml do
+      expect(InstanceMethod.instance_method(:say_default).parameters).to eq([])
+      expect(InstanceMethod.public_instance_method(:say_default).parameters).to eq([])
+      expect(InstanceMethod.new.method(:say_default).parameters).to eq([])
+      expect(InstanceMethod.new.public_method(:say_default).parameters).to eq([])
+      expect { InstanceMethod.new.singleton_method(:say_default) }.to raise_error(NameError)
+
       expect(InstanceMethod.new.say_default).to eq('default')
     end
   end
@@ -315,7 +321,22 @@ describe 'AppMap class Hooking', docker: false do
         :class: String
         :value: protected
     YAML
+    parameters = []
     test_hook_behavior 'spec/fixtures/hook/protected_method.rb', events_yaml do
+      expect(ProtectedMethod.singleton_method(:call_protected).parameters).to eq(parameters)
+      expect(ProtectedMethod.instance_method(:call_protected).parameters).to eq(parameters)
+      expect(ProtectedMethod.public_instance_method(:call_protected).parameters).to eq(parameters)
+      expect(ProtectedMethod.new.method(:call_protected).parameters).to eq(parameters)
+      expect(ProtectedMethod.new.public_method(:call_protected).parameters).to eq(parameters)
+      expect { ProtectedMethod.new.singleton_method(:call_protected) }.to raise_error(NameError)
+
+      expect(ProtectedMethod.singleton_method(:protected_method).parameters).to eq(parameters)
+      expect(ProtectedMethod.instance_method(:protected_method).parameters).to eq(parameters)
+      expect(ProtectedMethod.public_instance_method(:protected_method).parameters).to eq(parameters)
+      expect(ProtectedMethod.new.method(:protected_method).parameters).to eq(parameters)
+      expect(ProtectedMethod.new.public_method(:protected_method).parameters).to eq(parameters)
+      expect { ProtectedMethod.new.singleton_method(:protected_method) }.to raise_error(NameError)
+
       expect(ProtectedMethod.new.call_protected).to eq('protected')
     end
   end
@@ -358,6 +379,7 @@ describe 'AppMap class Hooking', docker: false do
         :class: String
         :value: self.protected
     YAML
+    parameters = []
     test_hook_behavior 'spec/fixtures/hook/protected_method.rb', events_yaml do
       expect(ProtectedMethod.call_protected).to eq('self.protected')
     end
@@ -1100,6 +1122,51 @@ describe 'AppMap class Hooking', docker: false do
     end
   end
 
+  it 'preserves the sighnature of hooked methods' do
+    parameters = []
+    events = <<~YAML
+    ---
+    - :id: 1
+      :event: :call
+      :defined_class: ReportParameters
+      :method_id: report_parameters
+      :path: spec/fixtures/hook/report_parameters.rb
+      :lineno: 5
+      :static: false
+      :parameters:
+      - :name: :args
+        :class: Array
+        :value: "[foo]"
+        :kind: :rest
+      - :name: :kw1
+        :class: String
+        :value: kw1
+        :kind: :keyreq
+      - :name: :kw2
+        :class: NilClass
+        :value: null
+        :kind: :key
+      - :name: :kws
+        :class: Hash
+        :value: "{}"
+        :kind: :keyrest
+      :receiver:
+        :class: ReportParameters
+        :value: ReportParameters
+    - :id: 2
+      :event: :return
+      :parent_id: 1
+      :return_value:
+        :class: Array
+        :value: "[[:rest, :args], [:keyreq, :kw1], [:key, :kw2], [:keyrest, :kws]]"
+    YAML
+    parameters = [[:rest, :args], [:keyreq, :kw1], [:key, :kw2], [:keyrest, :kws]]
+    test_hook_behavior 'spec/fixtures/hook/report_parameters.rb', events do
+      expect(ReportParameters.instance_method(:report_parameters).parameters).to eq(parameters)
+      expect(ReportParameters.new.report_parameters('foo', kw1: 'kw1')).to eq(parameters)
+    end
+  end
+
   describe 'kwargs handling' do
     if ruby_2?
       # https://github.com/applandinc/appmap-ruby/issues/153

data/spec/rails_recording_spec.rb

@@ -78,7 +78,7 @@ describe 'Rails' do
                 'name' => 'params',
                 'class' => 'ActiveSupport::HashWithIndifferentAccess',
                 'object_id' => Integer,
-                'value' => '{"login"=>"alice"}',
+                'value' => '{login=>alice}',
                 'kind' => 'req'
               ),
               'receiver' => anything

data/spec/record_net_http_spec.rb

@@ -127,7 +127,7 @@ describe 'Net::HTTP handler' do
         :message:
         - :name: ary
           :class: Array
-          :value: '["1", "2"]'
+          :value: "[1, 2]"
         EVENT
       end
 

data/test/gem_test.rb

@@ -24,7 +24,7 @@ class GemTest < Minitest::Test
       appmap_file = 'tmp/appmap/minitest/Parser_parser.appmap.json'
       appmap = JSON.parse(File.read(appmap_file))
       events = appmap['events']
-      assert_equal 2, events.size
+      assert_equal 6, events.size
       assert_equal 'call', events.first['event']
       assert_equal 'default_parser', events.first['method_id']
       assert_match /\lib\/parser\/base\.rb$/, events.first['path']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appmap
 version: !ruby/object:Gem::Version
-  version: 0.72.4
+  version: 0.74.0
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-17 00:00:00.000000000 Z
+date: 2022-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -339,10 +339,11 @@ files:
 - lib/appmap/agent.rb
 - lib/appmap/builtin_hooks/json.yml
 - lib/appmap/builtin_hooks/logger.yml
-- lib/appmap/builtin_hooks/marshal.yml
 - lib/appmap/builtin_hooks/net/http.yml
+- lib/appmap/builtin_hooks/open3.yml
 - lib/appmap/builtin_hooks/openssl.yml
 - lib/appmap/builtin_hooks/psych.yml
+- lib/appmap/builtin_hooks/ruby.yml
 - lib/appmap/class_map.rb
 - lib/appmap/command/agent_setup/init.rb
 - lib/appmap/command/agent_setup/status.rb
@@ -409,6 +410,7 @@ files:
 - spec/config_spec.rb
 - spec/depends/api_spec.rb
 - spec/depends/spec_helper.rb
+- spec/display_string_spec.rb
 - spec/fixtures/config/incomplete_config.yml
 - spec/fixtures/config/invalid_config.yml
 - spec/fixtures/config/invalid_yaml_config.yml
@@ -447,6 +449,7 @@ files:
 - spec/fixtures/hook/pkg_a/a.rb
 - spec/fixtures/hook/prepended_override.rb
 - spec/fixtures/hook/protected_method.rb
+- spec/fixtures/hook/report_parameters.rb
 - spec/fixtures/hook/revoke_api_key.appmap.json
 - spec/fixtures/hook/singleton_method.rb
 - spec/fixtures/hook/spec/api_spec.rb

data/lib/appmap/builtin_hooks/marshal.yml

@@ -1,8 +0,0 @@
-- methods:
-  - Marshal#load
-  - Marshal#restore
-  require_name: ruby
-  label: deserialize.unsafe
-- method: Marshal#dump
-  require_name: ruby
-  label: serialize