skylight 4.3.2 → 5.1.1

data/lib/skylight/util/instrumenter_method.rb

@@ -0,0 +1,26 @@
+module Skylight
+  module Util
+    module InstrumenterMethod
+      def instrumenter_method(name, block: false)
+        if block
+          module_eval <<-RUBY, __FILE__, __LINE__ + 1
+            def #{name}(*args)                      # def mute(*args)
+              unless instrumenter                   #   unless instrumenter
+                return yield if block_given?        #     return yield if block_given?
+                return                              #     return
+              end                                   #   end
+                                                    #
+              instrumenter.#{name}(*args) { yield } #   instrumenter.mute(*args) { yield }
+            end                                     # end
+          RUBY
+        else
+          module_eval <<-RUBY, __FILE__, __LINE__ + 1
+            def #{name}(*args)              # def config(*args)
+              instrumenter&.#{name}(*args)  #   instrumenter&.config(*args)
+            end                             # end
+          RUBY
+        end
+      end
+    end
+  end
+end

data/lib/skylight/util/logging.rb

@@ -0,0 +1,136 @@
+require "logger"
+
+module Skylight
+  module Util
+    # Log both to the specified logger and STDOUT
+    class AlertLogger
+      def initialize(logger)
+        @logger = logger
+      end
+
+      def write(*args)
+        $stderr.write(*args)
+
+        # Try to avoid writing to STDOUT/STDERR twice
+        logger_logdev = @logger.instance_variable_get(:@logdev)
+        logger_out = logger_logdev.respond_to?(:dev) ? logger_logdev.dev : nil
+        @logger.<<(*args) if logger_out != $stdout && logger_out != $stderr
+      end
+
+      def close; end
+    end
+
+    module Logging
+      def log_context
+        {}
+      end
+
+      def trace?
+        !!ENV[-"SKYLIGHT_ENABLE_TRACE_LOGS"]
+      end
+
+      def raise_on_error?
+        !!ENV[-"SKYLIGHT_RAISE_ON_ERROR"]
+      end
+
+      # Logs if tracing
+      #
+      # @param (see #debug)
+      #
+      # See {trace?}.
+      def trace(msg, *args)
+        return unless trace?
+
+        log :debug, msg, *args
+      end
+
+      # Evaluates and logs the result of the block if tracing
+      #
+      # @yield block to be evaluted
+      # @yieldreturn arguments for {#debug}
+      #
+      # See {trace?}.
+      def t
+        return unless trace?
+
+        log :debug, yield
+      end
+
+      # @param msg (see #log)
+      # @param args (see #log)
+      def debug(msg, *args)
+        log :debug, msg, *args
+      end
+
+      # @param msg (see #log)
+      # @param args (see #log)
+      def info(msg, *args)
+        log :info, msg, *args
+      end
+
+      # @param msg (see #log)
+      # @param args (see #log)
+      def warn(msg, *args)
+        log :warn, msg, *args
+      end
+
+      # @param msg (see #log)
+      # @param args (see #log)
+      def error(msg, *args)
+        log :error, msg, *args
+        raise format(msg, *args) if raise_on_error?
+      end
+
+      alias log_trace trace
+      alias log_debug debug
+      alias log_info info
+      alias log_warn warn
+      alias log_error error
+
+      # Alias for `Kernel#sprintf`
+      # @return [String]
+      def fmt(*args)
+        sprintf(*args)
+      end
+
+      def config_for_logging
+        if respond_to?(:config)
+          config
+        elsif is_a?(Skylight::Config)
+          self
+        end
+      end
+
+      # @param level [String,Symbol] the method on `logger` to use for logging
+      # @param msg [String] the message to log
+      # @param args [Array] values for `Kernel#sprintf` on `msg`
+      def log(level, msg, *args)
+        c = config_for_logging
+        logger = c ? c.logger : nil
+
+        msg = log_context.map { |(k, v)| "#{k}=#{v}; " }.join << msg
+
+        if logger
+          if logger.respond_to?(level)
+            if args.empty?
+              logger.send level, msg
+            else
+              logger.send level, format(msg, *args)
+            end
+            return # rubocop:disable Style/RedundantReturn
+          else
+            Kernel.warn "Invalid logger"
+          end
+          # Fallback to stderr for warn and error levels
+        elsif %i[warn error].include?(level)
+          $stderr.puts format("[SKYLIGHT] #{msg}", *args)
+        end
+      rescue Exception => e
+        if trace?
+          puts "[ERROR] #{e.message}"
+          puts e.backtrace
+        end
+      end
+    end
+  end
+end

data/lib/skylight/util/lru_cache.rb

@@ -0,0 +1,36 @@
+# Based on code by Sam Saffron: https://stackoverflow.com/a/16161783/181916
+module Skylight
+  module Util
+    class LruCache
+      def initialize(max_size)
+        @max_size = max_size
+        @data = {}
+      end
+
+      def max_size=(size)
+        raise ArgumentError, :max_size if @max_size < 1
+
+        @max_size = size
+        @data.shift while @data.size > @max_size
+      end
+
+      # Individual hash operations here are atomic in MRI.
+      def fetch(key)
+        found = true
+        value = @data.delete(key) { found = false }
+
+        value = yield if !found && block_given?
+
+        @data[key] = value if value
+
+        @data.shift if !found && value && @data.length > @max_size
+
+        value
+      end
+
+      def clear
+        @data.clear
+      end
+    end
+  end
+end

data/lib/skylight/util/platform.rb

@@ -12,11 +12,7 @@ module Skylight
           #   Ruby doesn't know that it's on a musl-based platform. `ldd` is the
           #   only reliable way to detect musl that we've found.
           # See https://github.com/skylightio/skylight-ruby/issues/92
-          if ENV["SKYLIGHT_MUSL"] || `ldd --version 2>&1` =~ /musl/
-            "linux-musl"
-          else
-            "linux"
-          end
+          ENV["SKYLIGHT_MUSL"] || `ldd --version 2>&1` =~ /musl/ ? "linux-musl" : "linux"
         when /darwin/
           "darwin"
         when /freebsd/

data/lib/skylight/util/ssl.rb

@@ -12,43 +12,19 @@ module Skylight
         if defined?(OpenSSL::X509::DEFAULT_CERT_FILE)
           f = OpenSSL::X509::DEFAULT_CERT_FILE
 
-          if f && File.exist?(f)
-            @ca_cert_file = f
-          end
-        end
-      end
-
-      def self.detect_ca_cert_dir!
-        return nil if ENV["SKYLIGHT_FORCE_OWN_CERTS"]
-
-        @ca_cert_dir = false
-        if defined?(OpenSSL::X509::DEFAULT_CERT_DIR)
-          d = OpenSSL::X509::DEFAULT_CERT_DIR
-
-          if d && File.exist?(d)
-            @ca_cert_dir = d
-          end
+          @ca_cert_file = f if f && File.exist?(f)
         end
       end
 
       detect_ca_cert_file!
-      detect_ca_cert_dir!
 
       def self.ca_cert_file?
         !!@ca_cert_file
       end
 
-      def self.ca_cert_dir?
-        !!@ca_cert_dir
-      end
-
       def self.ca_cert_file_or_default
         @ca_cert_file || DEFAULT_CA_FILE
       end
-
-      class << self
-        attr_reader :ca_cert_dir
-      end
     end
   end
 end

data/lib/skylight/vendor/cli/thor/rake_compat.rb

@@ -11,7 +11,7 @@ class Thor
   #   class Default < Thor
   #     include Thor::RakeCompat
   #
-  #     RSpec::Core::RakeTask.new(:spec) do |t|
+  #     RSpec::RakeTask.new(:spec) do |t|
   #       t.spec_opts = ['--options', "./.rspec"]
   #       t.spec_files = FileList['spec/**/*_spec.rb']
   #     end

data/lib/skylight/version.rb

@@ -1,3 +1,7 @@
 module Skylight
-  VERSION = "4.3.2".freeze
+  # pre-release versions should be given here as "5.0.0-alpha"
+  # for compatibility with semver when it is parsed by the rust agent.
+  # This string will be transformed in the gemspec to "5.0.0.alpha"
+  # to conform with rubygems.
+  VERSION = "5.1.1".freeze
 end

data/lib/skylight/vm/gc.rb

@@ -0,0 +1,60 @@
+module Skylight
+  # @api private
+  module VM
+    if defined?(JRUBY_VERSION)
+      # This doesn't quite work as we would like it. I believe that the GC
+      # statistics includes time that is not stop-the-world, this does not
+      # necessarily take time away from the application.
+      #
+      # require 'java'
+      # class GC
+      #   def initialize
+      #     @factory = Java::JavaLangManagement::ManagementFactory
+      #   end
+      #
+      #   def enable
+      #   end
+      #
+      #   def total_time
+      #     res = 0.0
+      #
+      #     @factory.garbage_collector_mx_beans.each do |mx|
+      #       res += (mx.collection_time.to_f / 1_000.0)
+      #     end
+      #
+      #     res
+      #   end
+      # end
+    elsif defined?(::GC::Profiler)
+      class GC
+        def initialize
+          @total = 0
+        end
+
+        def enable
+          ::GC::Profiler.enable
+        end
+
+        def total_time
+          # Reported in seconds
+          run = (::GC::Profiler.total_time * 1_000_000).to_i
+
+          ::GC::Profiler.clear if run > 0
+
+          @total += run
+        end
+      end
+    end
+
+    # Fallback
+    unless defined?(VM::GC)
+      class GC
+        def enable; end
+
+        def total_time
+          0
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 4.3.2
+  version: 5.1.1
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-15 00:00:00.000000000 Z
+date: 2021-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: skylight-core
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.2
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.2
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: beefcake
   requirement: !ruby/object:Gem::Requirement
@@ -86,28 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: 13.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: 13.0.1
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +136,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.15.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.15.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.21.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.21.2
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -193,20 +221,104 @@ files:
 - lib/skylight/cli/merger.rb
 - lib/skylight/config.rb
 - lib/skylight/data/cacert.pem
+- lib/skylight/deprecation.rb
 - lib/skylight/errors.rb
+- lib/skylight/extensions.rb
+- lib/skylight/extensions/source_location.rb
+- lib/skylight/formatters/http.rb
+- lib/skylight/gc.rb
 - lib/skylight/helpers.rb
 - lib/skylight/instrumenter.rb
 - lib/skylight/middleware.rb
 - lib/skylight/native.rb
 - lib/skylight/native_ext_fetcher.rb
+- lib/skylight/normalizers.rb
+- lib/skylight/normalizers/action_controller/process_action.rb
+- lib/skylight/normalizers/action_controller/send_file.rb
+- lib/skylight/normalizers/action_dispatch/process_middleware.rb
+- lib/skylight/normalizers/action_dispatch/route_set.rb
+- lib/skylight/normalizers/action_view/render_collection.rb
+- lib/skylight/normalizers/action_view/render_layout.rb
+- lib/skylight/normalizers/action_view/render_partial.rb
+- lib/skylight/normalizers/action_view/render_template.rb
+- lib/skylight/normalizers/active_job/perform.rb
+- lib/skylight/normalizers/active_model_serializers/render.rb
+- lib/skylight/normalizers/active_record/instantiation.rb
+- lib/skylight/normalizers/active_record/sql.rb
+- lib/skylight/normalizers/active_storage.rb
+- lib/skylight/normalizers/active_support/cache.rb
+- lib/skylight/normalizers/active_support/cache_clear.rb
+- lib/skylight/normalizers/active_support/cache_decrement.rb
+- lib/skylight/normalizers/active_support/cache_delete.rb
+- lib/skylight/normalizers/active_support/cache_exist.rb
+- lib/skylight/normalizers/active_support/cache_fetch_hit.rb
+- lib/skylight/normalizers/active_support/cache_generate.rb
+- lib/skylight/normalizers/active_support/cache_increment.rb
+- lib/skylight/normalizers/active_support/cache_read.rb
+- lib/skylight/normalizers/active_support/cache_read_multi.rb
+- lib/skylight/normalizers/active_support/cache_write.rb
+- lib/skylight/normalizers/coach/handler_finish.rb
+- lib/skylight/normalizers/coach/middleware_finish.rb
+- lib/skylight/normalizers/couch_potato/query.rb
+- lib/skylight/normalizers/data_mapper/sql.rb
+- lib/skylight/normalizers/default.rb
+- lib/skylight/normalizers/elasticsearch/request.rb
+- lib/skylight/normalizers/faraday/request.rb
+- lib/skylight/normalizers/grape/endpoint.rb
+- lib/skylight/normalizers/grape/endpoint_render.rb
+- lib/skylight/normalizers/grape/endpoint_run.rb
+- lib/skylight/normalizers/grape/endpoint_run_filters.rb
+- lib/skylight/normalizers/grape/format_response.rb
+- lib/skylight/normalizers/graphiti/render.rb
+- lib/skylight/normalizers/graphiti/resolve.rb
+- lib/skylight/normalizers/graphql/base.rb
+- lib/skylight/normalizers/render.rb
+- lib/skylight/normalizers/sequel/sql.rb
+- lib/skylight/normalizers/shrine.rb
+- lib/skylight/normalizers/sql.rb
+- lib/skylight/probes.rb
+- lib/skylight/probes/action_controller.rb
+- lib/skylight/probes/action_dispatch.rb
+- lib/skylight/probes/action_dispatch/request_id.rb
+- lib/skylight/probes/action_dispatch/routing/route_set.rb
+- lib/skylight/probes/action_view.rb
+- lib/skylight/probes/active_job.rb
+- lib/skylight/probes/active_job_enqueue.rb
+- lib/skylight/probes/active_model_serializers.rb
+- lib/skylight/probes/delayed_job.rb
+- lib/skylight/probes/elasticsearch.rb
+- lib/skylight/probes/excon.rb
+- lib/skylight/probes/excon/middleware.rb
+- lib/skylight/probes/faraday.rb
+- lib/skylight/probes/graphql.rb
+- lib/skylight/probes/httpclient.rb
+- lib/skylight/probes/middleware.rb
+- lib/skylight/probes/mongo.rb
+- lib/skylight/probes/mongoid.rb
+- lib/skylight/probes/net_http.rb
+- lib/skylight/probes/redis.rb
+- lib/skylight/probes/sequel.rb
+- lib/skylight/probes/sinatra.rb
 - lib/skylight/probes/sinatra_add_middleware.rb
+- lib/skylight/probes/tilt.rb
 - lib/skylight/railtie.rb
+- lib/skylight/sidekiq.rb
 - lib/skylight/sinatra.rb
+- lib/skylight/subscriber.rb
+- lib/skylight/test.rb
 - lib/skylight/trace.rb
+- lib/skylight/user_config.rb
+- lib/skylight/util.rb
+- lib/skylight/util/allocation_free.rb
+- lib/skylight/util/clock.rb
 - lib/skylight/util/component.rb
 - lib/skylight/util/deploy.rb
+- lib/skylight/util/gzip.rb
 - lib/skylight/util/hostname.rb
 - lib/skylight/util/http.rb
+- lib/skylight/util/instrumenter_method.rb
+- lib/skylight/util/logging.rb
+- lib/skylight/util/lru_cache.rb
 - lib/skylight/util/platform.rb
 - lib/skylight/util/proxy.rb
 - lib/skylight/util/ssl.rb
@@ -250,6 +362,7 @@ files:
 - lib/skylight/vendor/cli/thor/util.rb
 - lib/skylight/vendor/cli/thor/version.rb
 - lib/skylight/version.rb
+- lib/skylight/vm/gc.rb
 homepage: https://www.skylight.io
 licenses:
 - Nonstandard
@@ -262,14 +375,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Skylight is a smart profiler for Rails, Sinatra, and other Ruby apps.