scout_apm 2.4.11.pre → 2.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1686beb2285cb415ac0f73e4dfa65524b85a369d
-  data.tar.gz: f56d09891f9b899721c711f43dc48e06160073b1
+  metadata.gz: b51f36211c52637ac2eba181cf772f6e80e4476f
+  data.tar.gz: fef360f94b747d5fe67acb6fcc1ced25ddf80dce
 SHA512:
-  metadata.gz: 3af376cdc73869c73775ca02aaad1817fa735a7b2c73521fe2015f0584c5085e50f7ec94c40bc402363c691e70d98c6cfbc4d0887ff1b0cb7082efeae1bc2578
-  data.tar.gz: 6ace83f9f30fd8bfeb48875e6a58c508f2cc65f1fafd36e8fc1e6421c6556ddc096a27396dc2546ae623af9765586da976da64b6cec9654c29c71feea0927bd6
+  metadata.gz: a18c8bcc6c39c1d7448b2c715e006e7498db48973e1789b60f585e4357393c545033e5fe677aa11ea2d6f4a16b2b396c579575fad3758c464680317f48f5dfa2
+  data.tar.gz: d5aea617adf94ef945769198b42e995423fc9dec15dff9a57a292326bb535da20596bb9908c205315051be617b7ad3d08f640e95fa39470476b69577121e07fa

data/CHANGELOG.markdown

@@ -1,6 +1,7 @@
 # 2.4.11
 
 * Adds transaction + periodic reporting callback extension support
+* Use Module#prepend if available for ActiveRecord `exec_query` instrument
 
 # 2.4.10
 

data/lib/scout_apm/environment.rb

@@ -165,15 +165,23 @@ module ScoutApm
     end
 
     def ruby_19?
-      @ruby_19 ||= defined?(RUBY_ENGINE) && RUBY_ENGINE == "ruby" && RUBY_VERSION.match(/^1\.9/)
+      return @ruby_19 if defined?(@ruby_19)
+      @ruby_19 = defined?(RUBY_ENGINE) && RUBY_ENGINE == "ruby" && RUBY_VERSION.match(/^1\.9/)
     end
 
     def ruby_187?
-      @ruby_187 ||= defined?(RUBY_VERSION) && RUBY_VERSION.match(/^1\.8\.7/)
+      return @ruby_187 if defined?(@ruby_187)
+      @ruby_187 = defined?(RUBY_VERSION) && RUBY_VERSION.match(/^1\.8\.7/)
     end
 
     def ruby_2?
-      @ruby_2 ||= defined?(RUBY_VERSION) && RUBY_VERSION.match(/^2/)
+      return @ruby_2 if defined?(@ruby_2)
+      @ruby_2 = defined?(RUBY_VERSION) && RUBY_VERSION.match(/^2/)
+    end
+
+    # Returns true if this Ruby version supports Module#prepend.
+    def supports_module_prepend?
+      ruby_2?
     end
 
     # Returns a string representation of the OS (ex: darwin, linux)

data/lib/scout_apm/instruments/active_record.rb

@@ -118,8 +118,14 @@ module ScoutApm
            (::ActiveRecord::VERSION::MAJOR.to_i == 3 && ::ActiveRecord::VERSION::MINOR.to_i >= 2))
         if rails_3_2_or_above
           if Utils::KlassHelper.defined?("ActiveRecord::Relation")
-            ::ActiveRecord::Relation.module_eval do
-              include ::ScoutApm::Instruments::ActiveRecordRelationQueryInstruments
+            if @context.environment.supports_module_prepend?
+              ::ActiveRecord::Relation.module_eval do
+                prepend ::ScoutApm::Instruments::ActiveRecordRelationQueryInstruments
+              end
+            else
+              ::ActiveRecord::Relation.module_eval do
+                include ::ScoutApm::Instruments::ActiveRecordRelationQueryInstruments
+              end
             end
           end
         else
@@ -298,6 +304,10 @@ module ScoutApm
     end
 
     module ActiveRecordRelationQueryInstruments
+      def self.prepended(instrumented_class)
+        ScoutApm::Agent.instance.context.logger.info "Instrumenting ActiveRecord::Relation#exec_queries - #{instrumented_class.inspect} (prepending)"
+      end
+
       def self.included(instrumented_class)
         ScoutApm::Agent.instance.context.logger.info "Instrumenting ActiveRecord::Relation#exec_queries - #{instrumented_class.inspect}"
         instrumented_class.class_eval do
@@ -308,7 +318,7 @@ module ScoutApm
         end
       end
 
-      def exec_queries_with_scout_instruments(*args, &block)
+      def exec_queries(*args, &block)
         req = ScoutApm::RequestManager.lookup
         layer = ScoutApm::Layer.new("ActiveRecord", Utils::ActiveRecordMetricName::DEFAULT_METRIC)
         layer.annotate_layer(:ignorable => true)
@@ -316,12 +326,23 @@ module ScoutApm
         req.start_layer(layer)
         req.ignore_children!
         begin
-          exec_queries_without_scout_instruments(*args, &block)
+          if ScoutApm::Environment.instance.supports_module_prepend?
+            super(*args, &block)
+          else
+            exec_queries_without_scout_instruments(*args, &block)
+          end
         ensure
           req.acknowledge_children!
           req.stop_layer
         end
       end
+
+      # If prepend is not supported, rename the method and use
+      # alias_method_style chaining instead
+      if !ScoutApm::Environment.instance.supports_module_prepend?
+        alias_method :exec_queries_with_scout_instruments, :exec_queries
+        remove_method :exec_queries
+      end
     end
 
     module ActiveRecordUpdateInstruments

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "2.4.11.pre"
+  VERSION = "2.4.11"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 2.4.11.pre
+  version: 2.4.11
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-11 00:00:00.000000000 Z
+date: 2018-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -383,12 +383,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: scout_apm
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5.2
 signing_key: 
 specification_version: 4
 summary: Ruby application performance monitoring
@@ -435,4 +435,3 @@ test_files:
 - test/unit/utils/backtrace_parser_test.rb
 - test/unit/utils/numbers_test.rb
 - test/unit/utils/scm.rb
-has_rdoc: