scout_apm 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab8171fe01697f83d482fe4de6f9adf5362bd7e0
-  data.tar.gz: 1769b4fb75335f58c6c23e72b53f34b1748c584e
+  metadata.gz: b6fbe68e8addf7bfe056ee52866c15e10af61a1d
+  data.tar.gz: d3dbd902ea249c19be319e72bd9bb4147e8c5612
 SHA512:
-  metadata.gz: 874b8ecc93712deb4067b4c1b3c14c2a5449d9f2374dc18b881ca8e278681803c88d7f96eabb95b04a670ab57c036459044487058974eaddd66897ea83e0dd16
-  data.tar.gz: 5fb6e5098f9db249fb57b549525d4e25b8d590837f052eb4dc43ebdb6b9205d142806be17204fa325ffe78affdcc6e1829913d049ab3b82245e1af171897ddd7
+  metadata.gz: 3702bf98e121cb3701d7e350f6d73aaf961b976cdf627a809848bf06c5185e7ad2837d0a33f40f2540732e89f6f5feb78309bedbb84bbf2bdb9cbcb10458fee9
+  data.tar.gz: 1811b990165b63124cc5dbc56f34416ed77b0c1008f556f96e29b8e4f9f9c9d8e9be2cad352b632dc5ec732cf39dd4bdb1b9b36866fb34fc91b115a78475766c

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# 1.3.4
+
+* Fix backtracking issue with on of the SQL sanitization regexes
+
 # 1.3.3
 
 * Handling nil scope in LayerSlowTransactionConverter

data/lib/scout_apm/utils/sql_sanitizer.rb

@@ -49,7 +49,7 @@ module ScoutApm
         sql.gsub!(MYSQL_REMOVE_SINGLE_QUOTE_STRINGS, '?')
         sql.gsub!(MYSQL_REMOVE_DOUBLE_QUOTE_STRINGS, '?')
         sql.gsub!(MYSQL_REMOVE_INTEGERS, '?')
-        sql.gsub!(MYSQL_IN_CLAUSE, '?')
+        sql.gsub!(MYSQL_IN_CLAUSE, 'IN (?)')
         sql.gsub!(MULTIPLE_QUESTIONS, '?')
         sql.strip!
         sql

data/lib/scout_apm/utils/sql_sanitizer_regex.rb

@@ -7,17 +7,15 @@ module ScoutApm
 
       PSQL_VAR_INTERPOLATION = %r|\[\[.*\]\]\s*$|.freeze
       PSQL_REMOVE_STRINGS = /'(?:[^']|'')*'/.freeze
-
       PSQL_REMOVE_INTEGERS = /(?<!LIMIT )\b\d+\b/.freeze
-
       PSQL_PLACEHOLDER = /\$\d+/.freeze
-      PSQL_IN_CLAUSE = /IN\s+\((\s*\?,?\s*)*\)/.freeze
+      PSQL_IN_CLAUSE = /IN\s+\(\?[^\)]*\)/.freeze
 
       MYSQL_VAR_INTERPOLATION = %r|\[\[.*\]\]\s*$|.freeze
       MYSQL_REMOVE_INTEGERS = /(?<!LIMIT )\b\d+\b/.freeze
       MYSQL_REMOVE_SINGLE_QUOTE_STRINGS = /'(?:[^']|'')*'/.freeze
       MYSQL_REMOVE_DOUBLE_QUOTE_STRINGS = /"(?:[^"]|"")*"/.freeze
-      MYSQL_IN_CLAUSE = /IN\s+\((\s*\?,?\s*)*\)/.freeze
+      MYSQL_IN_CLAUSE = /IN\s+\(\?[^\)]*\)/.freeze
 
       SQLITE_VAR_INTERPOLATION = %r|\[\[.*\]\]\s*$|.freeze
       SQLITE_REMOVE_STRINGS = /'(?:[^']|'')*'/.freeze

data/lib/scout_apm/utils/sql_sanitizer_regex_1_8_7.rb

