rpm_contrib 2.1.5.beta → 2.1.6.beta1

data/CHANGELOG

@@ -1,4 +1,4 @@
-* Version 2.1.5.beta
+* Version 2.1.5
 
   Changed the resque detection so it does not depend on the load
   order of resque => rpm_contrib => newrelic_rpm.  The gems can be

data/Rakefile

@@ -1,4 +1,5 @@
 require 'rubygems'
+require "bundler/setup"
 require 'rake'
 # See http://www.rubygems.org/read/chapter/20 
 
@@ -21,7 +22,7 @@ begin
     gem.description = DESCRIPTION
     gem.email = "support@newrelic.com"
     gem.homepage = "http://github.com/newrelic/rpm_contrib"
-    gem.author = "Bill Kayser"
+    gem.authors = [ "Bill Kayser", "Jon Guymon" ]
     gem.add_dependency 'newrelic_rpm', '>=3.1.1'
     gem.version = version
     gem.files = FileList['LICENSE', 'README*', 'lib/**/*.rb', 'bin/*', '[A-Z]*', 'test/**/*'].to_a

data/lib/rpm_contrib/agent_compatibility.rb

@@ -0,0 +1,11 @@
+if NewRelic::VERSION::STRING < '3.2.0'
+  module DependencyDetection
+    def self.dependency_by_name(name)
+      @@items.find {|i| i.name == name }
+    end
+
+    class Dependent
+      attr_reader :name
+    end
+  end
+end

data/lib/rpm_contrib/instrumentation/active_mq.rb

@@ -3,9 +3,15 @@
 # Blue-Dog-Archolite @ GitHub
 
 DependencyDetection.defer do
+  @name = :active_mq
+  
   depends_on do
     defined?(::ActiveMessaging::Processor) && !NewRelic::Control.instance['disable_active_mq']
   end
+  
+  executes do
+    NewRelic::Agent.logger.debug 'Installing ActiveMQ instrumentation'
+  end
 
   executes do
     ::ActiveMessaging::Processor.class_eval do

data/lib/rpm_contrib/instrumentation/aws.rb

@@ -1,12 +1,17 @@
 # AWS Instrumentation by Brian Doll of New Relic
 DependencyDetection.defer do
-
+  @name = :aws
+  
   depends_on do
     defined?(::AWS::S3) && !NewRelic::Control.instance['disable_aws-s3']
   end
-
+  
   executes do
+    NewRelic::Agent.logger.debug 'Installing AWS instrumentation'
+  end
 
+  
+  executes do
     # Instrument connections to the AWS-S3 service
     ::AWS::S3::Connection::Management::ClassMethods.module_eval do
       add_method_tracer :establish_connection!, 'AWS-S3/establish_connection!'

data/lib/rpm_contrib/instrumentation/cassandra.rb

@@ -1,7 +1,14 @@
 DependencyDetection.defer do
+  @name = :cassandra
+  
   depends_on do
     defined?(::Cassandra) && !NewRelic::Control.instance['disable_cassandra_instrumentation']
   end
+  
+  executes do
+    NewRelic::Agent.logger.debug 'Installing Cassandra instrumentation'
+  end
+
   executes do
     ::Cassandra.class_eval do
       add_method_tracer :insert,               'Database/Cassandra/insert'

data/lib/rpm_contrib/instrumentation/crack.rb

@@ -1,8 +1,14 @@
 DependencyDetection.defer do
+  @name = :crack_json
+
   depends_on do
     defined?(::Crack::JSON) && !NewRelic::Control.instance['disable_crack']
   end
-
+  
+  executes do
+    NewRelic::Agent.logger.debug 'Installing Crack::JSON instrumentation'
+  end
+  
   executes do
     ::Crack::JSON.class_eval do
       class << self
@@ -14,10 +20,16 @@ DependencyDetection.defer do
 end
 
 DependencyDetection.defer do
+  @name = :crack_xml
+  
   depends_on do
     defined?(::Crack::XML) && !NewRelic::Control.instance['disable_crack']
   end
-
+  
+  executes do
+    NewRelic::Agent.logger.debug 'Installing Crack::XML instrumentation'
+  end
+  
   executes do
     ::Crack::XML.class_eval do
       class << self

data/lib/rpm_contrib/instrumentation/curb.rb

@@ -1,9 +1,14 @@
 DependencyDetection.defer do
-
+  @name = :curb
+  
   depends_on do
     defined?(::Curl) and not NewRelic::Control.instance['disable_curb']
   end
-
+  
+  executes do
+    NewRelic::Agent.logger.debug 'Installing Curb instrumentation'
+  end
+  
   executes do
     ::Curl::Easy.class_eval do
       def host

data/lib/rpm_contrib/instrumentation/elastic_search.rb

@@ -1,10 +1,16 @@
 # == Elastic Search Instrumentation
 #
 DependencyDetection.defer do
+  @name = :elastic_search
+  
   depends_on do
     defined?(::ElasticSearch::Client) && !NewRelic::Control.instance['disable_elastic_search_instrumentation']
   end
-
+  
+  executes do
+    NewRelic::Agent.logger.debug 'Installing Elastic Search instrumentation'
+  end
+  
   executes do
     ::ElasticSearch::Client.class_eval do
       add_method_tracer :index,  'ActiveRecord/ElasticSearch/index'

data/lib/rpm_contrib/instrumentation/mongo.rb

@@ -1,10 +1,15 @@
 # Mongo Instrumentation contributed by Alexey Palazhchenko
 DependencyDetection.defer do
-
+  @name = :mongodb
+  
   depends_on do
     defined?(::Mongo) and not NewRelic::Control.instance['disable_mongodb']
   end
 
+  executes do
+    NewRelic::Agent.logger.debug 'Installing MongoDB instrumentation'
+  end  
+
   executes do
     ::Mongo::Connection.class_eval do
       include NewRelic::Agent::MethodTracer

data/lib/rpm_contrib/instrumentation/paperclip.rb

@@ -1,8 +1,14 @@
 DependencyDetection.defer do
+  @name = :paperclip
+  
   depends_on do
     defined?(::Paperclip) && !NewRelic::Control.instance['disable_paperclip']
   end
-
+  
+  executes do
+    NewRelic::Agent.logger.debug 'Installing Paperclip instrumentation'
+  end
+  
   executes do
     ::Paperclip::Attachment.class_eval do
       add_method_tracer :save, 'Paperclip/#{name}/save'

data/lib/rpm_contrib/instrumentation/redis.rb

@@ -1,11 +1,16 @@
 # Redis instrumentation contributed by Ashley Martens of ngmoco
 #
 DependencyDetection.defer do
+  @name = :redis
 
   depends_on do
     defined?(::Redis) && !NewRelic::Control.instance['disable_redis']
   end
 
+  executes do
+    NewRelic::Agent.logger.debug 'Installing Redis instrumentation'
+  end
+
   executes do
     ::Redis::Client.class_eval do
 

data/lib/rpm_contrib/instrumentation/resque.rb

@@ -1,60 +1,60 @@
-DependencyDetection.defer do
-  depends_on do
-    defined?(::Resque)
+require 'rpm_contrib/language_support'
+
+module Resque
+  module Plugins
+    module NewRelicInstrumentation
+      include NewRelic::Agent::Instrumentation::ControllerInstrumentation
+      
+      def around_perform_with_monitoring(*args)
+        begin
+          perform_action_with_newrelic_trace(:name => 'perform',
+                                             :class_name => self.name,
+                                 :category => 'OtherTransaction/ResqueJob') do
+            yield(*args)
+          end
+        ensure
+          NewRelic::Agent.shutdown if RPMContrib::LanguageSupport.can_fork?
+        end
+      end
+    end
   end
-  executes do
-    module Resque::Plugins
-      # The plugin definition is a no-op but left in empty for backward compatibility.
-      # We were using the plugin to install instrumentation but it required you either 
-      # extend Resque::Job or extend this module.  Using the method chaining approach
-      # means you don't have to make any modifications to your job classes.
-      module NewRelicInstrumentation; end
+end
+
+module RPMContrib::Instrumentation::ResqueInstrumentationInstaller
+  def payload_class
+    klass = super
+    klass.instance_eval do
+      extend ::Resque::Plugins::NewRelicInstrumentation
     end
   end
 end
 
 DependencyDetection.defer do
+  @name = :resque
+  
   depends_on do
     defined?(::Resque::Job) and not NewRelic::Control.instance['disable_resque']
   end
 
+  executes do
+    NewRelic::Agent.logger.debug 'Installing Resque instrumentation'
+  end
+  
   executes do
     # == 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.
-
-    # Resque also works in a non forking mode when fork is not supported
-    begin
-      # IronRuby/JRuby don't support `Kernel.fork` yet
-      if Kernel.respond_to?(:fork)
-        Kernel.fork{exit!}
-      else
-        raise NotImplementedError
-      end
-    rescue NotImplementedError
-      $rpm_cant_fork = true
-    end
-
     ::Resque::Job.class_eval do
-      include NewRelic::Agent::Instrumentation::ControllerInstrumentation
-      old_perform_method = instance_method(:perform)
-      define_method(:perform) do
-        class_name = (payload_class ||self.class).name
-        perform_action_with_newrelic_trace(:name => 'perform', :class_name => class_name,
-                                           :category => 'OtherTransaction/ResqueJob') do
-          old_perform_method.bind(self).call
-        end
-        # If we aren't doing true forks, then the shutdown message would end up
-        # shutting down the agent in the parent which would cause us to stop sending
-        # data.  Data is not sent from the child.
-        NewRelic::Agent.shutdown unless $rpm_cant_fork
+      def self.new(*args)
+        super(*args).extend RPMContrib::Instrumentation::ResqueInstrumentationInstaller
       end
     end
 
     ::Resque.before_first_fork do
-      NewRelic::Agent.manual_start(:dispatcher => :resque, :sync_startup => true)
+      NewRelic::Agent.manual_start(:dispatcher => :resque,
+                                   :sync_startup => true)
     end
 
     ::Resque.after_fork do

data/lib/rpm_contrib/instrumentation/sinatra.rb

@@ -1,8 +1,14 @@
 DependencyDetection.defer do
+  @name = :sinatra_view
+  
   depends_on do
     defined?(::Sinatra::Base) and not NewRelic::Control.instance['disable_sinatra_template']
   end
-
+  
+  executes do
+    NewRelic::Agent.logger.debug 'Installing Sinatra view instrumentation'
+  end
+  
   executes do
     ::Sinatra::Base.class_eval do
       def render_with_newrelic_trace(*args, &block)
@@ -10,7 +16,7 @@ DependencyDetection.defer do
         return render_without_newrelic_trace(*args, &block) if file == "= yield"
 
         file = "Proc" if file.is_a?(Proc)
-        metrics = ["Sinatra/#{engine}/#{file}"]
+        metrics = ["View/#{engine}/#{file}/Rendering"]
 
         self.class.trace_execution_scoped metrics do
           render_without_newrelic_trace(*args, &block)

data/lib/rpm_contrib/instrumentation/typhoeus.rb

@@ -1,9 +1,14 @@
 DependencyDetection.defer do
-
+  @name = :typhoeus
+  
   depends_on do
     defined?(::Typhoeus) and not ::NewRelic::Control.instance['disable_typhoeus']
   end
-
+  
+  executes do
+    NewRelic::Agent.logger.debug 'Installing Typhoeus instrumentation'
+  end
+  
   executes do
     require 'uri'
     ::Typhoeus::Request.instance_eval do

data/lib/rpm_contrib/instrumentation/ultrasphinx.rb

@@ -1,9 +1,14 @@
 DependencyDetection.defer do
-
+  @name = :ultrasphinx
+    
   depends_on do
     defined?(::Ultrasphinx) and not ::NewRelic::Control.instance['disable_ultrasphinx']
   end
-
+  
+  executes do
+    NewRelic::Agent.logger.debug 'Installing Ultrasphinx instrumentation'
+  end
+  
   executes do
     class  ::Ultrasphinx::Search
       include NewRelic::Agent::MethodTracer

data/lib/rpm_contrib/instrumentation/workling.rb

@@ -1,13 +1,17 @@
 # Workling instrumentation contributed by Chad Ingram of Aurora Feint
 #
 DependencyDetection.defer do
-
+  @name = :workling
+  
   depends_on do
     defined?(::Workling) and not ::NewRelic::Control.instance['disable_workling']
   end
 
   executes do
-    
+    NewRelic::Agent.logger.debug 'Installing Workling instrumentation'
+  end
+
+  executes do
     ::Workling::Base.class_eval do
       include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
     end

data/lib/rpm_contrib/instrumentation/yajl.rb

@@ -1,8 +1,14 @@
 DependencyDetection.defer do
+  @name = :yajl_parser
+  
   depends_on do
     defined?(::Yajl::Parser) && !NewRelic::Control.instance['disable_yajl_instrumentation']
   end
 
+  executes do
+    NewRelic::Agent.logger.debug 'Installing Yajl::Parser instrumentation'
+  end  
+
   executes do
     ::Yajl::Parser.class_eval do
       class << self
@@ -14,10 +20,16 @@ DependencyDetection.defer do
 end
 
 DependencyDetection.defer do
+  @name = :yajl_encoder
+  
   depends_on do
     defined?(::Yajl::Encoder) && !NewRelic::Control.instance['disable_yajl_instrumentation']
   end
 
+  executes do
+    NewRelic::Agent.logger.debug 'Installing Yajl::Encoder instrumentation'
+  end
+
   executes do
     ::Yajl::Encoder.class_eval do
       class << self

data/lib/rpm_contrib/language_support.rb

@@ -0,0 +1,28 @@
+module RPMContrib::LanguageSupport
+  extend self
+  
+  @@forkable = nil
+  
+  def can_fork?
+    # this is expensive to check, so we should only check once
+    return @@forkable if @@forkable != nil
+
+    if Process.respond_to?(:fork)
+      # if this is not 1.9.2 or higher, we have to make sure
+      @@forkable = ::RUBY_VERSION < '1.9.2' ? test_forkability : true
+    else
+      @@forkable = false
+    end
+
+    @@forkable
+  end
+
+  private
+
+  def test_forkability
+    Process.fork { exit! }
+    true
+  rescue NotImplementedError
+    false
+  end
+end

data/lib/rpm_contrib.rb

@@ -5,6 +5,7 @@ module RPMContrib; end
 require 'rpm_contrib/detection'
 
 require 'newrelic_rpm'
+require 'rpm_contrib/agent_compatibility'
 require 'rpm_contrib/instrumentation'
 
 # Load all the Sampler class definitions.  These will register

data/test/helper.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'test/unit'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-#$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require File.expand_path("../../lib/rpm_contrib.rb", __FILE__)
 

data/test/test_resque.rb

