airbrake 8.1.1 → 8.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8819ab2225ac8b9224d2ee701aaf3815a1c18af8
-  data.tar.gz: 44e4c87574f7add4d6a71e5029ddd82e6f26847e
+  metadata.gz: 23d59d240ac51340e6085dbe50d6f42e910f5559
+  data.tar.gz: 1d656b05b2343324108a63a5d8af10b9401ce5c2
 SHA512:
-  metadata.gz: b1641b28731f4c05bee5863b3cd59563184a2a17c67c1805654127bf05dba293022f30bb2e1a44bd2da8188d9847fa5632b0eb6c41c3603041a3f23f932ce757
-  data.tar.gz: a0f83696463bc113eabf5f47cecb9ebc6aa3b23e191f8f83a8f8f1f93ba7d18c08bcaeeb75824bde742c3ca2642c25b53c367c8b9e0a509b088c0e7dcaecea2a
+  metadata.gz: 5662473402d0e4c6838927750cb45e6efc9b38f1dc74c605c1d54e3b300a36950f69b04cb79cb0cb627cfb16127d5268a3d3e4358df3f4b950a5abd733ca668f
+  data.tar.gz: 8dbdcbdd1c49fafd94f0c51fcd89fff87772ad39ed3bf82afdf249b42dec447fbafd41e979e99b271cbfde45d2f4a57c66fcc542187ddf6f4cdc10b1b96e2d1a

data/lib/airbrake/rack/middleware.rb

@@ -34,6 +34,10 @@ module Airbrake
         @notice_notifier = Airbrake.notifiers[:notice][notifier_name]
         @performance_notifier = Airbrake.notifiers[:performance][notifier_name]
 
+        # This object is shared among hooks. ActionControllerRouteSubscriber
+        # writes it and other hooks read it.
+        @routes = {}
+
         # Prevent adding same filters to the same notifier.
         return if @@known_notifiers.include?(notifier_name)
         @@known_notifiers << notifier_name
@@ -57,6 +61,9 @@ module Airbrake
         rescue Exception => ex
           notify_airbrake(ex, env)
           raise ex
+        ensure
+          # Clear routes for the next request.
+          @routes.clear
         end
         # rubocop:enable Lint/RescueException
 
@@ -101,13 +108,13 @@ module Airbrake
       def install_action_controller_hooks
         ActiveSupport::Notifications.subscribe(
           'start_processing.action_controller',
-          Airbrake::Rails::ActionControllerRouteSubscriber.new
+          Airbrake::Rails::ActionControllerRouteSubscriber.new(@routes)
         )
 
         ActiveSupport::Notifications.subscribe(
           'process_action.action_controller',
           Airbrake::Rails::ActionControllerNotifySubscriber.new(
-            @performance_notifier
+            @performance_notifier, @routes
           )
         )
       end
@@ -120,7 +127,9 @@ module Airbrake
         )
         ActiveSupport::Notifications.subscribe(
           'sql.active_record',
-          Airbrake::Rails::ActiveRecordSubscriber.new(@performance_notifier)
+          Airbrake::Rails::ActiveRecordSubscriber.new(
+            @performance_notifier, @routes
+          )
         )
       end
     end

data/lib/airbrake/rails/action_controller_notify_subscriber.rb

@@ -5,25 +5,28 @@ module Airbrake
     #
     # @since v8.0.0
     class ActionControllerNotifySubscriber
-      def initialize(notifier)
+      def initialize(notifier, routes)
         @notifier = notifier
+        @routes = routes
       end
 
       def call(*args)
-        return unless (route = Thread.current[:airbrake_rails_route])
+        return if @routes.none?
 
         event = ActiveSupport::Notifications::Event.new(*args)
         payload = event.payload
 
-        @notifier.notify(
-          Airbrake::Request.new(
-            method: payload[:method],
-            route: route,
-            status_code: find_status_code(payload),
-            start_time: event.time,
-            end_time: Time.new
+        @routes.each do |route, method|
+          @notifier.notify(
+            Airbrake::Request.new(
+              method: method,
+              route: route,
+              status_code: find_status_code(payload),
+              start_time: event.time,
+              end_time: Time.new
+            )
           )
-        )
+        end
       end
 
       private

data/lib/airbrake/rails/action_controller_route_subscriber.rb

@@ -5,7 +5,8 @@ module Airbrake
     #
     # @since v8.0.0
     class ActionControllerRouteSubscriber
-      def initialize
+      def initialize(routes)
+        @routes = routes
         @all_routes = nil
       end
 
@@ -17,8 +18,7 @@ module Airbrake
         event = ActiveSupport::Notifications::Event.new(*args)
         payload = event.payload
 
-        Thread.current[:airbrake_rails_route] = find_route(payload[:params])
-        Thread.current[:airbrake_rails_method] = payload[:method]
+        @routes[find_route(payload[:params])] = payload[:method]
       end
 
       private

data/lib/airbrake/rails/active_record_subscriber.rb

@@ -4,21 +4,24 @@ module Airbrake
     #
     # @since v8.1.0
     class ActiveRecordSubscriber
-      def initialize(notifier)
+      def initialize(notifier, routes)
         @notifier = notifier
+        @routes = routes
       end
 
       def call(*args)
         event = ActiveSupport::Notifications::Event.new(*args)
-        @notifier.notify(
-          Airbrake::Query.new(
-            route: Thread.current[:airbrake_rails_route],
-            method: Thread.current[:airbrake_rails_method],
-            query: event.payload[:sql],
-            start_time: event.time,
-            end_time: event.end
+        @routes.each do |route, method|
+          @notifier.notify(
+            Airbrake::Query.new(
+              route: route,
+              method: method,
+              query: event.payload[:sql],
+              start_time: event.time,
+              end_time: event.end
+            )
           )
-        )
+        end
       end
     end
   end

data/lib/airbrake/version.rb

@@ -1,5 +1,5 @@
 # We use Semantic Versioning v2.0.0
 # More information: http://semver.org/
 module Airbrake
-  AIRBRAKE_VERSION = '8.1.1'.freeze
+  AIRBRAKE_VERSION = '8.1.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: airbrake
 version: !ruby/object:Gem::Version
-  version: 8.1.1
+  version: 8.1.2
 platform: ruby
 authors:
 - Airbrake Technologies, Inc.