scout_apm 2.4.0.pre2 → 2.4.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08385e64d3b8d96ae39c02f892b637dfd0a9b154
-  data.tar.gz: 3ab13e2996230a611bca4907bd439d5503b05af5
+  metadata.gz: 29cede8ad70dd0d7cb0be6a777da5d346309ff24
+  data.tar.gz: 17f98116601cc9b75c3d0da0e9f315f2250af174
 SHA512:
-  metadata.gz: 50d959241a2921399d5d05e67add7b75000782e24ae9276c3a99460b9dcfcb076f72b230c6e35f29cb47f3dd3a75e2fb6487490e084f97403dfe030e4cf7210a
-  data.tar.gz: 6d36b242cc269e99981dae5fda755aa8bee1ef73616e1afc9dbabcd9a81aca3190f42d27fc6dddcc5b7309078b0ad6086e17008720ad90b35af0765f7ec237b2
+  metadata.gz: 4b5717805b91c5f13ab00e22c5739b4bba32ab7f4bf1eae18118607019937cfba7ad53dfd76086ddc1c5d8fcd2f2350686b594cbb5b6b3a44a61b4759305cad3
+  data.tar.gz: 60b82a60a84001d6a480f2ebdbf16cb5c964e729b30bcbc82c47b0cd526aea71802e3b753bb568176d5a4beca02a1a2d5bdf9b012a0bb48318fc6fb6b2908307

data/CHANGELOG.markdown

@@ -2,6 +2,10 @@
 
 * Rework agent startup sequence
 
+# 2.3.3
+
+* Capture ActiveRecord calls that generate more complex queries
+
 # 2.3.2
 
 * More robust startup sequence when using `rails server` vs. directly launching an app server

data/lib/scout_apm/instruments/active_record.rb

@@ -1,6 +1,38 @@
 require 'scout_apm/utils/sql_sanitizer'
 
 module ScoutApm
+  class SqlList
+    attr_reader :sqls
+
+    def initialize(sql=nil)
+      @sqls = []
+
+      if !sql.nil?
+        push(sql)
+      end
+    end
+
+    def <<(sql)
+      push(sql)
+    end
+
+    def push(sql)
+      if !(Utils::SqlSanitizer === sql)
+        sql = Utils::SqlSanitizer.new(sql)
+      end
+      @sqls << sql
+    end
+
+    # All of this one, then all of the other.
+    def merge(other)
+      @sqls += other.sqls
+    end
+
+    def to_s
+      @sqls.map{|s| s.to_s }.join(";\n")
+    end
+  end
+
   module Instruments
     class ActiveRecord
       attr_reader :context
@@ -129,13 +161,12 @@ module ScoutApm
         # Extract data from the arguments
         sql, name = args
         metric_name = Utils::ActiveRecordMetricName.new(sql, name)
-        desc = Utils::SqlSanitizer.new(sql)
+        desc = SqlList.new(sql)
 
         # Get current ScoutApm context
         req = ScoutApm::RequestManager.lookup
         current_layer = req.current_layer
 
-
         # If we call #log, we have a real query to run, and we've already
         # gotten through the cache gatekeeper. Since we want to only trace real
         # queries, and not repeated identical queries that just hit cache, we
@@ -150,9 +181,13 @@ module ScoutApm
           # TODO: Get rid of call .to_s, need to find this without forcing a previous run of the name logic
           if current_layer.name.to_s == Utils::ActiveRecordMetricName::DEFAULT_METRIC
             current_layer.name = metric_name
-            current_layer.desc = desc
           end
 
+          if current_layer.desc.nil?
+            current_layer.desc = SqlList.new
+          end
+          current_layer.desc.merge(desc)
+
           log_without_scout_instruments(*args, &block)
 
         # OR: Start a new layer, we didn't pick up instrumentation earlier in the stack.
@@ -229,6 +264,7 @@ module ScoutApm
         req = ScoutApm::RequestManager.lookup
         layer = ScoutApm::Layer.new("ActiveRecord", Utils::ActiveRecordMetricName::DEFAULT_METRIC)
         layer.annotate_layer(:ignorable => true)
+        layer.desc = SqlList.new
         req.start_layer(layer)
         req.ignore_children!
         begin
@@ -247,6 +283,7 @@ module ScoutApm
 
         req = ScoutApm::RequestManager.lookup
         layer = ScoutApm::Layer.new("ActiveRecord", Utils::ActiveRecordMetricName.new("", "#{model} #{operation}"))
+        layer.desc = SqlList.new
         req.start_layer(layer)
         req.ignore_children!
         begin

data/lib/scout_apm/layer_converters/converter_base.rb

@@ -145,7 +145,7 @@ module ScoutApm
         end
       end
 
-      def make_meta_options_desc_hash(layer, max_desc_length=1000)
+      def make_meta_options_desc_hash(layer, max_desc_length=32768)
         if layer.desc
           desc_s = layer.desc.to_s
           trimmed_desc = desc_s[0 .. max_desc_length]

data/lib/scout_apm/utils/sql_sanitizer.rb

@@ -74,8 +74,10 @@ module ScoutApm
         encodings.all?{|enc| Encoding.find(enc) rescue false}
       end
 
+      MAX_SQL_LENGTH = 16384
+
       def scrubbed(str)
-        return '' if !str.is_a?(String) || str.length > 4000 # safeguard - don't sanitize or scrub large SQL statements
+        return '' if !str.is_a?(String) || str.length > MAX_SQL_LENGTH # safeguard - don't sanitize or scrub large SQL statements
         return str if !str.respond_to?(:encode) # Ruby <= 1.8 doesn't have string encoding
         return str if str.valid_encoding? # Whatever encoding it is, it is valid and we can operate on it
         ScoutApm::Agent.instance.context.logger.debug "Scrubbing invalid sql encoding."

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "2.4.0.pre2"
+  VERSION = "2.4.0.pre3"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 2.4.0.pre2
+  version: 2.4.0.pre3
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-13 00:00:00.000000000 Z
+date: 2017-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest