scout_apm 2.3.0.pre1 → 2.3.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87d20e596496af9d020ff073a6c0a6dd5f25989b
-  data.tar.gz: 76a903858e591025ec82842c3f2a6d30a66f35fd
+  metadata.gz: 4554876f9ec9c7b93aa379cde4a00dd0adbdf1e7
+  data.tar.gz: 96a00005dd846304676a25568be464382dcb16eb
 SHA512:
-  metadata.gz: d9733bb68af60c98eafddc3ad2d469173987214bc785e80deff2bd6f87161b1c256ca8cdc7b525656cae8bebe06332772b42a4896f624b1a70ca69882f26df1d
-  data.tar.gz: e5a84284b84bb95bea7cbe7dda0bddfafc79e1180c833f8709d778cbbbc926d617c9f94f2a55dbf8870bd5869088bca8727227172823e7358d6b98617248a8ed
+  metadata.gz: 4f30c493a882edd86d1df9e0ecbb3afff859a92476a829466010cfdfaf154ae407bb64e1a29d5223b3f2ac4bfc9f1550e1f13363b08d451f293fefe7b70dd20a
+  data.tar.gz: 9a848973e69b1995ef393a1d16f2cb94bba5fc71d2e48fdd3ce6aa929283fd6a3c51e53728da9eb0409971bec2fd4444e3a7a33cfa5ce21ba55900340dbc843a

data/lib/scout_apm/instruments/active_record.rb

@@ -48,11 +48,16 @@ module ScoutApm
           end
         end
 
-        if Utils::KlassHelper.defined?("ActiveRecord::Relation")
-          ::ActiveRecord::Relation.class_eval do
-            include ::ScoutApm::Instruments::ActiveRecordRelationInstruments
-          end
-        end
+        # Disabled until we can determine how to use Module#prepend in the
+        # agent. Otherwise, this will cause infinite loops if NewRelic is
+        # installed. We can't just use normal Module#include, since the
+        # original methods don't call super the way Base#save does
+        #
+        #if Utils::KlassHelper.defined?("ActiveRecord::Relation")
+        #  ::ActiveRecord::Relation.class_eval do
+        #    include ::ScoutApm::Instruments::ActiveRecordRelationInstruments
+        #  end
+        #end
 
         if Utils::KlassHelper.defined?("ActiveRecord::Querying")
           ::ActiveRecord::Querying.module_eval do
@@ -222,23 +227,7 @@ module ScoutApm
     end
 
     module ActiveRecordUpdateInstruments
-      def self.included(instrumented_class)
-        ScoutApm::Agent.instance.logger.info "Instrumenting ActiveRecord Save: - #{instrumented_class.inspect}"
-        instrumented_class.class_eval do
-          unless instrumented_class.method_defined?(:save_without_scout_instruments)
-            alias_method :save_without_scout_instruments, :save
-            alias_method :save, :save_with_scout_instruments
-          end
-
-          unless instrumented_class.method_defined?(:"savebang_without_scout_instruments")
-            alias_method :"savebang_without_scout_instruments", :"save!"
-            alias_method :"save!", :"savebang_with_scout_instruments"
-          end
-        end
-
-      end
-
-      def savebang_with_scout_instruments(*args, &block)
+      def save(*args, &block)
         model = self.class.name
         operation = self.persisted? ? "Update" : "Create"
 
@@ -247,14 +236,14 @@ module ScoutApm
         req.start_layer(layer)
         req.ignore_children!
         begin
-          savebang_without_scout_instruments(*args, &block)
+          super(*args, &block)
         ensure
           req.acknowledge_children!
           req.stop_layer
         end
       end
 
-      def save_with_scout_instruments(*args, &block)
+      def save!(*args, &block)
         model = self.class.name
         operation = self.persisted? ? "Update" : "Create"
 
@@ -263,7 +252,7 @@ module ScoutApm
         req.start_layer(layer)
         req.ignore_children!
         begin
-          save_without_scout_instruments(*args, &block)
+          super(*args, &block)
         ensure
           req.acknowledge_children!
           req.stop_layer

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "2.3.0.pre1"
+  VERSION = "2.3.0.pre2"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 2.3.0.pre1
+  version: 2.3.0.pre2
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-28 00:00:00.000000000 Z
+date: 2017-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest