time_bandits 0.13.1 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e14e3f3974575197ad97649241f327dbf69824c354044bde8bd55ff421d9c21a
-  data.tar.gz: 4115bb4f9820a3227a62d6b4ea66c5f045c59cacb019fd89be71ff9da6b2f790
+  metadata.gz: 3597bdf1515a72122e85b16fffdcedc74a22c479012fa0fb2f7c42f64e0434de
+  data.tar.gz: a6acc865643fc97ce247b33fd55da8399323488435234d15d75766b26fc853c5
 SHA512:
-  metadata.gz: abc74cb6ae11bdf9388f8d113a3df89d61e6403cd614ebdd8d73aaa5be84c8a2d9d50d746b57a2eb4079140e1a34c9e1e3c172428e1065d15893ad94e99330b6
-  data.tar.gz: bd2347a6f49613abd7359524c1a08cb609acf501180b1deeb5b093318b664ff330c7a0bd8b2a577b1dee303d62ea8481162485b704d4f9041000cc58b3dd77a2
+  metadata.gz: c1451d6f063d1fd7feb18dd66c0650f10bf8398f7407fd4f3f7a63bef57a4bf52846267e8bf82c4e7295e41f1d999b70a16aadd1a08d1fc44fc9f174e18e74a4
+  data.tar.gz: cb1ff1654db60be898992d20a9b7b4825483033637147e94b8fc0192c2566ef096ce49f14b71f7ffd61a6524fa883030c78a69feb10eb90d012bca20321618a6

data/.github/workflows/run-tests.yml

@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby-version: [3.2.0, 3.1.3, 3.0.5, 2.7.7]
+        ruby-version: [3.2.2, 3.1.4, 3.0.6, 2.7.8]
 
     steps:
       - uses: actions/checkout@v3

data/Appraisals

@@ -1,10 +1,11 @@
 appraisals = [
-  "6.0.6",
-  "6.1.6",
+  "6.0.6.1",
+  "6.1.7.6",
+  "7.0.8",
+  "7.1.0"
 ]
 
 appraisals.insert(0, "5.2.8.1") if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.0.0")
-appraisals << "7.0.4" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.7.0")
 
 appraisals.each do |rails_version|
   %w(4.0 5.0).each do |redis_version|

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 0.14.1
+
+* Fixed that ActiveReccord metrics where only collected at log level DEBUG.
+
+## 0.14.0
+
+* Support Rails 7.1.0.
+
 ## 0.13.1
 * Fixed last place that tried to log a monotonic clock timestamp
   instead of a Time instance.

data/Gemfile

@@ -4,6 +4,3 @@ source "https://rubygems.org"
 gemspec
 
 gem "hiredis-client"
-
-# Use patched appraisal gem until it is fixed upstream.
-gem "appraisal", git: "https://github.com/thoughtbot/appraisal.git", ref: "0c855ae0da89fec74b4d1a01801c55b0e72496d4"

data/docker-compose.yml

@@ -3,7 +3,7 @@ version: '2'
 services:
   mysql:
     container_name: mysql
-    image: mysql:5.7
+    image: mysql:8
     ports:
       - "3601:3306"
     environment:

data/lib/time_bandits/monkey_patches/active_record/log_subscriber.rb

