dolores_rpm 3.2.0.3 → 3.2.0.4

data/CHANGELOG

@@ -1,5 +1,8 @@
+v3.2.0.4
+  * Trying revised version of DataMapper support from NewRelic HEAD
+
 v3.2.0.3
-  * Slightly newer DataMapper support
+  * Upgraded DataMapper support but it didn't work
 
 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,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "dolores_rpm"
-  s.version = "3.2.0.3"
+  s.version = "3.2.0.4"
 
   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-02"
+  s.date = "2012-05-04"
   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"]
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
     "cert/cacert.pem",
     "cert/oldsite.pem",
     "cert/site.pem",
+    "dolores_rpm-3.2.0.3.gem",
     "dolores_rpm.gemspec",
     "install.rb",
     "lib/conditional_vendored_dependency_detection.rb",

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

@@ -1,47 +1,7 @@
-## NewRelic instrumentation for DataMapper
-#
-# Instrumenting DM has different key challenges versus AR:
-#
-#   1. The hooking of SQL logging in DM is decoupled from any knowledge of the
-#      Model#method that invoked it.  But on the positive side, the duration is
-#      already calculated for you (and it happens inside the C-based DO code, so
-#      it's faster than a Ruby equivalent).
-#
-#   2. There are a lot more entry points that need to be hooked in order to
-#      understand call flow: DM::Model (model class) vs. DM::Resource (model
-#      instance) vs. DM::Collection (collection of model instances).  And
-#      others.
-#
-#   3. Strategic Eager Loading (SEL) combined with separately-grouped
-#      lazy-loaded attributes presents a unique problem for tying resulting
-#      SEL-invoked SQL calls to their proper scope.
-#
-# NOTE: On using "Database" versus "ActiveRecord" as base metric name
-#
-#   Using "Database" as the metric name base seems to properly identify methods
-#   as being DB-related in call graphs, but certain RPM views that show
-#   aggregations of DB CPM, etc still seem to rely solely on "ActiveRecord"
-#   being the base name, thus AFAICT "Database" calls to this are lost.  (Though
-#   I haven't yet tested "Database/SQL/{find/save/destroy/all}" yet, as it seems
-#   like an intuitively good name to use.)
-#
-#   So far I think these are the rules:
-#
-#     - ActiveRecord/{find/save/destroy} populates "Database Throughput" and
-#       "Database Response Time" in the Database tab. [non-scoped]
-#
-#     - ActiveRecord/all populates the main Overview tab of DB time.  (still
-#       unsure about this one). [non-scoped]
-#
-#     These metrics are represented as :push_scope => false or included as the
-#     non-first metric in trace_execution_scoped() (docs say only first counts
-#     towards scope) so they don't show up ine normal call graph/trace.
-
-if defined? ::DataMapper
-
-  # DM::Model class methods
-  ::DataMapper::Model.class_eval do
-
+# 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'
@@ -59,24 +19,18 @@ if defined? ::DataMapper
       next unless method_defined? method
       add_method_tracer(method, 'ActiveRecord/#{self.name}/' + method.to_s)
     end
-
   end
 
-  # DM's Model instance (Resource) methods
-  ::DataMapper::Resource.class_eval do
-
+  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
 
-  # DM's Collection instance methods
-  ::DataMapper::Collection.class_eval do
-
+  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'
@@ -96,86 +50,67 @@ if defined? ::DataMapper
       next unless method_defined? method
       add_method_tracer(method, 'ActiveRecord/#{self.name}/' + method.to_s)
     end
-
   end
 
-  # Catch the two entry points into DM::Repository::Adapter that bypass CRUD
-  # (for when SQL is run directly).
-  ::DataMapper::Adapters::DataObjectsAdapter.class_eval do
-
+  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
 
-  end if defined? ::DataMapper::Adapters::DataObjectsAdapter
-
-  # DM::Validations overrides Model#create, but currently in a way that makes it
-  # impossible to instrument from one place.  I've got a patch pending inclusion
-  # to make it instrumentable by putting the create method inside ClassMethods.
-  # This will pick it up if/when that patch is accepted.
-  ::DataMapper::Validations::ClassMethods.class_eval do
-
+  DataMapper::Validations::ClassMethods.class_eval do
     next unless method_defined? :create
     add_method_tracer :create,   'ActiveRecord/#{self.name}/create'
+  end
+end
 
-  end if defined? ::DataMapper::Validations::ClassMethods
-
-  # NOTE: DM::Transaction basically calls commit() twice, so as-is it will show
-  # up in traces twice -- second time subordinate to the first's scope.  Works
-  # well enough.
-  ::DataMapper::Transaction.module_eval do
-    add_method_tracer :commit, 'ActiveRecord/#{self.class.name[/[^:]*$/]}/commit'
-  end if defined? ::DataMapper::Transaction
-
-  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
+module NewRelic
+  module Agent
+    module Instrumentation
+      module DataMapperInstrumentation
 
-          # 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)
+        def self.included(klass)
+          klass.class_eval do
+            alias_method :log_without_newrelic_instrumentation, :log
+            alias_method :log, :log_with_newrelic_instrumentation
           end
-
-        end # DataMapperInstrumentation
-      end # Instrumentation
-    end # Agent
-  end # NewRelic
-
-  ::DataObjects::Connection.class_eval do
-    include ::NewRelic::Agent::Instrumentation::DataMapperInstrumentation
-  end if defined? ::DataObjects::Connection
-
-end # if defined? DataMapper
+        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)
+        end
+
+      end # DataMapperInstrumentation
+    end # Instrumentation
+  end # Agent
+end # NewRelic
+
+DataObjects::Connection.class_eval do
+  include ::NewRelic::Agent::Instrumentation::DataMapperInstrumentation
+end

data/lib/new_relic/version.rb

@@ -4,7 +4,7 @@ module NewRelic
     MAJOR = 3
     MINOR = 2
     TINY  = 0
-    BUILD = 3 #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
+    BUILD = 4 #'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: 105
+  hash: 103
   prerelease: 
   segments: 
   - 3
   - 2
   - 0
-  - 3
-  version: 3.2.0.3
+  - 4
+  version: 3.2.0.4
 platform: ruby
 authors: 
 - Bill Kayser
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-02 00:00:00 Z
+date: 2012-05-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: jeweler
@@ -90,6 +90,7 @@ files:
 - cert/cacert.pem
 - cert/oldsite.pem
 - cert/site.pem
+- dolores_rpm-3.2.0.3.gem
 - dolores_rpm.gemspec
 - install.rb
 - lib/conditional_vendored_dependency_detection.rb