instana 1.214.4 → 1.215.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 424b7ef31ac74b0ba82b7c010fe21074ccf6851670b18efe98fdf2d01360b71f
-  data.tar.gz: eabcd2216cc6c209444ba2e9400a4b446fdd31933c462b300d7f3e6fcdb7ee02
+  metadata.gz: 7087be480ee9027905afc8e29781253aa34e13fda02dec5607840d61cb4699c0
+  data.tar.gz: c73ad67e15ec9a21051f888ac443f35a39f2e9e9e7c1efeb3bd0824a41bdaad3
 SHA512:
-  metadata.gz: 166f7c5dbf87cbec5ad22690ad848be4fbd2a02d37514c57ca9fc560f4d98248749fb9894f07567fe4d4fdabe2750c703df86136b1c2cb9f773a97c016d36a90
-  data.tar.gz: ad43e911090d2e4cc107157a6bf052428a610dac4911c7c843de99e4770c926a80ccc92517378ec41d4a836cfbc584c133027cf58f6f3f1bbaea538b098e9c2b
+  metadata.gz: 2d09eb59acb9156a0cd5bbd85390406b7da1a72e9bc8692b2084feee186b6c723de72f34218520909226b0b7aa48eeb96708673fd514f8e7ebdc9ad24c84542a
+  data.tar.gz: 1b79ce75d861bcb005ccf46d18d61673faa194be298e5cbfb95ce6fb0a9f503a60c4709fed85b5ab295468c19674005d3ec7e3afda57a03704ab89788013999d

data/.tekton/.currency/resources/table.json

@@ -8,19 +8,19 @@
       },
       {
         "Package name": "Rack",
-        "Support Policy": "0-day",
+        "Support Policy": "45-days",
         "Beta version": "No",
         "Cloud Native": "No"
       },
       {
         "Package name": "Rails",
-        "Support Policy": "30-days",
+        "Support Policy": "45-days",
         "Beta version": "No",
         "Cloud Native": "No"
       },
       {
         "Package name": "Rails::API",
-        "Support Policy": "30-days",
+        "Support Policy": "45-days",
         "Beta version": "No",
         "Cloud Native": "No"
       },
@@ -32,61 +32,61 @@
       },
       {
         "Package name": "Roda",
-        "Support Policy": "30-days",
+        "Support Policy": "45-days",
         "Beta version": "No",
         "Cloud Native": "No"
       },
       {
         "Package name": "Sinatra",
-        "Support Policy": "30-days",
+        "Support Policy": "45-days",
         "Beta version": "No",
         "Cloud Native": "No"
       },
       {
         "Package name": "Excon",
-        "Support Policy": "30-days",
+        "Support Policy": "45-days",
         "Beta version": "No",
         "Cloud Native": "Yes"
       },
       {
         "Package name": "gRPC",
-        "Support Policy": "30-days",
+        "Support Policy": "45-days",
         "Beta version": "No",
         "Cloud Native": "No"
       },
       {
         "Package name": "Net::HTTP",
         "Support Policy": "0-day",
-        "Beta version": "No",
+        "Beta version": "Yes",
         "Cloud Native": "No"
       },
       {
         "Package name": "Rest-Client",
-        "Support Policy": "30-days",
+        "Support Policy": "45-days",
         "Beta version": "No",
         "Cloud Native": "No"
       },
       {
         "Package name": "Dalli",
-        "Support Policy": "30-days",
+        "Support Policy": "45-days",
         "Beta version": "No",
         "Cloud Native": "No"
       },
       {
         "Package name": "Resque",
-        "Support Policy": "30-days",
+        "Support Policy": "45-days",
         "Beta version": "No",
         "Cloud Native": "Yes"
       },
       {
         "Package name": "Sidekiq",
-        "Support Policy": "30-days",
+        "Support Policy": "45-days",
         "Beta version": "No",
         "Cloud Native": "Yes"
       },
       {
         "Package name": "GraphQL",
-        "Support Policy": "30-days",
+        "Support Policy": "45-days",
         "Beta version": "No",
         "Cloud Native": "Yes"
       }

data/instana.gemspec

@@ -40,7 +40,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "appraisal"
   spec.add_development_dependency "fakefs"
 
+  spec.add_runtime_dependency('base64', '>= 0.1')
   spec.add_runtime_dependency('concurrent-ruby', '>= 1.1')
+  spec.add_runtime_dependency('csv', '>= 0.1')
   spec.add_runtime_dependency('sys-proctable', '>= 1.2.2')
   spec.add_runtime_dependency('oj', '>=3.0.11') unless RUBY_PLATFORM =~ /java/i
 end

data/lib/instana/backend/host_agent.rb

@@ -28,7 +28,11 @@ module Instana
 
       def announce
         @client = until_not_nil { HostAgentLookup.new.call }
-        @discovery.delete_observers
+        begin
+          @discovery.send(:observers)&.send(:notify_and_delete_observers, Time.now, nil, nil)
+        ensure
+          @discovery.delete_observers
+        end
         @discovery
           .with_observer(HostAgentActivationObserver.new(@client, @discovery))
           .with_observer(HostAgentReportingObserver.new(@client, @discovery))

data/lib/instana/config.rb

@@ -27,6 +27,9 @@ module Instana
       # Enable/disable tracing (default: enabled)
       @config[:tracing] = { :enabled => true }
 
+      # Enable/disable tracing exit spans as root spans
+      @config[:allow_exit_as_root] = ENV['INSTANA_ALLOW_EXIT_AS_ROOT'] == '1'
+
       # Enable/Disable logging
       @config[:logging] = { :enabled => true }
 

data/lib/instana/instrumentation/excon.rb

@@ -78,8 +78,10 @@ module Instana
       private
 
       def traceable?
-        ::Instana.tracer.tracing? &&
-          (!Instana.tracer.current_span.exit_span? || Instana.tracer.current_span.name == :excon)
+        ::Instana.tracer.tracing? && ::Instana.tracer.current_span.nil? ||
+          !::Instana.tracer.current_span.nil? &&
+            (!Instana.tracer.current_span.exit_span? ||
+             Instana.tracer.current_span.exit_span? && Instana.tracer.current_span.name == :excon)
       end
     end
   end

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

@@ -7,7 +7,7 @@ module Instana
   module Instrumentation
     module NetHTTPInstrumentation
       def request(*args, &block)
-        if !Instana.tracer.tracing? || Instana.tracer.current_span.exit_span? || !started?
+        if skip_instrumentation?
           do_skip = true
           return super(*args, &block)
         end
@@ -64,6 +64,12 @@ module Instana
       ensure
         ::Instana.tracer.log_exit(:'net-http', kv_payload) unless do_skip
       end
+
+      def skip_instrumentation?
+        dnt_spans = [:dynamodb, :sqs, :sns, :s3]
+        !Instana.tracer.tracing? || !started? || !Instana.config[:nethttp][:enabled] ||
+          (!::Instana.tracer.current_span.nil? && dnt_spans.include?(::Instana.tracer.current_span.name))
+      end
     end
   end
 end

data/lib/instana/instrumentation/redis.rb

@@ -59,7 +59,7 @@ module Instana
 
     def skip_instrumentation?
       dnt_spans = [:redis, :'resque-client', :'sidekiq-client']
-      !Instana.tracer.tracing? || dnt_spans.include?(::Instana.tracer.current_span.name) || !Instana.config[:redis][:enabled]
+      !Instana.tracer.tracing? || (!::Instana.tracer.current_span.nil? && dnt_spans.include?(::Instana.tracer.current_span.name)) || !Instana.config[:redis][:enabled]
     end
 
     def call_with_instana(command, original_super, args, kwargs, &block)

data/lib/instana/tracer.rb

@@ -133,12 +133,12 @@ module Instana
     # @param kvs [Hash] list of key values to be reported in the span
     #
     def log_entry(name, kvs = nil, start_time = ::Instana::Util.now_in_ms, child_of = nil)
-      return unless self.current_span || child_of
+      return unless tracing? || child_of
 
-      new_span = if child_of.is_a?(::Instana::Span) || child_of.is_a?(::Instana::SpanContext)
-                   Span.new(name, parent_ctx: child_of, start_time: start_time)
-                 else
+      new_span = if child_of.nil? && !self.current_span.nil?
                    Span.new(name, parent_ctx: self.current_span, start_time: start_time)
+                 else
+                   Span.new(name, parent_ctx: child_of, start_time: start_time)
                  end
       new_span.set_tags(kvs) if kvs
       self.current_span = new_span
@@ -218,7 +218,7 @@ module Instana
     #   :span_id => 12345
     #
     def log_async_entry(name, kvs)
-      return unless self.current_span
+      return unless tracing?
 
       new_span = Span.new(name, parent_ctx: self.current_span)
       new_span.set_tags(kvs) unless kvs.empty?
@@ -268,7 +268,8 @@ module Instana
       # The non-nil value of this instance variable
       # indicates if we are currently tracing
       # in this thread or not.
-      self.current_span ? true : false
+      (self.current_span ? true : false) ||
+        (::Instana.config[:allow_exit_as_root] && ::Instana.config[:tracing][:enabled])
     end
 
     # Indicates if we're tracing and the current span name matches

data/lib/instana/version.rb

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

data/test/backend/host_agent_test.rb

@@ -32,6 +32,8 @@ class HostAgentTest < Minitest::Test
 
     discovery = Minitest::Mock.new
     discovery.expect(:delete_observers, discovery, [])
+    discovery.expect(:observers, discovery, [])
+    discovery.expect(:notify_and_delete_observers, discovery, [Object, nil, nil])
     discovery.expect(:with_observer, discovery, [Instana::Backend::HostAgentActivationObserver])
     discovery.expect(:with_observer, discovery, [Instana::Backend::HostAgentReportingObserver])
     discovery.expect(:swap, discovery, [])

data/test/instrumentation/dalli_test.rb

@@ -9,6 +9,10 @@ class DalliTest < Minitest::Test
     @dc = Dalli::Client.new(@memcached_host, :namespace => "instana_test")
   end
 
+  def teardown
+    ::Instana.config[:allow_exit_as_root] = false
+  end
+
   def test_config_defaults
     assert ::Instana.config[:dalli].is_a?(Hash)
     assert ::Instana.config[:dalli].key?(:enabled)
@@ -50,6 +54,35 @@ class DalliTest < Minitest::Test
     assert_equal @memcached_host, second_span[:data][:memcache][:server]
   end
 
+  def test_basic_get_as_root_exit_span
+    clear_all!
+    @dc.set(:instana, :boom)
+
+    ::Instana.config[:allow_exit_as_root] = true
+    result = @dc.get(:instana)
+
+    assert_equal :boom, result
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 1, spans.length
+
+    first_span = spans[0]
+
+    assert_equal :memcache, first_span[:n]
+    assert_equal false, first_span.key?(:error)
+    assert_nil first_span[:p]
+    assert first_span[:t] == first_span[:s]
+    assert first_span[:data].key?(:memcache)
+    assert first_span[:data][:memcache].key?(:command)
+    assert_equal :get, first_span[:data][:memcache][:command]
+    assert first_span[:data][:memcache].key?(:key)
+    assert_equal :instana, first_span[:data][:memcache][:key]
+    assert first_span[:data][:memcache].key?(:namespace)
+    assert_equal 'instana_test', first_span[:data][:memcache][:namespace]
+    assert first_span[:data][:memcache].key?(:server)
+    assert_equal @memcached_host, first_span[:data][:memcache][:server]
+  end
+
   def test_basic_set
     clear_all!
 

data/test/instrumentation/excon_test.rb

@@ -5,6 +5,10 @@ require 'test_helper'
 require 'support/apps/http_endpoint/boot'
 
 class ExconTest < Minitest::Test
+  def teardown
+    ::Instana.config[:allow_exit_as_root] = false
+  end
+
   def test_config_defaults
     assert ::Instana.config[:excon].is_a?(Hash)
     assert ::Instana.config[:excon].key?(:enabled)
@@ -52,6 +56,42 @@ class ExconTest < Minitest::Test
     assert_equal excon_span[:p], sdk_span[:s]
   end
 
+  def test_basic_get_as_root_exit_span
+    clear_all!
+
+    # A slight hack but webmock chokes with pipelined requests.
+    # Delete their excon middleware
+    Excon.defaults[:middlewares].delete ::WebMock::HttpLibAdapters::ExconAdapter
+    Excon.defaults[:middlewares].delete ::Excon::Middleware::Mock
+
+    url = "http://127.0.0.1:6511"
+
+    ::Instana.config[:allow_exit_as_root] = true
+    connection = Excon.new(url)
+    connection.get(:path => '/?basic_get')
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 2, spans.length
+
+    excon_span = find_first_span_by_name(spans, :excon)
+    rack_span = find_first_span_by_name(spans, :rack)
+
+    # data keys/values
+    refute_nil excon_span.key?(:data)
+    refute_nil excon_span[:data].key?(:http)
+    assert_equal "http://127.0.0.1:6511/", excon_span[:data][:http][:url]
+    assert_equal 200, excon_span[:data][:http][:status]
+    assert_equal 'basic_get', excon_span[:data][:http][:params]
+
+    # excon backtrace not included by default check
+    assert !excon_span.key?(:stack)
+
+    assert_equal rack_span[:t], excon_span[:t]
+
+    assert_equal rack_span[:p], excon_span[:s]
+    assert_nil excon_span[:p]
+  end
+
   def test_basic_get_with_error
     clear_all!
 

data/test/instrumentation/graphql_test.rb

@@ -83,6 +83,10 @@ class GraphqlTest < Minitest::Test
     mutation MutationType
   end
 
+  def teardown
+    ::Instana.config[:allow_exit_as_root] = false
+  end
+
   def test_it_works
     assert defined?(GraphQL)
   end
@@ -127,6 +131,43 @@ class GraphqlTest < Minitest::Test
     assert_equal expected_data, query_span[:data][:graphql]
   end
 
+  def test_query_as_root_exit_span
+    clear_all!
+
+    query = "query FirstTwoTaskSamples {
+      tasks(after: \"\", first: 2) {
+        nodes {
+          action
+        }
+      }
+    }"
+
+    expected_data = {
+      :operationName => "FirstTwoTaskSamples",
+      :operationType => "query",
+      :arguments => { "tasks" => ["after", "first"] },
+      :fields => { "tasks" => ["nodes"], "nodes" => ["action"] }
+    }
+    expected_results = {
+      "data" => {
+        "tasks" => {
+          "nodes" => [{"action" => "Sample 00"}, {"action" => "Sample 01"}]
+        }
+      }
+    }
+
+    ::Instana.config[:allow_exit_as_root] = true
+    results = Schema.execute(query)
+    ::Instana.config[:allow_exit_as_root] = false
+    queued_spans = Instana.processor.queued_spans
+    assert_equal 1, queued_spans.length
+    query_span = queued_spans[0]
+
+    assert_equal expected_results, results.to_h
+    assert_equal :'graphql.server', query_span[:n]
+    assert_equal expected_data, query_span[:data][:graphql]
+  end
+
   def test_query_with_fragment
     clear_all!
 

data/test/instrumentation/grpc_test.rb

@@ -4,11 +4,15 @@
 require 'test_helper'
 require 'support/apps/grpc/boot'
 
-class GrpcTest < Minitest::Test
+class GrpcTest < Minitest::Test # rubocop:disable Metrics/ClassLength
   def client_stub
     PingPongService::Stub.new('127.0.0.1:50051', :this_channel_is_insecure)
   end
 
+  def teardown
+    ::Instana.config[:allow_exit_as_root] = false
+  end
+
   def assert_client_span(client_span, call: '', call_type: '', error: nil)
     data = client_span[:data]
     assert_equal '127.0.0.1:50051', data[:rpc][:host]
@@ -80,6 +84,41 @@ class GrpcTest < Minitest::Test
     assert_equal client_span[:p], sdk_span[:s]
   end
 
+  def test_request_response_as_root_exit_span
+    clear_all!
+    ::Instana.config[:allow_exit_as_root] = true
+
+    response = client_stub.ping(
+      PingPongService::PingRequest.new(message: 'Hello World')
+    )
+    sleep 1
+
+    assert 'Hello World', response.message
+
+    # Pause for a split second to allow traces to be queued
+    sleep 0.2
+
+    spans = ::Instana.processor.queued_spans
+    client_span = find_spans_by_name(spans, :'rpc-client').first
+    server_span = find_spans_by_name(spans, :'rpc-server').first
+
+    assert_client_span(
+        client_span,
+        call: '/PingPongService/Ping',
+        call_type: :request_response
+    )
+
+    assert_server_span(
+        server_span,
+        call: '/PingPongService/Ping',
+        call_type: :request_response
+    )
+
+    assert_equal client_span[:t], server_span[:t]
+    assert_equal client_span[:s], server_span[:p]
+    assert_nil client_span[:p]
+  end
+
   def test_client_streamer
     clear_all!
     response = nil

data/test/instrumentation/mongo_test.rb

@@ -8,6 +8,10 @@ class MongoTest < Minitest::Test
     clear_all!
   end
 
+  def teardown
+    ::Instana.config[:allow_exit_as_root] = false
+  end
+
   def test_mongo
     Instana.tracer.start_or_continue_trace(:'mongo-test') do
       client = Mongo::Client.new('mongodb://127.0.0.1:27017/instana')
@@ -34,4 +38,31 @@ class MongoTest < Minitest::Test
     assert_equal insert_data[:peer], {hostname: "127.0.0.1", port: 27017}
     assert insert_data[:json].include?("insert")
   end
+
+  def test_mongo_as_root_exit_span
+    ::Instana.config[:allow_exit_as_root] = true
+
+    client = Mongo::Client.new('mongodb://127.0.0.1:27017/instana')
+    client[:people].delete_many({ name: /$S*/ })
+    client[:people].insert_many([{ _id: 1, name: "Stan" }])
+
+    spans = ::Instana.processor.queued_spans
+    delete_span, insert_span, = spans
+
+    delete_data = delete_span[:data][:mongo]
+    insert_data = insert_span[:data][:mongo]
+
+    assert_equal delete_span[:n], :mongo
+    assert_equal insert_span[:n], :mongo
+
+    assert_equal delete_data[:namespace], "instana"
+    assert_equal delete_data[:command], "delete"
+    assert_equal delete_data[:peer], {hostname: "127.0.0.1", port: 27017}
+    assert delete_data[:json].include?("delete")
+
+    assert_equal insert_data[:namespace], "instana"
+    assert_equal insert_data[:command], "insert"
+    assert_equal insert_data[:peer], {hostname: "127.0.0.1", port: 27017}
+    assert insert_data[:json].include?("insert")
+  end
 end

data/test/instrumentation/net_http_test.rb

@@ -5,6 +5,10 @@ require 'test_helper'
 require 'support/apps/http_endpoint/boot'
 
 class NetHTTPTest < Minitest::Test
+  def teardown
+    ::Instana.config[:allow_exit_as_root] = false
+  end
+
   def test_config_defaults
     assert ::Instana.config[:nethttp].is_a?(Hash)
     assert ::Instana.config[:nethttp].key?(:enabled)
@@ -47,6 +51,22 @@ class NetHTTPTest < Minitest::Test
     WebMock.disable_net_connect!
   end
 
+  def test_get_without_query_as_root_exit_span
+    clear_all!
+    ::Instana.config[:allow_exit_as_root] = true
+    WebMock.allow_net_connect!
+    Net::HTTP.get(URI('http://127.0.0.1:6511/'))
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 2, spans.length # 1 rack span from the endpoint is generated extra
+
+    http_span = find_first_span_by_name(spans, :'net-http')
+    assert_equal "http://127.0.0.1:6511/", http_span[:data][:http][:url]
+    assert_equal "200", http_span[:data][:http][:status]
+
+    WebMock.disable_net_connect!
+  end
+
   def test_block_request
     clear_all!
     WebMock.allow_net_connect!

data/test/instrumentation/rails_action_mailer_test.rb

