wireframe-rpm_contrib 1.0.12.3 → 1.0.12.4

data/CHANGELOG

@@ -1,4 +1,4 @@
-* Version 1.0.12.3
+* Version 1.0.12.4
 
   Add backgrounded resque support
 

data/lib/rpm_contrib/instrumentation/resque.rb

@@ -13,15 +13,35 @@ module RPMContrib
         old_perform_method = instance_method(:perform)
 
         define_method(:perform) do
-          class_name = (payload_class ||self.class).name
           NewRelic::Agent.reset_stats if NewRelic::Agent.respond_to? :reset_stats
-          perform_action_with_newrelic_trace(:name => 'perform', :class_name => class_name,
-                                             :category => 'OtherTransaction/ResqueJob') do
+          perform_action_with_newrelic_trace(trace_options) do
             old_perform_method.bind(self).call
           end
 
           NewRelic::Agent.shutdown unless defined?(::Resque.before_child_exit)
         end
+
+        private
+        def backgrounded_job?
+          if defined?(::Backgrounded::Handler::ResqueHandler) && self.is_a?(::Backgrounded::Handler::ResqueHandler)
+        end
+        def trace_options
+          if backgrounded_job?
+            {
+              :class_name => args[0],
+              :name => args[2].to_s,
+              :params => @payload,
+              :category => 'OtherTransaction/BackgroundedResqueJob'
+            }
+          else
+            class_name = (payload_class ||self.class).name
+            {
+              :class_name => class_name,
+              :name => 'perform',
+              :category => 'OtherTransaction/ResqueJob'
+            }
+          end
+        end
       end
 
       if defined?(::Resque.before_child_exit)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: wireframe-rpm_contrib
 version: !ruby/object:Gem::Version 
-  hash: 105
+  hash: 103
   prerelease: false
   segments: 
   - 1
   - 0
   - 12
-  - 3
-  version: 1.0.12.3
+  - 4
+  version: 1.0.12.4
 platform: ruby
 authors: 
 - Bill Kayser
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-02 00:00:00 -05:00
+date: 2010-10-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,11 +55,9 @@ files:
 - Rakefile
 - lib/new_relic/control/camping.rb
 - lib/rpm_contrib.rb
-- lib/rpm_contrib/detection/backgrounded_resque.rb
 - lib/rpm_contrib/detection/camping.rb
 - lib/rpm_contrib/detection/resque.rb
 - lib/rpm_contrib/instrumentation/aws/s3.rb
-- lib/rpm_contrib/instrumentation/backgrounded_resque.rb
 - lib/rpm_contrib/instrumentation/camping.rb
 - lib/rpm_contrib/instrumentation/cassandra.rb
 - lib/rpm_contrib/instrumentation/mongo_mapper.rb

data/lib/rpm_contrib/detection/backgrounded_resque.rb

@@ -1,15 +0,0 @@
-# Detect when running backgrounded with resque and set the framework and dispatcher.
-
-module NewRelic
-  class LocalEnvironment
-    module BackgroundedResque
-      def discover_dispatcher
-        super
-        if defined?(::Backgrounded::Handler::ResqueHandler) && @dispatcher.nil?
-          @dispatcher = 'backgrounded_resque'
-        end
-      end
-    end
-  end
-end
-

data/lib/rpm_contrib/instrumentation/backgrounded_resque.rb

@@ -1,38 +0,0 @@
-
-module RPMContrib
-  module Instrumentation
-    # == Backgrounded Resque Instrumentation
-    #
-    # Installs a hook to ensure the agent starts manually when the worker
-    # starts and also adds the tracer to the process method which executes
-    # in the forked task.
-    module BackgroundedResqueInstrumentation
-      ::Resque::Job.class_eval do
-        include NewRelic::Agent::Instrumentation::ControllerInstrumentation
-        
-        old_perform_method = instance_method(:perform)
-
-        define_method(:perform) do
-          options = {
-            :class_name => args[0],
-            :name => args[2].to_s,
-            :params => {:id => args[1]},
-            :category => 'OtherTransaction/BackgroundedResqueJob'
-          }
-          NewRelic::Agent.reset_stats if NewRelic::Agent.respond_to? :reset_stats
-          perform_action_with_newrelic_trace(options) do
-            old_perform_method.bind(self).call
-          end
-
-          NewRelic::Agent.shutdown unless defined?(::Resque.before_child_exit)
-        end
-      end
-
-      if defined?(::Resque.before_child_exit)
-        ::Resque.before_child_exit do |worker|
-          NewRelic::Agent.shutdown
-        end
-      end
-    end
-  end
-end if defined?(::Backgrounded::Handler::ResqueHandler) and not NewRelic::Control.instance['disable_backgrounded_resque']