instana 2.10.0 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85a74f9236a4a35af2f74850bb0c5230a921f37b23bdf80af6b578375fe620d3
-  data.tar.gz: eaaa01ae5c3a67c7d374fff6ccdf58be1bff45e8ba36186e2617b3084abb2e90
+  metadata.gz: 651f82ecb4bf26f63225bb880fff4028fca72f641eeac492b3bbb85d4c0be0d2
+  data.tar.gz: b311f0c13d53cf688247b580f018a57a62569eb0a1fa5c25d8fac1a8939ffdf0
 SHA512:
-  metadata.gz: 1338789ea5e37aa238bc08815cdbabf801ead7b17f28a9fc49e1efefecfa103ed2d0eb2958be6a50efa821169c2b4551e2b521b6f518585fa75e30a84cc92b0e
-  data.tar.gz: f1290dc8888e9e570bc2ee6a1dab5f11ac2f241726a0bf809aaa4c8fa5066d2bc142a268be3e85183052e9f26eff5a9a3377cf48b06a91acf9861f1c490f4da5
+  metadata.gz: 29c82de02af9e09ebaa84da9429d70867f1f8eb3c397836d50a78eaddecf8339a6b20e809bbdadc22dbd0f5f8672e766d96aff1c0802f9a08edefd7bccb0a1ae
+  data.tar.gz: e099c624a54ce5871010efad8ad469d8aebf0672cc7011a49bd26c9b448fcc6883eb58122cc9424f69757432b418b1a38fe332d78b1718c65ba60cae8958754e

data/lib/instana/base.rb

@@ -6,6 +6,11 @@ require "instana/version"
 require "instana/util"
 
 module Instana
+  # Instana trace context header names
+  INSTANA_TRACE_ID_HEADER = 'X-Instana-T'.freeze
+  INSTANA_SPAN_ID_HEADER = 'X-Instana-S'.freeze
+  INSTANA_LEVEL_HEADER = 'X-Instana-L'.freeze
+
   class << self
     attr_accessor :agent
     attr_accessor :tracer

data/lib/instana/config.rb

@@ -83,6 +83,10 @@ module Instana
       # W3C Trace Context Support
       @config[:w3c_trace_correlation] = ENV.fetch('INSTANA_DISABLE_W3C_TRACE_CORRELATION', nil).nil?
 
+      # Server-Timing response header injection (default: injected)
+      # Priority: YAML > env var > agent config > default (false)
+      read_disable_server_timing_config
+
       # HTTP exit span 4xx error classification (opt-in, default: off)
       # Priority: env vars > agent config > default (false / [])
       read_http_exit_config
@@ -151,6 +155,8 @@ module Instana
       read_otlp_config_from_agent(tracing_config) if should_read_from_agent?(:otlp)
       # Read HTTP exit 4xx classification from agent if env vars did not already set it
       read_http_exit_classification_from_agent(tracing_config) unless env_http_exit_classification_set?
+      # Read Server-Timing disable flag from agent if not already set from YAML or env
+      read_disable_server_timing_from_agent(tracing_config) if @config[:disable_server_timing_source] == 'default'
       # Read span filtering configuration from agent
       ::Instana.span_filtering_config&.read_config_from_agent(discovery)
     rescue => e
@@ -268,6 +274,49 @@ module Instana
 
     private
 
+    # Read disable-server-timing from YAML (tracing.global) or INSTANA_TRACING_DISABLE_SERVER_TIMING.
+    # Agent value is applied later via read_config_from_agent if neither is set.
+    def read_disable_server_timing_config
+      @config[:disable_server_timing] = false
+      @config[:disable_server_timing_source] = 'default'
+
+      yaml_value = parse_disable_server_timing_from_yaml
+      unless yaml_value.nil?
+        @config[:disable_server_timing] = truthy?(yaml_value)
+        @config[:disable_server_timing_source] = 'yaml'
+        return
+      end
+
+      env_value = ENV.fetch('INSTANA_TRACING_DISABLE_SERVER_TIMING', nil)
+      return if env_value.nil? || env_value.strip.empty?
+
+      @config[:disable_server_timing] = truthy?(env_value.strip)
+      @config[:disable_server_timing_source] = 'env'
+    end
+
+    # @return [Object, nil] raw YAML value of tracing.global.disable-server-timing, or nil if not set
+    def parse_disable_server_timing_from_yaml
+      config_path = ENV.fetch('INSTANA_CONFIG_PATH', nil)
+      return nil unless config_path && File.exist?(config_path)
+
+      yaml_content = YAML.safe_load(File.read(config_path))
+      tracing_config = yaml_content[TRACING_KEY] || yaml_content[LEGACY_TRACING_KEY]
+      global_config = tracing_config && tracing_config['global']
+      global_config.is_a?(Hash) ? global_config['disable-server-timing'] : nil
+    rescue => e
+      ::Instana.logger.warn("Failed to load disable-server-timing configuration from YAML: #{e.message}")
+      nil
+    end
+
+    # @param tracing_config [Hash] the tracing sub-hash from the discovery payload
+    def read_disable_server_timing_from_agent(tracing_config)
+      global_config = tracing_config['global']
+      return unless global_config.is_a?(Hash) && !global_config['disable-server-timing'].nil?
+
+      @config[:disable_server_timing] = truthy?(global_config['disable-server-timing'])
+      @config[:disable_server_timing_source] = 'agent'
+    end
+
     # Read HTTP exit 4xx error classification config (wrapper — same pattern as read_span_stack_config / read_otlp_config)
     def read_http_exit_config
       @config[:http_exit_classify_all_4xx_as_errors] = false

data/lib/instana/instrumentation/active_job.rb

@@ -1,19 +1,5 @@
 # (c) Copyright IBM Corp. 2021
 # (c) Copyright Instana Inc. 2021
-module OpenTelemetry
-  module Trace
-    module Propagation
-      module TraceContext
-        # A TraceParent is an implementation of the W3C trace context specification
-        # https://www.w3.org/TR/trace-context/
-        # {Trace::SpanContext}
-        class TraceParent
-          REGEXP = /^(?<version>[A-Fa-f0-9]{2})-(?<trace_id>[A-Fa-f0-9]{32})-(?<span_id>[A-Fa-f0-9]{32})-(?<flags>[A-Fa-f0-9]{2})(?<ignored>-.*)?$/
-        end
-      end
-    end
-  end
-end
 
 module Instana
   module Instrumentation
@@ -48,11 +34,8 @@ module Instana
               job_id: job.job_id
             }
           }
-          incoming_context = if job.arguments.is_a?(Array) && job.arguments.last.is_a?(Hash) && job.arguments.last.key?(:instana_context)
-                               instana_context = job.arguments.last[:instana_context]
-                               job.arguments.pop
-                               instana_context ? ::Instana::SpanContext.new(trace_id: instana_context[:trace_id], span_id: instana_context[:span_id]) : nil
-                             end
+          incoming_context = ::Instana::Instrumentation::ActiveJob.extract_context(job)
+
           Trace.with_span(OpenTelemetry::Trace.non_recording_span(incoming_context)) do
             ::Instana.tracer.in_span(:activejob, attributes: tags) do
               block.call
@@ -60,6 +43,38 @@ module Instana
           end
         end
       end
+
+      def self.extract_context(job)
+        # 1. From job arguments (Instana payload)
+        if job.arguments.is_a?(Array) && job.arguments.last.is_a?(Hash) && job.arguments.last.key?(:instana_context)
+          instana_context = job.arguments.last[:instana_context]
+          job.arguments.pop
+          return instana_context ? ::Instana::SpanContext.new(
+            trace_id: instana_context[:trace_id],
+            span_id: instana_context[:span_id],
+            level: instana_context[:level] || 1
+          ) : nil
+        end
+
+        # 2. From job.__otel_headers (if opentelemetry-instrumentation-active_job is active)
+        if job.respond_to?(:__otel_headers) && job.__otel_headers.is_a?(Hash)
+          headers = job.__otel_headers
+          tp = headers['traceparent'] || headers[:traceparent]
+          if tp
+            ctx = parse_w3c_traceparent(tp, headers['tracestate'] || headers[:tracestate])
+            return ctx if ctx
+          end
+        end
+
+        nil
+      end
+
+      def self.parse_w3c_traceparent(traceparent, tracestate)
+        ctx = ::Instana::Util.parse_w3c_trace_context(traceparent, tracestate)
+        return nil unless ctx
+
+        ::Instana::SpanContext.new(trace_id: ctx[:trace_id], span_id: ctx[:span_id], level: ctx[:level])
+      end
     end
   end
 end

data/lib/instana/instrumentation/aws_sdk_lambda.rb

@@ -9,15 +9,24 @@ module Instana
         def call(context)
           return @handler.call(context) unless [:invoke_async, :invoke].include?(context.operation_name)
 
-          if context.params[:client_context].nil? && ::Instana.tracer.tracing? && context.operation_name == :invoke
+          if ::Instana.tracer.tracing? && context.operation_name == :invoke
             span_context = ::Instana.tracer.context
-            payload = {
-              'X-INSTANA-T' => span_context.trace_id,
-              'X-INSTANA-S' => span_context.span_id,
-              'X-INSTANA-L' => span_context.level.to_s
-            }
+            if span_context
+              trace_payload = {
+                'X-INSTANA-T' => span_context.trace_id,
+                'X-INSTANA-S' => span_context.span_id,
+                'X-INSTANA-L' => span_context.level.to_s,
+                'traceparent' => span_context.trace_parent_header,
+                'tracestate' => span_context.trace_state_header
+              }.reject { |_, v| v.nil? || v.empty? }
 
-            context.params[:client_context] = Base64.strict_encode64(JSON.dump(payload))
+              merged = if context.params[:client_context]
+                         JSON.parse(Base64.strict_decode64(context.params[:client_context])).merge(trace_payload)
+                       else
+                         trace_payload
+                       end
+              context.params[:client_context] = Base64.strict_encode64(JSON.dump(merged))
+            end
           end
 
           tags = {

data/lib/instana/instrumentation/aws_sdk_sns.rb

@@ -14,11 +14,41 @@ module Instana
           }.reject { |_, v| v.nil? }
 
           if context.operation_name == :publish
-            ::Instana.tracer.in_span(:sns, attributes: {sns: sns_tags}) { @handler.call(context) }
+            ::Instana.tracer.in_span(:sns, attributes: { sns: sns_tags }) do |_span|
+              if ::Instana.tracer.tracing?
+                inject_trace_attributes(context.params)
+              end
+              @handler.call(context)
+            end
+          elsif context.operation_name == :publish_batch
+            ::Instana.tracer.in_span(:sns, attributes: { sns: sns_tags }) do |_span|
+              if ::Instana.tracer.tracing?
+                context.params[:publish_batch_request_entries]&.each do |entry|
+                  inject_trace_attributes(entry)
+                end
+              end
+              @handler.call(context)
+            end
           else
             @handler.call(context)
           end
         end
+
+        private
+
+        def inject_trace_attributes(params)
+          span_context = ::Instana.tracer.context
+          return unless span_context
+
+          params[:message_attributes] ||= {}
+          available_slots = 10 - params[:message_attributes].size
+
+          extra = ::Instana::Util.aws_message_attributes_w3c(span_context)
+          extra.merge!(::Instana::Util.aws_message_attributes_instana(span_context)) if available_slots >= 5
+
+          extra.reject! { |_, v| v[:string_value].nil? || v[:string_value].empty? }
+          params[:message_attributes].merge!(extra)
+        end
       end
 
       def add_handlers(handlers, _config)

data/lib/instana/instrumentation/aws_sdk_sqs.rb

@@ -36,11 +36,16 @@ module Instana
 
         def inject_instana_headers(span, params)
           params[:message_attributes] ||= {}
-          params[:message_attributes].merge!({
-                                               "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}
-                                             })
+          span_context = span.context
+          return unless span_context
+
+          available_slots = 10 - params[:message_attributes].size
+
+          extra = ::Instana::Util.aws_message_attributes_w3c(span_context)
+          extra.merge!(::Instana::Util.aws_message_attributes_instana(span_context)) if available_slots >= 5
+
+          extra.reject! { |_, v| v[:string_value].nil? || v[:string_value].empty? }
+          params[:message_attributes].merge!(extra)
         end
 
         def tags_for(operation_name, params)

data/lib/instana/instrumentation/bunny.rb

@@ -20,9 +20,11 @@ module Instana
           ::Instana.tracer.in_span(:rabbitmq, attributes: kvs) do |span|
             # Inject trace context into message headers
             options[:headers] ||= {}
-            options[:headers]['X-Instana-T'] = span.context.trace_id
-            options[:headers]['X-Instana-S'] = span.context.span_id
-            options[:headers]['X-Instana-L'] = span.context.level.to_s
+            options[:headers][INSTANA_TRACE_ID_HEADER] = span.context.trace_id
+            options[:headers][INSTANA_SPAN_ID_HEADER] = span.context.span_id
+            options[:headers][INSTANA_LEVEL_HEADER] = span.context.level.to_s
+            options[:headers]['traceparent']  = span.context.trace_parent_header
+            options[:headers]['tracestate']   = span.context.trace_state_header
 
             super(payload, options)
           end
@@ -113,13 +115,28 @@ module Instana
         return {} unless properties && properties.headers
 
         headers = properties.headers
+
+        if headers[INSTANA_TRACE_ID_HEADER]
+          extract_instana_context(headers)
+        elsif headers['traceparent']
+          extract_w3c_context(headers)
+        else
+          {}
+        end
+      end
+
+      def extract_instana_context(headers)
         {
-          trace_id: headers['X-Instana-T'],
-          span_id: headers['X-Instana-S'],
-          level: headers['X-Instana-L']&.to_i
+          trace_id: headers[INSTANA_TRACE_ID_HEADER],
+          span_id: headers[INSTANA_SPAN_ID_HEADER],
+          level: headers[INSTANA_LEVEL_HEADER]&.to_i || 1
         }.reject { |_, v| v.nil? }
       end
 
+      def extract_w3c_context(headers)
+        ::Instana::Util.parse_w3c_trace_context(headers['traceparent'], headers['tracestate']) || {}
+      end
+
       def log_error(error)
         # Log errors on to console if INSTANA_DEBUG is enabled
         ::Instana.logger.debug { "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{error.message}" }

data/lib/instana/instrumentation/grpc.rb

@@ -8,8 +8,8 @@ module Instana
     module GRPCCientInstrumentation
       CALL_TYPES = [:request_response, :client_streamer, :server_streamer, :bidi_streamer]
 
-      CALL_TYPES.each do |call_type|
-        define_method(call_type) do |method, *others, **options|
+      CALL_TYPES.each do |call_type| # rubocop:disable Metrics/BlockLength
+        define_method(call_type) do |method, *others, **options| # rubocop:disable Metrics/BlockLength
           begin
             kvs = { rpc: {} }
 
@@ -26,10 +26,15 @@ module Instana
 
             context = ::Instana.tracer.context
             if context
-              options[:metadata] = (options[:metadata] || {}).merge(
+              extra = {
                 'x-instana-t' => context.trace_id_header,
-                'x-instana-s' => context.span_id_header
-              )
+                'x-instana-s' => context.span_id_header,
+                'x-instana-l' => context.level.to_s,
+                'traceparent' => context.trace_parent_header,
+                'tracestate' => context.trace_state_header
+              }
+              extra.reject! { |_, v| v.nil? || v.empty? }
+              options[:metadata] = (options[:metadata] || {}).merge(extra)
             end
 
             super(method, *others, **options)
@@ -58,12 +63,7 @@ module Instana
             kvs = { rpc: {} }
             metadata = active_call.metadata
 
-            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,
-                                                 level: metadata.key?('x-instana-l') ? metadata['x-instana-l'] : nil)
-            end
+            incoming_context = extract_grpc_context(metadata)
 
             kvs[:rpc][:flavor] = :grpc
             kvs[:rpc][:host] = Socket.gethostname
@@ -87,6 +87,34 @@ module Instana
           end
         end
       end
+
+      private
+
+      def extract_grpc_context(metadata)
+        if metadata.key?('x-instana-t')
+          extract_instana_grpc_context(metadata)
+        elsif metadata.key?('traceparent')
+          extract_w3c_grpc_context(metadata)
+        end
+      end
+
+      def extract_instana_grpc_context(metadata)
+        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,
+          level: metadata['x-instana-l'] || 1
+        )
+      end
+
+      def extract_w3c_grpc_context(metadata)
+        ctx = ::Instana::Util.parse_w3c_trace_context(metadata['traceparent'], metadata['tracestate'])
+        return nil unless ctx
+
+        SpanContext.new(trace_id: ctx[:trace_id],
+                        span_id: ctx[:span_id],
+                        level: ctx[:level],
+                        baggage: ctx.slice(:external_trace_id, :external_trace_flags, :external_state))
+      end
     end
   end
 end

data/lib/instana/instrumentation/instrumented_request.rb

@@ -32,19 +32,14 @@ module Instana
 
       context[:level] = @env['HTTP_X_INSTANA_L'][0] if @env['HTTP_X_INSTANA_L']
 
-      unless ::Instana.config[:w3c_trace_correlation]
-        trace_state = parse_trace_state
-
-        if context[:from_w3c] && trace_state.empty?
-          context.delete(:span_id)
-          context[:from_w3c] = false
-        elsif context[:from_w3c] && !trace_state.empty?
-          context[:trace_id] = trace_state[:t]
-          context[:span_id] = trace_state[:p]
-          context[:from_w3c] = false
-        end
+      # Honour W3C sampled bit when no X-Instana-L is present.
+      if context[:level].nil? && context[:external_trace_flags]
+        w3c_sampled = (context[:external_trace_flags].to_i(16) & 0x01) == 1
+        context[:level] = w3c_sampled ? '1' : '0'
       end
 
+      apply_legacy_w3c_override(context) unless ::Instana.config[:w3c_trace_correlation]
+
       context
     end
 
@@ -107,6 +102,21 @@ module Instana
 
     private
 
+    def apply_legacy_w3c_override(context)
+      return unless context[:from_w3c]
+
+      trace_state = parse_trace_state
+
+      if trace_state.empty?
+        context.delete(:span_id)
+      else
+        context[:trace_id] = trace_state[:t]
+        context[:span_id] = trace_state[:p]
+      end
+
+      context[:from_w3c] = false
+    end
+
     def context_from_instana_headers
       sanitized_t = ::Instana::Util.header_to_id(@env['HTTP_X_INSTANA_T'])
       sanitized_s = ::Instana::Util.header_to_id(@env['HTTP_X_INSTANA_S'])

data/lib/instana/instrumentation/rack.rb

@@ -139,6 +139,8 @@ module Instana
       end
 
       headers['Traceparent'] = trace_context.trace_parent_header
+      return if ::Instana.config[:disable_server_timing]
+
       headers['Server-Timing'] = "intid;desc=#{trace_context.trace_id_header}"
     end
   end

data/lib/instana/instrumentation/resque.rb

@@ -79,7 +79,8 @@ module Instana
                           context_from_wire = job.payload['args'].pop
                           ::Instana::SpanContext.new(
                             trace_id: context_from_wire['trace_id'],
-                            span_id: context_from_wire['span_id']
+                            span_id: context_from_wire['span_id'],
+                            level: context_from_wire['level'] || 1
                           )
                         end
         span = OpenTelemetry::Trace.non_recording_span(trace_context) if trace_context

data/lib/instana/instrumentation/shoryuken.rb

@@ -15,24 +15,45 @@ module Instana
         }
 
         context = incomming_context_from(sqs_message.message_attributes)
-        instana_context = Instana::SpanContext.new(trace_id: context[:trace_id], span_id: context[:span_id], level: context[:level])
-        Trace.with_span(OpenTelemetry::Trace.non_recording_span(instana_context)) do
-          ::Instana.tracer.in_span(:sqs, attributes: {sqs: sqs_tags}, &block)
+        if context[:trace_id]
+          instana_context = Instana::SpanContext.new(
+            trace_id: context[:trace_id],
+            span_id: context[:span_id],
+            level: context[:level] || 1
+          )
+          Trace.with_span(OpenTelemetry::Trace.non_recording_span(instana_context)) do
+            ::Instana.tracer.in_span(:sqs, attributes: { sqs: sqs_tags }, &block)
+          end
+        else
+          ::Instana.tracer.in_span(:sqs, attributes: { sqs: sqs_tags }, &block)
         end
       end
 
       private
 
       def incomming_context_from(attributes)
-        trace_id = read_message_header(attributes, 'X_INSTANA_T')
-        span_id = read_message_header(attributes, 'X_INSTANA_S')
-        level = read_message_header(attributes, 'X_INSTANA_L')
-
-        {
-          trace_id: trace_id,
-          span_id: span_id,
-          level: level
-        }.reject { |_, v| v.nil? }
+        return {} unless attributes
+
+        if read_message_header(attributes, 'X_INSTANA_T')
+          trace_id = read_message_header(attributes, 'X_INSTANA_T')
+          span_id = read_message_header(attributes, 'X_INSTANA_S')
+          level = read_message_header(attributes, 'X_INSTANA_L')
+
+          {
+            trace_id: trace_id,
+            span_id: span_id,
+            level: level ? level.to_i : 1
+          }.reject { |_, v| v.nil? }
+        else
+          w3c_context_from(attributes)
+        end
+      end
+
+      def w3c_context_from(attributes)
+        ::Instana::Util.parse_w3c_trace_context(
+          read_message_header(attributes, 'traceparent'),
+          read_message_header(attributes, 'tracestate')
+        ) || {}
       end
 
       def read_message_header(attributes, key)

data/lib/instana/instrumentation/sidekiq-client.rb

@@ -31,6 +31,7 @@ module Instana
           if context
             msg['X-Instana-T'] = context.trace_id_header
             msg['X-Instana-S'] = context.span_id_header
+            msg['X-Instana-L'] = context.level.to_s
           end
 
           result = yield

data/lib/instana/instrumentation/sidekiq-worker.rb

@@ -30,10 +30,12 @@ module Instana
         trace_context = nil
         if msg.key?('X-Instana-T')
           trace_id = msg.delete('X-Instana-T')
-          span_id = msg.delete('X-Instana-S')
+          span_id  = msg.delete('X-Instana-S')
+          level    = msg.delete('X-Instana-L')
           trace_context = ::Instana::SpanContext.new(
             trace_id: ::Instana::Util.header_to_id(trace_id),
-            span_id: span_id ? ::Instana::Util.header_to_id(span_id) : nil
+            span_id: span_id ? ::Instana::Util.header_to_id(span_id) : nil,
+            level: level || 1
           )
         end
 

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.10.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.10.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.22
+rubygems_version: 4.0.23
 specification_version: 4
 summary: Ruby Distributed Tracing & Metrics Sensor for Instana
 test_files: []