bc-lightstep-ruby 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da452a7f373b4db3b6ee125e9b42787c4dca7e3848ef91fdbe24fc0991044b45
-  data.tar.gz: 10eb39929ce15f3df29924becdf69afd397f52297a8f74dd1504fc67ea634e2a
+  metadata.gz: 4f3a1bf19d2bd647344092637b395c79889582497e7505fe88a15e54ca490f49
+  data.tar.gz: 3dd48770cacc6e088edcbb63e26a9da3954b5112cc840890d79df3285c73b3b0
 SHA512:
-  metadata.gz: 4474f23f5dc1c0a7046df0cd3a748450df0c91619dedf5d123eb6ace4a5cc81884be514fbc70f62cfa4875ba3f4ebb3f59b580e8d59a7c2460d9949d68bdb476
-  data.tar.gz: 33d96552fe76aa2e70b20ef0e35c7b532ba0baf7d3e8528fd7fceafea7132b6a13fac6fa5d6f14bb54672090ce9e1f8ecf7c5f34f0e0e30ecbd2e808ec02baf8
+  metadata.gz: 7d8849b91e102c4ad4cac2272368d19b8f523f3195b280f9a7007344135c436ca9f7f0e44a0a0403dc4f1ea854a5de27e001d96eb96b40498d28ce63280f3501
+  data.tar.gz: 4fe13e2093848bba17236988b49649fbeeba3291f4c545d0732e7b4b79182c855719dcc7363f36e39141ff895976047fb369560abaaf328c688df2b426855dba

data/CHANGELOG.md

@@ -2,6 +2,11 @@ Changelog for the bc-lightstep-ruby gem.
 
 ### Pending Release
 
+### 2.2.2
+
+- Fix issue where parent span determination can be nil if lightstep is not initialized
+- Add tests for Ruby 2.7
+
 ### 2.2.1
 
 - Only set error tag in exceptions if not already set

data/bc-lightstep-ruby.gemspec

@@ -34,7 +34,6 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.6'
 
   spec.add_development_dependency 'activerecord', '> 4'
-  spec.add_development_dependency 'bundler', '~> 1.11'
   spec.add_development_dependency 'bundler-audit', '~> 0.6'
   spec.add_development_dependency 'rake', '>= 12.0'
   spec.add_development_dependency 'rspec', '~> 3.8'

data/lib/bigcommerce/lightstep/tracer.rb

@@ -128,7 +128,7 @@ module Bigcommerce
       def determine_parent(context:)
         # first attempt to find parent from args, if not, use carrier (headers) to lookup parent
         # 1 = FORMAT_TEXT_MAP (this constant is removed in future lightstep versions)
-        current_parent = context.is_a?(::LightStep::SpanContext) ? context : tracer.extract(1, context || {})
+        current_parent = extract_parent_from_context(context)
         # if no passed in parent, use the active thread parent
         current_parent = active_span if current_parent.nil?
         current_parent
@@ -155,6 +155,22 @@ module Bigcommerce
       def mark_root_span(span)
         span.instance_variable_set(:@root_span, true)
       end
+
+      ##
+      # @param [Hash|::LightStep::SpanContext] context
+      # @return [::LightStep::SpanContext]
+      # @return [NilClass]
+      #
+      def extract_parent_from_context(context)
+        return context if context.is_a?(::LightStep::SpanContext)
+
+        tracer.extract(1, context || {})
+      rescue StandardError => _e
+        # sometimes LightStep, when `start` is not run first, will error here. This protects this until the upstream
+        # library can be fixed. We essentially just want to silently no-op here, as this failing simply means there's
+        # no context to extract.
+        nil
+      end
     end
   end
 end

data/lib/bigcommerce/lightstep/version.rb

@@ -17,6 +17,6 @@
 #
 module Bigcommerce
   module Lightstep
-    VERSION = '2.2.1'
+    VERSION = '2.2.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bc-lightstep-ruby
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Shaun McCormick
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-29 00:00:00.000000000 Z
+date: 2021-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -24,20 +24,6 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '4'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.11'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -260,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Gem for lightstep distributed tracing