lib/skylight.rb in skylight-0.3.6 vs lib/skylight.rb in skylight-0.3.7

@@ -1,29 +1,36 @@
 require 'rbconfig'
 require 'socket'
 require 'skylight/version'
 
-begin
-  unless ENV["SKYLIGHT_DISABLE_AGENT"]
-    require 'skylight_native'
-    require 'skylight/native'
-    has_native_ext = true
-  end
-rescue LoadError
-  if defined?(Rails) && !Rails.env.development? && !Rails.env.test?
-    puts "[SKYLIGHT] [#{Skylight::VERSION}] The Skylight native extension for your platform wasn't found. We currently support monitoring in 32- and 64-bit Linux only. If you are on a supported platform, please contact support at [e-mail]. The missing extension will not affect the functioning of your application."
-  elsif defined?(Rails)
-    puts "[SKYLIGHT] [#{Skylight::VERSION}] Running Skylight in #{Rails.env} mode. No data will be reported until you deploy your app."
-  else
-    puts "[SKYLIGHT] [#{Skylight::VERSION}] Running Skylight in development mode."
-  end
-  raise if ENV.key?("SKYLIGHT_REQUIRED")
-end
-
 module Skylight
   TRACE_ENV_KEY      = 'SKYLIGHT_ENABLE_TRACE_LOGS'.freeze
+  STANDALONE_ENV_KEY = 'SKYLIGHT_STANDALONE'.freeze
+  STANDALONE_ENV_VAL = 'server'.freeze
 
+  # Whether or not the native extension is present
+  @@has_native_ext = false
+
+  def self.native?
+    @@has_native_ext
+  end
+
+  begin
+    unless ENV["SKYLIGHT_DISABLE_AGENT"]
+      # First attempt to require the native extension
+      require 'skylight_native'
+
+      # If nothing was thrown, then the native extension is present
+      @@has_native_ext = true
+
+      # Require ruby support for the native extension
+      require 'skylight/native'
+    end
+  rescue LoadError
+    raise if ENV.key?("SKYLIGHT_REQUIRED")
+  end
+
   autoload :Api,          'skylight/api'
   autoload :CLI,          'skylight/cli'
   autoload :Config,       'skylight/config'
   autoload :Helpers,      'skylight/helpers'
 
@@ -40,20 +47,20 @@
   class SerializeError   < RuntimeError; end
 
   if defined?(Rails)
     require 'skylight/railtie'
   end
-end
 
-if has_native_ext
-
-module Skylight
-  STANDALONE_ENV_KEY = 'SKYLIGHT_STANDALONE'.freeze
-  STANDALONE_ENV_VAL = 'server'.freeze
-
-  def self.native?
-    true
+  def self.warn_skylight_native_missing
+    # TODO: Dumping the error messages this way is pretty hacky
+    if defined?(Rails) && !Rails.env.development? && !Rails.env.test?
+      puts "[SKYLIGHT] [#{Skylight::VERSION}] The Skylight native extension for your platform wasn't found. We currently support monitoring in 32- and 64-bit Linux only. If you are on a supported platform, please contact support at [e-mail]. The missing extension will not affect the functioning of your application."
+    elsif defined?(Rails)
+      puts "[SKYLIGHT] [#{Skylight::VERSION}] Running Skylight in #{Rails.env} mode. No data will be reported until you deploy your app."
+    else
+      puts "[SKYLIGHT] [#{Skylight::VERSION}] Running Skylight in development mode."
+    end
   end
 
   def self.daemon?
     ENV[STANDALONE_ENV_KEY] == STANDALONE_ENV_VAL
   end
@@ -101,10 +108,16 @@
   TIER_REGEX = /^(?:#{TIERS.join('|')})(?:\.|$)/u
   CATEGORY_REGEX = /^[a-z0-9_-]+(?:\.[a-z0-9_-]+)*$/iu
   DEFAULT_CATEGORY = "app.block".freeze
   DEFAULT_OPTIONS = { category: DEFAULT_CATEGORY }
 
+  #
+  #
+  # ===== Public API =====
+  #
+  #
+
   def self.start!(*args)
     Instrumenter.start!(*args)
   end
 
   def self.stop!(*args)
@@ -134,11 +147,11 @@
       return yield if block_given?
       return
     end
 
     if Hash === opts
-      category = opts.delete(:category)
+      category = opts.delete(:category) || DEFAULT_CATEGORY
       title    = opts.delete(:title)
       desc     = opts.delete(:description)
     else
       category = DEFAULT_CATEGORY
       title    = opts.to_s
@@ -167,37 +180,6 @@
 
   # Called by the standalone agent
   Worker::Server.boot if daemon?
 
   require 'skylight/probes'
-end
-
-else
-
-module Skylight
-  def self.native?
-    false
-  end
-
-  def self.start!(*)
-  end
-
-  def self.stop!(*)
-  end
-
-  def self.trace(*)
-    yield if block_given?
-  end
-
-  def self.done(*)
-  end
-
-  def self.instrument(*)
-    yield if block_given?
-  end
-
-  def self.disable(*)
-    yield if block_given?
-  end
-end
-
 end