appmap 0.65.0 → 0.66.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ff92977defe997917c8b7c2d9d5974d5e743c02b637bcfffa5548e087d4644f
-  data.tar.gz: 4889a8d717b0167737719acc75c12f5709404b6445b6dd633523cd76e4992a96
+  metadata.gz: 2dd5295e0bbe8c9a4281b27bd712b61640672e93a03d6c3e31af3e201c9ca592
+  data.tar.gz: 8fb74d28bb2367918831c6d3af029440591da8ee694f1645fc2ef8baf5b28b60
 SHA512:
-  metadata.gz: 4a78ced9dc2d5c0e80fe0f68d01508cff0af59bfc65f9a747ec5f981d7bd5a7523a59230427ddf465b39db1768f2443c856a93c852ddb444bc80eec4a539f460
-  data.tar.gz: 21a54adacd2b5b27a5f2a6143db0c0684716a9d1db6add75d4e05fdd73054bb9576fc2bac3ce68067230d1fb04caf177c8e4366e05a061301bd1a9dd84214bf5
+  metadata.gz: ef07a3169b2d1f4dcabb406296275506250840cc767440b60a106f48ad5ee251017a9e9f7cd9769e7d0d133a3b9704f76bfef571fd69feef85163979cec80a80
+  data.tar.gz: 34c9c18e230dc46d868b759422eb7aeaba79b99fd1cca610bbc1a8bdc70a7cfa18e34a064a43cc50847c8c452bf267a6003a5b98cb3a2e2e8fa40028552fe112

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
+dist: bionic
 
 rbenv:
 - 2.6
@@ -15,6 +16,7 @@ services:
 - docker
 
 before_install:
+  - sudo apt-get update && sudo apt-get install apt-transport-https ca-certificates -y && sudo update-ca-certificates
   # see https://blog.travis-ci.com/docker-rate-limits 
   # and also https://www.docker.com/blog/what-you-need-to-know-about-upcoming-docker-hub-rate-limiting/
   # if we do not use authorized account, 

data/CHANGELOG.md

@@ -1,3 +1,37 @@
+## [0.66.2](https://github.com/applandinc/appmap-ruby/compare/v0.66.1...v0.66.2) (2021-10-07)
+
+
+### Bug Fixes
+
+* fix Travis for Ruby 3.0 ([8ec7359](https://github.com/applandinc/appmap-ruby/commit/8ec7359287f5b204ae9fb0724d8b683adfb79df5))
+* Fix warning of circular import ([84d456d](https://github.com/applandinc/appmap-ruby/commit/84d456d8ac26ef3fc7a81ca6517e4363aac9916d))
+* Properly handle headers which aren't mangled by Rack ([8e78e13](https://github.com/applandinc/appmap-ruby/commit/8e78e138776cb563f984e3592cf5024af16da2b7))
+* replace deprecated File.exists? method ([80ce5b5](https://github.com/applandinc/appmap-ruby/commit/80ce5b59fd010a806ca6320365f453f1e74f095d))
+* Validate presence package configuration ([f478d6b](https://github.com/applandinc/appmap-ruby/commit/f478d6b60a786608c21217755cec9a8185e084d3))
+
+## [0.66.1](https://github.com/applandinc/appmap-ruby/compare/v0.66.0...v0.66.1) (2021-09-29)
+
+
+### Bug Fixes
+
+* Fix compilation on macOS with Xcode 13 ([8c66e08](https://github.com/applandinc/appmap-ruby/commit/8c66e08393bf8d9efac9635ad7a150329797729d))
+
+# [0.66.0](https://github.com/applandinc/appmap-ruby/compare/v0.65.1...v0.66.0) (2021-09-28)
+
+
+### Features
+
+* Add option for explicit 'require' in function config ([1cf6c2a](https://github.com/applandinc/appmap-ruby/commit/1cf6c2aed8ee2d89c900f2959484b88b6fd3eb93))
+* Builtin code such as Ruby Logger can be hooked via appmap.yml ([779c9e5](https://github.com/applandinc/appmap-ruby/commit/779c9e5e4177d58ea7b63e663e7c5a0810a78c60))
+
+## [0.65.1](https://github.com/applandinc/appmap-ruby/compare/v0.65.0...v0.65.1) (2021-09-16)
+
+
+### Performance Improvements
+
+* Cache method metadata ([d11e0f3](https://github.com/applandinc/appmap-ruby/commit/d11e0f3361057b7cada204656ca833c12bb704c1))
+* Don't scan the backtrace on every SQL query ([9bb7457](https://github.com/applandinc/appmap-ruby/commit/9bb74576d24f7954a388f09f33e69ae9d11a4188))
+
 # [0.65.0](https://github.com/applandinc/appmap-ruby/compare/v0.64.0...v0.65.0) (2021-09-14)
 
 

data/ext/appmap/extconf.rb

@@ -1,6 +1,17 @@
 require "mkmf"
 
+
 $CFLAGS='-Werror'
+
+# Per https://bugs.ruby-lang.org/issues/17865,
+# compound-token-split-by-macro was added in clang 12 and broke
+# compilation with some of the ruby headers. If the current compiler
+# supports the new warning, turn it off.
+new_warning = '-Wno-error=compound-token-split-by-macro'
+if try_cflags(new_warning)
+  $CFLAGS += ' ' + new_warning
+end
+
 extension_name = "appmap"
 dir_config(extension_name)
 create_makefile(File.join(extension_name, extension_name))

data/lib/appmap/config.rb

@@ -117,13 +117,15 @@ module AppMap
     # entry in appmap.yml. When the Config is initialized, each Function is converted into
     # a Package and TargetMethods. It's called a Function rather than a Method, because Function
     # is the AppMap terminology.
-    Function = Struct.new(:package, :cls, :labels, :function_names) do # :nodoc:
+    Function = Struct.new(:package, :cls, :labels, :function_names, :builtin, :package_name) do # :nodoc:
       def to_h
         {
           package: package,
+          package_name: package_name,
           class: cls,
           labels: labels,
-          functions: function_names.map(&:to_sym)
+          functions: function_names.map(&:to_sym),
+          builtin: builtin
         }.compact
       end
     end
@@ -174,8 +176,8 @@ module AppMap
       package_hooks('actionpack',
         [
           method_hook('ActionDispatch::Request::Session', %i[[] dig values fetch], %w[http.session.read]),
-          method_hook('ActionDispatch::Request::Session', %i[destroy[]= clear update delete merge], %w[http.session.write]),
-          method_hook('ActionDispatch::Cookies::CookieJar', %i[[]= clear update delete recycle], %w[http.session.read]),
+          method_hook('ActionDispatch::Request::Session', %i[destroy []= clear update delete merge], %w[http.session.write]),
+          method_hook('ActionDispatch::Cookies::CookieJar', %i[[] fetch], %w[http.session.read]),
           method_hook('ActionDispatch::Cookies::CookieJar', %i[[]= clear update delete recycle], %w[http.session.write]),
           method_hook('ActionDispatch::Cookies::EncryptedCookieJar', %i[[]= clear update delete recycle], %w[http.cookie crypto.encrypt])
         ],
@@ -244,7 +246,7 @@ module AppMap
       @depends_config = depends_config
       @hook_paths = Set.new(packages.map(&:path))
       @exclude = exclude
-      @builtin_hooks = BUILTIN_HOOKS
+      @builtin_hooks = BUILTIN_HOOKS.dup
       @functions = functions
 
       @hooked_methods = METHOD_HOOKS.each_with_object(Hash.new { |h,k| h[k] = [] }) do |cls_target_methods, hooked_methods|
@@ -254,7 +256,15 @@ module AppMap
       functions.each do |func|
         package_options = {}
         package_options[:labels] = func.labels if func.labels
-        @hooked_methods[func.cls] << TargetMethods.new(func.function_names, Package.build_from_path(func.package, **package_options))
+        package_options[:package_name] = func.package_name
+        package_options[:package_name] ||= func.package if func.builtin
+        hook = TargetMethods.new(func.function_names, Package.build_from_path(func.package, **package_options))
+        if func.builtin
+          @builtin_hooks[func.cls] ||= []
+          @builtin_hooks[func.cls] << hook
+        else
+          @hooked_methods[func.cls] << hook
+        end
       end
 
       @hooked_methods.each_value do |hooks|
@@ -277,7 +287,7 @@ module AppMap
           LOGO
         end
 
-        config_present = true if File.exists?(config_file_name)
+        config_present = true if File.exist?(config_file_name)
 
         config_data = if config_present
           YAML.safe_load(::File.read(config_file_name))
@@ -300,6 +310,7 @@ module AppMap
           MISSING_FILE_MSG
           {}
         end
+
         load(config_data).tap do |config|
           config_yaml = {
             'name' => config.name,
@@ -324,15 +335,22 @@ module AppMap
 
         if config_data['functions']
           config_params[:functions] = config_data['functions'].map do |function_data|
-            package = function_data['package']
-            cls = function_data['class']
-            functions = function_data['function'] || function_data['functions']
-            raise %q(AppMap config 'function' element should specify 'package', 'class' and 'function' or 'functions') unless package && cls && functions
+            function_name = function_data['name']
+            package, cls, functions = []
+            if function_name
+              package, cls, _, function = Util.parse_function_name(function_name)
+              functions = Array(function)
+            else
+              package = function_data['package']
+              cls = function_data['class']
+              functions = function_data['function'] || function_data['functions']
+              raise %q(AppMap config 'function' element should specify 'package', 'class' and 'function' or 'functions') unless package && cls && functions
+            end
 
             functions = Array(functions).map(&:to_sym)
             labels = function_data['label'] || function_data['labels']
             labels = Array(labels).map(&:to_s) if labels
-            Function.new(package, cls, labels, functions)
+            Function.new(package, cls, labels, functions, function_data['builtin'], function_data['require'])
           end
         end
 
@@ -342,6 +360,7 @@ module AppMap
               gem = package['gem']
               path = package['path']
               raise %q(AppMap config 'package' element should specify 'gem' or 'path', not both) if gem && path
+              raise %q(AppMap config 'package' element should specify 'gem' or 'path') unless gem || path
 
               if gem
                 shallow = package['shallow']

data/lib/appmap/depends/api.rb

@@ -63,7 +63,7 @@ module AppMap
         removed = []
         out_of_date_appmaps.each do |appmap_path|
           mtime_path = File.join(appmap_path, 'mtime')
-          next unless File.exists?(mtime_path)
+          next unless File.exist?(mtime_path)
 
           appmap_mtime = File.read(mtime_path).to_i
           if appmap_mtime < since_ms

data/lib/appmap/depends/configuration.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'appmap'
-
 module AppMap
   module Depends
     class Configuration

data/lib/appmap/depends/util.rb

@@ -16,7 +16,7 @@ module AppMap
       def delete_appmap(appmap_path)
         FileUtils.rm_rf(appmap_path)
         appmap_file_path = [ appmap_path, 'appmap.json' ].join('.')
-        File.unlink(appmap_file_path) if File.exists?(appmap_file_path)
+        File.unlink(appmap_file_path) if File.exist?(appmap_file_path)
       rescue
         warn "Unable to delete AppMap: #{$!}"
       end

data/lib/appmap/event.rb

@@ -53,7 +53,7 @@ module AppMap
             @times[best_class_name(value)] += elapsed
           end
 
-          encode_dislay_string(value_string)
+          encode_display_string(value_string)
         end
 
         def object_properties(hash_like)
@@ -77,7 +77,7 @@ module AppMap
           value_cls.name
         end
 
-        def encode_dislay_string(value)
+        def encode_display_string(value)
           (value||'')[0...LIMIT].encode('utf-8', invalid: :replace, undef: :replace, replace: '_')
         end
 
@@ -138,22 +138,46 @@ module AppMap
     class MethodCall < MethodEvent
       attr_accessor :defined_class, :method_id, :path, :lineno, :parameters, :receiver, :static
 
+      MethodMetadata = Struct.new(:defined_class, :method_id, :path, :lineno, :static)
+
+      @@method_metadata = {}
+
       class << self
+        private
+
+        def method_metadata(defined_class, method, receiver)
+          result = @@method_metadata[method]
+          return result if result
+
+          result = MethodMetadata.new
+          result.static = receiver.is_a?(Module)
+          result.defined_class = defined_class
+          result.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
+            result.path = path
+            result.lineno = method.source_location[1]
+          else
+            result.path = [ defined_class, result.static ? '.' : '#', method.name ].join
+          end
+          @@method_metadata[method] = result
+        end
+
+        public
+
         def build_from_invocation(defined_class, method, receiver, arguments, event: MethodCall.new)
           event ||= MethodCall.new
           defined_class ||= 'Class'
+
           event.tap do
-            static = receiver.is_a?(Module)
-            event.defined_class = defined_class
-            event.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
-              event.path = path
-              event.lineno = method.source_location[1]
-            else
-              event.path = [ defined_class, static ? '.' : '#', method.name ].join
-            end
+            metadata = method_metadata(defined_class, method, receiver)
+
+            event.defined_class = metadata.defined_class
+            event.method_id = metadata.method_id
+            event.path = metadata.path
+            event.lineno = metadata.lineno
+            event.static = metadata.static
 
             # Check if the method has key parameters. If there are any they'll always be last.
             # If yes, then extract it from arguments.
@@ -186,7 +210,7 @@ module AppMap
               object_id: receiver.__id__,
               value: display_string(receiver)
             }
-            event.static = static
+
             MethodEvent.build_from_invocation(:call, event: event)
           end
         end

data/lib/appmap/handler/net_http.rb

@@ -27,7 +27,7 @@ module AppMap
 
         self.request_method = request.method
         self.url = url
-        self.headers = AppMap::Util.select_headers(NetHTTP.request_headers(request))
+        self.headers = NetHTTP.copy_headers(request)
         self.params = Rack::Utils.parse_nested_query(query)
       end
 
@@ -55,7 +55,7 @@ module AppMap
     end
 
     class HTTPClientResponse < AppMap::Event::MethodReturnIgnoreValue
-      attr_accessor :status, :mime_type, :headers
+      attr_accessor :status, :headers
 
       def initialize(response, parent_id, elapsed)
         super AppMap::Event.next_id_counter, :return, Thread.current.object_id
@@ -63,14 +63,13 @@ module AppMap
         self.status = response.code.to_i
         self.parent_id = parent_id
         self.elapsed = elapsed
-        self.headers = AppMap::Util.select_headers(NetHTTP.response_headers(response))
+        self.headers = NetHTTP.copy_headers(response)
       end
 
       def to_h
         super.tap do |h|
           h[:http_client_response] = {
             status_code: status,
-            mime_type: mime_type,
             headers: headers
           }.compact
         end
@@ -79,17 +78,15 @@ module AppMap
 
     class NetHTTP
       class << self
-        def request_headers(request)
+        def copy_headers(obj)
           {}.tap do |headers|
-            request.each_header do |k,v|
-              key = [ 'HTTP', Util.underscore(k).upcase ].join('_')
-              headers[key] = v
+            obj.each_header do |key, value|
+              key = key.split('-').map(&:capitalize).join('-')
+              headers[key] = value
             end
           end
         end
-    
-        alias response_headers request_headers
-    
+
         def handle_call(defined_class, hook_method, receiver, args)
           # request will call itself again in a start block if it's not already started.
           return unless receiver.started?

data/lib/appmap/handler/rails/request_handler.rb

@@ -9,16 +9,14 @@ module AppMap
     module Rails
       module RequestHandler
         class HTTPServerRequest < AppMap::Event::MethodEvent
-          attr_accessor :normalized_path_info, :request_method, :path_info, :params, :mime_type, :headers, :authorization
+          attr_accessor :normalized_path_info, :request_method, :path_info, :params, :headers
 
           def initialize(request)
             super AppMap::Event.next_id_counter, :call, Thread.current.object_id
 
             self.request_method = request.request_method
             self.normalized_path_info = normalized_path(request)
-            self.mime_type = request.headers['Content-Type']
-            self.headers = AppMap::Util.select_headers(request.env)
-            self.authorization = request.headers['Authorization']
+            self.headers = AppMap::Util.select_rack_headers(request.env)
             self.path_info = request.path_info.split('?')[0]
             # ActionDispatch::Http::ParameterFilter is deprecated
             parameter_filter_cls = \
@@ -35,9 +33,7 @@ module AppMap
               h[:http_server_request] = {
                 request_method: request_method,
                 path_info: path_info,
-                mime_type: mime_type,
                 normalized_path_info: normalized_path_info,
-                authorization: authorization,
                 headers: headers,
               }.compact
 
@@ -72,23 +68,21 @@ module AppMap
         end
 
         class HTTPServerResponse < AppMap::Event::MethodReturnIgnoreValue
-          attr_accessor :status, :mime_type, :headers
+          attr_accessor :status, :headers
 
           def initialize(response, parent_id, elapsed)
             super AppMap::Event.next_id_counter, :return, Thread.current.object_id
 
             self.status = response.status
-            self.mime_type = response.headers['Content-Type']
             self.parent_id = parent_id
             self.elapsed = elapsed
-            self.headers = AppMap::Util.select_headers(response.headers)
+            self.headers = response.headers.dup
           end
 
           def to_h
             super.tap do |h|
               h[:http_server_response] = {
                 status_code: status,
-                mime_type: mime_type,
                 headers: headers
               }.compact
             end

data/lib/appmap/handler/rails/sql_handler.rb

@@ -109,34 +109,6 @@ module AppMap
           begin
             sql = payload[:sql].strip
 
-            # 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|
-              Thread.current.backtrace.find do |line|
-                tokens = line.split(':')
-                matches_file = tokens.find { |t| t.rindex(file_name) == (t.length - file_name.length) }
-                matches_function = function_name.nil? || tokens.find { |t| t == "in `#{function_name}'" }
-                matches_file && matches_function
-              end
-            end
-
-            # Ignore SQL calls which are made while establishing a new connection.
-            #
-            # Example:
-            # /path/to/ruby/2.6.0/gems/sequel-5.20.0/lib/sequel/connection_pool.rb:122:in `make_new'
-            return if find_in_backtrace.call('lib/sequel/connection_pool.rb', 'make_new')
-            # lib/active_record/connection_adapters/abstract/connection_pool.rb:811:in `new_connection'
-            return if find_in_backtrace.call('lib/active_record/connection_adapters/abstract/connection_pool.rb', 'new_connection')
-
-            # Ignore SQL calls which are made while inspecting the DB schema.
-            #
-            # Example:
-            # /path/to/ruby/2.6.0/gems/sequel-5.20.0/lib/sequel/model/base.rb:812:in `get_db_schema'
-            return if find_in_backtrace.call('lib/sequel/model/base.rb', 'get_db_schema')
-            # /usr/local/bundle/gems/activerecord-5.2.3/lib/active_record/model_schema.rb:466:in `load_schema!'
-            return if find_in_backtrace.call('lib/active_record/model_schema.rb', 'load_schema!')
-            return if find_in_backtrace.call('lib/active_model/attribute_methods.rb', 'define_attribute_methods')
-            return if find_in_backtrace.call('lib/active_record/connection_adapters/schema_cache.rb')
-
             SQLExaminer.examine payload, sql: sql
 
             call = SQLCall.new(payload)

data/lib/appmap/hook.rb

@@ -89,7 +89,7 @@ module AppMap
 
       config.builtin_hooks.each do |class_name, hooks|
         Array(hooks).each do |hook|
-          require hook.package.package_name if hook.package.package_name
+          require hook.package.package_name if hook.package.package_name && hook.package.package_name != 'ruby'
           Array(hook.method_names).each do |method_name|
             method_name = method_name.to_sym
             base_cls = class_from_string.(class_name)

data/lib/appmap/swagger/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 
 module AppMap

data/lib/appmap/util.rb

@@ -21,6 +21,16 @@ module AppMap
     WHITE   = "\e[37m"
 
     class << self
+      def parse_function_name(name)
+        package_tokens = name.split('/')
+
+        class_and_name = package_tokens.pop
+        class_name, function_name, static = class_and_name.include?('.') ? class_and_name.split('.', 2) + [ true ] : class_and_name.split('#', 2) + [ false ]
+
+        raise "Malformed fully-qualified function name #{name}" unless function_name
+        [ package_tokens.empty? ? 'ruby' : package_tokens.join('/'), class_name, static, function_name ]
+      end
+
       # scenario_filename builds a suitable file name from a scenario name.
       # Special characters are removed, and the file name is truncated to fit within
       # shell limitations.
@@ -98,8 +108,18 @@ module AppMap
         event
       end
 
-      def select_headers(env)
+      def select_rack_headers(env)
+        finalize_headers = lambda do |headers|
+          blank?(headers) ? nil : headers
+        end
+
         # Rack prepends HTTP_ to all client-sent headers.
+
+        if !env['rack.version']
+          warn "Request headers does not contain rack.version. HTTP_ prefix is not expected."
+          return finalize_headers.call(env.dup)
+        end
+
         matching_headers = env
           .select { |k,v| k.start_with? 'HTTP_'}
           .reject { |k,v| blank?(v) }
@@ -108,7 +128,7 @@ module AppMap
             value = kv[1]
             memo[key] = value
           end
-        blank?(matching_headers) ? nil : matching_headers
+        finalize_headers.call(matching_headers)
       end
 
       def normalize_path(path)

data/lib/appmap/version.rb

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

data/spec/config_spec.rb

@@ -55,6 +55,34 @@ describe AppMap::Config, docker: false do
     expect(config.to_h.deep_stringify_keys!).to eq(config_expectation)
   end
 
+  it 'interprets a function in canonical name format' do
+    config_data = {
+      name: 'test',
+      packages: [],
+      functions: [
+        {
+          name: 'pkg/cls#fn',
+        }
+      ]
+    }.deep_stringify_keys!
+    config = AppMap::Config.load(config_data)
+
+    config_expectation = {
+      exclude: [],
+      name: 'test',
+      packages: [],
+      functions: [
+        {
+          package: 'pkg',
+          class: 'cls',
+          functions: [ :fn ],
+        }
+      ]
+    }.deep_stringify_keys!
+
+    expect(config.to_h.deep_stringify_keys!).to eq(config_expectation)
+  end
+
   context do
     let(:warnings) { @warnings ||= [] }
     let(:warning) { warnings.join }

data/spec/depends/api_spec.rb

@@ -93,9 +93,9 @@ describe 'Depends API' do
 
         test_report.clean_appmaps
 
-        expect(File.exists?(new_spec_file)).to be_falsey
+        expect(File.exist?(new_spec_file)).to be_falsey
       ensure
-        FileUtils.rm_f new_spec_file if File.exists?(new_spec_file)
+        FileUtils.rm_f new_spec_file if File.exist?(new_spec_file)
         FileUtils.rm_rf new_spec_file.split('.')[0]
       end
     end

data/spec/fixtures/config/missing_path_or_gem.yml

@@ -0,0 +1,3 @@
+name: name
+packages:
+  - dogs: are friendly

data/spec/fixtures/rails5_users_app/appmap.yml

@@ -5,3 +5,7 @@ packages:
   - path: app/controllers
     labels: [ mvc.controller ]
   - gem: sequel
+functions:
+  - name: logger/Logger::LogDevice#write
+    builtin: true
+    label: log

data/spec/fixtures/rails6_users_app/appmap.yml

@@ -5,6 +5,10 @@ packages:
   - path: app/controllers
     labels: [ mvc.controller ]
   - gem: sequel
+functions:
+  - name: logger/Logger::LogDevice#write
+    builtin: true
+    label: log
 swagger:
   project_version: 1.1.0
   output_dir: tmp/swagger

data/spec/rails_recording_spec.rb

@@ -1,7 +1,11 @@
 require 'rails_spec_helper'
 
+def default_rails_versions
+  ruby_2? ? [ 5, 6 ] : [ 6 ]
+end
+
 # Rails5 doesn't work with Ruby 3.x
-RailsVersions = ruby_2? ? [ 5, 6 ] : [ 6 ]
+RailsVersions = ENV['RAILS_VERSIONS'] || default_rails_versions
 
 describe 'Rails' do
   RailsVersions.each do |rails_major_version| # rubocop:disable Metrics/BlockLength
@@ -54,7 +58,7 @@ describe 'Rails' do
               hash_including(
                 'http_server_response' => hash_including(
                   'status_code' => 201,
-                  'mime_type' => 'application/json; charset=utf-8',
+                  'headers' => hash_including('Content-Type' => 'application/json; charset=utf-8'),
                 )
               )
             )
@@ -91,6 +95,15 @@ describe 'Rails' do
             )
           end
 
+          it 'captures log events' do
+            expect(events).to include hash_including(
+              'event' => 'call',
+              'defined_class' => 'Logger::LogDevice',
+              'method_id' => 'write',
+              'static' => false
+            )
+          end
+
           context 'with an object-style message' do
             let(:appmap_json_file) { 'Api_UsersController_POST_api_users_with_required_parameters_with_object-style_parameters_creates_a_user.appmap.json' }
 

data/test/agent_setup_validate_test.rb

@@ -6,6 +6,7 @@ class AgentSetupValidateTest < Minitest::Test
   NON_EXISTING_CONFIG_FILENAME = '123.yml'
   INVALID_YAML_CONFIG_FILENAME = 'spec/fixtures/config/invalid_yaml_config.yml'
   INVALID_CONFIG_FILENAME = 'spec/fixtures/config/invalid_config.yml'
+  MISSING_PATH_OR_GEM_CONFIG_FILENAME = 'spec/fixtures/config/missing_path_or_gem.yml'
 
   def test_init_when_config_exists
     output = `./exe/appmap-agent-validate`
@@ -72,4 +73,22 @@ class AgentSetupValidateTest < Minitest::Test
     ])
     assert_equal expected, output.strip
   end
+
+  def test_init_with_missing_package_key
+    output = `./exe/appmap-agent-validate -c #{MISSING_PATH_OR_GEM_CONFIG_FILENAME}`
+    assert_equal 0, $CHILD_STATUS.exitstatus
+    expected = JSON.pretty_generate([
+      {
+        level: :error,
+        message: 'AppMap auto-configuration is currently not available for non Rails projects'
+      },
+      {
+        level: :error,
+        filename: MISSING_PATH_OR_GEM_CONFIG_FILENAME,
+        message: "AppMap configuration #{MISSING_PATH_OR_GEM_CONFIG_FILENAME} could not be loaded",
+        detailed_message: "AppMap config 'package' element should specify 'gem' or 'path'"
+      }
+    ])
+    assert_equal expected, output.strip
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appmap
 version: !ruby/object:Gem::Version
-  version: 0.65.0
+  version: 0.66.2
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-14 00:00:00.000000000 Z
+date: 2021-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -3462,6 +3462,7 @@ files:
 - spec/fixtures/config/incomplete_config.yml
 - spec/fixtures/config/invalid_config.yml
 - spec/fixtures/config/invalid_yaml_config.yml
+- spec/fixtures/config/missing_path_or_gem.yml
 - spec/fixtures/config/valid_config.yml
 - spec/fixtures/depends/.gitignore
 - spec/fixtures/depends/app/controllers/api/api_keys_controller.rb
@@ -3738,7 +3739,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Record the operation of a Ruby program, using the AppLand 'AppMap' format.