appmap 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ae8f99b6edb988e9ec0e6e3ee31967d754ece4edf7dce0b34d025ff20dcabc9
-  data.tar.gz: 77311214bb3064101a08664e794550cdcb4759c15a6739780f3aafe76f19bdb2
+  metadata.gz: ef590ede8fe883183358cb975bb4531c07ee332de2708bfce4743c4cfc0c7f15
+  data.tar.gz: 23d4c0d3c7fa26d5c298186d3e8c9e6318ffe8aa265dcd55358a02ace656db04
 SHA512:
-  metadata.gz: c4ea141233301848f5de54bce11a59a69545f364e82dc984c4e6588088350a0ca5f1479acbc4595829c90bf0533ae17aea53b067da9f11bd1488c53b3068ebc6
-  data.tar.gz: 0c3486071282f8edfbca7bedd3e72efd0f77753c721e48f2e375f65ed8c57c2b8d29558cf0f4d8805309e243f1805417a9d6c66126003124831b2a4f03879343
+  metadata.gz: 2dcfac0480a1e5cf59be2bfa03614d141135d1e2a06010e494fd8807e58803b2361627cd861a038cc4ea7b1e21013628ae04e4a75fadc7df877c9c143d5a8f5d
+  data.tar.gz: bb9dadf2e3dae77b280497223544ffe84f9fed42cb742ea021e049be311a07f5e79b5715a59c523ff4ca7fff9ed37db301f243b5d6a722cde5d5b44ad8c98fc1

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.0.1](https://github.com/getappmap/appmap-ruby/compare/v1.0.0...v1.0.1) (2024-04-30)
+
+
+### Bug Fixes
+
+* Handle exceptions in app.matches? ([0e9db0d](https://github.com/getappmap/appmap-ruby/commit/0e9db0dc6d574785865c8883a85f011635fa1495)), closes [#358](https://github.com/getappmap/appmap-ruby/issues/358)
+
 # [1.0.0](https://github.com/getappmap/appmap-ruby/compare/v0.103.0...v1.0.0) (2024-02-06)
 
 

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

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require 'appmap/event'
-require 'appmap/hook'
-require 'appmap/util'
-require 'appmap/handler/rails/context'
+require "appmap/event"
+require "appmap/hook"
+require "appmap/util"
+require "appmap/handler/rails/context"
+require "appmap/handler/rails/test_route"
 
 module AppMap
   module Handler
     module Rails
-
       module RequestHandler
         class HTTPServerRequest < AppMap::Event::MethodEvent
           attr_accessor :normalized_path_info, :request_method, :path_info, :params, :headers, :call_elapsed_instrumentation
@@ -19,7 +19,7 @@ module AppMap
             self.request_method = request.request_method
             self.normalized_path_info = normalized_path(request)
             self.headers = AppMap::Util.select_rack_headers(request.env)
-            self.path_info = request.path_info.split('?')[0]
+            self.path_info = request.path_info.split("?")[0]
             # ActionDispatch::Http::ParameterFilter is deprecated
             parameter_filter_cls = \
               if defined?(ActiveSupport::ParameterFilter)
@@ -36,7 +36,7 @@ module AppMap
                 request_method: request_method,
                 path_info: path_info,
                 normalized_path_info: normalized_path_info,
-                headers: headers,
+                headers: headers
               }.compact
 
               unless Util.blank?(params)
@@ -46,7 +46,7 @@ module AppMap
                     name: key,
                     class: val.class.name,
                     value: self.class.display_string(val),
-                    object_id: val.__id__,
+                    object_id: val.__id__
                   }.tap do |message|
                     AppMap::Event::MethodEvent.add_schema message, val
                   end
@@ -60,9 +60,12 @@ module AppMap
           def normalized_path(request, router = ::Rails.application.routes.router)
             # use a cloned environment because the router can modify it
             request = ActionDispatch::Request.new request.env.clone
+
             router.recognize request do |route, _|
               app = route.app
-              next unless app.matches? request
+
+              next unless Rails.test_route(app, request)
+
               return normalized_path request, app.rack_app.routes.router if app.engine?
 
               return AppMap::Util.swaggerize_path(route.path.spec.to_s)
@@ -113,19 +116,19 @@ module AppMap
             req = receiver.request
             return unless Context.create req.env
 
-            before_hook_start_time = AppMap::Util.gettime()
+            before_hook_start_time = AppMap::Util.gettime
             call_event = HTTPServerRequest.new(req)
-            call_event.call_elapsed_instrumentation = (AppMap::Util.gettime() - before_hook_start_time)
+            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()
+            after_hook_start_time = AppMap::Util.gettime
             return_event = HTTPServerResponse.build_from_invocation \
               call_event.id, Context.new.find_template_render_value, elapsed, receiver.response
-            return_event.elapsed_instrumentation = (AppMap::Util.gettime() - after_hook_start_time) + call_event.call_elapsed_instrumentation
+            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
             Context.remove receiver.request.env
@@ -191,28 +194,28 @@ module AppMap
             @request_id = payload[:request].request_id
             @subscriber = self.class.instance_method(:after_hook).bind(self)
 
-            ActiveSupport::Notifications.subscribe 'process_action.action_controller', @subscriber
+            ActiveSupport::Notifications.subscribe "process_action.action_controller", @subscriber
             before_hook payload
           end
 
           def before_hook(payload)
-            before_hook_start_time = AppMap::Util.gettime()
+            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)
+            @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()
+            after_hook_start_time = AppMap::Util.gettime
             return_event = HTTPServerResponse.build_from_invocation(
               @call_event.id,
               Context.new.find_template_render_value,
               finished - started,
               payload[:response] || payload
             )
-            return_event.elapsed_instrumentation = (AppMap::Util.gettime() - after_hook_start_time) + @call_event.call_elapsed_instrumentation
+            return_event.elapsed_instrumentation = (AppMap::Util.gettime - after_hook_start_time) + @call_event.call_elapsed_instrumentation
 
             AppMap.tracing.record_event return_event
             Context.remove payload[:request].env

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

@@ -0,0 +1,26 @@
+module AppMap
+  module Handler
+    module Rails
+      class << self
+        def test_route(app, request)
+          app.matches?(request)
+        rescue
+          test_route_warn(request)
+          false
+        end
+
+        protected
+
+        @test_route_warned = false
+
+        def test_route_warn(request)
+          return if @test_route_warned
+
+          @test_route_warned = true
+          warn "Notice: Failed to match route for #{request&.path_info || "an unknown path"}: #{$ERROR_INFO}"
+          warn "Notice: A solution for this problem is forthcoming, see https://github.com/getappmap/appmap-ruby/issues/360"
+        end
+      end
+    end
+  end
+end

data/lib/appmap/version.rb

@@ -3,7 +3,7 @@
 module AppMap
   URL = 'https://github.com/applandinc/appmap-ruby'
 
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 
   APPMAP_FORMAT_VERSION = '1.12.0'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appmap
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-02-06 00:00:00.000000000 Z
+date: 2024-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: method_source
@@ -305,7 +305,6 @@ extensions:
 extra_rdoc_files: []
 files:
 - ".dockerignore"
-- ".github/workflows/main.yml"
 - ".gitignore"
 - ".nvmrc"
 - ".rbenv-gemsets"
@@ -398,6 +397,7 @@ files:
 - lib/appmap/handler/rails/request_handler.rb
 - lib/appmap/handler/rails/sql_handler.rb
 - lib/appmap/handler/rails/template.rb
+- lib/appmap/handler/rails/test_route.rb
 - lib/appmap/hook.rb
 - lib/appmap/hook/method.rb
 - lib/appmap/hook/method/ruby2.rb

data/.github/workflows/main.yml

@@ -1,16 +0,0 @@
-name: Add new issues to project tracker
-
-on:
-  issues:
-    types:
-      - opened
-
-jobs:
-  add-to-project:
-    name: Add issue to project
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/add-to-project@main
-        with:
-          project-url: https://github.com/orgs/getappmap/projects/15
-          github-token: ${{ secrets.ADD_TO_PROJECT_BOARD_PAT }}