instana 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44d2db00220595e42136a421be4f1d9d149fb958
-  data.tar.gz: 0e52f23d95fbfdf296c4632da28319d170298ca9
+  metadata.gz: 5188167998cd8f55f33cb1e5efabd7743d9320be
+  data.tar.gz: a8b730858f4f70b2cfdd4fedcda867b54484e580
 SHA512:
-  metadata.gz: 1e753d5fbd1c60c52afaa5a8219ee5c4e980dff40c22d27ccfc719ffc4068c72dae09e8a7fe5e072b30aa63e6a4fd5b240af054444df2a7f4a6a1a7b333aed05
-  data.tar.gz: 768f34f163485454e6371ab0ce2b39e44020a19ff44a9efe5a107b9efe282574f9cdcd6c62893a473fd86e323cb94438f2a751e06063e45cadc0c286c3ccf1a8
+  metadata.gz: e78d461c1c5442e885621209f64c3cc47e20f49858d4237b61404caac6e9872f1b8660e9e9ae50443e9cdeeed63345bacf159becb6c1a62e90996c5e7fdd5f57
+  data.tar.gz: 5794cb3bb5b488406d802210a1234a1b2d1293eb2d451aeb6d91651719fca4e00b5ebeaeeaa2961b0fc3bb5137d154da6df39c2b116be94ff2905f3d36b6e9dc

data/Rakefile

@@ -24,7 +24,10 @@ Rake::TestTask.new(:test) do |t|
                      'test/frameworks/rails/actioncontroller_test.rb',
                      'test/frameworks/rails/actionview3_test.rb' ]
   when /libraries/
-    t.test_files = FileList['test/instrumentation/*_test.rb']
+    t.test_files = FileList['test/instrumentation/*_test.rb',
+                            'test/frameworks/cuba_test.rb',
+                            'test/frameworks/roda_test.rb',
+                            'test/frameworks/sinatra_test.rb']
   else
     t.test_files = FileList['test/agent/*_test.rb'] +
                    FileList['test/tracing/*_test.rb'] +

data/lib/instana/instrumentation/net-http.rb

@@ -46,7 +46,7 @@ if defined?(::Net::HTTP) && ::Instana.config[:nethttp][:enabled]
       if response.code.to_i.between?(500, 511)
         # Because of the 5xx response, we flag this span as errored but
         # without a backtrace (no exception)
-        add_error(nil)
+        ::Instana.tracer.log_error(nil)
       end
 
       response

data/lib/instana/version.rb

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

data/test/instrumentation/net-http_test.rb

@@ -137,4 +137,32 @@ class NetHTTPTest < Minitest::Test
 
     WebMock.disable_net_connect!
   end
+
+  def test_request_with_5xx_response
+    clear_all!
+    WebMock.allow_net_connect!
+
+    response = nil
+    Instana.tracer.start_or_continue_trace('net-http-error-test') do
+      http = Net::HTTP.new("127.0.0.1", 6511)
+      response = http.request(Net::HTTP::Get.new("/error"))
+    end
+
+    traces = Instana.processor.queued_traces
+    assert_equal 2, traces.count
+
+    request_trace = traces[1]
+    assert_equal 2, request_trace.spans.count
+    assert request_trace.has_error?
+    http_span = request_trace.spans.to_a[1]
+
+    refute_nil http_span.key?(:data)
+    refute_nil http_span[:data].key?(:http)
+    assert_equal "http://127.0.0.1:6511/error", http_span[:data][:http][:url]
+    assert_equal "500", http_span[:data][:http][:status]
+    assert_equal :'net-http', http_span.name
+    assert http_span.key?(:stack)
+
+    WebMock.disable_net_connect!
+  end
 end

data/test/servers/rackapp_6511.rb

@@ -12,6 +12,11 @@ Thread.new do
         [200, {"Content-Type" => "application/json"}, ["[\"Stan\",\"is\",\"on\",\"the\",\"scene!\"]"]]
       }
     end
+    map "/error" do
+      run Proc.new { |env|
+        [500, {"Content-Type" => "application/json"}, ["[\"Stan\",\"is\",\"on\",\"the\",\"error!\"]"]]
+      }
+    end
   }
 
   Rack::Handler::Puma.run(app, {:Host => '127.0.0.1', :Port => 6511})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-28 00:00:00.000000000 Z
+date: 2017-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler