rpm_contrib 2.1.4 → 2.1.5.beta

data/CHANGELOG

@@ -1,3 +1,9 @@
+* Version 2.1.5.beta
+
+  Changed the resque detection so it does not depend on the load
+  order of resque => rpm_contrib => newrelic_rpm.  The gems can be
+  installed in any order.
+
 * Version 2.1.4
 
   Updated requirements to latest agent with some bug fixes for background jobs

data/README.md

@@ -12,10 +12,6 @@ For Rails 3.0 and when using Bundler, add these dependencies to your Gemfile:
     gem 'rpm_contrib'
     gem 'newrelic_rpm'
 
-For some frameworks, it's important that the contrib gem is loaded
-before the newrelic_rpm gem.  We hope to remove that unfortunate
-requirement in the future.
-
 For Rails 2.1 and later, add these dependencies to your in your environment.rb:
 
     config.gem 'rpm_contrib'
@@ -36,7 +32,18 @@ after all other frameworks have loaded:
 
     DependencyDetection.detect!
 
-# Supported Frameworks
+### Troubleshooting Startup
+
+If you've set up your gems to load as described above and you are still not seeing 
+data in RPM, there may be a bug in detecting your framework.  Try setting the 
+environment variable `NEWRELIC_DISPATCHER` to the name of your app server (Camping, 
+Resque, Rake, etc), and please report to us if this fixes the problem so we can
+fix the auto-detection logic.
+
+If this does not help then set the `log_level` to `debug` in the `newrelic.yml` file
+and examine the `newrelic_agent.log` file for errors after restarting your app.
+
+## 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.
@@ -56,8 +63,11 @@ You can disable it with `disable_cassandra_instrumentation` in your newrelic.yml
 ### 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.
+instrumentation to your configuration file.  See
+RPMContrib::Instrumentation::Camping for more information. 
+
+In addition you will need to load the gems in the following order: 1) Camping, 2) rpm_contrib,
+3) newrelic_rpm.
 
 ### Crack
 

data/lib/rpm_contrib/detection.rb

@@ -1,7 +1,5 @@
+# Currently the only framework we are detecting with an agent
+# patch is camping.  You need to specify the camping gem prior
+# to the contrib gem and newrelic agent gem in order for this to work.
 require 'rpm_contrib/detection/camping'
-require 'rpm_contrib/detection/resque'
 
-module RpmContrib
-  module Detection
-  end
-end

data/lib/rpm_contrib/instrumentation/resque.rb

@@ -54,7 +54,7 @@ DependencyDetection.defer do
     end
 
     ::Resque.before_first_fork do
-      NewRelic::Agent.manual_start(:dispatcher => :resque)
+      NewRelic::Agent.manual_start(:dispatcher => :resque, :sync_startup => true)
     end
 
     ::Resque.after_fork do

data/lib/rpm_contrib/instrumentation/ultrasphinx.rb

@@ -1,7 +1,7 @@
 DependencyDetection.defer do
 
   depends_on do
-    defined?(::UltraSphinx) and not ::NewRelic::Control.instance['disable_ultrasphinx']
+    defined?(::Ultrasphinx) and not ::NewRelic::Control.instance['disable_ultrasphinx']
   end
 
   executes do

data/lib/rpm_contrib/instrumentation/yajl.rb

@@ -1,13 +1,28 @@
 DependencyDetection.defer do
   depends_on do
-    defined?(::Yajl::Encoder) and not ::NewRelic::Control.instance['disable_yajl_instrumentation']
+    defined?(::Yajl::Parser) && !NewRelic::Control.instance['disable_yajl_instrumentation']
+  end
+
+  executes do
+    ::Yajl::Parser.class_eval do
+      class << self
+        include ::NewRelic::Agent::MethodTracer
+        add_method_tracer :parse, 'Parser/Yajl/parse'
+      end
+    end
+  end
+end
+
+DependencyDetection.defer do
+  depends_on do
+    defined?(::Yajl::Encoder) && !NewRelic::Control.instance['disable_yajl_instrumentation']
   end
 
   executes do
     ::Yajl::Encoder.class_eval do
       class << self
         include ::NewRelic::Agent::MethodTracer
-        add_method_tracer :parse, 'Encoder/Yajl/encode'
+        add_method_tracer :encode, 'Encoder/Yajl/encode'
       end
     end
   end

data/lib/rpm_contrib.rb

@@ -2,11 +2,7 @@ RPM_CONTRIB_LIB = File.dirname(__FILE__)
 
 module RPMContrib; end
 
-# Perform any framework/dispatcher detection before loading the rpm gem.
 require 'rpm_contrib/detection'
-if defined?(::NewRelic) && defined?(::NewRelic::Control)
-  puts "Warning! The rpm_contrib gem should be loaded before the newrelic_rpm gem if you are using Resque or Camping." 
-end
 
 require 'newrelic_rpm'
 require 'rpm_contrib/instrumentation'
@@ -25,7 +21,6 @@ if defined? Rails
     end
   # Rails 2.x
   elsif defined?(Rails) && Rails.respond_to?(:configuration)
-    
     Rails.configuration.after_initialize { NewRelic::Control.instance.init_plugin }
   else
     raise "The rpm_contrib gem supports Rails 2.2+ only."

data/test/test_curb.rb

@@ -1,5 +1,8 @@
 require "#{File.dirname(__FILE__)}/helper"
-require 'curb'
+begin
+require 'curb' 
+rescue LoadError
+end
 
 class NewRelic::Agent::NetInstrumentationTest < Test::Unit::TestCase
   include NewRelic::Agent::Instrumentation::ControllerInstrumentation
@@ -63,4 +66,4 @@ class NewRelic::Agent::NetInstrumentationTest < Test::Unit::TestCase
     assert_equal 0, @engine.metrics.size
   end
 
-end
+end if defined? ::Curl::Easy

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rpm_contrib
 version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: 
+  hash: 31098237
+  prerelease: 6
   segments: 
   - 2
   - 1
-  - 4
-  version: 2.1.4
+  - 5
+  - beta
+  version: 2.1.5.beta
 platform: ruby
 authors: 
 - Bill Kayser
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-22 00:00:00 -07:00
+date: 2011-09-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,7 +57,6 @@ files:
 - lib/rpm_contrib.rb
 - lib/rpm_contrib/detection.rb
 - lib/rpm_contrib/detection/camping.rb
-- lib/rpm_contrib/detection/resque.rb
 - lib/rpm_contrib/instrumentation.rb
 - lib/rpm_contrib/instrumentation/active_mq.rb
 - lib/rpm_contrib/instrumentation/aws.rb
@@ -106,12 +106,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 

data/lib/rpm_contrib/detection/resque.rb

@@ -1,15 +0,0 @@
-# Detect when running under camping and set the framework and dispatcher.
-
-module NewRelic
-  class LocalEnvironment
-    module Resque
-      def discover_dispatcher
-        super
-        if defined?(::Resque::Worker) && @dispatcher.nil?
-          @dispatcher = 'resque'
-        end
-      end
-    end
-  end
-end
-