Add time to query counter (#22)

Author: jeffcarbs

.rubocop_todo.yml

@@ -8,7 +8,7 @@
 
 # Offense count: 2
 Metrics/AbcSize:
-  Max: 19
+  Max: 20
 
 # Offense count: 3
 # Configuration parameters: CountComments, ExcludedMethods.

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.5.0] - 2020-07-23
+### Changed
+- Add time information to query counter
+
 ## [0.4.0] - 2020-07-20
 ### Changed
 - Upgrade the Rails dependency to allow for Rails 6.1
@@ -23,7 +27,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - First versions as a public ruby gem.
 
-[Unreleased]: https://github.com/gusto/ar-query-matchers/compare/v0.4.0...HEAD
+[Unreleased]: https://github.com/gusto/ar-query-matchers/compare/v0.5.0...HEAD
+[0.5.0]: https://github.com/gusto/ar-query-matchers/releases/tag/v0.5.0
 [0.4.0]: https://github.com/gusto/ar-query-matchers/releases/tag/v0.4.0
 [0.3.0]: https://github.com/gusto/ar-query-matchers/releases/tag/v0.3.0
 [0.2.0]: https://github.com/gusto/ar-query-matchers/releases/tag/v0.2.0

VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

lib/ar_query_matchers.rb

@@ -3,6 +3,7 @@
 require 'ar_query_matchers/queries/create_counter'
 require 'ar_query_matchers/queries/load_counter'
 require 'ar_query_matchers/queries/update_counter'
+require 'bigdecimal'
 
 module ArQueryMatchers
   module ArQueryMatchers

lib/ar_query_matchers/queries/query_counter.rb

@@ -62,7 +62,7 @@ def initialize(query_filter)
       # @param [block] block to instrument
       # @return [QueryStats] stats about all the SQL queries executed during the block
       def instrument(&block)
-        queries = Hash.new { |h, k| h[k] = { count: 0, lines: [] } }
+        queries = Hash.new { |h, k| h[k] = { count: 0, lines: [], time: BigDecimal(0) } }
         ActiveSupport::Notifications.subscribed(to_proc(queries), 'sql.active_record', &block)
         QueryStats.new(queries)
       end
@@ -75,7 +75,7 @@ def instrument(&block)
       private_constant :MARGINALIA_SQL_COMMENT_PATTERN
 
       def to_proc(queries)
-        lambda do |_name, _start, _finish, _message_id, payload|
+        lambda do |_name, start, finish, _message_id, payload|
           return if payload[:cached]
 
           # Given a `sql.active_record` event, figure out which model is being
@@ -87,6 +87,7 @@ def to_proc(queries)
             comment = payload[:sql].match(MARGINALIA_SQL_COMMENT_PATTERN)
             queries[model_name][:lines] << comment[:line] if comment
             queries[model_name][:count] += 1
+            queries[model_name][:time] += (finish - start).round(6) # Round to microseconds
           end
         end
       end