instana 1.7.7 → 1.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3fed3e3fee894cbd36d18cc5e01c85977a8c51d
-  data.tar.gz: baaa2b1e834962ed98e46bebda58bf6f9f411f24
+  metadata.gz: 316edaafce9e919b5191950fcd3a8dfd7ca39ef6
+  data.tar.gz: 28b3899692291381011da1602da9b3512e5637ff
 SHA512:
-  metadata.gz: c46e619221c89f61ebb3da597d9c77cbfbbdbc72455fad9ee83364998c41ffcb48dc09b78d9cd97fe2934cb33bd733032f4e6b97cb4221d3492fc54b58543b7d
-  data.tar.gz: fd8028cd58c3dd685f80a8fdb85d17ccde28c15c3b762398c9f2187837a67d50a76ccfbf55995e5892f37c0948944a28297c39d834e3fa1d6f017cff7992f215
+  metadata.gz: 37f348d6f49c0a6b4214e50d157349d6191fc61c17604d62e1a50ff32730201697220cced8986d4f0abec8e41eaeee95d342952b3b2fd97338bd7fd03c63a21a
+  data.tar.gz: d442ed00f217b08b4b29f64166c66ff1ecd4f551e238787587d203f887b450eb14933d0349b59f844530cc2e18e4790e57586498d3d4363274fc44891b7907e8

data/Configuration.md

@@ -48,6 +48,16 @@ Instrumentation can be disabled as:
 ::Instana.config[:rack][:enabled] = false
 ```
 
+## Enable/Disable Backtrace Collection
+
+Because backtraces are somewhat expensive in Ruby, backtrace collection is disabled by default but can be enabled with the following code:
+
+```Ruby
+::Instana.config[:collect_backtraces] = true
+```
+
+This will in-turn enable CodeView in your dashboard to get code level insights.
+
 ## Rack Middleware
 
 This gem will detect and automagically insert the Instana Rack middleware into the middleware stack when a [supported framework](https://instana.atlassian.net/wiki/display/DOCS/Ruby) is present.  We are currently adding support for more frameworks.  If you are using a yet to be instrumented framework, you can insert the Instana Rack middleware with the following:

data/lib/instana/agent.rb

@@ -252,7 +252,7 @@ module Instana
         if response.body && response.body.length > 2
           # The host agent returned something indicating that is has a request for us that we
           # need to process.
-          handle_response(response.body)
+          handle_agent_tasks(response.body)
         end
 
         if response.code.to_i == 200
@@ -267,30 +267,48 @@ module Instana
       Instana.logger.debug e.backtrace.join("\r\n")
     end
 
-    # When a request is received by the host agent, it is sent here
-    # from processing and response.
+    # When request(s) are received by the host agent, it is sent here
+    # for handling & processing.
     #
-    # @param json_string [String] the request from the host agent
+    # @param json_string [String] the requests from the host agent
     #
-    def handle_response(json_string)
-      their_request = Oj.load(json_string)
+    def handle_agent_tasks(json_string)
+      tasks = Oj.load(json_string)
+
+      if tasks.is_a?(Hash)
+        process_agent_task(tasks)
+      elsif tasks.is_a?(Array)
+        tasks.each do |t|
+          process_agent_task(t)
+        end
+      end
+    end
 
-      if their_request.key?("action")
-        if their_request["action"] == "ruby.source"
-          payload = ::Instana::Util.get_rb_source(their_request["args"]["file"])
+    # Process a task sent from the host agent.
+    #
+    # @param task [String] the request json from the host agent
+    #
+    def process_agent_task(task)
+      if task.key?("action")
+        if task["action"] == "ruby.source"
+          payload = ::Instana::Util.get_rb_source(task["args"]["file"])
         else
-          payload = { :error => "Unrecognized action: #{their_request["action"]}. An newer Instana gem may be required for this. Current version: #{::Instana::VERSION}" }
+          payload = { :error => "Unrecognized action: #{task["action"]}. An newer Instana gem may be required for this. Current version: #{::Instana::VERSION}" }
         end
       else
         payload = { :error => "Instana Ruby: No action specified in request." }
       end
 
-      path = "com.instana.plugin.ruby/response.#{@process[:report_pid]}?messageId=#{URI.encode(their_request['messageId'])}"
+      path = "com.instana.plugin.ruby/response.#{@process[:report_pid]}?messageId=#{URI.encode(task['messageId'])}"
       uri = URI.parse("http://#{@discovered[:agent_host]}:#{@discovered[:agent_port]}/#{path}")
       req = Net::HTTP::Post.new(uri)
       req.body = Oj.dump(payload)
       ::Instana.logger.debug "Responding to agent request: #{req.inspect}"
       make_host_agent_request(req)
+
+    rescue StandardError => e
+      Instana.logger.debug "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
+      Instana.logger.debug e.backtrace.join("\r\n")
     end
 
     # Accept and report spans to the host agent.

data/lib/instana/tracing/trace.rb

@@ -80,6 +80,7 @@ module Instana
     # @param kvs [Hash] list of key values to be reported in the span
     #
     def add_info(kvs, span = nil)
+      return unless @current_span
       span ||= @current_span
 
       # Pass on to the OT span interface which will properly
@@ -94,7 +95,7 @@ module Instana
     def add_error(e, span = nil)
       # Return if we've already logged this exception and it
       # is just propogating up the spans.
-      return if e && e.instance_variable_get(:@instana_logged)
+      return if e && e.instance_variable_get(:@instana_logged) || @current_span.nil?
       span ||= @current_span
       span.add_error(e)
     end
@@ -105,6 +106,8 @@ module Instana
     # @param kvs [Hash] list of key values to be reported in the span
     #
     def end_span(kvs = {}, end_time = ::Instana::Util.now_in_ms)
+      return unless @current_span
+
       @current_span.close(end_time)
       add_info(kvs) if kvs && !kvs.empty?
       @current_span = @current_span.parent unless @current_span.is_root?

data/lib/instana/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.7.7
+  version: 1.7.8
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2017-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler