instana 1.10.9-java → 1.10.10-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e0b041f1a4ee7018a3b441ba1c37f9ed292ea21a44699ce3a0ac6c45c1169a5
-  data.tar.gz: a03afa75870034fa4a9b028efafaf175e4583359af5be87ecaccd5577bd6c415
+  metadata.gz: f41161af3f02da722d5c6ea5909141cbae165095a623213f4734f1ff6f7d8ea2
+  data.tar.gz: ecfdd99be5ccca896b46c53db9be42c1b542d89ef7f036c28ecd42c8290144b1
 SHA512:
-  metadata.gz: 28fd81fd665342354a1b4d8ada57c850c059a2eb2ddccac6b243ee73cc18affe0a23bdfb1e9df7f22c59bce10e60f14f7af752465bb2ba6d7a710beb262850f4
-  data.tar.gz: d7a2fccc5c2e2c45ae3fe580cb7361e8cf854a0c05e2c75f4deb59c8e586deffefbce94e6382030da7109fa4317cd77ca9afb722d29f6171aeb63e1c008846be
+  metadata.gz: 7e00c3e9d3f66f7585e5b6f41a6cc44d692296f1f048083976eb1949c51cd2c05e0912d7f2e4de052c09f8c2669b972598371e6311ca121f8a7131531f52b496
+  data.tar.gz: 65e824158c542d2cf0756bc37da41288e14d7c4efa22df38b9cadc18c1736b7d140eadede22f1d8dd8be5656b107fde8ee4ddbe39523ee606180481676ef3823

data/lib/instana/instrumentation/rack.rb

@@ -51,9 +51,13 @@ module Instana
       status, headers, response = @app.call(env)
 
       if ::Instana.tracer.tracing?
-        kvs[:http][:status] = status
+        # In case some previous middleware returned a string status, make sure that we're dealing with
+        # an integer.  In Ruby nil.to_i, "asdfasdf".to_i will always return 0 from Ruby versions 1.8.7 and newer.
+        # So if an 0 status is reported here, it indicates some other issue (e.g. no status from previous middleware)
+        # See Rack Spec: https://www.rubydoc.info/github/rack/rack/file/SPEC#label-The+Status
+        kvs[:http][:status] = status.to_i
 
-        if !status.is_a?(Integer) || status.between?(500, 511)
+        if status.to_i.between?(500, 511)
           # Because of the 5xx response, we flag this span as errored but
           # without a backtrace (no exception)
           ::Instana.tracer.log_error(nil)

data/lib/instana/version.rb

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

data/test/frameworks/rails/actioncontroller_test.rb

@@ -78,6 +78,49 @@ class ActionControllerTest < Minitest::Test
     assert_equal "Exception", ac_span[:data][:log][:parameters]
   end
 
+  def test_api_controller_404
+    # 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'))
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 1, spans.length
+
+    rack_span = find_first_span_by_name(spans, :rack)
+
+    assert_equal false, rack_span.key?(:error)
+    assert_equal "/api/thispathdoesnotexist", rack_span[:data][:http][:url]
+    assert_equal 404, rack_span[:data][:http][:status]
+    assert_equal "GET", rack_span[:data][:http][:method]
+  end
+
+  def test_api_controller_raise_routing_error
+    # Run only when ActionController::API is used/defined
+    skip unless defined?(::ActionController::API)
+
+    clear_all!
+
+    Net::HTTP.get(URI.parse('http://localhost:3205/api/raise_route_error'))
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 2, spans.length
+
+    rack_span = find_first_span_by_name(spans, :rack)
+    ac_span = find_first_span_by_name(spans, :actioncontroller)
+
+    assert_equal false, rack_span.key?(:error)
+    assert_equal "/api/raise_route_error", rack_span[:data][:http][:url]
+    assert_equal 404, rack_span[:data][:http][:status]
+    assert_equal "GET", rack_span[:data][:http][:method]
+
+    assert_equal true, ac_span[:error]
+    assert ac_span.key?(:stack)
+    assert 1, ac_span[:ec]
+  end
+
   def test_404
     clear_all!
 
@@ -86,8 +129,28 @@ class ActionControllerTest < Minitest::Test
     spans = ::Instana.processor.queued_spans
     assert_equal 1, spans.length
 
-    first_span = spans[0]
+    rack_span = find_first_span_by_name(spans, :rack)
 
-    assert_equal :rack, first_span[:n]
+    assert_equal false, rack_span.key?(:error)
+    assert_equal 404, rack_span[:data][:http][:status]
+  end
+
+  def test_raise_routing_error
+    clear_all!
+
+    Net::HTTP.get(URI.parse('http://localhost:3205/test/raise_route_error'))
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 2, spans.length
+
+    rack_span = find_first_span_by_name(spans, :rack)
+    ac_span = find_first_span_by_name(spans, :actioncontroller)
+
+    assert_equal false, rack_span.key?(:error)
+    assert_equal 404, rack_span[:data][:http][:status]
+
+    assert_equal true, ac_span[:error]
+    assert ac_span.key?(:stack)
+    assert 1, ac_span[:ec]
   end
 end

data/test/servers/rails_3205.rb

@@ -39,9 +39,11 @@ class RailsTestApp < Rails::Application
     get "/test/render_js"             => "test#render_js"
     get "/test/render_alternate_layout"        => "test#render_alternate_layout"
     get "/test/render_partial_that_errors"     => "test#render_partial_that_errors"
+    get "/test/raise_route_error"     => "test#raise_route_error"
 
     get "/api/world" => "socket#world"
     get "/api/error" => "socket#error"
+    get "/api/raise_route_error" => "socket#raise_route_error"
   end
 
   # Enable cache classes. Production style.
@@ -172,6 +174,10 @@ class TestController < ActionController::Base
   def error
     raise Exception.new("Warning: This is a simulated Error")
   end
+
+  def raise_route_error
+    raise ActionController::RoutingError.new('Simulated not found')
+  end
 end
 
 if ::Rails::VERSION::MAJOR > 4
@@ -184,6 +190,10 @@ if ::Rails::VERSION::MAJOR > 4
       end
     end
 
+    def raise_route_error
+      raise ActionController::RoutingError.new('Simulated not found')
+    end
+
     def error
       raise Exception.new("Warning: This is a simulated Socket API Error")
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.10.9
+  version: 1.10.10
 platform: java
 authors:
 - Peter Giacomo Lombardo
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-10-07 00:00:00.000000000 Z
+date: 2019-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement