tunemygc 1.0.55 → 1.0.56

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9bc21ec0d45e156bf1a8646f766c5e2faef5b50
-  data.tar.gz: 575e3a4b82a1eb2fca4c7f4dd1c66e8763909a8e
+  metadata.gz: c7729fb0e74aeaa4d3015d0e2204c4aaf07c140c
+  data.tar.gz: 73ba3d4ea9b191a881f69eb32477d7fb055b512d
 SHA512:
-  metadata.gz: c2cd02a42b1e7f8af391cb2146d803cb006152e3b7288ebcac0ae26920dd1c045b7b0165d51100b4a220320a02f75cd78207c59ec988e7d0f4a56269583eebff
-  data.tar.gz: 9c53a726d80c244e7db4cb7386091aaa7fe2931e2757618c39e93910b337f7494dea7d81f9097c743fc617181cc55b9a819e4ee2e143f80bdc68d1131f2e8910
+  metadata.gz: ec0ad98014be93b9416c1d786c09194b24300947a02fe305c5e5d06bc098c9ca5a4928e03523c2697675f7b0286e69e187adc2819a4fdbdb9c0b343b75509018
+  data.tar.gz: 9128687fbac2a36cb712c1fe0005f4b228f10b97785408d98b2f57f84078a6102268a100eb3148b3448bb6c72cbff1a072646a138cc16930bf6eb2a194fd8a8f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tunemygc (1.0.53)
+    tunemygc (1.0.56)
 
 GEM
   remote: https://rubygems.org/
@@ -46,6 +46,8 @@ GEM
     builder (3.2.2)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
+    delayed_job (4.0.6)
+      activesupport (>= 3.0, < 5.0)
     erubis (2.7.0)
     globalid (0.3.0)
       activesupport (>= 4.1.0)
@@ -117,6 +119,7 @@ PLATFORMS
 DEPENDENCIES
   activejob (~> 4.2, >= 4.2.0)
   activesupport (~> 4.1)
+  delayed_job (~> 4.0.6, >= 4.0.6)
   rails
   rake (~> 10.3)
   rake-compiler (~> 0.9, >= 0.9.5)

data/README.md

@@ -108,9 +108,9 @@ And after some profiling requests, when the process terminates, you can visit th
 
 #### Advanced
 
-* `RUBY_GC_SPY=action_controller` (Spy on the GC for this type of processing. `action_controller`, `active_job`, `que_job`, `minitest` or `rspec` are supported)
+* `RUBY_GC_SPY=action_controller` (Spy on the GC for this type of processing. `action_controller`, `active_job`, `delayed_job`, `que_job`, `minitest` or `rspec` are supported)
 
-Defines what type of processing you would like to sample for GC activity. An Action Controller spy is the default, but [ActiveJob](https://github.com/rails/rails/tree/master/activejob), [que](https://github.com/chanks/que), [minitest](https://github.com/seattlerb/minitest) and [rspec](http://rspec.info) are also supported as experimental features.
+Defines what type of processing you would like to sample for GC activity. An Action Controller spy is the default, but [ActiveJob](https://github.com/rails/rails/tree/master/activejob), [delayed_job](https://github.com/collectiveidea/delayed_job), [que](https://github.com/chanks/que), [minitest](https://github.com/seattlerb/minitest) and [rspec](http://rspec.info) are also supported as experimental features.
 
 ## How do I use this?
 

data/lib/tunemygc/spies/delayed_job.rb

@@ -0,0 +1,35 @@
+# encoding: utf-8
+
+require 'delayed_job'
+
+module Delayed
+  module Plugins
+    class TuneMyGcPlugin < Delayed::Plugin
+      callbacks do |lifecycle|
+        lifecycle.around(:invoke_job) do |job, *args, &block|
+          TuneMyGc.processing_started
+          block.call(job, *args)
+          TuneMyGc.processing_ended
+        end
+      end
+    end
+  end
+end
+
+module TuneMyGc
+  module Spies
+    class DelayedJob < TuneMyGc::Spies::Base
+      def install
+        Delayed::Worker.plugins << Delayed::Plugins::TuneMyGcPlugin
+        TuneMyGc.log "hooked: delayed_job"
+      end
+
+      def uninstall
+        TuneMyGc.uninstall_gc_tracepoint
+        TuneMyGc.log "uninstalled GC tracepoint"
+        Delayed::Worker.plugins.delete(Delayed::Plugins::TuneMyGcPlugin)
+        TuneMyGc.log "uninstalled delayed_job spy"
+      end
+    end
+  end
+end

data/lib/tunemygc/spies.rb

@@ -8,12 +8,21 @@ module TuneMyGc
     end
 
     spy :Base, 'base'
+
+    # Web
     spy :ActionController, 'action_controller'
-    spy :Minitest, 'minitest'
-    spy :ActiveJob, 'active_job'
+
+    # Manual
     spy :Manual, 'manual'
+
+    # Tests
+    spy :Minitest, 'minitest'
     spy :Rspec, 'rspec'
+
+    # Async jobs
+    spy :ActiveJob, 'active_job'
     spy :QueJob, 'que_job'
+    spy :DelayedJob, 'delayed_job'
 
     def self.ids
       current.map do |spy|

data/lib/tunemygc/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module TuneMyGc
-  VERSION = "1.0.55"
+  VERSION = "1.0.56"
 end

data/test/delayed_job_test_backend.rb

@@ -0,0 +1,117 @@
+require 'ostruct'
+
+# An in-memory backend suitable only for testing. Tries to behave as if it were an ORM.
+module Delayed
+  module Backend
+    module Test
+      class Job
+        attr_accessor :id
+        attr_accessor :priority
+        attr_accessor :attempts
+        attr_accessor :handler
+        attr_accessor :last_error
+        attr_accessor :run_at
+        attr_accessor :locked_at
+        attr_accessor :locked_by
+        attr_accessor :failed_at
+        attr_accessor :queue
+
+        include Delayed::Backend::Base
+
+        cattr_accessor :id
+        self.id = 0
+
+        def initialize(hash = {})
+          self.attempts = 0
+          self.priority = 0
+          self.id = (self.class.id += 1)
+          hash.each { |k, v| send(:"#{k}=", v) }
+        end
+
+        def self.all
+          @jobs ||= []
+        end
+
+        def self.count
+          all.size
+        end
+
+        def self.delete_all
+          all.clear
+        end
+
+        def self.create(attrs = {})
+          new(attrs).tap do |o|
+            o.save
+          end
+        end
+
+        def self.create!(*args)
+          create(*args)
+        end
+
+        def self.clear_locks!(worker_name)
+          all.select { |j| j.locked_by == worker_name }.each do |j|
+            j.locked_by = nil
+            j.locked_at = nil
+          end
+        end
+
+        # Find a few candidate jobs to run (in case some immediately get locked by others).
+        def self.find_available(worker_name, limit = 5, max_run_time = Worker.max_run_time) # rubocop:disable CyclomaticComplexity, PerceivedComplexity
+          jobs = all.select do |j|
+            j.run_at <= db_time_now &&
+              (j.locked_at.nil? || j.locked_at < db_time_now - max_run_time || j.locked_by == worker_name) &&
+              !j.failed?
+          end
+          jobs.select! { |j| j.priority <= Worker.max_priority } if Worker.max_priority
+          jobs.select! { |j| j.priority >= Worker.min_priority } if Worker.min_priority
+          jobs.select! { |j| Worker.queues.include?(j.queue) } if Worker.queues.any?
+          jobs.sort_by! { |j| [j.priority, j.run_at] }[0..limit - 1]
+        end
+
+        # Lock this job for this worker.
+        # Returns true if we have the lock, false otherwise.
+        def lock_exclusively!(_max_run_time, worker)
+          now = self.class.db_time_now
+          if locked_by != worker
+            # We don't own this job so we will update the locked_by name and the locked_at
+            self.locked_at = now
+            self.locked_by = worker
+          end
+
+          true
+        end
+
+        def self.db_time_now
+          Time.current
+        end
+
+        def update_attributes(attrs = {})
+          attrs.each { |k, v| send(:"#{k}=", v) }
+          save
+        end
+
+        def destroy
+          self.class.all.delete(self)
+        end
+
+        def save
+          self.run_at ||= Time.current
+
+          self.class.all << self unless self.class.all.include?(self)
+          true
+        end
+
+        def save!
+          save
+        end
+
+        def reload
+          reset
+          self
+        end
+      end
+    end
+  end
+end

data/test/test_delayed_job_interposer.rb

@@ -0,0 +1,96 @@
+# encoding: utf-8
+
+require File.join(File.dirname(__FILE__), 'helper')
+require 'delayed_job'
+
+Delayed::Worker.delay_jobs = false
+
+NewsletterJob = Struct.new(:text, :emails) do
+  def perform
+  end
+end
+
+class TestDelayedJobInterposer < TuneMyGcTestCase
+  def setup
+    TuneMyGc.interposer.uninstall
+  end
+
+  def teardown
+    TuneMyGc.interposer = TuneMyGc::Interposer.new([:ActionController])
+  end
+
+  def test_init
+    TuneMyGc.interposer = TuneMyGc::Interposer.new([:DelayedJob])
+    interposer = TuneMyGc.interposer
+    assert !interposer.installed
+  end
+
+  def test_install_uninstall
+    TuneMyGc.interposer = TuneMyGc::Interposer.new([:DelayedJob])
+    interposer = TuneMyGc.interposer
+    interposer.install
+    interposer.on_initialized
+    assert interposer.installed
+    assert_nil interposer.install
+
+    interposer.uninstall
+  end
+
+  def test_gc_hooks
+    TuneMyGc.interposer = TuneMyGc::Interposer.new([:DelayedJob])
+    interposer = TuneMyGc.interposer
+    interposer.install
+    TuneMyGc.interposer.on_initialized
+
+    GC.start(full_mark: true, immediate_sweep: false)
+    GC.start(full_mark: true, immediate_sweep: true)
+
+    stages = []
+
+    while !TuneMyGc.snapshotter.empty?
+      stages << TuneMyGc.snapshotter.deq
+    end
+
+    # Account for incremental GC on 2.2
+    cycles = [:GC_CYCLE_STARTED, :GC_CYCLE_ENTERED]
+
+    assert stages.any?{|s| cycles.include?(s[3]) }
+
+    interposer.uninstall
+  end
+
+  def test_tests_limit
+    TuneMyGc.interposer = TuneMyGc::Interposer.new([:DelayedJob])
+    interposer = TuneMyGc.interposer
+    interposer.install
+    TuneMyGc.interposer.on_initialized
+
+    ENV["RUBY_GC_TUNE"] = "2"
+
+    require 'delayed_job_test_backend'
+    Delayed.const_set(:Job, Delayed::Backend::Test::Job)
+    worker = Delayed::Worker.new(:max_priority => nil, :min_priority => nil, :quiet => true)
+    worker.work_off
+
+    run_newsletter_job
+    run_newsletter_job
+
+    stages = []
+
+    while !TuneMyGc.snapshotter.empty?
+      stages << TuneMyGc.snapshotter.deq
+    end
+
+    cycles = [:PROCESSING_STARTED]
+
+    assert stages.any?{|s| cycles.include?(s[3]) }
+
+    interposer.uninstall
+  ensure
+    ENV["RUBY_GC_TUNE"] = "1"
+  end
+
+  def run_newsletter_job
+    Delayed::Job.enqueue NewsletterJob.new("test", %w(lourens@bearmetal.eu))
+  end
+end

data/tunemygc.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rake-compiler', '~> 0.9', '>= 0.9.5')
   s.add_development_dependency('webmock', '~> 1.2', '>= 1.2.0')
   s.add_development_dependency('activejob', '~> 4.2', '>= 4.2.0')
+  s.add_development_dependency('delayed_job', '~> 4.0.6', '>= 4.0.6')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tunemygc
 version: !ruby/object:Gem::Version
-  version: 1.0.55
+  version: 1.0.56
 platform: ruby
 authors:
 - Bear Metal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2015-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -98,6 +98,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
+- !ruby/object:Gem::Dependency
+  name: delayed_job
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.6
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.6
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.6
 description: Agent for the GC tuning webservice https://www.tunemygc.com - optimal
   settings for throughput and memory usage of Ruby applications
 email:
@@ -133,6 +153,7 @@ files:
 - lib/tunemygc/spies/action_controller.rb
 - lib/tunemygc/spies/active_job.rb
 - lib/tunemygc/spies/base.rb
+- lib/tunemygc/spies/delayed_job.rb
 - lib/tunemygc/spies/manual.rb
 - lib/tunemygc/spies/minitest.rb
 - lib/tunemygc/spies/que_job.rb
@@ -140,11 +161,13 @@ files:
 - lib/tunemygc/subscriber.rb
 - lib/tunemygc/syncer.rb
 - lib/tunemygc/version.rb
+- test/delayed_job_test_backend.rb
 - test/fixtures.rb
 - test/helper.rb
 - test/test_action_controller_interposer.rb
-- test/test_activejob_interposer.rb
+- test/test_active_job_interposer.rb
 - test/test_agent.rb
+- test/test_delayed_job_interposer.rb
 - test/test_minitest_interposer.rb
 - test/test_railtie.rb
 - test/test_snapshotter.rb
@@ -175,11 +198,13 @@ signing_key:
 specification_version: 4
 summary: TuneMyGC - optimal MRI Ruby 2.1+ Garbage Collection
 test_files:
+- test/delayed_job_test_backend.rb
 - test/fixtures.rb
 - test/helper.rb
 - test/test_action_controller_interposer.rb
-- test/test_activejob_interposer.rb
+- test/test_active_job_interposer.rb
 - test/test_agent.rb
+- test/test_delayed_job_interposer.rb
 - test/test_minitest_interposer.rb
 - test/test_railtie.rb
 - test/test_snapshotter.rb