@@ -0,0 +1,77 @@
+# This file monkey patches class ActiveRecord::LogSubscriber to count
+# the number of sql statements being executed and the number of query
+# cache hits, but is only used for Rails versions before 7.1.0.
+
+require "active_record/log_subscriber"
+
+module ActiveRecord
+  class LogSubscriber
+    IGNORE_PAYLOAD_NAMES = ["SCHEMA", "EXPLAIN"] unless defined?(IGNORE_PAYLOAD_NAMES)
+
+    def self.call_count=(value)
+      Thread.current.thread_variable_set(:active_record_sql_call_count, value)
+    end
+
+    def self.call_count
+      Thread.current.thread_variable_get(:active_record_sql_call_count) ||
+        Thread.current.thread_variable_set(:active_record_sql_call_count, 0)
+    end
+
+    def self.query_cache_hits=(value)
+      Thread.current.thread_variable_set(:active_record_sql_query_cache_hits, value)
+    end
+
+    def self.query_cache_hits
+      Thread.current.thread_variable_get(:active_record_sql_query_cache_hits) ||
+        Thread.current.thread_variable_set(:active_record_sql_query_cache_hits, 0)
+    end
+
+    def self.reset_call_count
+      calls = call_count
+      self.call_count = 0
+      calls
+    end
+
+    def self.reset_query_cache_hits
+      hits = query_cache_hits
+      self.query_cache_hits = 0
+      hits
+    end
+
+    remove_method :sql
+    def sql(event)
+      payload = event.payload
+
+      self.class.runtime += event.duration
+      self.class.call_count += 1
+      self.class.query_cache_hits += 1 if payload[:cached] || payload[:name] == "CACHE"
+
+      return unless logger.debug?
+
+      return if IGNORE_PAYLOAD_NAMES.include?(payload[:name])
+
+      log_sql_statement(payload, event)
+    end
+
+   private
+    def log_sql_statement(payload, event)
+      name  = "#{payload[:name]} (#{event.duration.round(1)}ms)"
+      name  = "CACHE #{name}" if payload[:cached]
+      sql   = payload[:sql]
+      binds = nil
+
+      unless (payload[:binds] || []).empty?
+        casted_params = type_casted_binds(payload[:type_casted_binds])
+        binds = "  " + payload[:binds].zip(casted_params).map { |attr, value|
+          render_bind(attr, value)
+        }.inspect
+      end
+
+      name = colorize_payload_name(name, payload[:name])
+      sql  = color(sql, sql_color(sql), true)
+
+      debug "  #{name}  #{sql}#{binds}"
+    end
+  end
+
+end

data/lib/time_bandits/monkey_patches/active_record/railties/controller_runtime.rb

@@ -0,0 +1,29 @@
+require "active_record/railties/controller_runtime"
+
+module ActiveRecord
+  module Railties
+    module ControllerRuntime
+      remove_method :cleanup_view_runtime
+      def cleanup_view_runtime
+        # this method has been redefined to do nothing for activerecord on purpose
+        super
+      end
+
+      remove_method :append_info_to_payload
+      def append_info_to_payload(payload)
+        super
+        if ActiveRecord::Base.connected?
+          payload[:db_runtime] = TimeBandits::TimeConsumers::Database.instance.consumed
+        end
+      end
+
+      module ClassMethods
+        # this method has been redefined to do nothing for activerecord on purpose
+        remove_method :log_process_action
+        def log_process_action(payload)
+          super
+        end
+      end
+    end
+  end
+end

data/lib/time_bandits/monkey_patches/active_record/runtime_registry.rb

@@ -0,0 +1,50 @@
+# This file monkey patches class ActiveRecord::RuntimeRegistry to
+# additionally store call counts and cache hits and subscribes an
+# event listener to manage those counters.
+
+require "active_record/runtime_registry"
+
+module ActiveRecord
+  module RuntimeRegistry
+
+    def self.call_count
+      ActiveSupport::IsolatedExecutionState[:active_record_sql_call_count] ||= 0
+    end
+
+    def self.call_count=(value)
+      ActiveSupport::IsolatedExecutionState[:active_record_sql_call_count] = value
+    end
+
+    def self.query_cache_hits
+      ActiveSupport::IsolatedExecutionState[:active_record_sql_query_cache_hits] ||= 0
+    end
+
+    def self.query_cache_hits=(value)
+      ActiveSupport::IsolatedExecutionState[:active_record_sql_query_cache_hits] = value
+    end
+
+    alias_method :reset_runtime, :reset
+    alias_method :runtime, :sql_runtime
+    alias_method :runtime=, :sql_runtime=
+
+    def self.reset_call_count
+      calls = call_count
+      self.call_count = 0
+      calls
+    end
+
+    def self.reset_query_cache_hits
+      hits = query_cache_hits
+      self.query_cache_hits = 0
+      hits
+    end
+
+  end
+end
+
+require "active_support/notifications"
+
+ActiveSupport::Notifications.subscribe("sql.active_record") do |event|
+  ActiveRecord::RuntimeRegistry.call_count += 1
+  ActiveRecord::RuntimeRegistry.query_cache_hits += 1 if event.payload[:cached]
+end

data/lib/time_bandits/monkey_patches/active_record.rb

@@ -1,105 +1,6 @@
-# this file monkey patches class ActiveRecord::LogSubscriber
-# to count the number of sql statements being executed
-# and the number of query cache hits
-# it needs to be adapted to each new rails version
-
-require "active_record/log_subscriber"
-
-module ActiveRecord
-  class LogSubscriber
-    IGNORE_PAYLOAD_NAMES = ["SCHEMA", "EXPLAIN"] unless defined?(IGNORE_PAYLOAD_NAMES)
-
-    def self.call_count=(value)
-      Thread.current.thread_variable_set(:active_record_sql_call_count, value)
-    end
-
-    def self.call_count
-      Thread.current.thread_variable_get(:active_record_sql_call_count) ||
-        Thread.current.thread_variable_set(:active_record_sql_call_count, 0)
-    end
-
-    def self.query_cache_hits=(value)
-      Thread.current.thread_variable_set(:active_record_sql_query_cache_hits, value)
-    end
-
-    def self.query_cache_hits
-      Thread.current.thread_variable_get(:active_record_sql_query_cache_hits) ||
-        Thread.current.thread_variable_set(:active_record_sql_query_cache_hits, 0)
-    end
-
-    def self.reset_call_count
-      calls = call_count
-      self.call_count = 0
-      calls
-    end
-
-    def self.reset_query_cache_hits
-      hits = query_cache_hits
-      self.query_cache_hits = 0
-      hits
-    end
-
-    remove_method :sql
-    def sql(event)
-      payload = event.payload
-
-      self.class.runtime += event.duration
-      self.class.call_count += 1
-      self.class.query_cache_hits += 1 if payload[:cached] || payload[:name] == "CACHE"
-
-      return unless logger.debug?
-
-      return if IGNORE_PAYLOAD_NAMES.include?(payload[:name])
-
-      log_sql_statement(payload, event)
-    end
-
-    private
-    def log_sql_statement(payload, event)
-      name  = "#{payload[:name]} (#{event.duration.round(1)}ms)"
-      name  = "CACHE #{name}" if payload[:cached]
-      sql   = payload[:sql]
-      binds = nil
-
-      unless (payload[:binds] || []).empty?
-        casted_params = type_casted_binds(payload[:type_casted_binds])
-        binds = "  " + payload[:binds].zip(casted_params).map { |attr, value|
-          render_bind(attr, value)
-        }.inspect
-      end
-
-      name = colorize_payload_name(name, payload[:name])
-      sql  = color(sql, sql_color(sql), true)
-
-      debug "  #{name}  #{sql}#{binds}"
-    end
-  end
-
-  require "active_record/railties/controller_runtime"
-
-  module Railties
-    module ControllerRuntime
-      remove_method :cleanup_view_runtime
-      def cleanup_view_runtime
-        # this method has been redefined to do nothing for activerecord on purpose
-        super
-      end
-
-      remove_method :append_info_to_payload
-      def append_info_to_payload(payload)
-        super
-        if ActiveRecord::Base.connected?
-          payload[:db_runtime] = TimeBandits::TimeConsumers::Database.instance.consumed
-        end
-      end
-
-      module ClassMethods
-        # this method has been redefined to do nothing for activerecord on purpose
-        remove_method :log_process_action
-        def log_process_action(payload)
-          super
-        end
-      end
-    end
-  end
+if Gem::Version.new(ActiveRecord::VERSION::STRING) < Gem::Version.new("7.1.0")
+  require_relative "active_record/log_subscriber"
+else
+  require_relative "active_record/runtime_registry"
 end
+require_relative "active_record/railties/controller_runtime"

data/lib/time_bandits/time_consumers/database.rb

@@ -13,6 +13,18 @@ module TimeBandits
       fields :time, :calls, :sql_query_cache_hits
       format "ActiveRecord: %.3fms(%dq,%dh)", :time, :calls, :sql_query_cache_hits
 
+      class << self
+        if Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new("7.1.0")
+          def metrics_store
+            ActiveRecord::RuntimeRegistry
+          end
+        else
+          def metrics_store
+            ActiveRecord::LogSubscriber
+          end
+        end
+      end
+
       def reset
         reset_stats
         super
@@ -27,13 +39,13 @@ module TimeBandits
       end
 
       def current_runtime
-        Database.instance.time + ActiveRecord::LogSubscriber.runtime
+        Database.instance.time + self.class.metrics_store.runtime
       end
 
       private
 
       def reset_stats
-        s = ActiveRecord::LogSubscriber
+        s = self.class.metrics_store
         hits  = s.reset_query_cache_hits
         calls = s.reset_call_count
         time  = s.reset_runtime

data/lib/time_bandits/version.rb

@@ -1,3 +1,3 @@
 module TimeBandits
-  VERSION = "0.13.1"
+  VERSION = "0.14.1"
 end

data/test/test_helper.rb

