instana 2.9.0 → 2.11.0

data/lib/instana/trace/span_context.rb

@@ -68,7 +68,7 @@ module Instana
     end
 
     def to_hash
-      { :trace_id => @trace_id, :span_id => @span_id }
+      { :trace_id => @trace_id, :span_id => @span_id, :level => @level }
     end
 
     def valid?

data/lib/instana/util.rb

@@ -2,7 +2,7 @@
 # (c) Copyright Instana Inc. 2016
 
 module Instana
-  module Util
+  module Util # rubocop:disable Metrics/ModuleLength
     class << self
       ID_RANGE = -2**63..2**63-1
       # Retrieves and returns the source code for any ruby
@@ -171,6 +171,44 @@ module Instana
         given
       end
 
+      # Parse W3C +traceparent+ / +tracestate+ values using the OpenTelemetry
+      # trace-context propagator.
+      #
+      # When the tracestate carries an Instana entry (+in=<trace>;<span>+) it
+      # takes precedence over the ids in the traceparent.
+      #
+      # @param traceparent [String] the traceparent header value
+      # @param tracestate [String, nil] the tracestate header value
+      #
+      # @return [Hash, nil] +nil+ when the traceparent is missing or invalid,
+      #   otherwise a hash with:
+      #   - +:trace_id+, +:span_id+, +:level+ for continuing the trace
+      #   - +:external_trace_id+, +:external_trace_flags+, +:external_state+
+      #     for re-emitting the W3C context downstream
+      #
+      def parse_w3c_trace_context(traceparent, tracestate = nil)
+        return nil unless traceparent.is_a?(String)
+
+        carrier = { 'traceparent' => traceparent, 'tracestate' => tracestate.is_a?(String) ? tracestate : nil }
+        extracted = OpenTelemetry::Trace::Propagation::TraceContext.text_map_propagator.extract(
+          carrier, context: OpenTelemetry::Context.empty
+        )
+        span_context = OpenTelemetry::Trace.current_span(extracted).context
+        return nil unless span_context.valid?
+
+        sampled = span_context.trace_flags.sampled?
+        instana_state = span_context.tracestate.value('in')&.match(/\A(?<trace>[0-9a-f]+);(?<span>[0-9a-f]+)\z/)
+
+        {
+          trace_id: header_to_id(instana_state ? instana_state[:trace] : span_context.hex_trace_id[16..]),
+          span_id: header_to_id(instana_state ? instana_state[:span] : span_context.hex_span_id),
+          level: sampled ? 1 : 0,
+          external_trace_id: span_context.hex_trace_id,
+          external_trace_flags: sampled ? '01' : '00',
+          external_state: tracestate
+        }
+      end
+
       def timeout_timestamp
         Process.clock_gettime(Process::CLOCK_MONOTONIC)
       end
@@ -229,6 +267,35 @@ module Instana
 
         klass.name.sub('Net::HTTP', '').gsub(/([A-Z])/, ' \1').strip
       end
+
+      # Build the W3C trace-context message attributes for an AWS message
+      # (SQS or SNS).  Returns a hash suitable for merging into
+      # +params[:message_attributes]+.
+      #
+      # @param span_context [Instana::SpanContext]
+      # @return [Hash]
+      #
+      def aws_message_attributes_w3c(span_context)
+        {
+          'traceparent' => { data_type: 'String', string_value: span_context.trace_parent_header },
+          'tracestate' => { data_type: 'String', string_value: span_context.trace_state_header }
+        }
+      end
+
+      # Build the Instana proprietary message attributes for an AWS message
+      # (SQS or SNS).  Returns a hash suitable for merging into
+      # +params[:message_attributes]+.
+      #
+      # @param span_context [Instana::SpanContext]
+      # @return [Hash]
+      #
+      def aws_message_attributes_instana(span_context)
+        {
+          'X_INSTANA_T' => { data_type: 'String', string_value: span_context.trace_id },
+          'X_INSTANA_S' => { data_type: 'String', string_value: span_context.span_id },
+          'X_INSTANA_L' => { data_type: 'String', string_value: span_context.level.to_s }
+        }
+      end
     end
   end
 end

data/lib/instana/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.11.0
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
@@ -416,7 +416,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.21
+rubygems_version: 4.0.23
 specification_version: 4
 summary: Ruby Distributed Tracing & Metrics Sensor for Instana
 test_files: []