time_bandits 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83242fd7d0fdb8779fea9b22a97773fccb5c311be2f81f87221987a00e2dcef8
-  data.tar.gz: 4fa8253a1a6c280f05006969bfc21445cbe9bde31fe7389248b4118dc915f1f4
+  metadata.gz: 0ac35c38f3393a0ff15bd629eaa862ab6f80b8c23dd199bd7ab0a21081ed7adc
+  data.tar.gz: 640caa883d9975cd47a662c0995b97fba05de0795e374ab4719f4c50cc3e773a
 SHA512:
-  metadata.gz: fd6139b93e05a294aab44109f5568c3492af1ac7bced768169d0ce0d7454caac10aee5da0b3f0d166d9103fe7e8eaefe0da7e52d1dd8dd70bf2a2e4d9b207882
-  data.tar.gz: 509da4a961ab2640b464ed090286f6f43c4328e1a011f5d99e063150d9772bb236a4a0a5b168d754bcb68b52771e796bc8dd1eac8075e79966b237fb22fe8201
+  metadata.gz: 14059e1e2903f23e6b61340688a1d6942a00c062d6088bb23c1f04b89e355860aa34b66d5e4a7926986e4f947e37a8bad72cf9ff0f149d9f86d8a68fa9fd05fd
+  data.tar.gz: cad90ceabc0220576aae6c8ffe83a3ec2c06f346e980e0c20d962267090dac1b03e36fcc8517e757104d9baf849b5cedc9bab5c7ffbabab2a064ffc7775eabc3

data/.travis.yml

@@ -1,11 +1,23 @@
+dist: bionic
 language: ruby
 rvm:
-  - 2.3.6
-  - 2.4.3
-  - 2.5.0
+  - 2.5.7
+  - 2.6.5
+  - 2.7.0
+before_install:
+  - gem install bundler
 script: "bundle exec rake appraisal:test"
-sudo: false
 services:
   - redis-server
   - memcached
   - rabbitmq
+  - mysql
+addons:
+  apt:
+    sources:
+      - sourceline: "deb https://packages.erlang-solutions.com/ubuntu bionic contrib"
+        key_url: "https://packages.erlang-solutions.com/ubuntu/erlang_solutions.asc"
+      - sourceline: "deb https://dl.bintray.com/rabbitmq/debian bionic main"
+        key_url: "https://dl.bintray.com/rabbitmq/Keys/rabbitmq-release-signing-key.asc"
+    packages:
+      - rabbitmq-server

data/Appraisals

@@ -1,21 +1,7 @@
 [
-  "4.1.16",
-  "4.2.8",
-  "4.2.9",
-  "4.2.11.1",
-  "5.0.3",
-  "5.0.4",
-  "5.0.7",
-  "5.0.7.2",
-  "5.1.1",
-  "5.1.2",
-  "5.1.5",
-  "5.1.7",
-  "5.2.0",
-  "5.2.3",
-  "6.0.0"
+  "5.2.4.3",
+  "6.0.3.2"
 ].each do |rails_version|
-  next if RUBY_VERSION >= "2.4.0" && rails_version < "4.2.8"
   appraise "activesupport-#{rails_version}" do
     gem "activesupport", rails_version
     gem "activerecord", rails_version

data/README.md

@@ -53,16 +53,16 @@ With these two new time consumers, the log line changes to
    b: number of bytes allocated by the ruby x_malloc call (#bytes)
    l: live data set size after last GC (#slots)
 
-Sidenote for Germans: you can use the word "Gesabbel" (eng: drivel) as a mnemonic here ;-)
+Side note for speakers of German: you can use the word "Gesabbel" (eng: drivel) as a mnemonic here ;-)
 
-It's realtively straightforward to write additional time consumers; the more difficult part of this is
+It's relatively straightforward to write additional time consumers; the more difficult part of this is
 monkey patching the code which you want to instrument. Have a look at consumers under
-lib/time_bandits/time_consumers and the corresponding patches under lib/time_bandits/monkey_patches.
+`lib/time_bandits/time_consumers` and the corresponding patches under `lib/time_bandits/monkey_patches`.
 
 
 ## Prerequisites
 
