skylight 1.7.2 → 2.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38b118d85b7e46213e2514bbaa79fea48031adab3189a911220efc8a73d8d193
-  data.tar.gz: 1c9654be2fe1269c907a39d18621116f62f66f268dd0c137bc6e01ef6aec77e7
+  metadata.gz: 257ac0e93ef049212cce0ee890a96265fbc0e6b4cf1b3a0e7e8ddb944ae30fb3
+  data.tar.gz: 5a31861bfd7feba873b7c40605acf861ab2b1861b586c0d027d3b3e6d2557b3b
 SHA512:
-  metadata.gz: db3dd167fdfe558b82794cfd832f7f35732ad9c63bcf63d6d68645fdce714f4793cb5cfb055668843fd5993806a92bf7233a8093e1b5d4c84580048c253a5cbb
-  data.tar.gz: 6445f6c23aa6d6fc3ca14dbfb46606756234294806dcd6b92042a7edfc6e2cff586a778c7053ff22a26698c45bb7723903cb7c8954b6aea2e6bdd50b99a5c164
+  metadata.gz: ba086a499bb89abbfd796b58093ddac311f610e04f1c29d8e398343daa63c3c879a96cccbb43acb25b411e1bf931f8b3390eb4d2fb83b067f103e2d2e0224b18
+  data.tar.gz: 27190de3814b1d7c83775e5cc2e015a85e0fbf211d78ee225bd3bfcbdd9d6b8ba10883926dd3ba4691aab601cc2109c89ee71aaff141eab9e60cc28077ae62f1

data/CHANGELOG.md

@@ -1,41 +1,12 @@
-## 1.7.2 (December 14 2018)
-* [BUGFIX] (Backported from 3.1.x series) Fix issue where routes in mounted engines could cause spans to be closed out-of-order.
+## 2.0.0-beta1
 
-## 1.7.1 (October 16 2018)
-* [BUGFIX] (Backported from 2.x series) Fix issue wherein certain error-handling patterns could break the middleware probe.
-
-## 1.7.0 (April 24, 2018)
-
-* [FEATURE] New API for loading Probes. Example: `Skylight.probe(:excon')`
-* [FEATURE] New API for enabling non-default Normalizers. Example: `Skylight.enable_normalizer('active_job')`
-* [DEPRECATION] Support for Rails versions prior to 4.2
-* [DEPRECATION] Support for Tilt versions prior to 1.4.1
-* [DEPRECATION] Support for Sinatra versions prior to 1.4
-* [DEPRECATION] Support for Grape versions prior to 0.13.0
-
-## 1.6.1 (April 12, 2018)
-
-* [IMPROVEMENT] Include endpoint name in error logging
-* [BUGFIX] Make sure to correctly release broken traces
-* [BUGFIX] Keep the `require` method private when overwriting
-
-## 1.6.0 (March 21, 2018)
-
-* [FEATURE] Time spent the Rails router is now identified separately in the trace
-* [IMPROVEMENT] Switch logger to debug mode if tracing is enabled
-* [IMPROVEMENT] Improved logging for a number of error cases
-* [IMPROVEMENT] Middleware probe should now accept anything allowed by Rack::Lint
-* [IMPROVEMENT] We were using arity checks to determine Rails version but due to other libraries' monkey patches this could sometimes fail. We just check version numbers now.
-* [BUGFIX] Middleware probe no longer errors when Middleware returns a frozen array
-
-## 1.5.1 (February 7, 2018)
-
-* [BUGFIX] `skylight doctor` no longer erroneously reports inability to reach Skylight servers.
+* [FEATURE] New SQL lexer to support a wider variety of SQL queries.
+* [BREAKING] Drop support for a number of deprecated libraries, including Rails prior to 4.2, Ruby prior to 2.2, and Sinatra prior to 1.4.
 
 ## 1.5.0 (December 6, 2017)
 
 * [FEATURE] [Coach](https://github.com/gocardless/coach) instrumentation. Enabled automatically via ActiveSupport::Notifications.
-* [FEATURE] Option to enable or disable agent by setting SKYLIGHT_ENABLED via ENV.
+* [FEATURE] Option to enable or disable agent by setting SKYLIGHT_ENABLE via ENV.
 * [IMPROVEMENT] Better logging for certain error cases.
 * [BUGFIX] Backport a SPEC compliance fix for older Rack::ETag to resolve case where the Middleware probe could cause empty traces.
 * [BUGFIX] Fix a case where using the non-block form of `Skylight.instrument` with `Skylight.done` could cause lost trace data.

data/ext/extconf.rb

@@ -5,12 +5,38 @@ require 'logger'
 require 'fileutils'
 
 $:.unshift File.expand_path("../../lib", __FILE__)
+
 require 'skylight/version'
-require 'skylight/util/multi_io'
-require 'skylight/util/native_ext_fetcher'
-require 'skylight/util/platform'
 
-include Skylight::Util
+# Don't use the gem for dev
+if File.exists?(File.expand_path("../../Gemfile", __FILE__))
+  # This approach won't work in production since skylight-core isn't in the skylight gem
+  $:.unshift File.expand_path("../../skylight-core/lib", __FILE__)
+else
+  # Is there a better way to get this into lib?
+  gem 'skylight-core', Skylight::Core::VERSION.tr('-', '.')
+end
+
+require 'skylight/native_ext_fetcher'
+require 'skylight/core/util/platform'
+
+# Util allowing proxying writes to multiple location
+class MultiIO
+
+  def initialize(*targets)
+      @targets = targets
+  end
+
+  def write(*args)
+    @targets.each {|t| t.write(*args)}
+  end
+
+  def close
+    @targets.each(&:close)
+  end
+end
+
+include Skylight::Core::Util
 
 SKYLIGHT_INSTALL_LOG = File.expand_path("../install.log", __FILE__)
 SKYLIGHT_REQUIRED   = ENV.key?("SKYLIGHT_REQUIRED") && ENV['SKYLIGHT_REQUIRED'] !~ /^false$/i
@@ -126,7 +152,7 @@ if !File.exist?(libskylight) && !File.exist?(skylight_dlopen_c) && !File.exist?(
   end
 
   begin
-    res = NativeExtFetcher.fetch(
+    res = Skylight::NativeExtFetcher.fetch(
       source:   SKYLIGHT_SOURCE_URL,
       version:  version,
       target:   hdrpath,
@@ -220,7 +246,7 @@ $CFLAGS << " -std=c99 -Wall -fno-strict-aliasing"
 
 # Allow stricter checks to be turned on for development or debugging
 if SKYLIGHT_EXT_STRICT
-  $CFLAGS << " -Wextra"
+  $CFLAGS << " -pedantic"
 end
 
 # TODO: Compute the relative path to the location

data/ext/libskylight.yml

@@ -1,11 +1,8 @@
 ---
-version: "1.4.0-7aecded"
+version: "2.0.0-7fe2c49"
 checksums:
-  x86-linux:         "79162dfc4dee8954869d2820e60e8d15d4f4915f66e29bedd15e68030acd5b27"
-  x86_64-linux:      "117ac0ff29240a518717fcf52f7cd3eeec69a135c481693b8eb259bb4c2b528c"
-  x86_64-linux-musl: "bab4030060eb4b83d0543839e0f51b09545d7d5b20c3f7dd35ae6f81f3189499"
-  x86_64-darwin:     "1c0fdb68c0dde34a1b0842403db2ea2ca6a0de2fb7d729e869f395f6d10383b5"
-# Temporarily divergent Rust build for FreeBSD
-x86_64-freebsd:
-  version: "1.4.1-33c50db"
-  checksum: "c71d958fdba4c6ea1f62aea03474e2b479e787d5e21a436dabf00218ea25d2b0"
+  x86-linux:         "57e0b65fd5bd03be9ad406711279d6164982107a4af144a85d4a352f035244ff"
+  x86_64-linux:      "5a2648e000f7b184dfaadd01f37399e808c80826613279571b61e4d7b122118a"
+  x86_64-linux-musl: "39fc56d55782af71c8c37f93d1082e05c9a4c0decb68487ea6695d95971985f6"
+  x86_64-darwin:     "05a68826b7cef60c19d22302ec4f5eaa5134fd3be6d19513f6de76337fccb734"
+  x86_64-freebsd:    "97f4a65c0ba19cfa236fec73f2fdd74e0df9ae0e12ecec7709c996a3c4eb10f2"

data/ext/skylight_native.c

@@ -73,6 +73,7 @@ STR2BUF(VALUE str) {
  * Ruby GVL helpers
  */
 
+// FIXME: This conditional doesn't logically cover every case
 #if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL) && \
     defined(HAVE_RUBY_THREAD_H)
 
@@ -98,10 +99,9 @@ typedef VALUE (*blocking_fn_t)(void*);
  */
 
 VALUE rb_mSkylight;
+VALUE rb_mCore;
 VALUE rb_mUtil;
 VALUE rb_cClock;
-VALUE rb_cTrace;
-VALUE rb_cInstrumenter;
 
 static const char* no_instrumenter_msg =
   "Instrumenter not currently running";
@@ -133,7 +133,7 @@ load_libskylight(VALUE klass, VALUE path) {
 
 /*
  *
- * class Skylight::Util::Clock
+ * class Skylight::Core::Util::Clock
  *
  */
 
@@ -145,7 +145,7 @@ clock_high_res_time(VALUE self) {
 
 /*
  *
- * class Skylight::Instrumenter
+ * class Skylight::Core::Instrumenter
  *
  */
 
@@ -155,7 +155,6 @@ instrumenter_new(VALUE klass, VALUE rb_env) {
   sky_buf_t env[256];
   int i, envc;
 
-  UNUSED(klass);
   CHECK_TYPE(rb_env, T_ARRAY);
 
   if (RARRAY_LEN(rb_env) >= 256) {
@@ -178,7 +177,7 @@ instrumenter_new(VALUE klass, VALUE rb_env) {
       sky_instrumenter_new(env, envc, &instrumenter),
       "failed to initialize instrumenter");
 
-  return Data_Wrap_Struct(rb_cInstrumenter, NULL, sky_instrumenter_free, instrumenter);
+  return Data_Wrap_Struct(klass, NULL, sky_instrumenter_free, instrumenter);
 }
 
 static void*
@@ -262,15 +261,16 @@ instrumenter_track_desc(VALUE self, VALUE rb_endpoint, VALUE rb_desc) {
 
 /*
  *
- * class Skylight::Trace
+ * class Skylight::Core::Trace
  *
  */
 
 static VALUE
-trace_new(VALUE klass, VALUE start, VALUE uuid, VALUE endpoint) {
+trace_new(VALUE klass, VALUE start, VALUE uuid, VALUE endpoint, VALUE meta) {
   sky_trace_t* trace;
 
-  UNUSED(klass);
+  UNUSED(meta);
+
   CHECK_NUMERIC(start);
   CHECK_TYPE(uuid, T_STRING);
   CHECK_TYPE(endpoint, T_STRING);
@@ -281,7 +281,7 @@ trace_new(VALUE klass, VALUE start, VALUE uuid, VALUE endpoint) {
 
   sky_clear_allocation_count();
 
-  return Data_Wrap_Struct(rb_cTrace, NULL, sky_trace_free, trace);
+  return Data_Wrap_Struct(klass, NULL, sky_trace_free, trace);
 }
 
 static VALUE
@@ -326,6 +326,11 @@ trace_set_endpoint(VALUE self, VALUE endpoint) {
   return Qnil;
 }
 
+static VALUE
+trace_set_exception(VALUE self, VALUE exception) {
+  return Qnil;
+}
+
 static VALUE
 trace_get_uuid(VALUE self) {
   sky_trace_t* trace;
@@ -414,7 +419,22 @@ trace_span_set_description(VALUE self, VALUE span, VALUE desc) {
 }
 
 static VALUE
-lex_sql(VALUE klass, VALUE rb_sql) {
+trace_span_set_meta(VALUE self, VALUE span, VALUE meta) {
+  return Qnil;
+}
+
+static VALUE
+trace_span_set_exception(VALUE self, VALUE span, VALUE exception, VALUE exception_details) {
+  return Qnil;
+}
+
+static VALUE
+trace_span_get_correlation_header(VALUE self, VALUE span_id) {
+  return Qnil;
+}
+
+static VALUE
+lex_sql(VALUE klass, VALUE rb_sql, VALUE rb_use_old_lexer) {
   sky_buf_t sql;
   sky_buf_t title;
   sky_buf_t statement;
@@ -438,9 +458,13 @@ lex_sql(VALUE klass, VALUE rb_sql) {
     .len = RSTRING_LEN(rb_sql),
   };
 
-  CHECK_FFI(
-      sky_lex_sql(sql, &title, &statement),
+  if (RTEST(rb_use_old_lexer)) {
+    CHECK_FFI(sky_lex_sql_old(sql, &title, &statement),
+      "native lex_sql_old failed");
+  } else {
+    CHECK_FFI(sky_lex_sql(sql, &title, &statement),
       "native lex_sql failed");
+  }
 
   // Set the statement return
   rb_str_set_len(rb_statement, statement.len);
@@ -463,24 +487,31 @@ lex_sql(VALUE klass, VALUE rb_sql) {
 void Init_skylight_native() {
   rb_mSkylight = rb_define_module("Skylight");
   rb_define_singleton_method(rb_mSkylight, "load_libskylight", load_libskylight, 1);
-  rb_define_singleton_method(rb_mSkylight, "lex_sql", lex_sql, 1);
+  rb_define_singleton_method(rb_mSkylight, "lex_sql", lex_sql, 2);
+
+  rb_mCore = rb_define_module_under(rb_mSkylight, "Core");
 
-  rb_mUtil  = rb_define_module_under(rb_mSkylight, "Util");
+  // FIXME: Don't put these under Core
+  rb_mUtil  = rb_define_module_under(rb_mCore, "Util");
   rb_cClock = rb_define_class_under(rb_mUtil, "Clock", rb_cObject);
   rb_define_method(rb_cClock, "native_hrtime", clock_high_res_time, 0);
 
-  rb_cTrace = rb_define_class_under(rb_mSkylight, "Trace", rb_cObject);
-  rb_define_singleton_method(rb_cTrace, "native_new", trace_new, 3);
+  VALUE rb_cTrace = rb_const_get(rb_mSkylight, rb_intern("Trace"));
+  rb_define_singleton_method(rb_cTrace, "native_new", trace_new, 4);
   rb_define_method(rb_cTrace, "native_get_started_at", trace_get_started_at, 0);
   rb_define_method(rb_cTrace, "native_get_endpoint", trace_get_endpoint, 0);
   rb_define_method(rb_cTrace, "native_set_endpoint", trace_set_endpoint, 1);
+  rb_define_method(rb_cTrace, "native_set_exception", trace_set_exception, 1);
   rb_define_method(rb_cTrace, "native_get_uuid", trace_get_uuid, 0);
   rb_define_method(rb_cTrace, "native_start_span", trace_start_span, 2);
   rb_define_method(rb_cTrace, "native_stop_span", trace_stop_span, 2);
   rb_define_method(rb_cTrace, "native_span_set_title", trace_span_set_title, 2);
   rb_define_method(rb_cTrace, "native_span_set_description", trace_span_set_description, 2);
+  rb_define_method(rb_cTrace, "native_span_set_meta", trace_span_set_meta, 2);
+  rb_define_method(rb_cTrace, "native_span_set_exception", trace_span_set_exception, 3);
+  rb_define_method(rb_cTrace, "native_span_get_correlation_header", trace_span_get_correlation_header, 1);
 
-  rb_cInstrumenter = rb_define_class_under(rb_mSkylight, "Instrumenter", rb_cObject);
+  VALUE rb_cInstrumenter = rb_const_get(rb_mSkylight, rb_intern("Instrumenter"));
   rb_define_singleton_method(rb_cInstrumenter, "native_new", instrumenter_new, 1);
   rb_define_method(rb_cInstrumenter, "native_start", instrumenter_start, 0);
   rb_define_method(rb_cInstrumenter, "native_stop", instrumenter_stop, 0);

data/lib/skylight.rb

@@ -1,2 +1,36 @@
+require 'skylight/version'
 require 'skylight/core'
-require 'skylight/probes'
+require 'skylight/trace'
+require 'skylight/instrumenter'
+require 'skylight/middleware'
+require 'skylight/api'
+require 'skylight/helpers'
+require 'skylight/config'
+require 'skylight/native'
+
+module Skylight
+  # Used from the CLI
+  autoload :CLI, 'skylight/cli'
+
+  # Specifically check for Railtie since we've had at least one case of a
+  #   customer having Rails defined without having all of Rails loaded.
+  if defined?(Rails::Railtie)
+    require 'skylight/railtie'
+  end
+
+  include Core::Instrumentable
+
+  def self.instrumenter_class
+    Instrumenter
+  end
+
+  def self.config_class
+    Config
+  end
+
+  # Install probes
+  def self.probe(*probes)
+    Core::Probes.probe(*probes)
+  end
+
+end

data/lib/skylight/api.rb

@@ -1,9 +1,10 @@
 require 'uri'
+require 'skylight/util/http'
 
 module Skylight
   # @api private
   class Api
-    include Util::Logging
+    include Core::Util::Logging
 
     attr_reader :config
 
@@ -33,7 +34,7 @@ module Skylight
 
     class ConfigValidationResults
 
-      include Util::Logging
+      include Core::Util::Logging
 
       attr_reader :raw_response
 
@@ -116,4 +117,5 @@ module Skylight
     end
 
   end
+
 end

data/lib/skylight/cli.rb

@@ -128,7 +128,7 @@ you should set the `SKYLIGHT_AUTHENTICATION` variable to:
       end
 
       def api
-        config.api
+        @api ||= Api.new(config)
       end
 
       def user_config

data/lib/skylight/cli/doctor.rb

@@ -1,3 +1,5 @@
+require 'skylight/util/http'
+
 module Skylight
   module CLI
     class Doctor < Thor::Group
@@ -9,7 +11,7 @@ module Skylight
         say "Checking SSL"
         http = Util::HTTP.new(config)
         indent do
-          req = http.get("/status")
+          req = http.get("/", "Accept" => "text/html")
           if req.success?
             say "OK", :green
           else
@@ -85,7 +87,7 @@ module Skylight
           begin
             config.validate!
             say "Configuration is valid", :green
-          rescue ConfigError => e
+          rescue Core::ConfigError => e
             encountered_error!
 
             say "Configuration is invalid", :red
@@ -111,7 +113,7 @@ module Skylight
           logger.level = Logger::DEBUG
           # Remove excess formatting
           logger.formatter = proc { |severity, datetime, progname, msg|
-            msg = msg.sub("[SKYLIGHT] [#{Skylight::VERSION}] ", '')
+            msg = msg.sub("[SKYLIGHT] [#{Skylight::Core::VERSION}] ", '')
             say "#{severity} - #{msg}" # Definitely non-standard
           }
           config.logger = logger
@@ -182,7 +184,7 @@ module Skylight
         end
 
         def is_mac?
-          Util::Platform::OS == 'darwin'
+          Core::Util::Platform::OS == 'darwin'
         end
 
         # NOTE: This check won't work correctly on Windows

data/lib/skylight/config.rb

@@ -1,314 +1,181 @@
-require 'yaml'
-require 'fileutils'
-require 'thread'
 require 'openssl'
-require 'erb'
-require 'json'
-require 'skylight/util/deploy'
+require 'skylight/core/util/deploy'
+require 'skylight/core/util/platform'
 require 'skylight/util/hostname'
-require 'skylight/util/logging'
-require 'skylight/util/platform'
 require 'skylight/util/ssl'
-require 'skylight/util/proxy'
 
 module Skylight
-  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,
-
-      # == 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,
-      'LOG_SQL_PARSE_ERRORS' => :log_sql_parse_errors,
-
-      # == Proxy ==
-      'PROXY_URL' => :proxy_url,
-
-      # == Instrumenter ==
-      "IGNORED_ENDPOINT" => :ignored_endpoint,
-      "IGNORED_ENDPOINTS" => :ignored_endpoints,
-      "ENABLE_SEGMENTS" => :enable_segments,
-
-      # == Skylight Remote ==
-      "AUTH_URL"                     => :auth_url,
-      "APP_CREATE_URL"               => :app_create_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,
-
-      # == User config settings ==
-      "USER_CONFIG_PATH"             => :'user_config_path',
-
-      # == 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',
-
-      # == Heroku settings ==
-      #
-      "HEROKU_DYNO_INFO_PATH"        => :'heroku.dyno_info_path',
-
-      # == Legacy env vars ==
-      #
-      'AGENT_LOCKFILE'      => :'agent.lockfile',
-      'AGENT_SOCKFILE_PATH' => :'agent.sockfile_path'
-    }
-
-    # Default values for Skylight configuration keys
-    DEFAULTS = {
-      :auth_url             => 'https://auth.skylight.io/agent',
-      :app_create_url       => 'https://www.skylight.io/apps',
-      :validation_url       => 'https://auth.skylight.io/agent/config',
-      :'daemon.lazy_start'  => true,
-      :log_file             => '-'.freeze,
-      :log_level            => 'INFO'.freeze,
-      :alert_log_file       => '-'.freeze,
-      :log_sql_parse_errors => false,
-      :enable_segments      => true,
-      :hostname             => Util::Hostname.default_hostname,
-      :'heroku.dyno_info_path' => '/etc/heroku/dyno'
-    }
-
-    if Skylight::Util::Platform::OS != 'darwin'
-      DEFAULTS[:'daemon.ssl_cert_path'] = Util::SSL.ca_cert_file_or_default
-      DEFAULTS[:'daemon.ssl_cert_dir'] = Util::SSL.ca_cert_dir
-    end
-
-    if Skylight.native?
-      native_path = Skylight.libskylight_path
-
-      DEFAULTS[:'daemon.lib_path'] = native_path
-      DEFAULTS[:'daemon.exec_path'] = File.join(native_path, 'skylightd')
-    end
-
-    DEFAULTS.freeze
-
-    REQUIRED = {
-      authentication: "authentication token",
-      hostname:       "server hostname",
-      auth_url:       "authentication url",
-      validation_url: "config validation url" }
-
-    SERVER_VALIDATE = [
-      # Nothing is validated for now, but this is a list of symbols
-      # for the key we want to validate.
-    ]
-
-    NATIVE_ENV = [
-      :version,
-      :root,
-      :hostname,
-      :deploy_id,
-      :session_token,
-      :proxy_url,
-      :auth_url,
-      :auth_http_deflate,
-      :auth_http_connect_timeout,
-      :auth_http_read_timeout,
-      :report_url,
-      :report_http_deflate,
-      :report_http_connect_timeout,
-      :report_http_read_timeout,
-      :'daemon.lazy_start',
-      :'daemon.exec_path',
-      :'daemon.lib_path',
-      :'daemon.pidfile_path',
-      :'daemon.sockdir_path',
-      :'daemon.batch_queue_depth',
-      :'daemon.batch_sample_size',
-      :'daemon.batch_flush_interval',
-      :'daemon.tick_interval',
-      :'daemon.sanity_check_interval',
-      :'daemon.inactivity_timeout',
-      :'daemon.max_connect_tries',
-      :'daemon.connect_try_window',
-      :'daemon.max_prespawn_jitter',
-      :'daemon.wait_timeout',
-      :'daemon.client_check_interval',
-      :'daemon.client_queue_depth',
-      :'daemon.client_write_timeout',
-      :'daemon.ssl_cert_path',
-      :'daemon.ssl_cert_dir'
-    ]
-
-    # Maps legacy config keys to new config keys
-    LEGACY = {
-      :'agent.sockfile_path' => :'daemon.sockdir_path',
-      :'agent.lockfile'  => :'daemon.pidfile_path'
-    }
-
-    VALIDATORS = {
-      :'agent.interval' => [lambda { |v, c| Integer === v && v > 0 }, "must be an integer greater than 0"]
-    }
-
-    # @api private
-    attr_reader :environment
-
-    # @api private
-    def initialize(*args)
-      attrs = {}
-
-      if Hash === args.last
-        attrs = args.pop.dup
-      end
-
-      @values   = {}
-      @priority = {}
-      @regexp   = nil
-
-      p = attrs.delete(:priority)
-
-      if @environment = args[0]
-        @regexp = /^#{Regexp.escape(@environment)}\.(.+)$/
-      end
-
-      attrs.each do |k, v|
-        self[k] = v
-      end
-
-      if p
-        p.each do |k, v|
-          @priority[Config.remap_key(k)] = v
-        end
-      end
+  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,
+
+        # == Deploy settings ==
+        'DEPLOY_ID'          => :'deploy.id',
+        'DEPLOY_GIT_SHA'     => :'deploy.git_sha',
+        'DEPLOY_DESCRIPTION' => :'deploy.description',
+
+        # == Sql Lexer ==
+        'USE_OLD_SQL_LEXER' => :use_old_sql_lexer,
+
+        # == Instrumenter ==
+        "IGNORED_ENDPOINT" => :ignored_endpoint,
+        "IGNORED_ENDPOINTS" => :ignored_endpoints,
+
+        # == Skylight Remote ==
+        "AUTH_URL"                     => :auth_url,
+        "APP_CREATE_URL"               => :app_create_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,
+
+        # == 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
 
-    def self.load(opts = {}, env = ENV)
-      attrs   = {}
-      version = nil
-
-      path = opts.delete(:file)
-      environment = opts.delete(:environment)
-
-      if path
-        error = nil
-        begin
-          attrs = YAML.load(ERB.new(File.read(path)).result)
-          error = "empty file" unless attrs
-          error = "invalid format" if attrs && !attrs.is_a?(Hash)
-        rescue Exception => e
-          error = e.message
+    # 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',
+          :validation_url       => 'https://auth.skylight.io/agent/config',
+          :'daemon.lazy_start'  => true,
+          :hostname             => Util::Hostname.default_hostname,
+          :use_old_sql_lexer    => false
+        )
+
+        if Core::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
 
-        raise ConfigError, "could not load config file; msg=#{error}" if error
+        if Skylight.native?
+          native_path = Skylight.libskylight_path
 
-        version = File.mtime(path).to_i
-      end
-
-      if env
-        attrs[:priority] = remap_env(env)
-      end
-
-      config = new(environment, attrs)
+          ret[:'daemon.lib_path'] = native_path
+          ret[:'daemon.exec_path'] = File.join(native_path, 'skylightd')
+        end
 
-      opts.each do |k, v|
-        config[k] = v
+        ret
       end
-
-      config
     end
 
-    def self.remap_key(key)
-      key = key.to_sym
-      LEGACY[key] || key
+    def self.required_keys
+      @required_keys ||= super.merge(
+        authentication: "authentication token",
+        hostname:       "server hostname",
+        auth_url:       "authentication url",
+        validation_url: "config validation url"
+      )
     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|
-        # 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
-            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
-      end
+    def self.native_env_keys
+      @native_env_keys ||= super + [
+        :version,
+        :root,
+        :hostname,
+        :deploy_id,
+        :session_token,
+        :auth_url,
+        :auth_http_deflate,
+        :auth_http_connect_timeout,
+        :auth_http_read_timeout,
+        :report_url,
+        :report_http_deflate,
+        :report_http_connect_timeout,
+        :report_http_read_timeout,
+        :'daemon.lazy_start',
+        :'daemon.exec_path',
+        :'daemon.lib_path',
+        :'daemon.pidfile_path',
+        :'daemon.sockdir_path',
+        :'daemon.batch_queue_depth',
+        :'daemon.batch_sample_size',
+        :'daemon.batch_flush_interval',
+        :'daemon.tick_interval',
+        :'daemon.sanity_check_interval',
+        :'daemon.inactivity_timeout',
+        :'daemon.max_connect_tries',
+        :'daemon.connect_try_window',
+        :'daemon.max_prespawn_jitter',
+        :'daemon.wait_timeout',
+        :'daemon.client_check_interval',
+        :'daemon.client_queue_depth',
+        :'daemon.client_write_timeout',
+        :'daemon.ssl_cert_path',
+        :'daemon.ssl_cert_dir'
+      ]
+    end
+
+    def self.legacy_keys
+      @legacy_keys ||= super.merge(
+        :'agent.sockfile_path' => :'daemon.sockdir_path',
+        :'agent.lockfile'      => :'daemon.pidfile_path'
+      )
+    end
 
-      ret
+    def self.validators
+      @validators ||= super.merge(
+        :'agent.interval' => [lambda { |v, c| Integer === v && v > 0 }, "must be an integer greater than 0"]
+      )
     end
 
+    # @api private
     def api
       @api ||= Api.new(self)
     end
 
     # @api private
     def validate!
-      REQUIRED.each do |k, v|
-        unless get(k)
-          raise ConfigError, "#{v} required"
-        end
-      end
+      super
 
       # 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?
       # That way we don't have to keep this in sync with the Rust repo.
       sockdir_path = File.expand_path(self[:'daemon.sockdir_path'] || '.', root)
       pidfile_path = File.expand_path(self[:'daemon.pidfile_path'] || 'skylight.pid', sockdir_path)
-      log_file = self[:log_file]
-      alert_log_file = self[:alert_log_file]
 
       check_file_permissions(pidfile_path, "daemon.pidfile_path or daemon.sockdir_path")
       check_sockdir_permissions(sockdir_path)
-      check_logfile_permissions(log_file, "log_file")
-      check_logfile_permissions(alert_log_file, "alert_log_file")
 
       true
     end
@@ -336,7 +203,7 @@ module Skylight
         corrected_config = res.corrected_config
         unless 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, DEFAULTS[k]] }]
+          corrected_config = Hash[self.class.server_validated_keys.map{|k| [k, [k]] }]
         end
 
         config_to_update = corrected_config.select{|k,v| get(k) != v }
@@ -357,139 +224,23 @@ module Skylight
       return 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_sockdir_permissions(sockdir_path)
       # Try to make the directory, don't blow up if we can't. Our writable? check will fail later.
       FileUtils.mkdir_p sockdir_path rescue nil
 
       unless FileTest.writable?(sockdir_path)
-        raise ConfigError, "Directory `#{sockdir_path}` is not writable. Please set daemon.sockdir_path in your config to a writable path"
+        raise Core::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 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 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."
       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 = Config.remap_key(key)
-      @priority.key?(key) || @values.key?(key)
-    end
-
-    def get(key, default = nil, &blk)
-      key = Config.remap_key(key)
-
-      return @priority[key] if @priority.key?(key)
-      return @values[key]   if @values.key?(key)
-      return DEFAULTS[key]  if DEFAULTS.key?(key)
-
-      if default
-        return default
-      elsif blk
-        return blk.call(key)
-      end
-
-      nil
-    end
-
-    alias [] get
-
-    def set(key, val, scope = nil)
-      if scope
-        key = [scope, key].join('.')
-      end
-
-      if Hash === val
-        val.each do |k, v|
-          set(k, v, key)
-        end
-      else
-        k = Config.remap_key(key)
-
-        if validator = 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(v)
-      respond_to?(v) ? send(v) : get(v)
-    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_json
-      JSON.generate(
-        config: {
-          priority: @priority,
-          values:   @values
-        }
-      )
-    end
-
     def to_native_env
-      ret = []
+      ret = super
 
       ret << "SKYLIGHT_AUTHENTICATION" << authentication_with_deploy
-
-      NATIVE_ENV.each do |key|
-        value = send_or_get(key)
-        unless value.nil?
-          env_key = ENV_TO_KEY.key(key) || key.upcase
-          ret << "SKYLIGHT_#{env_key}" << cast_for_env(value)
-        end
-      end
-
       ret << "SKYLIGHT_VALIDATE_AUTHENTICATION" << "false"
 
       ret
@@ -513,42 +264,6 @@ authentication: #{self[:authentication]}
     #
     #
 
-    def version
-      VERSION
-    end
-
-    # @api private
-    def gc
-      @gc ||= GC.new(self, get('gc.profiler', VM::GC.new))
-    end
-
-    # @api private
-    def ignore_token?
-      get('test.ignore_token')
-    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
-
-    def root
-      self[:root] || Dir.pwd
-    end
-
     def authentication_with_deploy
       token = get(:authentication)
 
@@ -562,49 +277,8 @@ authentication: #{self[:authentication]}
       token
     end
 
-    def logger
-      @logger ||=
-        MUTEX.synchronize do
-          load_logger
-        end
-    end
-
-    def logger=(logger)
-      @logger = logger
-    end
-
-    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)
-          l.level = Logger::DEBUG
-        end
-
-        l
-      end
-    end
-
-    def alert_logger=(logger)
-      @alert_logger = logger
-    end
-
-    def on_heroku?
-      File.exist?(get(:'heroku.dyno_info_path'))
-    end
-
     def deploy
-      @deploy ||= Util::Deploy.build(self)
-    end
-
-    def enable_segments?
-      !!get(:enable_segments)
-    end
-
-    def user_config
-      @user_config ||= UserConfig.new(self)
+      @deploy ||= Core::Util::Deploy.build(self)
     end
 
   private
@@ -614,48 +288,5 @@ authentication: #{self[:authentication]}
       `stat -f -L -c %T #{path} 2>&1`.strip == 'nfs'
     end
 
-    def create_logger(out)
-      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)
-    rescue
-      Logger.new(STDOUT)
-    end
-
-    def load_logger
-      unless l = @logger
-        out = get(:log_file)
-        out = STDOUT if out == '-'
-
-        l = create_logger(out)
-
-        if ENV[TRACE_ENV_KEY]
-          l.level = Logger::DEBUG
-        else
-          l.level =
-            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
-            end
-        end
-      end
-
-      l
-    end
-
-    def cast_for_env(v)
-      case v
-      when true  then 'true'
-      when false then 'false'
-      when nil   then 'nil'
-      else v.to_s
-      end
-    end
   end
 end