wireframe-rpm_contrib 2.1.6.2 → 2.1.8.1

data/CHANGELOG

@@ -1,9 +1,25 @@
-* Version 2.1.6.2
+* Version 2.1.8.1
 
   Add instrumentation for Backgrounded Resque Job Processing Framework (Ryan
 	Sonnek)
 
+* Version 2.1.8
+  - Removed redis instrumenation in favor of https://github.com/evanphx/newrelic-redis
+  - [FIX] adding check for aws-sdk (Tom Caspy)
+  - Improved Mongo instrumenation from pull request #16 titanous/mongoid-instrumentation
+
+* Version 2.1.7
+
+  Community contributed instrumentation
+  - ThinkingSphinx instrumentation improvement (Martin Sarsale)
+  - Picky search engine instrumentation (Niko Dittmann)
+  Community Contributed Bug Fixes
+  - Fix instrumentation injection for ActiveMessaging (W. Andrew Loe III)
+  Other
+  - Improvements to resque instrumentation detection of if its in a forking ruby implementation
+
 * Version 2.1.6
+
   Community contributed instrumentation
   - ThinkingSphinx instrumentation (W. Andrew Loe III)
   - Riak instrumentation (Bryce Kerley)
@@ -12,7 +28,7 @@
   - MongoDB instrumentation (Kenn Ejima)
   - Yajl instrumentation (Chris Griego)
   - UltraSphinx instrumentation (Jonathan Rudenberg)
-  Renamed ActiveMQ instrumentation to ActiveMessaging (W. Andrew Loe III)
+  - Renamed ActiveMQ instrumentation to ActiveMessaging (W. Andrew Loe III)
 
 * Version 2.1.5
 

data/README.md

@@ -3,6 +3,46 @@
 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.
 
+## Deprecation of RPM Contrib
+
+Over the next several months we are planning to phase out the rpm_contrib gem.
+We plan to migrate the existing instrumentation into separate projects that
+instrument indivdual libraries or frameworks.  We see this as having a number of
+advantages for newrelic users.  We will provide a list of recommended
+instrumentation projects.
+
+### Removal of Redis Instrumenation
+
+As of version 2.1.8 Redis instrumentation has been removed from rpm_contrib.
+Please use Evan Phoenix's `newrelic-redis` gem instead.
+https://github.com/evanphx/newrelic-redis
+
+###  Request for Maintainers
+
+If you're interested in maintaining instrumentation for a specific
+library/framework, please let us know.  We'd love to work with you and promote
+your project.  -The New Relic Ruby Agent Team
+
+## New Relic Ruby Agent Plugins
+
+Here is a list of instrumentation projects for various Ruby libraries:
+
+#### Redis
+
+As of version 2.1.8 Redis instrumentation has been removed from rpm_contrib.
+Please use Evan Phoenix's `newrelic-redis` gem instead.
+
+https://github.com/evanphx/newrelic-redis
+
+#### Faraday
+
+Instrumentation for the HTTP client library Faraday is available at:
+
+https://github.com/Viximo/newrelic-faraday
+
+
+## Getting Started
+
 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.
@@ -23,9 +63,6 @@ require the rpm_contrib gem:
     require 'rubygems'
     require 'rpm_contrib'
 
-When you load the rpm_contrib gem, the `newrelic_rpm` gem will also be
-initialized.  No need for a separate require statement for `newrelic_rpm`. 
-
 In non-Rails frameworks, it's important that the New Relic Agent gets
 loaded as late as possible, or that the final initialization hook is called 
 after all other frameworks have loaded:
@@ -43,6 +80,7 @@ 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
@@ -82,13 +120,13 @@ The gem will instrument both Curl::Easy and Curl::Multi - they should show up si
 
 You can disable it with `disable_curb` in your newrelic.yml file.
 
-## Elastic Search
+### Elastic Search
 
 The gem will instrument ElasticSearch::Client. The metrics should show up in the UI
 
 You can disable it with `disable_elastic_search_instrumentation` in your newrelic.yml file.
 
-## KyotoTycoon
+### KyotoTycoon
 
 The gem will instrument KyotoTycoon.
 
@@ -122,11 +160,10 @@ 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. This instrumentation
-supports Redis versions 1.x and 2.x. 
+Redis instrumentation has been removed from rpm_contrib.
 
-To disable Redis instrumentation, set 'disable_redis' to true in your newrelic.yml file.
+Please use Evan Phoenix's `newrelic-redis` gem instead.
+https://github.com/evanphx/newrelic-redis
 
 ### Riak
 

data/lib/rpm_contrib/instrumentation/aws.rb

@@ -13,8 +13,14 @@ DependencyDetection.defer do
   
   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!'
