rpm_contrib 1.0.10 → 1.0.11

data/CHANGELOG

@@ -1,3 +1,9 @@
+* Version 1.0.11
+
+  AWS/S3 instrumentation contributed by Brian Doll
+  Cassandra instrumentation contributed by Ashley Martens
+  Updated Redis instrumentation for 1.x and 2.x contributed by Karl Baum
+
 * Version 1.0.10
 
   Mongoid support contributed by Karl Baum

data/Rakefile

@@ -57,7 +57,7 @@ rescue LoadError
   end
 end
 
-task :test => :check_dependencies
+#task :test => :check_dependencies
 
 task :default => :test
 

data/lib/rpm_contrib/instrumentation/aws/s3.rb

@@ -0,0 +1,56 @@
+# Instrumentation for the AWS-S3 gem for New Relic RPM by Brian Doll
+if defined?(::AWS::S3) && !NewRelic::Control.instance['disable_aws-s3']
+
+  # Instrument connections to the AWS-S3 service
+  ::AWS::S3::Connection::Management::ClassMethods.module_eval do
+    add_method_tracer :establish_connection!, 'AWS-S3/establish_connection!'
+  end
+
+  # Instrument methods on Bucket
+  ::AWS::S3::Bucket.instance_eval do
+    class << self
+      add_method_tracer :create,  'AWS-S3/Bucket/create'
+      add_method_tracer :find,    'AWS-S3/Bucket/find'
+      add_method_tracer :objects, 'AWS-S3/Bucket/objects'
+      add_method_tracer :delete,  'AWS-S3/Bucket/delete'
+      add_method_tracer :list,    'AWS-S3/Bucket/list'
+    end
+  end
+
+  # Instrument methods on Bucket instances
+  ::AWS::S3::Bucket.class_eval do
+    add_method_tracer :[],        'AWS-S3/Bucket/#{self.name}/[]'
+    add_method_tracer :new_object,'AWS-S3/Bucket/#{self.name}/new_objects'
+    add_method_tracer :objects,   'AWS-S3/Bucket/#{self.name}/objects'
+    add_method_tracer :delete,    'AWS-S3/Bucket/#{self.name}/delete'
+    add_method_tracer :delete_all,'AWS-S3/Bucket/#{self.name}/delete_all'
+    add_method_tracer :update,    'AWS-S3/Bucket/#{self.name}/update'
+  end
+
+  # Instrument methods on S3Object
+  ::AWS::S3::S3Object.instance_eval do
+    class << self
+      add_method_tracer :about,   'AWS-S3/S3Object/about'
+      add_method_tracer :copy,    'AWS-S3/S3Object/copy'
+      add_method_tracer :delete,  'AWS-S3/S3Object/delete'
+      add_method_tracer :rename,  'AWS-S3/S3Object/rename'
+      add_method_tracer :store,   'AWS-S3/S3Object/store'
+    end
+  end
+
+  # Instrument methods on S3Object instances
+  # Metric names are aggregated across all S3Objects since having a metric for
+  # every single S3Object instance and method pair would be fairly useless
+  ::AWS::S3::S3Object.class_eval do
+    add_method_tracer :value,     'AWS-S3/S3Objects/value'
+    add_method_tracer :about,     'AWS-S3/S3Objects/about'
+    add_method_tracer :metadata,  'AWS-S3/S3Objects/metadata'
+    add_method_tracer :store,     'AWS-S3/S3Objects/store'
+    add_method_tracer :delete,    'AWS-S3/S3Objects/delete'
+    add_method_tracer :copy,      'AWS-S3/S3Objects/copy'
+    add_method_tracer :rename,    'AWS-S3/S3Objects/rename'
+    add_method_tracer :etag,      'AWS-S3/S3Objects/etag'
+    add_method_tracer :owner,     'AWS-S3/S3Objects/owner'
+  end
+  
+end

data/lib/rpm_contrib/instrumentation/cassandra.rb

@@ -0,0 +1,23 @@
+# == Cassandra Instrumentation
+#
+
+if defined?(::Cassandra) and not  NewRelic::Control.instance['disable_cassandra_instrumentation']
+  
+  ::Cassandra.class_eval do
+    add_method_tracer :insert,               'Database/Cassandra/insert'
+    add_method_tracer :remove,               'Database/Cassandra/remove'
+    add_method_tracer :clear_column_family!, 'Database/Cassandra/clear_column_family!'
+    add_method_tracer :clear_keyspace!,      'Database/Cassandra/clear_keyspace!'
+    add_method_tracer :count_columns,        'Database/Cassandra/count_columns'
+    add_method_tracer :multi_count_columns,  'Database/Cassandra/multi_count_columns'
+    add_method_tracer :get_columns,          'Database/Cassandra/get_columns'
+    add_method_tracer :multi_get_columns,    'Database/Cassandra/multi_get_columns'
+    add_method_tracer :get,                  'Database/Cassandra/get'
+    add_method_tracer :multi_get,            'Database/Cassandra/multi_get'
+    add_method_tracer :exists?,              'Database/Cassandra/exists?'
+    add_method_tracer :get_range,            'Database/Cassandra/get_range'
+    add_method_tracer :count_range,          'Database/Cassandra/count_range'
+    add_method_tracer :batch,                'Database/Cassandra/batch'
+  end
+
+end

data/lib/rpm_contrib/instrumentation/redis.rb

@@ -2,10 +2,16 @@
 #
 
 if defined?(::Redis) and not  NewRelic::Control.instance['disable_redis']
-  
-  ::Redis.class_eval 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]
@@ -16,11 +22,12 @@ if defined?(::Redis) and not  NewRelic::Control.instance['disable_redis']
         raw_call_command_without_newrelic_trace(*args)
       end
     end
-    
-    # alias_method_chain :raw_call_command, :newrelic_trace
-    alias raw_call_command_without_newrelic_trace raw_call_command
-    alias raw_call_command raw_call_command_with_newrelic_trace
+
+    alias_method :raw_call_command_without_newrelic_trace, redis_call_method
+    alias_method redis_call_method, :raw_call_command_with_newrelic_trace
     
   end
 
+
+
 end

data/test/test_redis.rb

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 10
-  version: 1.0.10
+  - 11
+  version: 1.0.11
 platform: ruby
 authors: 
 - Bill Kayser
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-21 00:00:00 -07:00
+date: 2010-09-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,7 +53,9 @@ files:
 - lib/rpm_contrib.rb
 - lib/rpm_contrib/detection/camping.rb
 - lib/rpm_contrib/detection/resque.rb
+- lib/rpm_contrib/instrumentation/aws/s3.rb
 - lib/rpm_contrib/instrumentation/camping.rb
+- lib/rpm_contrib/instrumentation/cassandra.rb
 - lib/rpm_contrib/instrumentation/mongo_mapper.rb
 - lib/rpm_contrib/instrumentation/mongoid.rb
 - lib/rpm_contrib/instrumentation/paperclip.rb
@@ -62,6 +64,7 @@ files:
 - test/helper.rb
 - test/schema.rb
 - test/test_mongoid.rb
+- test/test_redis.rb
 has_rdoc: true
 homepage: http://github.com/newrelic/rpm_contrib
 licenses: []
@@ -102,3 +105,4 @@ test_files:
 - test/helper.rb
 - test/schema.rb
 - test/test_mongoid.rb
+- test/test_redis.rb