appmap 0.28.1 → 0.34.1

data/lib/appmap/cucumber.rb

@@ -4,6 +4,8 @@ require 'appmap/util'
 
 module AppMap
   module Cucumber
+    APPMAP_OUTPUT_DIR = 'tmp/appmap/cucumber'
+    
     ScenarioAttributes = Struct.new(:name, :feature, :feature_group)
 
     ProviderStruct = Struct.new(:scenario) do
@@ -38,18 +40,27 @@ module AppMap
     end
 
     class << self
+      def init
+        warn 'Configuring AppMap recorder for Cucumber'
+
+        FileUtils.mkdir_p APPMAP_OUTPUT_DIR
+      end
+      
       def write_scenario(scenario, appmap)
         appmap['metadata'] = update_metadata(scenario, appmap['metadata'])
         scenario_filename = AppMap::Util.scenario_filename(appmap['metadata']['name'])
 
-        FileUtils.mkdir_p 'tmp/appmap/cucumber'
-        File.write(File.join('tmp/appmap/cucumber', scenario_filename), JSON.generate(appmap))
+        File.write(File.join(APPMAP_OUTPUT_DIR, scenario_filename), JSON.generate(appmap))
       end
 
       def enabled?
         ENV['APPMAP'] == 'true'
       end
 
+      def run
+        init
+      end
+      
       protected
 
       def cucumber_version
@@ -87,3 +98,9 @@ module AppMap
     end
   end
 end
+
+if AppMap::Cucumber.enabled?
+  require 'appmap'
+
+  AppMap::Cucumber.run
+end

data/lib/appmap/event.rb

@@ -15,21 +15,15 @@ module AppMap
       end
     end
 
-    MethodEventStruct = Struct.new(:id, :event, :defined_class, :method_id, :path, :lineno, :thread_id)
+    MethodEventStruct = Struct.new(:id, :event, :thread_id)
 
     class MethodEvent < MethodEventStruct
       LIMIT = 100
 
       class << self
-        def build_from_invocation(me, event_type, defined_class, method)
+        def build_from_invocation(me, event_type)
           me.id = AppMap::Event.next_id_counter
           me.event = event_type
-          me.defined_class = defined_class
-          me.method_id = method.name.to_s
-          path = method.source_location[0]
-          path = path[Dir.pwd.length + 1..-1] if path.index(Dir.pwd) == 0
-          me.path = path
-          me.lineno = method.source_location[1]
           me.thread_id = Thread.current.object_id
         end
 
@@ -58,15 +52,25 @@ module AppMap
           (value_string||'')[0...LIMIT].encode('utf-8', invalid: :replace, undef: :replace, replace: '_')
         end
       end
-
     end
 
     class MethodCall < MethodEvent
-      attr_accessor :parameters, :receiver, :static
+      attr_accessor :defined_class, :method_id, :path, :lineno, :parameters, :receiver, :static
 
       class << self
         def build_from_invocation(mc = MethodCall.new, defined_class, method, receiver, arguments)
           mc.tap do
+            static = receiver.is_a?(Module)
+            mc.defined_class = defined_class
+            mc.method_id = method.name.to_s
+            if method.source_location
+              path = method.source_location[0]
+              path = path[Dir.pwd.length + 1..-1] if path.index(Dir.pwd) == 0
+              mc.path = path
+              mc.lineno = method.source_location[1]
+            else
+              mc.path = [ defined_class, static ? '.' : '#', method.name ].join
+            end
             mc.parameters = method.parameters.map.with_index do |method_param, idx|
               param_type, param_name = method_param
               param_name ||= 'arg'
@@ -84,17 +88,22 @@ module AppMap
               object_id: receiver.__id__,
               value: display_string(receiver)
             }
-            mc.static = receiver.is_a?(Module)
-            MethodEvent.build_from_invocation(mc, :call, defined_class, method)
+            mc.static = static
+            MethodEvent.build_from_invocation(mc, :call)
           end
         end
       end
 
       def to_h
         super.tap do |h|
+          h[:defined_class] = defined_class
+          h[:method_id] = method_id
+          h[:path] = path
+          h[:lineno] = lineno
           h[:static] = static
           h[:parameters] = parameters
           h[:receiver] = receiver
+          h.delete_if { |_, v| v.nil? }
         end
       end
 
@@ -105,11 +114,11 @@ module AppMap
       attr_accessor :parent_id, :elapsed
 
       class << self
-        def build_from_invocation(mr = MethodReturnIgnoreValue.new, defined_class, method, parent_id, elapsed)
+        def build_from_invocation(mr = MethodReturnIgnoreValue.new, parent_id, elapsed)
           mr.tap do |_|
             mr.parent_id = parent_id
             mr.elapsed = elapsed
-            MethodEvent.build_from_invocation(mr, :return, defined_class, method)
+            MethodEvent.build_from_invocation(mr, :return)
           end
         end
       end
@@ -126,7 +135,7 @@ module AppMap
       attr_accessor :return_value, :exceptions
 
       class << self
-        def build_from_invocation(mr = MethodReturn.new, defined_class, method, parent_id, elapsed, return_value, exception)
+        def build_from_invocation(mr = MethodReturn.new, parent_id, elapsed, return_value, exception)
           mr.tap do |_|
             if return_value
               mr.return_value = {
@@ -152,7 +161,7 @@ module AppMap
 
               mr.exceptions = exceptions
             end
-            MethodReturnIgnoreValue.build_from_invocation(mr, defined_class, method, parent_id, elapsed)
+            MethodReturnIgnoreValue.build_from_invocation(mr, parent_id, elapsed)
           end
         end
       end

data/lib/appmap/hook.rb

@@ -4,162 +4,112 @@ require 'English'
 
 module AppMap
   class Hook
-    LOG = false
-
-    Package = Struct.new(:path, :exclude) do
-      def to_h
-        {
-          path: path,
-          exclude: exclude.blank? ? nil : exclude
-        }.compact
-      end
-    end
+    LOG = (ENV['DEBUG'] == 'true')
 
-    Config = Struct.new(:name, :packages) do
-      class << self
-        # Loads configuration data from a file, specified by the file name.
-        def load_from_file(config_file_name)
-          require 'yaml'
-          load YAML.safe_load(::File.read(config_file_name))
-        end
+    class << self
+      def lock_builtins
+        return if @builtins_hooked
 
-        # Loads configuration from a Hash.
-        def load(config_data)
-          packages = (config_data['packages'] || []).map do |package|
-            Package.new(package['path'], package['exclude'] || [])
-          end
-          Config.new config_data['name'], packages
-        end
+        @builtins_hooked = true
       end
 
-      def initialize(name, packages = [])
-        super name, packages || []
+      # Return the class, separator ('.' or '#'), and method name for
+      # the given method.
+      def qualify_method_name(method)
+        if method.owner.singleton_class?
+          # Singleton class names can take two forms:
+          # #<Class:Foo> or
+          # #<Class:#<Bar:0x0123ABC>>. Retrieve the name of
+          # the class from the string.
+          #
+          # (There really isn't a better way to do this. The
+          # singleton's reference to the class it was created
+          # from is stored in an instance variable named
+          # '__attached__'. It doesn't have the '@' prefix, so
+          # it's internal only, and not accessible from user
+          # code.)
+          class_name = /#<Class:((#<(?<cls>.*?):)|((?<cls>.*?)>))/.match(method.owner.to_s)['cls']
+          [ class_name, '.', method.name ]
+        else
+          [ method.owner.name, '#', method.name ]
+        end
       end
+    end
 
-      def to_h
-        {
-          name: name,
-          packages: packages.map(&:to_h)
-        }
-      end
+    attr_reader :config
+    def initialize(config)
+      @config = config
     end
 
-    HOOK_DISABLE_KEY = 'AppMap::Hook.disable'
+    # Observe class loading and hook all methods which match the config.
+    def enable &block
+      require 'appmap/hook/method'
 
-    class << self
-      # Observe class loading and hook all methods which match the config.
-      def hook(config = AppMap.configure)
-        package_include_paths = config.packages.map(&:path)
-        package_exclude_paths = config.packages.map do |pkg|
-          pkg.exclude.map do |exclude|
-            File.join(pkg.path, exclude)
-          end
-        end.flatten
+      hook_builtins
 
-        before_hook = lambda do |defined_class, method, receiver, args|
-          require 'appmap/event'
-          call_event = AppMap::Event::MethodCall.build_from_invocation(defined_class, method, receiver, args)
-          AppMap.tracing.record_event call_event, defined_class: defined_class, method: method
-          [ call_event, Time.now ]
-        end
+      tp = TracePoint.new(:end) do |trace_point|
+        cls = trace_point.self
 
-        after_hook = lambda do |call_event, defined_class, method, start_time, return_value, exception|
-          require 'appmap/event'
-          elapsed = Time.now - start_time
-          return_event = AppMap::Event::MethodReturn.build_from_invocation \
-            defined_class, method, call_event.id, elapsed, return_value, exception
-          AppMap.tracing.record_event return_event
-        end
+        instance_methods = cls.public_instance_methods(false)
+        class_methods = cls.singleton_class.public_instance_methods(false) - instance_methods
+
+        hook = lambda do |hook_cls|
+          lambda do |method_id|
+            method = hook_cls.public_instance_method(method_id)
+            hook_method = Hook::Method.new(hook_cls, method)
+
+            warn "AppMap: Examining #{hook_method.method_display_name}" if LOG
 
-        with_disabled_hook = lambda do |&fn|
-          # Don't record functions, such as to_s and inspect, that might be called
-          # by the fn. Otherwise there can be a stack oveflow.
-          Thread.current[HOOK_DISABLE_KEY] = true
-          begin
-            fn.call
-          ensure
-            Thread.current[HOOK_DISABLE_KEY] = false
+            disasm = RubyVM::InstructionSequence.disasm(method)
+            # Skip methods that have no instruction sequence, as they are obviously trivial.
+            next unless disasm
+
+            # Don't try and trace the AppMap methods or there will be
+            # a stack overflow in the defined hook method.
+            next if /\AAppMap[:\.]/.match?(hook_method.method_display_name)
+
+            next unless \
+              config.always_hook?(hook_method.defined_class, method.name) ||
+              config.included_by_location?(method)
+
+            hook_method.activate
           end
         end
 
-        TracePoint.trace(:end) do |tp|
-          cls = tp.self
-
-          instance_methods = cls.public_instance_methods(false)
-          class_methods = cls.singleton_class.public_instance_methods(false) - instance_methods
-
-          hook_method = lambda do |cls|
-            lambda do |method_id|
-              next if method_id.to_s =~ /_hooked_by_appmap$/
-
-              method = cls.public_instance_method(method_id)
-              location = method.source_location
-              location_file, = location
-              next unless location_file
-
-              location_file = location_file[Dir.pwd.length + 1..-1] if location_file.index(Dir.pwd) == 0
-              match = package_include_paths.find { |p| location_file.index(p) == 0 }
-              match &&= !package_exclude_paths.find { |p| location_file.index(p) }
-              next unless match
-
-              disasm = RubyVM::InstructionSequence.disasm(method)
-              # Skip methods that have no instruction sequence, as they are obviously trivial.
-              next unless disasm
-
-              defined_class, method_symbol = if method.owner.singleton_class?
-                # Singleton class names can take two forms:
-                # #<Class:Foo> or
-                # #<Class:#<Bar:0x0123ABC>>. Retrieve the name of
-                # the class from the string.
-                # 
-                # (There really isn't a better way to do this. The
-                # singleton's reference to the class it was created
-                # from is stored in an instance variable named
-                # '__attached__'. It doesn't have the '@' prefix, so
-                # it's internal only, and not accessible from user
-                # code.)
-                class_name = /#<Class:((#<(?<cls>.*?):)|((?<cls>.*?)>))/.match(method.owner.to_s)['cls']
-                [ class_name, '.' ]
-              else
-                [ method.owner.name, '#' ]
-              end
-              
-              method_display_name = "#{defined_class}#{method_symbol}#{method.name}"
-              # Don't try and trace the tracing method or there will be a stack overflow
-              # in the defined hook method.
-              next if method_display_name == "AppMap.tracing"
-
-              warn "AppMap: Hooking #{method_display_name}" if LOG
-
-              cls.define_method method_id do |*args, &block|
-                base_method = method.bind(self).to_proc
-
-                hook_disabled = Thread.current[HOOK_DISABLE_KEY]
-                enabled = true if !hook_disabled && AppMap.tracing.enabled?
-                return base_method.call(*args, &block) unless enabled
-
-                call_event, start_time = with_disabled_hook.call do
-                  before_hook.call(defined_class, method, self, args)
-                end
-                return_value = nil
-                exception = nil
-                begin
-                  return_value = base_method.call(*args, &block)
-                rescue
-                  exception = $ERROR_INFO
-                  raise
-                ensure
-                  with_disabled_hook.call do
-                    after_hook.call(call_event, defined_class, method, start_time, return_value, exception)
-                  end
-                end
-              end
-            end
-        end
+        instance_methods.each(&hook.(cls))
+        class_methods.each(&hook.(cls.singleton_class))
+      end
+
+      tp.enable(&block)
+    end
 
-        instance_methods.each(&hook_method.call(cls))
-        class_methods.each(&hook_method.call(cls.singleton_class))
+    def hook_builtins
+      return unless self.class.lock_builtins
+
+      class_from_string = lambda do |fq_class|
+        fq_class.split('::').inject(Object) do |mod, class_name|
+          mod.const_get(class_name)
+        end
       end
+
+      Config::BUILTIN_METHODS.each do |class_name, hook|
+        require hook.package.package_name if hook.package.package_name
+        Array(hook.method_names).each do |method_name|
+          method_name = method_name.to_sym
+          cls = class_from_string.(class_name)
+          method = \
+            begin
+              cls.instance_method(method_name)
+            rescue NameError
+              cls.method(method_name) rescue nil
+            end
+
+          if method
+            Hook::Method.new(cls, method).activate
+          else
+            warn "Method #{method_name} not found on #{cls.name}" 
+          end
+        end
       end
     end
   end

data/lib/appmap/hook/method.rb

@@ -0,0 +1,83 @@
+module AppMap
+  class Hook
+    class Method
+      attr_reader :hook_class, :hook_method, :defined_class, :method_display_name
+
+      HOOK_DISABLE_KEY = 'AppMap::Hook.disable'
+      private_constant :HOOK_DISABLE_KEY
+
+      # Grab the definition of Time.now here, to avoid interfering
+      # with the method we're hooking.
+      TIME_NOW = Time.method(:now)
+      private_constant :TIME_NOW
+      
+      def initialize(hook_class, hook_method)
+        @hook_class = hook_class
+        @hook_method = hook_method
+        @defined_class, method_symbol = Hook.qualify_method_name(@hook_method)
+        @method_display_name = [@defined_class, method_symbol, @hook_method.name].join
+      end
+
+      def activate
+        warn "AppMap: Hooking #{method_display_name}" if Hook::LOG
+
+        hook_method = self.hook_method
+        before_hook = self.method(:before_hook)
+        after_hook = self.method(:after_hook)
+        with_disabled_hook = self.method(:with_disabled_hook)
+
+        hook_class.define_method hook_method.name do |*args, &block|
+          instance_method = hook_method.bind(self).to_proc
+
+          hook_disabled = Thread.current[HOOK_DISABLE_KEY]
+          enabled = true if !hook_disabled && AppMap.tracing.enabled?
+          return instance_method.call(*args, &block) unless enabled
+
+          call_event, start_time = with_disabled_hook.() do
+            before_hook.(self, args)
+          end
+          return_value = nil
+          exception = nil
+          begin
+            return_value = instance_method.(*args, &block)
+          rescue
+            exception = $ERROR_INFO
+            raise
+          ensure
+            with_disabled_hook.() do
+              after_hook.(call_event, start_time, return_value, exception)
+            end
+          end
+        end
+      end
+
+      protected
+
+      def before_hook(receiver, args)
+        require 'appmap/event'
+        call_event = AppMap::Event::MethodCall.build_from_invocation(defined_class, hook_method, receiver, args)
+        AppMap.tracing.record_event call_event, defined_class: defined_class, method: hook_method
+        [ call_event, TIME_NOW.call ]
+      end
+
+      def after_hook(call_event, start_time, return_value, exception)
+        require 'appmap/event'
+        elapsed = TIME_NOW.call - start_time
+        return_event = \
+          AppMap::Event::MethodReturn.build_from_invocation call_event.id, elapsed, return_value, exception
+        AppMap.tracing.record_event return_event
+      end
+
+      def with_disabled_hook(&fn)
+        # Don't record functions, such as to_s and inspect, that might be called
+        # by the fn. Otherwise there can be a stack overflow.
+        Thread.current[HOOK_DISABLE_KEY] = true
+        begin
+          fn.call
+        ensure
+          Thread.current[HOOK_DISABLE_KEY] = false
+        end
+      end
+    end
+  end
+end