appmap 0.65.0 → 0.65.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ff92977defe997917c8b7c2d9d5974d5e743c02b637bcfffa5548e087d4644f
-  data.tar.gz: 4889a8d717b0167737719acc75c12f5709404b6445b6dd633523cd76e4992a96
+  metadata.gz: 30c93c7dbd38cd355d2512f43d177243bba4c184e81c588bf2f99e3b7d2426f4
+  data.tar.gz: 3dd70314c48d4df781dcda082fb293260d04725228e66c4c3323ebdcb09ea35a
 SHA512:
-  metadata.gz: 4a78ced9dc2d5c0e80fe0f68d01508cff0af59bfc65f9a747ec5f981d7bd5a7523a59230427ddf465b39db1768f2443c856a93c852ddb444bc80eec4a539f460
-  data.tar.gz: 21a54adacd2b5b27a5f2a6143db0c0684716a9d1db6add75d4e05fdd73054bb9576fc2bac3ce68067230d1fb04caf177c8e4366e05a061301bd1a9dd84214bf5
+  metadata.gz: bea8dc7d3e1f05cca6ae264b7b0cf8ab6cdddfd366c59f09131c9c98cd12989e2878f276fc01360166ccee6c16b040b6ecd3aa8c6e913407bbd93d4bb1928862
+  data.tar.gz: 5a798b37f59f39f70e69398e0d64353f66baf4b55000b45dc951be27830b04f36d17c2fe58bc4f5e86fdab368c056b90834c15a21f438535f8403ec437758d8d

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [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/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/version.rb

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

metadata

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