@@ -23,6 +23,7 @@ ActiveSupport::LogSubscriber.logger =::Logger.new("/dev/null")
 # fake Rails
 module Rails
   extend self
+  ActiveSupport::Cache.format_version = 7.1 if Gem::Version.new(ActiveSupport::VERSION::STRING) >= Gem::Version.new("7.1.0")
   def cache
     @cache ||= ActiveSupport::Cache.lookup_store(:mem_cache_store)
   end

data/test/unit/database_test.rb

@@ -10,6 +10,15 @@ class DatabaseTest < Test::Unit::TestCase
     TimeBandits.reset
     @old_logger = ActiveRecord::Base.logger
     ActiveRecord::Base.logger = Logger.new($stdout)
+    ActiveRecord::Base.logger.level = Logger::DEBUG
+
+    ActiveRecord::Base.establish_connection(
+      adapter:  "mysql2",
+      username: "root",
+      encoding: "utf8",
+      host: ENV['MYSQL_HOST'] || "127.0.0.1",
+      port: (ENV['MYSQL_PORT'] || 3601).to_i
+    )
   end
 
   def teardown
@@ -28,18 +37,18 @@ class DatabaseTest < Test::Unit::TestCase
   end
 
   test "formatting" do
-    log_subscriber.runtime += 1.234
-    log_subscriber.call_count += 3
-    log_subscriber.query_cache_hits += 1
+    metrics_store.runtime += 1.234
+    metrics_store.call_count += 3
+    metrics_store.query_cache_hits += 1
     TimeBandits.consumed
     assert_equal "ActiveRecord: 1.234ms(3q,1h)", TimeBandits.runtime
   end
 
   test "accessing current runtime" do
-    log_subscriber.runtime += 1.234
+    metrics_store.runtime += 1.234
     assert_equal 1.234, TimeBandits.consumed
-    assert_equal 0, log_subscriber.runtime
-    log_subscriber.runtime += 4.0
+    assert_equal 0, metrics_store.runtime
+    metrics_store.runtime += 4.0
     assert_equal 5.234, bandit.current_runtime
     assert_equal "ActiveRecord: 1.234ms(0q,0h)", TimeBandits.runtime
   end
@@ -52,12 +61,38 @@ class DatabaseTest < Test::Unit::TestCase
     assert_nil log_subscriber.new.sql(event)
   end
 
+  test "instrumentation records runtimes at log level debug" do
+    ActiveRecord::Base.logger.stubs(:debug)
+    ActiveRecord::Base.connection.execute "SELECT 1"
+    bandit.consumed
+    assert(bandit.current_runtime > 0)
+    # 2 calls, because one configures the connection
+    assert_equal 2, bandit.calls
+    assert_equal 0, bandit.sql_query_cache_hits
+  end
+
+  test "instrumentation records runtimes at log level error" do
+    skip if Gem::Version.new(ActiveRecord::VERSION::STRING) < Gem::Version.new("7.1.0")
+    ActiveRecord::Base.logger.level = Logger::ERROR
+    ActiveRecord::LogSubscriber.expects(:sql).never
+    ActiveRecord::Base.connection.execute "SELECT 1"
+    bandit.consumed
+    assert(bandit.current_runtime > 0)
+    # 2 calls, because one configures the connection
+    assert_equal 2, bandit.calls
+    assert_equal 0, bandit.sql_query_cache_hits
+  end
+
   private
 
   def bandit
     TimeBandits::TimeConsumers::Database.instance
   end
 
+  def metrics_store
+    TimeBandits::TimeConsumers::Database.metrics_store
+  end
+
   def log_subscriber
     ActiveRecord::LogSubscriber
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: time_bandits
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.14.1
 platform: ruby
 authors:
 - Stefan Kaes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-28 00:00:00.000000000 Z
+date: 2023-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thread_variables
@@ -240,6 +240,9 @@ files:
 - lib/time_bandits.rb
 - lib/time_bandits/monkey_patches/action_controller.rb
 - lib/time_bandits/monkey_patches/active_record.rb
+- lib/time_bandits/monkey_patches/active_record/log_subscriber.rb
+- lib/time_bandits/monkey_patches/active_record/railties/controller_runtime.rb
+- lib/time_bandits/monkey_patches/active_record/runtime_registry.rb
 - lib/time_bandits/monkey_patches/memcache-client.rb
 - lib/time_bandits/monkey_patches/memcached.rb
 - lib/time_bandits/monkey_patches/redis.rb
@@ -289,7 +292,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Custom performance logging for Rails