appmap 0.25.0 → 0.28.0

data/lib/appmap/command/record.rb

@@ -5,66 +5,7 @@ module AppMap
     RecordStruct = Struct.new(:config, :program)
 
     class Record < RecordStruct
-      class << self
-        # Builds a Hash of metadata which can be detected by inspecting the system.
-        def detect_metadata
-          {
-            language: {
-              name: 'ruby',
-              engine: RUBY_ENGINE,
-              version: RUBY_VERSION
-            },
-            client: {
-              name: 'appmap',
-              url: AppMap::URL,
-              version: AppMap::VERSION
-            }
-          }.tap do |m|
-            if defined?(::Rails)
-              m[:frameworks] ||= []
-              m[:frameworks] << {
-                name: 'rails',
-                version: ::Rails.version
-              }
-            end
-            m[:git] = git_metadata if git_available
-          end
-        end
-
-        protected
-
-        def git_available
-          @git_available = system('git status 2>&1 > /dev/null') if @git_available.nil?
-        end
-
-        def git_metadata
-          git_repo = `git config --get remote.origin.url`.strip
-          git_branch = `git rev-parse --abbrev-ref HEAD`.strip
-          git_sha = `git rev-parse HEAD`.strip
-          git_status = `git status -s`.split("\n").map(&:strip)
-          git_last_annotated_tag = `git describe --abbrev=0 2>/dev/null`.strip
-          git_last_annotated_tag = nil if git_last_annotated_tag.blank?
-          git_last_tag = `git describe --abbrev=0 --tags 2>/dev/null`.strip
-          git_last_tag = nil if git_last_tag.blank?
-          git_commits_since_last_annotated_tag = `git describe`.strip =~ /-(\d+)-(\w+)$/[1] rescue 0 if git_last_annotated_tag
-          git_commits_since_last_tag = `git describe --tags`.strip =~ /-(\d+)-(\w+)$/[1] rescue 0 if git_last_tag
-
-          {
-            repository: git_repo,
-            branch: git_branch,
-            commit: git_sha,
-            status: git_status,
-            git_last_annotated_tag: git_last_annotated_tag,
-            git_last_tag: git_last_tag,
-            git_commits_since_last_annotated_tag: git_commits_since_last_annotated_tag,
-            git_commits_since_last_tag: git_commits_since_last_tag
-          }
-        end
-      end
-
       def perform(&block)
-        AppMap::Hook.hook(config)
-
         tracer = AppMap.tracing.trace
 
         events = []
@@ -85,8 +26,8 @@ module AppMap
           quit = true
           event_thread.join
           yield AppMap::APPMAP_FORMAT_VERSION,
-                self.class.detect_metadata,
-                AppMap.class_map(config, tracer.event_methods),
+                AppMap.detect_metadata,
+                AppMap.class_map(tracer.event_methods),
                 events
         end
 

data/lib/appmap/cucumber.rb

@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+require 'appmap/util'
+
+module AppMap
+  module Cucumber
+    ScenarioAttributes = Struct.new(:name, :feature, :feature_group)
+
+    ProviderStruct = Struct.new(:scenario) do
+      def feature_group
+        # e.g. <Cucumber::Core::Ast::Location::Precise: cucumber/api/features/authenticate.feature:1>
+        feature_path.split('/').last.split('.')[0]
+      end
+    end
+
+    # ProviderBefore4 provides scenario name, feature name, and feature group name for Cucumber
+    # versions before 4.0.
+    class ProviderBefore4 < ProviderStruct
+      def attributes
+        ScenarioAttributes.new(scenario.name, scenario.feature.name, feature_group)
+      end
+
+      def feature_path
+        scenario.feature.location.to_s
+      end
+    end
+
+    # Provider4 provides scenario name, feature name, and feature group name for Cucumber
+    # versions 4.0 and later.
+    class Provider4 < ProviderStruct
+      def attributes
+        ScenarioAttributes.new(scenario.name, scenario.name.split(' ')[0..1].join(' '), feature_group)
+      end
+
+      def feature_path
+        scenario.location.file
+      end
+    end
+
+    class << self
+      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))
+      end
+
+      def enabled?
+        ENV['APPMAP'] == 'true'
+      end
+
+      protected
+
+      def cucumber_version
+        Gem.loaded_specs['cucumber']&.version&.to_s
+      end
+
+      def provider(scenario)
+        major, = cucumber_version.split('.').map(&:to_i)
+        if major < 4
+          ProviderBefore4
+        else
+          Provider4
+        end.new(scenario)
+      end
+
+      def update_metadata(scenario, base_metadata)
+        attributes = provider(scenario).attributes
+
+        base_metadata.tap do |m|
+          m['name'] = attributes.name
+          m['feature'] = attributes.feature
+          m['feature_group'] = attributes.feature_group
+          m['labels'] ||= []
+          m['labels'] += (scenario.tags&.map(&:name) || [])
+          m['frameworks'] ||= []
+          m['frameworks'] << {
+            'name' => 'cucumber',
+            'version' => Gem.loaded_specs['cucumber']&.version&.to_s
+          }
+          m['recorder'] = {
+            'name' => 'cucumber'
+          }
+        end
+      end
+    end
+  end
+end

data/lib/appmap/event.rb

@@ -139,7 +139,7 @@ module AppMap
               next_exception = exception
               exceptions = []
               while next_exception
-                exception_backtrace = next_exception.backtrace_locations[0]
+                exception_backtrace = next_exception.backtrace_locations.try(:[], 0)
                 exceptions << {
                   class: next_exception.class.name,
                   message: next_exception.message,

data/lib/appmap/hook.rb

@@ -115,7 +115,12 @@ module AppMap
                   [ method.owner.name, '#' ]
                 end
 
-              warn "AppMap: Hooking #{defined_class}#{method_symbol}#{method.name}" if LOG
+              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
@@ -133,6 +138,7 @@ module AppMap
                   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)

data/lib/appmap/metadata.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+module AppMap
+  module Metadata
+    class << self
+      def detect
+        {
+          app: AppMap.configuration.name,
+          language: {
+            name: 'ruby',
+            engine: RUBY_ENGINE,
+            version: RUBY_VERSION
+          },
+          client: {
+            name: 'appmap',
+            url: AppMap::URL,
+            version: AppMap::VERSION
+          }
+        }.tap do |m|
+          if defined?(::Rails)
+            m[:frameworks] ||= []
+            m[:frameworks] << {
+              name: 'rails',
+              version: ::Rails.version
+            }
+          end
+          m[:git] = git_metadata if git_available
+        end
+      end
+
+      protected
+
+      def git_available
+        @git_available = system('git status 2>&1 > /dev/null') if @git_available.nil?
+      end
+
+      def git_metadata
+        git_repo = `git config --get remote.origin.url`.strip
+        git_branch = `git rev-parse --abbrev-ref HEAD`.strip
+        git_sha = `git rev-parse HEAD`.strip
+        git_status = `git status -s`.split("\n").map(&:strip)
+        git_last_annotated_tag = `git describe --abbrev=0 2>/dev/null`.strip
+        git_last_annotated_tag = nil if git_last_annotated_tag.blank?
+        git_last_tag = `git describe --abbrev=0 --tags 2>/dev/null`.strip
+        git_last_tag = nil if git_last_tag.blank?
+        git_commits_since_last_annotated_tag = `git describe`.strip =~ /-(\d+)-(\w+)$/[1] rescue 0 if git_last_annotated_tag
+        git_commits_since_last_tag = `git describe --tags`.strip =~ /-(\d+)-(\w+)$/[1] rescue 0 if git_last_tag
+
+        {
+          repository: git_repo,
+          branch: git_branch,
+          commit: git_sha,
+          status: git_status,
+          git_last_annotated_tag: git_last_annotated_tag,
+          git_last_tag: git_last_tag,
+          git_commits_since_last_annotated_tag: git_commits_since_last_annotated_tag,
+          git_commits_since_last_tag: git_commits_since_last_tag
+        }
+      end
+    end
+  end
+end

data/lib/appmap/middleware/remote_recording.rb

@@ -5,13 +5,9 @@ module AppMap
     # RemoteRecording adds `/_appmap/record` routes to control recordings via HTTP requests
     class RemoteRecording
       def initialize(app)
-        require 'appmap/command/record'
-        require 'appmap/command/upload'
         require 'json'
 
         @app = app
-        @config = AppMap.configure
-        AppMap::Hook.hook(@config)
       end
 
       def event_loop
@@ -64,15 +60,14 @@ module AppMap
         @events.delete_if(&is_control_command_event)
         @events.delete_if(&is_return_from_control_command_event)
 
-        require 'appmap/command/record'
-        metadata = AppMap::Command::Record.detect_metadata
+        metadata = AppMap.detect_metadata
         metadata[:recorder] = {
           name: 'remote_recording'
         }
 
         response = JSON.generate \
           version: AppMap::APPMAP_FORMAT_VERSION,
-          classMap: AppMap.class_map(@config, tracer.event_methods),
+          classMap: AppMap.class_map(tracer.event_methods),
           metadata: metadata,
           events: @events
 

data/lib/appmap/rails/sql_handler.rb

@@ -102,9 +102,6 @@ module AppMap
         Thread.current[reentry_key] = true
         begin
           sql = payload[:sql].strip
-          sql_upper = sql.upcase
-
-          return unless WHITELIST.find { |keyword| sql_upper.index(keyword) == 0 }
 
           # Detect whether a function call within a specified filename is present in the call stack.
           find_in_backtrace = lambda do |file_name, function_name = nil|
@@ -143,8 +140,6 @@ module AppMap
           Thread.current[reentry_key] = nil
         end
       end
-
-      WHITELIST = %w[SELECT INSERT UPDATE DELETE].freeze
     end
   end
 end

data/lib/appmap/railtie.rb

@@ -5,8 +5,8 @@ module AppMap
   class Railtie < ::Rails::Railtie
     config.appmap = ActiveSupport::OrderedOptions.new
 
-    initializer 'appmap.init' do |_| #  params: app
-      AppMap.configure
+    initializer 'appmap.init' do |_| # params: app
+      require 'appmap'
     end
 
     # appmap.subscribe subscribes to ActiveSupport Notifications so that they can be recorded as

data/lib/appmap/rspec.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'appmap/util'
+
 module AppMap
   # Integration of AppMap with RSpec. When enabled with APPMAP=true, the AppMap tracer will
   # be activated around each scenario which has the metadata key `:appmap`.
@@ -8,10 +10,7 @@ module AppMap
     LOG = false
 
     def self.metadata
-      require 'appmap/command/record'
-      @metadata ||= AppMap::Command::Record.detect_metadata
-      @metadata.freeze
-      @metadata.dup
+      AppMap.detect_metadata
     end
 
     module FeatureAnnotations
@@ -107,7 +106,17 @@ module AppMap
 
       def parent
         # An example group always has a parent; but it might be 'self'...
-        example_group.parent != example_group ? ScopeExampleGroup.new(example_group.parent) : nil
+
+        # DEPRECATION WARNING: `Module#parent` has been renamed to `module_parent`. `parent` is deprecated and will be
+        # removed in Rails 6.1. (called from parent at /Users/kgilpin/source/appland/appmap-ruby/lib/appmap/rspec.rb:110)
+        example_group_parent = \
+          if example_group.respond_to?(:module_parent)
+            example_group.module_parent
+          else
+            example_group.parent
+          end
+
+        example_group_parent != example_group ? ScopeExampleGroup.new(example_group_parent) : nil
       end
     end
 
@@ -129,7 +138,7 @@ module AppMap
 
         AppMap::RSpec.add_event_methods @trace.event_methods
 
-        class_map = AppMap.class_map(AppMap::RSpec.config, @trace.event_methods)
+        class_map = AppMap.class_map(@trace.event_methods)
 
         description = []
         scope = ScopeExample.new(example)
@@ -180,7 +189,6 @@ module AppMap
     end
 
     @recordings_by_example = {}
-    @config = nil
     @event_methods = Set.new
 
     class << self
@@ -188,10 +196,6 @@ module AppMap
         warn 'Configuring AppMap recorder for RSpec'
 
         FileUtils.mkdir_p APPMAP_OUTPUT_DIR
-
-        require 'appmap/hook'
-        @config = AppMap.configure
-        AppMap::Hook.hook(@config)
       end
 
       def begin_spec(example)
@@ -214,9 +218,9 @@ module AppMap
       end
 
       def save(example_name, class_map, events: nil, feature_name: nil, feature_group_name: nil, labels: nil)
-        metadata = RSpec.metadata.dup.tap do |m|
+        metadata = RSpec.metadata.tap do |m|
           m[:name] = example_name
-          m[:app] = @config.name
+          m[:app] = AppMap.configuration.name
           m[:feature] = feature_name if feature_name
           m[:feature_group] = feature_group_name if feature_group_name
           m[:labels] = labels if labels
@@ -236,13 +240,13 @@ module AppMap
           classMap: class_map,
           events: events
         }.compact
-        fname = sanitize_filename(example_name)
+        fname = AppMap::Util.scenario_filename(example_name)
 
-        File.write(File.join(APPMAP_OUTPUT_DIR, "#{fname}.appmap.json"), JSON.generate(appmap))
+        File.write(File.join(APPMAP_OUTPUT_DIR, fname), JSON.generate(appmap))
       end
 
       def print_inventory
-        class_map = AppMap.class_map(@config, @event_methods)
+        class_map = AppMap.class_map(@event_methods)
         save 'Inventory', class_map, labels: %w[inventory]
       end
 
@@ -256,28 +260,6 @@ module AppMap
           print_inventory
         end
       end
-
-      private
-
-      # Cribbed from v5 version of ActiveSupport:Inflector#parameterize:
-      # https://github.com/rails/rails/blob/v5.2.4/activesupport/lib/active_support/inflector/transliterate.rb#L92
-      def sanitize_filename(fname, separator: '_')
-        # Replace accented chars with their ASCII equivalents.
-        fname = fname.encode('utf-8', invalid: :replace, undef: :replace, replace: '_')
-
-        # Turn unwanted chars into the separator.
-        fname.gsub!(/[^a-z0-9\-_]+/i, separator)
-
-        re_sep = Regexp.escape(separator)
-        re_duplicate_separator        = /#{re_sep}{2,}/
-        re_leading_trailing_separator = /^#{re_sep}|#{re_sep}$/i
-
-        # No more than one of the separator in a row.
-        fname.gsub!(re_duplicate_separator, separator)
-
-        # Finally, Remove leading/trailing separator.
-        fname.gsub(re_leading_trailing_separator, '')
-      end
     end
   end
 end

data/lib/appmap/trace.rb

@@ -4,36 +4,36 @@ module AppMap
   module Trace
     ScopedMethod = Struct.new(:defined_class, :method)
 
-    class Tracers
+    class Tracing
       def initialize
-        @tracers = []
+        @Tracing = []
       end
 
       def empty?
-        @tracers.empty?
+        @Tracing.empty?
       end
 
       def trace(enable: true)
         Tracer.new.tap do |tracer|
-          @tracers << tracer
+          @Tracing << tracer
           tracer.enable if enable
         end
-      end 
+      end
 
       def enabled?
-        @tracers.any?(&:enabled?)
+        @Tracing.any?(&:enabled?)
       end
 
       def record_event(event, defined_class: nil, method: nil)
-        @tracers.each do |tracer|
+        @Tracing.each do |tracer|
           tracer.record_event(event, defined_class: defined_class, method: method)
         end
       end
 
       def delete(tracer)
-        return unless @tracers.member?(tracer)
+        return unless @Tracing.member?(tracer)
 
-        @tracers.delete(tracer)
+        @Tracing.delete(tracer)
         tracer.disable
       end
     end