time_bandits 0.12.5 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be90aa917ea9d4256501dc921da7fea5c9f1c9608f89fc7e5e5dace634b0353f
-  data.tar.gz: 29d87ff61dfa62a3202434df9d687ae9dc8e9d5e6e4b9e0ef4709049b7abee51
+  metadata.gz: b008edd801936f7287a5cfd453ed13af7c883ec9780731e78a490da3ddaa3c6f
+  data.tar.gz: f062f276b88df3b380e8dc6b9ddda4c81e164c878f6e5867167e43bf9155ab06
 SHA512:
-  metadata.gz: e6692b8d8d10889442cc67f583fb6b98535f6a7ab3b060698c9dfef256f933bb976670dd1e672ba16a63d085d5238ade7704e7c1e9240ffc3da67d60e9a33435
-  data.tar.gz: b98ab1c3669dd66162199ad6a78bf113a598b8836a0a793404fa1dd28248fc43751ad32439ae03b3732a16f7476ad2109cacdc2c9cc7b57eec24ecb07475c460
+  metadata.gz: 9c60df11a4defd9f8764d267575b72918077fd51f0380a3f655af5f6f5b9b7c9e15a43621869f6f34623ee859d04feb35f91427fd60a50d33ec4fae97e6a8196
+  data.tar.gz: f862c5684068b9ba85bfac90a4472639a3e3c72f1b0ea63e83824f4b635bbb8e853e79706015ceb633c12ad636bdcdc7c8bff2821b4f894846bcd61def5da757

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

@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby-version: [3.1.0, 3.0.3, 2.7.5, 2.6.9]
+        ruby-version: [3.1.2, 3.0.4, 2.7.6]
 
     steps:
       - uses: actions/checkout@v2

data/Appraisals

@@ -1,14 +1,17 @@
 appraisals = [
-  "6.0.4.4",
-  "6.1.4.4",
+  "6.0.4.7",
+  "6.1.5",
 ]
 
 appraisals.insert(0, "5.2.6") if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.0.0")
-appraisals << "7.0.1" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.7.0")
+appraisals << "7.0.2.3" 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

