instana 1.13.0 → 1.193.3

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,138 @@
+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_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

data/test/instrumentation/rails_active_record_test.rb

@@ -0,0 +1,121 @@
+require 'test_helper'
+require 'support/apps/active_record/active_record'
+
+require 'irb'
+
+class RailsActiveRecordTest < Minitest::Test
+  def setup
+    skip unless ENV['DATABASE_URL']
+    @connection = ActiveRecord::Base.establish_connection(ENV['DATABASE_URL'])
+    ActiveRecord::Migration.suppress_messages do
+      ActiveRecord::Migration.run(CreateBlocks, direction: :up)
+    end
+  end
+
+  def teardown
+    ActiveRecord::Migration.suppress_messages do
+      ActiveRecord::Migration.run(CreateBlocks, direction: :down)
+    end
+    ActiveRecord::Base.remove_connection(@connection)
+  end
+
+  def test_config_defaults
+    assert ::Instana.config[:sanitize_sql] == true
+    assert ::Instana.config[:active_record].is_a?(Hash)
+    assert ::Instana.config[:active_record].key?(:enabled)
+    assert_equal true, ::Instana.config[:active_record][:enabled]
+  end
+
+  def test_create
+    Instana::Tracer.start_or_continue_trace(:ar_test, {}) do
+      Block.create(name: 'core', color: 'blue')
+    end
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 2, spans.length
+    span = find_first_span_by_name(spans, :activerecord)
+    data = span[:data][:activerecord]
+
+    assert data[:sql].start_with?('INSERT INTO')
+    assert 'core', data[:binds][0]
+    assert 'blue', data[:binds][1]
+  end
+
+  def test_read
+    Block.create(name: 'core', color: 'blue')
+    Instana::Tracer.start_or_continue_trace(:ar_test, {}) do
+      Block.find_by(name: 'core')
+    end
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 2, spans.length
+    span = find_first_span_by_name(spans, :activerecord)
+    data = span[:data][:activerecord]
+
+    assert data[:sql].start_with?('SELECT')
+    assert 'core', data[:binds][0]
+    assert 1, data[:binds][1]
+  end
+
+  def test_update
+    Block.create(name: 'core', color: 'blue')
+    b = Block.find_by(name: 'core')
+
+    Instana::Tracer.start_or_continue_trace(:ar_test, {}) do
+      b.color = 'red'
+      b.save
+    end
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 2, spans.length
+    span = find_first_span_by_name(spans, :activerecord)
+    data = span[:data][:activerecord]
+
+    assert data[:sql].start_with?('UPDATE')
+    assert 'red', data[:binds][0]
+    assert 1, data[:binds][2]
+  end
+
+  def test_delete
+    b = Block.create(name: 'core', color: 'blue')
+
+    Instana::Tracer.start_or_continue_trace(:ar_test, {}) do
+      b.delete
+    end
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 2, spans.length
+    span = find_first_span_by_name(spans, :activerecord)
+    data = span[:data][:activerecord]
+
+    assert data[:sql].start_with?('DELETE')
+    assert 1, data[:binds][0]
+  end
+
+  def test_raw
+    Instana::Tracer.start_or_continue_trace(:ar_test, {}) do
+      ActiveRecord::Base.connection.execute('SELECT 1')
+    end
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 2, spans.length
+    span = find_first_span_by_name(spans, :activerecord)
+    data = span[:data][:activerecord]
+
+    assert 'SELECT 1', data[:sql]
+  end
+
+  def test_raw_error
+    assert_raises ActiveRecord::StatementInvalid do
+      Instana::Tracer.start_or_continue_trace(:ar_test, {}) do
+        ActiveRecord::Base.connection.execute('INVALID')
+      end
+    end
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 2, spans.length
+    span = find_first_span_by_name(spans, :activerecord)
+
+    assert_equal 1, span[:ec]
+  end
+end

data/test/instrumentation/redis_test.rb

@@ -20,6 +20,16 @@ class RedisTest < Minitest::Test
     assert_redis_trace('SET')
   end
 
+  def test_georadius
+    clear_all!
+
+    Instana.tracer.start_or_continue_trace(:redis_test) do
+      @redis_client.georadius('Sicily', '15', '37', '200', 'km', 'WITHCOORD', 'WITHDIST')
+    end
+
+    assert_redis_trace('GEORADIUS')
+  end
+
   def test_normal_call_with_error
     clear_all!
 

data/test/instrumentation/resque_test.rb

@@ -1,15 +1,7 @@
 require 'test_helper'
-require_relative "../jobs/resque_fast_job"
-require_relative "../jobs/resque_error_job"
-require 'resque'
-
-if ENV.key?('REDIS_URL')
-  ::Resque.redis = ENV['REDIS_URL']
-elsif ENV.key?('REDIS_URL')
-  ::Resque.redis = ENV['REDIS_URL']
-else
-  ::Resque.redis = 'localhost:6379'
-end
+require 'support/apps/resque/boot'
+
+::Resque.redis = ENV['REDIS_URL']
 
 class ResqueClientTest < Minitest::Test
   def setup