@@ -34,6 +34,10 @@ class RailsActionMailerTest < Minitest::Test
     clear_all!
   end
 
+  def teardown
+    ::Instana.config[:allow_exit_as_root] = false
+  end
+
   def test_mailer
     Instana.tracer.start_or_continue_trace(:test) do
       TestMailer.sample_email.deliver_now
@@ -45,4 +49,18 @@ class RailsActionMailerTest < Minitest::Test
     assert_equal 'RailsActionMailerTest::TestMailer', mail_span[:data][:actionmailer][:class]
     assert_equal 'sample_email', mail_span[:data][:actionmailer][:method]
   end
+
+  def test_mailer_as_root_exit_span
+    ::Instana.config[:allow_exit_as_root] = true
+    TestMailer.sample_email.deliver_now
+    ::Instana.config[:allow_exit_as_root] = false
+
+    queued_spans = Instana.processor.queued_spans
+    assert_equal 1, queued_spans.length
+    mail_span = queued_spans[0]
+
+    assert_equal :"mail.actionmailer", mail_span[:n]
+    assert_equal 'RailsActionMailerTest::TestMailer', mail_span[:data][:actionmailer][:class]
+    assert_equal 'sample_email', mail_span[:data][:actionmailer][:method]
+  end
 end

data/test/instrumentation/redis_test.rb

@@ -23,6 +23,29 @@ class RedisTest < Minitest::Test
     assert_redis_trace('SET')
   end
 
+  def test_normal_call_as_root_exit_span
+    clear_all!
+
+    ::Instana.config[:allow_exit_as_root] = true
+
+    @redis_client.set('hello', 'world')
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 1, spans.length
+    redis_span = spans[0]
+
+    # first_span is the parent of second_span
+    assert_equal :redis, redis_span[:n]
+
+    data = redis_span[:data]
+
+    uri = URI.parse(@redis_url)
+    assert_equal "#{uri.host}:#{uri.port}", data[:redis][:connection]
+
+    assert_equal "0", data[:redis][:db]
+    assert_equal "SET", data[:redis][:command]
+  end
+
   def test_georadius
     clear_all!
 

data/test/instrumentation/resque_test.rb

@@ -15,6 +15,7 @@ class ResqueClientTest < Minitest::Test
   end
 
   def teardown
+    ::Instana.config[:allow_exit_as_root] = false
   end
 
   def test_enqueue
@@ -40,6 +41,26 @@ class ResqueClientTest < Minitest::Test
     assert_equal resque_job.args.first['span_id'], resque_span[:s]
   end
 
+  def test_enqueue_as_root_exit_span
+    ::Instana.config[:allow_exit_as_root] = true
+    ::Resque.enqueue(FastJob)
+    ::Instana.config[:allow_exit_as_root] = false
+
+    resque_job = Resque.reserve('critical')
+    spans = ::Instana.processor.queued_spans
+    assert_equal 1, spans.length
+
+    resque_span = spans[0]
+
+    assert_equal :"resque-client", resque_span[:n]
+    assert_equal "FastJob", resque_span[:data][:'resque-client'][:job]
+    assert_equal :critical, resque_span[:data][:'resque-client'][:queue]
+    assert_equal false, resque_span[:data][:'resque-client'].key?(:error)
+
+    assert_equal resque_job.args.first['trace_id'], resque_span[:t]
+    assert_equal resque_job.args.first['span_id'], resque_span[:s]
+  end
+
   def test_enqueue_to
     ::Instana.tracer.start_or_continue_trace(:'resque-client_test') do
       ::Resque.enqueue_to(:critical, FastJob)

data/test/instrumentation/rest_client_test.rb

@@ -10,6 +10,10 @@ class RestClientTest < Minitest::Test
     OpenSSL::SSL::SSLContext::DEFAULT_PARAMS[:ciphers] = OpenSSL::SSL::SSLContext.new.ciphers
   end
 
+  def teardown
+    ::Instana.config[:allow_exit_as_root] = false
+  end
+
   def test_config_defaults
     assert ::Instana.config[:'rest-client'].is_a?(Hash)
     assert ::Instana.config[:'rest-client'].key?(:enabled)
