skylight 0.1.8 → 0.2.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdeb1ad6b563b4b7a487b38421575943337819a9
-  data.tar.gz: 593f06bddf3ffa1ac6dca9544ce84bcecf7680fa
+  metadata.gz: b64f9d0eb45e48301e2b937366229e63bc339af3
+  data.tar.gz: 39656e4d86ac0d4f3496101643105fba58fdf4a6
 SHA512:
-  metadata.gz: 220a2e262e02e983112cc177c2cae80b11fd8a7d1c0f0235656fc250ff361db4017b3053be6d6d1ffe6c6c2e5316c1f88566764c6a2a2edb171368f095c6f734
-  data.tar.gz: 3f5fd68ec9ec55c2e2703aa399b4e376b6b75bf70b66fdd058add5c9d5db1ce00428c4df3e721306bd6499e39d487e1363ddf397a7e4ef88ccc0e0621393065f
+  metadata.gz: 3fe73155548f5bca71d6fab4049809fe354c8c6b205f9e26001595dd6454920a3c3fdbcab7b224a6069336ab25c3d38090f19133ba4665b523d63ca120ca0b6f
+  data.tar.gz: f6f4ab23ae9c2771d2eb702725e54dce515885319e13b442e02db549af99a349014cb45b17e370125e79b2f412005cd239e919c4ab266839cba9ab8aca49e1ce

data/lib/skylight.rb

@@ -49,6 +49,7 @@ module Skylight
   class WorkerStateError < RuntimeError; end
   class ConfigError      < RuntimeError; end
   class TraceError       < RuntimeError; end
+  class SerializeError   < RuntimeError; end
 
   TIERS = %w(
     api

data/lib/skylight/config.rb

@@ -14,7 +14,7 @@ module Skylight
         hostname = nil if hostname == ''
       end
 
-      hostname || SecureRandom.uuid
+      hostname || "gen-#{SecureRandom.uuid}"
     end
 
     # Map environment variable keys with Skylight configuration keys

data/lib/skylight/instrumenter.rb

@@ -1,18 +1,24 @@
 require 'thread'
+require 'set'
 
 module Skylight
   class Instrumenter
     KEY  = :__skylight_current_trace
     LOCK = Mutex.new
+    DESC_LOCK = Mutex.new
+
+    TOO_MANY_UNIQUES = "<too many unique descriptions>"
 
     include Util::Logging
 
-    def self.current_trace
-      Thread.current[KEY]
-    end
+    class TraceInfo
+      def current
+        Thread.current[KEY]
+      end
 
-    def self.current_trace=(trace)
-      Thread.current[KEY] = trace
+      def current=(trace)
+        Thread.current[KEY] = trace
+      end
     end
 
     def self.instance
@@ -36,7 +42,7 @@ module Skylight
       end
     end
 
-    attr_reader :config, :gc
+    attr_reader :config, :gc, :trace_info
 
     def initialize(config)
       if Hash === config
@@ -46,7 +52,18 @@ module Skylight
       @gc = config.gc
       @config = config
       @worker = config.worker.build
-      @subscriber = Subscriber.new(config)
+      @subscriber = Subscriber.new(config, self)
+
+      @trace_info = @config[:trace_info] || TraceInfo.new
+      @descriptions = Hash.new { |h,k| h[k] = Set.new }
+    end
+
+    def current_trace
+      @trace_info.current
+    end
+
+    def current_trace=(trace)
+      @trace_info.current = trace
     end
 
     def start!
@@ -72,7 +89,7 @@ module Skylight
 
     def trace(endpoint, cat, *args)
       # If a trace is already in progress, continue with that one
-      if trace = Instrumenter.current_trace
+      if trace = @trace_info.current
         t { "already tracing" }
         return yield(trace) if block_given?
         return trace
@@ -86,20 +103,20 @@ module Skylight
         return
       end
 
-      Instrumenter.current_trace = trace
+      @trace_info.current = trace
       return trace unless block_given?
 
       begin
         yield trace
 
       ensure
-        Instrumenter.current_trace = nil
+        @trace_info.current = nil
         trace.submit
       end
     end
 
     def instrument(cat, *args)
-      unless trace = Instrumenter.current_trace
+      unless trace = @trace_info.current
         return yield if block_given?
         return
       end
@@ -128,6 +145,31 @@ module Skylight
       end
     end
 
+    def limited_description(description)
+      endpoint = @trace_info.current.endpoint
+
+      DESC_LOCK.synchronize do
+        set = @descriptions[endpoint]
+
+        if set.size >= 100
+          return TOO_MANY_UNIQUES if set.size >= 100
+        end
+
+        set << description
+        description
+      end
+    end
+
+    def error(reason, body)
+      t { fmt "processing error; reason=%s; body=%s", reason, body }
+
+      message = Skylight::Messages::Error.new(reason: reason, body: body)
+
+      unless @worker.submit(message)
+        warn "failed to submit error to worker"
+      end
+    end
+
     def process(trace)
       t { fmt "processing trace; spans=%d; duration=%d",
             trace.spans.length, trace.spans[-1].duration }

data/lib/skylight/messages.rb

@@ -15,5 +15,6 @@ module Skylight
     require 'skylight/messages/endpoint'
     require 'skylight/messages/batch'
     require 'skylight/messages/hello'
+    require 'skylight/messages/error'
   end
 end

data/lib/skylight/messages/error.rb

@@ -0,0 +1,10 @@
+require 'skylight/messages/base'
+
+module Skylight
+  module Messages
+    class Error < Base
+      required :reason, :string, 1
+      required :body,   :string, 2
+    end
+  end
+end

data/lib/skylight/messages/span.rb

@@ -1,5 +1,71 @@
 module Skylight
   module Messages
+    class AnnotationBuilder
+      def self.build(object)
+        new(object).build
+      end
+
+      def initialize(object)
+        @object = object
+      end
+
+      def build
+        build_nested(@object)
+      end
+
+    private
+      def build_nested(object)
+        case object
+        when Hash
+          build_hash(object)
+        when Array
+          build_array(object)
+        end
+      end
+
+      def build_hash(object)
+        object.map do |key, value|
+          build_annotation(value, key)
+        end
+      end
+
+      def build_array(array)
+        array.map do |value|
+          build_annotation(value)
+        end
+      end
+
+      def build_annotation(value, key=nil)
+        Annotation.new.tap do |annotation|
+          annotation.key = key.to_s if key
+          annotation[classify(value)] = build_value(value)
+        end
+      end
+
+      def build_value(value)
+        nested?(value) ? build_nested(value) : value
+      end
+
+      def nested?(value)
+        value.is_a?(Array) || value.is_a?(Hash)
+      end
+
+      def classify(value)
+        case value
+        when String
+          :string
+        when Integer
+          :int
+        when Numeric
+          :double
+        when Hash, Array
+          :nested
+        else
+          raise Skylight::SerializeError.new("Annotation values must be Strings or Numeric. You passed #{value.inspect} in #{@object.inspect}")
+        end
+      end
+    end
+
     class Span
       include Beefcake::Message
 
@@ -32,13 +98,15 @@ module Skylight
         attr_accessor :children
 
         def initialize(trace, time, started_at, cat, title, desc, annot)
-          @trace      = trace
-          @built      = false
-          @time       = time
-          @started_at = started_at
-          @category   = cat.to_s
-          @children   = 0
-          self.title  = title
+          @trace       = trace
+          @built       = false
+          @time        = time
+          @started_at  = started_at
+          @category    = cat.to_s
+          @children    = 0
+          @annotations = annot
+
+          self.title   = title
           self.description = desc
         end
 
@@ -87,7 +155,9 @@ module Skylight
       private
 
         def to_annotations(val)
-          [] # TODO: Implement
+          return nil if !val || val.empty?
+
+          AnnotationBuilder.build(val)
         end
 
       end

data/lib/skylight/messages/trace.rb

@@ -51,6 +51,8 @@ module Skylight
           desc  = args.shift
           now   = adjust_for_skew(Util::Clock.micros)
 
+          desc = @instrumenter.limited_description(desc)
+
           sp = span(now - gc_time, cat, title, desc, annot)
           inc_children
           @spans << sp.build(0)
@@ -59,11 +61,13 @@ module Skylight
         end
 
         def instrument(cat, *args)
-          annot = args.pop if Hash === args
+          annot = args.pop if Hash === args.last
           title = args.shift
           desc  = args.shift
           now   = adjust_for_skew(Util::Clock.micros)
 
+          desc = @instrumenter.limited_description(desc)
+
           start(now - gc_time, cat, title, desc, annot)
         end
 
@@ -73,8 +77,8 @@ module Skylight
         end
 
         def release
-          return unless Instrumenter.current_trace == self
-          Instrumenter.current_trace = nil
+          return unless @instrumenter.current_trace == self
+          @instrumenter.current_trace = nil
         end
 
         def submit

data/lib/skylight/normalizers/process_action.rb

@@ -5,7 +5,7 @@ module Skylight
 
       def normalize(trace, name, payload)
         trace.endpoint = controller_action(payload)
-        [ "app.controller.request", trace.endpoint, nil, payload ]
+        [ "app.controller.request", trace.endpoint, nil, normalize_payload(payload) ]
       end
 
     private
@@ -13,6 +13,17 @@ module Skylight
       def controller_action(payload)
         "#{payload[:controller]}##{payload[:action]}"
       end
+
+      def normalize_payload(payload)
+        normalized = {}
+
+        payload.each do |key, value|
+          value = value.inspect unless value.is_a?(String) || value.is_a?(Numeric)
+          normalized[key] = value
+        end
+
+        normalized
+      end
     end
   end
 end

data/lib/skylight/normalizers/render_partial.rb

@@ -7,7 +7,7 @@ module Skylight
         normalize_render(
           "view.render.template",
           payload,
-          partial: true)
+          partial: 1)
       end
     end
   end

data/lib/skylight/normalizers/render_template.rb

@@ -7,7 +7,7 @@ module Skylight
         normalize_render(
           "view.render.template",
           payload,
-          partial: false)
+          partial: 0)
       end
     end
   end

data/lib/skylight/normalizers/sql.rb

@@ -1,3 +1,6 @@
+require "sql_lexer"
+require "json"
+
 module Skylight
   module Normalizers
     class SQL < Normalizer
@@ -9,16 +12,39 @@ module Skylight
           return :skip
         else
           name  = "db.sql.query"
-          title = payload[:name]
+          title = payload[:name] || "SQL"
         end
 
-        binds = payload[:binds]
+        if payload[:binds].empty?
+          extracted_title, payload[:sql], binds, error = extract_binds(payload)
+        else
+          extracted_title, _, _, error = extract_binds(payload)
+          binds = payload[:binds].map { |col, val| val.inspect }
+        end
+
+        title = extracted_title if extracted_title
+
 
-        annotations = {
-          sql:   payload[:sql],
-          binds: binds ? binds.map(&:last) : [] }
+        if payload[:sql]
+          annotations = {
+            sql:   payload[:sql],
+            binds: binds,
+          }
+        else
+          annotations = {
+            skylight_error: error
+          }
+        end
+
+        [ name, title, payload[:sql], annotations ]
+      end
 
-        [ name, title, nil, annotations ]
+    private
+      def extract_binds(payload)
+        title, sql, binds = SqlLexer::Lexer.bindify(payload[:sql])
+        [ title, sql, binds, nil ]
+      rescue
+        [ nil, nil, nil, ["sql_parse", payload[:sql]] ]
       end
     end
   end

data/lib/skylight/railtie.rb

@@ -24,6 +24,10 @@ module Skylight
 
   private
 
+    def existent_paths(paths)
+      paths.respond_to?(:existent) ? paths.existent : paths.select { |f| File.exists?(f) }
+    end
+
     def load_skylight_config(app)
       path = config_path(app)
       path = nil unless File.exist?(path)
@@ -39,7 +43,7 @@ module Skylight
       configure_logging(config, app)
 
       config['agent.sockfile_path'] = tmp
-      config['normalizers.render.view_paths'] = app.config.paths["app/views"].existent
+      config['normalizers.render.view_paths'] = existent_paths(app.config.paths["app/views"])
       config.validate!
       config
 

data/lib/skylight/subscriber.rb

@@ -4,10 +4,11 @@ module Skylight
 
     attr_reader :config
 
-    def initialize(config)
-      @config      = config
-      @subscriber  = nil
-      @normalizers = Normalizers.build(config)
+    def initialize(config, instrumenter)
+      @config       = config
+      @subscriber   = nil
+      @normalizers  = Normalizers.build(config)
+      @instrumenter = instrumenter
     end
 
     def register!
@@ -35,23 +36,32 @@ module Skylight
     end
 
     def start(name, id, payload)
-      return unless trace = Instrumenter.current_trace
+      return unless trace = @instrumenter.current_trace
 
       cat, title, desc, annot = normalize(trace, name, payload)
 
+      if cat != :skip && error = annot[:skylight_error]
+        @instrumenter.error(*error)
+      end
+
       unless cat == :skip
         span = trace.instrument(cat, title, desc, annot)
       end
 
       trace.notifications << Notification.new(name, span)
-
     rescue Exception => e
       error "Subscriber#start error; msg=%s", e.message
+      debug "trace=%s", trace.inspect
+      debug "in:  name=%s", name.inspect
+      debug "in:  payload=%s", payload.inspect
+      debug "out: cat=%s, title=%s, desc=%s", cat.inspect, name.inspect, desc.inspect
+      debug "out: annot=%s", annot.inspect
+      t { e.backtrace.join("\n") }
       nil
     end
 
     def finish(name, id, payload)
-      return unless trace = Instrumenter.current_trace
+      return unless trace = @instrumenter.current_trace
 
       while curr = trace.notifications.pop
         if curr.name == name
@@ -62,6 +72,10 @@ module Skylight
 
     rescue Exception => e
       error "Subscriber#finish error; msg=%s", e.message
+      debug "trace=%s", trace.inspect
+      debug "in:  name=%s", name.inspect
+      debug "in:  payload=%s", payload.inspect
+      t { e.backtrace.join("\n") }
       nil
     end
 

data/lib/skylight/version.rb

@@ -1,4 +1,4 @@
 module Skylight
-  VERSION = '0.1.8'
+  VERSION = '0.2.0.beta.1'
 end
 

data/lib/skylight/worker/collector.rb

@@ -49,9 +49,12 @@ module Skylight
 
         return true unless msg
 
-        if Messages::Trace === msg
+        case msg
+        when Messages::Trace
           t { fmt "collector received trace" }
           @batch.push(msg)
+        when Messages::Error
+          send_error(msg)
         else
           debug "Received unknown message; class=%s", msg.class.to_s
         end
@@ -61,6 +64,22 @@ module Skylight
 
     private
 
+      def send_error(msg)
+        res = @http_auth.post("/agent/error?hostname=#{escape(config[:'hostname'])}", reason: msg.reason, body: msg.body)
+
+        unless res.success?
+          if (400..499).include? @res.status
+            warn "error wasn't sent successfully; status=%s", res.status
+          end
+
+          warn "could not fetch report session token; status=%s", res.status
+          return
+        end
+      rescue Exception => e
+        error "exception; msg=%s; class=%s", e.message, e.class
+        t { e.backtrace.join("\n") }
+      end
+
       def finish
         t { fmt "collector finishing up" }
 
@@ -90,6 +109,11 @@ module Skylight
         res = @http_auth.get("/agent/authenticate?hostname=#{escape(config[:'hostname'])}")
 
         unless res.success?
+          if (400..499).include? @res.status
+            warn "token request rejected; status=%s", res.status
+            @http_report = nil
+          end
+
           warn "could not fetch report session token; status=%s", res.status
           return
         end
@@ -98,12 +122,12 @@ module Skylight
         tok = tok['token'] if tok
 
         if tok
-          @refresh_at  = now + 600
+          @refresh_at  = now + 30
           @http_report = Util::HTTP.new(config, :report)
           @http_report.authentication = tok
         else
           if @http_report
-            @refresh_at = now + 60
+            @refresh_at = now + 30
           end
           warn "server did not return a session token"
         end

data/lib/skylight/worker/server.rb

@@ -21,7 +21,6 @@ module Skylight
         :sockfile_path
 
       def initialize(config, lockfile, srv, lockfile_path)
-
         unless lockfile && srv
           raise ArgumentError, "lockfile and unix domain server socket are required"
         end
@@ -214,8 +213,8 @@ module Skylight
             info "newer version of agent deployed - restarting; curr=%s; new=%s", VERSION, msg.version
             reload(msg)
           end
-        when Messages::Trace
-          t { "received trace" }
+        when Messages::Base
+          t { "received message" }
           @collector.submit(msg)
         when :unknown
           debug "received unknown message"

data/lib/sql_lexer.rb

@@ -0,0 +1,6 @@
+require "sql_lexer/version"
+require "sql_lexer/lexer"
+
+module SqlLexer
+  # Your code goes here...
+end

data/lib/sql_lexer/lexer.rb

@@ -0,0 +1,259 @@
+require "strscan"
+
+module SqlLexer
+  class Lexer
+    # SQL identifiers and key words must begin with a letter (a-z, but also
+    # letters with diacritical marks and non-Latin letters) or an underscore
+    # (_). Subsequent characters in an identifier or key word can be letters,
+    # underscores, digits (0-9), or dollar signs ($). Note that dollar signs
+    # are not allowed in identifiers according to the letter of the SQL
+    # standard, so their use might render applications less portable. The SQL
+    # standard will not define a key word that contains digits or starts or
+    # ends with an underscore, so identifiers of this form are safe against
+    # possible conflict with future extensions of the standard.
+    StartID       = %q<\p{Alpha}_>
+    PartID        = %q<\p{Alnum}_$>
+    OpPart        = %q<\+|\-(?!-)|\*|/(?!\*)|\<|\>|=|~|!|@|#|%|\^|&|\||\?|\.|,|\(|\)>
+    WS            = %q< \t\r\n>
+    OptWS         = %Q<[#{WS}]*>
+
+    InOp          = %q<IN>
+    SpecialOps    = %Q<#{InOp}>
+
+    StartQuotedID = %Q<">
+    StartTickedID = %Q<`>
+    StartString   = %Q<'>
+    StartDigit    = %q<[\p{Digit}\.]>
+    StartBind     = %Q<#{StartString}|#{StartDigit}|#{SpecialOps}>
+    StartNonBind  = %Q<#{StartQuotedID}|#{StartTickedID}|\\$(?=\\p{Digit})>
+    TableNext     = %Q<(#{OptWS}((?=#{StartQuotedID})|(?=#{StartTickedID}))|[#{WS}]+(?=[#{StartID}]))>
+    StartAnyId    = %Q<"#{StartID}>
+    Placeholder   = %q<\$\p{Digit}+>
+
+    AfterID       = %Q<[#{WS};#{StartNonBind}]|(?:#{OpPart})|$>
+    ID            = %Q<[#{StartID}][#{PartID}]*(?=#{AfterID})>
+    AfterOp       = %Q<[#{WS}]|[#{StartAnyId}]|[#{StartBind}]|(#{StartNonBind})|$>
+    Op            = %Q<(?:#{OpPart})+(?=#{AfterOp})>
+    QuotedID      = %Q<#{StartQuotedID}(?:[^"]|"")*">
+    TickedID      = %Q<#{StartTickedID}(?:[^`]|``)*`>
+    NonBind       = %Q<#{ID}|#{Op}|#{QuotedID}|#{TickedID}|#{Placeholder}>
+    QuotedTable   = %Q<#{TickedID}|#{QuotedID}>
+
+    String        = %Q<#{StartString}(?:[^']|'')*'>
+
+    Digits        = %q<\p{Digit}+>
+    OptDigits     = %q<\p{Digit}*>
+    Exponent      = %Q<e[+\-]?#{Digits}>
+    OptExponent   = %Q<(?:#{Exponent})?>
+    HeadDecimal   = %Q<#{Digits}\\.#{OptDigits}#{OptExponent}>
+    TailDecimal   = %Q<#{OptDigits}\\.#{Digits}#{OptExponent}>
+    ExpDecimal    = %Q<#{Digits}#{Exponent}>
+
+    Number        = %Q<#{HeadDecimal}|#{TailDecimal}|#{ExpDecimal}|#{Digits}>
+
+    TkWS          = %r<[#{WS}]+>
+    TkOptWS       = %r<[#{WS}]*>
+    TkOp          = %r<[#{OpPart}]>
+    TkPlaceholder = %r<#{Placeholder}>
+    TkNonBind     = %r<#{NonBind}>
+    TkQuotedTable = %r<#{QuotedTable}>i
+    TkUpdateTable = %r<UPDATE#{TableNext}>i
+    TkInsertTable = %r<INSERT[#{WS}]+INTO#{TableNext}>i
+    TkDeleteTable = %r<DELETE[#{WS}]+FROM#{TableNext}>i
+    TkFromTable   = %r<FROM#{TableNext}>i
+    TkID          = %r<#{ID}>
+    TkEnd         = %r<;?[#{WS}]*>
+    TkBind        = %r<#{String}|#{Number}>
+    TkIn          = %r<#{InOp}>i
+    TkSpecialOp   = %r<#{SpecialOps}>i
+
+    STATE_HANDLERS = {
+      begin:       :process_begin,
+      first_token: :process_first_token,
+      tokens:      :process_tokens,
+      bind:        :process_bind,
+      non_bind:    :process_non_bind,
+      table_name:  :process_table_name,
+      end:         :process_end,
+      special:     :process_special,
+      in:          :process_in
+    }
+
+    def self.bindify(string)
+      new(string).tap do |scanner|
+        scanner.process
+        return scanner.title, scanner.output, scanner.binds
+      end
+    end
+
+    attr_reader :output, :binds, :title
+
+    def initialize(string)
+      @scanner = StringScanner.new(string)
+      @state   = :begin
+      @input   = string
+      @output  = string.dup
+      @binds   = []
+    end
+
+    def process
+      @operation = @table = @title = nil
+
+      while @state
+        if ENV["DEBUG"]
+          p @state
+          p @scanner
+        end
+
+        send STATE_HANDLERS[@state]
+      end
+
+      pos = 0
+      removed = 0
+      extracted_binds = Array.new(@binds.size / 2)
+
+      if @operation && @table
+        table = @input[@table[0], @table[1] - @table[0]]
+        @title = "#{@operation} #{table}"
+      end
+
+      while pos < @binds.size
+        slice = @output.slice!(@binds[pos] - removed, @binds[pos+1])
+        @output.insert(@binds[pos] - removed, '?')
+        extracted_binds[pos/2] = slice
+        removed += slice.size - 1
+        pos += 2
+      end
+
+      @binds = extracted_binds
+    end
+
+    def process_begin
+      @scanner.scan(TkOptWS)
+      @state = :first_token
+    end
+
+    def process_first_token
+      if @scanner.skip(/SELECT\s+/i)
+        @operation = :"SELECT FROM"
+        @state = :tokens
+        return
+      end
+
+      if @scanner.skip(TkUpdateTable)
+        @operation = :UPDATE
+      elsif @scanner.skip(TkInsertTable)
+        @operation = :"INSERT INTO"
+      elsif @scanner.skip(TkDeleteTable)
+        @operation = :"DELETE FROM"
+      end
+
+      @state = :table_name
+    end
+
+    def process_table_name
+      pos = @scanner.pos
+
+      if @scanner.skip(TkQuotedTable)
+        @table = [pos + 1, @scanner.pos - 1]
+      elsif @scanner.skip(TkID)
+        @table = [pos, @scanner.pos]
+      end
+
+      @state = :tokens
+    end
+
+    def process_tokens
+      @scanner.skip(TkOptWS)
+
+      if @operation == :"SELECT FROM" && !@table && @scanner.skip(TkFromTable)
+        @state = :table_name
+      elsif @scanner.match?(TkSpecialOp)
+        @state = :special
+      elsif @scanner.match?(TkBind)
+        @state = :bind
+      elsif @scanner.match?(TkNonBind)
+        @state = :non_bind
+      else
+        @state = :end
+      end
+    end
+
+    def process_special
+      if @scanner.skip(TkIn)
+        @scanner.skip(TkOptWS)
+        @scanner.skip(/\(/)
+        @state = :in
+      end
+    end
+
+    def process_in
+      nest = 1
+      iterations = 0
+
+      @skip_binds = true
+      pos = @scanner.pos - 1
+
+      while nest > 0
+        iterations += 1
+
+        if iterations > 10_000
+          raise "The SQL '#{@scanner.string}' could not be parsed because of too many iterations in IN"
+        end
+
+        if ENV["DEBUG"]
+          p @state
+          p @scanner
+          p nest
+        end
+
+        if @scanner.skip(/\(/)
+          nest += 1
+          process_tokens
+        elsif @scanner.skip(/\)/)
+          nest -= 1
+          break if nest.zero?
+          process_tokens
+        else
+          process_tokens
+        end
+
+        send STATE_HANDLERS[@state]
+      end
+
+      @binds << pos
+      @binds << @scanner.pos - pos
+
+      @skip_binds = false
+
+      @state = :tokens
+    end
+
+    def process_non_bind
+      @scanner.skip(TkNonBind)
+      @state = :tokens
+    end
+
+    def process_bind
+      pos = @scanner.pos
+      size = @scanner.skip(TkBind)
+
+      unless @skip_binds
+        @binds << pos
+        @binds << size
+      end
+
+      @state = :tokens
+    end
+
+    def process_end
+      @scanner.skip(TkEnd)
+
+      unless @scanner.eos?
+        raise "The SQL '#{@scanner.string}' could not be parsed"
+      end
+
+      @state = nil
+    end
+  end
+end

data/lib/sql_lexer/version.rb

@@ -0,0 +1,3 @@
+module SqlLexer
+  VERSION = "0.0.1"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0.beta.1
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-19 00:00:00.000000000 Z
+date: 2013-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -46,6 +46,7 @@ files:
 - lib/skylight/messages/base.rb
 - lib/skylight/messages/batch.rb
 - lib/skylight/messages/endpoint.rb
+- lib/skylight/messages/error.rb
 - lib/skylight/messages/event.rb
 - lib/skylight/messages/hello.rb
 - lib/skylight/messages/span.rb
@@ -127,6 +128,9 @@ files:
 - lib/skylight/worker/embedded.rb
 - lib/skylight/worker/server.rb
 - lib/skylight/worker/standalone.rb
+- lib/sql_lexer.rb
+- lib/sql_lexer/lexer.rb
+- lib/sql_lexer/version.rb
 - CHANGELOG.md
 - README.md
 - bin/skylight
@@ -144,9 +148,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3