nsa 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e00f8a3beffa73912bccaa929bbfd50fbfc89775
-  data.tar.gz: 6f3bc08197a8975d66bf970a74769d7ba74d2506
+  metadata.gz: 778f409d79d4181a1b2db1212d74eb0c1e99e6e8
+  data.tar.gz: 46d73670e6b9dfc1d21ade794382a86f0506adc6
 SHA512:
-  metadata.gz: d36ef682fb0278c9e8b1e54e051cf01df1f0c499a437889d204e339552aae977dd1398724f9dca174a98f830f0bc1ec3793f0be25d1f942e172fe7c3f090b7aa
-  data.tar.gz: db4e5a11691f10d8bb9e123d59502de8bf85280b61809d660e54f632325678e23c49897b3bdebfa7dd6862f42f4bc17a73a5145f98903830fb0bae22a96cbc31
+  metadata.gz: e6555f13345e3fa8e85fcb04173b628a2c784212ea684b00f4d0cb8e6598cda64eb5fbc74b38834e995312b4a3dda5cb82b03edd2276586726d5c61c3e5993be
+  data.tar.gz: 2d211ffbae3cb6ec597381b118b264fe7c4c04e23d2431fec1e76e9f06778fab61b4c33928c69841326d64ffb72c627e6cbe1be476ce4f9a0356093c04fbfff3

data/lib/nsa/collectors/active_record.rb

@@ -5,29 +5,37 @@ module NSA
     module ActiveRecord
       extend ::NSA::Statsd::Publisher
 
-      DELETE_SQL_REGEX = /^DELETE.+FROM\s+"([^"]+)"/
-      INSERT_SQL_REGEX = /^INSERT INTO\s+"([^"]+)"/
-      SELECT_SQL_REGEX = /^SELECT.+FROM\s+"([^"]+)"/
-      UPDATE_SQL_REGEX = /^UPDATE\s+"([^"]+)"/
+      # Ordered by most common query type
+      MATCHERS = [
+        [ :select, /^\s*SELECT.+?FROM\s+"?([^".\s),]+)"?/im ],
+        [ :insert, /^\s*INSERT INTO\s+"?([^".\s]+)"?/im ],
+        [ :update, /^\s*UPDATE\s+"?([^".\s]+)"?/im ],
+        [ :delete, /^\s*DELETE.+FROM\s+"?([^".\s]+)"?/im ]
+      ].freeze
+
+      EMPTY_MATCH_RESULT = []
 
       def self.collect(key_prefix)
         ::ActiveSupport::Notifications.subscribe("sql.active_record") do |_, start, finish, _id, payload|
-          query_type, table_name = case payload[:sql]
-                                   when DELETE_SQL_REGEX then [ :delete, $1 ]
-                                   when INSERT_SQL_REGEX then [ :insert, $1 ]
-                                   when SELECT_SQL_REGEX then [ :select, $1 ]
-                                   when UPDATE_SQL_REGEX then [ :update, $1 ]
-                                   else nil
-                                   end
-
+          query_type, table_name = match_query(payload[:sql])
           unless query_type.nil?
             stat_name = "#{key_prefix}.tables.#{table_name}.queries.#{query_type}.duration"
             duration_ms = (finish - start) * 1000
             statsd_timing(stat_name, duration_ms)
           end
         end
+      end
 
+      def self.match_query(sql)
+        MATCHERS
+          .lazy
+          .map { |(type, regex)|
+            match = (sql.match(regex) || EMPTY_MATCH_RESULT)
+            [ type, match[1] ]
+          }
+          .detect { |(_, table_name)| ! table_name.nil? }
       end
+
     end
   end
 end

data/lib/nsa/version.rb

@@ -1,3 +1,3 @@
 module NSA
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nsa
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - BJ Neilsen