@@ -9,13 +9,13 @@ module ScoutApm
       PSQL_REMOVE_STRINGS = /'(?:[^']|'')*'/.freeze
       PSQL_REMOVE_INTEGERS = /\b\d+\b/.freeze
       PSQL_PLACEHOLDER = /\$\d+/.freeze
-      PSQL_IN_CLAUSE = /IN\s+\((\s*\?,?\s*)*\)/.freeze
+      PSQL_IN_CLAUSE = /IN\s+\(\?[^\)]*\)/.freeze
 
       MYSQL_VAR_INTERPOLATION = %r|\[\[.*\]\]\s*$|.freeze
       MYSQL_REMOVE_INTEGERS = /\b\d+\b/.freeze
       MYSQL_REMOVE_SINGLE_QUOTE_STRINGS = /'(?:[^']|'')*'/.freeze
       MYSQL_REMOVE_DOUBLE_QUOTE_STRINGS = /"(?:[^"]|"")*"/.freeze
-      MYSQL_IN_CLAUSE = /IN\s+\((\s*\?,?\s*)*\)/.freeze
+      MYSQL_IN_CLAUSE = /IN\s+\(\?[^\)]*\)/.freeze
 
       SQLITE_VAR_INTERPOLATION = %r|\[\[.*\]\]\s*$|.freeze
       SQLITE_REMOVE_STRINGS = /'(?:[^']|'')*'/.freeze

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "1.3.3"
+  VERSION = "1.3.4"
 end
 

data/test/unit/sql_sanitizer_test.rb

@@ -45,6 +45,15 @@ module ScoutApm
         assert_equal %q|SELECT "blogs".* FROM "blogs" WHERE id IN (?)|, ss.to_s
       end
 
+      def test_postgres_collapse_in_clause_performacne
+        sql = 'SELECT "users".* FROM "users" WHERE "users"."id" IN (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NULL, ?, ?, ?)'
+        ss = SqlSanitizer.new(sql).tap{ |it| it.database_engine = :postgres }
+
+        assert_faster_than(0.01) do
+          assert_equal %q|SELECT "users".* FROM "users" WHERE "users"."id" IN (?)|, ss.to_s
+        end
+      end
+
       def test_mysql_where
         sql = %q|SELECT `users`.* FROM `users` WHERE `users`.`name` = ?  [["name", "chris"]]|
         ss = SqlSanitizer.new(sql).tap{ |it| it.database_engine = :mysql }
@@ -57,6 +66,15 @@ module ScoutApm
         assert_equal %q|SELECT  `blogs`.* FROM `blogs`  ORDER BY `blogs`.`id` ASC LIMIT 1|, ss.to_s
       end
 
+      def test_mysql_collpase_in_clause_performance
+        sql = 'SELECT `users`.* FROM `users` WHERE `users`.`id` IN (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NULL, ?, ?, ?)'
+        ss = SqlSanitizer.new(sql).tap{ |it| it.database_engine = :mysql }
+
+        assert_faster_than(0.01) do
+          assert_equal %q|SELECT `users`.* FROM `users` WHERE `users`.`id` IN (?)|, ss.to_s
+        end
+      end
+
       def test_mysql_literals
         sql = %q|SELECT `blogs`.* FROM `blogs` WHERE (title = 'abc')|
         ss = SqlSanitizer.new(sql).tap{ |it| it.database_engine = :mysql }
@@ -74,6 +92,15 @@ module ScoutApm
         assert_equal %q|SELECT `blogs`.* FROM `blogs` WHERE (title = 'a_c')|, ss.sql
         assert_equal %q|SELECT `blogs`.* FROM `blogs` WHERE (title = ?)|, ss.to_s
       end
+
+      def assert_faster_than(target_seconds)
+        t1 = ::Time.now
+        yield
+        t2 = ::Time.now
+
+        actual_time = t2.to_f - t1.to_f
+        assert (actual_time < target_seconds), "Code took too long to execute, expected time: #{target_seconds}, actual time: #{actual_time}}"
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-10 00:00:00.000000000 Z
+date: 2016-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest