skylight 1.7.2 → 2.0.0.beta1

data/lib/skylight/util/http.rb

@@ -3,7 +3,7 @@ require 'json'
 require 'openssl'
 require 'net/http'
 require 'net/https'
-require 'skylight/util/gzip'
+require 'skylight/core/util/gzip'
 require 'skylight/util/ssl'
 
 module Skylight
@@ -19,7 +19,7 @@ module Skylight
       DEFLATE          = 'deflate'.freeze
       GZIP             = 'gzip'.freeze
 
-      include Logging
+      include Core::Util::Logging
 
       attr_accessor :authentication
       attr_reader :host, :port
@@ -45,7 +45,7 @@ module Skylight
         @config = config
 
         unless url = config["#{service}_url"]
-          raise ArgumentError, "no URL specified"
+          raise ArgumentError, "no URL specified for #{service}"
         end
 
         url = URI.parse(url)

data/lib/skylight/vendor/cli/thor/actions/directory.rb

@@ -96,22 +96,12 @@ class Thor
           end
         end
 
-        if RUBY_VERSION < '2.0'
-          def file_level_lookup(previous_lookup)
-            File.join(previous_lookup, '{*,.[a-z]*}')
-          end
-
-          def files(lookup)
-            Dir[lookup]
-          end
-        else
-          def file_level_lookup(previous_lookup)
-            File.join(previous_lookup, '*')
-          end
+        def file_level_lookup(previous_lookup)
+          File.join(previous_lookup, '*')
+        end
 
-          def files(lookup)
-            Dir.glob(lookup, File::FNM_DOTMATCH)
-          end
+        def files(lookup)
+          Dir.glob(lookup, File::FNM_DOTMATCH)
         end
 
     end

data/lib/skylight/version.rb

@@ -1,4 +1,4 @@
 module Skylight
-  VERSION = '1.7.2'
+  VERSION = '2.0.0-beta1'
 end
 

metadata

@@ -1,43 +1,141 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 2.0.0.beta1
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-14 00:00:00.000000000 Z
+date: 2018-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: skylight-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 2.0.0.beta1
   type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.0.beta1
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.15'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.15'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.7'
+- !ruby/object:Gem::Dependency
+  name: rspec-collection_matchers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: beefcake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake-compiler
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: '0.9'
 description: 
 email:
 - engineering@tilde.io
@@ -63,92 +161,21 @@ files:
 - lib/skylight/cli.rb
 - lib/skylight/cli/doctor.rb
 - lib/skylight/cli/helpers.rb
-- lib/skylight/compat.rb
 - lib/skylight/config.rb
-- lib/skylight/core.rb
 - lib/skylight/data/cacert.pem
-- lib/skylight/deprecation.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/normalizers.rb
-- lib/skylight/normalizers/action_controller/process_action.rb
-- lib/skylight/normalizers/action_controller/send_file.rb
-- lib/skylight/normalizers/action_view/render_collection.rb
-- lib/skylight/normalizers/action_view/render_partial.rb
-- lib/skylight/normalizers/action_view/render_template.rb
+- lib/skylight/native_ext_fetcher.rb
 - lib/skylight/normalizers/active_job/enqueue_at.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_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/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/moped/query.rb
-- lib/skylight/probes.rb
-- lib/skylight/probes/action_controller.rb
-- lib/skylight/probes/action_dispatch.rb
-- lib/skylight/probes/action_view.rb
-- lib/skylight/probes/active_model_serializers.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/grape.rb
-- lib/skylight/probes/httpclient.rb
-- lib/skylight/probes/middleware.rb
-- lib/skylight/probes/mongo.rb
-- lib/skylight/probes/mongoid.rb
-- lib/skylight/probes/moped.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/tilt.rb
+- lib/skylight/probes/sinatra_add_middleware.rb
 - lib/skylight/railtie.rb
 - lib/skylight/sinatra.rb
-- lib/skylight/subscriber.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/deploy.rb
-- lib/skylight/util/gzip.rb
 - lib/skylight/util/hostname.rb
 - lib/skylight/util/http.rb
-- lib/skylight/util/inflector.rb
-- lib/skylight/util/logging.rb
-- lib/skylight/util/multi_io.rb
-- lib/skylight/util/native_ext_fetcher.rb
-- lib/skylight/util/platform.rb
-- lib/skylight/util/proxy.rb
 - lib/skylight/util/ssl.rb
-- lib/skylight/vendor/active_support/notifications.rb
-- lib/skylight/vendor/active_support/notifications/fanout.rb
-- lib/skylight/vendor/active_support/notifications/instrumenter.rb
-- lib/skylight/vendor/active_support/per_thread_registry.rb
 - lib/skylight/vendor/cli/highline.rb
 - lib/skylight/vendor/cli/highline/color_scheme.rb
 - lib/skylight/vendor/cli/highline/compatibility.rb
@@ -188,11 +215,7 @@ files:
 - lib/skylight/vendor/cli/thor/shell/html.rb
 - lib/skylight/vendor/cli/thor/util.rb
 - lib/skylight/vendor/cli/thor/version.rb
-- lib/skylight/vendor/thread_safe.rb
-- lib/skylight/vendor/thread_safe/non_concurrent_cache_backend.rb
-- lib/skylight/vendor/thread_safe/synchronized_cache_backend.rb
 - lib/skylight/version.rb
-- lib/skylight/vm/gc.rb
 homepage: http://www.skylight.io
 licenses:
 - Nonstandard
@@ -205,16 +228,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.2.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
-summary: Skylight is a smart profiler for Rails apps
+summary: Skylight is a smart profiler for Rails, Sinatra, and other Ruby apps.
 test_files: []

data/lib/skylight/compat.rb

@@ -1,76 +0,0 @@
-module Skylight
-  # Ensure the version of AS:N being used is recent enough
-  begin
-    # Attempt to reference an internal class only present in the new AS::Notifications
-    ActiveSupport::Notifications::Fanout::Subscribers
-  rescue NameError
-
-    # The things we do...
-    class ::ActiveSupport::Notifications::Fanout
-      attr_reader :subscribers
-
-      class Subscriber
-        attr_reader :pattern, :delegate
-      end
-    end
-
-    notifier = ActiveSupport::Notifications.notifier
-
-    # If the class is missing, require our vendored AS::N
-    require 'skylight/vendor/active_support/notifications'
-
-    if notifier.subscribers.respond_to?(:each)
-      notifier.subscribers.each do |sub|
-        pattern  = sub.respond_to?(:pattern)  && sub.pattern
-        delegate = sub.respond_to?(:delegate) && sub.delegate
-
-        if pattern && delegate
-          ActiveSupport::Notifications.subscribe(pattern, delegate)
-        end
-      end
-    end
-  end
-end
-
-if defined?(ActiveSupport::Notifications::Fanout::Subscribers::Evented)
-  # Handle early RCs of rails 4.0
-  # @api private
-  class ActiveSupport::Notifications::Fanout::Subscribers::Evented
-    unless method_defined?(:publish)
-      def publish(name, *args)
-        if @delegate.respond_to?(:publish)
-          @delegate.publish name, *args
-        end
-      end
-    end
-  end
-end
-
-require 'rack'
-require 'rack/etag'
-if Rack.release.to_f < 1.6
-  # Backport `close` compliance:
-  #   https://github.com/rack/rack/commit/4d9e1b228dacbcf1552c68e2ab2f21274fdcecb4
-  Rack::ETag.class_eval do
-    def call(env)
-      status, headers, body = @app.call(env)
-
-      if etag_status?(status) && etag_body?(body) && !skip_caching?(headers)
-        original_body = body
-        digest, body = digest_body(body)
-        original_body.close if original_body.respond_to?(:close)
-        headers['ETag'] = %("#{digest}") if digest
-      end
-
-      unless headers['Cache-Control']
-        if digest
-          headers['Cache-Control'] = @cache_control if @cache_control
-        else
-          headers['Cache-Control'] = @no_cache_control if @no_cache_control
-        end
-      end
-
-      [status, headers, body]
-    end
-  end
-end

data/lib/skylight/core.rb

@@ -1,149 +0,0 @@
-require 'skylight/version'
-require 'skylight/deprecation'
-
-# Root Skylight namespace
-module Skylight
-
-  # @api private
-  TRACE_ENV_KEY = 'SKYLIGHT_ENABLE_TRACE_LOGS'.freeze
-
-  # Load the native agent
-  require 'skylight/native'
-
-  # 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)
-    if Gem::Version.new(Rails.version) < Gem::Version.new('4.2.0')
-      DEPRECATOR.deprecation_warning("Support for Rails versions before 4.2")
-    end
-
-    require 'skylight/railtie'
-  end
-
-  require 'active_support/notifications'
-  require 'skylight/compat' # Require after AS::N
-
-  # Require VM specific things
-  require 'skylight/config'
-  require 'skylight/user_config'
-  require 'skylight/gc'
-  require 'skylight/helpers'
-  require 'skylight/instrumenter'
-  require 'skylight/middleware'
-  require 'skylight/trace'
-  require 'skylight/vm/gc'
-  require 'skylight/util'
-
-  # Used from the CLI
-  autoload :Api,          'skylight/api'
-  autoload :CLI,          'skylight/cli'
-  autoload :Normalizers,  'skylight/normalizers'
-  autoload :Subscriber,   'skylight/subscriber'
-
-  # @api private
-  class ConfigError < RuntimeError; end
-
-  # @api private
-  TIERS = %w(
-    rack
-    api
-    app
-    view
-    db
-    noise
-    other)
-
-  # @api private
-  TIER_REGEX = /^(?:#{TIERS.join('|')})(?:\.|$)/u
-
-  # @api private
-  CATEGORY_REGEX = /^[a-z0-9_-]+(?:\.[a-z0-9_-]+)*$/iu
-
-  # @api private
-  DEFAULT_CATEGORY = "app.block".freeze
-
-  # @api private
-  DEFAULT_OPTIONS = { category: DEFAULT_CATEGORY }
-
-  def self.probe(*args)
-    Probes.probe(*args)
-  end
-
-  def self.enable_normalizer(*names)
-    Normalizers.enable(*names)
-  end
-
-  # Start instrumenting
-  def self.start!(*args)
-    Instrumenter.start!(*args)
-  end
-
-  # Stop instrumenting
-  def self.stop!(*args)
-    Instrumenter.stop!(*args)
-  end
-
-  # Check tracing
-  def self.tracing?
-    inst = Instrumenter.instance
-    inst && inst.current_trace
-  end
-
-  # Start a trace
-  def self.trace(endpoint=nil, cat=nil, title=nil)
-    unless inst = Instrumenter.instance
-      return yield if block_given?
-      return
-    end
-
-    if block_given?
-      inst.trace(endpoint, cat || DEFAULT_CATEGORY, title) { yield }
-    else
-      inst.trace(endpoint, cat || DEFAULT_CATEGORY, title)
-    end
-  end
-
-  # Instrument
-  def self.instrument(opts = DEFAULT_OPTIONS, &block)
-    unless inst = Instrumenter.instance
-      return yield if block_given?
-      return
-    end
-
-    if Hash === opts
-      category    = opts[:category] || DEFAULT_CATEGORY
-      title       = opts[:title]
-      desc        = opts[:description]
-      if opts.key?(:annotations)
-        warn "call to #instrument included deprecated annotations"
-      end
-    else
-      category    = DEFAULT_CATEGORY
-      title       = opts.to_s
-      desc        = nil
-    end
-
-    inst.instrument(category, title, desc, &block)
-  end
-
-  # End a span
-  def self.done(span)
-    return unless inst = Instrumenter.instance
-    inst.done(span)
-  end
-
-  def self.broken!
-    return unless inst = Instrumenter.instance
-    inst.broken!
-  end
-
-  # Temporarily disable
-  def self.disable
-    unless inst = Instrumenter.instance
-      return yield if block_given?
-      return
-    end
-
-    inst.disable { yield }
-  end
-end