instana 1.197.0.pre1 → 1.199.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58219b994af0387dcc4c672577b19c9570e487998be17d315a92902d6e1d86e6
-  data.tar.gz: 60e586b644f60545ebe6c7690d3ba673354d2133937b3b2bf95db04fbe8f58c4
+  metadata.gz: 86a3e023781d52d3b5efd25c9b5d304520dd3c88aecde954c326bd736abae787
+  data.tar.gz: b6c7bf11431925b9a48b827b5adbb52d93cb1f1f44bde1ebef98bd89f2188cb0
 SHA512:
-  metadata.gz: 4d4ca8c71a1613c05e5f1fec02e5857c544013f0043d4b95e31fc900b81903ba5f3c08abd075afc4643e7761cd54a7595939ad9149575589b44b8e43722ea89a
-  data.tar.gz: 737447ad9f8ed3c6aef72bead3e66128b83ac1d346bc35f00ad1bd3e0b485f4cd8080faabf8817da23a788f229d32db1739e98484637fd8e70b852b415447d97
+  metadata.gz: e2045faa632b6edc00e4dba26feb69d5249c755698a0dac2adeaa0e2b1cbe65f7f37682f7b59a1d3d000f8908dbee85c4f0356da333f02e874361b5861cfcc3f
+  data.tar.gz: e1b3983ace1be9653732b033902c7f59a74dce020ebfb585e02cf3dfdd1c2e7eb50df4cff9ff4eb8467df3a57b3208165efe659d97073bd6bc97f9e2bdd62fa0

data/lib/instana/backend/agent.rb

@@ -15,7 +15,15 @@ module Instana
       end
 
       def setup
-        @delegate = if @fargate_metadata_uri && ENV.key?('INSTANA_ENDPOINT_URL')
+        @delegate = if ENV.key?('_HANDLER')
+                      ServerlessAgent.new([Snapshot::LambdaFunction.new])
+                    elsif ENV.key?('K_REVISION') && ENV.key?('INSTANA_ENDPOINT_URL')
+                      ServerlessAgent.new([
+                                            Snapshot::GoogleCloudRunProcess.new,
+                                            Snapshot::GoogleCloudRunInstance.new,
+                                            Snapshot::RubyProcess.new
+                                          ])
+                    elsif @fargate_metadata_uri && ENV.key?('INSTANA_ENDPOINT_URL')
                       ServerlessAgent.new(fargate_snapshots)
                     else
                       HostAgent.new

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,7 +33,10 @@ module Instana
       end
 
       def initialize(host, port, use_ssl: false)
-        @client = Net::HTTP.start(host, port, use_ssl: use_ssl)
+        timeout = Integer(ENV.fetch('INSTANA_TIMEOUT', 500))
+        @host = host
+        @port = port
+        @client = Net::HTTP.start(host, port, use_ssl: use_ssl, read_timeout: timeout)
       end
 
       # Send a request to the backend. If data is a {Hash},
@@ -57,21 +62,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

@@ -39,12 +39,10 @@ module Instana
 
       # @return [Hash, NilClass] the backend friendly description of the current in process collector
       def source
-        return @source if @source
-
         snapshot = @snapshots.detect { |s| s.respond_to?(:source) }
 
         if snapshot
-          @source = snapshot.source
+          snapshot.source
         else
           @logger.warn('Unable to find a snapshot which provides a source.')
           {}
@@ -58,21 +56,10 @@ module Instana
 
       # @return [Hash] values which are removed from urls sent to the backend
       def secret_values
-        # TODO: Parse from env
         matcher, *keys = @secrets.split(/[:,]/)
         {'matcher' => matcher, 'list' => keys}
       end
 
-      private
-
-      def request_headers
-        {
-          'X-Instana-Host' => host_name,
-          'X-Instana-Key' => ENV['INSTANA_AGENT_KEY'],
-          'X-Instana-Time' => (Time.now.to_i * 1000).to_s
-        }
-      end
-
       def send_bundle
         spans = @processor.queued_spans
         bundle = {
@@ -90,9 +77,19 @@ module Instana
         @logger.warn("Recived a `#{response.code}` when sending data.")
       end
 
+      private
+
+      def request_headers
+        {
+          'X-Instana-Host' => host_name,
+          'X-Instana-Key' => ENV['INSTANA_AGENT_KEY'],
+          'X-Instana-Time' => (Time.now.to_i * 1000).to_s
+        }
+      end
+
       def agent_snapshots
         @snapshots.map do |snapshot|
-          begin
+          begin # rubocop:disable Style/RedundantBegin, Lint/RedundantCopDisableDirective
             snapshot.snapshot
           rescue StandardError => e
             @logger.error(e.message)
@@ -102,12 +99,10 @@ module Instana
       end
 
       def host_name
-        return @host_name if @host_name
-
         snapshot = @snapshots.detect { |s| s.respond_to?(:host_name) }
 
         if snapshot
-          @host_name = snapshot.host_name
+          snapshot.host_name
         else
           @logger.warn('Unable to find a snapshot which provides a host_name.')
           ''

data/lib/instana/base.rb

@@ -13,6 +13,7 @@ module Instana
     attr_accessor :config
     attr_accessor :pid
     attr_reader :secrets
+    attr_reader :serverless
 
     ##
     # setup
@@ -25,6 +26,7 @@ module Instana
       @tracer = ::Instana::Tracer.new
       @processor = ::Instana::Processor.new
       @secrets = ::Instana::Secrets.new
+      @serverless = ::Instana::Serverless.new
     end
 
     def logger

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