+    if defined?(::AWS::S3::Connection)
+      ::AWS::S3::Connection::Management::ClassMethods.module_eval do
+        add_method_tracer :establish_connection!, 'AWS-S3/establish_connection!'
+      end
+    else #using aws-sdk
+      ::AWS::S3.class_eval do
+        add_method_tracer :initialize, 'AWS-S3/establish_connection!'
+      end
     end
 
     # Instrument methods on Bucket

data/lib/rpm_contrib/instrumentation/picky.rb

@@ -18,7 +18,7 @@ DependencyDetection.defer do
   @name = :picky
 
   depends_on do
-    defined?(::Picky) && !NewRelic::Control.instance['disable_picky']
+    defined?(::Picky::Search) && !NewRelic::Control.instance['disable_picky']
   end
 
   executes do
@@ -38,4 +38,4 @@ DependencyDetection.defer do
       alias_method :execute, :execute_with_newrelic_trace
     end
   end
-end
+end

data/lib/rpm_contrib/instrumentation/ripple.rb

@@ -11,7 +11,8 @@ DependencyDetection.defer do
   end
 
   executes do
-    ::Ripple::Callbacks::InstanceMethods.class_eval do
+    (defined?(::Ripple::Callbacks::InstanceMethods) ? 
+      ::Ripple::Callbacks::InstanceMethods : ::Ripple::Callbacks).class_eval do
       add_method_tracer :valid?, 'Database/Riak/Ripple/valid?'
     end
 
@@ -20,11 +21,12 @@ DependencyDetection.defer do
       add_method_tracer :destroy_all, 'Database/Riak/Ripple/destroy_all'
     end
 
-    ::Ripple::Document::Persistence::InstanceMethods.class_eval do
+
+    (defined?(::Ripple::Document::Persistence::InstanceMethods) ? 
+      ::Ripple::Document::Persistence::InstanceMethods : ::Ripple::Document::Persistence).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 :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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wireframe-rpm_contrib
 version: !ruby/object:Gem::Version
-  version: 2.1.6.2
+  version: 2.1.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-06 00:00:00.000000000 Z
+date: 2012-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: newrelic_rpm
-  requirement: &2153526980 !ruby/object:Gem::Requirement
+  requirement: &2156658320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2153526980
+  version_requirements: *2156658320
 description: ! 'Community contributed instrumentation for various frameworks based
   on
 
@@ -60,7 +60,6 @@ files:
 - lib/rpm_contrib/instrumentation/mongoid.rb
 - lib/rpm_contrib/instrumentation/paperclip.rb
 - lib/rpm_contrib/instrumentation/picky.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
@@ -76,7 +75,6 @@ files:
 - test/schema.rb
 - test/test_curb.rb
 - test/test_picky.rb
-- test/test_redis.rb
 - test/test_resque.rb
 - test/test_workling.rb
 homepage: http://github.com/newrelic/rpm_contrib
@@ -99,7 +97,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -722698460256660614
+      hash: -645573489236863710
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/rpm_contrib/instrumentation/redis.rb

@@ -1,42 +0,0 @@
-# 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
-
-      include NewRelic::Agent::MethodTracer
-
-      def self.redis_call_method
-        ::Redis::Client.new.respond_to?(:call) ? :call : :raw_call_command
-      end
-
-
-      def raw_call_command_with_newrelic_trace *args
-        method_name = args[0].is_a?(Array) ? args[0][0] : args[0]
-        metrics = ["Database/Redis/#{method_name}",
-                   (NewRelic::Agent::Instrumentation::MetricFrame.recording_web_transaction? ? 'Database/Redis/allWeb' : 'Database/Redis/allOther')]
-        self.class.trace_execution_scoped(metrics) do
-          # NewRelic::Control.instance.log.debug("Instrumenting Redis Call[#{method_name}]: #{args[0].inspect}")
-          raw_call_command_without_newrelic_trace(*args)
-        end
-      end
-
-      alias_method :raw_call_command_without_newrelic_trace, redis_call_method
-      alias_method redis_call_method, :raw_call_command_with_newrelic_trace
-
-    end
-  end
-end
-
-
-

data/test/test_redis.rb

@@ -1,34 +0,0 @@
-require "#{File.dirname(__FILE__)}/helper"
-begin
-  require 'redis'
-  require 'ruby-debug'
-rescue LoadError
-end
-
-require "#{File.dirname(__FILE__)}/../lib/rpm_contrib/instrumentation/redis"
-
-if defined?(::Redis)
-
-
-  class RedisTest < Test::Unit::TestCase
-
-    # Called before every test method runs. Can be used
-    # to set up fixture information.
-    def setup
-      # Do nothing
-    end
-
-    # Called after every test method runs. Can be used to tear
-    # down fixture information.
-
-    def teardown
-      # Do nothing
-    end
-
-    # Fake test
-    def test_fail
-
-
-    end
-  end
-end