rpm_contrib 1.0.6 → 1.0.7

data/CHANGELOG

@@ -1,3 +1,7 @@
+* Version 1.0.7
+
+  Resque instrumentation now supports the resque-multi-job-forks plugin
+
 * Version 1.0.6
 
   Update newrelic dependency: depends on 2.11.1

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 New Relic, Inc.
+Copyright (c) 2009-2010 New Relic, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/{README.md → README.rdoc}

@@ -1,4 +1,4 @@
-# The RPM Contrib Gem
+= 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
@@ -24,28 +24,41 @@ 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
+= 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
+=== Camping
 
-### Paperclip
+The gem will detect a Camping app but you need to manually add the
+instrumentation to your configuration file.  See RPMContrib::Instrumentation::Camping 
+for more information.
 
-### Authlogic
+=== Paperclip
 
-### MongoDB
+No special configuration required for Paperclip visibility.  You can disable
+it by setting `disable_paperclip` to true in the newrelic.yml file.
 
-### Resque
+=== Authlogic
+
+No special configuration required for Authlogic visibility.  You can disable
+it by setting `disable_authlogic` to true in the newrelic.yml file.
+
+=== MongoDB
+
+No special configuration required for MongoDB visibility.  You can disable
+it by setting `disable_mongodb` to true in the newrelic.yml file.
+
+=== Resque
 
 To disable resque, add this to your newrelic.yml:
 
     disable_resque: true
 
 
-# How to Add Custom Instrumentation
+= How to Add Custom Instrumentation
 
 We encourage contributions to this project and will provide whatever
 assistance we can to those wishing to develop instrumentation for
@@ -66,7 +79,7 @@ with this gem.
   web dispatcher, or be [started manually](http://support.newrelic.com/faqs/general/manual-start).
 * Framework support, for alternatives to Rails like Camping or Ramaze
 
-## Custom Tracers
+== Custom Tracers
 
 Custom tracers for frameworks should be added to the `lib/rpm_contrib/instrumentation`
 directory.  These files are loaded at the time the Agent starts.  **They will not
@@ -86,7 +99,7 @@ docs.
 
 A good example can be found in `lib/rpm_contrib/instrumentation/paperclip.rb`.
 
-## Samplers
+== Samplers
 
 You can add samplers which will record metrics approximately once a minute.  Samplers
 are useful for capturing generic instrumentation for display in 
@@ -97,7 +110,7 @@ class.  They should be placed in the `samplers` directory.
 
 Refer to examples in the RPM agent to see how to get started.
 
-## Supporting New Dispatchers
+== Supporting New Dispatchers
 
 If you want to add support for a new dispatcher which is not being recognized by default
 by the RPM agent, add code to the `rpm_contrib/detection` directory.  This code needs
@@ -108,7 +121,7 @@ This module should define the method `discover_dispatcher` and return the name o
 dispatcher if detected, or defer to super.  See `rpm_contrib/detection/camping.rb`
 for a good example.
 
-## Supporting New Frameworks
+== Supporting New Frameworks
 
 Supporting new frameworks can be pretty involved and generally involves both
 adding custom instrumentation as well as framework and dispatcher detection.
@@ -121,7 +134,7 @@ Refer to the camping example in this gem to see how this is done in general.
 If you decide to tackle any new frameworks, contact support@newrelic.com and
 we'll be happy to help you work through it.
 
-# Note on Patches/Pull Requests
+= Note on Patches/Pull Requests
  
 * Fork the http://www.github.com/newrelic/rpm_contrib project.
 * Add instrumentation files to `lib/rpm_contrib/instrumentation`.  These
@@ -134,14 +147,15 @@ we'll be happy to help you work through it.
   commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
-# Further Information
+= Further Information
 
-Refer to the [Agent API Documentation](http://newrelic.github.com/rpm).
+Refer to the Agent API Documentation at http://newrelic.github.com/rpm
 
-See [the support site](http://support.newrelic.com/faqs) for additional tips and documentation.
+See the support site faqs at http://support.newrelic.com/faqs for
+additional tips and documentation.
 
 Contact support@newrelic.com for help.
 
-### Copyright
+=== Copyright
 
-Copyright (c) 2010 New Relic. See LICENSE for details.
+Copyright (c) 2009-2010 New Relic. See LICENSE for details.

data/Rakefile

@@ -55,8 +55,15 @@ require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "rpm_contrib #{version}"
+  rdoc.main = "README.rdoc"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('LICENSE')
   rdoc.rdoc_files.include('CHANGELOG')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+begin
+  require 'sdoc_helpers'
+rescue LoadError
+  puts "sdoc support not enabled. Please gem install sdoc-helpers."
+end

data/lib/rpm_contrib/instrumentation/authlogic.rb

@@ -1,4 +1,4 @@
-if defined? Authlogic::Session::Base
+if defined? Authlogic::Session::Base && !NewRelic::Control.instance['disable_authlogic']
   Authlogic::Session::Base.class_eval do
   #  add_method_tracer :record, 'Authlogic/record'
     class << self

data/lib/rpm_contrib/instrumentation/mongodb.rb

@@ -1,8 +1,9 @@
 # Just drop this little diddy in your app to get some (not perfect) information on query times and such
 # This will eventually become an official plugin but for those who can't wait, enjoy.
 
-if defined?(::MongoMapper)
-  module MMNewRelicTracing
+
+module RPMContrib::Instrumentation
+  module MongoDB
     def self.included(model)
       model.metaclass.class_eval do
         add_method_tracer :find,        'Database/#{self.name}/find'
@@ -36,5 +37,5 @@ if defined?(::MongoMapper)
       end
     end
   end
-  ::MongoMapper::Document.append_inclusions(MMNewRelicTracing)
-end
+  ::MongoMapper::Document.append_inclusions(::RPMContrib::Instrumentation::MongoDB)
+end if defined?(::MongoMapper) && !NewRelic::Control.instance['disable_mongodb']

data/lib/rpm_contrib/instrumentation/paperclip.rb

@@ -1,6 +1,6 @@
 # Paperclip Instrumentation.
  
-if defined? ::Paperclip
+if defined?(::Paperclip) && !NewRelic::Control.instance['disable_paperclip']
  
   ::Paperclip::Attachment.class_eval do
     add_method_tracer :save, 'Paperclip/#{name}/save'

data/lib/rpm_contrib/instrumentation/resque.rb

@@ -7,34 +7,28 @@
 module RPMContrib
   module Instrumentation
     module ResqueInstrumentation
-
-      ::Resque::Worker.class_eval do
+      ::Resque::Job.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'
+        
+        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 => name, :class_name => class_name,
+          perform_action_with_newrelic_trace(:name => 'perform', :class_name => class_name,
                                              :category => 'OtherTransaction/ResqueJob') do
-            old_process_method.bind(self).call(*args)
+            old_perform_method.bind(self).call
           end
-          NewRelic::Agent.shutdown
+
+          NewRelic::Agent.shutdown unless defined?(::Resque.before_child_exit)
         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
+
+      if defined?(::Resque.before_child_exit)
+        ::Resque.before_child_exit do |worker|
+          NewRelic::Agent.shutdown
         end
       end
-      
     end
   end
-end if defined?(::Resque::Worker) and not NewRelic::Control.instance['disable_resque']
-
+end if defined?(::Resque::Job) and not NewRelic::Control.instance['disable_resque']

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 6
-  version: 1.0.6
+  - 7
+  version: 1.0.7
 platform: ruby
 authors: 
 - Bill Kayser
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-02 00:00:00 -07:00
+date: 2010-04-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,11 +39,11 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE
-- README.md
+- README.rdoc
 files: 
 - CHANGELOG
 - LICENSE
-- README.md
+- README.rdoc
 - Rakefile
 - lib/new_relic/control/camping.rb
 - lib/rpm_contrib.rb