instana 1.192.1 → 1.193.5

data/test/instana_test.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2016
+
 require 'test_helper'
 
 class InstanaTest < Minitest::Test

data/test/instrumentation/dalli_test.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2017
+
 require 'test_helper'
 
 class DalliTest < Minitest::Test

data/test/instrumentation/excon_test.rb

@@ -1,4 +1,8 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2016
+
 require 'test_helper'
+require 'support/apps/http_endpoint/boot'
 
 class ExconTest < Minitest::Test
   def test_config_defaults

data/test/instrumentation/graphql_test.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
 require 'test_helper'
 
 class GraphqlTest < Minitest::Test

data/test/instrumentation/grpc_test.rb

@@ -1,4 +1,8 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2017
+
 require 'test_helper'
+require 'support/apps/grpc/boot'
 
 class GrpcTest < Minitest::Test
   def client_stub
@@ -225,7 +229,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,8 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2016
+
 require 'test_helper'
+require 'support/apps/http_endpoint/boot'
 
 class NetHTTPTest < Minitest::Test
   def test_config_defaults

data/test/instrumentation/{instrumented_request_test.rb → rack_instrumented_request_test.rb}

@@ -1,6 +1,9 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
 require 'test_helper'
 
-class InstrumentedRequestTest < Minitest::Test
+class RackInstrumentedRequestTest < Minitest::Test
   def test_skip_trace_with_header
     req = Instana::InstrumentedRequest.new(
       'HTTP_X_INSTANA_L' => '0;sample-data'

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

@@ -1,7 +1,9 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2016
+
 require 'test_helper'
 require 'rack/test'
 require 'rack/lobster'
-require "instana/rack"
 
 class RackTest < Minitest::Test
   include Rack::Test::Methods

data/test/instrumentation/rails_action_cable_test.rb

@@ -0,0 +1,131 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+require 'test_helper'
+
+require 'rails'
+require 'action_cable'
+
+require 'ostruct'
+require 'logger'
+
+class RailsActionCableTest < Minitest::Test
+  def setup
+    skip unless defined?(::ActionCable::Connection::Base)
+  end
+
+  def test_transmit_no_parent
+    clear_all!
+
+    connection = mock_connection
+    channel_klass = Class.new(ActionCable::Channel::Base)
+
+    channel_klass
+      .new(connection, :test)
+      .send(:transmit, 'action' => 'sample')
+
+    span, rest = Instana.processor.queued_spans
+    data = span[:data]
+
+    assert_nil rest
+    assert :"rpc-server", span[:n]
+    assert :actioncable, data[:rpc][:flavor]
+    assert channel_klass.to_s, data[:rpc][:call]
+    assert :transmit, data[:rpc][:call_type]
+    assert Socket.gethostname, data[:rpc][:host]
+  end
+
+  def test_transmit_parent
+    clear_all!
+
+    connection = mock_connection
+    connection.instance_variable_set(
+      :@instana_trace_context,
+      Instana::SpanContext.new('ABC', 'ABC')
+    )
+    channel_klass = Class.new(ActionCable::Channel::Base)
+
+    channel_klass
+      .new(connection, :test)
+      .send(:transmit, 'action' => 'sample')
+
+    span, rest = Instana.processor.queued_spans
+    data = span[:data]
+
+    assert_nil rest
+    assert 'ABC', span[:t]
+    assert :"rpc-server", span[:n]
+    assert :actioncable, data[:rpc][:flavor]
+    assert channel_klass.to_s, data[:rpc][:call]
+    assert :transmit, data[:rpc][:call_type]
+    assert Socket.gethostname, data[:rpc][:host]
+  end
+
+  def test_action_no_parent
+    clear_all!
+
+    connection = mock_connection
+    channel_klass = Class.new(ActionCable::Channel::Base) do
+      def sample
+        raise unless Instana.tracer.tracing?
+      end
+    end
+
+    channel_klass
+      .new(connection, :test)
+      .perform_action('action' => 'sample')
+
+    span, rest = Instana.processor.queued_spans
+    data = span[:data]
+
+    assert_nil rest
+    assert :"rpc-server", span[:n]
+    assert :actioncable, data[:rpc][:flavor]
+    assert "#{channel_klass}#sample", data[:rpc][:call]
+    assert :action, data[:rpc][:call_type]
+    assert Socket.gethostname, data[:rpc][:host]
+  end
+
+  def test_action_parent
+    clear_all!
+
+    connection = mock_connection
+    connection.instance_variable_set(
+      :@instana_trace_context,
+      Instana::SpanContext.new('ABC', 'ABC')
+    )
+    channel_klass = Class.new(ActionCable::Channel::Base) do
+      def sample
+        raise unless Instana.tracer.tracing?
+      end
+    end
+
+    channel_klass
+      .new(connection, :test)
+      .perform_action('action' => 'sample')
+
+    span, rest = Instana.processor.queued_spans
+    data = span[:data]
+
+    assert_nil rest
+    assert 'ABC', span[:t]
+    assert :"rpc-server", span[:n]
+    assert :actioncable, data[:rpc][:flavor]
+    assert "#{channel_klass}#sample", data[:rpc][:call]
+    assert :action, data[:rpc][:call_type]
+    assert Socket.gethostname, data[:rpc][:host]
+  end
+
+  private
+
+  def mock_connection
+    server = OpenStruct.new(
+      logger: Logger.new('/dev/null'),
+      worker_pool: nil,
+      config: OpenStruct.new(log_tags: [])
+    )
+    connection = ActionCable::Connection::Base.new(server, {})
+    connection.define_singleton_method(:transmit) { |*_args| true }
+    connection
+  end
+end

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

@@ -1,6 +1,16 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2017
+
 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 +20,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 +57,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 +66,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 +76,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 +118,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 +137,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 +155,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 +171,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,151 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+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