instana 1.193.6 → 1.195.4

data/test/instrumentation/aws_test.rb

@@ -4,6 +4,10 @@
 require 'test_helper'
 
 class AwsTest < Minitest::Test
+  def setup
+    clear_all!
+  end
+
   def test_dynamo_db
     dynamo = Aws::DynamoDB::Client.new(
       region: "local",
@@ -27,7 +31,131 @@ class AwsTest < Minitest::Test
     assert rest.empty?
     assert_equal entry_span[:s], dynamo_span[:p]
     assert_equal :dynamodb, dynamo_span[:n]
-    assert_equal :get_item, dynamo_span[:data][:op]
-    assert_equal 'sample_table', dynamo_span[:data][:table]
+    assert_equal 'get', dynamo_span[:data][:dynamodb][:op]
+    assert_equal 'sample_table', dynamo_span[:data][:dynamodb][:table]
+  end
+
+  def test_s3
+    dynamo = Aws::S3::Client.new(
+      region: "local",
+      access_key_id: "minioadmin",
+      secret_access_key: "minioadmin",
+      endpoint: "http://localhost:9000"
+    )
+
+    assert_raises Aws::S3::Errors::NoSuchBucket do
+      Instana::Tracer.start_or_continue_trace(:s3_test, {}) do
+        dynamo.get_object(
+          bucket: 'sample_bucket',
+          key: 'sample_key'
+        )
+      end
+    end
+
+    spans = ::Instana.processor.queued_spans
+    s3_span, entry_span, *rest = spans
+
+    assert rest.empty?
+    assert_equal entry_span[:s], s3_span[:p]
+    assert_equal :s3, s3_span[:n]
+    assert_equal 'get', s3_span[:data][:s3][:op]
+    assert_equal 'sample_bucket', s3_span[:data][:s3][:bucket]
+    assert_equal 'sample_key', s3_span[:data][:s3][:key]
+  end
+
+  def test_sns_publish
+    sns = Aws::SNS::Client.new(
+      region: "local",
+      access_key_id: "test",
+      secret_access_key: "test",
+      endpoint: "http://localhost:9911"
+    )
+
+    assert_raises Aws::SNS::Errors::NotFound do
+      Instana::Tracer.start_or_continue_trace(:sns_test, {}) do
+        sns.publish(
+          topic_arn: 'topic:arn',
+          target_arn: 'target:arn',
+          phone_number: '555-0100',
+          subject: 'Test Subject',
+          message: 'Test Message'
+        )
+      end
+    end
+
+    spans = ::Instana.processor.queued_spans
+    aws_span, entry_span, *rest = spans
+
+    assert rest.empty?
+    assert_equal entry_span[:s], aws_span[:p]
+    assert_equal :sns, aws_span[:n]
+    assert_equal 'topic:arn', aws_span[:data][:sns][:topic]
+    assert_equal 'target:arn', aws_span[:data][:sns][:target]
+    assert_equal '555-0100', aws_span[:data][:sns][:phone]
+    assert_equal 'Test Subject', aws_span[:data][:sns][:subject]
+  end
+
+  def test_sns_other
+    sns = Aws::SNS::Client.new(
+      region: "local",
+      access_key_id: "test",
+      secret_access_key: "test",
+      endpoint: "http://localhost:9911"
+    )
+
+    Instana::Tracer.start_or_continue_trace(:sns_test, {}) do
+      sns.list_subscriptions
+    end
+
+    spans = ::Instana.processor.queued_spans
+    aws_span, entry_span, *rest = spans
+
+    assert rest.empty?
+    assert_equal entry_span[:s], aws_span[:p]
+    assert_equal :"net-http", aws_span[:n]
+  end
+
+  def test_sqs
+    sqs = Aws::SQS::Client.new(
+      region: "local",
+      access_key_id: "test",
+      secret_access_key: "test",
+      endpoint: "http://localhost:9324"
+    )
+
+    create_response = nil
+    get_url_response = nil
+
+    Instana::Tracer.start_or_continue_trace(:sqs_test, {}) do
+      create_response = sqs.create_queue(queue_name: 'test')
+      get_url_response = sqs.get_queue_url(queue_name: 'test')
+      sqs.send_message(queue_url: create_response.queue_url, message_body: 'Sample')
+    end
+
+    received = sqs.receive_message(
+      queue_url: create_response.queue_url,
+      message_attribute_names: ['All']
+    )
+    sqs.delete_queue(queue_url: create_response.queue_url)
+    message = received.messages.first
+    create_span, get_span, send_span, _root = ::Instana.processor.queued_spans
+
+    assert_equal :sqs, create_span[:n]
+    assert_equal create_response.queue_url, create_span[:data][:sqs][:queue]
+    assert_equal 'exit', create_span[:data][:sqs][:sort]
+    assert_equal 'create.queue', create_span[:data][:sqs][:type]
+
+    assert_equal :sqs, get_span[:n]
+    assert_equal get_url_response.queue_url, get_span[:data][:sqs][:queue]
+    assert_equal 'exit', get_span[:data][:sqs][:sort]
+    assert_equal 'get.queue', get_span[:data][:sqs][:type]
+
+    assert_equal :sqs, send_span[:n]
+    assert_equal get_url_response.queue_url, send_span[:data][:sqs][:queue]
+    assert_equal 'exit', send_span[:data][:sqs][:sort]
+    assert_equal 'single.sync', send_span[:data][:sqs][:type]
+    assert_equal send_span[:t], message.message_attributes['X_INSTANA_T'].string_value
+    assert_equal send_span[:s], message.message_attributes['X_INSTANA_S'].string_value
+    assert_equal 'Sample', message.body
   end
 end

data/test/instrumentation/excon_test.rb

@@ -22,7 +22,7 @@ class ExconTest < Minitest::Test
     url = "http://127.0.0.1:6511"
 
     connection = Excon.new(url)
-    Instana.tracer.start_or_continue_trace('excon-test') do
+    Instana.tracer.start_or_continue_trace(:'excon-test') do
       connection.get(:path => '/?basic_get')
     end
 
@@ -40,6 +40,7 @@ class ExconTest < Minitest::Test
     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)
@@ -146,4 +147,18 @@ class ExconTest < Minitest::Test
       assert_equal :sdk, grandparent_span[:n]
     end
   end
+
+  def test_basic_get_no_tracing
+    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"
+
+    connection = Excon.new(url)
+    connection.get(:path => '/?basic_get')
+  end
 end

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

@@ -18,7 +18,7 @@ class RackInstrumentedRequestTest < Minitest::Test
     refute req.skip_trace?
   end
 
-  def test_incomming_context
+  def test_incoming_context
     id = Instana::Util.generate_id
     req = Instana::InstrumentedRequest.new(
       'HTTP_X_INSTANA_L' => '1',
@@ -33,6 +33,51 @@ class RackInstrumentedRequestTest < Minitest::Test
     }
 
     assert_equal expected, req.incoming_context
+    refute req.continuing_from_trace_parent?
+  end
+
+  def test_incoming_w3_content
+    req = Instana::InstrumentedRequest.new(
+      'HTTP_X_INSTANA_L' => '1',
+      'HTTP_TRACEPARENT' => '00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01'
+    )
+
+    expected = {
+      external_trace_id: '4bf92f3577b34da6a3ce929d0e0e4736',
+      external_state: nil,
+      trace_id: 'a3ce929d0e0e4736',
+      span_id: '00f067aa0ba902b7',
+      level: '1'
+    }
+
+    assert_equal expected, req.incoming_context
+    assert req.continuing_from_trace_parent?
+  end
+
+  def test_incoming_invalid_w3_content
+    req = Instana::InstrumentedRequest.new(
+      'HTTP_X_INSTANA_L' => '1',
+      'HTTP_TRACEPARENT' => '00-XXa3ce929d0e0e4736-00f67aa0ba902b7-01'
+    )
+
+    expected = {
+      level: '1'
+    }
+
+    assert_equal expected, req.incoming_context
+  end
+
+  def test_incoming_w3_state
+    req = Instana::InstrumentedRequest.new(
+      'HTTP_TRACESTATE' => 'a=12345,in=123;abe,c=[+]'
+    )
+
+    expected = {
+      t: '123',
+      p: 'abe'
+    }
+
+    assert_equal expected, req.instana_ancestor
   end
 
   def test_request_tags
@@ -41,7 +86,8 @@ class RackInstrumentedRequestTest < Minitest::Test
       'HTTP_HOST' => 'example.com',
       'REQUEST_METHOD' => 'GET',
       'HTTP_X_CAPTURE_THIS' => 'that',
-      'PATH_INFO' => '/'
+      'PATH_INFO' => '/',
+      'QUERY_STRING' => 'test=true'
     )
 
     expected = {
@@ -50,7 +96,8 @@ class RackInstrumentedRequestTest < Minitest::Test
       host: 'example.com',
       header: {
         "X-Capture-This": 'that'
-      }
+      },
+      params: 'test=true'
     }
 
     assert_equal expected, req.request_tags

data/test/instrumentation/rack_test.rb

@@ -15,6 +15,24 @@ class RackTest < Minitest::Test
     end
   end
 
+  class ErrorApp
+    def call(_env)
+      raise 'An Error'
+    end
+  end
+
+  class FiveZeroOneApp
+    def call(_env)
+      [501, {}, ['No']]
+    end
+  end
+
+  class NoHeadersApp
+    def call(_env)
+      [501, nil, ['No']]
+    end
+  end
+
   def app
     @app = Rack::Builder.new do
       use Rack::CommonLogger
@@ -22,6 +40,8 @@ class RackTest < Minitest::Test
       use Instana::Rack
       map("/mrlobster") { run Rack::Lobster.new }
       map("/path_tpl") { run PathTemplateApp.new }
+      map("/error") { run ErrorApp.new }
+      map("/five_zero_one") { run FiveZeroOneApp.new }
     end
   end
 
@@ -49,6 +69,10 @@ class RackTest < Minitest::Test
     assert last_response.headers.key?("Server-Timing")
     assert last_response.headers["Server-Timing"] == "intid;desc=#{::Instana::Util.id_to_header(rack_span[:t])}"
 
+    # W3 Trace Context
+    assert_equal "00-#{rack_span[:t].rjust(32, '0')}-#{rack_span[:s]}-01", last_response.headers["Traceparent"]
+    assert_equal "in=#{rack_span[:t]};#{rack_span[:s]}", last_response.headers["Tracestate"]
+
     assert rack_span.key?(:data)
     assert rack_span[:data].key?(:http)
     assert_equal "GET", rack_span[:data][:http][:method]
@@ -272,4 +296,121 @@ class RackTest < Minitest::Test
     assert_equal :rack, rack_span[:n]
     assert_equal 'sample_template', rack_span[:data][:http][:path_tpl]
   end
+
+  def test_basic_get_with_x_instana_synthetic
+    header 'X-INSTANA-SYNTHETIC', '1'
+
+    clear_all!
+    get '/mrlobster'
+    assert last_response.ok?
+
+    spans = ::Instana.processor.queued_spans
+
+    # Span validation
+    assert_equal 1, spans.count
+
+    first_span = spans.first
+    assert_equal true, first_span[:sy]
+  end
+
+  def test_basic_get_with_w3_trace
+    clear_all!
+
+    header 'TRACEPARENT', '00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01'
+
+    get '/mrlobster'
+    assert last_response.ok?
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 1, spans.count
+
+    first_span = spans.first
+    assert_equal :rack, first_span[:n]
+    assert_equal 'a3ce929d0e0e4736', first_span[:t]
+    assert_equal '00f067aa0ba902b7', first_span[:p]
+    assert_equal '4bf92f3577b34da6a3ce929d0e0e4736', first_span[:lt]
+    assert_nil first_span[:ia]
+    assert first_span[:tp]
+  end
+
+  def test_basic_get_with_w3_disabled
+    clear_all!
+    ::Instana.config[:w3_trace_correlation] = false
+
+    header 'TRACEPARENT', '00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01'
+
+    get '/mrlobster'
+    assert last_response.ok?
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 1, spans.count
+
+    first_span = spans.first
+    assert_equal :rack, first_span[:n]
+    refute first_span[:tp]
+    ::Instana.config[:w3_trace_correlation] = true
+  end
+
+  def test_skip_trace
+    clear_all!
+    header 'X_INSTANA_L', '0;junk'
+
+    get '/mrlobster'
+    assert last_response.ok?
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 0, spans.count
+  end
+
+  def test_disable_trace
+    clear_all!
+    ::Instana.config[:tracing][:enabled] = false
+
+    get '/mrlobster'
+    assert last_response.ok?
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 0, spans.count
+    ::Instana.config[:tracing][:enabled] = true
+  end
+
+  def test_error_trace
+    clear_all!
+
+    get '/error'
+    refute last_response.ok?
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 1, spans.count
+
+    first_span = spans.first
+    assert_equal :rack, first_span[:n]
+    assert_equal 1, first_span[:ec]
+  end
+
+  def test_disable_trace_with_error
+    clear_all!
+    ::Instana.config[:tracing][:enabled] = false
+
+    get '/error'
+    refute last_response.ok?
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 0, spans.count
+    ::Instana.config[:tracing][:enabled] = true
+  end
+
+  def test_five_zero_x_trace
+    clear_all!
+
+    get '/five_zero_one'
+    refute last_response.ok?
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 1, spans.count
+
+    first_span = spans.first
+    assert_equal :rack, first_span[:n]
+    assert_equal 1, first_span[:ec]
+  end
 end