rpm_contrib 2.1.0 → 2.1.1

data/CHANGELOG

@@ -1,3 +1,8 @@
+* Version 2.1.1
+  
+  Fix namespacing problem with Resque
+  Add instrumentation to Mongo::Cursor #refresh and #close - thanks to Chris Griego
+
 * Version 2.1.0
 
   Included instrumentation from the community:

data/README.md

@@ -30,30 +30,65 @@ initialized.  No need for a separate require statement for `newrelic_rpm`.  The
 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.
 
+### ActiveMQ
+
+The gem will detect the underlying ActiveMessaging::Processor class and instrument the `on_message` method
+
+It can be disabled with the `disable_active_mq` flag in your newrelic.yml file.
+
+### Cassandra
+
+The gem will instrument Cassandra so it should be visible in transaction traces and the web transactions page.
+
+You can disable it with `disable_cassandra_instrumentation` in your newrelic.yml file.
+
 ### Camping
 
 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.
 
+### Crack
+
+The gem will instrument the Crack parsers for JSON and XML - you
+should see them in transaction traces and the web transactions page.
+
+You can disable it with `disable_crack` in your newrelic.yml file.
+
+### Curb
+
+The gem will instrument both Curl::Easy and Curl::Multi - they should show up similarly to Net::HTTP in the UI
+
+You can disable it with `disable_curb` in your newrelic.yml file.
+
+## Elastic Search
+
+The gem will instrument ElasticSearch::Client. The metrics should show up in the UI
+
+You can disable it with `disable_elastic_search_instrumentation` in your newrelic.yml file.
+
 ### Paperclip
 
-No special configuration required for Paperclip visibility.  You can disable
-it by setting `disable_paperclip` to true in the newrelic.yml file.
+No special configuration required for Paperclip visibility.  
+
+You can disable it by setting `disable_paperclip` to true in your newrelic.yml file.
 
 ### MongoDB
 
-Both MongoMapper and Mongoid are supported.  You can disable them both by setting
-'disable_mongodb' to true in the newrelic.yml file.
+Our instrumentation works on the underlying 'Mongo' library.  
+
+You can disable it by setting 'disable_mongodb' to true in your newrelic.yml file.
 
 ### Resque
 
 Make sure that your jobs either inherit from Resque::Job or else include our instrumentation:
 
+```ruby
 class MyJob
   require 'rpm_contrib/instrumentation/resque'
   include Resque::Plugins::NewRelicInstrumentation
 end
+```
 
 To disable resque, set 'disable_resque' to true in your newrelic.yml file.
 
@@ -61,8 +96,39 @@ To disable resque, set 'disable_resque' to true in your newrelic.yml file.
 
 Redis instrumentation will record operations as well as `allWeb` and `allOther`
 summary metrics under the `Database/Redis` metric namespace. This instrumentation
-supports Redis versions 1.x and 2.x. To disable Redis instrumentation, set
-'disable_redis' to true in your newrelic.yml file.
+supports Redis versions 1.x and 2.x. 
+
+To disable Redis instrumentation, set 'disable_redis' to true in your newrelic.yml file.
+
+### Sinatra view instrumentation
+
+This adds instrumentation to the `render` methods in Sinatra::Base
+
+You can disable it with `disable_sinatra_template` in your newrelic.yml file.
+
+### Typhoeus instrumentation
+
+This adds instrumentation to the Typhoeus::Request class for 'GET' requests
+
+You can disable it with `disable_typhoeus` in your newrelic.yml file.
+
+### Ultrasphinx instrumentation
+
+This adds basic instrumentation to the `run` and `results` method of Ultrasphinx::Search
+
+You can disable it with `disable_ultrasphinx` in your newrelic.yml file.
+
+### Workling
+
+This adds instrumentation to the Workling::Base and all children, for all defined public methods not inherited from the Workling::Base class
+
+You can disable it with `disable_workling` in your newrelic.yml file.
+
+### YAJL
+
+This adds instrumentation to the YAJL json parser
+
+You can disable it with `disable_yajl_instrumentation` in your newrelic.yml file.
 
 ### AWS/S3
 

data/lib/rpm_contrib/instrumentation/mongo.rb

@@ -25,8 +25,23 @@ module RpmContrib
           alias_method :instrument_without_newrelic_trace, :instrument
           alias_method :instrument, :instrument_with_newrelic_trace
         end
-      end
 
+        ::Mongo::Cursor.class_eval do
+          include NewRelic::Agent::MethodTracer
+
+          def refresh_with_newrelic_trace
+            return if send_initial_query || @cursor_id.zero? # don't double report the initial query
+
+            trace_execution_scoped("Database/#{collection.name}/refresh") do
+              refresh_without_newrelic_trace
+            end
+          end
+
+          alias_method :refresh_without_newrelic_trace, :refresh
+          alias_method :refresh, :refresh_with_newrelic_trace
+          add_method_tracer :close, 'Database/#{collection.name}/close'
+        end
+      end
     end
   end
 end

data/lib/rpm_contrib/instrumentation/resque.rb

@@ -24,7 +24,7 @@ module RPMContrib
       end
 
       ::Resque::Job.class_eval do
-        include Resque::Plugins::NewRelicInstrumentation
+        include ::Resque::Plugins::NewRelicInstrumentation
       end
     end
   end

data/lib/rpm_contrib/instrumentation/typhoeus.rb

@@ -1,7 +1,7 @@
 module RpmContrib
   module Instrumentation
     module Typhoeus
-      if defined?(::Typhoeus)
+      if defined?(::Typhoeus) and not ::NewRelic::Control.instance['disable_typhoeus']
         require 'uri'
         module ::Typhoeus
           Request.instance_eval do

data/lib/rpm_contrib/instrumentation/ultrasphinx.rb

@@ -3,7 +3,7 @@ require 'new_relic/agent/method_tracer'
 module RpmContrib
   module Instrumentation
     module UltraSphinx
-      if defined?(::UltraSphinx)
+      if defined?(::UltraSphinx) and not ::NewRelic::Control.instance['disable_ultrasphinx']
         module ::Ultrasphinx
           class Search
             include NewRelic::Agent::MethodTracer

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rpm_contrib
 version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: 
+  hash: 9
+  prerelease: false
   segments: 
   - 2
   - 1
-  - 0
-  version: 2.1.0
+  - 1
+  version: 2.1.1
 platform: ruby
 authors: 
 - Bill Kayser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-12 00:00:00 -07:00
+date: 2011-05-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Contributed Instrumentation for New Relic RPM