rpm_contrib 1.0.9 → 1.0.10

data/CHANGELOG

@@ -1,3 +1,7 @@
+* Version 1.0.10
+
+  Mongoid support contributed by Karl Baum
+
 * Version 1.0.9
 
   Fixed dependency specification on newrelic_rpm

data/README.md

@@ -39,8 +39,11 @@ it by setting `disable_paperclip` to true in the newrelic.yml file.
 
 ### MongoDB
 
-No special configuration required for MongoDB visibility.  You can disable
-it by setting `disable_mongodb` to true in the newrelic.yml file.
+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.
 
 ### Resque
 

data/lib/rpm_contrib/instrumentation/mongo_mapper.rb

@@ -0,0 +1,44 @@
+if defined?(::MongoMapper) && !NewRelic::Control.instance['disable_mongodb']
+  
+  module RPMContrib::Instrumentation
+    # Just drop this little diddy in your app to get some (not perfect) information
+    # on query times and such.
+    #
+    # Currently only MongoMapper is implemented
+    module MongoMapper
+      def self.included(model)
+        model.metaclass.class_eval do
+          add_method_tracer :find,        'Database/#{self.name}/find'
+          add_method_tracer :find!,       'Database/#{self.name}/find!'
+          add_method_tracer :paginate,    'Database/#{self.name}/paginate'
+          add_method_tracer :first,       'Database/#{self.name}/first'
+          add_method_tracer :last,        'Database/#{self.name}/last'
+          add_method_tracer :all,         'Database/#{self.name}/all'
+          add_method_tracer :count,       'Database/#{self.name}/count'
+          add_method_tracer :create,      'Database/#{self.name}/create'
+          add_method_tracer :create!,     'Database/#{self.name}/create!'
+          add_method_tracer :update,      'Database/#{self.name}/update'
+          add_method_tracer :delete,      'Database/#{self.name}/delete'
+          add_method_tracer :delete_all,  'Database/#{self.name}/delete_all'
+          add_method_tracer :destroy,     'Database/#{self.name}/destroy'
+          add_method_tracer :destroy_all, 'Database/#{self.name}/destroy_all'
+          add_method_tracer :exists?,     'Database/#{self.name}/exists?'
+          add_method_tracer :find_by_id,  'Database/#{self.name}/find_by_id'
+          add_method_tracer :increment,   'Database/#{self.name}/increment'
+          add_method_tracer :decrement,   'Database/#{self.name}/decrement'
+          add_method_tracer :set,         'Database/#{self.name}/set'
+          add_method_tracer :push,        'Database/#{self.name}/push'
+          add_method_tracer :push_all,    'Database/#{self.name}/push_all'
+          add_method_tracer :push_uniq,   'Database/#{self.name}/push_uniq'
+          add_method_tracer :pull,        'Database/#{self.name}/pull'
+          add_method_tracer :pull_all,    'Database/#{self.name}/pull_all'
+        end
+        
+        model.class_eval do
+          add_method_tracer :save,        'Database/#{self.class.name}/save'
+        end
+      end
+    end
+    ::MongoMapper::Document.append_inclusions(::RPMContrib::Instrumentation::MongoMapper)
+  end 
+end

data/lib/rpm_contrib/instrumentation/mongoid.rb

@@ -0,0 +1,53 @@
+if defined?(::Mongoid) && !NewRelic::Control.instance['disable_mongodb']
+
+  module Mongoid #:nodoc:
+    module Document
+
+      #adding call to super
+      class << self
+        alias :old_included :included
+
+        def included(model)
+          old_included(model)
+          super
+        end
+      end
+    end
+  end
+
+  module RPMContrib::Instrumentation
+
+    module Mongoid
+      def included(model)
+        model.metaclass.class_eval do
+          puts "adding mongoid method tracers for #{model.name}"
+          add_method_tracer :create, 'Database/#{self.name}/create'
+          add_method_tracer :create!, 'Database/#{self.name}/create!'
+          add_method_tracer :delete_all, 'Database/#{self.name}/delete_all'
+          add_method_tracer :destroy_all, 'Database/#{self.name}/destroy_all'
+          add_method_tracer :all, 'Database/#{self.name}/all'
+          add_method_tracer :find, 'Database/#{self.name}/find'
+          add_method_tracer :first, 'Database/#{self.name}/first'
+          add_method_tracer :last, 'Database/#{self.name}/last'
+          add_method_tracer :find_or_create_by, 'Database/#{self.name}/find_or_create_by'
+          add_method_tracer :find_or_initialize_by, 'Database/#{self.name}/find_or_initialize_by'
+          add_method_tracer :min, 'Database/#{self.name}/min'
+          add_method_tracer :max, 'Database/#{self.name}/max'
+          add_method_tracer :sum, 'Database/#{self.name}/sum'
+        end
+
+        model.class_eval do
+          add_method_tracer :update_attributes, 'Database/#{self.class.name}/update_attributes'
+          add_method_tracer :update_attributes!, 'Database/#{self.class.name}/update_attributes!'
+          add_method_tracer :save, 'Database/#{self.class.name}/save'
+          add_method_tracer :save!, 'Database/#{self.class.name}/save!'
+          add_method_tracer :delete, 'Database/#{self.class.name}/delete'
+          add_method_tracer :destroy, 'Database/#{self.class.name}/destroy'
+
+        end
+        super
+      end
+    end
+    ::Mongoid::Document.extend(RPMContrib::Instrumentation::Mongoid)
+  end
+end

data/test/helper.rb

@@ -2,11 +2,8 @@ require 'rubygems'
 require 'test/unit'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'newrelic_rpm'
-require 'rpm_contrib'
+#$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-class Test::Unit::TestCase
-end
+require File.expand_path("../../lib/rpm_contrib.rb", __FILE__)
 
 require 'schema.rb'

data/test/test_mongoid.rb

@@ -0,0 +1,42 @@
+require "#{File.dirname(__FILE__)}/helper"
+begin
+  require 'mongoid'
+rescue LoadError
+end
+
+require "#{File.dirname(__FILE__)}/../lib/rpm_contrib/instrumentation/mongoid"
+
+if defined?(::Mongoid)
+  
+  Mongoid.configure do |config|
+    config.master = Mongo::Connection.new.db('animals')
+  end
+
+  class Dog
+    include Mongoid::Document
+
+    field :name
+  end
+
+  class MongoidTest < 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
+      Dog.create!(:name=>'rover')
+
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 9
-  version: 1.0.9
+  - 10
+  version: 1.0.10
 platform: ruby
 authors: 
 - Bill Kayser
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-10 00:00:00 -07:00
+date: 2010-05-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,13 +54,14 @@ files:
 - lib/rpm_contrib/detection/camping.rb
 - lib/rpm_contrib/detection/resque.rb
 - lib/rpm_contrib/instrumentation/camping.rb
-- lib/rpm_contrib/instrumentation/mongodb.rb
+- lib/rpm_contrib/instrumentation/mongo_mapper.rb
+- lib/rpm_contrib/instrumentation/mongoid.rb
 - lib/rpm_contrib/instrumentation/paperclip.rb
 - lib/rpm_contrib/instrumentation/redis.rb
 - lib/rpm_contrib/instrumentation/resque.rb
 - test/helper.rb
 - test/schema.rb
-- test/test_rpm_contrib.rb
+- test/test_mongoid.rb
 has_rdoc: true
 homepage: http://github.com/newrelic/rpm_contrib
 licenses: []
@@ -100,4 +101,4 @@ summary: Contributed Instrumentation for New Relic RPM
 test_files: 
 - test/helper.rb
 - test/schema.rb
-- test/test_rpm_contrib.rb
+- test/test_mongoid.rb

data/lib/rpm_contrib/instrumentation/mongodb.rb

@@ -1,41 +0,0 @@
-# Just drop this little diddy in your app to get some (not perfect) information on query times and such
-# This will eventually become an official plugin but for those who can't wait, enjoy.
-
-
-module RPMContrib::Instrumentation
-  module MongoDB
-    def self.included(model)
-      model.metaclass.class_eval do
-        add_method_tracer :find,        'Database/#{self.name}/find'
-        add_method_tracer :find!,       'Database/#{self.name}/find!'
-        add_method_tracer :paginate,    'Database/#{self.name}/paginate'
-        add_method_tracer :first,       'Database/#{self.name}/first'
-        add_method_tracer :last,        'Database/#{self.name}/last'
-        add_method_tracer :all,         'Database/#{self.name}/all'
-        add_method_tracer :count,       'Database/#{self.name}/count'
-        add_method_tracer :create,      'Database/#{self.name}/create'
-        add_method_tracer :create!,     'Database/#{self.name}/create!'
-        add_method_tracer :update,      'Database/#{self.name}/update'
-        add_method_tracer :delete,      'Database/#{self.name}/delete'
-        add_method_tracer :delete_all,  'Database/#{self.name}/delete_all'
-        add_method_tracer :destroy,     'Database/#{self.name}/destroy'
-        add_method_tracer :destroy_all, 'Database/#{self.name}/destroy_all'
-        add_method_tracer :exists?,     'Database/#{self.name}/exists?'
-        add_method_tracer :find_by_id,  'Database/#{self.name}/find_by_id'
-        add_method_tracer :increment,   'Database/#{self.name}/increment'
-        add_method_tracer :decrement,   'Database/#{self.name}/decrement'
-        add_method_tracer :set,         'Database/#{self.name}/set'
-        add_method_tracer :push,        'Database/#{self.name}/push'
-        add_method_tracer :push_all,    'Database/#{self.name}/push_all'
-        add_method_tracer :push_uniq,   'Database/#{self.name}/push_uniq'
-        add_method_tracer :pull,        'Database/#{self.name}/pull'
-        add_method_tracer :pull_all,    'Database/#{self.name}/pull_all'
-      end
-      
-      model.class_eval do
-        add_method_tracer :save,        'Database/#{self.class.name}/save'
-      end
-    end
-  end
-  ::MongoMapper::Document.append_inclusions(::RPMContrib::Instrumentation::MongoDB)
-end if defined?(::MongoMapper) && !NewRelic::Control.instance['disable_mongodb']

data/test/test_rpm_contrib.rb

@@ -1,7 +0,0 @@
-require "#{File.dirname(__FILE__)}/helper"
-
-class TestRpmContrib < Test::Unit::TestCase
-  def test_something_for_real
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end