rpm_contrib 2.1.6.beta1 → 2.1.6

data/CHANGELOG

@@ -1,3 +1,13 @@
+* Version 2.1.6
+  Community contributed instrumentation
+  - ThinkingSphinx instrumentation (W. Andrew Loe III)
+  - Riak instrumentation (Bryce Kerley)
+  - KyotoTycoon instrumentation (Keisuke Kawahara)
+  Community Contributed Bug Fixes
+  - MongoDB instrumentation (Kenn Ejima)
+  - Yajl instrumentation (Chris Griego)
+  Renamed ActiveMQ instrumentation to ActiveMessaging (W. Andrew Loe III)
+
 * Version 2.1.5
 
   Changed the resque detection so it does not depend on the load
@@ -10,7 +20,7 @@
   Converted instrumentation to install with DependencyDetection in the latest Agent
   Changed Resque instrumentation from a plugin back to method chaining
   Fixed several reported bugs related to resque
-  
+
 * Version 2.1.3
 
   Fixed typo in Resque instrumentation
@@ -21,7 +31,7 @@
   Add a manual shutdown to the Resque instrumentation to make sure data is saved and sent - thanks to Jade Rubick
 
 * Version 2.1.1
-  
+
   Fix namespacing problem with Resque
   Add instrumentation to Mongo::Cursor #refresh and #close - thanks to Chris Griego
 
@@ -97,7 +107,7 @@
   MongoDB instrumentation contributed by John Nunemaker
 
 * Version 1.0.2
- 
+
   Improved Camping support
 
 * Version 1.0.1

data/Gemfile

@@ -0,0 +1,13 @@
+source :rubygems
+
+gem 'newrelic_rpm', '>=3.1.1'
+
+group :test do
+  gem 'resque'
+  gem 'json'
+  gem 'mocha'
+end
+
+group :build do
+  gem 'jeweler'
+end

data/README.md

@@ -48,11 +48,11 @@ and examine the `newrelic_agent.log` file for errors after restarting your app.
 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
+### ActiveMessaging
 
 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.
+It can be disabled with the `disable_active_messaging` flag in your newrelic.yml file.
 
 ### Cassandra
 
@@ -88,6 +88,12 @@ The gem will instrument ElasticSearch::Client. The metrics should show up in the
 
 You can disable it with `disable_elastic_search_instrumentation` in your newrelic.yml file.
 
+## KyotoTycoon
+
+The gem will instrument KyotoTycoon.
+
+You can disable it with `disable_kyototycoon` in your newrelic.yml file.
+
 ### Paperclip
 
 No special configuration required for Paperclip visibility.  
@@ -116,12 +122,33 @@ supports Redis versions 1.x and 2.x.
 
 To disable Redis instrumentation, set 'disable_redis' to true in your newrelic.yml file.
 
+### Riak
+
+RiakClient is instrumented.  Its opereations are recorded under Database in the
+the response time graph.
+
+To disable Riak instrumentation, set 'disable_riak_client' to true in your newrelic.yml file.
+
+### Ripple
+
+Ripple is instrumented.  Its opereations are recorded under Database in the
+the response time graph.
+
+To disable Riak instrumentation, set 'disable_ripple' 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.
 
+### ThinkingSphinx instrumentation
+
+This adds instrumentation to the `initialize` and `results` method of ThinkingSphinx::Search
+
+You can disable it with `disable_thinking_sphinx` in your newrelic.yml file.
+
+
 ### Typhoeus instrumentation
 
 This adds instrumentation to the Typhoeus::Request class for 'GET' requests

data/Rakefile

@@ -26,6 +26,7 @@ begin
     gem.add_dependency 'newrelic_rpm', '>=3.1.1'
     gem.version = version
     gem.files = FileList['LICENSE', 'README*', 'lib/**/*.rb', 'bin/*', '[A-Z]*', 'test/**/*'].to_a
+    gem.files.exclude *File.read(File.join(File.dirname(__FILE__), '.gitignore')).split
     gem.rdoc_options <<
       "--line-numbers" <<
       "--inline-source" <<

data/lib/rpm_contrib/instrumentation/{active_mq.rb → active_messaging.rb}

@@ -1,16 +1,17 @@
-# == ActiveMQ Instrumentation ==
+# == ActiveMessaging Instrumentation ==
 # Robert R. Meyer
 # Blue-Dog-Archolite @ GitHub
 
 DependencyDetection.defer do
-  @name = :active_mq
+  @name = :active_messaging
   
   depends_on do
-    defined?(::ActiveMessaging::Processor) && !NewRelic::Control.instance['disable_active_mq']
+    defined?(::ActiveMessaging::Processor) && !NewRelic::Control.instance['disable_active_messaging'] &&
+      !NewRelic::Control.instance['disable_active_mq']
   end
   
   executes do
-    NewRelic::Agent.logger.debug 'Installing ActiveMQ instrumentation'
+    NewRelic::Agent.logger.debug 'Installing ActiveMessaging instrumentation'
   end
 
   executes do

data/lib/rpm_contrib/instrumentation/kyototycoon.rb

@@ -0,0 +1,28 @@
+# KyotoTycoon instrumentation
+
+DependencyDetection.defer do
+  @name = :kyototycoon
+
+  depends_on do
+    defined?(::KyotoTycoon) && !NewRelic::Control.instance['disable_kyototycoon']
+  end
+
+  executes do
+    NewRelic::Agent.logger.debug 'Installing KyotoTycoon instrumentation'
+  end
+
+  executes do
+    ::KyotoTycoon.class_eval do
+      require 'new_relic/agent/method_tracer'
+      include NewRelic::Agent::MethodTracer
+
+      [:get, :remove, :set, :add, :replace,
+       :append, :cas, :increment, :decrement, :increment_double,
+       :set_bulk, :get_bulk, :remove_bulk, :clear, :vacuum,
+       :sync, :report, :status, :match_prefix, :match_regex,
+       :keys].each do |method|
+        add_method_tracer method
+      end
+    end
+  end
+end

data/lib/rpm_contrib/instrumentation/mongo.rb

@@ -37,8 +37,6 @@ DependencyDetection.defer 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

data/lib/rpm_contrib/instrumentation/resque.rb

@@ -20,11 +20,15 @@ module Resque
   end
 end
 
-module RPMContrib::Instrumentation::ResqueInstrumentationInstaller
-  def payload_class
-    klass = super
-    klass.instance_eval do
-      extend ::Resque::Plugins::NewRelicInstrumentation
+module RPMContrib
+  module Instrumentation
+    module ResqueInstrumentationInstaller
+      def payload_class
+        klass = super
+        klass.instance_eval do
+          extend ::Resque::Plugins::NewRelicInstrumentation
+        end
+      end
     end
   end
 end

data/lib/rpm_contrib/instrumentation/riak_client.rb

@@ -0,0 +1,48 @@
+DependencyDetection.defer do
+  @name = :riak_client
+
+  depends_on do
+    defined?(::Riak) and not NewRelic::Control.instance['disable_riak_client']
+  end
+
+  executes do
+    NewRelic::Agent.logger.debug 'Installing Riak client instrumentation'
+  end
+
+  executes do
+    backend_tracers = proc do
+      add_method_tracer :ping, 'Database/Riak/ping'
+
+      add_method_tracer :list_buckets, 'Database/Riak/list_buckets'
+      add_method_tracer :get_bucket_props, 'Database/Riak/get_bucket_props'
+      add_method_tracer :set_bucket_props, 'Database/Riak/set_bucket_props'
+
+      add_method_tracer :mapred, 'Database/Riak/mapred'
+
+      add_method_tracer :list_keys, 'Database/Riak/list_keys'
+      add_method_tracer :fetch_object, 'Database/Riak/fetch_object'
+      add_method_tracer :reload_object, 'Database/Riak/reload_object'
+      add_method_tracer :store_object, 'Database/Riak/store_object'
+      add_method_tracer :delete_object, 'Database/Riak/delete_object'
+    end
+
+    ::Riak::Client::BeefcakeProtobuffsBackend.class_eval &backend_tracers
+    ::Riak::Client::BeefcakeProtobuffsBackend.class_eval do
+      add_method_tracer :server_info, 'Database/Riak/server_info'
+      add_method_tracer :get_client_id, 'Database/Riak/get_client_id'
+      add_method_tracer :set_client_id, 'Database/Riak/set_client_id'
+    end
+    ::Riak::Client::HTTPBackend.class_eval &backend_tracers
+    ::Riak::Client::HTTPBackend.class_eval do
+      add_method_tracer :stats, 'Database/Riak/stats'
+      add_method_tracer :link_walk, 'Database/Riak/link_walk'
+      add_method_tracer :get_index, 'Database/Riak/get_index'
+      add_method_tracer :search, 'Database/Riak/search'
+      add_method_tracer :update_search_index, 'Database/Riak/update_search_index'
+    end
+
+    ::Riak::RObject.class_eval do
+      add_method_tracer :serialize, 'Database/Riak/serialize'
+    end
+  end
+end

data/lib/rpm_contrib/instrumentation/ripple.rb

@@ -0,0 +1,37 @@
+DependencyDetection.defer do
+  @name = :ripple
+
+  depends_on do
+    defined?(::Ripple) and not
+      NewRelic::Control.instance['disable_ripple']
+  end
+
+  executes do
+    NewRelic::Agent.logger.debug 'Installing Ripple instrumentation'
+  end
+
+  executes do
+    ::Ripple::Callbacks::InstanceMethods.class_eval do
+      add_method_tracer :valid?, 'Database/Riak/Ripple/valid?'
+    end
+
+    ::Ripple::Document::Persistence::ClassMethods.class_eval do
+      add_method_tracer :create, 'Database/Riak/Ripple/create'
+      add_method_tracer :destroy_all, 'Database/Riak/Ripple/destroy_all'
+    end
+
+    ::Ripple::Document::Persistence::InstanceMethods.class_eval do
+      add_method_tracer :really_save, 'Database/Riak/Ripple/really_save'
+      add_method_tracer :reload, 'Database/Riak/Ripple/reload'
+      add_method_tracer :delete, 'Database/Riak/Ripple/delete'
+      add_method_tracer :destroy, 'Database/Riak/Ripple/destroy'
+      add_method_tracer :update_attribute, 'Database/Riak/Ripple/update_attribute'
+      add_method_tracer :update_attributes, 'Database/Riak/Ripple/update_attributes'
+    end
+
+    ::Ripple::Document::Finders::ClassMethods.class_eval do
+      add_method_tracer :find, 'Database/Riak/Ripple/find'
+      add_method_tracer :list, 'Database/Riak/Ripple/list'
+    end
+  end
+end

data/lib/rpm_contrib/instrumentation/thinking_sphinx.rb

@@ -0,0 +1,21 @@
+DependencyDetection.defer do
+  @name = :thinking_sphinx
+    
+  depends_on do
+    defined?(::ThinkingSphinx) and not ::NewRelic::Control.instance['disable_thinking_sphinx']
+  end
+  
+  executes do
+    NewRelic::Agent.logger.debug 'Installing Thinking Sphinx instrumentation'
+  end
+  
+  executes do
+    class ::ThinkingSphinx::Search
+      include NewRelic::Agent::MethodTracer
+
+      add_method_tracer :initialize
+      add_method_tracer :results
+    end
+  end
+end
+

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: rpm_contrib
 version: !ruby/object:Gem::Version
-  version: 2.1.6.beta1
-  prerelease: 6
+  version: 2.1.6
+  prerelease: 
 platform: ruby
 authors:
 - Bill Kayser
@@ -10,12 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-23 00:00:00.000000000 -07:00
-default_executable: 
+date: 2011-11-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: newrelic_rpm
-  requirement: &2153791500 !ruby/object:Gem::Requirement
+  requirement: &70329403038300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +22,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2153791500
+  version_requirements: *70329403038300
 - !ruby/object:Gem::Dependency
   name: newrelic_rpm
-  requirement: &2153790140 !ruby/object:Gem::Requirement
+  requirement: &70329403022960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,7 +33,7 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2153790140
+  version_requirements: *70329403022960
 description: ! 'Community contributed instrumentation for various frameworks based
   on
 
@@ -50,6 +49,7 @@ extra_rdoc_files:
 - README.md
 files:
 - CHANGELOG
+- Gemfile
 - LICENSE
 - README.md
 - Rakefile
@@ -59,18 +59,22 @@ files:
 - lib/rpm_contrib/detection.rb
 - lib/rpm_contrib/detection/camping.rb
 - lib/rpm_contrib/instrumentation.rb
-- lib/rpm_contrib/instrumentation/active_mq.rb
+- lib/rpm_contrib/instrumentation/active_messaging.rb
 - lib/rpm_contrib/instrumentation/aws.rb
 - lib/rpm_contrib/instrumentation/camping.rb
 - lib/rpm_contrib/instrumentation/cassandra.rb
 - lib/rpm_contrib/instrumentation/crack.rb
 - lib/rpm_contrib/instrumentation/curb.rb
 - lib/rpm_contrib/instrumentation/elastic_search.rb
+- lib/rpm_contrib/instrumentation/kyototycoon.rb
 - lib/rpm_contrib/instrumentation/mongo.rb
 - lib/rpm_contrib/instrumentation/paperclip.rb
 - lib/rpm_contrib/instrumentation/redis.rb
 - lib/rpm_contrib/instrumentation/resque.rb
+- lib/rpm_contrib/instrumentation/riak_client.rb
+- lib/rpm_contrib/instrumentation/ripple.rb
 - lib/rpm_contrib/instrumentation/sinatra.rb
+- lib/rpm_contrib/instrumentation/thinking_sphinx.rb
 - lib/rpm_contrib/instrumentation/typhoeus.rb
 - lib/rpm_contrib/instrumentation/ultrasphinx.rb
 - lib/rpm_contrib/instrumentation/workling.rb
@@ -83,7 +87,6 @@ files:
 - test/test_redis.rb
 - test/test_resque.rb
 - test/test_workling.rb
-has_rdoc: true
 homepage: http://github.com/newrelic/rpm_contrib
 licenses: []
 post_install_message: 
@@ -102,6 +105,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3341867622411034151
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -110,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Contributed Instrumentation for New Relic RPM