instana 1.214.3 → 1.215.0

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!
@@ -183,8 +203,8 @@ class NetHTTPTest < Minitest::Test
 
     assert_equal :sdk, sdk_span[:n]
     assert_equal :'net-http-error-test', sdk_span[:data][:sdk][:name]
-    assert_equal nil, sdk_span[:error]
-    assert_equal nil, sdk_span[:ec]
+    assert_nil sdk_span[:error]
+    assert_nil sdk_span[:ec]
 
     refute_nil http_span.key?(:data)
     refute_nil http_span[:data].key?(:http)

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/rails_action_view_test.rb

@@ -17,18 +17,6 @@ class RailsActionViewTest < Minitest::Test
 
   def setup
     clear_all!
-    @framework_version = Gem::Specification.find_by_name('rails').version
-    @supported_framework_version = @framework_version < Gem::Version.new('6.1')
-    @execute_test_if_framework_version_is_supported = lambda {
-      unless @supported_framework_version
-        skip "Skipping this test because Rails version #{@framework_version} is not yet supported!"
-      end
-    }
-    @execute_test_only_if_framework_version_is_not_supported = lambda {
-      if @supported_framework_version
-        skip "Skipping this test because Rails version #{@framework_version} is already supported!"
-      end
-    }
   end
 
   def test_config_defaults
@@ -37,25 +25,7 @@ class RailsActionViewTest < Minitest::Test
     assert_equal true, ::Instana.config[:action_view][:enabled]
   end
 
-  def test_no_tracing_if_unsupported_version_only_render_is_ok
-    @execute_test_only_if_framework_version_is_not_supported.call
-
-    ['/render_view', '/render_view_direct', '/render_partial', '/render_collection', '/render_file',
-     '/render_alternate_layout', '/render_json', '/render_xml',
-     '/render_rawbody', '/render_js'].each do |endpoint|
-      get endpoint
-      assert last_response.ok?
-    end
-
-    get '/render_partial_that_errors'
-    assert_equal false, last_response.ok?
-
-    spans = ::Instana.processor.queued_spans
-    assert_equal [], spans
-  end
-
   def test_render_view
-    @execute_test_if_framework_version_is_supported.call
     get '/render_view'
     assert last_response.ok?
 
@@ -66,7 +36,6 @@ class RailsActionViewTest < Minitest::Test
   end
 
   def test_render_view_direct
-    @execute_test_if_framework_version_is_supported.call
     get '/render_view_direct'
     assert last_response.ok?
 
@@ -89,7 +58,6 @@ class RailsActionViewTest < Minitest::Test
   end
 
   def test_render_file
-    @execute_test_if_framework_version_is_supported.call
     get '/render_file'
     assert last_response.ok?
 
@@ -100,7 +68,6 @@ class RailsActionViewTest < Minitest::Test
   end
 
   def test_render_json
-    @execute_test_if_framework_version_is_supported.call
     get '/render_json'
     assert last_response.ok?
 
@@ -111,7 +78,6 @@ class RailsActionViewTest < Minitest::Test
   end
 
   def test_render_xml
-    @execute_test_if_framework_version_is_supported.call
     get '/render_xml'
     assert last_response.ok?
 
@@ -122,7 +88,6 @@ class RailsActionViewTest < Minitest::Test
   end
 
   def test_render_body
-    @execute_test_if_framework_version_is_supported.call
     get '/render_rawbody'
     assert last_response.ok?
 
@@ -133,7 +98,6 @@ class RailsActionViewTest < Minitest::Test
   end
 
   def test_render_js
-    @execute_test_if_framework_version_is_supported.call
     get '/render_js'
     assert last_response.ok?
 
@@ -144,7 +108,6 @@ class RailsActionViewTest < Minitest::Test
   end
 
   def test_render_alternate_layout
-    @execute_test_if_framework_version_is_supported.call
     get '/render_alternate_layout'
     assert last_response.ok?
 
@@ -155,7 +118,6 @@ class RailsActionViewTest < Minitest::Test
   end
 
   def test_render_partial
-    @execute_test_if_framework_version_is_supported.call
     get '/render_partial'
     assert last_response.ok?
 
@@ -166,7 +128,6 @@ class RailsActionViewTest < Minitest::Test
   end
 
   def test_render_partial_that_errors
-    @execute_test_if_framework_version_is_supported.call
     get '/render_partial_that_errors'
     refute last_response.ok?
 
@@ -182,13 +143,11 @@ class RailsActionViewTest < Minitest::Test
   end
 
   def test_render_collection
-    @execute_test_if_framework_version_is_supported.call
     get '/render_collection'
     assert last_response.ok?
 
     spans = ::Instana.processor.queued_spans
     span = find_first_span_by_name(spans, :render)
-
     assert_equal :collection, span[:data][:render][:type]
     assert_equal 'blocks/block', span[:data][:render][:name]
   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/tracer_test.rb

@@ -121,7 +121,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 +151,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.3
+  version: 1.215.0
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-04-30 00:00:00.000000000 Z
+date: 2024-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -142,6 +142,15 @@ files:
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- ".tekton/.currency/currency-pipeline.yaml"
+- ".tekton/.currency/currency-pipelinerun.yaml"
+- ".tekton/.currency/currency-rbac.yaml"
+- ".tekton/.currency/currency-scheduled-eventlistener.yaml"
+- ".tekton/.currency/currency-tasks.yaml"
+- ".tekton/.currency/docs/report.md"
+- ".tekton/.currency/resources/requirements.txt"
+- ".tekton/.currency/resources/table.json"
+- ".tekton/.currency/scripts/generate_report.py"
 - ".tekton/github-interceptor-secret.yaml"
 - ".tekton/github-pr-eventlistener.yaml"
 - ".tekton/github-pr-pipeline.yaml.part"
@@ -149,6 +158,7 @@ files:
 - ".tekton/github-webhook-ingress.yaml"
 - ".tekton/pipeline.yaml"
 - ".tekton/pipelinerun.yaml"
+- ".tekton/ruby-tracer-prepuller.yaml"
 - ".tekton/run_unittests.sh"
 - ".tekton/scheduled-eventlistener.yaml"
 - ".tekton/task.yaml"