skylight 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0dd3b6275124e51f701f53d5c748dd874e5b83e
-  data.tar.gz: 332f461813a0eda4ee7f8e83353fb2369e335c48
+  metadata.gz: cdeb1ad6b563b4b7a487b38421575943337819a9
+  data.tar.gz: 593f06bddf3ffa1ac6dca9544ce84bcecf7680fa
 SHA512:
-  metadata.gz: 1ff8a8fd21899b7ba352d83b8d211bf1fa1d4826dd56aaed5d8d1ab3e65848985c41ddc9f1b7b0855800aaa6f80e8601ce599cd6c33df9e1a7282941fa67f240
-  data.tar.gz: 3d626a30b21e61f3ed87f9d7ceceb6420b16a40a76c001afd105477ed7e0e06dd9fe037d71899a9364a4b5c44fa60fa7fd2e61fc9cfff20b0574d534cba1c8cc
+  metadata.gz: 220a2e262e02e983112cc177c2cae80b11fd8a7d1c0f0235656fc250ff361db4017b3053be6d6d1ffe6c6c2e5316c1f88566764c6a2a2edb171368f095c6f734
+  data.tar.gz: 3f5fd68ec9ec55c2e2703aa399b4e376b6b75bf70b66fdd058add5c9d5db1ce00428c4df3e721306bd6499e39d487e1363ddf397a7e4ef88ccc0e0621393065f

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## unreleased ##
 
+## 0.1.8 (July 19, 2013)
+
+* Update agent for new authentication scheme
+* Change ENV variable prefix from SK_ to SKYLIGHT_
+
 ## 0.1.7 (July 11, 2013)
 
 * Add instrument_method helper

data/lib/skylight.rb

@@ -3,8 +3,8 @@ require 'socket'
 require 'skylight/version'
 
 module Skylight
-  TRACE_ENV_KEY      = 'SK_ENABLE_TRACE_LOGS'.freeze
-  STANDALONE_ENV_KEY = 'SK_STANDALONE'.freeze
+  TRACE_ENV_KEY      = 'SKYLIGHT_ENABLE_TRACE_LOGS'.freeze
+  STANDALONE_ENV_KEY = 'SKYLIGHT_STANDALONE'.freeze
   STANDALONE_ENV_VAL = 'server'.freeze
 
   def self.daemon?

data/lib/skylight/config.rb

@@ -19,27 +19,27 @@ module Skylight
 
     # Map environment variable keys with Skylight configuration keys
     ENV_TO_KEY = {
-      'SK_ROOT'                => :'root',
-      'SK_LOG_FILE'            => :'log_file',
-      'SK_LOG_LEVEL'           => :'log_level',
-      'SK_APPLICATION'         => :'application',
-      'SK_AUTHENTICATION'      => :'authentication',
-      'SK_HOSTNAME'            => :'hostname',
-      'SK_AGENT_INTERVAL'      => :'agent.interval',
-      'SK_AGENT_KEEPALIVE'     => :'agent.keepalive',
-      'SK_AGENT_SAMPLE_SIZE'   => :'agent.sample',
-      'SK_AGENT_SOCKFILE_PATH' => :'agent.sockfile_path',
-      'SK_AGENT_STRATEGY'      => :'agent.strategy',
-      'SK_REPORT_HOST'         => :'report.host',
-      'SK_REPORT_PORT'         => :'report.port',
-      'SK_REPORT_SSL'          => :'report.ssl',
-      'SK_REPORT_DEFLATE'      => :'report.deflate',
-      'SK_ACCOUNTS_HOST'       => :'accounts.host',
-      'SK_ACCOUNTS_PORT'       => :'accounts.port',
-      'SK_ACCOUNTS_SSL'        => :'accounts.ssl',
-      'SK_ACCOUNTS_DEFLATE'    => :'accounts.deflate',
-      'SK_ME_AUTHENTICATION'   => :'me.authentication',
-      'SK_ME_CREDENTIALS_PATH' => :'me.credentials_path' }
+      'ROOT'                => :'root',
+      'LOG_FILE'            => :'log_file',
+      'LOG_LEVEL'           => :'log_level',
+      'APPLICATION'         => :'application',
+      'AUTHENTICATION'      => :'authentication',
+      'HOSTNAME'            => :'hostname',
+      'AGENT_INTERVAL'      => :'agent.interval',
+      'AGENT_KEEPALIVE'     => :'agent.keepalive',
+      'AGENT_SAMPLE_SIZE'   => :'agent.sample',
+      'AGENT_SOCKFILE_PATH' => :'agent.sockfile_path',
+      'AGENT_STRATEGY'      => :'agent.strategy',
+      'REPORT_HOST'         => :'report.host',
+      'REPORT_PORT'         => :'report.port',
+      'REPORT_SSL'          => :'report.ssl',
+      'REPORT_DEFLATE'      => :'report.deflate',
+      'ACCOUNTS_HOST'       => :'accounts.host',
+      'ACCOUNTS_PORT'       => :'accounts.port',
+      'ACCOUNTS_SSL'        => :'accounts.ssl',
+      'ACCOUNTS_DEFLATE'    => :'accounts.deflate',
+      'ME_AUTHENTICATION'   => :'me.authentication',
+      'ME_CREDENTIALS_PATH' => :'me.credentials_path' }
 
     # Default values for Skylight configuration keys
     DEFAULTS = {
@@ -61,6 +61,7 @@ module Skylight
 
     REQUIRED = {
       :'authentication' => "authentication token",
+      :'hostname'       => "server hostname",
       :'report.host'    => "skylight remote host",
       :'report.port'    => "skylight remote port" }
 
@@ -97,7 +98,10 @@ module Skylight
       ret = {}
 
       env.each do |k, val|
-        if key = ENV_TO_KEY[k]
+        # Support deprecated SK_ key prefix
+        next unless k =~ /^(?:SK|SKYLIGHT)_(.+)$/
+
+        if key = ENV_TO_KEY[$1]
           ret[key] =
             case val
             when /^false$/i      then false
@@ -209,7 +213,7 @@ module Skylight
 
       ENV_TO_KEY.each do |k, v|
         if (c = get(v)) != DEFAULTS[v]
-          ret[k] = cast_for_env(c)
+          ret["SKYLIGHT_#{k}"] = cast_for_env(c)
         end
       end
 

data/lib/skylight/util/http.rb

@@ -77,7 +77,7 @@ module Skylight
         headers[AUTHORIZATION]    = authentication if authentication
         headers[ACCEPT]           = APPLICATION_JSON
         headers[X_VERSION_HDR]    = VERSION
-        headers[CONTENT_ENCODING] = GZIP if @deflate
+        headers[CONTENT_ENCODING] = GZIP if length && @deflate
 
         hdrs.each do |k, v|
           headers[k] = v

data/lib/skylight/version.rb

@@ -1,4 +1,4 @@
 module Skylight
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end
 

data/lib/skylight/worker/builder.rb

@@ -14,7 +14,7 @@ module Skylight
       end
 
       def build
-        s = strategy
+        s = strategy.to_s
 
         case s
         when 'embedded'
@@ -32,7 +32,7 @@ module Skylight
             lockfile,
             server)
         else
-          raise "unknown strategy: `#{strat}`"
+          raise "unknown strategy: `#{s}`"
         end
       end
 

data/lib/skylight/worker/collector.rb

@@ -1,8 +1,11 @@
+require 'uri'
+
 module Skylight
   module Worker
     class Collector < Util::Task
+      include URI::Escape
+
       ENDPOINT     = '/report'.freeze
-      FLUSH_DELAY  = 0.5
       CONTENT_TYPE = 'content-type'.freeze
       SKYLIGHT_V1  = 'application/x-skylight-report-v1'.freeze
 
@@ -11,14 +14,17 @@ module Skylight
       attr_reader :config
 
       def initialize(config)
-        super(1000)
-
-        @config   = config
-        @http     = Util::HTTP.new(config)
-        @size     = config[:'agent.sample']
-        @batch    = nil
-        @interval = config[:'agent.interval']
-        @buf      = ""
+        super(1000, 0.25)
+
+        @config      = config
+        @size        = config[:'agent.sample']
+        @batch       = nil
+        @interval    = config[:'agent.interval']
+        @buf         = ""
+        @refresh_at  = 0
+        @http_auth   = Util::HTTP.new(config, :accounts)
+        @http_report = nil
+        # @http_report = Util::HTTP.new(config, :report)
 
         t { fmt "starting collector; interval=%d; size=%d", @interval, @size }
       end
@@ -26,8 +32,18 @@ module Skylight
       def handle(msg, now = Util::Clock.secs)
         @batch ||= new_batch(now)
 
+        if should_refresh_token?(now)
+          refresh_report_token(now)
+        end
+
         if @batch.should_flush?(now)
-          flush(@batch)
+          if has_report_token?(now)
+            flush(@batch)
+          else
+            warn "do not have valid session token -- dropping"
+            return
+          end
+
           @batch = new_batch(now)
         end
 
@@ -47,7 +63,17 @@ module Skylight
 
       def finish
         t { fmt "collector finishing up" }
-        flush(@batch) if @batch
+
+        now = Util::Clock.secs
+
+        if should_refresh_token?(now)
+          refresh_report_token(now)
+        end
+
+        if @batch && has_report_token?(now)
+          flush(@batch)
+        end
+
         @batch = nil
       end
 
@@ -57,7 +83,42 @@ module Skylight
         debug "flushing batch; size=%d", batch.sample.count
 
         @buf.clear
-        @http.post(ENDPOINT, batch.encode(@buf), CONTENT_TYPE => SKYLIGHT_V1)
+        @http_report.post(ENDPOINT, batch.encode(@buf), CONTENT_TYPE => SKYLIGHT_V1)
+      end
+
+      def refresh_report_token(now)
+        res = @http_auth.get("/agent/authenticate?hostname=#{escape(config[:'hostname'])}")
+
+        unless res.success?
+          warn "could not fetch report session token; status=%s", res.status
+          return
+        end
+
+        tok = res.body['session']
+        tok = tok['token'] if tok
+
+        if tok
+          @refresh_at  = now + 600
+          @http_report = Util::HTTP.new(config, :report)
+          @http_report.authentication = tok
+        else
+          if @http_report
+            @refresh_at = now + 60
+          end
+          warn "server did not return a session token"
+        end
+      rescue Exception => e
+        error "exception; msg=%s; class=%s", e.message, e.class
+        t { e.backtrace.join("\n") }
+      end
+
+      def should_refresh_token?(now)
+        now >= @refresh_at
+      end
+
+      def has_report_token?(now)
+        return unless @http_report
+        now < @refresh_at + (3600 * 3 - 660)
       end
 
       def new_batch(now)
@@ -71,12 +132,12 @@ module Skylight
       class Batch
         include Util::Logging
 
-        attr_reader :config, :from, :counts, :sample
+        attr_reader :config, :from, :counts, :sample, :flush_at
 
         def initialize(config, size, from, interval)
           @config   = config
           @from     = from
-          @flush_at = from + interval + FLUSH_DELAY
+          @flush_at = from + interval
           @sample   = Util::UniformSample.new(size)
           @counts   = Hash.new(0)
         end

data/lib/skylight/worker/server.rb

@@ -5,10 +5,10 @@ module Skylight
     # TODO:
     #   - Shutdown if no connections for over a minute
     class Server
-      LOCKFILE_PATH      = 'SK_LOCKFILE_PATH'.freeze
-      LOCKFILE_ENV_KEY   = 'SK_LOCKFILE_FD'.freeze
-      UDS_SRV_FD_KEY     = 'SK_UDS_FD'.freeze
-      KEEPALIVE_KEY      = 'SK_KEEPALIVE'.freeze
+      LOCKFILE_PATH      = 'SKYLIGHT_LOCKFILE_PATH'.freeze
+      LOCKFILE_ENV_KEY   = 'SKYLIGHT_LOCKFILE_FD'.freeze
+      UDS_SRV_FD_KEY     = 'SKYLIGHT_UDS_FD'.freeze
+      KEEPALIVE_KEY      = 'SKYLIGHT_KEEPALIVE'.freeze
 
       include Util::Logging
 

metadata

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