appmap 0.63.0 → 0.66.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42f7035cf2ee0f8595c813470df56fd34e77e41c70a9303165272ba252ea0d6d
-  data.tar.gz: 728224dd6897ae1a0aee4cf12f8253fb6081eb1420e1caad99623d46d7b88613
+  metadata.gz: 1eecc28364d2832ecd593baed1c12a82d11bcd7f48945bebb59acd1d1830c254
+  data.tar.gz: ae096b7623cf2c59d9978b7d72676b797e2f7276adf2296d864434bea2a33605
 SHA512:
-  metadata.gz: d2775d730040fd7d2c7603c0700fd6698b97addfec2f6156ad9602b158b6a461a70c21c53647ef51afa9cbe47f22c06b4218c9684664b367145373eebb1c709c
-  data.tar.gz: f69c9a3674311f75a9a0d418f42331655c5225cdc6b2d3fc100d76d45894cdd94bdbb48ad7f400512acf684808f7cf4de4bce31b07b63a994f4f372f504db880
+  metadata.gz: 29f8d31824e2faf890cb35e895d5d165d5f083238f3a89aac00c95b8ac00289ca9647eaa4dc01a5b197f68f511f270a0d8f4f3fd6b4470be1d63df4cbda9274e
+  data.tar.gz: b59fc7043f6eb31af9680cccb104fb1dfe7f6370275b28f3ee4e7edc1070e85fd9828c2d681458b6812bc2feba323bb18508628ecdaea175d2e9947f06f48cba

data/.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
 
 rbenv:
-- 2.5
 - 2.6
 - 2.7
+- 3.0
 
 addons:
   apt:

data/CHANGELOG.md

@@ -1,3 +1,38 @@
+# [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)
+
+
+### Bug Fixes
+
+* Require fileutils as needed ([790c3a8](https://github.com/applandinc/appmap-ruby/commit/790c3a88b0e69581e0e4f73b7a92f46448b3cdd8))
+
+
+### Features
+
+* Add support for Ruby 3.0, and drop Ruby 2.5 ([eba14e1](https://github.com/applandinc/appmap-ruby/commit/eba14e1669bdf50dc51ce8623c5d586edfdb1a2f))
+
+# [0.64.0](https://github.com/applandinc/appmap-ruby/compare/v0.63.0...v0.64.0) (2021-08-24)
+
+
+### Features
+
+* Show config file name in validation messages ([95520f8](https://github.com/applandinc/appmap-ruby/commit/95520f83a2b27fae6a3d5751cc1a4a1180c2dc25))
+
 # [0.63.0](https://github.com/applandinc/appmap-ruby/compare/v0.62.1...v0.63.0) (2021-08-24)
 
 

data/README.md

@@ -117,11 +117,11 @@ root@6fab5f89125f:/src/app# bundle
 ```
 
 At this point, the bundle is built with the `appmap` gem located  in `/src/appmap`, which is volume-mounted from the host.
-So you can edit the fixture code and the appmap code and run test commands such as `rspec` and `cucumber` in the container.
+So you can edit the fixture code and the appmap code and run test commands such as `rspec` in the container.
 For example:
 
 ```sh-session
-root@6fab5f89125f:/src/app# bundle exec rspec
+root@6fab5f89125f:/src/app# APPMAP=true bundle exec rspec
 Configuring AppMap from path appmap.yml
 ....
 

data/Rakefile

@@ -28,7 +28,7 @@ namespace 'gem' do
   end
 end
 
-RUBY_VERSIONS=%w[2.5 2.6 2.7].select do |version|
+RUBY_VERSIONS=%w[2.6 2.7 3.0].select do |version|
   travis_ruby_version = ENV['TRAVIS_RUBY_VERSION']
   next true unless travis_ruby_version
 

data/lib/appmap/command/agent_setup/init.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'json'
+require 'yaml'
 require 'appmap/service/guesser'
 
 module AppMap

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
@@ -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|
@@ -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
 
@@ -367,7 +385,7 @@ module AppMap
           config_params[:depends_config] = depends_config
         end
 
-        Config.new name, config_params
+        Config.new name, **config_params
       end
     end
 

data/lib/appmap/cucumber.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'appmap/util'
+require 'fileutils'
 
 module AppMap
   module Cucumber

data/lib/appmap/depends/util.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 module AppMap
   module Depends
     module Util

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/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/minitest.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'appmap/util'
+require 'fileutils'
 require 'active_support'
 require 'active_support/core_ext'
 

data/lib/appmap/rspec.rb

@@ -2,6 +2,7 @@
 
 require 'appmap/util'
 require 'set'
+require 'fileutils'
 
 module AppMap
   # Integration of AppMap with RSpec. When enabled with APPMAP=true, the AppMap tracer will

data/lib/appmap/service/validator/config_validator.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'appmap/service/validator/violation'
+require 'yaml'
 
 module AppMap
   module Service
@@ -39,7 +40,7 @@ module AppMap
         rescue Psych::SyntaxError => e
           @violations << Violation.error(
             filename: @config_file,
-            message: 'AppMap configuration is not valid YAML',
+            message: "AppMap configuration #{@config_file} is not valid YAML",
             detailed_message: e.message
           )
           nil
@@ -52,7 +53,7 @@ module AppMap
         rescue StandardError => e
           @violations << Violation.error(
             filename: @config_file,
-            message: 'AppMap configuration could not be loaded',
+            message: "AppMap configuration #{@config_file} could not be loaded",
             detailed_message: e.message
           )
           nil
@@ -62,7 +63,7 @@ module AppMap
           unless present?
             @violations << Violation.error(
               filename: @config_file,
-              message: 'AppMap configuration file does not exist'
+              message: "AppMap configuration #{@config_file} file does not exist"
             )
           end
         end
@@ -76,7 +77,10 @@ module AppMap
         end
 
         def validate_ruby_version
-          unless RUBY_VERSION =~ AppMap::SUPPORTED_RUBY_VERSIONS_REGEX
+          major, minor, _ = RUBY_VERSION.split('.')
+          version = [ major, minor ].join('.')
+
+          unless AppMap::SUPPORTED_RUBY_VERSIONS.member?(version)
             @violations << Violation.error(
               message: "AppMap does not support Ruby #{RUBY_VERSION}. " \
                 "Supported versions are: #{AppMap::SUPPORTED_RUBY_VERSIONS.join(', ')}."

data/lib/appmap/swagger/rake_tasks.rb

@@ -1,5 +1,6 @@
 require 'rake'
 require 'yaml'
+require 'fileutils'
 require 'appmap/node_cli'
 require 'appmap/swagger/markdown_descriptions'
 require 'appmap/swagger/stable'

data/lib/appmap/util.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'bundler'
+require 'fileutils'
 
 module AppMap
   module Util
@@ -20,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.
@@ -130,7 +141,6 @@ module AppMap
 
       # Atomically writes AppMap data to +filename+.
       def write_appmap(filename, appmap)
-        require 'fileutils'
         require 'tmpdir'
 
         # This is what Ruby Tempfile does; but we don't want the file to be unlinked.

data/lib/appmap/version.rb

@@ -3,12 +3,11 @@
 module AppMap
   URL = 'https://github.com/applandinc/appmap-ruby'
 
-  VERSION = '0.63.0'
+  VERSION = '0.66.0'
 
   APPMAP_FORMAT_VERSION = '1.5.1'
 
-  SUPPORTED_RUBY_VERSIONS_REGEX = /^2\.[567]\./.freeze
-  SUPPORTED_RUBY_VERSIONS = %w[2.5 2.6 2.7].freeze
+  SUPPORTED_RUBY_VERSIONS = %w[2.6 2.7 3.0].freeze
 
   DEFAULT_APPMAP_DIR = 'tmp/appmap'.freeze
   DEFAULT_CONFIG_FILE_PATH = 'appmap.yml'.freeze

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

@@ -55,7 +55,7 @@ describe 'Depends API' do
   describe '.inspect_test_files' do
     it 'reports metadata, added, removed, changed, failed' do
       test_report = api.inspect_test_files(appmap_dir: DEPENDS_TEST_DIR, test_file_patterns: %w[spec/fixtures/depends/spec/*_spec.rb])
-      expect(test_report.metadata_files).to eq(%w[spec/fixtures/depends/user_page_scenario/metadata.json spec/fixtures/depends/revoke_api_key/metadata.json])
+      expect(test_report.metadata_files.sort).to eq(%w[spec/fixtures/depends/revoke_api_key/metadata.json spec/fixtures/depends/user_page_scenario/metadata.json])
       expect(test_report.added).to be_empty
       expect(test_report.removed).to be_empty
       expect(test_report.changed).to be_empty

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/Gemfile

@@ -7,7 +7,7 @@ gem 'haml-rails'
 
 gem 'activerecord', require: false
 gem 'pg'
-gem 'sequel', '= 5.20.0', require: false
+gem 'sequel', '>= 5.43.0', require: false
 gem 'sequel-rails', require: false
 gem 'sequel_secure_password', require: false
 

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/fixtures/rails6_users_app/docker-compose.yml

@@ -15,7 +15,7 @@ services:
       dockerfile: Dockerfile
     image: rails6-app:${RUBY_VERSION}
     command:
-      [ "./bin/rails", "server", "-b", "0.0.0.0", "webrick" ]
+      [ "./bin/rails", "server", "-b", "0.0.0.0", "-u", "webrick" ]
     environment:
       RAILS_ENV:
       ORM_MODULE:

data/spec/hook_spec.rb

@@ -987,10 +987,12 @@ describe 'AppMap class Hooking', docker: false do
   end
 
   describe 'kwargs handling' do
-    # https://github.com/applandinc/appmap-ruby/issues/153
-    it 'empty hash for **kwrest can be proxied as a regular function argument', github_issue: 153 do
-      invoke_test_file 'spec/fixtures/hook/kwargs.rb' do
-        expect(Kwargs.has_kwrest_calls_no_kwargs(nil, {})).to eq({})
+    if ruby_2?
+      # https://github.com/applandinc/appmap-ruby/issues/153
+      it 'empty hash for **kwrest can be proxied as a regular function argument', github_issue: 153 do
+        invoke_test_file 'spec/fixtures/hook/kwargs.rb' do
+          expect(Kwargs.has_kwrest_calls_no_kwargs(nil, {})).to eq({})
+        end
       end
     end
   end

data/spec/rails_recording_spec.rb

@@ -1,7 +1,14 @@
 require 'rails_spec_helper'
 
+def default_rails_versions
+  ruby_2? ? [ 5, 6 ] : [ 6 ]
+end
+
+# Rails5 doesn't work with Ruby 3.x
+RailsVersions = ENV['RAILS_VERSIONS'] || default_rails_versions
+
 describe 'Rails' do
-  %w[5 6].each do |rails_major_version| # rubocop:disable Metrics/BlockLength
+  RailsVersions.each do |rails_major_version| # rubocop:disable Metrics/BlockLength
     context "#{rails_major_version}" do
       include_context 'Rails app pg database', "spec/fixtures/rails#{rails_major_version}_users_app" unless use_existing_data?
       include_context 'rails integration test setup'
@@ -88,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' }
 
@@ -239,7 +255,7 @@ describe 'Rails' do
   end
 
   describe 'with default appmap.yml' do
-    include_context 'Rails app pg database', "spec/fixtures/rails5_users_app" unless use_existing_data?
+    include_context 'Rails app pg database', "spec/fixtures/rails6_users_app" unless use_existing_data?
     include_context 'rails integration test setup'
 
     def run_spec(spec_name)

data/spec/railtie_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_spec_helper'
 
 describe 'AppMap tracer via Railtie' do
-  include_context 'Rails app pg database', 'spec/fixtures/rails5_users_app' do 
+  include_context 'Rails app pg database', 'spec/fixtures/rails6_users_app' do 
     let(:env) { {} }
 
     let(:cmd) { %(docker-compose run --rm -e RAILS_ENV=development -e APPMAP app ./bin/rails r "puts AppMap.instance_variable_get('@configuration').nil?") }
@@ -10,13 +10,13 @@ describe 'AppMap tracer via Railtie' do
       Open3.capture3(env, cmd, chdir: fixture_dir).tap do |result|
         unless result[2] == 0
           warn <<~STDERR
-            Failed to run rails5_users_app container
+            Failed to run rails6_users_app container
             <<< Output:
             #{result[0]}
             #{result[1]}
             >>> End of output
           STDERR
-          raise 'Failed to run rails5_users_app container'
+          raise 'Failed to run rails6_users_app container'
         end
       end
     end

data/spec/record_sql_rails_pg_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_spec_helper'
 
 describe 'SQL events' do
-  include_context 'Rails app pg database', 'spec/fixtures/rails5_users_app' do
+  include_context 'Rails app pg database', 'spec/fixtures/rails6_users_app' do
     around(:each) do |example|
       FileUtils.rm_rf tmpdir
       FileUtils.mkdir_p tmpdir

data/spec/remote_recording_spec.rb

@@ -3,9 +3,9 @@ require 'net/http'
 require 'socket'
 
 describe 'remote recording', :order => :defined do
-  include_context 'Rails app pg database', 'spec/fixtures/rails5_users_app' do
+  include_context 'Rails app pg database', 'spec/fixtures/rails6_users_app' do
     before(:all) do
-      fixture_dir = 'spec/fixtures/rails5_users_app'
+      fixture_dir = 'spec/fixtures/rails6_users_app'
       start_cmd = 'docker-compose up -d app'
       run_cmd({ 'ORM_MODULE' => 'sequel', 'APPMAP' => 'true' }, start_cmd, chdir: fixture_dir)
       Dir.chdir fixture_dir do
@@ -44,7 +44,7 @@ describe 'remote recording', :order => :defined do
     end
 
     after(:all) do
-      fixture_dir = 'spec/fixtures/rails5_users_app'
+      fixture_dir = 'spec/fixtures/rails6_users_app'
       run_cmd 'docker-compose rm -fs app', chdir: fixture_dir
     end
 

data/spec/spec_helper.rb

@@ -21,6 +21,10 @@ def use_existing_data?
   ENV['USE_EXISTING_DATA'] == 'true'
 end
 
+def ruby_2?
+  RUBY_VERSION.split('.')[0].to_i == 2
+end
+
 shared_context 'collect events' do
   def collect_events(tracer)
     [].tap do |events|

data/test/agent_setup_validate_test.rb

@@ -30,7 +30,7 @@ class AgentSetupValidateTest < Minitest::Test
       {
         level: :error,
         filename: NON_EXISTING_CONFIG_FILENAME,
-        message: 'AppMap configuration file does not exist'
+        message: "AppMap configuration #{NON_EXISTING_CONFIG_FILENAME} file does not exist"
       }
     ])
     assert_equal expected, output.strip
@@ -47,7 +47,7 @@ class AgentSetupValidateTest < Minitest::Test
       {
         level: :error,
         filename: INVALID_YAML_CONFIG_FILENAME,
-        message: 'AppMap configuration is not valid YAML',
+        message: "AppMap configuration #{INVALID_YAML_CONFIG_FILENAME} is not valid YAML",
         detailed_message: "(#{INVALID_YAML_CONFIG_FILENAME}): " \
           'did not find expected key while parsing a block mapping at line 1 column 1'
       }
@@ -66,7 +66,7 @@ class AgentSetupValidateTest < Minitest::Test
       {
         level: :error,
         filename: INVALID_CONFIG_FILENAME,
-        message: 'AppMap configuration could not be loaded',
+        message: "AppMap configuration #{INVALID_CONFIG_FILENAME} could not be loaded",
         detailed_message: "no implicit conversion of String into Integer"
       }
     ])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appmap
 version: !ruby/object:Gem::Version
-  version: 0.63.0
+  version: 0.66.0
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-24 00:00:00.000000000 Z
+date: 2021-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport