appmap 0.85.0 → 0.88.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 002b026a3ee8b2e89a073906212e694f296dcc0666db8450c9051bab372550b2
-  data.tar.gz: 743adc87f3f3ae044c7da5d3040be48f79db21bf5d9861b60ec32f84ba39bc19
+  metadata.gz: 22745bf509f674a271a3bc42eb870813cf22d6e0c399a87e99377311a0ddaf67
+  data.tar.gz: 482036f94bc62a732263ac7318e6c942efd22282d9b2ace1ae1245bda28de591
 SHA512:
-  metadata.gz: 6af49c4b8155df95b38edf948217eedfa785151c7d3b6997cee8f0ba5971444c755a1e189a12fffdd640e1ec7e12316bd3a5e70d82e047d1dba4c2873040e5a1
-  data.tar.gz: e5af21dd5198c5291cdcd8da036b54c31c59178c17ccda863e4653aab7efb9a5392325226f90ef973f99107d8a44d24870dab3417d6b50c001ae4d325f50f30a
+  metadata.gz: dd9fe2dc676c639487b19c5ad4c10e52d8dd1ff95ef10f0829077fc6a4100613d220df7bb8aea5c425e65158617112148827136bc2151cfd8e0a13666e49c347
+  data.tar.gz: 5913ce200514ce676f26a6bf20e348fe9481ecd929ac9b8a5874b9f2e2d20d3bdc82722a535afebe7a153c7a7290ccf8e8e510a336f0b5d7265b6b3665b18a69

data/CHANGELOG.md

@@ -1,3 +1,29 @@
+# [0.88.0](https://github.com/applandinc/appmap-ruby/compare/v0.87.0...v0.88.0) (2022-08-31)
+
+
+### Bug Fixes
+
+* Allow recording of error responses ([e538556](https://github.com/applandinc/appmap-ruby/commit/e5385560cbbab2d27ce6c0a1620d5c7539e0d985))
+
+
+### Features
+
+* Add HTTP server request support for Rails 7 ([bd7f6c9](https://github.com/applandinc/appmap-ruby/commit/bd7f6c9109ee6c850250016276c8fbb6a8a66a2e))
+
+# [0.87.0](https://github.com/applandinc/appmap-ruby/compare/v0.86.0...v0.87.0) (2022-08-19)
+
+
+### Features
+
+* Improve performance of initial hooking ([901e262](https://github.com/applandinc/appmap-ruby/commit/901e26237027920ede6b0f9d4bc3d175c861b23a))
+
+# [0.86.0](https://github.com/applandinc/appmap-ruby/compare/v0.85.0...v0.86.0) (2022-08-10)
+
+
+### Features
+
+* Don't record rspec test when appmap: false ([09c4a24](https://github.com/applandinc/appmap-ruby/commit/09c4a249c7446c6aebcc1d462d3d7b35817334fc))
+
 # [0.85.0](https://github.com/applandinc/appmap-ruby/compare/v0.84.0...v0.85.0) (2022-08-08)
 
 

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

@@ -73,8 +73,8 @@ module AppMap
           class << self
             def build_from_invocation(parent_id, return_value, elapsed, response, event: HTTPServerResponse.new)
               event ||= HTTPServerResponse.new
-              event.status = response.status
-              event.headers = response.headers.dup
+              event.status = response[:status] || response.status
+              event.headers = (response[:headers] || response.headers).dup
               AppMap::Event::MethodReturn.build_from_invocation parent_id, return_value, nil, elapsed: elapsed, event: event, parameter_schema: true
             end
           end
@@ -114,6 +114,46 @@ module AppMap
             AppMap.tracing.record_event return_event
           end
         end
+
+        # RequestListener listens to the 'start_processing.action_controller' notification as a
+        # source of HTTP server request events. A strategy other than HookMethod is required for
+        # Rails >= 7 due to the hooked methods visibility dropping to private.
+        class RequestListener
+          def self.begin_request(_name, _started, _finished, _unique_id, payload)
+            RequestListener.new(payload)
+          end
+
+          protected
+
+          def initialize(payload)
+            @request_id = payload[:request].request_id
+            @subscriber = self.class.instance_method(:after_hook).bind(self)
+
+            ActiveSupport::Notifications.subscribe 'process_action.action_controller', @subscriber
+            before_hook payload
+          end
+
+          def before_hook(payload)
+            @call_event = HTTPServerRequest.new payload[:request]
+            AppMap.tracing.record_event @call_event
+          end
+
+          def after_hook(_name, started, finished, _unique_id, payload)
+            return unless @request_id == payload[:request].request_id
+
+            return_value = Thread.current[TEMPLATE_RENDER_VALUE]
+            Thread.current[TEMPLATE_RENDER_VALUE] = nil
+            return_event = HTTPServerResponse.build_from_invocation(
+              @call_event.id,
+              return_value,
+              finished - started,
+              payload[:response] || payload
+            )
+
+            AppMap.tracing.record_event return_event
+            ActiveSupport::Notifications.unsubscribe(@subscriber)
+          end
+        end
       end
     end
   end

data/lib/appmap/hook.rb

@@ -183,12 +183,6 @@ module AppMap
 
       hook = lambda do |hook_cls|
         lambda do |method_id|
-          # Don't try and trace the AppMap methods or there will be
-          # a stack overflow in the defined hook method.
-          next if %w[Marshal AppMap ActiveSupport].member?((hook_cls&.name || '').split('::')[0])
-
-          next if method_id == :call
-
           method = \
             begin
               hook_cls.instance_method(method_id)
@@ -197,6 +191,16 @@ module AppMap
               next
             end
 
+          package = config.lookup_package(hook_cls, method)
+          # doing this check first returned early in 98.7% of cases in sample_app_6th_ed
+          next unless package
+
+          # Don't try and trace the AppMap methods or there will be
+          # a stack overflow in the defined hook method.
+          next if %w[Marshal AppMap ActiveSupport].member?((hook_cls&.name || '').split('::')[0])
+
+          next if method_id == :call
+
           next if self.class.already_hooked?(method)
 
           warn "AppMap: Examining #{hook_cls} #{method.name}" if LOG
@@ -206,9 +210,6 @@ module AppMap
           # TODO: Figure out how to tell the difference?
           next unless disasm
 
-          package = config.lookup_package(hook_cls, method)
-          next unless package
-
           package.handler_class.new(package, hook_cls, method).activate
         end
       end

data/lib/appmap/railtie.rb

@@ -18,7 +18,15 @@ module AppMap
       ActiveSupport::Notifications.subscribe 'sql.sequel', AppMap::Handler::Rails::SQLHandler.new
       ActiveSupport::Notifications.subscribe 'sql.active_record', AppMap::Handler::Rails::SQLHandler.new
 
-      AppMap::Handler::Rails::RequestHandler::HookMethod.new.activate
+      http_hook_available = ActionController::Instrumentation.public_instance_methods.include?(:process_action)
+      if http_hook_available
+        AppMap::Handler::Rails::RequestHandler::HookMethod.new.activate
+      else
+        ActiveSupport::Notifications.subscribe(
+          'start_processing.action_controller',
+          AppMap::Handler::Rails::RequestHandler::RequestListener.method(:begin_request)
+        )
+      end
     end
   end
 end if ENV['APPMAP'] == 'true'

data/lib/appmap/rspec.rb

@@ -157,14 +157,20 @@ module AppMap
         AppMap.info 'Configuring AppMap recorder for RSpec' if first_recording?
         @recording_count += 1
 
-        @recordings_by_example[example.object_id] = Recording.new(example)
+        recording = if example.metadata[:appmap] != false
+          Recording.new(example)
+        else
+          :false
+        end
+
+        @recordings_by_example[example.object_id] = recording
       end
 
       def end_spec(example, exception:)
         recording = @recordings_by_example.delete(example.object_id)
         return warn "No recording found for #{example}" unless recording
 
-        recording.finish exception
+        recording.finish exception unless recording == :false
       end
 
       def config

data/lib/appmap/version.rb

@@ -3,7 +3,7 @@
 module AppMap
   URL = 'https://github.com/applandinc/appmap-ruby'
 
-  VERSION = '0.85.0'
+  VERSION = '0.88.0'
 
   APPMAP_FORMAT_VERSION = '1.7.0'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appmap
 version: !ruby/object:Gem::Version
-  version: 0.85.0
+  version: 0.88.0
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-08 00:00:00.000000000 Z
+date: 2022-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: method_source