skylight 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 766b35710e2c5cc91f17df574ceb6ae2d99c476a
-  data.tar.gz: 9145a148d2b08e8d4c74e283d57cb922664d72b2
+  metadata.gz: 01262f190b63ef103a1e1bc671f3a98ff12798f6
+  data.tar.gz: d0fcae9d16a2fcff34cad93d33f16a4fcb4b8113
 SHA512:
-  metadata.gz: 29c0ae3e1fea0b3e180fdbf6a1db5e9818783f4ea46241101afa0e8d601c9dee6100f7432e89b03f0c6318f981227f160da197f2a17108683919301f95a295c0
-  data.tar.gz: fb823dc8938a5db2292a9ab10aedb2269f00bb180605a55dee8844d12dfbda4f7b722e5b79f1e8d53e34eca641875433efd669f03eb5a6b4bf95749ccd6ac49d
+  metadata.gz: acbb99369ebb3807ac990756d6606d99d86a716cf81b6bf0f6a4cc83d0832916da010d374e926435c3012044c572b4222e480bfba8f3bfcabf9a740538edb1ee
+  data.tar.gz: 8ed42b17470c205f40ef6c37c45572b1d84449d914ac9047bff2c7707b47e23bd537bf158bcce6f6898340d5342776992686fde8109538b59f795ee3e273b314

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.4.2 (November 12, 2014)
+
+* [BUGFIX] Fix exit status on MRI 1.9.2
+* [BUGFIX] Strip SQL comments for better aggregation
+
 ## 0.4.1 (November 7, 2014)
 
 * [BUGFIX] Fix downloading native agent on 32bit systems

data/lib/skylight/instrumenter.rb

@@ -60,7 +60,18 @@ module Skylight
       end
     end
 
-    at_exit { stop! }
+    at_exit do
+      if RUBY_VERSION == '1.9.2'
+        # workaround for MRI bug losing exit status in at_exit block
+        # http://bugs.ruby-lang.org/issues/5218
+        exit_status = $!.status if $!.is_a?(SystemExit)
+        stop!
+        exit exit_status if exit_status
+      else
+        stop!
+      end
+    end
+
 
     attr_reader :config, :gc, :trace_info
 

data/lib/skylight/normalizers/active_record/sql.rb

@@ -39,7 +39,7 @@ module Skylight
 
       private
         def extract_binds(payload, precalculated)
-          title, sql, binds = SqlLexer::Lexer.bindify(payload[:sql], precalculated)
+          title, sql, binds = SqlLexer::Lexer.bindify(payload[:sql], precalculated, true)
           [ title, sql, binds, nil ]
         rescue => e
           group = "sql_parse"

data/lib/skylight/version.rb

@@ -1,4 +1,4 @@
 module Skylight
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end
 

data/lib/sql_lexer/lexer.rb

@@ -108,9 +108,9 @@ module SqlLexer
       array:       :process_array
     }
 
-    def self.bindify(string, binds=nil)
+    def self.bindify(string, binds=nil, strip_comments=false)
       scanner = instance(string)
-      scanner.process(binds)
+      scanner.process(binds, strip_comments)
       [scanner.title, scanner.output, scanner.binds]
     end
 
@@ -176,8 +176,8 @@ module SqlLexer
     PLACEHOLDER = "?".freeze
     UNKNOWN = "<unknown>".freeze
 
-    def process(binds)
-      process_comments
+    def process(binds, strip_comments)
+      process_comments(strip_comments)
 
       @operation = nil
       @provided_binds = binds
@@ -220,9 +220,33 @@ module SqlLexer
       nil
     end
 
-    EMPTY = "".freeze
+    def replace_comment(pos, length, strip)
+      if strip
+        # Dup the string if necessary so we aren't destructive to the original value
+        if @input == @original_input
+          @input = @input.dup
+          @scanner.string = @input
+        end
+
+        # Replace the comment with a space to ensure valid SQL
+        # Updating the input also updates the scanner
+        @input[pos, length] = SPACE
+        @output[pos, length] = SPACE
+
+        # Move back to start of removed string
+        @scanner.pos = pos
+      else
+        # Dup the string if necessary so we aren't destructive to the original value
+        @scanner.string = @input.dup if @scanner.string == @original_input
+
+        # Replace the comment with spaces
+        @scanner.string[pos, length] = SPACE*length
+      end
+    end
+
+    def process_comments(strip_comments)
+      @original_input = @input
 
-    def process_comments
       # SQL treats comments as similar to whitespace
       # Here we replace all comments with spaces of the same length so as to not affect binds
 
@@ -256,10 +280,7 @@ module SqlLexer
           if count == 0
             # We've closed all comments
             length = @scanner.charpos - pos
-            # Dup the string if necessary so we aren't destructive to the original value
-            @scanner.string = @input.dup if @scanner.string == @input
-            # Replace the comment with spaces
-            @scanner.string[pos, length] = SPACE*length
+            replace_comment(pos, length, strip_comments)
             break
           end
         end
@@ -271,10 +292,7 @@ module SqlLexer
       while @scanner.skip_until(TkComment)
         pos = @scanner.charpos
         len = @scanner.matched_size
-        # Dup the string if necessary so we aren't destructive to the original value
-        @scanner.string = @input.dup if @scanner.string == @input
-        # Replace the comment with spaces
-        @scanner.string[pos-len, len] = SPACE*len
+        replace_comment(pos-len, len, strip_comments)
       end
 
       @scanner.reset

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport