instana 1.4.2 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cae516e462dbd350c30cf8e513758b3d9928bc2
-  data.tar.gz: ccc8a1aab6f2e63249514788d080c546dbe9e44d
+  metadata.gz: f2d72e4ebe2d8f5b7c78ea47e40e04a37ba063e4
+  data.tar.gz: 97b8eb1c78242d4c94d48370a4916c90c0217012
 SHA512:
-  metadata.gz: 6898e624c5943b389c6d116f7c43ec8c4b3eb0582806fd809cbf2528343de990163e1d6d2c375e5d5cae70e5a8ff3efbed1091fac0f3f7dde8cae4c97aad8b39
-  data.tar.gz: 2cfa76f168aea300c64b74b895d95ac75b792ac86ff15aa84031269a1cdd60a39ec33356be8f9f54034193f38b3a50562dbf7eeed710c907e4819aeb9027ecb9
+  metadata.gz: 9d1176fc22477cacbaa80940fb73f422183c938c1228b9134e2b3d3cd36452db779318a5b06ec8ae891afaeabdca8052191aac623c97ddc158c6ae90e655917a
+  data.tar.gz: f2523904ba96880a37254e8fcea1ae64d91fa51bb46baebcbccf7831612118232d7ecdd1b91d847717b9864dce8cfaf670121ca4b19b675df8241c06bc0a5484

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

@@ -24,6 +24,34 @@ module Instana
         ::Instana.logger.debug "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
         return false
       end
+
+      # Render can be called with many options across the various supported
+      # versions of Rails.  This method attempts to make sense and provide
+      # insight into what is happening (rendering a layout, file, nothing,
+      # plaintext etc.)
+      def get_render_topic(opts)
+        if opts.key?(:layout)
+          case opts[:layout]
+          when FalseClass
+            name = "Without layout"
+          when String
+            name = opts[:layout]
+          when Proc
+            name = "Proc"
+          else
+            name = "Default"
+          end
+        end
+        name ||= opts[:template]
+        name ||= opts[:file]
+        name = "Nothing" if opts[:nothing]
+        name = "Plaintext" if opts[:plain]
+        name = "JSON" if opts[:json]
+        name = "XML" if opts[:xml]
+        name = "Raw" if opts[:body]
+        name = "Javascript" if opts[:js]
+        name
+      end
     end
 
     # Used in ActionPack versions 5 and beyond, this module provides
@@ -54,7 +82,14 @@ module Instana
       # for versions 5+.
       #
       def render(*args, &blk)
-        ::Instana.tracer.log_entry(:actionview)
+        # Figure out what's being rendered
+        if args.length > 0 && args[0].is_a?(Hash)
+          name = get_render_topic(args[0])
+        end
+        name ||= "Default"
+
+        ::Instana.tracer.log_entry(:actionview, :actionview => { :name => name })
+
         super(*args, &blk)
       rescue Exception => e
         ::Instana.tracer.log_error(e) unless has_rails_handler?
@@ -99,7 +134,11 @@ module Instana
       # for versions 3 and 4.
       #
       def render_with_instana(*args, &blk)
-        ::Instana.tracer.log_entry(:actionview)
+        if args.length > 0 && args[0].is_a?(Hash)
+          name = get_render_topic(args[0])
+        end
+        name ||= "Default"
+        ::Instana.tracer.log_entry(:actionview, :actionview => { :name => name })
         render_without_instana(*args, &blk)
       rescue Exception => e
         ::Instana.tracer.log_error(e) unless has_rails_handler?

data/lib/instana/tracing/span.rb

@@ -271,6 +271,15 @@ module Instana
       if custom?
         @data[:data][:sdk][:custom] ||= {}
         @data[:data][:sdk][:custom][key] = value
+
+        if key.to_sym == :'span.kind'
+          case value.to_sym
+          when :server || :consumer
+            @data[:data][:sdk][:type] = :entry
+          when :client || :producer
+            @data[:data][:sdk][:type] = :exit
+          end
+        end
       else
         if !@data[:data].key?(key)
           @data[:data][key] = value

data/lib/instana/version.rb

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

data/test/frameworks/rails/actionview3_test.rb

@@ -27,6 +27,153 @@ class ActionViewTest < Minitest::Test
     assert_equal :actionview, third_span.name
   end
 
+  def test_render_nothing
+    clear_all!
+
+    Net::HTTP.get(URI.parse('http://localhost:3205/test/render_nothing'))
+
+    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 "Nothing", third_span[:data][:actionview][:name]
+    assert_equal :actionview, third_span.name
+  end
+
+  def test_render_file
+    clear_all!
+
+    Net::HTTP.get(URI.parse('http://localhost:3205/test/render_file'))
+
+    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 "/etc/issue", third_span[:data][:actionview][:name]
+    assert_equal :actionview, third_span.name
+  end
+
+  def test_render_json
+    clear_all!
+
+    Net::HTTP.get(URI.parse('http://localhost:3205/test/render_json'))
+
+    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 "JSON", third_span[:data][:actionview][:name]
+    assert_equal :actionview, third_span.name
+  end
+
+  def test_render_xml
+    clear_all!
+
+    Net::HTTP.get(URI.parse('http://localhost:3205/test/render_xml'))
+
+    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 "XML", third_span[:data][:actionview][:name]
+    assert_equal :actionview, third_span.name
+  end
+
+  def test_render_body
+    clear_all!
+
+    Net::HTTP.get(URI.parse('http://localhost:3205/test/render_rawbody'))
+
+    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 "Raw", third_span[:data][:actionview][:name]
+    assert_equal :actionview, third_span.name
+  end
+
+  def test_render_js
+    clear_all!
+
+    Net::HTTP.get(URI.parse('http://localhost:3205/test/render_js'))
+
+    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 "Javascript", third_span[:data][:actionview][:name]
+    assert_equal :actionview, third_span.name
+  end
+
+  def test_render_alternate_layout
+    clear_all!
+
+    Net::HTTP.get(URI.parse('http://localhost:3205/test/render_alternate_layout'))
+
+    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 "layouts/mobile", third_span[:data][:actionview][:name]
+    assert_equal :actionview, third_span.name
+  end
+
   def test_render_partial
     clear_all!
 
@@ -106,4 +253,3 @@ class ActionViewTest < Minitest::Test
     assert_equal 'blocks/block', fifth_span[:data][:render][:name]
   end
 end
-

data/test/frameworks/rails/actionview4_test.rb

@@ -27,6 +27,153 @@ class ActionViewTest < Minitest::Test
     assert_equal :actionview, third_span.name
   end
 
+  def test_render_nothing
+    clear_all!
+
+    Net::HTTP.get(URI.parse('http://localhost:3205/test/render_nothing'))
+
+    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 "Nothing", third_span[:data][:actionview][:name]
+    assert_equal :actionview, third_span.name
+  end
+
+  def test_render_file
+    clear_all!
+
+    Net::HTTP.get(URI.parse('http://localhost:3205/test/render_file'))
+
+    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 "/etc/issue", third_span[:data][:actionview][:name]
+    assert_equal :actionview, third_span.name
+  end
+
+  def test_render_json
+    clear_all!
+
+    Net::HTTP.get(URI.parse('http://localhost:3205/test/render_json'))
+
+    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 "JSON", third_span[:data][:actionview][:name]
+    assert_equal :actionview, third_span.name
+  end
+
+  def test_render_xml
+    clear_all!
+
+    Net::HTTP.get(URI.parse('http://localhost:3205/test/render_xml'))
+
+    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 "XML", third_span[:data][:actionview][:name]
+    assert_equal :actionview, third_span.name
+  end
+
+  def test_render_body
+    clear_all!
+
+    Net::HTTP.get(URI.parse('http://localhost:3205/test/render_rawbody'))
+
+    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 "Raw", third_span[:data][:actionview][:name]
+    assert_equal :actionview, third_span.name
+  end
+
+  def test_render_js
+    clear_all!
+
+    Net::HTTP.get(URI.parse('http://localhost:3205/test/render_js'))
+
+    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 "Javascript", third_span[:data][:actionview][:name]
+    assert_equal :actionview, third_span.name
+  end
+
+  def test_render_alternate_layout
+    clear_all!
+
+    Net::HTTP.get(URI.parse('http://localhost:3205/test/render_alternate_layout'))
+
+    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 "layouts/mobile", third_span[:data][:actionview][:name]
+    assert_equal :actionview, third_span.name
+  end
+
   def test_render_partial
     clear_all!
 
@@ -105,4 +252,3 @@ class ActionViewTest < Minitest::Test
     assert_equal 'blocks/block', fifth_span[:data][:render][:name]
   end
 end
-

data/test/frameworks/rails/actionview5_test.rb

@@ -27,6 +27,153 @@ class ActionViewTest < Minitest::Test
     assert_equal :actionview, third_span.name
   end
 
+  def test_render_nothing
+    clear_all!
+
+    Net::HTTP.get(URI.parse('http://localhost:3205/test/render_nothing'))
+
+    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 "Nothing", third_span[:data][:actionview][:name]
+    assert_equal :actionview, third_span.name
+  end
+
+  def test_render_file
+    clear_all!
+
+    Net::HTTP.get(URI.parse('http://localhost:3205/test/render_file'))
+
+    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 "/etc/issue", third_span[:data][:actionview][:name]
+    assert_equal :actionview, third_span.name
+  end
+
+  def test_render_json
+    clear_all!
+
+    Net::HTTP.get(URI.parse('http://localhost:3205/test/render_json'))
+
+    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 "JSON", third_span[:data][:actionview][:name]
+    assert_equal :actionview, third_span.name
+  end
+
+  def test_render_xml
+    clear_all!
+
+    Net::HTTP.get(URI.parse('http://localhost:3205/test/render_xml'))
+
+    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 "XML", third_span[:data][:actionview][:name]
+    assert_equal :actionview, third_span.name
+  end
+
+  def test_render_body
+    clear_all!
+
+    Net::HTTP.get(URI.parse('http://localhost:3205/test/render_rawbody'))
+
+    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 "Raw", third_span[:data][:actionview][:name]
+    assert_equal :actionview, third_span.name
+  end
+
+  def test_render_js
+    clear_all!
+
+    Net::HTTP.get(URI.parse('http://localhost:3205/test/render_js'))
+
+    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 "Javascript", third_span[:data][:actionview][:name]
+    assert_equal :actionview, third_span.name
+  end
+
+  def test_render_alternate_layout
+    clear_all!
+
+    Net::HTTP.get(URI.parse('http://localhost:3205/test/render_alternate_layout'))
+
+    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 "layouts/mobile", third_span[:data][:actionview][:name]
+    assert_equal :actionview, third_span.name
+  end
+
   def test_render_partial
     clear_all!
 
@@ -113,4 +260,3 @@ class ActionViewTest < Minitest::Test
     assert_equal 'blocks/block', fifth_span[:data][:render][:name]
   end
 end
-

data/test/servers/rails_3205.rb

@@ -27,8 +27,15 @@ 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 "/test/render_file"        => "test#render_file"
+    get "/test/render_nothing"     => "test#render_nothing"
+    get "/test/render_json"        => "test#render_json"
+    get "/test/render_xml"         => "test#render_xml"
+    get "/test/render_rawbody"     => "test#render_rawbody"
+    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 "/api/world" => "socket#world"
     get "/api/error" => "socket#error"
@@ -91,6 +98,41 @@ class TestController < ActionController::Base
     @blocks = Block.all
   end
 
+  def render_file
+    @message = "Hello Instana!"
+    render :file => '/etc/issue'
+  end
+
+  def render_alternate_layout
+    @message = "Hello Instana!"
+    render :layout => 'layouts/mobile'
+  end
+
+  def render_nothing
+    @message = "Hello Instana!"
+    render :nothing => true
+  end
+
+  def render_json
+    @message = "Hello Instana!"
+    render :json => @message
+  end
+
+  def render_xml
+    @message = "Hello Instana!"
+    render :xml => @message
+  end
+
+  def render_rawbody
+    @message = "Hello Instana!"
+    render :body => 'raw body output'
+  end
+
+  def render_js
+    @message = "Hello Instana!"
+    render :js => @message
+  end
+
   def error
     raise Exception.new("Warning: This is a simulated Error")
   end

data/test/tracing/opentracing_test.rb

@@ -160,6 +160,33 @@ class OpenTracerTest < Minitest::Test
     span.finish
   end
 
+  def test_span_kind_translation
+    clear_all!
+    span = OpenTracing.start_span('my_app_entry')
+
+    assert span.is_a?(::Instana::Span)
+    assert_equal :my_app_entry, OpenTracing.current_trace.current_span.name
+
+    span.set_tag(:'span.kind', :server)
+    assert_equal :entry, span[:data][:sdk][:type]
+
+    span.set_tag(:'span.kind', :consumer)
+    assert_equal :entry, span[:data][:sdk][:type]
+
+    span.set_tag(:'span.kind', :client)
+    assert_equal :exit, span[:data][:sdk][:type]
+
+    span.set_tag(:'span.kind', :producer)
+    assert_equal :exit, span[:data][:sdk][:type]
+
+    span[:data][:sdk].delete(:type)
+    span.set_tag(:'span.kind', :blah)
+    assert_equal false, span[:data][:sdk].key?(:type)
+    assert_equal :blah, span[:data][:sdk][:custom][:'span.kind']
+
+    span.finish
+  end
+
   def test_start_span_with_baggage
     clear_all!
     span = OpenTracing.start_span('my_app_entry')

metadata

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