scout_apm 1.2.12 → 1.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 238644dc9ea19370a84d3bb7c352faef442b555e
-  data.tar.gz: 7c43ada6596aed42f483084fab03c66a50f9732a
+  metadata.gz: 0f13ea6034c312de70bf591cd4098cd925439d0a
+  data.tar.gz: 46cfdd7065339dd4089eec27cdb9faa855e09224
 SHA512:
-  metadata.gz: e882ef1bbf5ac0b908dc249c4ffdde6e7db167a5d909d89c70ca974fdf9deb63ceadf987c33418de5a426782621c0b67d2589f97872642c52a45a185e15ac7cf
-  data.tar.gz: b40f7a9b49bc263d209d13e27fb6fe448861e166bf17e3bae8a95253ddd4acf07900f30af97171824218dc47b2941e87578bded7db69752aa878c90ad3347003
+  metadata.gz: 89411a5bd8b03ef4d7db33297827c03df6f9acc965dbd0b512993c7bf9b5d4eef9f4b2d0e51ca657ff2decfd2f2fd096a3b0dc412c98ce9cdefbe018381afbbc
+  data.tar.gz: c0d3c36fd63ca7332826a5ad69eabc2e803b7ebdfcf63bb879372213abb32f5d7c8c6aea75c5a0d48f895f8ba3c36d249bcbff504b5eef31f28336ebf693fe25

data/CHANGELOG.markdown

@@ -1,6 +1,13 @@
+# 1.2.13
+
+* SQL Sanitation-Related performance improvements:
+  * Lazy sanitation of SQL queries: only running when needed (a slow transaction is recorded)
+  * An SQL sanitation performance improvement (strip! vs. gsub!)
+  * Removing the TRAILING_SPACES regex - not used across all db engines and adds a bit more overhead
+
 # 1.2.12
 
-* add uri_reporting option to report bare path (as opposed to fullpath). Default is 'fullpath'; set to 'path' to avoid exposing URL parameters.  
+* Add uri_reporting option to report bare path (as opposed to fullpath). Default is 'fullpath'; set to 'path' to avoid exposing URL parameters.  
 
 # 1.2.11
 

data/lib/scout_apm/framework_integrations/rails_3_or_4.rb

@@ -33,9 +33,10 @@ module ScoutApm
       end
 
       def database_engine
+        return @database_engine if @database_engine
         default = :mysql
 
-        if defined?(ActiveRecord::Base)
+        @database_engine = if defined?(ActiveRecord::Base)
           adapter = get_database_adapter # can be nil
 
           case adapter.to_s
@@ -59,4 +60,4 @@ module ScoutApm
       end
     end
   end
-end
+end

data/lib/scout_apm/instruments/active_record.rb

@@ -60,7 +60,7 @@ module ScoutApm
         sql, name = args
         self.class.instrument("ActiveRecord",
                               Utils::ActiveRecordMetricName.new(sql, name).metric_name,
-                              :desc => Utils::SqlSanitizer.new(sql).to_s ) do
+                              :desc => Utils::SqlSanitizer.new(sql) ) do
           log_without_scout_instruments(sql, name, &block)
         end
       end

data/lib/scout_apm/layer_converter.rb

@@ -24,7 +24,6 @@ module ScoutApm
         end
       end
     end
-
   end
 
   # Take a TrackedRequest and turn it into a hash of:
@@ -55,8 +54,6 @@ module ScoutApm
                          {:scope => scope_layer.legacy_metric_name}
                        end
 
-        meta_options.merge!(:desc => layer.desc) if layer.desc
-
         meta = MetricMeta.new(layer.legacy_metric_name, meta_options)
         metric_hash[meta] ||= MetricStats.new( meta_options.has_key?(:scope) )
 
@@ -159,7 +156,7 @@ module ScoutApm
                        end
 
         # Specific Metric
-        meta_options.merge!(:desc => layer.desc) if layer.desc
+        meta_options.merge!(:desc => layer.desc.to_s) if layer.desc
         meta = MetricMeta.new(layer.legacy_metric_name, meta_options)
         meta.extra.merge!(:backtrace => ScoutApm::SlowTransaction.backtrace_parser(layer.backtrace)) if layer.backtrace
         metric_hash[meta] ||= MetricStats.new( meta_options.has_key?(:scope) )

data/lib/scout_apm/utils/sql_sanitizer.rb

@@ -12,14 +12,17 @@ module ScoutApm
       end
       include ScoutApm::Utils::SqlRegex
 
-      attr_reader :sql
       attr_accessor :database_engine
 
       def initialize(sql)
-        @sql = scrubbed(sql.dup)
+        @raw_sql = sql
         @database_engine = ScoutApm::Environment.instance.database_engine
       end
 
+      def sql
+        @sql ||= scrubbed(@raw_sql.dup) # don't do this in initialize as it is extra work that isn't needed unless we have a slow transaction.
+      end
+
       def to_s
         case database_engine
         when :postgres then to_s_postgres
@@ -37,7 +40,7 @@ module ScoutApm
         sql.gsub!(PSQL_REMOVE_INTEGERS, '?')
         sql.gsub!(PSQL_IN_CLAUSE, 'IN (?)')
         sql.gsub!(MULTIPLE_SPACES, ' ')
-        sql.gsub!(TRAILING_SPACES, '')
+        sql.strip!
         sql
       end
 
@@ -48,7 +51,7 @@ module ScoutApm
         sql.gsub!(MYSQL_REMOVE_INTEGERS, '?')
         sql.gsub!(MYSQL_IN_CLAUSE, '?')
         sql.gsub!(MULTIPLE_QUESTIONS, '?')
-        sql.gsub!(TRAILING_SPACES, '')
+        sql.strip!
         sql
       end
 
@@ -57,7 +60,8 @@ module ScoutApm
         sql.gsub!(SQLITE_REMOVE_STRINGS, '?')
         sql.gsub!(SQLITE_REMOVE_INTEGERS, '?')
         sql.gsub!(MULTIPLE_SPACES, ' ')
-        sql.gsub!(TRAILING_SPACES, '')
+        sql.strip!
+        sql
       end
 
       def has_encodings?(encodings=['UTF-8', 'binary'])

data/lib/scout_apm/utils/sql_sanitizer_regex.rb

@@ -4,7 +4,6 @@ module ScoutApm
     module SqlRegex
       MULTIPLE_SPACES    = %r|\s+|.freeze
       MULTIPLE_QUESTIONS = /\?(,\?)+/.freeze
-      TRAILING_SPACES    = /\s+$/.freeze
 
       PSQL_VAR_INTERPOLATION = %r|\[\[.*\]\]\s*$|.freeze
       PSQL_REMOVE_STRINGS = /'(?:[^']|'')*'/.freeze

data/lib/scout_apm/utils/sql_sanitizer_regex_1_8_7.rb

@@ -4,7 +4,6 @@ module ScoutApm
     module SqlRegex
       MULTIPLE_SPACES    = %r|\s+|.freeze
       MULTIPLE_QUESTIONS = /\?(,\?)+/.freeze
-      TRAILING_SPACES    = /\s+$/.freeze
 
       PSQL_VAR_INTERPOLATION = %r|\[\[.*\]\]\s*$|.freeze
       PSQL_REMOVE_STRINGS = /'(?:[^']|'')*'/.freeze

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "1.2.12"
+  VERSION = "1.2.13"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 1.2.12
+  version: 1.2.13
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -176,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: scout_apm
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Ruby application performance monitoring