skylight-core 4.0.0.beta → 4.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab9eed2e498ca4b55dfed12501b36fdea71433e0505a2c34733a0d025b03bbdd
-  data.tar.gz: c5a4eed17eb02f2beb8e0b54e90196429467676a9b79dbff10ecd24d0cd9c31d
+  metadata.gz: 5667f3a36781897ae62521c5d959f4b840901098bd3fe639b8bbce7751b7339b
+  data.tar.gz: c39fbb604997035cbfdaabafb2a6f9774c744711b41ae2201e34bf8ba6ee82ca
 SHA512:
-  metadata.gz: 823f266c1a844a4e8424569b34f35afb9b5998c2688b66e299bbc4ad16c335aceffa17d24ed0c38243d89f7b8b16b202f65fdb8d416dc13a830e3505848b86a2
-  data.tar.gz: 6c134666859922615c8083298fd42d7d7b04bbb6d2845ab08071daadb65fcc19aa471361cc197b84ddecb708694b3bebb3d8e35f9f825985348c5eacf4809afe
+  metadata.gz: 4afc3b9e000c00161e196a91936894b15a04adc6edb15760c69dd6adaa44357d1ed397f8dfe59f5105268f68faff22a72fcc1c1e8a0060236adc1141c97c3416
+  data.tar.gz: 23f7bca0c54d9266865ea766798640a6bc4d24815611fcde6dc0e0bd81a05a7710a81ab6e22ef19dd959cbdbef099b8af0c4854ccab4daea96366825369e0c0a

data/lib/skylight/core/normalizers/action_controller/process_action.rb

@@ -28,10 +28,10 @@ module Skylight::Core
           # Show 'error' if there's an unhandled exception or if the status is 4xx or 5xx
           if payload[:exception] || payload[:exception_object] || payload[:status].to_s =~ /^[45]/
             segment = "error"
-          # We won't have a rendered_format if it's a `head` outside of a `respond_to` block.
-          elsif payload[:rendered_format]
+          # We won't have a sk_rendered_format if it's a `head` outside of a `respond_to` block.
+          elsif payload[:sk_rendered_format]
             # We only show the variant if we actually have a format
-            segment = [payload[:rendered_format], payload[:variant]].compact.flatten.join("+")
+            segment = [payload[:sk_rendered_format], payload[:sk_variant]].compact.flatten.join("+")
           end
 
           if segment

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

@@ -4,6 +4,17 @@ module Skylight::Core
       class Perform < Normalizer
         register "perform.active_job"
 
+        DELIVERY_JOB = "ActionMailer::DeliveryJob".freeze
+
+        def self.normalize_title(job_instance)
+          job_instance.class.name.to_s.tap do |str|
+            if str == DELIVERY_JOB
+              mailer_class, mailer_method, * = job_instance.arguments
+              return ["#{mailer_class}##{mailer_method}", str]
+            end
+          end
+        end
+
         CAT = "app.job.perform".freeze
 
         def normalize(trace, _name, payload)
@@ -49,11 +60,13 @@ module Skylight::Core
             # If the current endpoint name matches this payload, return true to allow the
             # segment to be assigned by normalize_after.
             trace.endpoint == Skylight::Core::Probes::ActiveJob::Probe::TITLE ||
+              trace.endpoint == DELIVERY_JOB ||
               trace.endpoint == normalize_title(payload[:job])
           end
 
           def normalize_title(job_instance)
-            job_instance.class.to_s
+            title, * = self.class.normalize_title(job_instance)
+            title
           end
       end
     end

data/lib/skylight/core/probes/action_controller.rb

@@ -5,22 +5,23 @@ module Skylight::Core
         def install
           ::ActionController::Instrumentation.class_eval do
             private
-
               alias_method :append_info_to_payload_without_sk, :append_info_to_payload
               def append_info_to_payload(payload)
                 append_info_to_payload_without_sk(payload)
+
                 rendered_mime = begin
-                  if respond_to?(:rendered_format)
+                  if respond_to?(:rendered_format) && rendered_format
                     rendered_format
                   elsif content_type.is_a?(Mime::Type)
                     content_type
                   elsif content_type.respond_to?(:to_s)
-                    type_str = content_type.to_s.split(";").first
+                    type_str = content_type.to_s.split(';').first
                     Mime::Type.lookup(type_str) unless type_str.blank?
                   end
                 end
-                payload[:rendered_format] = rendered_mime.try(:ref)
-                payload[:variant] = request.respond_to?(:variant) ? request.variant : nil
+
+                payload[:sk_rendered_format] = rendered_mime.try(:ref)
+                payload[:sk_variant] = request.respond_to?(:variant) ? request.variant : nil
               end
           end
         end

data/lib/skylight/core/probes/action_view.rb

@@ -10,9 +10,9 @@ module Skylight::Core
               path, locals = case args.length
                              when 2
                                args
-                             when 3
-                               # Rails > 6.0.0.beta1 prepends an additional `view` argument
-                               args.last(2)
+                             when 4
+                               # Rails >= 6.0.0.beta2 arguments are (view, path, template, locals)
+                               [args[1], args[3]]
                              end
 
               layout = nil

data/lib/skylight/core/probes/active_job_enqueue.rb

@@ -9,8 +9,13 @@ module Skylight::Core
             begin
               job_class = job.class
               adapter_name = EnqueueProbe.normalize_adapter_name(job_class)
-              desc = "{ adapter: #{adapter_name}, queue: '#{job.queue_name}' }"
-              name = job_class.name
+
+              # If this is an ActionMailer::DeliveryJob, we'll report this as the mailer title
+              # and include ActionMailer::DeliveryJob in the description.
+              name, job_class_name = Skylight::Core::Normalizers::ActiveJob::Perform.normalize_title(job)
+              descriptors = ["adapter: '#{adapter_name}'", "queue: '#{job.queue_name}'"]
+              descriptors << "job: '#{job_class_name}'" if job_class_name
+              desc = "{ #{descriptors.join(', ')} }"
             rescue
               block.call
             else

data/lib/skylight/core/version.rb

@@ -1,5 +1,5 @@
 module Skylight
   module Core
-    VERSION = "4.0.0-beta".freeze
+    VERSION = "4.0.0-beta2".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight-core
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta
+  version: 4.0.0.beta2
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-14 00:00:00.000000000 Z
+date: 2019-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport