skylight 0.0.10 → 0.0.11

data/lib/skylight/cli.rb

@@ -4,6 +4,7 @@ $:.unshift File.expand_path('../vendor', __FILE__)
 require "skylight"
 require "thor"
 require "highline"
+require "active_support/inflector"
 
 module Skylight
   class CLI < Thor
@@ -77,8 +78,15 @@ module Skylight
     end
 
     def app_name
-      require "./config/application"
-      Rails.application.class.name.split("::").first.underscore
+      @app_name ||=
+        begin
+          if File.exist?("config/application.rb")
+            require "./config/application"
+            Rails.application.class.name.split("::").first.underscore.humanize
+          else
+            File.basename(File.expand_path('.')).humanize
+          end
+        end
     end
   end
 end

data/lib/skylight/config.rb

@@ -1,5 +1,6 @@
 require 'yaml'
 require 'logger'
+require 'fileutils'
 
 module Skylight
   class Config
@@ -22,6 +23,7 @@ module Skylight
       end
 
     private
+
       def apply_env(config, env)
         env.each do |key, value|
           name = normalize_env(key)
@@ -46,7 +48,7 @@ module Skylight
       @port     = 443
       @interval = 5
       @protocol = JsonProto.new(self)
-      @max_pending_traces = 500
+      @max_pending_traces   = 500
       @samples_per_interval = 100
 
       @logger = Logger.new(STDOUT)
@@ -60,6 +62,9 @@ module Skylight
         end
       end
 
+      @http ||= Util::HTTP.new(self)
+      @gc_profiler ||= GC::Profiler
+
       yield self if block_given?
     end
 
@@ -88,6 +93,7 @@ module Skylight
     attr_reader :normalizer
 
     attr_reader :protocol
+
     def protocol=(val)
       if val.is_a?(String) || val.is_a?(Symbol)
         class_name = val.to_s.capitalize+"Proto"
@@ -114,10 +120,13 @@ module Skylight
     attr_writer :gc_profiler
 
     def gc_profiler
+      # TODO: Move this into tests
       @gc_profiler ||= Struct.new(:enable, :disable, :clear, :total_time).new(nil, nil, nil, 0)
     end
 
     def save(filename=yaml_file)
+      FileUtils.mkdir_p File.dirname(filename)
+
       File.open(filename, "w") do |file|
         config = {}
         config["authentication_token"] = authentication_token if authentication_token

data/lib/skylight/instrumenter.rb

@@ -1,6 +1,9 @@
 module Skylight
   class Instrumenter
 
+    # Guards starting the instrumenter
+    LOCK = Mutex.new
+
     # Maximum number of traces to sample for each interval
     SAMPLE_SIZE = 100
 
@@ -8,44 +11,63 @@ module Skylight
     INTERVAL = 5
 
     def self.start!(config = Config.new)
-      # Convert a hash to a config object
-      if Hash === config
-        config = Config.new config
-      end
-
       new(config).start!
     end
 
     attr_reader :config, :worker, :samples
 
     def initialize(config)
-      @config = config
+      # Convert a hash to a config object
+      if Hash === config
+        config = Config.new(config)
+      end
 
-      @worker = Worker.new(self)
+      @config  = config
+      @started = false
+      @worker  = Worker.new(self)
     end
 
     def start!
-      @worker.start!
-      Subscriber.register!(config)
+      # Quick check
+      return self if @started
+
+      LOCK.synchronize do
+        # Ensure that the instrumenter has not been started now that the lock
+        # as been acquired
+        return self if @started
+
+        @worker.start!
+        Subscriber.register!(config)
 
-      # Ensure properly configured
-      return unless config
+        # Ensure properly configured
+        return unless config
 
-      # Ensure that there is an API token
-      unless config.authentication_token
-        if logger = config.logger
-          logger.warn "[SKYLIGHT] No authentication token provided; cannot start agent."
+        # Ensure that there is an API token
+        unless config.authentication_token
+          if logger = config.logger
+            logger.warn "[SKYLIGHT] No authentication token provided; cannot start agent."
+          end
+
+          return
         end
 
-        return
-      end
+        config.gc_profiler.enable
 
-      config.gc_profiler.enable
+        @started = true
+      end
 
       self
+
+    rescue
+      nil
     end
 
     def trace(endpoint = nil)
+      # Ignore everything unless the instrumenter has been started
+      unless @started
+        return yield
+      end
+
       # If there already is a trace going on, then just continue
       if Thread.current[Trace::KEY]
         return yield

data/lib/skylight/middleware.rb

@@ -1,46 +1,24 @@
 module Skylight
   class Middleware
-    def self.new(app, config, *)
-      return app unless config
+
+    def self.new(app, instrumenter, *)
+      return app unless instrumenter
       super
     end
 
-    def initialize(app, config, instrumenter_class=Instrumenter)
+    def initialize(app, instrumenter)
       @app = app
-      @config = config
-      @config.gc_profiler = GC::Profiler
-      @instrumenter_class = instrumenter_class
+      @instrumenter = instrumenter
     end
 
     def call(env)
-      instrumenter.trace("Rack") do
+      @instrumenter.start!
+
+      @instrumenter.trace("Rack") do
         ActiveSupport::Notifications.instrument("app.rack.request") do
           @app.call(env)
         end
       end
     end
-
-  private
-    LOCK = Mutex.new
-
-    def instrumenter
-      return @instrumenter if defined?(@instrumenter)
-
-      LOCK.synchronize do
-        return @instrumeter if defined?(@instrumenter)
-        @instrumenter = @instrumenter_class.start!(@config)
-        return @instrumenter
-      end
-    rescue Exception
-      @instrumenter = stub
-    end
-
-    def stub
-      Class.new do
-        def trace(*)
-          yield
-        end
-      end.new
-    end
   end
 end

data/lib/skylight/normalize/send_file.rb

@@ -1,44 +1,51 @@
-require "action_dispatch/http/mime_type"
-require "action_dispatch/http/mime_types"
-require "rack/utils"
-
 module Skylight
   module Normalize
-    class SendFile < Normalizer
-      register "send_file.action_controller"
-
-      def normalize
-        path = @payload[:path]
-
-        annotations = {
-          path: path,
-          filename: @payload[:filename],
-          type: normalize_type,
-          disposition: normalize_disposition,
-          status: normalize_status
-        }
-
-        # These will eventually be different
-        title = desc = "send file: #{path}"
-
-        [ "app.controller.send_file", title, desc, annotations ]
-      end
-
-    private
-      def normalize_type
-        type = @payload[:type] || "application/octet-stream"
-        type = Mime[type].to_s if type.is_a?(Symbol)
-        type
-      end
 
-      def normalize_status
-        status = @payload[:status] || 200
-        Rack::Utils.status_code(status)
+    # Temporary hacks
+    begin
+      require "action_dispatch/http/mime_type"
+      require "action_dispatch/http/mime_types"
+      require "rack/utils"
+
+      class SendFile < Normalizer
+        register "send_file.action_controller"
+
+        def normalize
+          path = @payload[:path]
+
+          annotations = {
+            path: path,
+            filename: @payload[:filename],
+            type: normalize_type,
+            disposition: normalize_disposition,
+            status: normalize_status
+          }
+
+          # These will eventually be different
+          title = desc = "send file: #{path}"
+
+          [ "app.controller.send_file", title, desc, annotations ]
+        end
+
+      private
+        def normalize_type
+          type = @payload[:type] || "application/octet-stream"
+          type = Mime[type].to_s if type.is_a?(Symbol)
+          type
+        end
+
+        def normalize_status
+          status = @payload[:status] || 200
+          Rack::Utils.status_code(status)
+        end
+
+        def normalize_disposition
+          @payload[:disposition] || "attachment"
+        end
       end
 
-      def normalize_disposition
-        @payload[:disposition] || "attachment"
-      end
+    rescue LoadError
     end
+
   end
 end

data/lib/skylight/railtie.rb

@@ -13,52 +13,61 @@ module Skylight
 
     attr_accessor :instrumenter
 
-    initializer "skylight.sanity_check" do |app|
-      checker = SanityChecker.new
-      @problems = checker.smoke_test(config_path(app)) || checker.sanity_check(load_config(app))
-      next unless @problems
+    initializer "skylight.configure" do |app|
+      config = load_config(app)
 
-      @problems.each do |group, problem_list|
-        problem_list.each do |problem|
-          puts "[SKYLIGHT] PROBLEM: #{group} #{problem}"
-        end
-      end
-    end
+      if good_to_go?(app, config)
+        @instrumenter = Instrumenter.new(config)
 
-    initializer "skylight.configure" do |app|
-      if @problems
-        puts "[SKYLIGHT] Skipping Skylight boot"
-      else
         Rails.logger.debug "[SKYLIGHT] Installing middleware"
-        app.middleware.insert 0, Middleware, load_config(app)
+        app.middleware.insert 0, Middleware, @instrumenter
+      else
+        puts "[SKYLIGHT] Skipping Skylight boot"
       end
     end
 
   private
 
-    def environments
-      Array(config.skylight.environments).map { |e| e && e.to_s }.compact
+    def good_to_go?(app, config)
+      unless problems = check_for_problems(app, config)
+        return true
+      end
+
+      problems.each do |group, problem_list|
+        problem_list.each do |problem|
+          puts "[SKYLIGHT] PROBLEM: #{group} #{problem}"
+        end
+      end
+
+      false
     end
 
-    def config_path(app)
-      path = config.skylight.config_path
-      File.expand_path(path, app.root)
+    def check_for_problems(app, config)
+      checker = SanityChecker.new
+      checker.smoke_test(config_path(app)) || checker.sanity_check(config)
     end
 
     def load_config(app)
-      @skylight_config ||= begin
         config = Config.load_from_yaml(config_path(app), ENV).tap do |c|
           c.logger = Rails.logger
         end
 
         config.normalizer.view_paths = app.config.paths["app/views"].existent
-        config.http = Util::HTTP.new(config)
         config
-      end
     rescue => e
       raise
       Rails.logger.error "[SKYLIGHT] #{e.message} (#{e.class}) - #{e.backtrace.first}"
     end
 
+    def environments
+      Array(config.skylight.environments).map { |e| e && e.to_s }.compact
+    end
+
+    def config_path(app)
+      path = config.skylight.config_path
+      File.expand_path(path, app.root)
+    end
+
+
   end
 end

data/lib/skylight/subscriber.rb

@@ -19,8 +19,6 @@ module Skylight
 
     def finish(name, id, payload)
       return unless trace = Trace.current
-
-      logger.debug("[SKYLIGHT] END")
       trace.stop
     end
 

data/lib/skylight/trace.rb

@@ -94,7 +94,14 @@ module Skylight
 
       update_cumulative_gc
 
-      span.ended_at = now - @timestamp - @cumulative_gc
+      ended_at = now - @timestamp
+
+      # If it's not the root node
+      if span.parent
+        ended_at -= @cumulative_gc
+      end
+
+      span.ended_at = ended_at
 
       # Update the parent
       @parent = @spans[@parent].parent

data/lib/skylight/version.rb

@@ -1,3 +1,3 @@
 module Skylight
-  VERSION = '0.0.10'
+  VERSION = '0.0.11'
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
+  prerelease: 
 platform: ruby
 authors:
 - Tilde, Inc.
@@ -13,29 +14,33 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 description: Currently in pre-alpha.
@@ -124,25 +129,26 @@ files:
 - bin/skylight
 homepage: http://www.skylight.io
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Skylight is a ruby application monitoring tool.
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: addb4eed3d6a9b0f22eb5163115018211c5da90c
-  data.tar.gz: 513eb7a8391b46447744f602127b2e0e4fe84edc
-SHA512:
-  metadata.gz: cd3900fdbb47bc3adf7a81dda75a69277b72484d056a1f86c66b83b36335d0a2e01568830c0bb412bdcd76c82eb7ceec11fc2a5b8f73c1c129d725ab342e27b4
-  data.tar.gz: e94a2b3bf08c8151b1a23e666402a4530eaa3310087de8f6b43f109f57792c7556e17314711babfeff7cfaca3a3f8d1df41f18b36587bf356c5c12d2533f668a