instana 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d305a85a9022580df0cb7f1a997ae3249761eeca
-  data.tar.gz: 4ced318153f068d2d78ad2b24b3f417bf4e38552
+  metadata.gz: 5b29ece207c8410bea84eb595c1f70e0f019502f
+  data.tar.gz: 527d974dadaa17372a87f7fafabd28de2a4601c2
 SHA512:
-  metadata.gz: ceb52cced4e372faf89bd2fd8b0d98a05287da16518bb6532d39c2fa61877ad8d8d4e699d8c0ea5de6bf0c35b218c474ff0bfeab342deb79f316c7ebb9edc3ec
-  data.tar.gz: cd0c7cf3c526a3ae1e346db0ebf6b39fc9ff70b75dffc1f606b9fd8d213e783138e5711f7b482e414ee1f44c352463b5792859ae2c66a0376acccfc92b1fd631
+  metadata.gz: cc6a8d6780ac0d0ac0cea4d56e1e794e99a1a740475bd7dd6f1537c3595409a0fea824663b693a71f3192885693a05dec5d1ac507c63c6c54841ed8f40e4e541
+  data.tar.gz: 6df29e6b77dc0dfd303965acf1d6eec9282f3fef83c91360acfa78a68247609b00b3a34b9b788b238a8c5fee965e34f01f56dafce1a2c37b40ec56382a756d42

data/lib/instana/agent.rb

@@ -23,6 +23,9 @@ module Instana
       # entity data reporting.
       @entity_last_seen = Time.now
 
+      # Used to track the last time the collect timer was run.
+      @last_collect_run = Time.now
+
       # Two timers, one for each state (unannounced & announced)
       @timers = ::Timers::Group.new
       @announce_timer = nil
@@ -109,16 +112,22 @@ module Instana
       # If we are in announced state, send metric data (only delta reporting)
       # every ::Instana.config[:collector][:interval] seconds.
       @collect_timer = @timers.every(::Instana.config[:collector][:interval]) do
-        if @state == :announced
-          if !::Instana.collector.collect_and_report
-            # If report has been failing for more than 1 minute,
-            # fall back to unannounced state
-            if (Time.now - @entity_last_seen) > 60
-              ::Instana.logger.warn "Host agent offline for >1 min.  Going to sit in a corner..."
-              transition_to(:unannounced)
+        # Make sure that this block doesn't get called more often than the interval.  This can
+        # happen on high CPU load and a back up of timer runs.  If we are called before `interval`
+        # then we just skip.
+        unless (Time.now - @last_collect_run) < ::Instana.config[:collector][:interval]
+          @last_collect_run = Time.now
+          if @state == :announced
+            if !::Instana.collector.collect_and_report
+              # If report has been failing for more than 1 minute,
+              # fall back to unannounced state
+              if (Time.now - @entity_last_seen) > 60
+                ::Instana.logger.warn "Host agent offline for >1 min.  Going to sit in a corner..."
+                transition_to(:unannounced)
+              end
             end
+            ::Instana.processor.send
           end
-          ::Instana.processor.send
         end
       end
     end

data/lib/instana/config.rb

@@ -22,6 +22,7 @@ module Instana
 
       # Instrumentation
       @config[:action_controller]  = { :enabled => true }
+      @config[:action_view]        = { :enabled => true }
       @config[:active_record]      = { :enabled => true }
       @config[:dalli]              = { :enabled => true }
       @config[:excon]              = { :enabled => true }

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

@@ -60,6 +60,7 @@ module Instana
       def self.included(klass)
         klass.class_eval do
           alias_method_chain :process_action, :instana
+          alias_method_chain :render, :instana
         end
       end
 
@@ -80,6 +81,19 @@ module Instana
       ensure
         ::Instana.tracer.log_exit(:actioncontroller)
       end
+
+      # The Instana wrapper method for ActionController::Base.render
+      # for versions 3 and 4.
+      #
+      def render_with_instana(*args, &blk)
+        ::Instana.tracer.log_entry(:actionview)
+        render_without_instana(*args, &blk)
+      rescue Exception => e
+        ::Instana.tracer.log_error(e) unless has_rails_handler?
+        raise
+      ensure
+        ::Instana.tracer.log_exit(:actionview)
+      end
     end
   end
 end

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

@@ -0,0 +1,43 @@
+module Instana
+  module Instrumentation
+    module ActionViewRenderer
+      def self.included(klass)
+        ::Instana::Util.method_alias(klass, :render_partial)
+        ::Instana::Util.method_alias(klass, :render_collection)
+      end
+
+      def render_partial_with_instana
+        kv_payload = { :render => {} }
+        kv_payload[:render][:type] = :partial
+        kv_payload[:render][:name] = @options[:partial].to_s if @options.is_a?(Hash)
+
+        ::Instana.tracer.log_entry(:render, kv_payload)
+        render_partial_without_instana
+      rescue Exception => e
+        ::Instana.tracer.log_error(e) unless has_rails_handler?
+        raise
+      ensure
+        ::Instana.tracer.log_exit(:render)
+      end
+
+      def render_collection_with_instana
+        kv_payload = { :render => {} }
+        kv_payload[:render][:type] = :collection
+        kv_payload[:render][:name] = @path.to_s
+
+        ::Instana.tracer.log_entry(:render, kv_payload)
+        render_collection_without_instana
+      rescue Exception => e
+        ::Instana.tracer.log_error(e) unless has_rails_handler?
+        raise
+      ensure
+        ::Instana.tracer.log_exit(:render)
+      end
+    end
+  end
+end
+
+if defined?(::ActionView) && ::Instana.config[:action_view][:enabled] && ::ActionPack::VERSION::STRING >= '3.1'
+  ::Instana.logger.warn "Instrumenting ActionView"
+  ::ActionView::PartialRenderer.send(:include, ::Instana::Instrumentation::ActionViewRenderer)
+end

