Merge pull request rails#51000 from Shopify/fix-race-condition

Fix a race condition in FutureResult#instrument

Author: byroot

activerecord/lib/active_record/future_result.rb

@@ -32,8 +32,11 @@ def initialize(future_result, instrumenter)
 
       def instrument(name, payload = {}, &block)
         event = @instrumenter.new_event(name, payload)
-        @events << event
-        event.record(&block)
+        begin
+          event.record(&block)
+        ensure
+          @events << event
+        end
       end
 
       def flush