rpm_contrib 1.0.11 → 1.0.12

data/CHANGELOG

@@ -1,3 +1,8 @@
+* Version 1.0.12
+
+  Better support for initialization within a Rails 3 application
+  rpm_contrib now depends on newrelic_rpm >= 2.13.1
+
 * Version 1.0.11
 
   AWS/S3 instrumentation contributed by Brian Doll

data/README.md

@@ -3,16 +3,20 @@
 The `rpm_contrib` gem contains instrumentation for the New Relic RPM agent
 contributed by the community of RPM users.  It requires the RPM Agent to run.
 
-To use the contrib gem, install the `rpm_contrib` gem from gemcutter.  It will
-also install the required version of the `newrelic_rpm` gem if it's not already
-installed.
+To use the rpm_contrib gem, install the `rpm_contrib` gem from rubygems.org.
+It will also install the required version of the `newrelic_rpm` gem if it's not
+already installed.
+
+For Rails 3.0 and later, add this dependency to your Gemfile:
+
+    gem 'rpm_contrib'
 
 For Rails 2.1 and later, add this dependency to your in your environment.rb:
 
     config.gem 'rpm_contrib'
 
 For other frameworks, make sure you load rubygems if it isn't already, then just
-require the contrib gem:
+require the rpm_contrib gem:
 
     require 'rubygems'
     require 'rpm_contrib'
@@ -39,26 +43,25 @@ it by setting `disable_paperclip` to true in the newrelic.yml file.
 
 ### MongoDB
 
-The MongoMapper object mapper is the only currently supported mapper for RPM
-visibility using this gem.  Feel free to add others and let us know.
-
-No special configuration required.  You can disable it by setting
-`disable_mongodb` to true in the newrelic.yml file.
+Both MongoMapper and Mongoid are supported.  You can disable them both by setting
+'disable_mongodb' to true in the newrelic.yml file.
 
 ### Resque
 
-To disable resque, add this to your newrelic.yml:
-
-    disable_resque: true
+To disable resque, set 'disable_resque' to true in your newrelic.yml file.
 
 ### Redis
 
 Redis instrumentation will record operations as well as `allWeb` and `allOther`
-summary metrics under the `Database/Redis` metric namespace.
+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.
 
-To disable Redis instrumentation, add this to your newrelic.yml:
+### AWS/S3
 
-    disable_redis: true
+Get metrics on how S3 is performing for you in production. To disable AWS/S3, set
+'disable_aws-s3' to true in your newrelic.yml file.  For more information on this
+instrumentation, check out [our blog](http://blog.newrelic.com/2010/07/06/monitoring-aws-s3/).
 
 # How to Add Custom Instrumentation
 

data/Rakefile

@@ -22,7 +22,7 @@ begin
     gem.email = "support@newrelic.com"
     gem.homepage = "http://github.com/newrelic/rpm_contrib"
     gem.author = "Bill Kayser"
-    gem.add_dependency 'newrelic_rpm', '>=2.11.1'
+    gem.add_dependency 'newrelic_rpm', '>=2.13.1'
     gem.version = version
     gem.files = FileList['LICENSE', 'README*', 'lib/**/*.rb', 'bin/*', '[A-Z]*', 'test/**/*'].to_a
     gem.rdoc_options <<

data/lib/rpm_contrib.rb

@@ -1,34 +1,43 @@
-
 RPM_CONTRIB_LIB = File.dirname(__FILE__)
 
 module RPMContrib
   VERSION = File.read(RPM_CONTRIB_LIB+"/../CHANGELOG")[/Version ([\d\.]+)$/, 1]
-end
 
-# Perform any framework/dispatcher detection before loading the rpm
-# gem.
+  def self.init_sequence
+    Proc.new do
+      # Tell the agent to load all the files in the
+      # rpm_contrib/instrumentation directory.
+      NewRelic::Agent.add_instrumentation(RPM_CONTRIB_LIB+"/rpm_contrib/instrumentation/**/*.rb")
+
+      # Load all the Sampler class definitions.  These will register
+      # automatically with the agent.
+      Dir.glob(RPM_CONTRIB_LIB + "/rpm_contrib/samplers/**/*.rb") { |file| require file }
+    end
+  end
 
+end
+
+# Perform any framework/dispatcher detection before loading the rpm gem.
 raise "The rpm_contrib gem must be loaded before the newrelic_rpm gem." if defined?(::NewRelic)
 
 Dir.glob(RPM_CONTRIB_LIB + "/rpm_contrib/detection/**/*.rb") { |file| require file }
 
 require 'newrelic_rpm'
 
-init_sequence = Proc.new do
-  
-  # Tell the agent to load all the files in the
-  # rpm_contrib/instrumentation directory.
-  NewRelic::Agent.add_instrumentation(RPM_CONTRIB_LIB+"/rpm_contrib/instrumentation/**/*.rb")
-
-  # Load all the Sampler class definitions.  These will register
-  # automatically with the agent.
-  Dir.glob(RPM_CONTRIB_LIB + "/rpm_contrib/samplers/**/*.rb") { |file| require file }
-end
-
-if defined?(Rails.configuration)
-  Rails.configuration.after_initialize &init_sequence
+if defined? Rails
+  # Rails 3.x+
+  if Rails.respond_to?(:version) && Rails.version =~ /^3/
+    module NewRelic
+      class Railtie < Rails::Railtie
+        initializer("rpm_contrib.start_plugin", &RPMContrib.init_sequence)
+      end
+    end
+  # Rails 2.x
+  elsif defined?(Rails) && Rails.respond_to?(:configuration)
+    Rails.configuration.after_initialize &RPMContrib.init_sequence
+  else
+    raise "The rpm_contrib gem supports Rails 2.2+ only."
+  end
 else
-  init_sequence.call
-end
-
-
+  RPMContrib.init_sequence.call
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rpm_contrib
 version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: false
   segments: 
   - 1
   - 0
-  - 11
-  version: 1.0.11
+  - 12
+  version: 1.0.12
 platform: ruby
 authors: 
 - Bill Kayser
@@ -14,21 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-01 00:00:00 -07:00
+date: 2010-09-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: newrelic_rpm
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 57
         segments: 
         - 2
-        - 11
+        - 13
         - 1
-        version: 2.11.1
+        version: 2.13.1
   type: :runtime
   version_requirements: *id001
 description: |
@@ -81,23 +84,27 @@ rdoc_options:
 require_paths: 
 - lib
 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 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Contributed Instrumentation for New Relic RPM