instana 1.192.0 → 1.193.4

data/test/instrumentation/excon_test.rb

@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'support/apps/http_endpoint/boot'
 
 class ExconTest < Minitest::Test
   def test_config_defaults

data/test/instrumentation/grpc_test.rb

@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'support/apps/grpc/boot'
 
 class GrpcTest < Minitest::Test
   def client_stub
@@ -225,7 +226,7 @@ class GrpcTest < Minitest::Test
     server_span = find_spans_by_name(spans, :'rpc-server').first
 
     validate_sdk_span(sdk_span)
-    
+
     assert_client_span(
         client_span,
         call: '/PingPongService/FailToPing',

data/test/instrumentation/{net-http_test.rb → net_http_test.rb}

@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'support/apps/http_endpoint/boot'
 
 class NetHTTPTest < Minitest::Test
   def test_config_defaults

data/test/instrumentation/rack_instrumented_request_test.rb

@@ -0,0 +1,84 @@
+require 'test_helper'
+
+class RackInstrumentedRequestTest < Minitest::Test
+  def test_skip_trace_with_header
+    req = Instana::InstrumentedRequest.new(
+      'HTTP_X_INSTANA_L' => '0;sample-data'
+    )
+
+    assert req.skip_trace?
+  end
+
+  def test_skip_trace_without_header
+    req = Instana::InstrumentedRequest.new({})
+
+    refute req.skip_trace?
+  end
+
+  def test_incomming_context
+    id = Instana::Util.generate_id
+    req = Instana::InstrumentedRequest.new(
+      'HTTP_X_INSTANA_L' => '1',
+      'HTTP_X_INSTANA_T' => id,
+      'HTTP_X_INSTANA_S' => id
+    )
+
+    expected = {
+      trace_id: id,
+      span_id: id,
+      level: '1'
+    }
+
+    assert_equal expected, req.incoming_context
+  end
+
+  def test_request_tags
+    ::Instana.agent.extra_headers = %w[X-Capture-This]
+    req = Instana::InstrumentedRequest.new(
+      'HTTP_HOST' => 'example.com',
+      'REQUEST_METHOD' => 'GET',
+      'HTTP_X_CAPTURE_THIS' => 'that',
+      'PATH_INFO' => '/'
+    )
+
+    expected = {
+      method: 'GET',
+      url: '/',
+      host: 'example.com',
+      header: {
+        "X-Capture-This": 'that'
+      }
+    }
+
+    assert_equal expected, req.request_tags
+    ::Instana.agent.extra_headers = nil
+  end
+
+  def test_correlation_data_valid
+    req = Instana::InstrumentedRequest.new(
+      'HTTP_X_INSTANA_L' => '1,correlationType=web ;correlationId=1234567890abcdef'
+    )
+    expected = {
+      type: 'web',
+      id: '1234567890abcdef'
+    }
+
+    assert_equal expected, req.correlation_data
+  end
+
+  def test_correlation_data_invalid
+    req = Instana::InstrumentedRequest.new(
+      'HTTP_X_INSTANA_L' => '0;sample-data'
+    )
+
+    assert_equal({}, req.correlation_data)
+  end
+
+  def test_correlation_data_legacy
+    req = Instana::InstrumentedRequest.new(
+      'HTTP_X_INSTANA_L' => '1'
+    )
+
+    assert_equal({}, req.correlation_data)
+  end
+end

data/test/{frameworks → instrumentation}/rack_test.rb

@@ -1,11 +1,10 @@
 require 'test_helper'
 require 'rack/test'
 require 'rack/lobster'
-require "instana/rack"
 
 class RackTest < Minitest::Test
   include Rack::Test::Methods
-  
+
   class PathTemplateApp
     def call(env)
       env['INSTANA_HTTP_PATH_TEMPLATE'] = 'sample_template'
@@ -147,8 +146,9 @@ class RackTest < Minitest::Test
 
   def test_context_continuation
     clear_all!
-    header 'X-INSTANA-T', Instana::Util.id_to_header(1234)
-    header 'X-INSTANA-S', Instana::Util.id_to_header(4321)
+    continuation_id = Instana::Util.generate_id
+    header 'X-INSTANA-T', continuation_id
+    header 'X-INSTANA-S', continuation_id
 
     get '/mrlobster'
     assert last_response.ok?
@@ -182,10 +182,30 @@ class RackTest < Minitest::Test
     # Context validation
     # The first span should have the passed in trace ID
     # and specify the passed in span ID as it's parent.
-    assert_equal 1234, rack_span[:t]
-    assert_equal 4321, rack_span[:p]
+    assert_equal continuation_id, rack_span[:t]
+    assert_equal continuation_id, rack_span[:p]
   end
 
+  def test_correlation_information
+    clear_all!
+
+    header 'X-INSTANA-L', '1,correlationType=test;correlationId=abcdefh123'
+
+    get '/mrlobster'
+    assert last_response.ok?
+
+    spans = ::Instana.processor.queued_spans
+
+    # Span validation
+    assert_equal 1, spans.count
+    rack_span = spans.first
+    assert_equal :rack, rack_span[:n]
+
+    assert_equal 'abcdefh123', rack_span[:crid]
+    assert_equal 'test', rack_span[:crtp]
+  end
+
+
   def test_instana_response_headers
     clear_all!
     get '/mrlobster'
@@ -235,16 +255,16 @@ class RackTest < Minitest::Test
     ::Instana.config[:collect_backtraces] = false
     ::Instana.agent.extra_headers = nil
   end
-  
+
   def test_capture_http_path_template
     clear_all!
-    
+
     get '/path_tpl'
     assert last_response.ok?
-    
+
     spans = ::Instana.processor.queued_spans
     assert_equal 1, spans.length
-    
+
     rack_span = spans.first
     assert_equal :rack, rack_span[:n]
     assert_equal 'sample_template', rack_span[:data][:http][:path_tpl]

data/test/{frameworks/rails/actioncontroller_test.rb → instrumentation/rails_action_controller_test.rb}

@@ -1,6 +1,13 @@
 require 'test_helper'
 
-class ActionControllerTest < Minitest::Test
+class RailsActionControllerTest < Minitest::Test
+  include Rack::Test::Methods
+  APP = Rack::Builder.parse_file('test/support/apps/action_controller/config.ru').first
+
+  def app
+    APP
+  end
+
   def test_config_defaults
     assert ::Instana.config[:action_controller].is_a?(Hash)
     assert ::Instana.config[:action_controller].key?(:enabled)
@@ -10,33 +17,35 @@ class ActionControllerTest < Minitest::Test
   def test_controller_reporting
     clear_all!
 
-    Net::HTTP.get(URI.parse('http://localhost:3205/test/world'))
+    get '/base/world'
+    assert last_response.ok?
 
     spans = ::Instana.processor.queued_spans
     assert_equal 3, spans.length
 
     ac_span = find_first_span_by_name(spans, :actioncontroller)
 
-    assert_equal "TestController", ac_span[:data][:actioncontroller][:controller]
+    assert_equal "TestBaseController", ac_span[:data][:actioncontroller][:controller]
     assert_equal "world", ac_span[:data][:actioncontroller][:action]
   end
 
   def test_controller_error
     clear_all!
 
-    Net::HTTP.get(URI.parse('http://localhost:3205/test/error'))
+    get '/base/error'
+    refute last_response.ok?
 
     spans = ::Instana.processor.queued_spans
     assert_equal 2, spans.length
 
     ac_span = find_first_span_by_name(spans, :actioncontroller)
 
-    assert_equal "TestController", ac_span[:data][:actioncontroller][:controller]
+    assert_equal "TestBaseController", ac_span[:data][:actioncontroller][:controller]
     assert_equal "error", ac_span[:data][:actioncontroller][:action]
     assert ac_span.key?(:error)
     assert ac_span.key?(:stack)
     assert_equal "Warning: This is a simulated Error", ac_span[:data][:log][:message]
-    assert_equal "Exception", ac_span[:data][:log][:parameters]
+    assert_equal "StandardError", ac_span[:data][:log][:parameters]
   end
 
   def test_api_controller_reporting
@@ -45,7 +54,8 @@ class ActionControllerTest < Minitest::Test
 
     clear_all!
 
-    Net::HTTP.get(URI.parse('http://localhost:3205/api/world'))
+    get '/api/world'
+    assert last_response.ok?
 
     spans = ::Instana.processor.queued_spans
     assert_equal 3, spans.length
@@ -53,7 +63,7 @@ class ActionControllerTest < Minitest::Test
     ac_span = find_first_span_by_name(spans, :actioncontroller)
 
     assert_equal :actioncontroller, ac_span[:n]
-    assert_equal "SocketController", ac_span[:data][:actioncontroller][:controller]
+    assert_equal "TestApiController", ac_span[:data][:actioncontroller][:controller]
     assert_equal "world", ac_span[:data][:actioncontroller][:action]
   end
 
@@ -63,28 +73,30 @@ class ActionControllerTest < Minitest::Test
 
     clear_all!
 
-    Net::HTTP.get(URI.parse('http://localhost:3205/api/error'))
+    get '/api/error'
+    refute last_response.ok?
 
     spans = ::Instana.processor.queued_spans
     assert_equal 2, spans.length
 
     ac_span = find_first_span_by_name(spans, :actioncontroller)
 
-    assert_equal "SocketController", ac_span[:data][:actioncontroller][:controller]
+    assert_equal "TestApiController", ac_span[:data][:actioncontroller][:controller]
     assert_equal "error", ac_span[:data][:actioncontroller][:action]
     assert ac_span.key?(:error)
     assert ac_span.key?(:stack)
     assert_equal "Warning: This is a simulated Socket API Error", ac_span[:data][:log][:message]
-    assert_equal "Exception", ac_span[:data][:log][:parameters]
+    assert_equal "StandardError", ac_span[:data][:log][:parameters]
   end
 
-  def test_api_controller_404
+  def test_api_controller_not_found
     # Run only when ActionController::API is used/defined
     skip unless defined?(::ActionController::API)
 
     clear_all!
 
-    Net::HTTP.get(URI.parse('http://localhost:3205/api/thispathdoesnotexist'))
+    get '/api/thispathdoesnotexist'
+    refute last_response.ok?
 
     spans = ::Instana.processor.queued_spans
     assert_equal 1, spans.length
@@ -103,7 +115,8 @@ class ActionControllerTest < Minitest::Test
 
     clear_all!
 
-    Net::HTTP.get(URI.parse('http://localhost:3205/api/raise_route_error'))
+    get '/api/raise_route_error'
+    refute last_response.ok?
 
     spans = ::Instana.processor.queued_spans
     assert_equal 2, spans.length
@@ -121,10 +134,11 @@ class ActionControllerTest < Minitest::Test
     assert 1, ac_span[:ec]
   end
 
-  def test_404
+  def test_not_found
     clear_all!
 
-    Net::HTTP.get(URI.parse('http://localhost:3205/test/404'))
+    get '/base/404'
+    refute last_response.ok?
 
     spans = ::Instana.processor.queued_spans
     assert_equal 1, spans.length
@@ -138,7 +152,8 @@ class ActionControllerTest < Minitest::Test
   def test_raise_routing_error
     clear_all!
 
-    Net::HTTP.get(URI.parse('http://localhost:3205/test/raise_route_error'))
+    get '/base/raise_route_error'
+    refute last_response.ok?
 
     spans = ::Instana.processor.queued_spans
     assert_equal 2, spans.length
@@ -153,16 +168,17 @@ class ActionControllerTest < Minitest::Test
     assert ac_span.key?(:stack)
     assert 1, ac_span[:ec]
   end
-  
+
   def test_path_template
     clear_all!
 
-    Net::HTTP.get(URI.parse('http://localhost:3205/test/world'))
-    
+    get '/base/world'
+    assert last_response.ok?
+
     spans = ::Instana.processor.queued_spans
     rack_span = find_first_span_by_name(spans, :rack)
 
     assert_equal false, rack_span.key?(:error)
-    assert_equal '/test/world(.:format)', rack_span[:data][:http][:path_tpl]
+    assert_equal '/base/world(.:format)', rack_span[:data][:http][:path_tpl]
   end
 end

data/test/instrumentation/rails_action_view_test.rb

@@ -0,0 +1,148 @@
+require 'test_helper'
+
+class RailsActionViewTest < Minitest::Test
+  include Rack::Test::Methods
+  APP = Rack::Builder.parse_file('test/support/apps/action_view/config.ru').first
+
+  def app
+    APP
+  end
+
+  def setup
+    clear_all!
+  end
+
+  def test_config_defaults
+    assert ::Instana.config[:action_view].is_a?(Hash)
+    assert ::Instana.config[:action_view].key?(:enabled)
+    assert_equal true, ::Instana.config[:action_view][:enabled]
+  end
+
+  def test_render_view
+    get '/render_view'
+    assert last_response.ok?
+
+    spans = ::Instana.processor.queued_spans
+    span = find_first_span_by_name(spans, :actionview)
+
+    assert_equal 'Default', span[:data][:actionview][:name]
+  end
+
+  def test_render_view_direct
+    get '/render_view_direct'
+    assert last_response.ok?
+
+    spans = ::Instana.processor.queued_spans
+    span = find_first_span_by_name(spans, :actionview)
+
+    assert_equal 'Default', span[:data][:actionview][:name]
+  end
+
+  def test_render_nothing
+    # `render nothing: true` was removed in 5.1
+    skip unless Rails::VERSION::MAJOR <= 5 && Rails::VERSION::MINOR <= 1
+    get '/render_nothing'
+    assert last_response.ok?
+
+    spans = ::Instana.processor.queued_spans
+    span = find_first_span_by_name(spans, :actionview)
+
+    assert_equal 'Nothing', span[:data][:actionview][:name]
+  end
+
+  def test_render_file
+    get '/render_file'
+    assert last_response.ok?
+
+    spans = ::Instana.processor.queued_spans
+    span = find_first_span_by_name(spans, :actionview)
+
+    assert_equal 'test/support/apps/action_view/config.ru', span[:data][:actionview][:name]
+  end
+
+  def test_render_json
+    get '/render_json'
+    assert last_response.ok?
+
+    spans = ::Instana.processor.queued_spans
+    span = find_first_span_by_name(spans, :actionview)
+
+    assert_equal 'JSON', span[:data][:actionview][:name]
+  end
+
+  def test_render_xml
+    get '/render_xml'
+    assert last_response.ok?
+
+    spans = ::Instana.processor.queued_spans
+    span = find_first_span_by_name(spans, :actionview)
+
+    assert_equal 'XML', span[:data][:actionview][:name]
+  end
+
+  def test_render_body
+    get '/render_rawbody'
+    assert last_response.ok?
+
+    spans = ::Instana.processor.queued_spans
+    span = find_first_span_by_name(spans, :actionview)
+
+    assert_equal 'Raw', span[:data][:actionview][:name]
+  end
+
+  def test_render_js
+    get '/render_js'
+    assert last_response.ok?
+
+    spans = ::Instana.processor.queued_spans
+    span = find_first_span_by_name(spans, :actionview)
+
+    assert_equal 'Javascript', span[:data][:actionview][:name]
+  end
+
+  def test_render_alternate_layout
+    get '/render_alternate_layout'
+    assert last_response.ok?
+
+    spans = ::Instana.processor.queued_spans
+    span = find_first_span_by_name(spans, :actionview)
+
+    assert_equal 'layouts/mobile', span[:data][:actionview][:name]
+  end
+
+  def test_render_partial
+    get '/render_partial'
+    assert last_response.ok?
+
+    spans = ::Instana.processor.queued_spans
+    span = find_first_span_by_name(spans, :render)
+
+    assert_equal 'message', span[:data][:render][:name]
+  end
+
+  def test_render_partial_that_errors
+    get '/render_partial_that_errors'
+    refute last_response.ok?
+
+    spans = ::Instana.processor.queued_spans
+    span = find_first_span_by_name(spans, :render)
+
+    assert_equal :partial, span[:data][:render][:type]
+    assert_equal 'syntax_error', span[:data][:render][:name]
+    assert span[:data][:log].key?(:message)
+    assert span[:data][:log][:parameters].include?('SyntaxError')
+    assert span[:error]
+    assert span[:stack]
+  end
+
+  def test_render_collection
+    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
+end