data/lib/instana/frameworks/rails.rb

@@ -20,6 +20,7 @@ if defined?(::Rails)
         config.after_initialize do
           require "instana/frameworks/instrumentation/active_record"
           require "instana/frameworks/instrumentation/action_controller"
+          require "instana/frameworks/instrumentation/action_view"
         end
       end
     end

data/lib/instana/tracing/span.rb

@@ -1,6 +1,6 @@
 module Instana
   class Span
-    REGISTERED_SPANS = [ :actioncontroller, :activerecord, :excon, :memcache, :'net-http', :rack ].freeze
+    REGISTERED_SPANS = [ :actioncontroller, :actionview, :activerecord, :excon, :memcache, :'net-http', :rack, :render ].freeze
     ENTRY_SPANS = [ :rack ].freeze
     EXIT_SPANS = [ :'net-http', :excon, :activerecord ].freeze
     HTTP_SPANS = ENTRY_SPANS + EXIT_SPANS

data/lib/instana/version.rb

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

data/test/frameworks/rails/actioncontroller_test.rb

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

data/test/frameworks/rails/actionview_test.rb

@@ -0,0 +1,81 @@
+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_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 :activerecord, third_span.name
+    assert_equal :actionview, 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/activerecord3_test.rb

@@ -23,7 +23,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]
@@ -63,7 +63,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]
@@ -103,7 +103,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/frameworks/rails/activerecord4_test.rb

@@ -23,7 +23,7 @@ class ActiveRecordPgTest < 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]
@@ -63,7 +63,7 @@ class ActiveRecordPgTest < 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]
@@ -103,7 +103,7 @@ class ActiveRecordPgTest < 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

@@ -1,5 +1,9 @@
 
-::Instana.logger.warn "Starting background Ruby on Rails application on port 3205"
+::Instana.logger.warn "Starting background Ruby on Rails #{Rails::VERSION::STRING} application on port 3205"
+
+if Rails::VERSION::STRING >= '5.0' && ::Instana::Test.mysql?
+  ::Instana.logger.fatal "Rails 5.x doesn't support the mysql adapter (discontinued).  Set DB_FLAVOR=msyql2 instead.  This will fail as is."
+end
 
 require "rails/all"
 require "action_controller/railtie" # require more if needed
@@ -18,9 +22,12 @@ end
 
 class RailsTestApp < Rails::Application
   routes.append do
-    get "/test/world" => "test#world"
-    get "/test/db"    => "test#db"
-    get "/test/error" => "test#error"
+    get "/test/world"              => "test#world"
+    get "/test/db"                 => "test#db"
+    get "/test/error"              => "test#error"
+    get "/test/render_view"        => "test#render_view"
+    get "/test/render_partial"     => "test#render_partial"
+    get "/test/render_collection"  => "test#render_collection"
 
     get "/api/world" => "socket#world"
     get "/api/error" => "socket#error"
@@ -33,6 +40,8 @@ class RailsTestApp < Rails::Application
   # uncomment below to display errors
   # config.consider_all_requests_local = true
 
+  config.paths['app/views'].unshift(File.expand_path(File.dirname(__FILE__) + '/../views'))
+
   config.active_support.deprecation = :stderr
 
   config.middleware.delete Rack::Lock
@@ -65,6 +74,18 @@ class TestController < ActionController::Base
     end
   end
 
+  def render_view
+    @message = "Hello Instana!"
+  end
+
+  def render_partial
+    @message = "Hello Instana!"
+  end
+
+  def render_collection
+    @blocks = Block.all
+  end
+
   def error
     raise Exception.new("Warning: This is a simulated Error")
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-23 00:00:00.000000000 Z
+date: 2017-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -188,6 +188,7 @@ files:
 - lib/instana/frameworks/cuba.rb
 - lib/instana/frameworks/instrumentation/abstract_mysql_adapter.rb
 - lib/instana/frameworks/instrumentation/action_controller.rb
+- lib/instana/frameworks/instrumentation/action_view.rb
 - lib/instana/frameworks/instrumentation/active_record.rb
 - lib/instana/frameworks/instrumentation/mysql2_adapter.rb
 - lib/instana/frameworks/instrumentation/mysql_adapter.rb
@@ -226,6 +227,7 @@ 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/activerecord3_test.rb
 - test/frameworks/rails/activerecord4_test.rb
 - test/frameworks/rails/activerecord5_test.rb
@@ -278,6 +280,7 @@ 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/activerecord3_test.rb
 - test/frameworks/rails/activerecord4_test.rb
 - test/frameworks/rails/activerecord5_test.rb