instana 1.195.1 → 1.197.0.pre2

data/test/instrumentation/net_http_test.rb

@@ -11,6 +11,24 @@ class NetHTTPTest < Minitest::Test
     assert_equal true, ::Instana.config[:nethttp][:enabled]
   end
 
+  def test_get_with_query
+    clear_all!
+    WebMock.allow_net_connect!
+
+    Instana.tracer.start_or_continue_trace(:"net-http-test") do
+      Net::HTTP.get(URI('http://127.0.0.1:6511/?query_value=true'))
+    end
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 3, spans.length
+
+    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 "query_value=true", http_span[:data][:http][:params]
+
+    WebMock.disable_net_connect!
+  end
+
   def test_block_request
     clear_all!
     WebMock.allow_net_connect!

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'
     }
 
@@ -81,12 +83,14 @@ class RackInstrumentedRequestTest < Minitest::Test
   end
 
   def test_request_tags
-    ::Instana.agent.extra_headers = %w[X-Capture-This]
+    ::Instana.agent.define_singleton_method(:extra_headers) { %w[X-Capture-This] }
+
     req = Instana::InstrumentedRequest.new(
       'HTTP_HOST' => 'example.com',
       'REQUEST_METHOD' => 'GET',
       'HTTP_X_CAPTURE_THIS' => 'that',
-      'PATH_INFO' => '/'
+      'PATH_INFO' => '/',
+      'QUERY_STRING' => 'test=true'
     )
 
     expected = {
@@ -95,11 +99,12 @@ class RackInstrumentedRequestTest < Minitest::Test
       host: 'example.com',
       header: {
         "X-Capture-This": 'that'
-      }
+      },
+      params: 'test=true'
     }
 
     assert_equal expected, req.request_tags
-    ::Instana.agent.extra_headers = nil
+    ::Instana.agent.singleton_class.send(:remove_method, :extra_headers)
   end
 
   def test_correlation_data_valid

data/test/instrumentation/rack_test.rb

@@ -80,9 +80,6 @@ class RackTest < Minitest::Test
     assert_equal 200, rack_span[:data][:http][:status]
     assert_equal 'example.org', rack_span[:data][:http][:host]
     assert rack_span.key?(:f)
-    assert rack_span[:f].key?(:e)
-    assert rack_span[:f].key?(:h)
-    assert_equal ::Instana.agent.agent_uuid, rack_span[:f][:h]
     assert !rack_span.key?(:stack)
 
     # Restore to default
@@ -134,9 +131,6 @@ class RackTest < Minitest::Test
     assert_equal "/mrlobster", rack_span[:data][:http][:url]
     assert_equal 200, rack_span[:data][:http][:status]
     assert rack_span.key?(:f)
-    assert rack_span[:f].key?(:e)
-    assert rack_span[:f].key?(:h)
-    assert_equal ::Instana.agent.agent_uuid, rack_span[:f][:h]
   end
 
   def test_basic_put
@@ -166,9 +160,6 @@ class RackTest < Minitest::Test
     assert_equal "/mrlobster", rack_span[:data][:http][:url]
     assert_equal 200, rack_span[:data][:http][:status]
     assert rack_span.key?(:f)
-    assert rack_span[:f].key?(:e)
-    assert rack_span[:f].key?(:h)
-    assert_equal ::Instana.agent.agent_uuid, rack_span[:f][:h]
   end
 
   def test_context_continuation
@@ -202,9 +193,6 @@ class RackTest < Minitest::Test
     assert_equal "/mrlobster", rack_span[:data][:http][:url]
     assert_equal 200, rack_span[:data][:http][:status]
     assert rack_span.key?(:f)
-    assert rack_span[:f].key?(:e)
-    assert rack_span[:f].key?(:h)
-    assert_equal ::Instana.agent.agent_uuid, rack_span[:f][:h]
 
     # Context validation
     # The first span should have the passed in trace ID
@@ -260,7 +248,7 @@ class RackTest < Minitest::Test
   def test_custom_headers_capture
     clear_all!
     ::Instana.config[:collect_backtraces] = true
-    ::Instana.agent.extra_headers = %w(X-Capture-This X-Capture-That)
+    ::Instana.agent.define_singleton_method(:extra_headers) { %w(X-Capture-This X-Capture-That) }
 
     get '/mrlobster', {}, { "HTTP_X_CAPTURE_THIS" => "ThereYouGo" }
     assert last_response.ok?
@@ -280,7 +268,7 @@ class RackTest < Minitest::Test
 
     # Restore to default
     ::Instana.config[:collect_backtraces] = false
-    ::Instana.agent.extra_headers = nil
+    ::Instana.agent.singleton_class.send(:remove_method, :extra_headers)
   end
 
   def test_capture_http_path_template

data/test/instrumentation/shoryuken_test.rb

@@ -0,0 +1,47 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+require 'test_helper'
+require 'ostruct'
+
+class ShoryukenTest < Minitest::Test
+  def setup
+    clear_all!
+    @middleware = Instana::Instrumentation::Shoryuken.new
+  end
+
+  def test_start_trace_with_context
+    id = Instana::Util.generate_id
+    message = OpenStruct.new(
+      queue_url: 'http://example.com',
+      message_attributes: {
+        "X_INSTANA_T" => OpenStruct.new(string_value: id),
+        "X_INSTANA_S" => OpenStruct.new(string_value: id),
+        "X_INSTANA_L" => OpenStruct.new(string_value: '1')
+      }
+    )
+
+    @middleware.call(nil, nil, message, nil) {}
+
+    span = ::Instana.processor.queued_spans.first
+
+    assert_equal id, span[:t]
+    assert_equal id, span[:p]
+    assert_equal 'entry', span[:data][:sqs][:sort]
+    assert_equal 'http://example.com', span[:data][:sqs][:queue]
+  end
+
+  def test_start_trace
+    message = OpenStruct.new(
+      queue_url: 'http://example.com'
+    )
+
+    @middleware.call(nil, nil, message, nil) {}
+
+    span = ::Instana.processor.queued_spans.first
+
+    assert_nil span[:p]
+    assert_equal 'entry', span[:data][:sqs][:sort]
+    assert_equal 'http://example.com', span[:data][:sqs][:queue]
+  end
+end

data/test/secrets_test.rb

@@ -5,72 +5,91 @@ require 'test_helper'
 
 class SecretsTest < Minitest::Test
   def setup
-    @subject = Instana::Secrets.new
+    @subject = Instana::Secrets.new(logger: Logger.new('/dev/null'))
   end
-  
+
   def test_equals_ignore_case
     sample_config = {
-      "matcher"=>"equals-ignore-case", 
+      "matcher"=>"equals-ignore-case",
       "list"=>["key"]
     }
-    
+
     url = url_for(%w(key Str kEy KEY))
     assert_redacted @subject.remove_from_query(url, sample_config), %w(key kEy KEY)
   end
-  
+
   def test_equals
     sample_config = {
-      "matcher"=>"equals", 
+      "matcher"=>"equals",
       "list"=>["key", "kEy"]
     }
-    
+
     url = url_for(%w(key Str kEy KEY))
     assert_redacted @subject.remove_from_query(url, sample_config), %w(key kEy)
   end
-  
+
   def test_contains_ignore_case
     sample_config = {
-      "matcher"=>"contains-ignore-case", 
+      "matcher"=>"contains-ignore-case",
       "list"=>["stan"]
     }
-    
+
     url = url_for(%w(instantiate conTESTant sample))
     assert_redacted @subject.remove_from_query(url, sample_config), %w(instantiate conTESTant)
   end
-  
+
   def test_contains
     sample_config = {
-      "matcher"=>"contains", 
+      "matcher"=>"contains",
       "list"=>["stan"]
     }
-    
+
     url = url_for(%w(instantiate conTESTant sample))
     assert_redacted @subject.remove_from_query(url, sample_config), %w(instantiate)
-  
   end
-  
+
   def test_regexp
     sample_config = {
-      "matcher"=>"regex", 
+      "matcher"=>"regex",
       "list"=>["l{2}"]
     }
-    
+
     url = url_for(%w(ball foot move))
-    assert_redacted @subject.remove_from_query(url, sample_config), %w(ball) 
+    assert_redacted @subject.remove_from_query(url, sample_config), %w(ball)
+  end
+
+  def test_invalid
+    sample_config = {
+      "matcher"=>"test_invalid",
+      "list"=>["key"]
+    }
+
+    url = url_for(%w(key Str kEy KEY))
+    assert_redacted @subject.remove_from_query(url, sample_config), []
+  end
+
+  def test_without_scheme
+    sample_config = {
+      "matcher"=>"contains",
+      "list"=>["stan"]
+    }
+
+    url = 'example.com?instantiate=true'
+    assert_redacted @subject.remove_from_query(url, sample_config), %w(instantiate)
   end
-  
+
   private
-  
+
   def url_for(keys)
     url = URI('http://example.com')
     url.query = URI.encode_www_form(keys.map { |k| [k, rand(1..100)]})
     url.to_s
   end
-  
+
   def assert_redacted(str, keys)
     url = URI(str)
     params = CGI.parse(url.query)
-    
+
     assert_equal keys, params.select { |_, v| v == %w(<redacted>) }.keys, 'to be redacted'
   end
 end

data/test/snapshot/deltable_test.rb

@@ -0,0 +1,17 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+require 'test_helper'
+
+class DeltableTest < Minitest::Test
+  include Instana::Snapshot::Deltable
+
+  def test_delta
+    subject = {a: {b: 5}}
+
+    assert_equal 5, delta(:a, :b, obj: subject, compute: ->(o, n) { o + n })
+    assert_equal 10, delta(:a, :b, obj: subject, compute: ->(o, n) { o + n })
+
+    assert_nil delta(:a, :c, obj: subject, compute: ->(o, n) { o + n })
+  end
+end

data/test/snapshot/docker_container_test.rb

@@ -0,0 +1,82 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+require 'test_helper'
+
+class DockerContainerTest < Minitest::Test
+  def test_container
+    stub_request(:get, 'https://10.10.10.10:8080/v3/task/stats')
+      .to_return(status: 200, body: File.read('test/support/ecs/stats.json'))
+
+    container = JSON.parse(File.read('test/support/ecs/task.json'))['Containers'].first
+    subject = Instana::Snapshot::DockerContainer.new(container, metadata_uri: 'https://10.10.10.10:8080/v3')
+
+    snapshot = subject.snapshot
+
+    assert_equal Instana::Snapshot::DockerContainer::ID, snapshot[:name]
+    assert_equal 'arn:aws:ecs:us-east-2:012345678910:task/9781c248-0edd-4cdb-9a93-f63cb662a5d3::~internal~ecs~pause', snapshot[:entityId]
+
+    assert_equal "731a0d6a3b4210e2448339bc7015aaa79bfe4fa256384f4102db86ef94cbbc4c", snapshot[:data][:Id]
+    assert_equal "2018-02-01T20:55:08.366329616Z", snapshot[:data][:Created]
+    assert_equal "2018-02-01T20:55:09.058354915Z", snapshot[:data][:Started]
+    assert_equal "amazon/amazon-ecs-pause:0.1.0", snapshot[:data][:Image]
+    assert_equal container['Labels'], snapshot[:data][:Labels]
+    assert_nil snapshot[:data][:Ports]
+    assert_equal "awsvpc", snapshot[:data][:NetworkMode]
+  end
+
+  def test_container_metrics
+    stub_request(:get, 'https://10.10.10.10:8080/v3/task/stats')
+      .to_return(status: 200, body: File.read('test/support/ecs/stats.json'))
+
+    container = JSON.parse(File.read('test/support/ecs/task.json'))['Containers'].last
+    subject = Instana::Snapshot::DockerContainer.new(container, metadata_uri: 'https://10.10.10.10:8080/v3')
+
+    snapshot = subject.snapshot
+
+    assert_equal Instana::Snapshot::DockerContainer::ID, snapshot[:name]
+    assert_equal 'arn:aws:ecs:us-east-2:012345678910:task/9781c248-0edd-4cdb-9a93-f63cb662a5d3::nginx-curl', snapshot[:entityId]
+
+    assert_equal 0.0030905127838258164, snapshot[:data][:cpu][:total_usage]
+    assert_equal 0.0022809745982374286, snapshot[:data][:cpu][:user_usage]
+    assert_equal 0.00031104199066874026, snapshot[:data][:cpu][:system_usage]
+    assert_equal 0, snapshot[:data][:cpu][:throttling_count]
+    assert_equal 0, snapshot[:data][:cpu][:throttling_time]
+    assert_equal 5_890_048, snapshot[:data][:blkio][:blk_read]
+    assert_equal 12288, snapshot[:data][:blkio][:blk_write]
+    assert_equal 6_610_944, snapshot[:data][:memory][:active_anon]
+    assert_equal 0, snapshot[:data][:memory][:active_file]
+    assert_equal 0, snapshot[:data][:memory][:inactive_anon]
+    assert_equal 2_158_592, snapshot[:data][:memory][:inactive_file]
+    assert_equal 0, snapshot[:data][:memory][:total_cache]
+    assert_equal 8_769_536, snapshot[:data][:memory][:total_rss]
+    assert_equal 10_035_200, snapshot[:data][:memory][:usage]
+    assert_equal 12_677_120, snapshot[:data][:memory][:max_usage]
+    assert_equal 4_134_825_984, snapshot[:data][:memory][:limit]
+    assert_equal({bytes: 40_000_257, dropped: 7, errors: 2, packet: 200_017}, snapshot[:data][:network][:rx])
+    assert_equal({bytes: 20_000_511, dropped: 200_007, errors: 5, packet: 2}, snapshot[:data][:network][:tx])
+  end
+
+  def test_container_no_network
+    stub_request(:get, 'https://10.10.10.10:8080/v3/task/stats')
+      .to_return(status: 200, body: File.read('test/support/ecs/stats.json'))
+
+    container = JSON.parse(File.read('test/support/ecs/task.json'))['Containers'][1]
+    subject = Instana::Snapshot::DockerContainer.new(container, metadata_uri: 'https://10.10.10.10:8080/v3')
+
+    snapshot = subject.snapshot
+    assert_nil snapshot[:data][:network]
+  end
+
+  def test_snapshot_error
+    stub_request(:get, 'https://10.10.10.10:8080/v3/task/stats')
+      .to_return(status: 500)
+
+    container = JSON.parse(File.read('test/support/ecs/task.json'))['Containers'].first
+    subject = Instana::Snapshot::DockerContainer.new(container, metadata_uri: 'https://10.10.10.10:8080/v3')
+
+    assert_raises do
+      subject.snapshot
+    end
+  end
+end

data/test/snapshot/fargate_container_test.rb

@@ -0,0 +1,82 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+require 'test_helper'
+
+class FargateContainerTest < Minitest::Test
+  def test_snapshot_observed
+    container = JSON.parse(File.read('test/support/ecs/task.json'))['Containers'].first
+    subject = Instana::Snapshot::FargateContainer.new(container, metadata_uri: 'https://10.10.10.10:8080/v3')
+
+    stub_request(:get, 'https://10.10.10.10:8080/v3')
+      .to_return(status: 200, body: File.read('test/support/ecs/container.json'))
+
+    snapshot = subject.snapshot
+
+    assert_equal Instana::Snapshot::FargateContainer::ID, snapshot[:name]
+    assert_equal 'arn:aws:ecs:us-east-2:012345678910:task/9781c248-0edd-4cdb-9a93-f63cb662a5d3::~internal~ecs~pause', snapshot[:entityId]
+
+    assert_equal "731a0d6a3b4210e2448339bc7015aaa79bfe4fa256384f4102db86ef94cbbc4c", snapshot[:data][:dockerId]
+    assert_equal "ecs-nginx-5-internalecspause-acc699c0cbf2d6d11700", snapshot[:data][:dockerName]
+    assert_equal "~internal~ecs~pause", snapshot[:data][:containerName]
+    assert_equal "amazon/amazon-ecs-pause:0.1.0", snapshot[:data][:image]
+    assert_equal "", snapshot[:data][:imageId]
+    assert_equal "arn:aws:ecs:us-east-2:012345678910:task/9781c248-0edd-4cdb-9a93-f63cb662a5d3", snapshot[:data][:taskArn]
+    assert_nil snapshot[:data][:taskDefinition]
+    assert_nil snapshot[:data][:taskDefinitionVersion]
+    assert_equal "default", snapshot[:data][:clusterArn]
+    assert_equal "RESOURCES_PROVISIONED", snapshot[:data][:desiredStatus]
+    assert_equal "RESOURCES_PROVISIONED", snapshot[:data][:knownStatus]
+    assert_nil snapshot[:data][:ports]
+    assert_equal({:cpu => 0, :memory => 0}, snapshot[:data][:limits])
+    assert_equal "2018-02-01T20:55:08.366329616Z", snapshot[:data][:createdAt]
+    assert_equal "2018-02-01T20:55:09.058354915Z", snapshot[:data][:startedAt]
+
+    assert_nil subject.source
+  end
+
+  def test_snapshot_current
+    container = JSON.parse(File.read('test/support/ecs/task.json'))['Containers'].last
+    subject = Instana::Snapshot::FargateContainer.new(container, metadata_uri: 'https://10.10.10.10:8080/v3')
+
+    stub_request(:get, 'https://10.10.10.10:8080/v3')
+      .to_return(status: 200, body: File.read('test/support/ecs/container.json'))
+
+    snapshot = subject.snapshot
+
+    assert_equal Instana::Snapshot::FargateContainer::ID, snapshot[:name]
+    assert_equal 'arn:aws:ecs:us-east-2:012345678910:task/9781c248-0edd-4cdb-9a93-f63cb662a5d3::nginx-curl', snapshot[:entityId]
+
+    assert_equal "43481a6ce4842eec8fe72fc28500c6b52edcc0917f105b83379f88cac1ff3946", snapshot[:data][:dockerId]
+    assert_equal "ecs-nginx-5-nginx-curl-ccccb9f49db0dfe0d901", snapshot[:data][:dockerName]
+    assert_equal "nginx-curl", snapshot[:data][:containerName]
+    assert_equal "nrdlngr/nginx-curl", snapshot[:data][:image]
+    assert_equal "sha256:2e00ae64383cfc865ba0a2ba37f61b50a120d2d9378559dcd458dc0de47bc165", snapshot[:data][:imageId]
+    assert_equal "arn:aws:ecs:us-east-2:012345678910:task/9781c248-0edd-4cdb-9a93-f63cb662a5d3", snapshot[:data][:taskArn]
+    assert_nil snapshot[:data][:taskDefinition]
+    assert_nil snapshot[:data][:taskDefinitionVersion]
+    assert_equal "default", snapshot[:data][:clusterArn]
+    assert_equal "RUNNING", snapshot[:data][:desiredStatus]
+    assert_equal "RUNNING", snapshot[:data][:knownStatus]
+    assert_nil snapshot[:data][:ports]
+    assert_equal({:cpu => 512, :memory => 512}, snapshot[:data][:limits])
+    assert_equal "2018-02-01T20:55:10.554941919Z", snapshot[:data][:createdAt]
+    assert_equal "2018-02-01T20:55:11.064236631Z", snapshot[:data][:startedAt]
+    assert_equal true, snapshot[:data][:instrumented]
+    assert_equal "ruby", snapshot[:data][:runtime]
+
+    assert_equal({hl: true, cp: "aws", e: "arn:aws:ecs:us-east-2:012345678910:task/9781c248-0edd-4cdb-9a93-f63cb662a5d3::nginx-curl"}, subject.source)
+  end
+
+  def test_snapshot_error
+    stub_request(:get, 'https://10.10.10.10:8080/v3')
+      .to_return(status: 500)
+
+    container = JSON.parse(File.read('test/support/ecs/task.json'))['Containers'].first
+    subject = Instana::Snapshot::FargateContainer.new(container, metadata_uri: 'https://10.10.10.10:8080/v3')
+
+    assert_raises do
+      subject.snapshot
+    end
+  end
+end