-Rails >= 3.x is required. The gem will raise an error if you try to use it with an incompatible
+ActiveSupport/Rails >= 5.2 is required. The gem will raise an error if you try to use it with an incompatible
 version.
 
 You'll need a ruby with the railsexpress GC patches applied, if you want to include GC and heap size
@@ -80,10 +80,15 @@ changed so much of the code that is is practically a full rewrite, hence we chan
 
 ## Running Tests
 
-In order for the test to run you need a running memcached, redis-server and mysql
+Run `docker-compose up` to start Redis, MySQL, RabbitMQ and Memached containers, then run `rake`.
+
 
 ## Release Notes
 
+## 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
 
@@ -178,7 +183,7 @@ In order for the test to run you need a running memcached, redis-server and mysq
 
 ## License
 
-Copyright (c) 2009-2014 Stefan Kaes <skaes@railsexpress.de>
+Copyright (c) 2009-2020 Stefan Kaes <skaes@railsexpress.de>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -13,6 +13,7 @@ Rake::TestTask.new do |t|
   t.libs << "test"
   t.test_files = FileList['test/**/*_test.rb']
   t.verbose = true
+  t.ruby_opts = %w(-W0)
 end
 
 namespace :appraisal do

data/docker-compose.yml

@@ -3,7 +3,7 @@ version: '2'
 services:
   mysql:
     container_name: mysql
-    image: mysql:5.5
+    image: mysql:5.7
     ports:
       - "3601:3306"
     environment:
@@ -11,18 +11,18 @@ services:
 
   memcached:
     container_name: memcached
-    image: memcached:1.4.27
+    image: memcached:1.6.6
     ports:
       - "11211:11211"
 
   redis:
     container_name: redis
-    image: redis:3.2.0
+    image: redis:5.0.9
     ports:
       - "6379:6379"
 
   rabbitmq:
     container_name: rabbitmq
-    image: rabbitmq:3.6.2
+    image: rabbitmq:3.8.5
     ports:
       - "5672:5672"

data/gemfiles/{activesupport_5.0.4.gemfile → activesupport_5.2.4.3.gemfile}

@@ -2,7 +2,7 @@
 
 source "http://rubygems.org"
 
-gem "activesupport", "5.0.4"
-gem "activerecord", "5.0.4"
+gem "activesupport", "5.2.4.3"
+gem "activerecord", "5.2.4.3"
 
 gemspec path: "../"

data/gemfiles/{activesupport_5.2.3.gemfile.lock → activesupport_5.2.4.3.gemfile.lock}

@@ -1,83 +1,81 @@
 PATH
   remote: ..
   specs:
-    time_bandits (0.10.12)
-      activesupport (>= 2.3.2)
+    time_bandits (0.11.0)
+      activesupport (>= 5.2.4.3)
       thread_variables
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activerecord (5.2.3)
-      activemodel (= 5.2.3)
-      activesupport (= 5.2.3)
+    activemodel (5.2.4.3)
+      activesupport (= 5.2.4.3)
+    activerecord (5.2.4.3)
+      activemodel (= 5.2.4.3)
+      activesupport (= 5.2.4.3)
       arel (>= 9.0)
-    activesupport (5.2.3)
+    activesupport (5.2.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    amq-protocol (2.3.0)
+    amq-protocol (2.3.1)
     amqp (1.8.0)
       amq-protocol (>= 2.2.0)
       eventmachine
     ansi (1.5.0)
-    appraisal (2.2.0)
+    appraisal (2.3.0)
       bundler
       rake
       thor (>= 0.14.0)
     arel (9.0.0)
-    beetle (3.3.1)
+    beetle (3.4.1)
       activesupport (>= 2.3.4)
-      amq-protocol (= 2.3.0)
+      amq-protocol (= 2.3.1)
       amqp (= 1.8.0)
       bunny (~> 0.7.12)
       hiredis (>= 0.4.5)
-      redis (>= 2.2.2)
+      redis (>= 4.2.1)
     bunny (0.7.12)
-    byebug (11.0.1)
-    concurrent-ruby (1.1.5)
+    byebug (11.1.3)
+    concurrent-ruby (1.1.6)
     dalli (2.7.10)
     eventmachine (1.2.7)
     hiredis (0.6.3)
-    i18n (1.6.0)
+    i18n (1.8.3)
       concurrent-ruby (~> 1.0)
     memcached (1.8.0)
-    metaclass (0.0.4)
-    minitest (5.11.3)
-    mocha (1.9.0)
-      metaclass (~> 0.0.1)
-    mysql2 (0.5.2)
-    rake (10.5.0)
-    redis (4.1.2)
-    sequel (5.23.0)
-    thor (0.20.3)
+    minitest (5.14.1)
+    mocha (1.11.2)
+    mysql2 (0.5.3)
+    rake (13.0.1)
+    redis (4.2.1)
+    sequel (5.33.0)
+    thor (1.0.1)
     thread_safe (0.3.6)
     thread_variables (0.2.0)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (= 5.2.3)
-  activesupport (= 5.2.3)
+  activerecord (= 5.2.4.3)
+  activesupport (= 5.2.4.3)
   ansi
   appraisal
-  beetle (>= 0.4.6)
+  beetle (>= 3.4.1)
   byebug
   dalli
   memcached (~> 1.8.0)
   minitest (~> 5.5)
   mocha
   mysql2
-  rake (~> 10.5.0)
+  rake
   redis
   sequel
   time_bandits!
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

data/gemfiles/{activesupport_4.2.9.gemfile → activesupport_6.0.3.2.gemfile}

@@ -2,7 +2,7 @@
 
 source "http://rubygems.org"
 
-gem "activesupport", "4.2.9"
-gem "activerecord", "4.2.9"
+gem "activesupport", "6.0.3.2"
+gem "activerecord", "6.0.3.2"
 
 gemspec path: "../"

data/gemfiles/{activesupport_5.1.7.gemfile.lock → activesupport_6.0.3.2.gemfile.lock}

@@ -1,83 +1,81 @@
 PATH
   remote: ..
   specs:
-    time_bandits (0.10.12)
-      activesupport (>= 2.3.2)
+    time_bandits (0.11.0)
+      activesupport (>= 5.2.4.3)
       thread_variables
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (5.1.7)
-      activesupport (= 5.1.7)
-    activerecord (5.1.7)
-      activemodel (= 5.1.7)
-      activesupport (= 5.1.7)
-      arel (~> 8.0)
-    activesupport (5.1.7)
+    activemodel (6.0.3.2)
+      activesupport (= 6.0.3.2)
+    activerecord (6.0.3.2)
+      activemodel (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
+    activesupport (6.0.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    amq-protocol (2.3.0)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    amq-protocol (2.3.1)
     amqp (1.8.0)
       amq-protocol (>= 2.2.0)
       eventmachine
     ansi (1.5.0)
-    appraisal (2.2.0)
+    appraisal (2.3.0)
       bundler
       rake
       thor (>= 0.14.0)
-    arel (8.0.0)
-    beetle (3.3.1)
+    beetle (3.4.1)
       activesupport (>= 2.3.4)
-      amq-protocol (= 2.3.0)
+      amq-protocol (= 2.3.1)
       amqp (= 1.8.0)
       bunny (~> 0.7.12)
       hiredis (>= 0.4.5)
-      redis (>= 2.2.2)
+      redis (>= 4.2.1)
     bunny (0.7.12)
-    byebug (11.0.1)
-    concurrent-ruby (1.1.5)
+    byebug (11.1.3)
+    concurrent-ruby (1.1.6)
     dalli (2.7.10)
     eventmachine (1.2.7)
     hiredis (0.6.3)
-    i18n (1.6.0)
+    i18n (1.8.3)
       concurrent-ruby (~> 1.0)
     memcached (1.8.0)
-    metaclass (0.0.4)
-    minitest (5.11.3)
-    mocha (1.9.0)
-      metaclass (~> 0.0.1)
-    mysql2 (0.5.2)
-    rake (10.5.0)
-    redis (4.1.2)
-    sequel (5.23.0)
-    thor (0.20.3)
+    minitest (5.14.1)
+    mocha (1.11.2)
+    mysql2 (0.5.3)
+    rake (13.0.1)
+    redis (4.2.1)
+    sequel (5.33.0)
+    thor (1.0.1)
     thread_safe (0.3.6)
     thread_variables (0.2.0)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (= 5.1.7)
-  activesupport (= 5.1.7)
+  activerecord (= 6.0.3.2)
+  activesupport (= 6.0.3.2)
   ansi
   appraisal
-  beetle (>= 0.4.6)
+  beetle (>= 3.4.1)
   byebug
   dalli
   memcached (~> 1.8.0)
   minitest (~> 5.5)
   mocha
   mysql2
-  rake (~> 10.5.0)
+  rake
   redis
   sequel
   time_bandits!
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

data/lib/time_bandits.rb

@@ -5,11 +5,7 @@ require 'thread_variables'
 module TimeBandits
 
   module TimeConsumers
-    if defined?(Rails) && Rails::VERSION::STRING < "3.0"
-      autoload :Database,          'time_bandits/time_consumers/database_rails2'
-    else
-      autoload :Database,          'time_bandits/time_consumers/database'
-    end
+    autoload :Database,          'time_bandits/time_consumers/database'
     autoload :GarbageCollection, 'time_bandits/time_consumers/garbage_collection'
     autoload :JMX,               'time_bandits/time_consumers/jmx'
     autoload :MemCache,          'time_bandits/time_consumers/mem_cache'
@@ -20,7 +16,7 @@ module TimeBandits
     autoload :Beetle,            'time_bandits/time_consumers/beetle'
   end
 
-  require 'time_bandits/railtie' if defined?(Rails) && Rails::VERSION::STRING >= "3.0"
+  require 'time_bandits/railtie' if defined?(Rails)
   require 'time_bandits/time_consumers/base_consumer'
 
   mattr_accessor :time_bandits

data/lib/time_bandits/monkey_patches/action_controller.rb

@@ -4,45 +4,6 @@ module ActionController #:nodoc:
 
   module Instrumentation
 
-    # patch to ensure that the completed line is always written to the log.
-    # this is not necessary anymore with Rails 4 and higher.
-    def process_action(action, *args)
-      raw_payload = get_raw_payload
-      ActiveSupport::Notifications.instrument("start_processing.action_controller", raw_payload.dup)
-
-      exception = nil
-      result = ActiveSupport::Notifications.instrument("process_action.action_controller", raw_payload) do |payload|
-        begin
-          super
-        rescue Exception => exception
-          response.status = 500
-          nil
-        ensure
-          payload[:status] = response.status
-          append_info_to_payload(payload)
-        end
-      end
-      raise exception if exception
-      result
-    end unless Rails::VERSION::STRING >= "4.0"
-
-    # patch to ensure that render times are always recorded in the log.
-    # this is not necessary anymore with Rails 3 and up.
-    def render(*args)
-      render_output = nil
-      exception = nil
-      self.view_runtime = cleanup_view_runtime do
-        Benchmark.ms do
-          begin
-            render_output = super
-          rescue Exception => exception
-          end
-        end
-      end
-      raise exception if exception
-      render_output
-    end unless Rails::VERSION::STRING >= "3.0"
-
     def cleanup_view_runtime #:nodoc:
       consumed_before_rendering = TimeBandits.consumed
       runtime = yield
@@ -52,32 +13,6 @@ module ActionController #:nodoc:
 
     private
 
-    if Rails::VERSION::STRING =~ /\A3\.[01]/
-      def get_raw_payload
-        {
-          :controller => self.class.name,
-          :action     => self.action_name,
-          :params     => request.filtered_parameters,
-          :formats    => request.formats.map(&:to_sym),
-          :method     => request.method,
-          :path       => (request.fullpath rescue "unknown")
-        }
-      end
-    elsif Rails::VERSION::STRING =~ /\A3\.2/
-      def get_raw_payload
-        {
-          :controller => self.class.name,
-          :action     => self.action_name,
-          :params     => request.filtered_parameters,
-          :format     => request.format.try(:ref),
-          :method     => request.method,
-          :path       => (request.fullpath rescue "unknown")
-        }
-      end
-    elsif Rails::VERSION::STRING < "3"
-      raise "time_bandits ActionController monkey patch is not compatible with your Rails version"
-    end
-
     module ClassMethods
       # patch to log rendering time with more precision
       def log_process_action(payload) #:nodoc:
@@ -104,7 +39,7 @@ module ActionController #:nodoc:
 
       # this is an ugly hack to ensure completed lines show up in the test logs
       # TODO: move this code to some other place
-      return unless Rails.env.test? && Rails::VERSION::STRING >= "3.2"
+      return unless Rails.env.test?
 
       status = payload[:status]
       if status.nil? && payload[:exception].present?