appmap 0.92.1 → 0.93.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f527f92e73d7e71cf5a4e9db3b71c570b39443ad0788bc2c6f4b4bae4bb215ba
-  data.tar.gz: 6604ce77790645d5c5a60d37a2bc1116952909fe29856ea9fb36bac29d992d81
+  metadata.gz: 065c32b4761f0e0c6ddbe31d008e6e015935b327a78a948ba546fea284e2e1c5
+  data.tar.gz: e960cde3aca40d4d103ffdbb1b9384e827555a0ae53f135142744fdbcd5adc99
 SHA512:
-  metadata.gz: 841907ab84538b09c9f83509d3c65dcd6d3b0be92e452a3558194fd33a8c90336f4f8294be91ac94a8631546acc89bef91807a451a546c3c1d9408110268e237
-  data.tar.gz: 715e6d1e540a89c660f0d3a9794b0c199356b1557fc5921226a422b78eff9c62f6b696cd1d231f0c25d06b82c417f5fef4b9e613b564146a50779b6e4d4d6910
+  metadata.gz: a2efd8e697df46ae1f65630b49567283e437586b9a4bb6177d08d481a27a13167d2bae303ca27a9b17bcb57d396ed51f4683a1fa617804eb61222deb0ae0fb95
+  data.tar.gz: 2cc2eeba86b6b35452dd2b2b3f76b0adeffdcfe0fb54e6a03c85a445de3004abec26dea56b07c117a8e90ce3e9e52115398b993cdc5e322801cf248accbcbbd6

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## [0.93.1](https://github.com/getappmap/appmap-ruby/compare/v0.93.0...v0.93.1) (2022-10-04)
+
+
+### Bug Fixes
+
+* Unyield static asset requests ([4041e4b](https://github.com/getappmap/appmap-ruby/commit/4041e4bbfb44612c5ade2cba334e1ab36a7929e5))
+
+# [0.93.0](https://github.com/getappmap/appmap-ruby/compare/v0.92.1...v0.93.0) (2022-09-22)
+
+
+### Features
+
+* Record the time spent instrumentating a function, as opposed to only the time spend executing a function ([0941b4d](https://github.com/getappmap/appmap-ruby/commit/0941b4d343b1ea2964268d3a47d8f762de00deea))
+* save elapsed_instrumentation for HTTP requests ([a32fb52](https://github.com/getappmap/appmap-ruby/commit/a32fb526a6f7b47ddc859e86a68b53b50b052061))
+* save elapsed_instrumentation for RequestListener ([5a081cc](https://github.com/getappmap/appmap-ruby/commit/5a081ccf558a4591035acc81b1717b2ccef880ee))
+* Save elapsed_instrumentation for sql_query ([40a851e](https://github.com/getappmap/appmap-ruby/commit/40a851e5d40cc5ada36ea52e32d5222da4c67d10))
+
 ## [0.92.1](https://github.com/getappmap/appmap-ruby/compare/v0.92.0...v0.92.1) (2022-09-21)
 
 

data/lib/appmap/event.rb

@@ -262,7 +262,7 @@ module AppMap
     end
 
     class MethodReturnIgnoreValue < MethodEvent
-      attr_accessor :parent_id, :elapsed
+      attr_accessor :parent_id, :elapsed, :elapsed_instrumentation
 
       class << self
         def build_from_invocation(parent_id, elapsed: nil, event: MethodReturnIgnoreValue.new)
@@ -279,6 +279,7 @@ module AppMap
         super.tap do |h|
           h[:parent_id] = parent_id
           h[:elapsed] = elapsed if elapsed
+          h[:elapsed_instrumentation] = elapsed_instrumentation if elapsed_instrumentation
         end
       end
     end

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

@@ -10,7 +10,7 @@ module AppMap
 
       module RequestHandler
         class HTTPServerRequest < AppMap::Event::MethodEvent
-          attr_accessor :normalized_path_info, :request_method, :path_info, :params, :headers
+          attr_accessor :normalized_path_info, :request_method, :path_info, :params, :headers, :call_elapsed_instrumentation
 
           def initialize(request)
             super AppMap::Event.next_id_counter, :call, Thread.current.object_id
@@ -101,16 +101,21 @@ module AppMap
           protected
 
           def before_hook(receiver, *)
+            before_hook_start_time = AppMap::Util.gettime()
             call_event = HTTPServerRequest.new(receiver.request)
+            call_event.call_elapsed_instrumentation = (AppMap::Util.gettime() - before_hook_start_time)
             # http_server_request events are i/o and do not require a package name.
             AppMap.tracing.record_event call_event, defined_class: defined_class, method: hook_method
             call_event
           end
 
           def after_hook(receiver, call_event, elapsed, *)
+            after_hook_start_time = AppMap::Util.gettime()
             return_value = Thread.current[TEMPLATE_RENDER_VALUE]
             Thread.current[TEMPLATE_RENDER_VALUE] = nil
             return_event = HTTPServerResponse.build_from_invocation call_event.id, return_value, elapsed, receiver.response
+            return_event.elapsed_instrumentation = (AppMap::Util.gettime() - after_hook_start_time) + call_event.call_elapsed_instrumentation
+            call_event.call_elapsed_instrumentation = nil # to stay consistent with elapsed_instrumentation only being stored in return
             AppMap.tracing.record_event return_event
           end
         end
@@ -134,13 +139,16 @@ module AppMap
           end
 
           def before_hook(payload)
+            before_hook_start_time = AppMap::Util.gettime()
             @call_event = HTTPServerRequest.new payload[:request]
+            @call_event.call_elapsed_instrumentation = (AppMap::Util.gettime() - before_hook_start_time)
             AppMap.tracing.record_event @call_event
           end
 
           def after_hook(_name, started, finished, _unique_id, payload)
             return unless @request_id == payload[:request].request_id
 
+            after_hook_start_time = AppMap::Util.gettime()
             return_value = Thread.current[TEMPLATE_RENDER_VALUE]
             Thread.current[TEMPLATE_RENDER_VALUE] = nil
             return_event = HTTPServerResponse.build_from_invocation(
@@ -149,6 +157,7 @@ module AppMap
               finished - started,
               payload[:response] || payload
             )
+            return_event.elapsed_instrumentation = (AppMap::Util.gettime() - after_hook_start_time) + @call_event.call_elapsed_instrumentation
 
             AppMap.tracing.record_event return_event
             ActiveSupport::Notifications.unsubscribe(@subscriber)

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

@@ -2,6 +2,7 @@
 
 require 'appmap/event'
 require 'appmap/hook/method'
+require 'appmap/util'
 
 module AppMap
   module Handler
@@ -148,6 +149,8 @@ module AppMap
           reentry_key = "#{self.class.name}#call"
           return if Thread.current[reentry_key] == true
 
+          after_start_time = AppMap::Util.gettime()
+
           Thread.current[reentry_key] = true
           begin
             sql = payload[:sql].strip
@@ -156,7 +159,9 @@ module AppMap
 
             call = SQLCall.new(payload)
             AppMap.tracing.record_event(call)
-            AppMap.tracing.record_event(SQLReturn.new(call.id, finished - started))
+            sql_return_event = SQLReturn.new(call.id, finished - started)
+            sql_return_event.elapsed_instrumentation = AppMap::Util.gettime() - after_start_time
+            AppMap.tracing.record_event(sql_return_event)
           ensure
             Thread.current[reentry_key] = nil
           end

data/lib/appmap/hook/method/ruby2.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'appmap/util'
+
 def ruby2_keywords(*); end unless respond_to?(:ruby2_keywords, true)
 
 module AppMap
@@ -8,15 +10,19 @@ module AppMap
     # cf. https://eregon.me/blog/2019/11/10/the-delegation-challenge-of-ruby27.html
     class Method
       ruby2_keywords def call(receiver, *args, &block)
-        call_event = trace? && with_disabled_hook { before_hook receiver, *args }
+        call_event = false
+        if trace?
+          call_event, elapsed_before = with_disabled_hook { before_hook receiver, *args }
+        end
         # note we can't short-circuit directly to do_call because then the call stack
         # depth changes and eval handler doesn't work correctly
-        trace_call call_event, receiver, *args, &block
+        trace_call call_event, elapsed_before, receiver, *args, &block
       end
 
       protected
 
       def before_hook(receiver, *args)
+        before_hook_start_time = AppMap::Util.gettime()
         call_event = handle_call(receiver, args)
         if call_event
           AppMap.tracing.record_event \
@@ -25,7 +31,7 @@ module AppMap
             defined_class: defined_class,
             method: hook_method
         end
-        call_event
+        [call_event, AppMap::Util.gettime() - before_hook_start_time]
       end
 
       ruby2_keywords def do_call(receiver, *args, &block)
@@ -33,17 +39,18 @@ module AppMap
       end
 
       # rubocop:disable Metrics/MethodLength
-      ruby2_keywords def trace_call(call_event, receiver, *args, &block)
+      ruby2_keywords def trace_call(call_event, elapsed_before, receiver, *args, &block)
         return do_call(receiver, *args, &block) unless call_event
 
-        start_time = gettime
+        start_time = AppMap::Util.gettime()
         begin
           return_value = do_call(receiver, *args, &block)
         rescue # rubocop:disable Style/RescueStandardError
           exception = $ERROR_INFO
           raise
         ensure
-          with_disabled_hook { after_hook receiver, call_event, gettime - start_time, return_value, exception } \
+          after_start_time = AppMap::Util.gettime()
+          with_disabled_hook { after_hook receiver, call_event, elapsed_before, after_start_time - start_time, after_start_time, return_value, exception } \
             if call_event
         end
       end

data/lib/appmap/hook/method/ruby3.rb

@@ -1,19 +1,25 @@
 # frozen_string_literal: true
 
+require 'appmap/util'
+
 module AppMap
   class Hook
     # Delegation methods for Ruby 3.
     class Method
       def call(receiver, *args, **kwargs, &block)
-        call_event = trace? && with_disabled_hook { before_hook receiver, *args, **kwargs }
+        call_event = false
+        if trace?
+          call_event, elapsed_before = with_disabled_hook { before_hook receiver, *args, **kwargs }
+        end
         # note we can't short-circuit directly to do_call because then the call stack
         # depth changes and eval handler doesn't work correctly
-        trace_call call_event, receiver, *args, **kwargs, &block
+        trace_call call_event, elapsed_before, receiver, *args, **kwargs, &block
       end
 
       protected
 
       def before_hook(receiver, *args, **kwargs)
+        before_hook_start_time = AppMap::Util.gettime()
         args = [*args, kwargs] if !kwargs.empty? || keyrest?
         call_event = handle_call(receiver, args)
         if call_event
@@ -23,7 +29,7 @@ module AppMap
             defined_class: defined_class,
             method: hook_method
         end
-        call_event
+        [call_event, AppMap::Util.gettime() - before_hook_start_time]
       end
 
       def keyrest?
@@ -35,17 +41,18 @@ module AppMap
       end
 
       # rubocop:disable Metrics/MethodLength
-      def trace_call(call_event, receiver, *args, **kwargs, &block)
+      def trace_call(call_event, elapsed_before, receiver, *args, **kwargs, &block)
         return do_call(receiver, *args, **kwargs, &block) unless call_event
 
-        start_time = gettime
+        start_time = AppMap::Util.gettime()
         begin
           return_value = do_call(receiver, *args, **kwargs, &block)
         rescue # rubocop:disable Style/RescueStandardError
           exception = $ERROR_INFO
           raise
         ensure
-          with_disabled_hook { after_hook receiver, call_event, gettime - start_time, return_value, exception } \
+          after_start_time = AppMap::Util.gettime()
+          with_disabled_hook { after_hook receiver, call_event, elapsed_before, after_start_time - start_time, after_start_time, return_value, exception } \
             if call_event
         end
       end

data/lib/appmap/hook/method.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'appmap/util'
+
 module AppMap
   class Hook
     SIGNATURES = {}
@@ -78,10 +80,6 @@ module AppMap
         warn "#{hook_method.name} not found on #{hook_class}" if Hook::LOG
       end
 
-      def gettime
-        Process.clock_gettime Process::CLOCK_MONOTONIC
-      end
-
       def trace?
         return false unless AppMap.tracing_enabled?
         return false if Thread.current[HOOK_DISABLE_KEY]
@@ -102,8 +100,9 @@ module AppMap
         @defined_class ||= Hook.qualify_method_name(hook_method)&.first
       end
 
-      def after_hook(_receiver, call_event, elapsed, return_value, exception)
+      def after_hook(_receiver, call_event, elapsed_before, elapsed, after_start_time, return_value, exception)
         return_event = handle_return(call_event.id, elapsed, return_value, exception)
+        return_event.elapsed_instrumentation = elapsed_before + (AppMap::Util.gettime() - after_start_time)
         AppMap.tracing.record_event(return_event) if return_event
       end
 

data/lib/appmap/middleware/remote_recording.rb

@@ -89,39 +89,46 @@ module AppMap
         # into a separate Tracer.
         tracer = AppMap.tracing.trace(thread: Thread.current) if record_all_requests?
 
-        @app.call(env).tap do |status, headers|
-          if tracer
-            AppMap.tracing.delete(tracer)
-
-            events = tracer.events.map(&:to_h)
-
-            appmap_name = "#{req.request_method} #{req.path} (#{status}) - #{start_time.strftime('%T.%L')}"
-            appmap_file_name = AppMap::Util.scenario_filename([ start_time.to_f, req.url ].join('_'))
-            output_dir = File.join(AppMap::DEFAULT_APPMAP_DIR, 'requests')
-            appmap_file_path = File.join(output_dir, appmap_file_name)
-
-            metadata = AppMap.detect_metadata
-            metadata[:name] = appmap_name
-            metadata[:timestamp] = start_time.to_f
-            metadata[:recorder] = {
-              name: 'rack',
-              type: 'requests'
-            }
-    
-            appmap = {
-              version: AppMap::APPMAP_FORMAT_VERSION,
-              classMap: AppMap.class_map(tracer.event_methods),
-              metadata: metadata,
-              events: events
-            }
-
-            FileUtils.mkdir_p(output_dir)
-            File.write(appmap_file_path, JSON.generate(appmap))
-
-            headers['AppMap-Name'] = File.expand_path(appmap_name)
-            headers['AppMap-File-Name'] = File.expand_path(appmap_file_path)
-          end
+        record_request = lambda do |args|
+          return unless tracer
+
+          AppMap.tracing.delete(tracer)
+
+          status, headers = args
+          events = tracer.events.map(&:to_h)
+
+          event_fields = events.map(&:keys).flatten.map(&:to_sym).uniq.sort
+          return unless %i[http_server_request http_server_response].all? { |field| event_fields.include?(field) }
+
+          path = req.path.gsub(/\/{2,}/, '/') # Double slashes have been observed
+          appmap_name = "#{req.request_method} #{path} (#{status}) - #{start_time.strftime('%T.%L')}"
+          appmap_file_name = AppMap::Util.scenario_filename([ start_time.to_f, req.url ].join('_'))
+          output_dir = File.join(AppMap::DEFAULT_APPMAP_DIR, 'requests')
+          appmap_file_path = File.join(output_dir, appmap_file_name)
+
+          metadata = AppMap.detect_metadata
+          metadata[:name] = appmap_name
+          metadata[:timestamp] = start_time.to_f
+          metadata[:recorder] = {
+            name: 'rack',
+            type: 'requests'
+          }
+  
+          appmap = {
+            version: AppMap::APPMAP_FORMAT_VERSION,
+            classMap: AppMap.class_map(tracer.event_methods),
+            metadata: metadata,
+            events: events
+          }
+
+          FileUtils.mkdir_p(output_dir)
+          File.write(appmap_file_path, JSON.generate(appmap))
+
+          headers['AppMap-Name'] = File.expand_path(appmap_name)
+          headers['AppMap-File-Name'] = File.expand_path(appmap_file_path)
         end
+
+        @app.call(env).tap(&record_request)
       end
 
       def recording_state

data/lib/appmap/util.rb

@@ -86,6 +86,7 @@ module AppMap
       def sanitize_event(event, &block)
         event.delete(:thread_id)
         event.delete(:elapsed)
+        event.delete(:elapsed_instrumentation)
         delete_object_id = ->(obj) { (obj || {}).delete(:object_id) }
         delete_object_id.call(event[:receiver])
         delete_object_id.call(event[:return_value])
@@ -231,6 +232,10 @@ module AppMap
       def ruby_minor_version
         @ruby_minor_version ||= RUBY_VERSION.split('.')[0..1].join('.').to_f
       end
+
+      def gettime
+        Process.clock_gettime Process::CLOCK_MONOTONIC
+      end
     end
   end
 end

data/lib/appmap/version.rb

@@ -3,7 +3,7 @@
 module AppMap
   URL = 'https://github.com/applandinc/appmap-ruby'
 
-  VERSION = '0.92.1'
+  VERSION = '0.93.1'
 
   APPMAP_FORMAT_VERSION = '1.9.0'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appmap
 version: !ruby/object:Gem::Version
-  version: 0.92.1
+  version: 0.93.1
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-21 00:00:00.000000000 Z
+date: 2022-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: method_source