reusing the time instrumentation from the instrumenter rather than Benchmark. [#5098 state:open]

1 files changed, 7 insertions, 4 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
index be8d1bd76b..6072481411 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -199,11 +199,14 @@ module ActiveRecord
 
         def log(sql, name)
           name ||= "SQL"
-          result = nil
-          ActiveSupport::Notifications.instrument("sql.active_record",
-            :sql => sql, :name => name, :connection_id => self.object_id) do
-            @runtime += Benchmark.ms { result = yield }
+          instrumenter = ActiveSupport::Notifications.instrumenter
+
+          result = instrumenter.instrument("sql.active_record",
+            :sql => sql, :name => name, :connection_id => object_id) do
+            yield
           end
+          @runtime += instrumenter.elapsed
+
           result
         rescue Exception => e
           message = "#{e.class.name}: #{e.message}: #{sql}"