harness 0.2.5 → 0.2.6

data/lib/harness/integration/sidekiq.rb

@@ -0,0 +1,34 @@
+module Sidekiq
+  module Middleware
+    module Server
+      class HarnessInstrumentation
+        def call(worker_class, item, queue)
+          if instrument? worker_class
+            options = {}
+            options[:gauge] = "#{worker_class.class.to_s.underscore}.sidekiq"
+            options[:counter] = "#{worker_class.class.to_s.pluralize.underscore}.sidekiq"
+
+            ActiveSupport::Notifications.instrument "#{worker_class.class.to_s.underscore}.sidekiq", options do
+              yield
+            end
+
+            ActiveSupport::Notifications.instrument "job.sidekiq", :counter => true
+          else
+            yield
+          end
+        end
+
+        private
+        def instrument?(worker_class)
+          worker_class !~ /^Harness/
+        end
+      end
+    end
+  end
+end
+
+Sidekiq.configure_server do |config|
+  config.server_middleware do |chain|
+    chain.add Sidekiq::Middleware::Server::HarnessInstrumentation
+  end
+end

data/lib/harness/railtie.rb

@@ -30,14 +30,24 @@ module Harness
     end
 
     initializer "harness.queue" do
-      if defined? Resque
+      Harness.config.queue = Harness::SyncronousQueue
+    end
+
+    initializer "harness.queue.production" do |app|
+      use_real_queue = Rails.env != 'development' && Rails.env != 'test'
+
+      if defined?(Resque) && use_real_queue
         require 'harness/queues/resque_queue'
         Harness.config.queue = :resque
-      elsif defined? Sidekiq
+      elsif defined?(Sidekiq) && use_real_queue
         require 'harness/queues/sidekiq_queue'
         Harness.config.queue = :sidekiq
-      else
-        Harness.config.queue = Harness::SyncronousQueue
+      end
+    end
+
+    initializer "harness.sidekiq" do |app|
+      if defined? Sidekiq
+        require 'harness/integration/sidekiq'
       end
     end
   end

data/lib/harness/version.rb

@@ -1,3 +1,3 @@
 module Harness
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/test/integration/integrations/sidekiq_test.rb

@@ -0,0 +1,34 @@
+require 'test_helper'
+require 'sidekiq'
+require 'harness/integration/sidekiq'
+
+class SidekiqIntegrationTest < IntegrationTest
+  def middleware
+    Sidekiq::Middleware::Server::HarnessInstrumentation.new
+  end
+
+  def tests_logs_job_performance_stats
+    middleware.call("report", nil, nil) { }
+
+    assert_gauge_logged "report.sidekiq"
+    assert_counter_logged "reports.sidekiq"
+  end
+
+  def tests_logs_a_counter_of_all_jobs
+    middleware.call("reports", nil, nil) { }
+
+    assert_counter_logged "job.sidekiq"
+  end
+
+  def test_ignores_harness_jobs
+    middleware.call("Harness::SidekiqQueue::SendCounter", nil, nil) { }
+
+    assert_empty counters
+    assert_empty gauges
+
+    middleware.call("Harness::SidekiqQueue::SendGauge", nil, nil) { }
+
+    assert_empty counters
+    assert_empty gauges
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: harness
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-08 00:00:00.000000000 Z
+date: 2012-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70254849265340 !ruby/object:Gem::Requirement
+  requirement: &70238567232420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *70254849265340
+  version_requirements: *70238567232420
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70254849264700 !ruby/object:Gem::Requirement
+  requirement: &70238567232000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70254849264700
+  version_requirements: *70238567232000
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70254849264220 !ruby/object:Gem::Requirement
+  requirement: &70238567231540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70254849264220
+  version_requirements: *70238567231540
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70254849263400 !ruby/object:Gem::Requirement
+  requirement: &70238567231120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70254849263400
+  version_requirements: *70238567231120
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70254849262580 !ruby/object:Gem::Requirement
+  requirement: &70238567230700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70254849262580
+  version_requirements: *70238567230700
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &70254851992420 !ruby/object:Gem::Requirement
+  requirement: &70238567230280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70254851992420
+  version_requirements: *70238567230280
 - !ruby/object:Gem::Dependency
   name: sidekiq
-  requirement: &70254851996240 !ruby/object:Gem::Requirement
+  requirement: &70238567229860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70254851996240
+  version_requirements: *70238567229860
 description: ''
 email:
 - me@broadcastingadam.com
@@ -113,6 +113,7 @@ files:
 - lib/harness/integration/action_mailer.rb
 - lib/harness/integration/action_view.rb
 - lib/harness/integration/active_support.rb
+- lib/harness/integration/sidekiq.rb
 - lib/harness/job.rb
 - lib/harness/measurement.rb
 - lib/harness/meter.rb
@@ -128,6 +129,7 @@ files:
 - test/integration/integrations/action_mailer_test.rb
 - test/integration/integrations/action_view_test.rb
 - test/integration/integrations/active_support_test.rb
+- test/integration/integrations/sidekiq_test.rb
 - test/integration/logging_test.rb
 - test/integration/meter_test.rb
 - test/integration/queues/resque_test.rb
@@ -171,6 +173,7 @@ test_files:
 - test/integration/integrations/action_mailer_test.rb
 - test/integration/integrations/action_view_test.rb
 - test/integration/integrations/active_support_test.rb
+- test/integration/integrations/sidekiq_test.rb
 - test/integration/logging_test.rb
 - test/integration/meter_test.rb
 - test/integration/queues/resque_test.rb