rpm_contrib 1.0.3 → 1.0.4

data/CHANGELOG

@@ -1,3 +1,7 @@
+* Version 1.0.4
+
+  Resque support
+
 * Version 1.0.3
 
   MongoDB instrumentation contributed by John Nunemaker

data/README.md

@@ -1,28 +1,49 @@
 # The RPM Contrib Gem
 
-The `rpm_contrib` gem contains instrumentation for the New Relic RPM agent
-contributed by the community of RPM users.  It requires the RPM Agent
-to run.
+The `rpm_contrib` gem contains instrumentation for the New Relic RPM
+agent contributed by the community of RPM users.  It requires the RPM
+Agent to run.
 
-To use the contrib gem, install the `rpm_contrib` gem off gemcutter.  It will
-also install the required version of the `newrelic_rpm` gem if it's not 
-already installed.
+To use the contrib gem, install the `rpm_contrib` gem from gemcutter.
+It will also install the required version of the `newrelic_rpm` gem if
+it's not already installed.
 
-For Rails 2.1 and later, add the dependency in your initializer:
+For Rails 2.1 and later, add this dependency to your in your
+environment.rb:
 
     config.gem 'rpm_contrib'
 
-For other frameworks, make sure you load rubygems if it isn't already, then
-just require the contrib gem:
+For other frameworks, make sure you load rubygems if it isn't already,
+then just require the contrib gem:
 
     require 'rubygems'
     require 'rpm_contrib'
 
-When you load the rpm_contrib gem, the `newrelic_rpm` gem will also be initialized.
-No need for a separate require statement for `newrelic_rpm`.
+When you load the rpm_contrib gem, the `newrelic_rpm` gem will also be
+initialized.  No need for a separate require statement for
+`newrelic_rpm`.  The `rpm_contrib` gem must be loaded before the
+`newrelic_rpm` gem initializes.
+
+# Supported Frameworks
+
+A number of frameworks are supported in the contrib gem.  They are all
+turned on by default but you can add settings to your newrelic.yml to
+disable any of them.
+
+### Camping
+
+### Paperclip
+
+### Authlogic
+
+### MongoDB
+
+### Resque
+
+To disable resque, add this to your newrelic.yml:
+
+    disable_resque: true
 
-**It's important that you don't load the newrelic_rpm gem separately.** The 
-`rpm_contrib` gem must be loaded before the `newrelic_rpm` gem initializes.
 
 # How to Add Custom Instrumentation
 

data/Rakefile

@@ -18,7 +18,7 @@ begin
     gem.email = "support@newrelic.com"
     gem.homepage = "http://github.com/newrelic/rpm_contrib"
     gem.author = "Bill Kayser"
-    gem.add_dependency 'newrelic_rpm', '>= 2.10.6'
+    gem.add_dependency 'newrelic_rpm', '2.11.0.beta'
     gem.version = version
     gem.files = FileList['LICENSE', 'README*', 'lib/**/*.rb', 'bin/*', '[A-Z]*', 'test/**/*'].to_a
   end

data/lib/rpm_contrib.rb

@@ -5,7 +5,6 @@ module RPMContrib
   VERSION = File.read(RPM_CONTRIB_LIB+"/../CHANGELOG")[/Version ([\d\.]+)$/, 1]
 end
 
-
 # Perform any framework/dispatcher detection before loading the rpm
 # gem.
 
@@ -15,11 +14,21 @@ Dir.glob(RPM_CONTRIB_LIB + "/rpm_contrib/detection/**/*.rb") { |file| require fi
 
 require 'newrelic_rpm'
 
-# Tell the agent to load all the files in the rpm_contrib/instrumentation directory.
+init_sequence = Proc.new do
+  
+  # Tell the agent to load all the files in the
+  # rpm_contrib/instrumentation directory.
+  NewRelic::Agent.add_instrumentation(RPM_CONTRIB_LIB+"/rpm_contrib/instrumentation/**/*.rb")
+
+  # Load all the Sampler class definitions.  These will register
+  # automatically with the agent.
+  Dir.glob(RPM_CONTRIB_LIB + "/rpm_contrib/samplers/**/*.rb") { |file| require file }
+end
 
-NewRelic::Agent.add_instrumentation(RPM_CONTRIB_LIB+"/rpm_contrib/instrumentation/**/*.rb")
+if defined?(Rails.configuration)
+  Rails.configuration.after_initialize &init_sequence
+else
+  init_sequence.call
+end
 
-# Load all the Sampler class definitions.  These will register
-# automatically with the agent.
-Dir.glob(RPM_CONTRIB_LIB + "/rpm_contrib/samplers/**/*.rb") { |file| require file }
 

data/lib/rpm_contrib/detection/resque.rb

@@ -0,0 +1,15 @@
+# Detect when running under camping and set the framework and dispatcher.
+
+module NewRelic
+  class LocalEnvironment
+    module Resque
+      def discover_dispatcher
+        super
+        if defined?(::Resque::Worker) && @dispatcher.nil?
+          @dispatcher = 'resque'
+        end
+      end
+    end
+  end
+end
+

data/lib/rpm_contrib/instrumentation/resque.rb

@@ -0,0 +1,39 @@
+# == 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 RPMContrib
+  module Instrumentation
+    module ResqueInstrumentation
+
+      ::Resque::Worker.class_eval do
+        include NewRelic::Agent::Instrumentation::ControllerInstrumentation
+        old_process_method = instance_method(:process)
+        define_method(:process) do | *args |
+          if args[0]
+            class_name = args[0].payload_class.name
+          else
+            class_name = 'Resque::Job'
+          end
+          name = 'process'
+          perform_action_with_newrelic_trace(:name => name, :class_name => class_name,
+                                             :category => 'OtherTransaction/ResqueJob') do
+            old_process_method.bind(self).call(*args)
+          end
+          NewRelic::Agent.shutdown
+        end
+        
+        old_work_method = instance_method(:work)
+        
+        define_method(:work) do | *args |
+          RAILS_DEFAULT_LOGGER.info "Sarting Resque monitoring"
+          old_work_method.bind(self).call(*args)
+        end
+      end
+      
+    end
+  end
+end if defined?(::Resque::Worker) and not NewRelic::Control.instance['disable_resque']
+

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - Bill Kayser
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-11 00:00:00 -08:00
+date: 2010-03-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,13 +22,14 @@ dependencies:
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         segments: 
         - 2
-        - 10
-        - 6
-        version: 2.10.6
+        - 11
+        - 0
+        - beta
+        version: 2.11.0.beta
   type: :runtime
   version_requirements: *id001
 description: "      Community contributed instrumentation for various frameworks based on\n      the New Relic Ruby monitoring gem newrelic_rpm.\n"
@@ -48,10 +49,12 @@ files:
 - lib/new_relic/control/camping.rb
 - lib/rpm_contrib.rb
 - lib/rpm_contrib/detection/camping.rb
+- lib/rpm_contrib/detection/resque.rb
 - lib/rpm_contrib/instrumentation/authlogic.rb
 - lib/rpm_contrib/instrumentation/camping.rb
 - lib/rpm_contrib/instrumentation/mongodb.rb
 - lib/rpm_contrib/instrumentation/paperclip.rb
+- lib/rpm_contrib/instrumentation/resque.rb
 - test/helper.rb
 - test/schema.rb
 - test/test_rpm_contrib.rb