time_bandits 0.12.7 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b8b86f7d1fd439347f33ce1a814afe78f6bb4b81f287821d1cafa710d685cc7
-  data.tar.gz: bd4914bd9edc10e9af70e9d642de6f4f29a6718f2405121f1d7e64155e90920b
+  metadata.gz: e14e3f3974575197ad97649241f327dbf69824c354044bde8bd55ff421d9c21a
+  data.tar.gz: 4115bb4f9820a3227a62d6b4ea66c5f045c59cacb019fd89be71ff9da6b2f790
 SHA512:
-  metadata.gz: 2be85317edc8af9c48c7aa319c6725bc1fad3f734190a83742995926c9bb90f82ce88d2c9f87abea92c6e96f85235176a896ea7449fd8ed03615dd7c2ae85a57
-  data.tar.gz: 7566807416012598e58e9528a8196fba0bfefa9841a32052792a23070b9cae8e98844455f73edd25644ec09eca12f3e4a895010347724e5cc9fffd184f9f7413
+  metadata.gz: abc74cb6ae11bdf9388f8d113a3df89d61e6403cd614ebdd8d73aaa5be84c8a2d9d50d746b57a2eb4079140e1a34c9e1e3c172428e1065d15893ad94e99330b6
+  data.tar.gz: bd2347a6f49613abd7359524c1a08cb609acf501180b1deeb5b093318b664ff330c7a0bd8b2a577b1dee303d62ea8481162485b704d4f9041000cc58b3dd77a2

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

@@ -13,10 +13,10 @@ jobs:
 
     strategy:
       matrix:
-        ruby-version: [3.1.2, 3.0.4, 2.7.6]
+        ruby-version: [3.2.0, 3.1.3, 3.0.5, 2.7.7]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Start containers
         run: docker-compose -f docker-compose.yml up -d

data/Appraisals

@@ -1,14 +1,17 @@
 appraisals = [
-  "6.0.4.7",
-  "6.1.5",
+  "6.0.6",
+  "6.1.6",
 ]
 
-appraisals.insert(0, "5.2.6") if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.0.0")
-appraisals << "7.0.2.3" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.7.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|
-  appraise "activesupport-#{rails_version}" do
-    gem "activesupport", rails_version
-    gem "activerecord", rails_version
+  %w(4.0 5.0).each do |redis_version|
+    appraise "activesupport-#{rails_version}-redis-#{redis_version}" do
+      gem "redis", "~> #{redis_version}"
+      gem "activesupport", rails_version
+      gem "activerecord", rails_version
+    end
   end
 end

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 # CHANGELOG
 
-## Version 0.12.6
+## 0.13.1
+* Fixed last place that tried to log a monotonic clock timestamp
+  instead of a Time instance.
+
+## 0.13.0
+* Support redis 5.0.
+
+## Version 0.12.7
 * logging start time requires a real time, not a monotonic clock
 
 ## Version 0.12.6

data/Gemfile

@@ -2,3 +2,8 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in time_bandits.gemspec
 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

@@ -17,7 +17,7 @@ services:
 
   redis:
     container_name: redis
-    image: redis:5.0
+    image: redis:6.0
     ports:
       - "6379:6379"
 

data/lib/time_bandits/monkey_patches/redis.rb

@@ -1,12 +1,36 @@
 require 'redis'
-class Redis
-  class Client
-    alias :old_logging :logging
 
-    def logging(commands, &block)
-      ActiveSupport::Notifications.instrument('request.redis', commands: commands) do
-        old_logging(commands, &block)
+if Redis::VERSION < "5.0"
+
+  class Redis
+    class Client
+      alias :old_logging :logging
+
+      def logging(commands, &block)
+        ActiveSupport::Notifications.instrument('request.redis', commands: commands) do
+          old_logging(commands, &block)
+        end
+      end
+    end
+  end
+
+else
+
+  module TimeBandits
+    module RedisInstrumentation
+      def call(command, redis_config)
+        ActiveSupport::Notifications.instrument("request.redis", commands: [command]) do
+          super
+        end
+      end
+
+      def call_pipelined(commands, redis_config)
+        ActiveSupport::Notifications.instrument("request.redis", commands: commands) do
+          super
+        end
       end
     end
   end
+  RedisClient.register(TimeBandits::RedisInstrumentation)
+
 end

data/lib/time_bandits/rack/logger.rb

@@ -28,7 +28,7 @@ module TimeBandits
 
       def call_app(request, env)
         start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-        start(request, start_time)
+        start(request, Time.now)
         resp = @app.call(env)
         resp[2] = ::Rack::BodyProxy.new(resp[2]) { finish(request) }
         resp

data/lib/time_bandits/time_consumers/redis.rb

@@ -16,7 +16,7 @@ module TimeBandits
         def request(event)
           i = Redis.instance
           i.time += event.duration
-          i.calls += 1 #count redis round trips, not calls
+          i.calls += 1 # count redis round trips, not calls
 
           return unless logger.debug?
 

data/lib/time_bandits/version.rb

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

data/test/unit/redis_test.rb

@@ -54,10 +54,10 @@ class RedisTest < Test::Unit::TestCase
   private
   def pipelined_work(type = :pipelined)
     TimeBandits.reset
-    @redis.send(type) do
-      @redis.get("foo")
-      @redis.set("bar", 1)
-      @redis.hgetall("baz")
+    @redis.send(type) do |transaction|
+      transaction.get("foo")
+      transaction.set("bar", 1)
+      transaction.hgetall("baz")
     end
   end
 

data/time_bandits.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency("mocha")
   s.add_development_dependency("mysql2")
   s.add_development_dependency("rake")
-  s.add_development_dependency("redis", "< 5.0")
+  s.add_development_dependency("redis")
   s.add_development_dependency("sequel")
   s.add_development_dependency("activerecord")
   s.add_development_dependency("beetle", ">= 3.4.1")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: time_bandits
 version: !ruby/object:Gem::Version
-  version: 0.12.7
+  version: 0.13.1
 platform: ruby
 authors:
 - Stefan Kaes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-31 00:00:00.000000000 Z
+date: 2023-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thread_variables
@@ -168,16 +168,16 @@ dependencies:
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -289,7 +289,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.19
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Custom performance logging for Rails