@@ -61,4 +65,43 @@ class RestClientTest < Minitest::Test
 
     WebMock.disable_net_connect!
   end
+
+  def test_basic_get_as_root_exit_span
+    clear_all!
+    ::Instana.config[:allow_exit_as_root] = true
+    WebMock.allow_net_connect!
+
+    url = "http://127.0.0.1:6511/"
+
+    RestClient.get url
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 3, spans.length
+
+    rack_span = find_first_span_by_name(spans, :rack)
+    rest_span = find_first_span_by_name(spans, :'rest-client')
+    net_span = find_first_span_by_name(spans, :'net-http')
+
+    # Span name validation
+    assert_equal :rack, rack_span[:n]
+    assert_equal :sdk, rest_span[:n]
+    assert_equal :"net-http", net_span[:n]
+
+    # Trace IDs and relationships
+    trace_id = net_span[:t]
+    assert_equal trace_id, rest_span[:t]
+    assert_equal trace_id, rack_span[:t]
+
+    assert_nil rest_span[:p]
+    assert_equal rest_span[:s], net_span[:p]
+    assert_equal net_span[:s], rack_span[:p]
+
+    # data keys/values
+    refute_nil net_span.key?(:data)
+    refute_nil net_span[:data].key?(:http)
+    assert_equal "http://127.0.0.1:6511/", net_span[:data][:http][:url]
+    assert_equal "200", net_span[:data][:http][:status]
+
+    WebMock.disable_net_connect!
+  end
 end

data/test/instrumentation/sidekiq-client_test.rb

@@ -9,6 +9,10 @@ class SidekiqClientTest < Minitest::Test
     ::Sidekiq::Queue.new('some_random_queue').clear
   end
 
+  def teardown
+    ::Instana.config[:allow_exit_as_root] = false
+  end
+
   def test_config_defaults
     assert ::Instana.config[:'sidekiq-client'].is_a?(Hash)
     assert ::Instana.config[:'sidekiq-client'].key?(:enabled)
@@ -35,6 +39,36 @@ class SidekiqClientTest < Minitest::Test
     assert_normal_trace_recorded(job)
   end
 
+  def test_enqueue_as_root_exit_span
+    clear_all!
+    ::Instana.config[:allow_exit_as_root] = true
+    disable_redis_instrumentation
+    ::Sidekiq::Client.push(
+      'queue' => 'some_random_queue',
+      'class' => ::SidekiqJobOne,
+      'args' => [1, 2, 3],
+      'retry' => false
+    )
+    ::Instana.config[:allow_exit_as_root] = false
+    enable_redis_instrumentation
+
+    queue = ::Sidekiq::Queue.new('some_random_queue')
+    job = queue.first
+
+    assert_job_enqueued(job)
+    spans = ::Instana.processor.queued_spans
+    assert_equal 1, spans.length
+
+    first_span = spans[0]
+
+    assert_equal :'sidekiq-client', first_span[:n]
+    assert_equal 'some_random_queue', first_span[:data][:'sidekiq-client'][:queue]
+    assert_equal 'SidekiqJobOne', first_span[:data][:'sidekiq-client'][:job]
+    assert_equal "false", first_span[:data][:'sidekiq-client'][:retry]
+    assert first_span[:data][:'sidekiq-client'][:'redis-url']
+    assert_equal job['jid'], first_span[:data][:'sidekiq-client'][:job_id]
+  end
+
   def test_enqueue_failure
     clear_all!
 
@@ -68,8 +102,8 @@ class SidekiqClientTest < Minitest::Test
     assert_equal 'SidekiqJobOne', job_message['class']
     assert_equal [1, 2, 3], job_message['args']
     assert_equal false, job_message['retry']
-    assert_equal false, job_message['X-Instana-T'].nil?
-    assert_equal false, job_message['X-Instana-S'].nil?
+    refute_nil   job_message['X-Instana-T']
+    refute_nil   job_message['X-Instana-S']
   end
 
   def assert_normal_trace_recorded(job)
@@ -102,7 +136,7 @@ class SidekiqClientTest < Minitest::Test
 
     assert_equal :'sidekiq-client', second_span[:n]
     assert_equal true, second_span[:error]
-    assert_equal false, second_span[:stack].nil?
+    refute_nil   second_span[:stack]
 
     assert_equal 'some_random_queue', second_span[:data][:'sidekiq-client'][:queue]
     assert_equal 'SidekiqJobTwo', second_span[:data][:'sidekiq-client'][:job]

data/test/instrumentation/sidekiq-worker_test.rb

@@ -156,7 +156,7 @@ class SidekiqServerTest < Minitest::Test
     assert_equal 'important', worker_span[:data][:'sidekiq-worker'][:queue]
     assert_equal 'SidekiqJobOne', worker_span[:data][:'sidekiq-worker'][:job]
     assert       worker_span[:data][:'sidekiq-worker'][:'redis-url']
-    assert_equal false, worker_span[:data][:'sidekiq-worker'][:job_id].nil?
+    refute_nil   worker_span[:data][:'sidekiq-worker'][:job_id]
   end
 
   def assert_failed_worker_span(worker_span)
@@ -165,7 +165,7 @@ class SidekiqServerTest < Minitest::Test
     assert_equal 'important', worker_span[:data][:'sidekiq-worker'][:queue]
     assert_equal 'SidekiqJobTwo', worker_span[:data][:'sidekiq-worker'][:job]
     assert       worker_span[:data][:'sidekiq-worker'][:'redis-url']
-    assert_equal false, worker_span[:data][:'sidekiq-worker'][:job_id].nil?
+    refute_nil   worker_span[:data][:'sidekiq-worker'][:job_id]
 
     assert_equal true, worker_span[:data][:'sidekiq-worker'][:error]
     assert_equal 'Fail to execute the job', worker_span[:data][:log][:message]

data/test/secrets_test.rb

@@ -94,7 +94,7 @@ class SecretsTest < Minitest::Test
       "list"=>["stan"]
     }
 
-    assert_equal @subject.remove_from_query(nil, sample_config), nil
+    assert_nil @subject.remove_from_query(nil, sample_config)
   end
 
   private

data/test/tracing/span_test.rb

@@ -9,8 +9,8 @@ class SpanTest < Minitest::Test
 
     assert_equal span[:s], span.id
     assert_equal span[:t], span.trace_id
-    assert_equal span[:p], span.parent_id
-    assert_equal span[:d], span.duration
+    assert_nil span[:p] # parent_id of a root span is nil
+    assert_nil span[:d] # duration of an open span is nil
 
     span.parent_id = 'test'
     assert_equal 'test', span.parent_id

data/test/tracing/tracer_test.rb

@@ -51,9 +51,7 @@ class TracerTest < Minitest::Test
 
     assert_equal false, ::Instana.tracer.tracing?
 
-    require 'resolv'
-    r = Resolv::DNS.new
-    ipv4 = r.getaddress("www.pwpush.com")
+    ipv4 = '111.111.111.111'
 
     ::Instana.tracer.start_or_continue_trace(:rack, {:ipaddr => ipv4}) do
       assert_equal true, ::Instana.tracer.tracing?
@@ -121,7 +119,7 @@ class TracerTest < Minitest::Test
     sdk_span = find_first_span_by_name(spans, :sub_block)
 
     assert_equal rack_span[:n], :rack
-    assert_equal rack_span[:p], nil
+    assert_nil rack_span[:p]
     assert_equal rack_span[:t], rack_span[:s]
     assert_equal rack_span[:data][:one], 1
 
@@ -151,7 +149,7 @@ class TracerTest < Minitest::Test
     assert_equal root_span[:data][:sdk][:name], :root_span
     assert_equal root_span[:data][:sdk][:type], :entry
     assert_equal root_span[:k], 1
-    assert_equal root_span[:p], nil
+    assert_nil root_span[:p]
     assert_equal root_span[:t], root_span[:s]
     assert_equal root_span[:data][:sdk][:custom][:tags][:one], 1
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.214.4
+  version: 1.215.1
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-24 00:00:00.000000000 Z
+date: 2024-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: sys-proctable
   requirement: !ruby/object:Gem::Requirement