instana 1.197.0.pre1 → 1.197.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58219b994af0387dcc4c672577b19c9570e487998be17d315a92902d6e1d86e6
-  data.tar.gz: 60e586b644f60545ebe6c7690d3ba673354d2133937b3b2bf95db04fbe8f58c4
+  metadata.gz: 518b5595452badfeb017ea91f89907026f1d21ee0945982dbeb0f1d55662a45a
+  data.tar.gz: 46e3a5473d6e804a54f7e756739e4f34439db51e4e825770763d2647b59eefa8
 SHA512:
-  metadata.gz: 4d4ca8c71a1613c05e5f1fec02e5857c544013f0043d4b95e31fc900b81903ba5f3c08abd075afc4643e7761cd54a7595939ad9149575589b44b8e43722ea89a
-  data.tar.gz: 737447ad9f8ed3c6aef72bead3e66128b83ac1d346bc35f00ad1bd3e0b485f4cd8080faabf8817da23a788f229d32db1739e98484637fd8e70b852b415447d97
+  metadata.gz: e0025b1437bd30313df97306835a228083e6d6dbd6253e109d9ba67d85f7ce4b03c677ccfbaff9fa3084f5968add9d01ac9dcd60a1d5338b54c37cebf5d3b306
+  data.tar.gz: 7d1fadb443f1ce0304bd4944198300ed0a2043ea9154dbd7fe50b89ed0a101bddd6da7f9086901eac3dc9c95e799a4eb29118fe6c7c8f153908bbb0b75b03788

data/lib/instana/backend/host_agent.rb

@@ -5,22 +5,29 @@ module Instana
   module Backend
     # @since 1.197.0
     class HostAgent
-      def initialize(discovery: Concurrent::Atom.new(nil))
+      attr_reader :future
+
+      def initialize(discovery: Concurrent::Atom.new(nil), logger: ::Instana.logger)
         @discovery = discovery
-        @client = nil
+        @logger = logger
+        @future = nil
       end
 
-      def setup
+      def setup; end
+
+      def spawn_background_thread
         return if ENV.key?('INSTANA_TEST')
 
-        @client = HostAgentLookup.new.call
-        @discovery
-          .with_observer(HostAgentActivationObserver.new(@client, @discovery))
-          .with_observer(HostAgentReportingObserver.new(@client, @discovery))
-      end
+        @future = Concurrent::Promises.future do
+          client = until_not_nil { HostAgentLookup.new.call }
+          @discovery.delete_observers
+          @discovery
+            .with_observer(HostAgentActivationObserver.new(client, @discovery))
+            .with_observer(HostAgentReportingObserver.new(client, @discovery))
 
-      def spawn_background_thread
-        @discovery.swap { nil }
+          @discovery.swap { nil }
+          client
+        end
       end
 
       # @return [Boolean] true if the agent able to send spans to the backend
@@ -48,6 +55,16 @@ module Instana
 
       private
 
+      def until_not_nil
+        loop do
+          result = yield
+          return result unless result.nil?
+
+          @logger.debug("Waiting on a connection to the agent.")
+          sleep(1)
+        end
+      end
+
       def discovery_value
         v = @discovery.value
         v || {}

data/lib/instana/backend/host_agent_activation_observer.rb

@@ -12,20 +12,23 @@ module Instana
 
       # @param [RequestClient] client used to make requests to the backend
       # @param [Concurrent::Atom] discovery object used to store discovery response in
-      def initialize(client, discovery, wait_time: 60, logger: ::Instana.logger, max_wait_tries: 60, proc_table: Sys::ProcTable) # rubocop:disable Metrics/ParameterLists
+      def initialize(client, discovery, wait_time: 1, logger: ::Instana.logger, max_wait_tries: 60, proc_table: Sys::ProcTable, socket_proc: default_socket_proc) # rubocop:disable Metrics/ParameterLists
         @client = client
         @discovery = discovery
         @wait_time = wait_time
         @logger = logger
         @max_wait_tries = max_wait_tries
         @proc_table = proc_table
+        @socket_proc = socket_proc
       end
 
       def update(_time, _old_version, new_version)
         return unless new_version.nil?
 
+        socket = @socket_proc.call(@client)
+
         try_forever_with_backoff do
-          payload = discovery_payload
+          payload = discovery_payload(socket)
           discovery_response = @client.send_request('PUT', DISCOVERY_URL, payload)
 
           raise DiscoveryError, "Discovery response was #{discovery_response.code} with `#{payload}`." unless discovery_response.ok?
@@ -36,11 +39,13 @@ module Instana
           @logger.debug("Agent ready.")
           @discovery.swap { discovery }
         end
+
+        socket.close
       end
 
       private
 
-      def discovery_payload
+      def discovery_payload(socket)
         proc_table = @proc_table.ps(pid: Process.pid)
         process = ProcessInfo.new(proc_table)
 
@@ -52,9 +57,10 @@ module Instana
           cpuSetFileContent: process.cpuset
         }
 
-        if @client.fileno && @client.inode
-          payload[:fd] = @client.fileno
-          payload[:inode] = @client.inode
+        inode_path = "/proc/self/fd/#{socket.fileno}"
+        if socket.fileno && File.exist?(inode_path)
+          payload[:fd] = socket.fileno
+          payload[:inode] = File.readlink(inode_path)
         end
 
         payload.compact
@@ -76,12 +82,16 @@ module Instana
       def try_forever_with_backoff
         yield
       rescue DiscoveryError, Net::OpenTimeout => e
-        @logger.error(e)
+        @logger.warn(e)
         sleep(@wait_time)
         retry
       rescue StandardError => e
         @logger.error(%(#{e}\n#{e.backtrace.join("\n")}))
       end
+
+      def default_socket_proc
+        ->(c) { TCPSocket.new(c.host, c.port) }
+      end
     end
   end
 end

data/lib/instana/backend/request_client.rb

@@ -18,6 +18,8 @@ module Instana
     # Convince wrapper around {Net::HTTP}.
     # @since 1.197.0
     class RequestClient
+      attr_reader :host, :port
+
       class Response < SimpleDelegator
         # @return [Hash] the decoded json response
         def json
@@ -31,6 +33,8 @@ module Instana
       end
 
       def initialize(host, port, use_ssl: false)
+        @host = host
+        @port = port
         @client = Net::HTTP.start(host, port, use_ssl: use_ssl)
       end
 
@@ -57,21 +61,6 @@ module Instana
         Response.new(response)
       end
 
-      # @return [Integer, NilClass] the fileno of the Net::HTTP socket or nil if it can't be identified
-      def fileno
-        socket = @client.instance_variable_get('@socket')
-        io = socket && socket.instance_variable_get('@io')
-        io && io.fileno
-      end
-
-      # @return [String] the inode asscoated with the Net::HTTP socket or nil if it can't be identified
-      def inode
-        path = "/proc/self/fd/#{fileno}"
-        return unless File.exist?(path) && fileno
-
-        File.readlink(path)
-      end
-
       private
 
       def encode_body(data)

data/lib/instana/backend/serverless_agent.rb

@@ -92,7 +92,7 @@ module Instana
 
       def agent_snapshots
         @snapshots.map do |snapshot|
-          begin
+          begin # rubocop:disable Style/RedundantBegin, Lint/RedundantCopDisableDirective
             snapshot.snapshot
           rescue StandardError => e
             @logger.error(e.message)

data/lib/instana/config.rb

@@ -51,7 +51,7 @@ module Instana
       @config[:sanitize_sql] = true
 
       # W3 Trace Context Support
-      @config[:w3_trace_correlation] = ENV.fetch('INSTANA_W3C_TRACE_CORRELATION', 'true').eql?('true')
+      @config[:w3_trace_correlation] = ENV['INSTANA_DISABLE_W3C_TRACE_CORRELATION'].nil?
 
       @config[:action_controller]  = { :enabled => true }
       @config[:action_view]        = { :enabled => true }

data/lib/instana/instrumentation/excon.rb

@@ -24,14 +24,16 @@ module Instana
         end
 
         # Set request headers; encode IDs as hexadecimal strings
-        datum[:headers]['X-Instana-T'] = t_context.trace_id_header
-        datum[:headers]['X-Instana-S'] = t_context.span_id_header
+        datum[:headers]['X-Instana-L'] = t_context.level.to_s
 
-        if ::Instana.config[:w3_trace_correlation]
-          datum[:headers]['Traceparent'] = t_context.trace_parent_header
-          datum[:headers]['Tracestate'] = t_context.trace_state_header
+        if t_context.active?
+          datum[:headers]['X-Instana-T'] = t_context.trace_id_header
+          datum[:headers]['X-Instana-S'] = t_context.span_id_header
         end
 
+        datum[:headers]['Traceparent'] = t_context.trace_parent_header
+        datum[:headers]['Tracestate'] = t_context.trace_state_header unless t_context.trace_state_header.empty?
+
         @stack.request_call(datum)
       end
 

data/lib/instana/instrumentation/instrumented_request.rb

@@ -18,16 +18,33 @@ module Instana
     end
 
     def incoming_context
-      context = if @env['HTTP_X_INSTANA_T']
+      context = if !correlation_data.empty?
+                  {}
+                elsif @env['HTTP_X_INSTANA_T']
                   context_from_instana_headers
-                elsif @env['HTTP_TRACEPARENT'] && ::Instana.config[:w3_trace_correlation]
+                elsif @env['HTTP_TRACEPARENT']
                   context_from_trace_parent
+                elsif @env['HTTP_TRACESTATE']
+                  context_from_trace_state
                 else
                   {}
                 end
 
       context[:level] = @env['HTTP_X_INSTANA_L'][0] if @env['HTTP_X_INSTANA_L']
 
+      unless ::Instana.config[:w3_trace_correlation]
+        trace_state = parse_trace_state
+
+        if context[:from_w3] && trace_state.empty?
+          context.delete(:span_id)
+          context[:from_w3] = false
+        elsif context[:from_w3] && !trace_state.empty?
+          context[:trace_id] = trace_state[:t]
+          context[:span_id] = trace_state[:p]
+          context[:from_w3] = false
+        end
+      end
+
       context
     end
 
@@ -69,19 +86,43 @@ module Instana
     end
 
     def continuing_from_trace_parent?
-      incoming_context.include?(:external_trace_id)
+      incoming_context[:from_w3]
     end
 
     def synthetic?
       @env.has_key?('HTTP_X_INSTANA_SYNTHETIC') && @env['HTTP_X_INSTANA_SYNTHETIC'].eql?('1')
     end
 
+    def long_instana_id?
+      ::Instana::Util.header_to_id(@env['HTTP_X_INSTANA_T']).length == 32
+    end
+
+    def external_trace_id?
+      continuing_from_trace_parent? || long_instana_id?
+    end
+
+    def external_trace_id
+      incoming_context[:long_instana_id] || incoming_context[:external_trace_id]
+    end
+
     private
 
     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'])
+      external_trace_id = if @env['HTTP_TRACEPARENT']
+                            context_from_trace_parent[:external_trace_id]
+                          elsif long_instana_id?
+                            sanitized_t
+                          end
+
       {
-        trace_id: ::Instana::Util.header_to_id(@env['HTTP_X_INSTANA_T']),
-        span_id: ::Instana::Util.header_to_id(@env['HTTP_X_INSTANA_S'])
+        span_id: sanitized_s,
+        trace_id: long_instana_id? ? sanitized_t[16..-1] : sanitized_t, # rubocop:disable Style/SlicingWithRange, Lint/RedundantCopDisableDirective
+        long_instana_id: long_instana_id? ? sanitized_t : nil,
+        external_trace_id: external_trace_id,
+        external_state: @env['HTTP_TRACESTATE'],
+        from_w3: false
       }.compact
     end
 
@@ -90,14 +131,28 @@ module Instana
       matches = @env['HTTP_TRACEPARENT'].match(W3_TRACE_PARENT_FORMAT)
       return {} unless matches
 
+      trace_id = ::Instana::Util.header_to_id(matches['trace'][16..-1]) # rubocop:disable Style/SlicingWithRange, Lint/RedundantCopDisableDirective
+      span_id = ::Instana::Util.header_to_id(matches['parent'])
+
       {
         external_trace_id: matches['trace'],
         external_state: @env['HTTP_TRACESTATE'],
-        trace_id: ::Instana::Util.header_to_id(matches['trace'][16..-1]), # rubocop:disable Style/SlicingWithRange, Lint/RedundantCopDisableDirective
-        span_id: ::Instana::Util.header_to_id(matches['parent'])
+        trace_id: trace_id,
+        span_id: span_id,
+        from_w3: true
       }
     end
 
+    def context_from_trace_state
+      state = parse_trace_state
+
+      {
+        trace_id: state[:t],
+        span_id: state[:p],
+        from_w3: false
+      }.compact
+    end
+
     def parse_trace_state
       return {} unless @env.has_key?('HTTP_TRACESTATE')
       token = @env['HTTP_TRACESTATE']

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

@@ -19,14 +19,16 @@ module Instana
 
         # Set request headers; encode IDs as hexadecimal strings
         t_context = ::Instana.tracer.context
-        request['X-Instana-T'] = t_context.trace_id_header
-        request['X-Instana-S'] = t_context.span_id_header
+        request['X-Instana-L'] = t_context.level.to_s
 
-        if ::Instana.config[:w3_trace_correlation]
-          request['Traceparent'] = t_context.trace_parent_header
-          request['Tracestate'] = t_context.trace_state_header
+        if t_context.active?
+          request['X-Instana-T'] = t_context.trace_id_header
+          request['X-Instana-S'] = t_context.span_id_header
         end
 
+        request['Traceparent'] = t_context.trace_parent_header
+        request['Tracestate'] = t_context.trace_state_header unless t_context.trace_state_header.empty?
+
         # Collect up KV info now in case any exception is raised
         kv_payload = { :http => {} }
         kv_payload[:http][:method] = request.method

data/lib/instana/instrumentation/rack.rb

@@ -12,7 +12,6 @@ module Instana
 
     def call(env)
       req = InstrumentedRequest.new(env)
-      return @app.call(env) if req.skip_trace?
       kvs = {
         http: req.request_tags,
         service: ENV['INSTANA_SERVICE_NAME']
@@ -34,12 +33,16 @@ module Instana
 
         if req.continuing_from_trace_parent?
           current_span[:tp] = true
-          current_span[:lt] = req.incoming_context[:external_trace_id]
+        end
+
+        if req.external_trace_id?
+          current_span[:lt] = req.external_trace_id
         end
 
         if req.synthetic?
           current_span[:sy] = true
         end
+
         # In case some previous middleware returned a string status, make sure that we're dealing with
         # an integer.  In Ruby nil.to_i, "asdfasdf".to_i will always return 0 from Ruby versions 1.8.7 and newer.
         # So if an 0 status is reported here, it indicates some other issue (e.g. no status from previous middleware)
@@ -70,15 +73,17 @@ module Instana
       if ::Instana.tracer.tracing?
         if headers
           # Set response headers; encode as hex string
-          headers['X-Instana-T'] = trace_context.trace_id_header
-          headers['X-Instana-S'] = trace_context.span_id_header
-          headers['X-Instana-L'] = '1'
+          if trace_context.active?
+            headers['X-Instana-T'] = trace_context.trace_id_header
+            headers['X-Instana-S'] = trace_context.span_id_header
+            headers['X-Instana-L'] = '1'
 
-          if ::Instana.config[:w3_trace_correlation]
-            headers['Traceparent'] = trace_context.trace_parent_header
             headers['Tracestate'] = trace_context.trace_state_header
+          else
+            headers['X-Instana-L'] = '0'
           end
 
+          headers['Traceparent'] = trace_context.trace_parent_header
           headers['Server-Timing'] = "intid;desc=#{trace_context.trace_id_header}"
         end
 

data/lib/instana/tracing/processor.rb

@@ -5,7 +5,7 @@ require 'thread'
 
 module Instana
   class Processor
-    def initialize
+    def initialize(logger: ::Instana.logger)
       # The main queue before being reported to the
       # host agent.  Spans in this queue are complete
       # and ready to be sent.
@@ -14,12 +14,22 @@ module Instana
       # This is the maximum number of spans we send to the host
       # agent at once.
       @batch_size = 3000
+      @logger = logger
+      @pid = $PROCESS_ID
     end
 
     # Adds a span to the span queue
     #
     # @param [Trace] - the trace to be added to the queue
     def add_span(span)
+      # :nocov:
+      if @pid != $PROCESS_ID
+        @logger.info("Proces `#{@pid}` has forked into #{$PROCESS_ID}. Resetting discovery.")
+        ::Instana.agent.spawn_background_thread
+        @pid = $PROCESS_ID
+      end
+      # :nocov:
+
       @queue.push(span)
     end
 

data/lib/instana/tracing/span.rb

@@ -28,9 +28,15 @@ module Instana
       if parent_ctx.is_a?(::Instana::SpanContext)
         @is_root = false
 
-        @data[:t] = parent_ctx.trace_id       # Trace ID
+        # If we have a parent trace, link to it
+        if parent_ctx.trace_id
+          @data[:t] = parent_ctx.trace_id       # Trace ID
+          @data[:p] = parent_ctx.span_id        # Parent ID
+        else
+          @data[:t] = ::Instana::Util.generate_id
+        end
+
         @data[:s] = ::Instana::Util.generate_id # Span ID
-        @data[:p] = parent_ctx.span_id        # Parent ID
 
         @baggage = parent_ctx.baggage.dup
         @level = parent_ctx.level

data/lib/instana/tracing/span_context.rb

@@ -31,19 +31,22 @@ module Instana
     end
 
     def trace_parent_header
-      return '' unless valid?
-
-      trace = (@baggage[:external_trace_id] || @trace_id).rjust(32, '0')
-      parent = @span_id.rjust(16, '0')
+      trace = (@baggage[:external_trace_id] || trace_id_header).rjust(32, '0')
+      parent = span_id_header.rjust(16, '0')
       flags = @level == 1 ? "01" : "00"
 
       "00-#{trace}-#{parent}-#{flags}"
     end
 
     def trace_state_header
-      return '' unless valid?
+      external_state = @baggage[:external_state] || ''
+      state = external_state.split(/,/)
+
+      if @level == 1
+        state = state.reject { |s| s.start_with?('in=') }
+        state.unshift("in=#{trace_id_header};#{span_id_header}")
+      end
 
-      state = ["in=#{trace_id_header};#{span_id_header}", @baggage[:external_state]]
       state.compact.join(',')
     end
 
@@ -51,10 +54,12 @@ module Instana
       { :trace_id => @trace_id, :span_id => @span_id }
     end
 
-    private
-
     def valid?
-      @baggage && @trace_id && @span_id
+      @baggage && @trace_id && !@trace_id.emtpy?
+    end
+
+    def active?
+      @level == 1
     end
   end
 end

data/lib/instana/util.rb

@@ -156,8 +156,10 @@ module Instana
       #
       # @return [String]
       #
-      def header_to_id(header_id)
-        header_id.is_a?(String) && header_id.match(/\A[a-z\d]{16,32}\z/i) ? header_id : ''
+      def header_to_id(given)
+        return '' unless given.is_a?(String)
+        return '' unless given.match(/\A[a-z\d]{16,32}\z/i)
+        given
       end
     end
   end

data/lib/instana/version.rb

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

data/test/backend/host_agent_activation_observer_test.rb

@@ -4,6 +4,10 @@
 require 'test_helper'
 
 class HostAgentActivationObserverTest < Minitest::Test
+  def setup
+    @socket_proc = ->(_c) { OpenStruct.new(fileno: 0) }
+  end
+
   def test_standard_discovery
     stub_request(:put, "http://10.10.10.10:9292/com.instana.plugin.ruby.discovery")
       .and_timeout
@@ -17,7 +21,7 @@ class HostAgentActivationObserverTest < Minitest::Test
     client = Instana::Backend::RequestClient.new('10.10.10.10', 9292)
     discovery = Concurrent::Atom.new(nil)
 
-    subject = Instana::Backend::HostAgentActivationObserver.new(client, discovery, wait_time: 0, logger: Logger.new('/dev/null'), max_wait_tries: 1)
+    subject = Instana::Backend::HostAgentActivationObserver.new(client, discovery, wait_time: 0, logger: Logger.new('/dev/null'), max_wait_tries: 1, socket_proc: @socket_proc)
 
     subject.update(nil, nil, nil)
     assert_equal({'pid' => 1234}, discovery.value)
@@ -31,15 +35,18 @@ class HostAgentActivationObserverTest < Minitest::Test
       .and_return(status: 200, body: '{"ok": true}')
 
     client = Instana::Backend::RequestClient.new('10.10.10.10', 9292)
-    # This is the cleanest way to fake it so it works across all test environments
-    client.define_singleton_method(:fileno) { '0' }
-    client.define_singleton_method(:inode) { '0' }
-
     discovery = Concurrent::Atom.new(nil)
 
-    subject = Instana::Backend::HostAgentActivationObserver.new(client, discovery, wait_time: 0, logger: Logger.new('/dev/null'), max_wait_tries: 1)
+    subject = Instana::Backend::HostAgentActivationObserver.new(client, discovery, wait_time: 0, logger: Logger.new('/dev/null'), max_wait_tries: 1, socket_proc: @socket_proc)
 
-    subject.update(nil, nil, nil)
+    FakeFS.with_fresh do
+      FakeFS::FileSystem.clone('test/support/proc', '/proc')
+      FakeFS::FileSystem.clone('test/support/proc/0', "/proc/#{Process.pid}")
+      Dir.mkdir('/proc/self/fd')
+      File.symlink('/proc/self/sched', "/proc/self/fd/0")
+
+      subject.update(nil, nil, nil)
+    end
 
     assert_equal({'pid' => 1234}, discovery.value)
   end
@@ -48,7 +55,7 @@ class HostAgentActivationObserverTest < Minitest::Test
     client = Instana::Backend::RequestClient.new('10.10.10.10', 9292)
     discovery = Concurrent::Atom.new(nil)
 
-    subject = Instana::Backend::HostAgentActivationObserver.new(client, discovery, wait_time: 0, logger: Logger.new('/dev/null'), proc_table: nil)
+    subject = Instana::Backend::HostAgentActivationObserver.new(client, discovery, wait_time: 0, logger: Logger.new('/dev/null'), proc_table: nil, socket_proc: @socket_proc)
 
     subject.update(nil, nil, nil)
     assert_nil discovery.value
@@ -58,7 +65,7 @@ class HostAgentActivationObserverTest < Minitest::Test
     client = Instana::Backend::RequestClient.new('10.10.10.10', 9292)
     discovery = Concurrent::Atom.new(nil)
 
-    subject = Instana::Backend::HostAgentActivationObserver.new(client, discovery)
+    subject = Instana::Backend::HostAgentActivationObserver.new(client, discovery, socket_proc: @socket_proc)
     assert_nil subject.update(nil, nil, true)
     assert_nil discovery.value
   end

data/test/backend/host_agent_test.rb

@@ -4,19 +4,34 @@
 require 'test_helper'
 
 class HostAgentTest < Minitest::Test
-  def test_setup
+  def test_spawn_background_thread
     ENV['INSTANA_TEST'] = nil
     ::Instana.config[:agent_host] = '10.10.10.10'
 
+    if File.exist?('/sbin/ip')
+      addr = `/sbin/ip route | awk '/default/ { print $3 }'`.strip
+      stub_request(:get, "http://#{addr}:42699/")
+        .to_timeout
+    end
+
     stub_request(:get, "http://10.10.10.10:42699/")
+      .to_timeout.times(3).then
       .to_return(status: 200, body: "", headers: {})
 
     discovery = Minitest::Mock.new
+    discovery.expect(:delete_observers, discovery, [])
     discovery.expect(:with_observer, discovery, [Instana::Backend::HostAgentActivationObserver])
     discovery.expect(:with_observer, discovery, [Instana::Backend::HostAgentReportingObserver])
+    discovery.expect(:swap, discovery, [])
 
     subject = Instana::Backend::HostAgent.new(discovery: discovery)
-    subject.setup
+
+    FakeFS.with_fresh do
+      FakeFS::FileSystem.clone('test/support/ecs', '/proc')
+      subject.spawn_background_thread
+    end
+
+    subject.future.value!
 
     discovery.verify
   ensure

data/test/backend/request_client_test.rb

@@ -36,26 +36,4 @@ class RequestClientTest < Minitest::Test
 
     refute response.ok?
   end
-
-  def test_fileno
-    subject = Instana::Backend::RequestClient.new('example.com', 9292)
-    assert_nil subject.fileno
-  end
-
-  def test_inode
-    subject = Instana::Backend::RequestClient.new('example.com', 9292)
-    subject.define_singleton_method(:fileno) { '0' } # This is the cleanest way to fake it so it works across all test environments
-    FakeFS.with_fresh do
-      FakeFS::FileSystem.clone('test/support/proc', '/proc')
-      Dir.mkdir('/proc/self/fd')
-      File.symlink('/proc/self/sched', '/proc/self/fd/0')
-
-      assert_equal '/proc/self/sched', subject.inode
-    end
-  end
-
-  def test_inode_no_proc
-    subject = Instana::Backend::RequestClient.new('example.com', 9292)
-    assert_nil subject.inode
-  end
 end

data/test/instrumentation/rack_instrumented_request_test.rb

@@ -29,6 +29,7 @@ class RackInstrumentedRequestTest < Minitest::Test
     expected = {
       trace_id: id,
       span_id: id,
+      from_w3: false,
       level: '1'
     }
 
@@ -47,6 +48,7 @@ class RackInstrumentedRequestTest < Minitest::Test
       external_state: nil,
       trace_id: 'a3ce929d0e0e4736',
       span_id: '00f067aa0ba902b7',
+      from_w3: true,
       level: '1'
     }
 

data/test/test_helper.rb

@@ -45,7 +45,7 @@ require 'fakefs/safe'
 require 'webmock/minitest'
 # Webmock: Whitelist local IPs
 WebMock.disable_net_connect!(
-  allow: ->(uri) { %w[localhost 127.0.0.1 172.17.0.1 172.0.12.100].include?(uri.host) }
+  allow: ->(uri) { %w[localhost 127.0.0.1 172.17.0.1 172.0.12.100].include?(uri.host) && ENV.key?('APPRAISAL_INITIALIZED') }
 )
 
 Dir['test/support/*.rb'].each { |f| load(f) }

data/test/tracing/span_context_test.rb

@@ -11,8 +11,7 @@ class SpanContextTest < Minitest::Test
 
   def test_invalid
     subject = Instana::SpanContext.new(nil, nil)
-    assert subject.trace_parent_header.empty?
-    assert subject.trace_state_header.empty?
+    refute subject.valid?
   end
 
   def test_flags_level_zero

data/test/tracing/span_test.rb

@@ -46,6 +46,15 @@ class SpanTest < Minitest::Test
     assert_equal 'test', span.trace_id
   end
 
+  def test_span_from_contetx_invalid
+    context = Instana::SpanContext.new(nil, nil, 1)
+    span = Instana::Span.new(:test, parent_ctx: context)
+
+    assert_nil span.parent_id
+    refute_equal context.span_id, span.trace_id
+    assert_equal 1, span.context.level
+  end
+
   def test_span_collect_backtraces
     Instana.config[:collect_backtraces] = true
     span = Instana::Span.new(:excon)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.197.0.pre1
+  version: 1.197.0.pre2
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-30 00:00:00.000000000 Z
+date: 2021-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler