skylight 0.1.7.alpha1 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db1b0ac1268ea2ee9d131e07bd233d1865f5ff7b
-  data.tar.gz: b42da292696538f036387909cdb44331ca32494a
+  metadata.gz: a0dd3b6275124e51f701f53d5c748dd874e5b83e
+  data.tar.gz: 332f461813a0eda4ee7f8e83353fb2369e335c48
 SHA512:
-  metadata.gz: 2c59dceb8da40478a4e7a6ccb1b7d069268449ffbfe8aa61634f50e15296951f103ae3d5aa4cffce2eded0f4a7714c0ac9019f8ae75493487bfb5040fa6dab96
-  data.tar.gz: bd2f355e06b37128932b2ed61a03ee7340caaec31c2531cf293c65276832444962be7464f88daf91154a52e61684b12a36cfce040a0f01380b4cd3ebcf28074c
+  metadata.gz: 1ff8a8fd21899b7ba352d83b8d211bf1fa1d4826dd56aaed5d8d1ab3e65848985c41ddc9f1b7b0855800aaa6f80e8601ce599cd6c33df9e1a7282941fa67f240
+  data.tar.gz: 3d626a30b21e61f3ed87f9d7ceceb6420b16a40a76c001afd105477ed7e0e06dd9fe037d71899a9364a4b5c44fa60fa7fd2e61fc9cfff20b0574d534cba1c8cc

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 ## unreleased ##
 
+## 0.1.7 (July 11, 2013)
+
+* Add instrument_method helper
 * Add the ability to configure logging from railtie
+* Tracks the current host
+* [BUG] Handle AS::N monkey patching when there are already subscribers
+* [BUG] Handle ruby 1.9.2 encoding bug
 
 ## 0.1.6 (June 11, 2013)
 

data/lib/skylight.rb

@@ -23,6 +23,7 @@ module Skylight
   autoload :CLI,          'skylight/cli'
   autoload :Config,       'skylight/config'
   autoload :GC,           'skylight/gc'
+  autoload :Helpers,      'skylight/helpers'
   autoload :Instrumenter, 'skylight/instrumenter'
   autoload :Messages,     'skylight/messages'
   autoload :Middleware,   'skylight/middleware'
@@ -59,6 +60,7 @@ module Skylight
 
   TIER_REGEX = /^(?:#{TIERS.join('|')})(?:\.|$)/
   CATEGORY_REGEX = /^[a-z0-9_-]+(?:\.[a-z0-9_-]+)*$/i
+  DEFAULT_CATEGORY = "app.block".freeze
 
   def self.start!(*args)
     Instrumenter.start!(*args)
@@ -77,13 +79,23 @@ module Skylight
     inst.trace(*args, &blk)
   end
 
-  def self.instrument(*args, &blk)
+  def self.instrument(opts = {}, &blk)
     unless inst = Instrumenter.instance
       return yield if block_given?
       return
     end
 
-    inst.instrument(*args, &blk)
+    if Hash === opts
+      category = opts.delete(:category) || DEFAULT_CATEGORY
+      title    = opts.delete(:title)
+      desc     = opts.delete(:description)
+    else
+      category = DEFAULT_CATEGORY
+      title    = opts.to_s
+      desc     = nil
+    end
+
+    inst.instrument(category, title, desc, &blk)
   end
 
   RUBYBIN = File.join(

data/lib/skylight/cli.rb

@@ -28,6 +28,20 @@ module Skylight
       config.write(config_path)
 
       say "Congratulations. Your application is on Skylight! http://www.skylight.io", :green
+      say <<-OUT
+
+The application was registered for you and we generated an config file
+containing your API token at:
+
+  #{relative_config_path}
+
+The next step is for you to deploy your application to production. The
+easiest way is to just commit the config file to your source control
+repository and deploy from there. You can learn more about the process at:
+
+  http://docs.skylight.io/getting-started/#deploy
+
+      OUT
     rescue Interrupt
     end
 
@@ -78,8 +92,12 @@ module Skylight
       yaml['token']
     end
 
+    def relative_config_path
+      'config/skylight.yml'
+    end
+
     def config_path
-      File.expand_path('config/skylight.yml')
+      File.expand_path(relative_config_path)
     end
 
     def credentials_path

data/lib/skylight/compat.rb

@@ -1,11 +1,34 @@
 module Skylight
   # Ensure the version of AS:N being used is recent enough
   begin
-    # Attempt to reference an internal class
+    # Attempt to reference an internal class only present in the new AS::Notifications
     ActiveSupport::Notifications::Fanout::Subscribers
   rescue NameError
+
+    # The things we do...
+    class ::ActiveSupport::Notifications::Fanout
+      attr_reader :subscribers
+
+      class Subscriber
+        attr_reader :pattern, :delegate
+      end
+    end
+
+    notifier = ActiveSupport::Notifications.notifier
+
     # If the class is missing, require our vendored AS::N
     require 'skylight/vendor/active_support/notifications'
+
+    if notifier.subscribers.respond_to?(:each)
+      notifier.subscribers.each do |sub|
+        pattern  = sub.respond_to?(:pattern)  && sub.pattern
+        delegate = sub.respond_to?(:delegate) && sub.delegate
+
+        if pattern && delegate
+          ActiveSupport::Notifications.subscribe(pattern, delegate)
+        end
+      end
+    end
   end
 end
 

data/lib/skylight/config.rb

@@ -2,11 +2,21 @@ require 'yaml'
 require 'fileutils'
 require 'logger'
 require 'thread'
+require 'socket'
 
 module Skylight
   class Config
     MUTEX = Mutex.new
 
+    def self.default_hostname
+      if hostname = Socket.gethostname
+        hostname.strip!
+        hostname = nil if hostname == ''
+      end
+
+      hostname || SecureRandom.uuid
+    end
+
     # Map environment variable keys with Skylight configuration keys
     ENV_TO_KEY = {
       'SK_ROOT'                => :'root',
@@ -14,6 +24,7 @@ module Skylight
       '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',
@@ -34,6 +45,7 @@ module Skylight
     DEFAULTS = {
       :'log_file'            => '-'.freeze,
       :'log_level'           => 'INFO'.freeze,
+      :'hostname'            => default_hostname,
       :'agent.keepalive'     => 60,
       :'agent.interval'      => 5,
       :'agent.sample'        => 200,

data/lib/skylight/helpers.rb

@@ -0,0 +1,77 @@
+module Skylight
+  module Helpers
+    module ClassMethods
+      def method_added(name)
+        super
+
+        if opts = @__sk_instrument_next_method
+          @__sk_instrument_next_method = nil
+          title = "#{to_s}##{name}"
+          __sk_instrument_method_on(self, name, title, opts)
+        end
+      end
+
+      def singleton_method_added(name)
+        super
+
+        if opts = @__sk_instrument_next_method
+          @__sk_instrument_next_method = nil
+          title = "#{to_s}.#{name}"
+          __sk_instrument_method_on(__sk_singleton_class, name, title, opts)
+        end
+      end
+
+      def instrument_method(*args)
+        opts = args.pop if Hash === args.last
+
+        if name = args.pop
+          title = "#{to_s}##{name}"
+          __sk_instrument_method_on(self, name, title, opts || {})
+        else
+          @__sk_instrument_next_method = opts || {}
+        end
+      end
+
+    private
+
+      def __sk_instrument_method_on(klass, name, title, opts)
+        category = (opts[:category] || "app.method").to_s
+        title    = (opts[:title] || title).to_s
+        desc     = opts[:description].to_s if opts[:description]
+
+        klass.class_eval <<-RUBY
+          alias_method :"#{name}_before_instrument", :"#{name}"
+
+          def #{name}(*args, &blk)
+            span = Skylight.instrument(
+              category:  :"#{category}",
+              title:       #{title.inspect},
+              description: #{desc.inspect})
+
+            begin
+              #{name}_before_instrument(*args, &blk)
+            ensure
+              span.done if span
+            end
+          end
+        RUBY
+      end
+
+      if respond_to?(:singleton_class)
+        alias :__sk_singleton_class :singleton_class
+      else
+        def __sk_singleton_class
+          class << self; self; end
+        end
+      end
+    end
+
+    def self.included(base)
+      base.class_eval do
+        @__sk_instrument_next_method = nil
+        extend ClassMethods
+      end
+    end
+
+  end
+end

data/lib/skylight/messages/batch.rb

@@ -5,6 +5,7 @@ module Skylight
 
       required :timestamp, :uint32,  1
       repeated :endpoints, Endpoint, 2
+      optional :hostname,  :string,  3
 
     end
   end

data/lib/skylight/util/http.rb

@@ -10,6 +10,7 @@ module Skylight
       CONTENT_LENGTH   = 'content-length'.freeze
       CONTENT_TYPE     = 'content-type'.freeze
       ACCEPT           = 'Accept'.freeze
+      X_VERSION_HDR    = 'x-skylight-agent-version'.freeze
       APPLICATION_JSON = 'application/json'.freeze
       AUTHORIZATION    = 'authorization'.freeze
       DEFLATE          = 'deflate'.freeze
@@ -75,6 +76,7 @@ module Skylight
         headers[CONTENT_LENGTH]   = length.to_s if length
         headers[AUTHORIZATION]    = authentication if authentication
         headers[ACCEPT]           = APPLICATION_JSON
+        headers[X_VERSION_HDR]    = VERSION
         headers[CONTENT_ENCODING] = GZIP if @deflate
 
         hdrs.each do |k, v|

data/lib/skylight/vendor/beefcake/buffer.rb

@@ -80,13 +80,19 @@ module Skylight
 
       BINARY = 'BINARY'
 
-      if defined?(JRUBY_VERSION)
+      # Detect a ruby encodings bug, as far as I know, this exists in
+      # most versions fo JRuby as well as 1.9.2
+      def self.current_ruby_has_encoding_bug?
+        base = "\0\1".force_encoding('BINARY')
+        base << "BUG".encode("UTF-8")
+        base.encoding.to_s == 'UTF-8'
+      end
+
+      if ''.respond_to?(:force_encoding) && current_ruby_has_encoding_bug?
         def <<(bytes)
-          buf.force_encoding(BINARY)
           buf << bytes
-        rescue
-          p [ buf, bytes ]
-          raise
+          buf.force_encoding(BINARY)
+          buf
         end
       else
         def <<(bytes)

data/lib/skylight/version.rb

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

data/lib/skylight/worker/collector.rb

@@ -117,6 +117,7 @@ module Skylight
 
           Messages::Batch.new(
             timestamp: from,
+            hostname:  config[:hostname],
             endpoints: endpoints.values).
             encode(buf)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 0.1.7.alpha1
+  version: 0.1.7
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2013-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -39,6 +39,7 @@ files:
 - lib/skylight/config.rb
 - lib/skylight/data/cacert.pem
 - lib/skylight/gc.rb
+- lib/skylight/helpers.rb
 - lib/skylight/instrumenter.rb
 - lib/skylight/messages.rb
 - lib/skylight/messages/annotation.rb
@@ -143,9 +144,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: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3