@@ -0,0 +1,74 @@
+require 'resque'
+require 'mocha'
+require File.expand_path(File.dirname(__FILE__) + "/helper")
+require File.expand_path(File.dirname(__FILE__) + "/../lib/rpm_contrib")
+
+class ResqueTest < Test::Unit::TestCase
+  class ExtendoJorb < ::Resque::Job
+    def self.perform
+      true
+    end
+  end
+  
+  class GoodJorb
+    def self.perform
+      true
+    end
+  end
+
+  class BadJorb
+    def self.perform
+      raise "I'm doing a bad jorb"
+    end
+  end
+
+  def setup
+    @worker = Resque::Worker.new(:test)
+    NewRelic::Agent.manual_start
+    @engine = NewRelic::Agent.instance.stats_engine
+  end
+
+  def teardown
+    @engine.clear_stats
+  end
+  
+  def test_should_instrument_job_extending_from_resque_job
+    @worker.perform(Resque::Job.new(:test,
+                                    'class' => 'ResqueTest::ExtendoJorb'))
+
+    metrics = [ 'OtherTransaction/all', 'OtherTransaction/ResqueJob/all',
+                'OtherTransaction/ResqueJob/ResqueTest::ExtendoJorb/perform' ]
+    metrics.each do |metric|
+      assert(@engine.metrics.include?(metric),
+             "#{@engine.metrics.inspect} missing #{metric}")
+    end
+    assert !@engine.metrics.include?('Errors/all')
+  end
+
+  def test_should_instrument_poro_job
+    @worker.perform(Resque::Job.new(:test, 'class' => 'ResqueTest::GoodJorb'))
+
+    metrics = [ 'OtherTransaction/all', 'OtherTransaction/ResqueJob/all',
+                'OtherTransaction/ResqueJob/ResqueTest::GoodJorb/perform' ]
+    metrics.each do |metric|
+      assert(@engine.metrics.include?(metric),
+             "#{@engine.metrics.inspect} missing #{metric}")
+    end
+    assert !@engine.metrics.include?('Errors/all')
+  end
+
+  def test_should_collect_job_errors
+    begin
+      @worker.perform(Resque::Job.new(:test, 'class' => 'ResqueTest::BadJorb'))
+    rescue
+    end
+    
+    metrics = [ 'OtherTransaction/all', 'OtherTransaction/ResqueJob/all',
+                'OtherTransaction/ResqueJob/ResqueTest::BadJorb/perform',
+                'Errors/all' ]
+    metrics.each do |metric|
+      assert(@engine.metrics.include?(metric),
+             "#{@engine.metrics.inspect} missing #{metric}")
+    end      
+  end
+end

metadata

@@ -1,60 +1,61 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rpm_contrib
-version: !ruby/object:Gem::Version 
-  hash: 31098237
+version: !ruby/object:Gem::Version
+  version: 2.1.6.beta1
   prerelease: 6
-  segments: 
-  - 2
-  - 1
-  - 5
-  - beta
-  version: 2.1.5.beta
 platform: ruby
-authors: 
+authors:
 - Bill Kayser
+- Jon Guymon
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-08 00:00:00 -07:00
+date: 2011-09-23 00:00:00.000000000 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: newrelic_rpm
+  requirement: &2153791500 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.1
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *2153791500
+- !ruby/object:Gem::Dependency
+  name: newrelic_rpm
+  requirement: &2153790140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 3
-        - 1
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.1.1
   type: :runtime
-  version_requirements: *id001
-description: |
-  Community contributed instrumentation for various frameworks based on
+  prerelease: false
+  version_requirements: *2153790140
+description: ! 'Community contributed instrumentation for various frameworks based
+  on
+
   the New Relic Ruby monitoring gem newrelic_rpm.
 
+'
 email: support@newrelic.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - CHANGELOG
 - LICENSE
 - README.md
-files: 
+files:
 - CHANGELOG
 - LICENSE
 - README.md
 - Rakefile
 - lib/new_relic/control/camping.rb
 - lib/rpm_contrib.rb
+- lib/rpm_contrib/agent_compatibility.rb
 - lib/rpm_contrib/detection.rb
 - lib/rpm_contrib/detection/camping.rb
 - lib/rpm_contrib/instrumentation.rb
@@ -74,52 +75,43 @@ files:
 - lib/rpm_contrib/instrumentation/ultrasphinx.rb
 - lib/rpm_contrib/instrumentation/workling.rb
 - lib/rpm_contrib/instrumentation/yajl.rb
+- lib/rpm_contrib/language_support.rb
 - lib/rpm_contrib/samplers.rb
 - test/helper.rb
 - test/schema.rb
 - test/test_curb.rb
 - 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: 
-rdoc_options: 
+rdoc_options:
 - --line-numbers
 - --inline-source
 - --title
 - Contributed Instrumentation for New Relic RPM
 - -m
 - README.md
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Contributed Instrumentation for New Relic RPM
 test_files: []
-