dolores_rpm 3.2.0.4 → 3.2.0.5

data/CHANGELOG

@@ -1,8 +1,5 @@
-v3.2.0.4
-  * Trying revised version of DataMapper support from NewRelic HEAD
-
-v3.2.0.3
-  * Upgraded DataMapper support but it didn't work
+v3.2.0.5
+  * Add DataMapper instrumentation for find/save/destroy with :push_scope => false (gets find to show up on database instrumentation)
 
 v3.2.0.2
   * Roll back to previous version of DataMapper instrumentation (current one does not work for our app)

data/dolores_rpm.gemspec

@@ -5,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = "dolores_rpm"
-  s.version = "3.2.0.4"
+  s.version = "3.2.0.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-04"
+  s.date = "2012-05-08"
   s.description = "New Relic is a performance management system, developed by New Relic,\nInc (http://www.newrelic.com). This is a fork that uses an older version\nof the DataMapper instrumentation. Newer versions did not work for us.\n"
   s.email = "support@newrelic.com"
-  s.executables = ["newrelic_cmd", "newrelic", "mongrel_rpm"]
+  s.executables = ["newrelic_cmd", "mongrel_rpm", "newrelic"]
   s.extra_rdoc_files = [
     "CHANGELOG",
     "LICENSE",
@@ -29,7 +29,8 @@ Gem::Specification.new do |s|
     "cert/cacert.pem",
     "cert/oldsite.pem",
     "cert/site.pem",
-    "dolores_rpm-3.2.0.3.gem",
+    "dolores_rpm-3.2.0.2.gem",
+    "dolores_rpm-3.3.4.fork.gem",
     "dolores_rpm.gemspec",
     "install.rb",
     "lib/conditional_vendored_dependency_detection.rb",
@@ -282,7 +283,7 @@ Gem::Specification.new do |s|
   s.post_install_message = "\nPLEASE NOTE:\n\nDeveloper Mode is now a Rack middleware.\n\nDeveloper Mode is no longer available in Rails 2.1 and earlier.\nHowever, starting in version 2.12 you can use Developer Mode in any\nRack based framework, in addition to Rails.  To install developer mode\nin a non-Rails application, just add NewRelic::Rack::DeveloperMode to\nyour middleware stack.\n\nIf you are using JRuby, we recommend using at least version 1.4 or \nlater because of issues with the implementation of the timeout library.\n\nRefer to the README.md file for more information.\n\nPlease see http://github.com/newrelic/rpm/blob/master/CHANGELOG\nfor a complete description of the features and enhancements available\nin version 3.2 of the Ruby Agent.\n  \n"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "New Relic Ruby Agent"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.23"
   s.summary = "New Relic Ruby Agent"
 
   if s.respond_to? :specification_version then

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

@@ -1,11 +1,17 @@
 # NewRelic instrumentation for DataMapper
 # For now, we have to refer to all db metrics as "ActiveRecord"
 if defined? DataMapper
+  
   DataMapper::Model.class_eval do
-    add_method_tracer :get,      'ActiveRecord/#{self.name}/get'
-    add_method_tracer :first,    'ActiveRecord/#{self.name}/first'
-    add_method_tracer :last,     'ActiveRecord/#{self.name}/last'
-    add_method_tracer :all,      'ActiveRecord/#{self.name}/all'
+    add_method_tracer :get,    'ActiveRecord/#{self.name}/get'
+    add_method_tracer :first,  'ActiveRecord/#{self.name}/first'
+    add_method_tracer :last,   'ActiveRecord/#{self.name}/last'
+    add_method_tracer :all,    'ActiveRecord/#{self.name}/all'
+
+    add_method_tracer :get,    'ActiveRecord/find', :push_scope => false
+    add_method_tracer :first,  'ActiveRecord/find', :push_scope => false
+    add_method_tracer :last,   'ActiveRecord/find', :push_scope => false
+    add_method_tracer :all,    'ActiveRecord/find', :push_scope => false
 
     add_method_tracer :create,   'ActiveRecord/#{self.name}/create'
     add_method_tracer :create!,  'ActiveRecord/#{self.name}/create'
@@ -14,103 +20,57 @@ if defined? DataMapper
     add_method_tracer :destroy,  'ActiveRecord/#{self.name}/destroy'
     add_method_tracer :destroy!, 'ActiveRecord/#{self.name}/destroy'
 
-    # For dm-aggregates and partial dm-ar-finders support:
-    for method in [ :aggregate, :find, :find_by_sql ] do
-      next unless method_defined? method
-      add_method_tracer(method, 'ActiveRecord/#{self.name}/' + method.to_s)
-    end
+    add_method_tracer :create,   'ActiveRecord/save', :push_scope => false
+    add_method_tracer :create!,  'ActiveRecord/save', :push_scope => false
+    add_method_tracer :update,   'ActiveRecord/save', :push_scope => false
+    add_method_tracer :update!,  'ActiveRecord/save', :push_scope => false
+    add_method_tracer :destroy,  'ActiveRecord/destroy', :push_scope => false
+    add_method_tracer :destroy!, 'ActiveRecord/destroy', :push_scope => false
   end
-
   DataMapper::Resource.class_eval do
-    add_method_tracer :update,   'ActiveRecord/#{self.class.name[/[^:]*$/]}/update'
-    add_method_tracer :update!,  'ActiveRecord/#{self.class.name[/[^:]*$/]}/update'
-    add_method_tracer :save,     'ActiveRecord/#{self.class.name[/[^:]*$/]}/save'
-    add_method_tracer :save!,    'ActiveRecord/#{self.class.name[/[^:]*$/]}/save'
-    add_method_tracer :destroy,  'ActiveRecord/#{self.class.name[/[^:]*$/]}/destroy'
-    add_method_tracer :destroy!, 'ActiveRecord/#{self.class.name[/[^:]*$/]}/destroy'
-  end
 
-  DataMapper::Collection.class_eval do
-    add_method_tracer :get,       'ActiveRecord/#{self.name}/get'
-    add_method_tracer :first,     'ActiveRecord/#{self.name}/first'
-    add_method_tracer :last,      'ActiveRecord/#{self.name}/last'
-    add_method_tracer :all,       'ActiveRecord/#{self.name}/all'
+    @@my_sql_defined = defined? ActiveRecord::ConnectionAdapters::MysqlAdapter
+    @@postgres_defined = defined? ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
 
-    add_method_tracer :lazy_load, 'ActiveRecord/#{self.name}/lazy_load'
-
-    add_method_tracer :create,    'ActiveRecord/#{self.name}/create'
-    add_method_tracer :create!,   'ActiveRecord/#{self.name}/create'
-    add_method_tracer :update,    'ActiveRecord/#{self.name}/update'
-    add_method_tracer :update!,   'ActiveRecord/#{self.name}/update'
-    add_method_tracer :destroy,   'ActiveRecord/#{self.name}/destroy'
-    add_method_tracer :destroy!,  'ActiveRecord/#{self.name}/destroy'
-
-    # For dm-aggregates support:
-    for method in [ :aggregate ] do
-      next unless method_defined? method
-      add_method_tracer(method, 'ActiveRecord/#{self.name}/' + method.to_s)
+    for method in [:query] do
+      add_method_tracer method, 'ActiveRecord/#{self.class.name[/[^:]*$/]}/execute'
+      add_method_tracer method, 'ActiveRecord/all', :push_scope => false
     end
-  end
-
-  DataMapper::Adapters::DataObjectsAdapter.class_eval do
-    add_method_tracer :select,  'ActiveRecord/#{self.class.name[/[^:]*$/]}/select'
-    add_method_tracer :execute, 'ActiveRecord/#{self.class.name[/[^:]*$/]}/execute'
-  end
-
-  DataMapper::Validations::ClassMethods.class_eval do
-    next unless method_defined? :create
-    add_method_tracer :create,   'ActiveRecord/#{self.name}/create'
-  end
-end
-
-module NewRelic
-  module Agent
-    module Instrumentation
-      module DataMapperInstrumentation
-
-        def self.included(klass)
-          klass.class_eval do
-            alias_method :log_without_newrelic_instrumentation, :log
-            alias_method :log, :log_with_newrelic_instrumentation
-          end
-        end
-
-        # Unlike in AR, log is called in DM after the query actually ran,
-        # complete with metrics.  Since DO has already calculated the
-        # duration, there's nothing more to measure, so just record and log.
-        #
-        # We rely on the assumption that all possible entry points have been
-        # hooked with tracers, ensuring that notice_sql attaches this SQL to
-        # the proper call scope.
-        def log_with_newrelic_instrumentation(msg)
-          return unless NewRelic::Agent.is_execution_traced?
-          return unless operation = case msg.query
-                                    when /^\s*select/i          then 'find'
-                                    when /^\s*(update|insert)/i then 'save'
-                                    when /^\s*delete/i          then 'destroy'
-                                    else nil
-                                    end
-
-          # FYI: self.to_s will yield connection URI string.
-          duration = msg.duration / 1000000.0
-
-          # Attach SQL to current segment/scope.
-          NewRelic::Agent.instance.transaction_sampler.notice_sql(msg.query, nil, duration)
-
-          # Record query duration associated with each of the desired metrics.
-          metrics = [ "ActiveRecord/#{operation}", 'ActiveRecord/all' ]
-          metrics.each do |metric|
-            NewRelic::Agent.instance.stats_engine.get_stats_no_scope(metric).trace_call(duration)
-          end
-        ensure
-          log_without_newrelic_instrumentation(msg)
+    for method in [:update, :save] do
+      add_method_tracer method, 'ActiveRecord/#{self.class.name[/[^:]*$/]}/save'
+      add_method_tracer method, 'ActiveRecord/save', :push_scope => false
+    end
+    add_method_tracer :destroy, 'ActiveRecord/#{self.class.name[/[^:]*$/]}/destroy'
+    add_method_tracer :destroy, 'ActiveRecord/destroy', :push_scope => false
+
+    def log_with_newrelic_instrumentation(sql, name, &block)
+      # if we aren't in a blamed context, then add one so that we can
+      # see that controllers are calling SQL directly we check
+      # scope_depth vs 2 since the controller is 1
+      if NewRelic::Agent.instance.transaction_sampler.scope_depth < 2
+        self.class.trace_method_execution "Database/DirectSQL", true, true do
+          log_with_capture_sql(sql, name, &block)
         end
-
-      end # DataMapperInstrumentation
-    end # Instrumentation
-  end # Agent
-end # NewRelic
-
-DataObjects::Connection.class_eval do
-  include ::NewRelic::Agent::Instrumentation::DataMapperInstrumentation
+      else
+        log_with_capture_sql(sql, name, &block)
+      end
+    end
+    
+    def log_with_capture_sql(sql, name, &block)
+      if @@my_sql_defined && self.is_a?(ActiveRecord::ConnectionAdapters::MysqlAdapter)
+        config = @config
+      elsif @@postgres_defined && self.is_a?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
+        config = @config
+      else
+        config = nil
+      end
+      
+      t0 = Time.now
+      result = log_without_newrelic_instrumentation(sql, name, &block)
+      
+      NewRelic::Agent.instance.transaction_sampler.notice_sql(sql, config, (Time.now - t0).to_f)
+      
+      result
+    end
+  end
 end

data/lib/new_relic/version.rb

@@ -4,7 +4,7 @@ module NewRelic
     MAJOR = 3
     MINOR = 2
     TINY  = 0
-    BUILD = 4 #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
+    BUILD = 5 #'0' # 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: 103
+  hash: 101
   prerelease: 
   segments: 
   - 3
   - 2
   - 0
-  - 4
-  version: 3.2.0.4
+  - 5
+  version: 3.2.0.5
 platform: ruby
 authors: 
 - Bill Kayser
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-04 00:00:00 Z
+date: 2012-05-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: jeweler
@@ -71,8 +71,8 @@ description: |
 email: support@newrelic.com
 executables: 
 - newrelic_cmd
-- newrelic
 - mongrel_rpm
+- newrelic
 extensions: []
 
 extra_rdoc_files: 
@@ -90,7 +90,8 @@ files:
 - cert/cacert.pem
 - cert/oldsite.pem
 - cert/site.pem
-- dolores_rpm-3.2.0.3.gem
+- dolores_rpm-3.2.0.2.gem
+- dolores_rpm-3.3.4.fork.gem
 - dolores_rpm.gemspec
 - install.rb
 - lib/conditional_vendored_dependency_detection.rb
@@ -391,7 +392,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: New Relic Ruby Agent