skylight-core 4.0.0.alpha2 → 4.0.0.alpha3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcb4098f385b742f3c0a35e4f15870fbfefe917b3cd21c411ade2d523ebae700
-  data.tar.gz: 743e877a1931e73c52231db337f880e5628a5634de3e82d72e6dcc990f1a0ae6
+  metadata.gz: dc9eb39c7b8b4247a019740d8ac1784ed1442ae33f20bfc04fe061be5151a8e3
+  data.tar.gz: 78c44b3fe3015152a7ebef7da37986e25bd87d48ddae853fdd7af77030dcb40b
 SHA512:
-  metadata.gz: 52153aa179543d1f8ec6a1c352d18e8b36050f3bfe14e56182a5db42528d831477199c8f8136f41ad1934c30fb748afa427a5f8f1d0d5c68afddfd49ce034d62
-  data.tar.gz: 265f428b0b1ea26a0bc7456ce4a00ec79cb5571378fbf8306a49f25ed7713fefdc036beba1bdc223e22f0829a87d15c0e623e4d86255807e7da37bc7f2169ff4
+  metadata.gz: 6797bce1826972cba73f28d2f4c0c941fb3b9f6e593e022d6d58f7fccb155e9162055a0d3defc82aa790d8c2d4c308cd662ea9014dcdce19c3e8d3cf6eaaf201
+  data.tar.gz: 9831703c5ed2ecf9468c0b6ffde0237c04fe7f7abadb9c4eee9b4697730521a8a870cff9d42089edb571d3ff3ce96f16c017fbef132c4f6af0e9580b38a2ae05

data/lib/skylight/core/instrumentable.rb

@@ -20,7 +20,7 @@ module Skylight
         end
 
         def instrumenter
-          @instrumenter
+          defined?(@instrumenter) && @instrumenter
         end
 
         def correlation_header
@@ -37,10 +37,10 @@ module Skylight
 
         # Start instrumenting
         def start!(config = nil)
-          return @instrumenter if @instrumenter
+          return instrumenter if instrumenter
 
           const_get(:LOCK).synchronize do
-            return @instrumenter if @instrumenter
+            return instrumenter if instrumenter
 
             config ||= {}
             config = config_class.load(config) unless config.is_a?(config_class)
@@ -66,13 +66,17 @@ module Skylight
           false
         end
 
+        def started?
+          !!instrumenter
+        end
+
         # Stop instrumenting
         def stop!
           t { "stop!" }
 
           const_get(:LOCK).synchronize do
             t { "stop! synchronized" }
-            return unless @instrumenter
+            return unless instrumenter
             # This is only really helpful for getting specs to pass.
             @instrumenter.current_trace = nil
 
@@ -88,7 +92,7 @@ module Skylight
         end
 
         # Start a trace
-        def trace(endpoint = nil, cat = nil, title = nil, meta = nil, segment: nil)
+        def trace(endpoint = nil, cat = nil, title = nil, meta: nil, segment: nil)
           unless instrumenter
             return yield if block_given?
             return
@@ -97,9 +101,9 @@ module Skylight
           cat ||= DEFAULT_CATEGORY
 
           if block_given?
-            instrumenter.trace(endpoint, cat, title, nil, meta, segment: segment) { |tr| yield tr }
+            instrumenter.trace(endpoint, cat, title, nil, meta: meta, segment: segment) { |tr| yield tr }
           else
-            instrumenter.trace(endpoint, cat, title, nil, meta, segment: segment)
+            instrumenter.trace(endpoint, cat, title, nil, meta: meta, segment: segment)
           end
         end
 

data/lib/skylight/core/instrumenter.rb

@@ -120,7 +120,7 @@ module Skylight::Core
       native_stop
     end
 
-    def trace(endpoint, cat, title = nil, desc = nil, meta = nil, segment: nil)
+    def trace(endpoint, cat, title = nil, desc = nil, meta: nil, segment: nil)
       # If a trace is already in progress, continue with that one
       if (trace = @trace_info.current)
         return yield(trace) if block_given?
@@ -128,7 +128,7 @@ module Skylight::Core
       end
 
       begin
-        trace = self.class.trace_class.new(self, endpoint, Util::Clock.nanos, cat, title, desc, meta, segment: segment)
+        trace = self.class.trace_class.new(self, endpoint, Util::Clock.nanos, cat, title, desc, meta: meta, segment: segment)
       rescue Exception => e
         log_error e.message
         t { e.backtrace.join("\n") }
@@ -155,7 +155,7 @@ module Skylight::Core
     end
 
     def disabled?
-      @disabled
+      defined?(@disabled) && @disabled
     end
 
     def self.match?(string, regex)

data/lib/skylight/core/middleware.rb

@@ -78,8 +78,8 @@ module Skylight::Core
       else
         begin
           t { "middleware beginning trace" }
-          trace = instrumentable.trace(endpoint_name(env), "app.rack.request", nil, endpoint_meta(env))
-          t { "middleware began trace=#{trace.uuid}" }
+          trace = instrumentable.trace(endpoint_name(env), "app.rack.request", nil, meta: endpoint_meta(env))
+          t { "middleware began trace=#{trace ? trace.uuid : nil}" }
 
           resp = @app.call(env)
 
@@ -88,8 +88,8 @@ module Skylight::Core
           else
             resp
           end
-        rescue Exception
-          t { "middleware exception: #{trace}" }
+        rescue Exception => e
+          t { "middleware exception: #{e}\n#{e.backtrace.join("\n")}" }
           trace.submit if trace
           raise
         end

data/lib/skylight/core/trace.rb

@@ -9,7 +9,7 @@ module Skylight::Core
     attr_reader :instrumenter, :endpoint, :notifications, :meta
     attr_accessor :uuid, :segment
 
-    def self.new(instrumenter, endpoint, start, cat, title = nil, desc = nil, meta = nil, segment: nil)
+    def self.new(instrumenter, endpoint, start, cat, title = nil, desc = nil, meta: nil, segment: nil)
       uuid = SecureRandom.uuid
       inst = native_new(normalize_time(start), uuid, endpoint, meta)
       inst.uuid = uuid

data/lib/skylight/core/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight-core
 version: !ruby/object:Gem::Version
-  version: 4.0.0.alpha2
+  version: 4.0.0.alpha3
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-19 00:00:00.000000000 Z
+date: 2019-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -42,16 +42,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: 1.17.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: 1.17.3
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -263,15 +263,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.7
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: The core methods of the Skylight profiler.