dolores_rpm 3.3.4.4 → 3.3.4.5

data/CHANGELOG

@@ -1,3 +1,6 @@
+v3.3.4.5
+  * Fixed bug in DataMapper instrumentation
+
 v3.3.4.4
   * Fixing README and Rakefile to indicate clearly that this is a fork
 

data/dolores_rpm.gemspec

@@ -5,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = "dolores_rpm"
-  s.version = "3.3.4.4"
+  s.version = "3.3.4.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bill Kayser", "Jon Guymon", "Justin George", "Darin Swanson"]
-  s.date = "2012-05-13"
+  s.date = "2012-05-14"
   s.description = "New Relic is a performance management system, developed by New Relic,\nInc (http://www.newrelic.com). This is a fork that adds\tadditional\ninstrumentation to the DataMapper instrumentation because we could\nnot view time spent in the database.\n"
   s.email = "support@newrelic.com"
-  s.executables = ["mongrel_rpm", "newrelic_cmd", "newrelic"]
+  s.executables = ["newrelic_cmd", "mongrel_rpm", "newrelic"]
   s.extra_rdoc_files = [
     "CHANGELOG",
     "LICENSE",

data/lib/new_relic/agent/instrumentation/data_mapper.rb

@@ -115,7 +115,7 @@ DependencyDetection.defer do
       add_method_tracer :destroy,  'ActiveRecord/#{self.class.name[/[^:]*$/]}/destroy'
       add_method_tracer :destroy!, 'ActiveRecord/#{self.class.name[/[^:]*$/]}/destroy'
 
-      add_method_tracer :update,   'ActiveRecord/all', :push_scope => false
+      add_method_tracer :update,   'ActiveRecord/save', :push_scope => false
       add_method_tracer :update!,  'ActiveRecord/save', :push_scope => false
       add_method_tracer :save,     'ActiveRecord/save', :push_scope => false
       add_method_tracer :save!,    'ActiveRecord/save', :push_scope => false
@@ -175,6 +175,11 @@ DependencyDetection.defer do
       add_method_tracer :select,  'ActiveRecord/#{self.class.name[/[^:]*$/]}/select'
       add_method_tracer :execute, 'ActiveRecord/#{self.class.name[/[^:]*$/]}/execute'
 
+      add_method_tracer :select,    'ActiveRecord/find', :push_scope => false
+      add_method_tracer :select,    'ActiveRecord/all', :push_scope => false
+
+      add_method_tracer :execute,    'ActiveRecord/save', :push_scope => false
+      add_method_tracer :execute,    'ActiveRecord/all', :push_scope => false
     end
   end
 end

data/lib/new_relic/version.rb

@@ -4,7 +4,7 @@ module NewRelic
     MAJOR = 3
     MINOR = 3
     TINY  = 4
-    BUILD = 4 # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
+    BUILD = 5 # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: dolores_rpm
 version: !ruby/object:Gem::Version 
-  hash: 127
+  hash: 125
   prerelease: 
   segments: 
   - 3
   - 3
   - 4
-  - 4
-  version: 3.3.4.4
+  - 5
+  version: 3.3.4.5
 platform: ruby
 authors: 
 - Bill Kayser
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-13 00:00:00 Z
+date: 2012-05-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: jeweler
@@ -71,8 +71,8 @@ description: |
 
 email: support@newrelic.com
 executables: 
-- mongrel_rpm
 - newrelic_cmd
+- mongrel_rpm
 - newrelic
 extensions: []