rpm_contrib 2.1.10 → 2.1.11

data/CHANGELOG

@@ -1,3 +1,6 @@
+* Version 2.1.11
+  - Removed Resque instrumentation in favor of instrumentation in main agent https://github.com/newrelic/rpm (version 3.4.0)
+
 * Version 2.1.10
   - Removed Workling instrumentation in favor of https://github.com/aurorafeint/newrelic-workling
 

data/README.md

@@ -156,14 +156,6 @@ Our instrumentation works on the underlying 'Mongo' library.
 
 You can disable it by setting 'disable_mongodb' to true in your newrelic.yml file.
 
-### Resque
-
-To instrument jobs you no longer need to have your Job class inherit from Resque::Job or include 
-the Resque::Plugins::NewRelicInstrumentation module.  The module definition was left in for 
-backward compatibility.
-
-To disable resque, set 'disable_resque' to true in your newrelic.yml file.
-
 ### Redis
 
 Redis instrumentation has been removed from rpm_contrib.

metadata

@@ -1,53 +1,69 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rpm_contrib
-version: !ruby/object:Gem::Version
-  version: 2.1.10
+version: !ruby/object:Gem::Version 
+  hash: 29
   prerelease: 
+  segments: 
+  - 2
+  - 1
+  - 11
+  version: 2.1.11
 platform: ruby
-authors:
+authors: 
 - Bill Kayser
 - Jon Guymon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-17 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-05-25 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: newrelic_rpm
-  requirement: &70210346727380 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 3
+        - 1
+        - 1
         version: 3.1.1
   type: :runtime
-  prerelease: false
-  version_requirements: *70210346727380
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: newrelic_rpm
-  requirement: &70210346726420 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 3
+        - 1
+        - 1
         version: 3.1.1
   type: :runtime
-  prerelease: false
-  version_requirements: *70210346726420
-description: ! 'Community contributed instrumentation for various frameworks based
-  on
-
+  version_requirements: *id002
+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
 - Gemfile
 - LICENSE
@@ -71,7 +87,6 @@ files:
 - lib/rpm_contrib/instrumentation/mongoid.rb
 - lib/rpm_contrib/instrumentation/paperclip.rb
 - lib/rpm_contrib/instrumentation/picky.rb
-- lib/rpm_contrib/instrumentation/resque.rb
 - lib/rpm_contrib/instrumentation/sinatra.rb
 - lib/rpm_contrib/instrumentation/thinking_sphinx.rb
 - lib/rpm_contrib/instrumentation/typhoeus.rb
@@ -83,35 +98,43 @@ files:
 - test/schema.rb
 - test/test_curb.rb
 - test/test_picky.rb
-- test/test_resque.rb
 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
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Contributed Instrumentation for New Relic RPM
 test_files: []
+

data/lib/rpm_contrib/instrumentation/resque.rb

@@ -1,71 +0,0 @@
-require 'rpm_contrib/language_support'
-
-# call this now so it is memoized before potentially forking worker processes
-RPMContrib::LanguageSupport.can_fork?
-
-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
-end
-
-module RPMContrib
-  module Instrumentation
-    module ResqueInstrumentationInstaller
-      def payload_class
-        klass = super
-        klass.instance_eval do
-          extend ::Resque::Plugins::NewRelicInstrumentation
-        end
-      end
-    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::Job.class_eval do
-      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)
-    end
-
-    ::Resque.after_fork do
-      NewRelic::Agent.after_fork(:force_reconnect => false)
-    end
-  end
-end 

data/test/test_resque.rb

@@ -1,74 +0,0 @@
-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