skylight-core 4.2.0.beta2 → 4.2.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34c416285f52795281bbd430f70367601d861b0af6f1b159ea4815aafa612016
-  data.tar.gz: 9a2608e5e0285a90ba5531a0200e3621611cca52034e2ab717564205d4583839
+  metadata.gz: 60447468569409892f992529357071ffbc96fdec761b360f0d875dd28a4b4cda
+  data.tar.gz: 55f68601c0449764eea3f85a5228a233d55829f9c485500fc518a39e4465d1a0
 SHA512:
-  metadata.gz: 755507e9ef7779f9dc1062c1a0fe8d934510a41fd01813f5389fee8c2f0fb5803dccc5da73536dd65a5ac5c1b87fe25622e71faa25a76d952bc4d762dbfff67f
-  data.tar.gz: 43ad79dbd48363114759634112dcacfbe770cbaa00827cb0277a586d67154952efe47242304e4f68a6f053e59d6819189272c4c48f9c552c78b22e4d07b52954
+  metadata.gz: bf727015e1cb1112fa8edb96ddb1845f023e15f5c15811849106fb0e8649565b69b5559037e423d446eb87d2dc533ff710cad3e0f64b603b2c892c3b377538c1
+  data.tar.gz: 397ab6335dcda160000b90fae373cb20731b96bd6f5f451f30e1daa037c98d38162530b71af10c892ab6bae252bd230f679d2be43af218ce3482d666c9eab200

data/lib/skylight/core/instrumentable.rb

@@ -98,6 +98,12 @@ module Skylight
             return
           end
 
+          if instrumenter.poisoned?
+            spawn_shutdown_thread!
+            return yield if block_given?
+            return
+          end
+
           cat ||= DEFAULT_CATEGORY
 
           if block_given?
@@ -188,6 +194,14 @@ module Skylight
           return unless instrumenter
           instrumenter.config
         end
+
+        # Runs the shutdown procedure in the background.
+        # This should do little more than unsubscribe from all ActiveSupport::Notifications
+        def spawn_shutdown_thread!
+          @shutdown_thread || const_get(:LOCK).synchronize do
+            @shutdown_thread ||= Thread.new { @instrumenter&.shutdown }
+          end
+        end
       end
     end
   end

data/lib/skylight/core/instrumenter.rb

@@ -260,6 +260,14 @@ module Skylight::Core
       trace.broken!
     end
 
+    def poison!
+      @poisoned = true
+    end
+
+    def poisoned?
+      @poisoned
+    end
+
     def done(span, meta = nil)
       return unless (trace = @trace_info.current)
       trace.done(span, meta)
@@ -290,12 +298,16 @@ module Skylight::Core
         native_submit_trace(trace)
         true
       rescue => e
-        warn "failed to submit trace to worker; trace=%s, err=%s", trace.uuid, e
-        t { "BACKTRACE:\n#{e.backtrace.join("\n")}" }
-        false
+        handle_instrumenter_error(trace, e)
       end
     end
 
+    def handle_instrumenter_error(trace, e)
+      warn "failed to submit trace to worker; trace=%s, err=%s", trace.uuid, e
+      t { "BACKTRACE:\n#{e.backtrace.join("\n")}" }
+      false
+    end
+
     def ignore?(trace)
       config.ignored_endpoints.include?(trace.endpoint)
     end

data/lib/skylight/core/sidekiq.rb

@@ -2,6 +2,11 @@ module Skylight
   module Core
     module Sidekiq
       def self.add_middleware(instrumentable)
+        unless defined?(::Sidekiq)
+          instrumentable.warn "Skylight for Sidekiq is active, but Sidekiq is not defined."
+          return
+        end
+
         ::Sidekiq.configure_server do |sidekiq_config|
           instrumentable.debug "Adding Sidekiq Middleware"
 

data/lib/skylight/core/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight-core
 version: !ruby/object:Gem::Version
-  version: 4.2.0.beta2
+  version: 4.2.0.beta3
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-13 00:00:00.000000000 Z
+date: 2019-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport