skylight 5.1.0.beta3 → 5.2.0.beta2

data/lib/skylight/errors.rb

@@ -68,5 +68,8 @@ module Skylight
 
     # E0006
     register(6, "InvalidUtf8", "Invalid UTF-8")
+
+    # E0007
+    register(7, "GrpcConnect", "Failed to connect to gRPC server.")
   end
 end

data/lib/skylight/extensions/source_location.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "skylight/util/lru_cache"
-require "active_support/dependencies"
+require "active_support/inflector"
 
 module Skylight
   module Extensions
@@ -163,7 +163,7 @@ module Skylight
 
       def instance_method_source_location(constant_name, method_name, source_name: :instance_method)
         @instance_method_source_location_cache.fetch([constant_name, method_name, source_name]) do
-          if (constant = ::ActiveSupport::Dependencies.safe_constantize(constant_name))
+          if (constant = ::ActiveSupport::Inflector.safe_constantize(constant_name))
             if constant.instance_methods.include?(:"before_instrument_#{method_name}")
               method_name = :"before_instrument_#{method_name}"
             end

data/lib/skylight/middleware.rb

@@ -3,6 +3,8 @@ require "securerandom"
 module Skylight
   # @api private
   class Middleware
+    SKYLIGHT_REQUEST_ID = "skylight.request_id".freeze
+
     class BodyProxy
       def initialize(body, &block)
         @body = body
@@ -81,7 +83,8 @@ module Skylight
       set_request_id(env)
 
       if Skylight.tracing?
-        error "Already instrumenting. Make sure the Skylight Rack Middleware hasn't been added more than once."
+        debug "Already instrumenting. Make sure the Skylight Rack Middleware hasn't been added more than once."
+        return @app.call(env)
       end
 
       if env["REQUEST_METHOD"] == "HEAD"
@@ -108,7 +111,7 @@ module Skylight
 
     def log_context
       # Don't cache this, it will change
-      { request_id: @current_request_id, inst: Skylight.instrumenter&.uuid }
+      { request_id: current_request_id, inst: Skylight.instrumenter&.uuid }
     end
 
     # Allow for overwriting
@@ -122,8 +125,10 @@ module Skylight
 
     # Request ID code based on ActionDispatch::RequestId
     def set_request_id(env)
+      return if env[SKYLIGHT_REQUEST_ID]
+
       existing_request_id = env["action_dispatch.request_id"] || env["HTTP_X_REQUEST_ID"]
-      @current_request_id = env["skylight.request_id"] = make_request_id(existing_request_id)
+      self.current_request_id = env[SKYLIGHT_REQUEST_ID] = make_request_id(existing_request_id)
     end
 
     def make_request_id(request_id)
@@ -133,5 +138,13 @@ module Skylight
     def internal_request_id
       SecureRandom.uuid
     end
+
+    def current_request_id
+      Thread.current[SKYLIGHT_REQUEST_ID]
+    end
+
+    def current_request_id=(request_id)
+      Thread.current[SKYLIGHT_REQUEST_ID] = request_id
+    end
   end
 end

data/lib/skylight/normalizers/active_job/perform.rb

@@ -15,7 +15,7 @@ module Skylight
             .tap do |str|
               if str.match(DELIVERY_JOB)
                 mailer_class, mailer_method, * = job_instance.arguments
-                return "#{mailer_class}##{mailer_method}", str
+                return "#{mailer_class}##{mailer_method}", str if mailer_class && mailer_method
               end
             end
         end
@@ -33,9 +33,7 @@ module Skylight
         end
 
         def normalize_after(trace, _span, _name, payload)
-          return unless config.enable_segments? && assign_endpoint?(trace, payload)
-
-          trace.segment = payload[:job].queue_name
+          maybe_set_endpoint(trace, payload)
         end
 
         private
@@ -53,31 +51,30 @@ module Skylight
         end
 
         def maybe_set_endpoint(trace, payload)
-          trace.endpoint = normalize_title(payload[:job]) if assign_endpoint?(trace, payload)
-        end
+          endpoint = normalize_title(payload[:job])
 
-        def assign_endpoint?(trace, payload)
           # Always assign the endpoint if it has not yet been assigned by the ActiveJob probe.
-          return true unless trace.endpoint
-          if defined?(Skylight::Probes::ActiveJob::TITLE) && trace.endpoint == Skylight::Probes::ActiveJob::TITLE
-            return true
-          end
-          if defined?(SKylight::Probes::DelayedJob::Probe::UNKNOWN) &&
-               trace.endpoint == Skylight::Probes::DelayedJob::Probe::UNKNOWN
-            return true
+          if !trace.endpoint ||
+               (defined?(Skylight::Probes::ActiveJob::TITLE) && trace.endpoint == Skylight::Probes::ActiveJob::TITLE) ||
+               (
+                 defined?(Skylight::Probes::DelayedJob::Probe::UNKNOWN) &&
+                   trace.endpoint == Skylight::Probes::DelayedJob::Probe::UNKNOWN
+               ) ||
+               # If a job is called using #perform_now inside a controller action
+               # or within another job's #perform method, we do not want this to
+               # overwrite the existing endpoint name (unless it is the default from ActiveJob).
+               #
+               # If the current endpoint name matches this payload, return true to allow the
+               # segment to be assigned by normalize_after.
+               trace.endpoint =~ DELIVERY_JOB ||
+               # This adapter wrapper needs to be handled specifically due to interactions with the
+               # standalone Delayed::Job probe, as there is no consistent way to get the wrapped
+               # job name among all Delayed::Job backends.
+               trace.endpoint == DELAYED_JOB_WRAPPER
+            trace.endpoint = endpoint
           end
 
-          # If a job is called using #perform_now inside a controller action
-          # or within another job's #perform method, we do not want this to
-          # overwrite the existing endpoint name (unless it is the default from ActiveJob).
-          #
-          # If the current endpoint name matches this payload, return true to allow the
-          # segment to be assigned by normalize_after.
-          trace.endpoint == DELIVERY_JOB || trace.endpoint == normalize_title(payload[:job]) ||
-            # This adapter wrapper needs to be handled specifically due to interactions with the
-            # standalone Delayed::Job probe, as there is no consistent way to get the wrapped
-            # job name among all Delayed::Job backends.
-            trace.endpoint == DELAYED_JOB_WRAPPER
+          trace.segment = payload[:job].queue_name if trace.endpoint == endpoint && config.enable_segments?
         end
 
         def normalize_title(job_instance)

data/lib/skylight/normalizers/grape/endpoint.rb

@@ -20,7 +20,7 @@ module Skylight
 
         def get_namespace(endpoint)
           # slice off preceding slash for data continuity
-          ::Grape::Namespace.joined_space_path(endpoint.namespace_stackable(:namespace)).to_s[1..-1]
+          ::Grape::Namespace.joined_space_path(endpoint.namespace_stackable(:namespace)).to_s[1..]
         end
       end
     end

data/lib/skylight/probes/middleware.rb

@@ -25,10 +25,10 @@ module Skylight
       # for Rails <= 5.2 ActionDispatch::MiddlewareStack::Middleware
       module Instrumentation
         def build(*)
-          sk_instrument_middleware(super)
+          Instrumentation.sk_instrument_middleware(super)
         end
 
-        def sk_instrument_middleware(middleware)
+        def self.sk_instrument_middleware(middleware)
           return middleware if middleware.is_a?(Skylight::Middleware)
 
           # Not sure how this would actually happen

data/lib/skylight/probes/rack_builder.rb

@@ -0,0 +1,37 @@
+module Skylight
+  module Probes
+    module Rack
+      module Builder
+        module Instrumentation
+          def use(middleware, *args, &block)
+            if @map
+              mapping = @map
+              @map = nil
+              @use << proc { |app| generate_map(app, mapping) }
+            end
+            @use << proc do |app|
+              middleware
+                .new(app, *args, &block)
+                .tap do |middleware_instance|
+                  Skylight::Probes::Middleware::Instrumentation.sk_instrument_middleware(middleware_instance)
+                end
+            end
+          end
+          ruby2_keywords(:use) if respond_to?(:ruby2_keywords, true)
+        end
+
+        class Probe
+          def install
+            if defined?(::Rack.release) && Gem::Version.new(::Rack.release) >= ::Gem::Version.new("1.4") &&
+                 defined?(::Rack::Builder)
+              require "skylight/probes/middleware"
+              ::Rack::Builder.prepend(Instrumentation)
+            end
+          end
+        end
+      end
+    end
+
+    register(:rack_builder, "Rack::Builder", "rack/builder", Skylight::Probes::Rack::Builder::Probe.new)
+  end
+end

data/lib/skylight/probes/sinatra_add_middleware.rb

@@ -2,8 +2,8 @@ module Skylight
   module Probes
     module Sinatra
       module Instrumentation
-        def build(*)
-          use Skylight::Middleware
+        def setup_default_middleware(builder)
+          builder.use Skylight::Middleware
           super
         end
       end

data/lib/skylight/railtie.rb

@@ -99,8 +99,8 @@ module Skylight
 
       configure_logging(config, app)
 
-      config[:'daemon.sockdir_path'] ||= tmp
-      config[:'normalizers.render.view_paths'] = existent_paths(app.config.paths["app/views"]) + [Rails.root.to_s]
+      config[:"daemon.sockdir_path"] ||= tmp
+      config[:"normalizers.render.view_paths"] = existent_paths(app.config.paths["app/views"]) + [Rails.root.to_s]
 
       config[:env] ||= Rails.env.to_s if config[:report_rails_env]
 

data/lib/skylight/sinatra.rb

@@ -1,2 +1,2 @@
 require "skylight"
-Skylight.probe(:sinatra_add_middleware, :sinatra, :tilt, :sequel)
+Skylight.probe(:sinatra_add_middleware, :sinatra, :tilt, :sequel, :rack_builder)

data/lib/skylight/util/clock.rb

@@ -13,7 +13,7 @@ module Skylight
       # rubocop:disable Lint/DuplicateMethods
       def tick
         now = Time.now
-        now.to_i * 1_000_000_000 + now.usec * 1_000
+        (now.to_i * 1_000_000_000) + (now.usec * 1_000)
       end
 
       # rubocop:enable Lint/DuplicateMethods

data/lib/skylight/util/deploy.rb

@@ -52,15 +52,15 @@ module Skylight
         end
 
         def id
-          config.get(:'deploy.id') || git_sha
+          config.get(:"deploy.id") || git_sha
         end
 
         def git_sha
-          config.get(:'deploy.git_sha')
+          config.get(:"deploy.git_sha")
         end
 
         def description
-          config.get(:'deploy.description')
+          config.get(:"deploy.description")
         end
       end
 
@@ -85,7 +85,7 @@ module Skylight
         private
 
         def get_info
-          info_path = config[:'heroku.dyno_info_path']
+          info_path = config[:"heroku.dyno_info_path"]
 
           if File.exist?(info_path) && (info = JSON.parse(File.read(info_path)))
             info["release"]

data/lib/skylight/util/platform.rb

@@ -38,8 +38,8 @@ module Skylight
           "x86"
         when /ppc|powerpc/
           "powerpc"
-        when /^arm/
-          "arm"
+        when /arm64|aarch64/
+          "aarch64"
         else
           cpu
         end

data/lib/skylight/version.rb

@@ -3,5 +3,5 @@ module Skylight
   # 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.0-beta3".freeze
+  VERSION = "5.2.0-beta2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 5.1.0.beta3
+  version: 5.2.0.beta2
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-21 00:00:00.000000000 Z
+date: 2021-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: 1.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: 1.21.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -296,6 +296,7 @@ files:
 - lib/skylight/probes/mongo.rb
 - lib/skylight/probes/mongoid.rb
 - lib/skylight/probes/net_http.rb
+- lib/skylight/probes/rack_builder.rb
 - lib/skylight/probes/redis.rb
 - lib/skylight/probes/sequel.rb
 - lib/skylight/probes/sinatra.rb
@@ -375,14 +376,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.0.8
 signing_key:
 specification_version: 4
 summary: Skylight is a smart profiler for Rails, Sinatra, and other Ruby apps.