@@ -0,0 +1,324 @@
+# CHANGELOG
+
+## 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
+* use ruby 3.1.1 in GitHub actions
+* updated appraisals
+* restrict Redis gem to a version before 5.0 until 5.x has become
+  stable
+* use monotonic clocks for time measurements
+
+## Version 0.12.5
+* use GC.stat(:malloc_increase_bytes) to measure allocated bytes as fallback
+* support ruby 3.1.0 GC.total_time
+* ruby 3.1.0 needs rails 7.0.1 to run the tests
+* include ruby-3.1.0 on GitHub actions
+
+## Version 0.12.4
+* rails 7.0.0 compatibility
+* only test Rails 3.0.0 with Ruby >= 2.7.0
+* updated Appraisals
+* use safe ruby version to run tests on GitHub
+* switched to GitHub actions (#19)
+* try to fix travis
+* updated appraisals
+* remove gemfiles created by appraisals and git ignore them
+
+## Version 0.12.3
+* relax minitest dependency
+* suppress Ruby 2.7 warnings in action controller tests
+* updated test container versions
+
+## Version 0.12.2
+* fixed that completed line was logged twice in Rails test environment
+* split license into separate file
+* added travis badge
+
+## Version 0.12.1
+* install GC time bandit automatically inRails applications
+* only load railtie if class Rails::Railtie is defined
+
+## Version 0.12.0
+* removed leftover from old Rails plugin times
+* don't need sudo on travis
+* Merge pull request #15 from toy/patch-1
+* try to fix travis build
+* doc rephrasing
+* updated README
+* relax active support version requirement to 5.2.0
+* updated travis build matrix
+* dropped support for old rails and ruby versions
+* silence ruby warnings
+* updated docker images
+* require at least version 5.2.4.3 for activesupport
+* updated appraisals to only test supported Rails versions
+* damn travis
+* travis fu
+* updated ruby versions
+* trying to fix travis
+
+## Version 0.11.0
+* added and updated appraisals
+* support rails 6
+* Add changelog url to gemspec
+
+## Version 0.10.12
+* updated README
+* also support future 5.0.x versions
+* added appraisal for rails 5.0.7
+* Merge pull request #14 from mediafinger/master
+* Call type_casted_binds with only one argument in Rails 5.0.7
+
+## Version 0.10.11
+* prepare 0.10.11 release
+* clarified how TimeBanditry gets activated in railtie
+* test rails 5.2.0 compatibility
+* Merge pull request #13 from sghosh23/update_rails_version_active_record_monkey_patch
+* add rails version 5.2 to support active record monkey patch
+* fix test failures on ActiveRecord 4.1.16
+* reinstalled appraisals
+* try to fix travis builds
+
+## Version 0.10.10
+* make sure sql method can be executed on logsubscriber
+* updated appraisals
+
+## Version 0.10.8
+* added specialized activerecord logging for Rails >= 5.1.5
+
+## Version 0.10.8
+* rails has changed render_bind in 5.0.3
+* updated README
+* added rabbitmq as a service for travis
+* added more rails versions to test against
+* abort rake task when system calls fail
+* fixed deprecation warning for ruby 2.4.1
+
+## Version 0.10.7
+* changed README format to markdown
+* Merge pull request #11 from manveru/patch-1
+* Adapt log_sql_statement for Rails 5.1
+* changed travis command
+
+## Version 0.10.6
+* updated reales notes
+* Merge pull request #9 from pinglamb/master
+* added .travis.yml
+* updated rails versions for appraisals
+
+## Version 0.10.5
+* make activerecord monkey patch available for rails 5.1
+
+## Version 0.10.4
+* protect against Rails 5 firing on_load handlers multiple times
+
+## Version 0.10.3
+* fixed activerecord logging monkey patch
+
+## Version 0.10.2
+* go back to using alias_method to enable testing with rspec
+
+## Version 0.10.1
+* fixed broken module.prepend
+
+## Version 0.10.0
+* updated release notes
+* rebased on master
+* added docker compose file to start redis, memcached, mysql and rabbitmq for testing
+* added rails 5 to appraisals
+* active record log subscriber changes to support rails 5
+* checked and updated action controller hacks for rails 5
+* rails 5 fixed the memcache store stats bug on fetch
+* rails 5 deprecated alias_method_chain, used Module.prepend instead
+* rails 5 deprecated string values for middlewares
+
+## Version 0.9.2
+* fixed sequel gem monkey patch
+* I really hate the stupid decision by rake to force ruby -w on everyone
+* updated rails versions in appraisals
+
+## Version 0.9.1
+* redis time consumer: make sure to log ASCII in debug mode
+
+## Version 0.9.0
+* added beetle time consumer
+* Multiply 1000 to get the actual millisecond
+
+## Version 0.8.1
+* make sure every consumer has a current_runtime methods (duh)
+
+## Version 0.8.0
+* access current database runtime including not yet consumed time
+
+## Version 0.7.4
+* fixed that actions without render showed zero db time
+* removed .lock files
+* use appraisal for testing against multiple active support versions
+* test with rails 4.2.4
+
+## Version 0.7.3
+* in rails 4.2 dalli is always instrumented
+* monkey patches seem to be compatible with rails 4.2
+
+## Version 0.7.2
+* updated to support ruby 2.2.0
+
+## Version 0.7.1
+* style change
+* updated README
+* measure time and calls with sequel
+
+## Version 0.7.0
+* make the most out of an unpatched ruby
+
+## Version 0.6.7
+* fixed wrong nesting of public :sql
+
+## Version 0.6.6
+* fixed duplicate log lines for active record monkey patch and rails 4.1
+* Count redis round trips not calls
+
+## Version 0.6.5
+* rails monkey patches are compatible with 4.1
+
+## Version 0.6.4
+* make sure not to call 'instrument=' if a rails 4 app uses :dalli_store instead of :mem_cache_store
+
+## Version 0.6.3
+* rails 3.2 columns don't understand binary?
+
+## Version 0.6.2
+* rails 4.0 updates to active_record monkey_patch
+
+## Version 0.6.1
+* support for ruby 2.1
+* added test for GC time consumer
+
+## Version 0.6.0
+* updated README
+* added tests for dalli and redis and new completed line behavior
+* patched dalli consumer to work correctly with rails 4
+* added redis time consumer
+* don't include bandits in the the completed line which haven't measured anything
+
+## Version 0.5.1
+* added license information to gemspec
+
+## Version 0.5.0
+* ugly hack to ensure Completed lines are logged in the test environment
+* reset time bandits before running controller tests
+* renamed RailsCache consumer to dalli and rely on dalli for logging
+* avoid calling logger in production
+* install some gems for debugging
+* updated README
+* we're all milliseconds now
+* we are thread safe now. lose the Rack::Lock middleware
+* drop rails 2 support
+* switch database consumer to use base_consumer
+* added a general rails cache consumer (can be used to replace memcache consumers)
+* make memcache consumers threadsafe
+* use structs instead of hashes for counters
+* more groundwork for thread safe time bandits
+* added some tests
+
+## Version 0.4.1
+* added rake dev dependency
+* we can't rely on Rack::Sendfile to be around
+
+## Version 0.4.0
+* rails 4.0 and tagged logging support
+
+## Version 0.3.1
+* need to call TimeBandits.consumed to get correct db time stats
+
+## Version 0.3.0
+* use thread local variables gem
+* make use of thread_local_variable_access gem
+
+## Version 0.2.2
+* enable GC stats after passenger has forked a new worker process
+* reset time bandits after rails initialization process has been completed
+
+## Version 0.2.1
+* use the correct rails version specific code to extract raw_payload
+
+## Version 0.2.0
+* basic rails 3.1 and 32. compatibility
+
+## Version 0.1.4
+* fixed bug related to mixing seconds and millicesonds
+
+## Version 0.1.3
+* db time is already measured in milliseconds
+
+## Version 0.1.2
+* the Rails 3 database consumer no longer uses instance variables for the statistics
+
+## Version 0.1.1
+* use own middlware logger and provide viewtime and action for logjam_agent
+
+## Version 0.1.0
+* ignore some files
+* the version numbering is ridiculous
+* add a bit of backtrace info
+* removed last traces of agent suport
+* provide metrics for rack middlewares
+* metrics for rails2 database adapter
+* improved metrics for memcached
+
+## Version 0.0.9
+
+* Relax Rails version check, still running fine on 2.3.14
+* metrics agent support for rails 2
+
+## Version 0.0.8
+* gem compatibility for rails 2.3.x
+* updated README
+
+## Version 0.0.7
+* git ignore the Gemfile.lock
+* Assume status 500 in case of an exception being raised
+* Fail gracefully if an exception occurs during before_dispatch
+
+## Version 0.0.6
+* updated gemspec to pin to the right branch on github
+
+## Version 0.0.5
+* prepare new version (now with activerecord support)
+* updated readme
+* database consumer is now thread safe
+* initial version of ActiveRecord time consumer
+
+
+## Version 0.0.4
+* oh man. concentrate!
+
+## Version 0.0.3
+* oops
+
+## Version 0.0.2
+* refactored rack logger
+
+## Version 0.0.1
+* now a proper rails3 gem plugin
+* removed log ouput
+* don't install time bandits per default (app needs control over order of bandits in completed line)
+* use the more accurate timing info
+* Merge branch 'master' into rails3
+* deleted unused file
+* Merge branch 'master' into rails3
+* checked in some xing modifications
+* first stab at supporting rails3
+* JRuby support for GC and memory statistics, using the jmx gem.
+* during initialization, enable memcache and GC stats if they are available
+* we are compatible to activerecord 2.3.5
+* Merge branch 'master' of github.com:skaes/time_bandits
+* time bandits registration interface changed and got a new method for creating log lines outside ActionController
+* added Rakefile with rdoc task
+* removed Rakefile
+* initial import

data/Gemfile

@@ -1,4 +1,6 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in time_bandits.gemspec
 gemspec
+
+gem "hiredis-client"

data/README.md

@@ -84,114 +84,3 @@ changed so much of the code that is is practically a full rewrite, hence we chan
 ## Running Tests
 
 Run `docker-compose up` to start Redis, MySQL, RabbitMQ and Memached containers, then run `rake`.
-
-
-## Release Notes
-
-## Version 0.12.3
-  -  suppress Ruby 2.7 warnings about keyword parameters in controller tests
-
-## Version 0.12.2
-  -  fixed that completed line was logged twice in Rails test environment
-
-## Version 0.12.1
-  - support having the rails gem in a bundle without activating the time bandits railtie
-  - automatically install the garbage collection time bandit in rails applications
-
-## Version 0.12.0
-  - drops support for Rails versions before 5.2.0 and Ruby versions before 2.2.0
-  - makes it possible to use individual time bandits without Rails (e.g. in a Sinatra app)
-
-## Version 0.11.0
-  - supports rails 6.0.0
-
-## Version 0.10.12
-  - supports rails 5.0.7
-
-## Version 0.10.11
-  - support rails 5.2.0
-
-## Version 0.10.10
-  - fixed regression introduced in 0.10.9
-
-### Version 0.10.9
-  - added specialized activerecord logging for Rails >= 5.1.5
-
-### Version 0.10.8
-  - rails has changed render_bind in 5.0.3
-
-### Version 0.10.7
-  - fixed bug in activerecord monkeypatch for Rails 5.1
-
-### Version 0.10.6
-  - fixed time calculation for rails 4
-
-### Version 0.10.5
-  - enabled activerecord monkeypatch for rails 5.1
-
-### Version 0.10.4
-  -  protect against Rails 5 firing on_load handlers multiple times
-
-### Version 0.10.3
-  - fixed activerecord monkeypatch
-
-### Version 0.10.2
-  - controller testing fixed for rspec
-
-### Version 0.10.1
-  - fixed incorrect module prepend which broke controller testing
-
-### Version 0.10.0
-  - support rails 5
-
-### Version 0.9.2
-  - sequel gem changes broke sequel time consumer
-
-### Version 0.9.1
-  - make sure redis times consumer logs keys in ASCII
-
-### Version 0.9.0
-  - added beetle time consumer
-
-### Version 0.8.1
-  - bugfix
-
-### Version 0.8.0
-  - support retrieving current runtime including not yet consumed time
-
-### Version 0.7.4
-  - use appraisal for testing against multiple rails versions
-  - bugfix for actions without render
-
-### Version 0.7.3
-  - bugfix dalli consumer for rails 4.2
-
-### Version 0.7.2
-  - support ruby 2.2.0
-
-### Version 0.7.1
-  - support measuring sequel gem
-
-### Version 0.7.0
-   - switched to byebug (debugger does not fully support 2.0 and 2.1 not at all)
-   - adapted garbage collection statistics to work for 2.1
-   - improved rails 4.x compatibility
-   - GC time consumer now tries to make the most out of an unpatched ruby
-
-### Version 0.6.0
-   - added redis time consumer
-   - fixed rails 4.0 problems with builtin mem_cache_store
-   - now only consumers which measured something are added to the completed line
-
-### Version 0.5.1
-   - added license file
-
-### Version 0.5
-   - has dropped rails 2 support
-   - relies on ActiveSupport::Notifications
-   - is supposedly thread safe
-   - all measurements are thread local (except GC statistics)
-   - times are all measured in milliseconds internally
-   - added class TimeBandits::TimeConsumers::BaseConsumer to simplify writing custom consumers
-
-

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/monkey_patches/sequel.rb

@@ -12,10 +12,11 @@ Sequel::Database.class_eval do
 
     def log_connection_yield(*args, &block)
       begin
-        start = Time.now
+        start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
         _orig_log_connection_yield(*args, &block)
       ensure
-        ActiveSupport::Notifications.instrument('duration.sequel', durationInSeconds: Time.now - start)
+        end_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+        ActiveSupport::Notifications.instrument('duration.sequel', durationInSeconds: end_time - start_time)
       end
     end
 
@@ -25,10 +26,11 @@ Sequel::Database.class_eval do
 
     def log_yield(*args, &block)
       begin
-        start = Time.now
+        start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
         _orig_log_yield(*args, &block)
       ensure
-        ActiveSupport::Notifications.instrument('duration.sequel', durationInSeconds: Time.now - start)
+        end_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+        ActiveSupport::Notifications.instrument('duration.sequel', durationInSeconds: end_time - start_time)
       end
     end
 

data/lib/time_bandits/rack/logger.rb

@@ -27,7 +27,7 @@ module TimeBandits
     protected
 
       def call_app(request, env)
-        start_time = Time.now
+        start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
         start(request, start_time)
         resp = @app.call(env)
         resp[2] = ::Rack::BodyProxy.new(resp[2]) { finish(request) }
@@ -36,12 +36,13 @@ module TimeBandits
         finish(request)
         raise
       ensure
-        completed(request, (Time.now - start_time) * 1000, resp)
+        end_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+        completed(request, (end_time - start_time) * 1000, resp)
         ActiveSupport::LogSubscriber.flush_all!
       end
 
       # Started GET "/session/new" for 127.0.0.1 at 2012-09-26 14:51:42 -0700
-      def started_request_message(request, start_time=Time.now)
+      def started_request_message(request, start_time = Time.now)
         'Started %s "%s" for %s at %s' % [
           request.request_method,
           request.filtered_path,

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.5"
+  VERSION = "0.13.0"
 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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: time_bandits
 version: !ruby/object:Gem::Version
-  version: 0.12.5
+  version: 0.13.0
 platform: ruby
 authors:
 - Stefan Kaes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-12 00:00:00.000000000 Z
+date: 2022-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thread_variables
@@ -230,6 +230,7 @@ files:
 - ".github/workflows/run-tests.yml"
 - ".gitignore"
 - Appraisals
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -288,7 +289,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.3.19
 signing_key:
 specification_version: 4
 summary: Custom performance logging for Rails