skylight 4.2.1 → 5.0.0.beta

data/lib/skylight/api.rb

@@ -4,7 +4,7 @@ require "skylight/util/http"
 module Skylight
   # @api private
   class Api
-    include Core::Util::Logging
+    include Util::Logging
 
     attr_reader :config
 
@@ -21,6 +21,7 @@ module Skylight
 
       def errors
         return unless res.respond_to?(:body) && res.body.is_a?(Hash)
+
         res.body["errors"]
       end
 
@@ -36,7 +37,7 @@ module Skylight
     end
 
     class ConfigValidationResults
-      include Core::Util::Logging
+      include Util::Logging
 
       attr_reader :raw_response
 
@@ -87,11 +88,13 @@ module Skylight
 
       def validation_errors
         return {} if config_valid? || !body
+
         body["errors"]
       end
 
       def corrected_config
-        return {} if config_valid? || !body
+        return nil if config_valid? || !body
+
         body["corrected"]
       end
     end
@@ -107,6 +110,7 @@ module Skylight
       res = http_request(:app_create, :post, params)
 
       raise CreateFailed, res unless res.success?
+
       res
     end
 

data/lib/skylight/cli.rb

@@ -60,7 +60,7 @@ module Skylight
       rescue Api::CreateFailed => e
         say "Could not create the application. Please run `bundle exec skylight doctor` for diagnostics.", :red
         say e.to_s, :yellow
-      rescue Interrupt
+      rescue Interrupt # rubocop:disable Lint/SuppressedException
       end
 
       desc "disable_dev_warning", "Disables warning about running Skylight in development mode for all local apps"
@@ -71,7 +71,8 @@ module Skylight
         say "Development mode warning disabled", :green
       end
 
-      desc "disable_env_warning", "Disables warning about running Skylight in environments not defined in config.skylight.environments"
+      desc "disable_env_warning", "Disables warning about running Skylight in environments not defined in " \
+                                  "config.skylight.environments"
       def disable_env_warning
         user_config.disable_env_warning = true
         user_config.save
@@ -93,7 +94,7 @@ module Skylight
                 begin
                   namefile = Tempfile.new("skylight-app-name")
                   # Windows appears to need double quotes for `rails runner`
-                  `rails runner "File.open('#{namefile.path}', 'w') {|f| f.write(Rails.application.class.name) rescue '' }"`
+                  `rails runner "File.open('#{namefile.path}', 'w') {|f| f.write(Rails.application.class.name) rescue '' }"` # rubocop:disable Layout/LineLength
                   name = namefile.read.split("::").first.underscore.titleize
                   name = nil if name.empty?
                 rescue => e

data/lib/skylight/cli/doctor.rb

@@ -24,7 +24,8 @@ module Skylight
                   say "Please update your certificates with RVM by running `rvm osx-ssl-certs update all`.", :yellow
                   say "Alternatively, try setting `SKYLIGHT_FORCE_OWN_CERTS=1` in your environment.", :yellow
                 else
-                  say "Please update your local certificates or try setting `SKYLIGHT_FORCE_OWN_CERTS=1` in your environment.", :yellow
+                  say "Please update your local certificates or try setting `SKYLIGHT_FORCE_OWN_CERTS=1` in your " \
+                      "environment.", :yellow
                 end
               end
             else
@@ -87,7 +88,7 @@ module Skylight
           begin
             config.validate!
             say "Configuration is valid", :green
-          rescue Core::ConfigError => e
+          rescue ConfigError => e
             encountered_error!
 
             say "Configuration is invalid", :red

data/lib/skylight/cli/merger.rb

@@ -14,7 +14,7 @@ module Skylight
 
       STRINGS = {
         get_token: "get your merge token from `https://www.skylight.io/merging`",
-        unlisted: "My app isn't listed here :("
+        unlisted:  "My app isn't listed here :("
       }.freeze
 
       argument :merge_token, type: :string, desc: STRINGS[:get_token]
@@ -171,9 +171,9 @@ module Skylight
           say "Merging..."
 
           api.merge_apps!(@merge_token,
-                          app_guid: @parent_app.guid,
+                          app_guid:       @parent_app.guid,
                           component_guid: @child_app.guid,
-                          environment: @child_env)
+                          environment:    @child_env)
         rescue => e
           say("Something went wrong. Please contact support@skylight.io for more information.", :red)
           done!(message: e.message, success: false)
@@ -252,7 +252,8 @@ module Skylight
 
         def valid_component?(component_name, env)
           return false unless env
-          Skylight::Util::Component.new(env, component_name) && true
+
+          Util::Component.new(env, component_name) && true
         rescue ArgumentError
           false
         end
@@ -265,6 +266,7 @@ module Skylight
           ret = Enumerator.new do |yielder|
             @parents.each do |_, app|
               next if app == @parent_app
+
               app.components.each do |component|
                 yielder << OpenStruct.new({ app_name: app.name }.merge(component))
               end

data/lib/skylight/config.rb

@@ -1,4 +1,11 @@
 require "openssl"
+require "yaml"
+require "fileutils"
+require "erb"
+require "json"
+require "skylight/util/logging"
+require "skylight/util/proxy"
+require "skylight/errors"
 require "skylight/util/component"
 require "skylight/util/deploy"
 require "skylight/util/platform"
@@ -6,123 +13,187 @@ require "skylight/util/hostname"
 require "skylight/util/ssl"
 
 module Skylight
-  class Config < Core::Config
-    def self.env_to_key
-      @env_to_key ||= super.merge(
-        # == Authentication ==
-        "AUTHENTICATION" => :authentication,
-
-        # == App settings ==
-        "ROOT"          => :root,
-        "HOSTNAME"      => :hostname,
-        "SESSION_TOKEN" => :session_token,
-
-        # == Component settings ==
-        "ENV" => :env,
-        "COMPONENT" => :component,
-        "REPORT_RAILS_ENV" => :report_rails_env,
-
-        # == Deploy settings ==
-        "DEPLOY_ID"          => :'deploy.id',
-        "DEPLOY_GIT_SHA"     => :'deploy.git_sha',
-        "DEPLOY_DESCRIPTION" => :'deploy.description',
-
-        # == Max Span Handling ==
-        "REPORT_MAX_SPANS_EXCEEDED" => :report_max_spans_exceeded,
-        "PRUNE_LARGE_TRACES" => :prune_large_traces,
-
-        # == Instrumenter ==
-        "IGNORED_ENDPOINT" => :ignored_endpoint,
-        "IGNORED_ENDPOINTS" => :ignored_endpoints,
-
-        # == Skylight Remote ==
-        "AUTH_URL"                     => :auth_url,
-        "APP_CREATE_URL"               => :app_create_url,
-        "MERGES_URL"                   => :merges_url,
-        "VALIDATION_URL"               => :validation_url,
-        "AUTH_HTTP_DEFLATE"            => :auth_http_deflate,
-        "AUTH_HTTP_CONNECT_TIMEOUT"    => :auth_http_connect_timeout,
-        "AUTH_HTTP_READ_TIMEOUT"       => :auth_http_read_timeout,
-        "REPORT_URL"                   => :report_url,
-        "REPORT_HTTP_DEFLATE"          => :report_http_deflate,
-        "REPORT_HTTP_CONNECT_TIMEOUT"  => :report_http_connect_timeout,
-        "REPORT_HTTP_READ_TIMEOUT"     => :report_http_read_timeout,
-        "REPORT_HTTP_DISABLED"         => :report_http_disabled,
-
-        # == Native agent settings ==
-        #
-        "LAZY_START"                   => :'daemon.lazy_start',
-        "DAEMON_EXEC_PATH"             => :'daemon.exec_path',
-        "DAEMON_LIB_PATH"              => :'daemon.lib_path',
-        "PIDFILE_PATH"                 => :'daemon.pidfile_path',
-        "SOCKDIR_PATH"                 => :'daemon.sockdir_path',
-        "BATCH_QUEUE_DEPTH"            => :'daemon.batch_queue_depth',
-        "BATCH_SAMPLE_SIZE"            => :'daemon.batch_sample_size',
-        "BATCH_FLUSH_INTERVAL"         => :'daemon.batch_flush_interval',
-        "DAEMON_TICK_INTERVAL"         => :'daemon.tick_interval',
-        "DAEMON_SANITY_CHECK_INTERVAL" => :'daemon.sanity_check_interval',
-        "DAEMON_INACTIVITY_TIMEOUT"    => :'daemon.inactivity_timeout',
-        "CLIENT_MAX_TRIES"             => :'daemon.max_connect_tries',
-        "CLIENT_CONN_TRY_WIN"          => :'daemon.connect_try_window',
-        "MAX_PRESPAWN_JITTER"          => :'daemon.max_prespawn_jitter',
-        "DAEMON_WAIT_TIMEOUT"          => :'daemon.wait_timeout',
-        "CLIENT_CHECK_INTERVAL"        => :'daemon.client_check_interval',
-        "CLIENT_QUEUE_DEPTH"           => :'daemon.client_queue_depth',
-        "CLIENT_WRITE_TIMEOUT"         => :'daemon.client_write_timeout',
-        "SSL_CERT_PATH"                => :'daemon.ssl_cert_path',
-        "SSL_CERT_DIR"                 => :'daemon.ssl_cert_dir',
-
-        # == Legacy env vars ==
-        #
-        "AGENT_LOCKFILE"      => :'agent.lockfile',
-        "AGENT_SOCKFILE_PATH" => :'agent.sockfile_path'
-      )
-    end
+  class Config
+    include Util::Logging
+
+    # @api private
+    MUTEX = Mutex.new
+
+    # Map environment variable keys with Skylight configuration keys
+    ENV_TO_KEY = {
+      # == Authentication ==
+      -"AUTHENTICATION"               => :authentication,
+
+      # == App settings ==
+      -"ROOT"                         => :root,
+      -"HOSTNAME"                     => :hostname,
+      -"SESSION_TOKEN"                => :session_token,
+
+      # == Component settings ==
+      -"ENV"                          => :env,
+      -"COMPONENT"                    => :component,
+      -"REPORT_RAILS_ENV"             => :report_rails_env,
+
+      # == Deploy settings ==
+      -"DEPLOY_ID"                    => :'deploy.id',
+      -"DEPLOY_GIT_SHA"               => :'deploy.git_sha',
+      -"DEPLOY_DESCRIPTION"           => :'deploy.description',
+
+      # == Logging ==
+      -"LOG_FILE"                     => :log_file,
+      -"LOG_LEVEL"                    => :log_level,
+      -"ALERT_LOG_FILE"               => :alert_log_file,
+      -"NATIVE_LOG_FILE"              => :native_log_file,
+      -"LOG_SQL_PARSE_ERRORS"         => :log_sql_parse_errors,
+
+      # == Proxy ==
+      -"PROXY_URL"                    => :proxy_url,
+
+      # == Instrumenter ==
+      -"ENABLE_SEGMENTS"              => :enable_segments,
+      -"ENABLE_SIDEKIQ"               => :enable_sidekiq,
+      -"IGNORED_ENDPOINT"             => :ignored_endpoint,
+      -"IGNORED_ENDPOINTS"            => :ignored_endpoints,
+      -"SINATRA_ROUTE_PREFIXES"       => :sinatra_route_prefixes,
+      -"ENABLE_SOURCE_LOCATIONS"      => :enable_source_locations,
+
+      # == Max Span Handling ==
+      -"REPORT_MAX_SPANS_EXCEEDED"    => :report_max_spans_exceeded,
+      -"PRUNE_LARGE_TRACES"           => :prune_large_traces,
+
+      # == Skylight Remote ==
+      -"AUTH_URL"                     => :auth_url,
+      -"APP_CREATE_URL"               => :app_create_url,
+      -"MERGES_URL"                   => :merges_url,
+      -"VALIDATION_URL"               => :validation_url,
+      -"AUTH_HTTP_DEFLATE"            => :auth_http_deflate,
+      -"AUTH_HTTP_CONNECT_TIMEOUT"    => :auth_http_connect_timeout,
+      -"AUTH_HTTP_READ_TIMEOUT"       => :auth_http_read_timeout,
+      -"REPORT_URL"                   => :report_url,
+      -"REPORT_HTTP_DEFLATE"          => :report_http_deflate,
+      -"REPORT_HTTP_CONNECT_TIMEOUT"  => :report_http_connect_timeout,
+      -"REPORT_HTTP_READ_TIMEOUT"     => :report_http_read_timeout,
+      -"REPORT_HTTP_DISABLED"         => :report_http_disabled,
+
+      # == Native agent settings ==
+      #
+      -"LAZY_START"                   => :'daemon.lazy_start',
+      -"DAEMON_EXEC_PATH"             => :'daemon.exec_path',
+      -"DAEMON_LIB_PATH"              => :'daemon.lib_path',
+      -"PIDFILE_PATH"                 => :'daemon.pidfile_path',
+      -"SOCKDIR_PATH"                 => :'daemon.sockdir_path',
+      -"BATCH_QUEUE_DEPTH"            => :'daemon.batch_queue_depth',
+      -"BATCH_SAMPLE_SIZE"            => :'daemon.batch_sample_size',
+      -"BATCH_FLUSH_INTERVAL"         => :'daemon.batch_flush_interval',
+      -"DAEMON_TICK_INTERVAL"         => :'daemon.tick_interval',
+      -"DAEMON_LOCK_CHECK_INTERVAL"   => :'daemon.lock_check_interval',
+      -"DAEMON_INACTIVITY_TIMEOUT"    => :'daemon.inactivity_timeout',
+      -"CLIENT_MAX_TRIES"             => :'daemon.max_connect_tries',
+      -"CLIENT_CONN_TRY_WIN"          => :'daemon.connect_try_window',
+      -"MAX_PRESPAWN_JITTER"          => :'daemon.max_prespawn_jitter',
+      -"DAEMON_WAIT_TIMEOUT"          => :'daemon.wait_timeout',
+      -"CLIENT_CHECK_INTERVAL"        => :'daemon.client_check_interval',
+      -"CLIENT_QUEUE_DEPTH"           => :'daemon.client_queue_depth',
+      -"CLIENT_WRITE_TIMEOUT"         => :'daemon.client_write_timeout',
+      -"SSL_CERT_PATH"                => :'daemon.ssl_cert_path',
+      -"SSL_CERT_DIR"                 => :'daemon.ssl_cert_dir',
+
+      # == Legacy env vars ==
+      #
+      -"AGENT_LOCKFILE"               => :'agent.lockfile',
+      -"AGENT_SOCKFILE_PATH"          => :'agent.sockfile_path',
+
+      # == User config settings ==
+      -"USER_CONFIG_PATH"             => :user_config_path,
+
+      # == Heroku settings ==
+      -"HEROKU_DYNO_INFO_PATH"        => :'heroku.dyno_info_path',
+
+      # == Source Location ==
+      -"SOURCE_LOCATION_IGNORED_GEMS" => :source_location_ignored_gems
+    }.freeze
+
+    KEY_TO_NATIVE_ENV = {
+      # We use different log files for native and Ruby, but the native code doesn't know this
+      native_log_file:  "LOG_FILE",
+      native_log_level: "LOG_LEVEL"
+    }.freeze
+
+    SERVER_VALIDATE = %i[
+      enable_source_locations
+    ].freeze
+
+    DEFAULT_IGNORED_SOURCE_LOCATION_GEMS = [
+      -"skylight",
+      -"activesupport",
+      -"activerecord"
+    ].freeze
 
     # Default values for Skylight configuration keys
     def self.default_values
-      @default_values ||= begin
-        ret = super.merge(
-          auth_url:                   "https://auth.skylight.io/agent",
-          app_create_url:             "https://www.skylight.io/apps",
-          merges_url:                 "https://www.skylight.io/merges",
-          validation_url:             "https://auth.skylight.io/agent/config",
-          'daemon.lazy_start':        true,
-          hostname:                   Util::Hostname.default_hostname,
-          report_max_spans_exceeded:  false,
-          prune_large_traces:         true,
-          report_rails_env:           true
-        )
+      @default_values ||=
+        begin
+          ret = {
+            # URLs
+            auth_url:                  -"https://auth.skylight.io/agent",
+            app_create_url:            -"https://www.skylight.io/apps",
+            merges_url:                -"https://www.skylight.io/merges",
+            validation_url:            -"https://auth.skylight.io/agent/config",
+
+            # Logging
+            log_file:                  -"-",
+            log_level:                 -"INFO",
+            alert_log_file:            -"-",
+            log_sql_parse_errors:      true,
+
+            # Features
+            enable_segments:           true,
+            enable_sidekiq:            false,
+            sinatra_route_prefixes:    false,
+            enable_source_locations:   false,
+
+            # Deploys
+            'heroku.dyno_info_path':   -"/etc/heroku/dyno",
+            report_rails_env:          true,
+
+            # Daemon
+            'daemon.lazy_start':       true,
+            hostname:                  Util::Hostname.default_hostname,
+            report_max_spans_exceeded: false,
+            prune_large_traces:        true
+          }
+
+          unless Util::Platform::OS == -"darwin"
+            ret[:'daemon.ssl_cert_path'] = Util::SSL.ca_cert_file_or_default
+            ret[:'daemon.ssl_cert_dir'] = Util::SSL.ca_cert_dir
+          end
 
-        unless Util::Platform::OS == "darwin"
-          ret[:'daemon.ssl_cert_path'] = Util::SSL.ca_cert_file_or_default
-          ret[:'daemon.ssl_cert_dir'] = Util::SSL.ca_cert_dir
-        end
+          if Skylight.native?
+            native_path = Skylight.libskylight_path
 
-        if Skylight.native?
-          native_path = Skylight.libskylight_path
+            ret[:'daemon.lib_path'] = native_path
+            ret[:'daemon.exec_path'] = File.join(native_path, "skylightd")
+          end
 
-          ret[:'daemon.lib_path'] = native_path
-          ret[:'daemon.exec_path'] = File.join(native_path, "skylightd")
+          ret
         end
-
-        ret
-      end
     end
 
-    def self.required_keys
-      @required_keys ||= super.merge(
-        authentication: "authentication token",
-        hostname:       "server hostname",
-        auth_url:       "authentication url",
-        validation_url: "config validation url"
-      )
-    end
+    REQUIRED_KEYS = {
+      authentication: "authentication token",
+      hostname:       "server hostname",
+      auth_url:       "authentication url",
+      validation_url: "config validation url"
+    }.freeze
 
     def self.native_env_keys
-      @native_env_keys ||= super + %i[
+      @native_env_keys ||= %i[
+        native_log_level
+        native_log_file
+        log_sql_parse_errors
         version
         root
+        proxy_url
         hostname
         session_token
         auth_url
@@ -143,7 +214,7 @@ module Skylight
         daemon.batch_sample_size
         daemon.batch_flush_interval
         daemon.tick_interval
-        daemon.sanity_check_interval
+        daemon.lock_check_interval
         daemon.inactivity_timeout
         daemon.max_connect_tries
         daemon.connect_try_window
@@ -157,27 +228,136 @@ module Skylight
       ]
     end
 
+    # Maps legacy config keys to new config keys
     def self.legacy_keys
-      @legacy_keys ||= super.merge(
+      @legacy_keys ||= {
         'agent.sockfile_path': :'daemon.sockdir_path',
         'agent.lockfile':      :'daemon.pidfile_path'
-      )
+      }
     end
 
     def self.validators
-      @validators ||= super.merge(
+      @validators ||= {
         'agent.interval': [->(v, _c) { v.is_a?(Integer) && v > 0 }, "must be an integer greater than 0"]
-      )
+      }
     end
 
     # @api private
-    def api
-      @api ||= Api.new(self)
+    attr_reader :environment
+
+    # @api private
+    def initialize(*args)
+      attrs = {}
+
+      if args.last.is_a?(Hash)
+        attrs = args.pop.dup
+      end
+
+      @values   = {}
+      @priority = {}
+      @regexp   = nil
+      @alert_logger = nil
+      @logger = nil
+
+      p = attrs.delete(:priority)
+
+      if (@environment = args[0])
+        @regexp = /^#{Regexp.escape(@environment)}\.(.+)$/
+      end
+
+      attrs.each do |k, v|
+        self[k] = v
+      end
+
+      p&.each do |k, v|
+        @priority[self.class.remap_key(k)] = v
+      end
+    end
+
+    def self.load(opts = {}, env = ENV)
+      attrs = {}
+      path = opts.delete(:file)
+      environment = opts.delete(:environment)
+
+      if path
+        error = nil
+        begin
+          attrs = YAML.safe_load(ERB.new(File.read(path)).result,
+                                 [], # permitted_classes
+                                 [], # permitted_symbols
+                                 true) # aliases enabled
+          error = "empty file" unless attrs
+          error = "invalid format" if attrs && !attrs.is_a?(Hash)
+        rescue Exception => e
+          error = e.message
+        end
+
+        raise ConfigError, "could not load config file; msg=#{error}" if error
+      end
+
+      if env
+        attrs[:priority] = remap_env(env)
+      end
+
+      config = new(environment, attrs)
+
+      opts.each do |k, v|
+        config[k] = v
+      end
+
+      config
+    end
+
+    def self.remap_key(key)
+      key = key.to_sym
+      legacy_keys[key] || key
+    end
+
+    # @api private
+    def self.remap_env(env)
+      ret = {}
+
+      return ret unless env
+
+      # Only set if it exists, we don't want to set to a nil value
+      if (proxy_url = Util::Proxy.detect_url(env))
+        ret[:proxy_url] = proxy_url
+      end
+
+      env.each do |k, val|
+        next unless k =~ /^(?:SK|SKYLIGHT)_(.+)$/
+        next unless (key = ENV_TO_KEY[$1])
+
+        ret[key] =
+          case val
+          when /^false$/i      then false
+          when /^true$/i       then true
+          when /^(nil|null)$/i then nil
+          when /^\d+$/         then val.to_i
+          when /^\d+\.\d+$/    then val.to_f
+          else val
+          end
+      end
+
+      ret
     end
 
     # @api private
     def validate!
-      super
+      REQUIRED_KEYS.each do |k, v|
+        unless get(k)
+          raise ConfigError, "#{v} required"
+        end
+      end
+
+      log_file = self[:log_file]
+      alert_log_file = self[:alert_log_file]
+      native_log_file = self.native_log_file
+
+      check_logfile_permissions(log_file, "log_file")
+      check_logfile_permissions(alert_log_file, "alert_log_file")
+      # TODO: Support rotation interpolation in this check
+      check_logfile_permissions(native_log_file, "native_log_file")
 
       # TODO: Move this out of the validate! method: https://github.com/tildeio/direwolf-agent/issues/273
       # FIXME: Why not set the sockdir_path and pidfile_path explicitly?
@@ -191,6 +371,302 @@ module Skylight
       true
     end
 
+    def check_file_permissions(file, key)
+      file_root = File.dirname(file)
+
+      # Try to make the directory, don't blow up if we can't. Our writable? check will fail later.
+      FileUtils.mkdir_p file_root rescue nil
+
+      if File.exist?(file) && !FileTest.writable?(file)
+        raise ConfigError, "File `#{file}` is not writable. Please set #{key} in your config to a writable path"
+      end
+
+      unless FileTest.writable?(file_root)
+        raise ConfigError, "Directory `#{file_root}` is not writable. Please set #{key} in your config to a " \
+                           "writable path"
+      end
+    end
+
+    def check_logfile_permissions(log_file, key)
+      return if log_file == "-" # STDOUT
+
+      log_file = File.expand_path(log_file, root)
+      check_file_permissions(log_file, key)
+    end
+
+    def key?(key)
+      key = self.class.remap_key(key)
+      @priority.key?(key) || @values.key?(key)
+    end
+
+    def get(key, default = nil)
+      key = self.class.remap_key(key)
+
+      return @priority[key] if @priority.key?(key)
+      return @values[key]   if @values.key?(key)
+      return self.class.default_values[key] if self.class.default_values.key?(key)
+
+      if default
+        return default
+      elsif block_given?
+        return yield key
+      end
+
+      nil
+    end
+
+    alias [] get
+
+    def set(key, val, scope = nil)
+      if scope
+        key = [scope, key].join(".")
+      end
+
+      if val.is_a?(Hash)
+        val.each do |k, v|
+          set(k, v, key)
+        end
+      else
+        k = self.class.remap_key(key)
+
+        if (validator = self.class.validators[k])
+          blk, msg = validator
+
+          unless blk.call(val, self)
+            error_msg = "invalid value for #{k} (#{val})"
+            error_msg << ", #{msg}" if msg
+            raise ConfigError, error_msg
+          end
+        end
+
+        if @regexp && k =~ @regexp
+          @priority[$1.to_sym] = val
+        end
+
+        @values[k] = val
+      end
+    end
+
+    alias []= set
+
+    def send_or_get(val)
+      respond_to?(val) ? send(val) : get(val)
+    end
+
+    def duration_ms(key, default = nil)
+      if (v = self[key]) && v.to_s =~ /^\s*(\d+)(s|sec|ms|micros|nanos)?\s*$/
+        v = $1.to_i
+        case $2
+        when "ms"
+          v
+        when "micros"
+          v / 1_000
+        when "nanos"
+          v / 1_000_000
+        else # "s", "sec", nil
+          v * 1000
+        end
+      else
+        default
+      end
+    end
+
+    def to_native_env
+      ret = []
+
+      self.class.native_env_keys.each do |key|
+        value = send_or_get(key)
+        unless value.nil?
+          env_key = KEY_TO_NATIVE_ENV[key] || ENV_TO_KEY.key(key) || key.upcase
+          ret << "SKYLIGHT_#{env_key}" << cast_for_env(value)
+        end
+      end
+
+      ret << "SKYLIGHT_AUTHENTICATION" << authentication_with_meta
+      ret << "SKYLIGHT_VALIDATE_AUTHENTICATION" << "false"
+
+      ret
+    end
+
+    #
+    #
+    # ===== Helpers =====
+    #
+    #
+
+    def version
+      VERSION
+    end
+
+    # @api private
+    def gc
+      @gc ||= GC.new(self, get("gc.profiler", VM::GC.new))
+    end
+
+    # @api private
+    def ignored_endpoints
+      @ignored_endpoints ||=
+        begin
+          ignored_endpoints = get(:ignored_endpoints)
+
+          # If, for some odd reason you have a comma in your endpoint name, use the
+          # YML config instead.
+          if ignored_endpoints.is_a?(String)
+            ignored_endpoints = ignored_endpoints.split(/\s*,\s*/)
+          end
+
+          val = Array(get(:ignored_endpoint))
+          val.concat(Array(ignored_endpoints))
+          val
+        end
+    end
+
+    # @api private
+    def source_location_ignored_gems
+      @source_location_ignored_gems ||=
+        begin
+          ignored_gems = get(:source_location_ignored_gems)
+          if ignored_gems.is_a?(String)
+            ignored_gems = ignored_gems.split(/\s*,\s*/)
+          end
+
+          Array(ignored_gems) | DEFAULT_IGNORED_SOURCE_LOCATION_GEMS
+        end
+    end
+
+    def root
+      @root ||= Pathname.new(self[:root] || Dir.pwd).realpath
+    end
+
+    def log_level
+      @log_level ||=
+        if trace?
+          Logger::DEBUG
+        else
+          case get(:log_level)
+          when /^debug$/i then Logger::DEBUG
+          when /^info$/i  then Logger::INFO
+          when /^warn$/i  then Logger::WARN
+          when /^error$/i then Logger::ERROR
+          when /^fatal$/i then Logger::FATAL
+          else Logger::ERROR
+          end
+        end
+    end
+
+    def native_log_level
+      @native_log_level ||=
+        if trace?
+          "trace"
+        else
+          case log_level
+          when Logger::DEBUG then "debug"
+          when Logger::INFO  then "info"
+          when Logger::WARN  then "warn"
+          else "error"
+          end
+        end
+    end
+
+    def logger
+      @logger ||=
+        MUTEX.synchronize do
+          load_logger
+        end
+    end
+
+    def native_log_file
+      @native_log_file ||= get("native_log_file") do
+        log_file = self["log_file"]
+        return "-" if log_file == "-"
+
+        parts = log_file.to_s.split(".")
+        parts.insert(-2, "native")
+        parts.join(".")
+      end
+    end
+
+    attr_writer :logger
+
+    def alert_logger
+      @alert_logger ||= MUTEX.synchronize do
+        unless (l = @alert_logger)
+          out = get(:alert_log_file)
+          out = Util::AlertLogger.new(load_logger) if out == "-"
+
+          l = create_logger(out, level: Logger::DEBUG)
+        end
+
+        l
+      end
+    end
+
+    attr_writer :alert_logger
+
+    def enable_segments?
+      !!get(:enable_segments)
+    end
+
+    def enable_sidekiq?
+      !!get(:enable_sidekiq)
+    end
+
+    def sinatra_route_prefixes?
+      !!get(:sinatra_route_prefixes)
+    end
+
+    def enable_source_locations?
+      !!get(:enable_source_locations)
+    end
+
+    def user_config
+      @user_config ||= UserConfig.new(self)
+    end
+
+    def on_heroku?
+      File.exist?(get(:'heroku.dyno_info_path'))
+    end
+
+    private
+
+      def create_logger(out, level: :info)
+        if out.is_a?(String)
+          out = File.expand_path(out, root)
+          # May be redundant since we also do this in the permissions check
+          FileUtils.mkdir_p(File.dirname(out))
+        end
+
+        Logger.new(out, progname: "Skylight", level: level)
+      rescue
+        Logger.new(STDOUT, progname: "Skylight", level: level)
+      end
+
+      def load_logger
+        unless (l = @logger)
+          out = get(:log_file)
+          out = STDOUT if out == "-"
+          l = create_logger(out, level: log_level)
+        end
+
+        l
+      end
+
+      def cast_for_env(val)
+        case val
+        when true  then "true"
+        when false then "false"
+        when nil   then "nil"
+        else val.to_s
+        end
+      end
+
+    public
+
+    # @api private
+    def api
+      @api ||= Api.new(self)
+    end
+
     def validate_with_server
       res = api.validate_config
 
@@ -212,6 +688,10 @@ module Skylight
         return false if res.forbidden?
 
         corrected_config = res.corrected_config
+
+        # Use defaults if no corrected config is available. This will happen if the request failed.
+        corrected_config ||= Hash[SERVER_VALIDATE.map { |k| [k, self.class.default_values.fetch(k)] }]
+
         config_to_update = corrected_config.reject { |k, v| get(k) == v }
         unless config_to_update.empty?
           info("Updating config values:")
@@ -235,23 +715,16 @@ module Skylight
       FileUtils.mkdir_p sockdir_path rescue nil
 
       unless FileTest.writable?(sockdir_path)
-        raise Core::ConfigError, "Directory `#{sockdir_path}` is not writable. Please set daemon.sockdir_path in your config to a writable path"
+        raise ConfigError, "Directory `#{sockdir_path}` is not writable. Please set daemon.sockdir_path in " \
+                           "your config to a writable path"
       end
 
       if check_nfs(sockdir_path)
-        raise Core::ConfigError, "Directory `#{sockdir_path}` is an NFS mount and will not allow sockets. Please set daemon.sockdir_path in your config to a non-NFS path."
+        raise ConfigError, "Directory `#{sockdir_path}` is an NFS mount and will not allow sockets. Please set " \
+                           "daemon.sockdir_path in your config to a non-NFS path."
       end
     end
 
-    def to_native_env
-      ret = super
-
-      ret << "SKYLIGHT_AUTHENTICATION" << authentication_with_meta
-      ret << "SKYLIGHT_VALIDATE_AUTHENTICATION" << "false"
-
-      ret
-    end
-
     def write(path)
       FileUtils.mkdir_p(File.dirname(path))
 
@@ -292,7 +765,7 @@ module Skylight
 
     def components
       @components ||= {
-        web: Util::Component.new(
+        web:    Util::Component.new(
           get(:env),
           Util::Component::DEFAULT_NAME
         ),
@@ -303,18 +776,22 @@ module Skylight
         )
       }
     rescue ArgumentError => e
-      raise Core::ConfigError, e.message
+      raise ConfigError, e.message
     end
 
     def component
       components[:web]
     end
 
+    def to_json(*)
+      JSON.generate(as_json)
+    end
+
     def as_json(*)
       {
         config: {
           priority: @priority.merge(component.as_json),
-          values: @values
+          values:   @values
         }
       }
     end