skylight 5.2.0.beta → 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/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/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/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.2.0-beta".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.2.0.beta
+  version: 5.2.0.beta2
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-10 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.20.0
+        version: 1.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.20.0
+        version: 1.21.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -383,7 +383,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !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.