instana 2.7.1 → 2.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fe7c3837caaff2049722cb46bc33d0ea37789ded119a67550b27691ad0d11e1
-  data.tar.gz: 8cc41e4f9827901c0d8fb698fac1db5a043aa7ba18b6d5c71af71d9d7e1d8ac6
+  metadata.gz: 75c9fe7c6b744ebafc10428dbbfdcfe046fdcfc80b31227b29b4a18ade7ec5dd
+  data.tar.gz: 94b10d48f251f49157203534306399fed404adf619318cdebb0ff1864a74fc41
 SHA512:
-  metadata.gz: 2a82afe29514e0ac07761fb8cd7118db6bcef26b86acf1f68eedbf5d075680a126d7a7d0aa73a80acc47e4e19d8f999ae36e42c268131c5db8c2e47fd3e0ac3c
-  data.tar.gz: 4f8401eafd6b92bbbd121d65cb6370eb8b8a1a6dd1d5fa4bbcd8e46703b2e2dc345018f1b215a6f82b145c66b532531a8d054bfe48d3a052c42a44e0e3c3c185
+  metadata.gz: 56ff7ee602ef57a060bc1e467e11dc5466469433c54abc6457bb1959c4f5abf82d491b5db272b4cf45bea72335c28a0b9213357c44bf90543c123d424743f9f7
+  data.tar.gz: 811b2bd02833ec5127fdfeee050cab1ce3c1410e120ecd4452c41207b4c7a4fbc11f390ba8a62181f7a56fd3cd073392ca5115a68bfeb3a200f84ad5812a8ba7

data/lib/instana/instrumentation/action_cable.rb

@@ -9,7 +9,13 @@ module Instana
       end
 
       def process
-        @instana_trace_context ||= ::Instana.tracer.tracing? ? ::Instana.tracer.current_span.context : {}
+        # Wrapped in non_recording_span by the channel callbacks below, so it
+        # must be a SpanContext.
+        @instana_trace_context ||= if ::Instana.tracer.tracing?
+                                     ::Instana.tracer.current_span.context
+                                   else
+                                     OpenTelemetry::Trace::SpanContext::INVALID
+                                   end
         super
       end
     end

data/lib/instana/instrumentation/grpc.rb

@@ -58,7 +58,7 @@ module Instana
             kvs = { rpc: {} }
             metadata = active_call.metadata
 
-            incoming_context = {}
+            incoming_context = nil
             if metadata.key?('x-instana-t')
               incoming_context = SpanContext.new(trace_id: ::Instana::Util.header_to_id(metadata['x-instana-t']),
                                                  span_id: metadata.key?('x-instana-s') ? ::Instana::Util.header_to_id(metadata['x-instana-s']) : nil,

data/lib/instana/instrumentation/net-http.rb

@@ -57,7 +57,7 @@ module Instana
           current_span.record_exception(nil)
         end
         extra_headers = ::Instana::Util.extra_header_tags(response)&.merge(::Instana::Util.extra_header_tags(request))
-        kv_payload[:http][:header] = extra_headers unless extra_headers&.empty?
+        kv_payload[:http][:header] = extra_headers unless extra_headers && extra_headers.empty?
         response
       rescue => e
         current_span&.record_exception(e)

data/lib/instana/instrumentation/rack.rb

@@ -34,6 +34,7 @@ module Instana
       raise
     ensure
       finalize_trace(current_span, kvs, headers, trace_context) if ::Instana.tracer.tracing?
+      OpenTelemetry::Context.detach(@trace_token) if @trace_token
     end
 
     private
@@ -123,7 +124,6 @@ module Instana
     def finalize_trace(current_span, kvs, headers, trace_context)
       set_response_headers(headers, trace_context) if headers
       current_span.add_attributes(kvs)
-      OpenTelemetry::Context.detach(@trace_token) if @trace_token
       current_span.finish
     end
 

data/lib/instana/samplers/samplers.rb

@@ -68,7 +68,10 @@ module Instana
 
       def self.should_sample?(trace_id:, parent_context:, links:, name:, kind:, attributes:) # rubocop:disable Metrics/ParameterLists, Lint/UnusedMethodArgument:
         parent_span_context = OpenTelemetry::Trace.current_span(parent_context).context
-        tracestate = parent_span_context&.tracestate
+        # Parents wrapped in non_recording_span can expose a non-SpanContext
+        # #context; the new span's SpanContext needs a Tracestate, never nil.
+        tracestate = parent_span_context.tracestate if parent_span_context.respond_to?(:tracestate)
+        tracestate ||= OpenTelemetry::Trace::Tracestate::DEFAULT
         Result.new(decision: :__record_only__, tracestate: tracestate)
       end
     end

data/lib/instana/trace/tracer.rb

@@ -323,7 +323,9 @@ module Instana
     #   with_parent=current context, start_timestamp=current time.
     #
     def start_span(name, with_parent: nil, attributes: nil, links: nil, start_timestamp: ::Instana::Util.now_in_ms, kind: nil) # rubocop:disable Metrics/ParameterLists
-      return Instana::Trace.non_recording_span(with_parent) if !::Instana.agent.ready? || !::Instana.config[:tracing][:enabled]
+      # The placeholder's #context is read back as the parent by the next span
+      # start, so it must be a SpanContext (INVALID when there is no parent).
+      return Instana::Trace.non_recording_span(OpenTelemetry::Trace.current_span(with_parent).context) if !::Instana.agent.ready? || !::Instana.config[:tracing][:enabled]
 
       with_parent ||= OpenTelemetry::Context.current
       name ||= 'empty'

data/lib/instana/version.rb

@@ -2,6 +2,6 @@
 # (c) Copyright Instana Inc. 2016
 
 module Instana
-  VERSION = "2.7.1"
+  VERSION = "2.7.2"
   VERSION_FULL = "instana-#{VERSION}"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.7.2
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
@@ -93,6 +93,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: base64
   requirement: !ruby/object:Gem::Requirement
@@ -362,7 +376,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.14
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Ruby Distributed Tracing & Metrics Sensor for Instana
 test_files: []