time_bandits 0.14.1 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3597bdf1515a72122e85b16fffdcedc74a22c479012fa0fb2f7c42f64e0434de
-  data.tar.gz: a6acc865643fc97ce247b33fd55da8399323488435234d15d75766b26fc853c5
+  metadata.gz: 56bb0eb9adc75541319ab152fee15ca29bb60d92135a85e2dee0dc192334c03e
+  data.tar.gz: 51c3edf811d144bd2221d57994b1a53ccbbe92228a42252628037d1cae8b3113
 SHA512:
-  metadata.gz: c1451d6f063d1fd7feb18dd66c0650f10bf8398f7407fd4f3f7a63bef57a4bf52846267e8bf82c4e7295e41f1d999b70a16aadd1a08d1fc44fc9f174e18e74a4
-  data.tar.gz: cb1ff1654db60be898992d20a9b7b4825483033637147e94b8fc0192c2566ef096ce49f14b71f7ffd61a6524fa883030c78a69feb10eb90d012bca20321618a6
+  metadata.gz: 5a020882e44e5b0244b2a426b31cfa855b4aa4c4cb2fb3b7e0c2e9b7a9bf37eb4a4ccb86484b8e851e7902fe5afc4e3a6a7f2803a47de0d5b286055ba5db3edc
+  data.tar.gz: e74877201e8880fd4eb0d5e52728badcb0dfd89b8b9429cde69dacae7ba5afcef4b3d82ea016f2c342139f3f6447e07f96b8c35b68e03195ff65bdabb8a90367

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

@@ -13,13 +13,13 @@ jobs:
 
     strategy:
       matrix:
-        ruby-version: [3.2.2, 3.1.4, 3.0.6, 2.7.8]
+        ruby-version: [3.3.1, 3.2.4, 3.1.5, 3.0.7]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Start containers
-        run: docker-compose -f docker-compose.yml up -d
+        run: docker compose -f docker-compose.yml up -d
 
       - name: Set up Ruby ${{ matrix.ruby-version }}
         uses: ruby/setup-ruby@v1
@@ -43,4 +43,4 @@ jobs:
 
       - name: Stop containers
         if: always()
-        run: docker-compose -f "docker-compose.yml" down
+        run: docker compose -f "docker-compose.yml" down

data/Appraisals

@@ -1,11 +1,12 @@
 appraisals = [
-  "6.0.6.1",
-  "6.1.7.6",
-  "7.0.8",
-  "7.1.0"
+  "6.1.7.8",
+  "7.0.8.4",
+  "7.1.3.4",
 ]
 
-appraisals.insert(0, "5.2.8.1") if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.0.0")
+if RUBY_VERSION >= "3.1"
+  appraisals << "7.2.0.rc1"
+end
 
 appraisals.each do |rails_version|
   %w(4.0 5.0).each do |redis_version|

data/Gemfile

@@ -3,4 +3,18 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in time_bandits.gemspec
 gemspec
 
+gem "ansi"
+gem "appraisal"
+gem "byebug"
+gem "dalli"
+gem "memcached", "~> 1.8.0" if RUBY_VERSION < "3.3.0"
+gem "minitest"
+gem "mocha"
+gem "mysql2"
+gem "rake"
+gem "redis"
+gem "sequel"
+gem "activerecord"
+gem "beetle", ">= 3.4.1"
+
 gem "hiredis-client"

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

@@ -1,29 +1,44 @@
 # This file monkey patches class ActiveRecord::RuntimeRegistry to
 # additionally store call counts and cache hits and subscribes an
-# event listener to manage those counters.
+# event listener to manage those counters. It is used if the active
+# record version is 7.1.0 or higher.
 
 require "active_record/runtime_registry"
 
 module ActiveRecord
   module RuntimeRegistry
 
-    def self.call_count
-      ActiveSupport::IsolatedExecutionState[:active_record_sql_call_count] ||= 0
-    end
+    if respond_to?(:queries_count)
+      alias_method :call_count, :queries_count
+      alias_method :call_count=, :queries_count=
+    else
+      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
+      def self.call_count=(value)
+        ActiveSupport::IsolatedExecutionState[:active_record_sql_call_count] = value
+      end
     end
 
-    def self.query_cache_hits
-      ActiveSupport::IsolatedExecutionState[:active_record_sql_query_cache_hits] ||= 0
-    end
+    if respond_to?(:cached_queries_count)
+      alias_method :query_cache_hits, :cached_queries_count
+      alias_method :query_cache_hits=, :cached_queries_count=
+    else
+      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
+      def self.query_cache_hits=(value)
+        ActiveSupport::IsolatedExecutionState[:active_record_sql_query_cache_hits] = value
+      end
+     end
 
-    alias_method :reset_runtime, :reset
+    if respond_to?(:reset_runtimes)
+      alias_method :reset_runtime, :reset_runtimes
+    else
+      alias_method :reset_runtime, :reset
+    end
     alias_method :runtime, :sql_runtime
     alias_method :runtime=, :sql_runtime=
 
@@ -42,9 +57,14 @@ module ActiveRecord
   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]
+# Rails 7.2 already collects query counts and cache hits, so we no
+# longer need our own event handler.
+unless ActiveRecord::RuntimeRegistry.respond_to?(:queries_count)
+  require "active_support/notifications"
+
+  ActiveSupport::Notifications.monotonic_subscribe("sql.active_record") do |event|
+    ActiveRecord::RuntimeRegistry.call_count += 1
+    ActiveRecord::RuntimeRegistry.query_cache_hits += 1 if event.payload[:cached]
+  end
 end

data/lib/time_bandits/version.rb

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

data/test/unit/database_test.rb

@@ -46,6 +46,8 @@ class DatabaseTest < Test::Unit::TestCase
 
   test "accessing current runtime" do
     metrics_store.runtime += 1.234
+    assert_equal 1.234, metrics_store.runtime
+    assert_equal 1.234, bandit.current_runtime
     assert_equal 1.234, TimeBandits.consumed
     assert_equal 0, metrics_store.runtime
     metrics_store.runtime += 4.0
@@ -66,8 +68,13 @@ class DatabaseTest < Test::Unit::TestCase
     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
+    if ActiveRecord::VERSION::STRING =~ /\A7.2\..*\Z/
+      # registry ingores schema calls now
+      assert_equal 1, bandit.calls
+    else
+      # 2 calls, because one configures the connection
+      assert_equal 2, bandit.calls
+    end
     assert_equal 0, bandit.sql_query_cache_hits
   end
 
@@ -75,11 +82,17 @@ class DatabaseTest < Test::Unit::TestCase
     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
+    assert_equal 0, bandit.calls
     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
+    if ActiveRecord::VERSION::STRING =~ /\A7.2\..*\Z/
+      # registry ingores schema calls now
+      assert_equal 1, bandit.calls
+    else
+      # 2 calls, because one configures the connection
+      assert_equal 2, bandit.calls
+    end
     assert_equal 0, bandit.sql_query_cache_hits
   end
 

data/test/unit/memcached_test.rb

@@ -2,6 +2,7 @@ require_relative '../test_helper'
 
 class MemcachedTest < Test::Unit::TestCase
   def setup
+    skip "memcached is currently not supported on Ruby #{RUBY_VERSION} as the gem does not compile" unless RUBY_VERSION < "3.3.0"
     TimeBandits.time_bandits = []
     TimeBandits.add TimeBandits::TimeConsumers::Memcached
     TimeBandits.reset

data/time_bandits.gemspec

@@ -23,19 +23,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency("thread_variables")
   s.add_runtime_dependency("activesupport", [">= 5.2.0"])
-
-  s.add_development_dependency("ansi")
-  s.add_development_dependency("appraisal")
-  s.add_development_dependency("byebug")
-  s.add_development_dependency("dalli")
-  s.add_development_dependency("memcached", "~> 1.8.0")
-  s.add_development_dependency("minitest")
-  s.add_development_dependency("mocha")
-  s.add_development_dependency("mysql2")
-  s.add_development_dependency("rake")
-  s.add_development_dependency("redis")
-  s.add_development_dependency("sequel")
-  s.add_development_dependency("activerecord")
-  s.add_development_dependency("beetle", ">= 3.4.1")
+  s.add_runtime_dependency("base64")
+  s.add_runtime_dependency("mutex_m")
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: time_bandits
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.15.0
 platform: ruby
 authors:
 - Stefan Kaes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-11 00:00:00.000000000 Z
+date: 2024-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thread_variables
@@ -39,153 +39,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 5.2.0
 - !ruby/object:Gem::Dependency
-  name: ansi
+  name: base64
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: dalli
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: memcached
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.8.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.8.0
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: redis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sequel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -193,33 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: mutex_m
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: beetle
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.4.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.4.1
 description: Rails Completed Line on Steroids
 email:
 - skaes@railsexpress.de
@@ -292,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Custom performance logging for Rails