skylight-core 4.2.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a473587df8be0c1cf35b0296875e2cbd3c47d678be913e61c770e7d29d30756a
-  data.tar.gz: d637956868b2c614225343bf10a063038778df91418053222d7a5e5038fcaa69
+  metadata.gz: 8c4b136b3f461ff94a6d693a2b1aca9c63c178e4bd3db96101ad667cfe54441e
+  data.tar.gz: fc5d2e143f1c03184d8ae05cbca803c5e27320ed070a04f7eff13101f4b29023
 SHA512:
-  metadata.gz: 91aebd0cfa951251a62903542df63949db425718233e178d362318bce81e4ccd865372e4d1cd9891d1adc09d87d8ac182daf5e5c6c7ded5b81f800ba1faa3374
-  data.tar.gz: 4d442162789bcbd47ae5bc37fabdaf49650c0fb4f7fc8b50c6a4c2c63cfe6271cd66191db27114d9985ffdcaf5a82effad58984065411b469d9cafa064f3ed63
+  metadata.gz: 9e9ed8c974221845ad2724cbedf5deea98a51519a3d098b6d9f5309e6660f6f0327ad6435fd5bf8e420bc3b474e377ab732e4a6fa90b80fac53f222ec16996e2
+  data.tar.gz: dff09e0c589d7e2d84eba7c7e5baf8edc294dd44717a5fda4cc2d1effeb9e58adb28fce645176c4d6fcd7c48a4c5ae30db6145e9c5d97367ad92e8e0c7101a24

data/lib/skylight/core/middleware.rb

@@ -44,17 +44,31 @@ module Skylight::Core
       end
     end
 
-    def self.with_after_close(resp, &block)
+    def self.with_after_close(resp, debug_identifier: "unknown", &block)
       # Responses should be arrays but in some situations they aren't
       #   e.g. https://github.com/ruby-grape/grape/issues/1041
-      # The safest approach seems to be to rely on implicit destructuring
-      #   since that is currently what Rack::Lint does.
       # See also https://github.com/rack/rack/issues/1239
-      status, headers, body = resp
 
+      unless resp.respond_to?(:to_ary)
+        if resp.respond_to?(:to_a)
+          log_target.warn("Rack response from \"#{debug_identifier}\" cannot be implicitly converted to an array. This is in violation of "\
+                          "the Rack SPEC and will raise an error in future versions.")
+          resp = resp.to_a
+        else
+          log_target.error("Rack response from \"#{debug_identifier}\" cannot be converted to an array. This is in violation of the Rack SPEC "\
+                          "and may cause problems with Skylight operation.")
+          return resp
+        end
+      end
+
+      status, headers, body = resp
       [status, headers, BodyProxy.new(body, &block)]
     end
 
+    def self.log_target
+      @log_target ||= (Skylight::Core::Fanout.registered.first&.config || Logger.new(STDERR))
+    end
+
     include Util::Logging
 
     # For Util::Logging
@@ -84,7 +98,7 @@ module Skylight::Core
           resp = @app.call(env)
 
           if trace
-            Middleware.with_after_close(resp) { trace.submit }
+            Middleware.with_after_close(resp, debug_identifier: "Rack App: #{@app.class}") { trace.submit }
           else
             resp
           end

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

@@ -4,12 +4,12 @@ module Skylight::Core
       class Perform < Normalizer
         register "perform.active_job"
 
-        DELIVERY_JOB = "ActionMailer::DeliveryJob".freeze
+        DELIVERY_JOB = /\AActionMailer::(Mail)?DeliveryJob\Z/.freeze
         DELAYED_JOB_WRAPPER = "ActiveJob::QueueAdapters::DelayedJobAdapter::JobWrapper".freeze
 
         def self.normalize_title(job_instance)
           job_instance.class.name.to_s.tap do |str|
-            if str == DELIVERY_JOB
+            if str.match(DELIVERY_JOB)
               mailer_class, mailer_method, * = job_instance.arguments
               return ["#{mailer_class}##{mailer_method}", str]
             end

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

@@ -33,7 +33,7 @@ module Skylight::Core
                 spans = Skylight::Core::Fanout.instrument(title: name, category: "#{category}")
                 resp = call_without_sk(*args, &block)
 
-                proxied_response = Skylight::Core::Middleware.with_after_close(resp) do
+                proxied_response = Skylight::Core::Middleware.with_after_close(resp, debug_identifier: "Middleware: #{name}") do
                   Skylight::Core::Fanout.done(spans)
                 end
               rescue Exception => err

data/lib/skylight/core/version.rb

@@ -1,5 +1,5 @@
 module Skylight
   module Core
-    VERSION = "4.2.0".freeze
+    VERSION = "4.2.1".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight-core
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.1
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-30 00:00:00.000000000 Z
+date: 2020-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -269,8 +269,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: The core methods of the Skylight profiler.