skylight 0.3.17 → 0.3.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fe30001ff54231d9fc09691d32cfbe734b6511e
-  data.tar.gz: ba257edb4e82c556e5b86a4e93023d19e9d1fa9f
+  metadata.gz: e3075ceb0a4b8ed3fe217362f3600422de59ab1f
+  data.tar.gz: 44909ca961dc7dad62831f66bc69a845a77bd7fb
 SHA512:
-  metadata.gz: 4862132100ec976e3c8a9a0ba48df3df9323f0b70c4bad5816fb89f6a955c831b2ba07db354437410f00091d53b90d1f1fd517ff5944a7c5b4e14f6a79c692f3
-  data.tar.gz: e4a853e6647f09e4f717909e747ccce70b609f08748c1ff268f87aa5eceea4ebc8cfb04cb39ede0d8000de07ca0792c81f37735973f2bf9cbb5ae4bb79db0a2b
+  metadata.gz: 0207565d0fbc49a04a4663b622efc9823883aa96315541cc5f365643a2ee588fe91db3af1b3427a1657b40a5fa6a82e48dd4bf9cb15dd0c09890b3c57141b0ab
+  data.tar.gz: 81b0262fcf344f564dec9ee76ae10a9086d1a330a6d77b959c58355c466e381ab9943339088c53eed2f9001cbdd52984ca14e5f25ab007a18475ecdb5ced8d8d

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.3.18 (July 17, 2014)
+
+* [FEATURE] Redis probe (Not enabled by default. See http://docs.skylight.io/agent/#railtie)
+* [FEATURE] Support app creation with token instead of email/password
+* [BUGFIX] App creation now works even when Webmock is enabled
+* [BUGFIX] Fix instrumentation for methods ending in special chars
+* [BUGFIX] Improved SQL parsing
+* [IMPROVEMENT] Respect collector token expiration to reduce token requests
+
 ## 0.3.17 (July 1, 2014)
 
 * Fix warning for Cache.instrument overwrite

data/lib/skylight/api.rb

@@ -3,6 +3,20 @@ module Skylight
   class Api
     attr_reader :config, :http
 
+    class CreateFailed < StandardError
+      attr_reader :res
+
+      def initialize(res)
+        @res = res
+        super "failed with status #{res.status}"
+      end
+
+      def errors
+        return unless res.body.is_a?(Hash)
+        res.body['errors']
+      end
+    end
+
     def initialize(config, service = :accounts)
       @config = config
       @http   = Util::HTTP.new(config, service)
@@ -24,10 +38,12 @@ module Skylight
       end
     end
 
-    def create_app(name)
-      res = @http.post('/apps', { app: { name: name }})
-      puts "POST /apps: #{res.inspect}" if ENV['DEBUG']
-      res if res.success?
+    def create_app(name, token=nil)
+      params = { app: { name: name } }
+      params[:token] = token if token
+      res = @http.post('/apps', params)
+      raise CreateFailed, res unless res.success?
+      res
     end
 
   end

data/lib/skylight/cli.rb

@@ -10,20 +10,19 @@ module Skylight
   # @api private
   class CLI < Thor
 
-    desc "setup", "Sets up a new app"
-    def setup
+    desc "setup TOKEN", "Sets up a new app using the provided token"
+    def setup(token=nil)
       if File.exist?(config_path)
         say "Your app is already on Skylight. http://www.skylight.io", :green
         return
       end
 
-      api.authentication = load_credentials
-
-      unless res = api.create_app(app_name)
-        say "Could not create the application", :red
-        return
+      unless token
+        api.authentication = login
       end
 
+      res = api.create_app(app_name, token)
+
       config[:application]    = res.get('app.id')
       config[:authentication] = res.get('app.token')
       config.write(config_path)
@@ -43,6 +42,9 @@ repository and deploy from there. You can learn more about the process at:
   http://docs.skylight.io/getting-started/#deploy
 
       OUT
+    rescue Api::CreateFailed => e
+      say "Could not create the application", :red
+      say e.errors.inspect, :orange if e.errors
     rescue Interrupt
     end
 
@@ -51,6 +53,8 @@ repository and deploy from there. You can learn more about the process at:
     def app_name
       @app_name ||=
         begin
+          name = nil
+
           if File.exist?("config/application.rb")
             # This looks like a Rails app, lets make sure we have the railtie loaded
             # skylight.rb checks for Rails, but when running the CLI, Skylight loads before Rails does
@@ -60,30 +64,35 @@ repository and deploy from there. You can learn more about the process at:
               error "Unable to load Railtie. Please notify support@skylight.io."
             end
 
-            require "./config/application"
-            Rails.application.class.name.split("::").first.underscore.humanize
-          else
-            File.basename(File.expand_path('.')).humanize
+            # Get the name in a process so that we don't pollute our environment here
+            # This is especially important since users may have things like WebMock that
+            # will prevent us from communicating with the Skylight API
+            begin
+              namefile = Tempfile.new('skylight-app-name')
+              `rails runner 'File.open(\"#{namefile.path}\", \"w\") {|f| f.write(Rails.application.class.name) }'`
+              name = namefile.read.split("::").first.underscore.titleize
+            ensure
+              namefile.close
+              namefile.unlink
+            end
+          end
+
+          if !name || name.strip.empty?
+            name = File.basename(File.expand_path('.')).titleize
           end
-        end
-    end
 
-    def load_credentials
-      load_credentials_from_file || login
+          name
+        end
     end
 
     def login
+      say "Please enter your email and password below or get a token from https://www.skylight.io/app/setup.", :cyan
+
       10.times do
         email    = highline.ask("Email: ")
         password = highline.ask("Password: ") { |q| q.echo = "*" }
 
         if token = api.login(email, password)
-          # Write the token
-          FileUtils.mkdir_p(File.dirname(credentials_path))
-          File.open(credentials_path, 'w') do |f|
-            f.puts YAML.dump('token' => token)
-          end
-
           return token
         end
 
@@ -95,12 +104,6 @@ repository and deploy from there. You can learn more about the process at:
       return
     end
 
-    def load_credentials_from_file
-      return unless File.exist?(credentials_path)
-      return unless yaml = YAML.load_file(credentials_path)
-      yaml['token']
-    end
-
     def relative_config_path
       'config/skylight.yml'
     end
@@ -109,10 +112,6 @@ repository and deploy from there. You can learn more about the process at:
       File.expand_path(relative_config_path)
     end
 
-    def credentials_path
-      File.expand_path(config[:'me.credentials_path'])
-    end
-
     def api
       @api ||= Api.new(config)
     end

data/lib/skylight/helpers.rb

@@ -99,7 +99,7 @@ module Skylight
         desc     = opts[:description].to_s if opts[:description]
 
         klass.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          alias_method :"#{name}_before_instrument", :"#{name}"
+          alias_method :"before_instrument_#{name}", :"#{name}"
 
           def #{name}(*args, &blk)
             span = Skylight.instrument(
@@ -108,7 +108,7 @@ module Skylight
               description: #{desc.inspect})
 
             begin
-              #{name}_before_instrument(*args, &blk)
+              before_instrument_#{name}(*args, &blk)
             ensure
               Skylight.done(span) if span
             end

data/lib/skylight/probes/redis.rb

@@ -0,0 +1,30 @@
+module Skylight
+  module Probes
+    module Redis
+      class Probe
+        def install
+          ::Redis::Client.class_eval do
+            alias call_without_sk call
+
+            def call(command, &block)
+              command_name = command[0]
+
+              return call_without_sk(command, &block) if command_name == :auth
+
+              opts = {
+                category: "db.redis.command",
+                title:    command_name.upcase.to_s
+              }
+
+              Skylight.instrument(opts) do
+                call_without_sk(command, &block)
+              end
+            end
+          end
+        end
+      end
+    end
+
+    register("Redis", "redis", Redis::Probe.new)
+  end
+end

data/lib/skylight/railtie.rb

@@ -14,7 +14,7 @@ module Skylight
 
     # The probes to load
     #   net_http is on by default
-    #   Also available: excon
+    #   Also available: excon, redis
     config.skylight.probes = ['net_http']
 
     initializer 'skylight.configure' do |app|

data/lib/skylight/version.rb

@@ -1,4 +1,4 @@
 module Skylight
-  VERSION = '0.3.17'
+  VERSION = '0.3.18'
 end
 

data/lib/skylight/worker/collector.rb

@@ -180,11 +180,20 @@ module Skylight
           return
         end
 
-        tok = res.body['session']
-        tok = tok['token'] if tok
+        session = res.body['session']
+        tok, expires_at = session['token'], session['expires_at'] if session
+
+        if tok && expires_at
+          if expires_at <= now
+            error "token is expired: token=%s; expires_at=%s"
+            return
+          end
+
+          # 30 minute buffer or split the difference
+          @refresh_at  = expires_at - now > 3600 ?
+                            now + ((expires_at - now) / 2) :
+                            expires_at - 1800
 
-        if tok
-          @refresh_at  = now + 1800 # 30 minutes
           @http_report = Util::HTTP.new(config, :report)
           @http_report.authentication = tok
         else

data/lib/sql_lexer.rb

@@ -1,4 +1,5 @@
 require "sql_lexer/version"
+require "sql_lexer/string_scanner"
 require "sql_lexer/lexer"
 
 module SqlLexer

data/lib/sql_lexer/lexer.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require "strscan"
 
 module SqlLexer
@@ -18,8 +20,8 @@ module SqlLexer
     OptWS         = %Q<[#{WS}]*>
     End           = %Q<;|$>
 
-    InOp          = %q<IN>
-    ArrayOp       = %q<ARRAY>
+    InOp          = %Q<IN(?=#{OptWS}\\()>
+    ArrayOp       = %q<ARRAY(?=\[)>
     ColonColonOp  = %Q<::(?=[#{StartID}])>
     ArrayIndexOp  = %q<\\[(?:\-?\d+(?::\-?\d+)?|NULL)\\]>
     SpecialOps    = %Q<#{InOp}(?=[#{WS}])|#{ColonColonOp}|#{ArrayOp}|#{ArrayIndexOp}>
@@ -42,7 +44,7 @@ module SqlLexer
 
     AfterID       = %Q<[#{WS};#{StartNonBind}]|(?:#{OpPart})|(?:#{ColonColonOp})|(?:#{ArrayIndexOp})|$>
     ID            = %Q<[#{StartID}][#{PartID}]*(?=#{AfterID})>
-    AfterOp       = %Q<[#{WS}]|[#{StartAnyId}]|[#{StartBind}]|(#{StartNonBind})|$>
+    AfterOp       = %Q<[#{WS}]|[#{StartAnyId}]|[#{StartBind}]|(#{StartNonBind})|;|$>
     Op            = %Q<(?:#{OpPart})+(?=#{AfterOp})>
     QuotedID      = %Q<#{StartQuotedID}(?:[^"]|"")*">
     TickedID      = %Q<#{StartTickedID}(?:[^`]|``)*`>
@@ -228,7 +230,7 @@ module SqlLexer
       # SQL allows for nested comments so this takes a bit more work
       while @scanner.skip_until(TkBlockCommentStart)
         count = 1
-        pos = @scanner.pos - 2
+        pos = @scanner.charpos - 2
 
         while true
           # Determine whether we close the comment or start nesting
@@ -253,7 +255,7 @@ module SqlLexer
 
           if count == 0
             # We've closed all comments
-            length = @scanner.pos - pos
+            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
@@ -267,7 +269,7 @@ module SqlLexer
 
       # Remove single line comments
       while @scanner.skip_until(TkComment)
-        pos = @scanner.pos
+        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
@@ -418,7 +420,7 @@ module SqlLexer
       iterations = 0
 
       @skip_binds = true
-      pos = @scanner.pos - 1
+      pos = @scanner.charpos - 1
 
       while nest > 0
         iterations += 1
@@ -448,7 +450,7 @@ module SqlLexer
       end
 
       @binds << pos
-      @binds << @scanner.pos - pos
+      @binds << @scanner.charpos - pos
 
       @skip_binds = false
 
@@ -460,7 +462,7 @@ module SqlLexer
       iterations = 0
 
       @skip_binds = true
-      pos = @scanner.pos - 6
+      pos = @scanner.charpos - 6
 
       while nest > 0
         iterations += 1
@@ -498,7 +500,7 @@ module SqlLexer
       end
 
       @binds << pos
-      @binds << @scanner.pos - pos
+      @binds << @scanner.charpos - pos
 
       @skip_binds = false
 
@@ -511,12 +513,17 @@ module SqlLexer
     end
 
     def process_bind
-      pos = @scanner.pos
-      size = @scanner.skip(TkBind)
+      pos = nil
+
+      unless @skip_binds
+        pos = @scanner.charpos
+      end
+
+      @scanner.skip(TkBind)
 
       unless @skip_binds
         @binds << pos
-        @binds << size
+        @binds << @scanner.charpos - pos
       end
 
       @state = :tokens

data/lib/sql_lexer/string_scanner.rb

@@ -0,0 +1,11 @@
+unless StringScanner.method_defined? :charpos
+  class StringScanner
+    def charpos
+      if string.respond_to?(:byteslice)
+        string.byteslice(0, pos).length
+      else
+        string.unpack("@0a#{pos}").first.force_encoding("UTF-8").length
+      end
+    end
+  end
+end

data/lib/sql_lexer/version.rb

@@ -1,3 +1,3 @@
 module SqlLexer
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 0.3.17
+  version: 0.3.18
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -92,6 +92,7 @@ files:
 - lib/skylight/probes/excon.rb
 - lib/skylight/probes/excon/middleware.rb
 - lib/skylight/probes/net_http.rb
+- lib/skylight/probes/redis.rb
 - lib/skylight/railtie.rb
 - lib/skylight/subscriber.rb
 - lib/skylight/util.rb
@@ -165,6 +166,7 @@ files:
 - lib/skylight/worker/standalone.rb
 - lib/sql_lexer.rb
 - lib/sql_lexer/lexer.rb
+- lib/sql_lexer/string_scanner.rb
 - lib/sql_lexer/version.rb
 homepage: http://www.skylight.io
 licenses: []