skylight 3.1.4 → 5.3.4

data/ext/skylight_native.c

@@ -86,14 +86,6 @@ typedef void* (*blocking_fn_t)(void*);
 #define WITHOUT_GVL(fn, a) \
   rb_thread_call_without_gvl((blocking_fn_t)(fn), (a), 0, 0)
 
-// Ruby 1.9
-#elif defined(HAVE_RB_THREAD_BLOCKING_REGION)
-
-typedef VALUE (*blocking_fn_t)(void*);
-#define WITHOUT_GVL(fn, a) \
-  rb_thread_blocking_region((blocking_fn_t)(fn), (a), 0, 0)
-
-
 #endif
 
 
@@ -103,7 +95,6 @@ typedef VALUE (*blocking_fn_t)(void*);
 
 VALUE rb_mSkylight;
 VALUE rb_eNativeError;
-VALUE rb_mCore;
 VALUE rb_mUtil;
 VALUE rb_cClock;
 VALUE rb_cTrace;
@@ -140,7 +131,7 @@ load_libskylight(VALUE klass, VALUE path) {
 
 /*
  *
- * class Skylight::Core::Util::Clock
+ * class Skylight::Util::Clock
  *
  */
 
@@ -152,7 +143,7 @@ clock_high_res_time(VALUE self) {
 
 /*
  *
- * class Skylight::Core::Instrumenter
+ * class Skylight::Instrumenter
  *
  */
 
@@ -243,33 +234,9 @@ instrumenter_submit_trace(VALUE self, VALUE rb_trace) {
   return Qnil;
 }
 
-static VALUE
-instrumenter_track_desc(VALUE self, VALUE rb_endpoint, VALUE rb_desc) {
-  int tracked;
-  sky_instrumenter_t* instrumenter;
-
-  CHECK_TYPE(rb_endpoint, T_STRING);
-  CHECK_TYPE(rb_desc, T_STRING);
-
-  tracked = 0;
-
-  My_Struct(instrumenter, sky_instrumenter_t, no_instrumenter_msg);
-
-  CHECK_FFI(
-      sky_instrumenter_track_desc(instrumenter, STR2BUF(rb_endpoint), STR2BUF(rb_desc), &tracked),
-      "Instrumenter#native_track_desc");
-
-  if (tracked) {
-    return Qtrue;
-  }
-  else {
-    return Qfalse;
-  }
-}
-
 /*
  *
- * class Skylight::Core::Trace
+ * class Skylight::Trace
  *
  */
 
@@ -334,6 +301,34 @@ trace_set_endpoint(VALUE self, VALUE endpoint) {
   return Qnil;
 }
 
+static VALUE
+trace_get_component(VALUE self) {
+  sky_trace_t* trace;
+  sky_buf_t component;
+
+  My_Struct(trace, sky_trace_t, consumed_trace_msg);
+
+  CHECK_FFI(
+      sky_trace_component(trace, &component),
+      "Trace#native_get_component");
+
+  return BUF2STR(component);
+}
+
+static VALUE
+trace_set_component(VALUE self, VALUE component) {
+  sky_trace_t* trace;
+
+  CHECK_TYPE(component, T_STRING);
+  My_Struct(trace, sky_trace_t, consumed_trace_msg);
+
+  CHECK_FFI(
+      sky_trace_set_component(trace, STR2BUF(component)),
+      "Trace#native_set_component");
+
+  return Qnil;
+}
+
 static VALUE
 trace_use_pruning(VALUE self) {
   sky_trace_t* trace;
@@ -475,15 +470,31 @@ trace_span_set_description(VALUE self, VALUE span, VALUE desc) {
 
 static VALUE
 trace_span_set_meta(VALUE self, VALUE span, VALUE meta) {
-  UNUSED(self);
-  UNUSED(span);
-  UNUSED(meta);
+  sky_trace_t* trace;
+  VALUE rb_source_location;
+
+  My_Struct(trace, sky_trace_t, consumed_trace_msg);
+
+  CHECK_TYPE(span, T_FIXNUM);
+  CHECK_TYPE(meta, T_HASH);
+
+  rb_source_location = rb_hash_lookup(meta, ID2SYM(rb_intern("source_location")));
+  if (rb_source_location != Qnil) {
+    sky_buf_t source_location;
+
+    CHECK_TYPE(rb_source_location, T_STRING);
+    source_location = STR2BUF(rb_source_location);
+
+    sky_trace_span_add_string_annotation(trace, FIX2UINT(span), 3, source_location);
+  }
+
   return Qnil;
 }
 
 static VALUE
-trace_span_started(VALUE self) {
+trace_span_started(VALUE self, VALUE span) {
   UNUSED(self);
+  UNUSED(span);
   return Qnil;
 }
 
@@ -496,79 +507,25 @@ trace_span_set_exception(VALUE self, VALUE span, VALUE exception, VALUE exceptio
   return Qnil;
 }
 
-static VALUE
-trace_span_get_correlation_header(VALUE self, VALUE span_id) {
-  UNUSED(self);
-  UNUSED(span_id);
-  return Qnil;
-}
-
-static VALUE
-lex_sql(VALUE klass, VALUE rb_sql) {
-  sky_buf_t sql;
-  sky_buf_t title;
-  sky_buf_t statement;
-  uint8_t title_store[128];
-  VALUE rb_statement;
-  VALUE ret;
-
-  UNUSED(klass);
-  CHECK_TYPE(rb_sql, T_STRING);
-
-  sql = STR2BUF(rb_sql);
-  title = (sky_buf_t) {
-    .data = title_store,
-    .len = sizeof(title_store),
-  };
-
-  // The statement cannot be longer than the original sql string
-  rb_statement = rb_str_buf_new(RSTRING_LEN(rb_sql));
-  statement = (sky_buf_t) {
-    .data = RSTRING_PTR(rb_statement),
-    .len = RSTRING_LEN(rb_sql),
-  };
-
-  CHECK_FFI(sky_lex_sql(sql, &title, &statement),
-    "Skylight#lex_sql");
-
-  // Set the statement return
-  rb_str_set_len(rb_statement, statement.len);
-  rb_enc_associate(rb_statement, rb_utf8_encoding());
-
-  ret = rb_ary_new2(2);
-
-  if (title.len > 0) {
-    rb_ary_store(ret, 0, BUF2STR(title));
-  }
-  else {
-    rb_ary_store(ret, 0, Qnil);
-  }
-
-  rb_ary_store(ret, 1, rb_statement);
-
-  return ret;
-}
-
 void Init_skylight_native() {
   rb_mSkylight = rb_define_module("Skylight");
 
   rb_eNativeError = rb_const_get(rb_mSkylight, rb_intern("NativeError"));
 
   rb_define_singleton_method(rb_mSkylight, "load_libskylight", load_libskylight, 1);
-  rb_define_singleton_method(rb_mSkylight, "lex_sql", lex_sql, 1);
-
-  rb_mCore = rb_define_module_under(rb_mSkylight, "Core");
 
-  // FIXME: Don't put these under Core
-  rb_mUtil  = rb_define_module_under(rb_mCore, "Util");
+  rb_mUtil  = rb_define_module_under(rb_mSkylight, "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_const_get(rb_mSkylight, rb_intern("Trace"));
   rb_define_singleton_method(rb_cTrace, "native_new", trace_new, 4);
+  rb_undef_alloc_func(rb_cTrace);
   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_get_component", trace_get_component, 0);
+  rb_define_method(rb_cTrace, "native_set_component", trace_set_component, 1);
   rb_define_method(rb_cTrace, "native_use_pruning", trace_use_pruning, 0);
   rb_define_method(rb_cTrace, "native_set_exception", trace_set_exception, 1);
   rb_define_method(rb_cTrace, "native_get_uuid", trace_get_uuid, 0);
@@ -581,12 +538,11 @@ void Init_skylight_native() {
   rb_define_method(rb_cTrace, "native_span_set_meta", trace_span_set_meta, 2);
   rb_define_method(rb_cTrace, "native_span_started", trace_span_started, 1);
   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_const_get(rb_mSkylight, rb_intern("Instrumenter"));
   rb_define_singleton_method(rb_cInstrumenter, "native_new", instrumenter_new, 2);
+  rb_undef_alloc_func(rb_cInstrumenter);
   rb_define_method(rb_cInstrumenter, "native_start", instrumenter_start, 0);
   rb_define_method(rb_cInstrumenter, "native_stop", instrumenter_stop, 0);
   rb_define_method(rb_cInstrumenter, "native_submit_trace", instrumenter_submit_trace, 1);
-  rb_define_method(rb_cInstrumenter, "native_track_desc", instrumenter_track_desc, 2);
 }

data/lib/skylight/api.rb

@@ -1,16 +1,22 @@
-require 'uri'
-require 'skylight/util/http'
+require "uri"
+require "skylight/util/http"
 
 module Skylight
   # @api private
   class Api
-    include Core::Util::Logging
+    include Util::Logging
 
     attr_reader :config
 
-    class Error < StandardError; end
-    class Unauthorized < Error; end
-    class Conflict < Error; end
+    class Error < StandardError
+    end
+
+    class Unauthorized < Error
+    end
+
+    class Conflict < Error
+    end
+
     class CreateFailed < Error
       attr_reader :res
 
@@ -21,14 +27,15 @@ module Skylight
 
       def errors
         return unless res.respond_to?(:body) && res.body.is_a?(Hash)
-        res.body['errors']
+
+        res.body["errors"]
       end
 
       def to_s
         if errors
           errors.inspect
         elsif res
-          "#{res.class.to_s}: #{res.to_s}"
+          "#{res.class}: #{res}"
         else
           super
         end
@@ -36,8 +43,7 @@ module Skylight
     end
 
     class ConfigValidationResults
-
-      include Core::Util::Logging
+      include Util::Logging
 
       attr_reader :raw_response
 
@@ -46,7 +52,7 @@ module Skylight
         @raw_response = raw_response
       end
 
-      def is_error_response?
+      def error_response?
         raw_response.is_a?(Util::HTTP::ErrorResponse) || status > 499
       end
 
@@ -55,7 +61,7 @@ module Skylight
       end
 
       def body
-        return nil if is_error_response?
+        return nil if error_response?
 
         unless raw_response.body.is_a?(Hash)
           warn("Unable to parse server response: status=%s, body=%s", raw_response.status, raw_response.body)
@@ -67,11 +73,15 @@ module Skylight
 
       def token_valid?
         # Don't prevent boot if it's an error response, so assume token is valid
-        return true if is_error_response?
+        return true if error_response?
+
         # A 2xx response means everything is good!
         return true if raw_response.success?
-        # A 422 means an invalid config, but the token must be valid if we got this far
-        return true if status === 422
+        return false if status == 401
+
+        # A 403/422 means an invalid config,
+        # but the token must be valid if we got this far
+        true
       end
 
       def config_valid?
@@ -79,44 +89,50 @@ module Skylight
         raw_response.success?
       end
 
+      def forbidden?
+        status == 403
+      end
+
       def validation_errors
-        return if config_valid?
-        body ? body['errors'] : nil
+        return {} if config_valid? || !body
+
+        body["errors"]
       end
 
       def corrected_config
-        return if config_valid?
-        body ? body['corrected'] : nil
-      end
+        return nil if config_valid? || !body
 
+        body["corrected"]
+      end
     end
 
     def initialize(config)
       @config = config
     end
 
-    def create_app(name, token=nil)
+    def create_app(name, token = nil)
       params = { app: { name: name } }
       params[:token] = token if token
 
       res = http_request(:app_create, :post, params)
 
       raise CreateFailed, res unless res.success?
+
       res
     end
 
     def fetch_mergeable_apps(token)
-      headers = { 'x-skylight-merge-token' => token }
+      headers = { "x-skylight-merge-token" => token }
       http_request(:merges, :get, headers).tap do |res|
-        raise error_for_status(res.status).new("HTTP #{res.status}: #{res.body}") unless res.success?
+        raise error_for_status(res.status), "HTTP #{res.status}: #{res.body}" unless res.success?
       end
     end
 
     def merge_apps!(token, app_guid:, component_guid:, environment:)
-      headers = { 'x-skylight-merge-token' => token }
+      headers = { "x-skylight-merge-token" => token }
       body = { environment: environment, app_guid: app_guid, component_guid: component_guid }
       http_request(:merges, :post, body, headers).tap do |res|
-        raise error_for_status(res.status).new("HTTP #{res.status}: #{res.body}") unless res.success?
+        raise error_for_status(res.status), "HTTP #{res.status}: #{res.body}" unless res.success?
       end
     end
 
@@ -144,7 +160,5 @@ module Skylight
         Error
       end
     end
-
   end
-
 end

data/lib/skylight/cli/doctor.rb

@@ -1,4 +1,4 @@
-require 'skylight/util/http'
+require "skylight/util/http"
 
 module Skylight
   module CLI
@@ -20,11 +20,13 @@ module Skylight
               say "Failed to verify SSL certificate.", :red
               if Util::SSL.ca_cert_file?
                 say "Certificates located at #{Util::SSL.ca_cert_file_or_default} may be out of date.", :yellow
-                if is_mac? && has_rvm?
+                if mac? && rvm_present?
                   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
@@ -39,7 +41,7 @@ module Skylight
         say "Checking for Rails"
 
         indent do
-          if is_rails?
+          if rails?
             say "Rails application detected", :green
           else
             say "No Rails application detected", :yellow
@@ -63,11 +65,9 @@ module Skylight
             say "Unable to load native extension", :yellow
 
             indent do
-              install_log = File.expand_path("../../../ext/install.log", __FILE__)
+              install_log = File.expand_path("../../../ext/install.log", __dir__)
               if File.exist?(install_log)
-                File.readlines(install_log).each do |line|
-                  say line, :red
-                end
+                File.readlines(install_log).each { |line| say line, :red }
               else
                 say "Reason unknown", :red
               end
@@ -84,20 +84,18 @@ module Skylight
         say "Checking for valid configuration"
 
         indent do
-          begin
-            config.validate!
-            say "Configuration is valid", :green
-          rescue Core::ConfigError => e
-            encountered_error!
-
-            say "Configuration is invalid", :red
-            indent do
-              say e.message, :red
-              say "This may occur if you are configuring with ENV variables and didn't set them in this shell."
-            end
-
-            done!
+          config.validate!
+          say "Configuration is valid", :green
+        rescue ConfigError => e
+          encountered_error!
+
+          say "Configuration is invalid", :red
+          indent do
+            say e.message, :red
+            say "This may occur if you are configuring with ENV variables and didn't set them in this shell."
           end
+
+          done!
         end
 
         puts "\n"
@@ -109,16 +107,19 @@ module Skylight
         indent do
           # Set this after we validate. It will give us more detailed information on start.
           logger = Logger.new("/dev/null") # Rely on `say` in the formatter instead
+
           # Log everything
           logger.level = Logger::DEBUG
+
           # Remove excess formatting
-          logger.formatter = proc { |severity, datetime, progname, msg|
-            msg = msg.sub("[SKYLIGHT] [#{Skylight::VERSION}] ", '')
-            say "#{severity} - #{msg}" # Definitely non-standard
-          }
+          logger.formatter =
+            proc do |severity, _datetime, _progname, msg|
+              msg = msg.sub("[SKYLIGHT] [#{Skylight::VERSION}] ", "")
+              say "#{severity} - #{msg}" # Definitely non-standard
+            end
           config.logger = logger
 
-          config.set(:'daemon.lazy_start', false)
+          config.set(:"daemon.lazy_start", false)
 
           started = Skylight.start!(config)
 
@@ -139,7 +140,7 @@ module Skylight
           daemon_running = false
           while tries < 5
             `ps cax | grep skylightd`
-            if $?.success?
+            if $CHILD_STATUS.success?
               daemon_running = true
               break
             end
@@ -166,58 +167,55 @@ module Skylight
 
       private
 
-        # Overwrite the default helper method to load from Rails
-        def config
-          return @config if @config
+      # Overwrite the default helper method to load from Rails
+      def config
+        return @config if @config
 
-          # MEGAHAX
-          if is_rails?
-            # Normally auto-loaded, but we haven't loaded Rails by the time Skylight is loaded
-            require 'skylight/railtie'
-            require rails_rb
-
-            railtie = Skylight::Railtie.send(:new)
-            @config = railtie.send(:load_skylight_config, Rails.application)
-          else
-            super
-          end
-        end
+        # MEGAHAX
+        if rails?
+          # Normally auto-loaded, but we haven't loaded Rails by the time Skylight is loaded
+          require "skylight/railtie"
+          require rails_rb
 
-        def is_mac?
-          Core::Util::Platform::OS == 'darwin'
+          railtie = Skylight::Railtie.send(:new)
+          @config = railtie.send(:load_skylight_config, Rails.application)
+        else
+          super
         end
+      end
 
-        # NOTE: This check won't work correctly on Windows
-        def has_rvm?
-          if @has_rvm.nil?
-            @has_rvm = system("which rvm > /dev/null");
-          end
-          @has_rvm
-        end
+      def mac?
+        Util::Platform::OS == "darwin"
+      end
 
-        def encountered_error!
-          @has_errors = true
-        end
+      # NOTE: This check won't work correctly on Windows
+      def rvm_present?
+        @has_rvm = system("which rvm > /dev/null") if @has_rvm.nil?
+        @has_rvm
+      end
 
-        def has_errors?
-          @has_errors
-        end
+      def encountered_error!
+        @has_errors = true
+      end
 
-        def done!
-          shell.padding = 0
-          say "\n\n"
+      def has_errors?
+        @has_errors
+      end
 
-          if has_errors?
-            say "Skylight Doctor found some errors. Please review the output above.", :red
-            say "If you have any further questions, please contact support@skylight.io.", :yellow
-            exit 1
-          else
-            say "All checks passed!", :green
-            say "If you're still having trouble, please contact support@skylight.io.", :yellow
-            exit 0
-          end
+      def done!
+        shell.padding = 0
+        say "\n\n"
+
+        if has_errors?
+          say "Skylight Doctor found some errors. Please review the output above.", :red
+          say "If you have any further questions, please contact support@skylight.io.", :yellow
+          exit 1
+        else
+          say "All checks passed!", :green
+          say "If you're still having trouble, please contact support@skylight.io.", :yellow
+          exit 0
         end
-
+      end
     end
   end
 end

data/lib/skylight/cli/helpers.rb

@@ -1,7 +1,6 @@
 module Skylight
   module CLI
     module Helpers
-
       private
 
       # Duplicated below
@@ -9,7 +8,7 @@ module Skylight
         File.expand_path("config/application.rb")
       end
 
-      def is_rails?
+      def rails?
         File.exist?(rails_rb)
       end
 
@@ -20,13 +19,12 @@ module Skylight
 
       # Sets the output padding while executing a block and resets it.
       #
-      def indent(count = 1, &block)
+      def indent(count = 1)
         orig_padding = shell.padding
         shell.padding += count
         yield
         shell.padding = orig_padding
       end
-
     end
   end
-end
+end