instana 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b29ece207c8410bea84eb595c1f70e0f019502f
-  data.tar.gz: 527d974dadaa17372a87f7fafabd28de2a4601c2
+  metadata.gz: d4f4776893611a534108c425fee351857893c440
+  data.tar.gz: c432c9c4ac294429d3a2e1c7db6f9d995c7f8e27
 SHA512:
-  metadata.gz: cc6a8d6780ac0d0ac0cea4d56e1e794e99a1a740475bd7dd6f1537c3595409a0fea824663b693a71f3192885693a05dec5d1ac507c63c6c54841ed8f40e4e541
-  data.tar.gz: 6df29e6b77dc0dfd303965acf1d6eec9282f3fef83c91360acfa78a68247609b00b3a34b9b788b238a8c5fee965e34f01f56dafce1a2c37b40ec56382a756d42
+  metadata.gz: 469f5a906f2936196c3af073c7d07b13191414690b3646ac1a216b10deaee0f609d8767b22a4ead6eb32a2d4ef828943b73000de30dca305d7150ad08e9f2e17
+  data.tar.gz: f9e47e7a26878761d9353a25ae6de9a82b1d6ed19cf143a7e4feb684e47e0ec2139deaee5a7f3e9a780685021539afb27861534c6569f06170062bdb328b7b24

data/Rakefile

@@ -12,11 +12,17 @@ Rake::TestTask.new(:test) do |t|
 
   case File.basename(ENV['BUNDLE_GEMFILE']).split('.').first
   when /rails50/
-    t.test_files = FileList['test/frameworks/rails/activerecord5_test.rb'] + FileList['test/frameworks/rails/actioncontroller_test.rb']
+    t.test_files = [ 'test/frameworks/rails/activerecord5_test.rb',
+                     'test/frameworks/rails/actioncontroller_test.rb',
+                     'test/frameworks/rails/actionview5_test.rb' ]
   when /rails42/
-    t.test_files = FileList['test/frameworks/rails/activerecord4_test.rb'] + FileList['test/frameworks/rails/actioncontroller_test.rb']
+    t.test_files = [ 'test/frameworks/rails/activerecord4_test.rb',
+                     'test/frameworks/rails/actioncontroller_test.rb',
+                     'test/frameworks/rails/actionview4_test.rb' ]
   when /rails32/
-    t.test_files = FileList['test/frameworks/rails/activerecord3_test.rb'] + FileList['test/frameworks/rails/actioncontroller_test.rb']
+    t.test_files = [ 'test/frameworks/rails/activerecord3_test.rb',
+                     'test/frameworks/rails/actioncontroller_test.rb',
+                     'test/frameworks/rails/actionview3_test.rb' ]
   when /libraries/
     t.test_files = FileList['test/instrumentation/*_test.rb']
   else

data/lib/instana/frameworks/instrumentation/action_controller.rb

@@ -49,6 +49,19 @@ module Instana
       ensure
         ::Instana.tracer.log_exit(:actioncontroller)
       end
+
+      # The Instana wrapper method for ActionController::Base.render
+      # for versions 5+.
+      #
+      def render(*args, &blk)
+        ::Instana.tracer.log_entry(:actionview)
+        super(*args, &blk)
+      rescue Exception => e
+        ::Instana.tracer.log_error(e) unless has_rails_handler?
+        raise
+      ensure
+        ::Instana.tracer.log_exit(:actionview)
+      end
     end
 
     # Used in ActionPack versions 4 and earlier, this module provides

data/lib/instana/frameworks/instrumentation/action_view.rb

@@ -14,7 +14,7 @@ module Instana
         ::Instana.tracer.log_entry(:render, kv_payload)
         render_partial_without_instana
       rescue Exception => e
-        ::Instana.tracer.log_error(e) unless has_rails_handler?
+        ::Instana.tracer.log_error(e)
         raise
       ensure
         ::Instana.tracer.log_exit(:render)
@@ -28,7 +28,7 @@ module Instana
         ::Instana.tracer.log_entry(:render, kv_payload)
         render_collection_without_instana
       rescue Exception => e
-        ::Instana.tracer.log_error(e) unless has_rails_handler?
+        ::Instana.tracer.log_error(e)
         raise
       ensure
         ::Instana.tracer.log_exit(:render)

data/lib/instana/version.rb

@@ -1,4 +1,4 @@
 module Instana
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
   VERSION_FULL = "instana-#{VERSION}"
 end

data/test/frameworks/rails/actioncontroller_test.rb

@@ -16,11 +16,7 @@ class ActionControllerTest < Minitest::Test
     assert_equal 1, traces.count
     trace = traces.first
 
-    if ::Rails::VERSION::MAJOR > 4
-      assert_equal 2, trace.spans.count
-    else
-      assert_equal 3, trace.spans.count
-    end
+    assert_equal 3, trace.spans.count
     spans = trace.spans.to_a
     first_span = spans[0]
     second_span = spans[1]
@@ -69,7 +65,7 @@ class ActionControllerTest < Minitest::Test
     assert_equal 1, traces.count
     trace = traces.first
 
-    assert_equal 2, trace.spans.count
+    assert_equal 3, trace.spans.count
     spans = trace.spans.to_a
     first_span = spans[0]
     second_span = spans[1]

data/test/frameworks/rails/{actionview_test.rb → actionview3_test.rb}

@@ -51,6 +51,34 @@ class ActionViewTest < Minitest::Test
     assert_equal 'message', fourth_span[:data][:render][:name]
   end
 
+  def test_render_partial_that_errors
+    clear_all!
+
+    Net::HTTP.get(URI.parse('http://localhost:3205/test/render_partial_that_errors'))
+
+    traces = Instana.processor.queued_traces
+    assert_equal 1, traces.count
+    trace = traces.first
+
+    assert_equal 4, trace.spans.count
+    spans = trace.spans.to_a
+    first_span = spans[0]
+    second_span = spans[1]
+    third_span = spans[2]
+    fourth_span = spans[3]
+
+    assert_equal :rack, first_span.name
+    assert_equal :actioncontroller, second_span.name
+    assert_equal :actionview, third_span.name
+    assert_equal :render, fourth_span.name
+    assert_equal :partial, fourth_span[:data][:render][:type]
+    assert_equal 'syntax_error', fourth_span[:data][:render][:name]
+    assert fourth_span[:data][:log].key?(:message)
+    assert_equal "ActionView::Template::Error", fourth_span[:data][:log][:parameters]
+    assert fourth_span[:error]
+    assert fourth_span[:stack]
+  end
+
   def test_render_collection
     clear_all!
 

data/test/frameworks/rails/actionview4_test.rb

@@ -0,0 +1,108 @@
+require 'test_helper'
+
+class ActionViewTest < Minitest::Test
+  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
+    clear_all!
+
+    Net::HTTP.get(URI.parse('http://localhost:3205/test/render_view'))
+
+    traces = Instana.processor.queued_traces
+    assert_equal 1, traces.count
+    trace = traces.first
+
+    assert_equal 3, trace.spans.count
+    spans = trace.spans.to_a
+    first_span = spans[0]
+    second_span = spans[1]
+    third_span = spans[2]
+
+    assert_equal :rack, first_span.name
+    assert_equal :actioncontroller, second_span.name
+    assert_equal :actionview, third_span.name
+  end
+
+  def test_render_partial
+    clear_all!
+
+    Net::HTTP.get(URI.parse('http://localhost:3205/test/render_partial'))
+
+    traces = Instana.processor.queued_traces
+    assert_equal 1, traces.count
+    trace = traces.first
+
+    assert_equal 4, trace.spans.count
+    spans = trace.spans.to_a
+    first_span = spans[0]
+    second_span = spans[1]
+    third_span = spans[2]
+    fourth_span = spans[3]
+
+    assert_equal :rack, first_span.name
+    assert_equal :actioncontroller, second_span.name
+    assert_equal :actionview, third_span.name
+    assert_equal :render, fourth_span.name
+    assert_equal :partial, fourth_span[:data][:render][:type]
+    assert_equal 'message', fourth_span[:data][:render][:name]
+  end
+
+  def test_render_partial_that_errors
+    clear_all!
+
+    Net::HTTP.get(URI.parse('http://localhost:3205/test/render_partial_that_errors'))
+
+    traces = Instana.processor.queued_traces
+    assert_equal 1, traces.count
+    trace = traces.first
+
+    assert_equal 4, trace.spans.count
+    spans = trace.spans.to_a
+    first_span = spans[0]
+    second_span = spans[1]
+    third_span = spans[2]
+    fourth_span = spans[3]
+
+    assert_equal :rack, first_span.name
+    assert_equal :actioncontroller, second_span.name
+    assert_equal :actionview, third_span.name
+    assert_equal :render, fourth_span.name
+    assert_equal :partial, fourth_span[:data][:render][:type]
+    assert_equal 'syntax_error', fourth_span[:data][:render][:name]
+    assert fourth_span[:data][:log].key?(:message)
+    assert_equal "SyntaxError", fourth_span[:data][:log][:parameters]
+    assert fourth_span[:error]
+    assert fourth_span[:stack]
+  end
+
+  def test_render_collection
+    clear_all!
+
+    Net::HTTP.get(URI.parse('http://localhost:3205/test/render_collection'))
+
+    traces = Instana.processor.queued_traces
+    assert_equal 1, traces.count
+    trace = traces.first
+
+    assert_equal 5, trace.spans.count
+    spans = trace.spans.to_a
+    first_span = spans[0]
+    second_span = spans[1]
+    third_span = spans[2]
+    fourth_span = spans[3]
+    fifth_span = spans[4]
+
+    assert_equal :rack, first_span.name
+    assert_equal :actioncontroller, second_span.name
+    assert_equal :actionview, third_span.name
+    assert_equal :activerecord, fourth_span.name
+    assert_equal :render, fifth_span.name
+    assert_equal :collection, fifth_span[:data][:render][:type]
+    assert_equal 'blocks/block', fifth_span[:data][:render][:name]
+  end
+end
+

data/test/frameworks/rails/actionview5_test.rb

@@ -0,0 +1,116 @@
+require 'test_helper'
+
+class ActionViewTest < Minitest::Test
+  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
+    clear_all!
+
+    Net::HTTP.get(URI.parse('http://localhost:3205/test/render_view'))
+
+    traces = Instana.processor.queued_traces
+    assert_equal 1, traces.count
+    trace = traces.first
+
+    assert_equal 3, trace.spans.count
+    spans = trace.spans.to_a
+    first_span = spans[0]
+    second_span = spans[1]
+    third_span = spans[2]
+
+    assert_equal :rack, first_span.name
+    assert_equal :actioncontroller, second_span.name
+    assert_equal :actionview, third_span.name
+  end
+
+  def test_render_partial
+    clear_all!
+
+    Net::HTTP.get(URI.parse('http://localhost:3205/test/render_partial'))
+
+    traces = Instana.processor.queued_traces
+    assert_equal 1, traces.count
+    trace = traces.first
+
+    assert_equal 4, trace.spans.count
+    spans = trace.spans.to_a
+    first_span = spans[0]
+    second_span = spans[1]
+    third_span = spans[2]
+    fourth_span = spans[3]
+
+    assert_equal :rack, first_span.name
+    assert_equal :actioncontroller, second_span.name
+    assert_equal :actionview, third_span.name
+    assert_equal :render, fourth_span.name
+    assert_equal :partial, fourth_span[:data][:render][:type]
+    assert_equal 'message', fourth_span[:data][:render][:name]
+  end
+
+  def test_render_partial_that_errors
+    clear_all!
+
+    Net::HTTP.get(URI.parse('http://localhost:3205/test/render_partial_that_errors'))
+
+    traces = Instana.processor.queued_traces
+    assert_equal 1, traces.count
+    trace = traces.first
+
+    assert_equal 4, trace.spans.count
+    spans = trace.spans.to_a
+    first_span = spans[0]
+    second_span = spans[1]
+    third_span = spans[2]
+    fourth_span = spans[3]
+
+    assert_equal :rack, first_span.name
+    assert_equal :actioncontroller, second_span.name
+    assert_equal :actionview, third_span.name
+    assert_equal :render, fourth_span.name
+    assert_equal :partial, fourth_span[:data][:render][:type]
+    assert_equal 'syntax_error', fourth_span[:data][:render][:name]
+    assert fourth_span[:data][:log].key?(:message)
+    assert_equal "SyntaxError", fourth_span[:data][:log][:parameters]
+    assert fourth_span[:error]
+    assert fourth_span[:stack]
+  end
+
+  def test_render_collection
+    clear_all!
+
+    Net::HTTP.get(URI.parse('http://localhost:3205/test/render_collection'))
+
+    traces = Instana.processor.queued_traces
+    assert_equal 1, traces.count
+    trace = traces.first
+
+    assert_equal 5, trace.spans.count
+    spans = trace.spans.to_a
+    first_span = spans[0]
+    second_span = spans[1]
+    third_span = spans[2]
+    fourth_span = spans[3]
+    fifth_span = spans[4]
+
+    assert_equal :rack, first_span.name
+    assert_equal :actioncontroller, second_span.name
+
+
+    if Rails::VERSION::STRING < '4.0'
+      assert_equal :activerecord, third_span.name
+      assert_equal :actionview, fourth_span.name
+    else
+      assert_equal :actionview, third_span.name
+      assert_equal :activerecord, fourth_span.name
+    end
+
+    assert_equal :render, fifth_span.name
+    assert_equal :collection, fifth_span[:data][:render][:type]
+    assert_equal 'blocks/block', fifth_span[:data][:render][:name]
+  end
+end
+

data/test/frameworks/rails/activerecord5_test.rb

@@ -19,7 +19,7 @@ class ActiveRecordTest < Minitest::Test
     assert_equal 1, traces.count
     trace = traces.first
 
-    assert_equal 5, trace.spans.count
+    assert_equal 6, trace.spans.count
     spans = trace.spans.to_a
     first_span = spans[0]
     second_span = spans[2]
@@ -59,7 +59,7 @@ class ActiveRecordTest < Minitest::Test
     assert_equal 1, traces.count
     trace = traces.first
 
-    assert_equal 5, trace.spans.count
+    assert_equal 6, trace.spans.count
     spans = trace.spans.to_a
     first_span = spans[0]
     second_span = spans[2]

data/test/servers/rails_3205.rb

@@ -27,6 +27,7 @@ class RailsTestApp < Rails::Application
     get "/test/error"              => "test#error"
     get "/test/render_view"        => "test#render_view"
     get "/test/render_partial"     => "test#render_partial"
+    get "/test/render_partial_that_errors"     => "test#render_partial_that_errors"
     get "/test/render_collection"  => "test#render_collection"
 
     get "/api/world" => "socket#world"
@@ -82,6 +83,10 @@ class TestController < ActionController::Base
     @message = "Hello Instana!"
   end
 
+  def render_partial_that_errors
+    @message = "Hello Instana!"
+  end
+
   def render_collection
     @blocks = Block.all
   end
@@ -109,6 +114,10 @@ end
 
 RailsTestApp.initialize!
 
+# Initialize some blocks so we have stuff to test against.
+Block.new(:name => :corner, :color => :blue).save
+Block.new(:name => :floor, :color => :green).save
+
 Thread.new do
   Rack::Handler::Puma.run(RailsTestApp.to_app, {:Host => '127.0.0.1', :Port => 3205})
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
@@ -227,7 +227,9 @@ files:
 - test/frameworks/cuba_test.rb
 - test/frameworks/rack_test.rb
 - test/frameworks/rails/actioncontroller_test.rb
-- test/frameworks/rails/actionview_test.rb
+- test/frameworks/rails/actionview3_test.rb
+- test/frameworks/rails/actionview4_test.rb
+- test/frameworks/rails/actionview5_test.rb
 - test/frameworks/rails/activerecord3_test.rb
 - test/frameworks/rails/activerecord4_test.rb
 - test/frameworks/rails/activerecord5_test.rb
@@ -280,7 +282,9 @@ test_files:
 - test/frameworks/cuba_test.rb
 - test/frameworks/rack_test.rb
 - test/frameworks/rails/actioncontroller_test.rb
-- test/frameworks/rails/actionview_test.rb
+- test/frameworks/rails/actionview3_test.rb
+- test/frameworks/rails/actionview4_test.rb
+- test/frameworks/rails/actionview5_test.rb
 - test/frameworks/rails/activerecord3_test.rb
 - test/frameworks/rails/activerecord4_test.rb
 - test/frameworks/rails/activerecord5_test.rb