instana 1.5.0 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bead9a4a515329922c151505eae7f209c49be9d2
-  data.tar.gz: bb7eb569bb0127e6d245858f3bbe595b1c8a62d4
+  metadata.gz: 2f4bc2a5ccafd6784e94f221a85e0fba6834fe23
+  data.tar.gz: f23e89da1122a87d34206ffaaa213aef0833c692
 SHA512:
-  metadata.gz: cbe325aa85a8bca25ae4aaa0cd4317d2476d9b475d1fbd497722ccd3ea54472482f42f78cc1d7d035c4305344fd3fbc9e8531feb1dd4dcd5208aab20c14f5ae6
-  data.tar.gz: 4cfd9167eec7ad906cea0259c238ed47efa07748a6ba8aaa8de243b4a957632576b8ffebc98ae308d729226c714d1a06bd7ac6c43676e17b1aefb017a575dc9d
+  metadata.gz: f653bfd0c09c1a1bd878b809b475c668d91c7c7bc759fbd306801d49a1bf18bea66b89747176043c72102e98e439005205170e8d2bfa63ecdf21e2dbbc225f27
+  data.tar.gz: 497fa0cd4b43d55260eceb7c34bbc66b6e0b8a497283b607a05761cfb1cf9afd0ad67bc849f0bb28ba7ea84aa7263849ce7239f33a3a9a7b07939a081acdc873

data/Configuration.md

@@ -123,50 +123,3 @@ The gem can be configured to use your application logger instead:
 
 Setting `INSTANA_GEM_DEV` to a non nil value will enable extra logging output generally useful
 for development.
-
-#### Extended Debug Logging
-
-_Note: To use this, you must leave the gem original logger intact and not replace it as described above._
-
-The gem allows the debug level to be configured that affects
-what extra debug info it reports.  It allows for:
-
-* `:agent` - shows all agent state related debug messages
-* `:agent_comm` - outputs all request/response pairs to and from the
-  host agent
-* `:trace` - outputs debug messages related to tracing and trace management
-
-Log messages can be generated for these channels using:
-
-```Ruby
-::Instana.logger.agent("agent specific log msg")
-::Instana.logger.agent_comm("agent communication specific log msg")
-```
-
-To set the debug log level:
-
-```Ruby
-::Instana.logger.debug_level = [:agent, :agent_comm, :trace]
-# or
-::Instana.logger.debug_level = [:agent_comm]
-# or
-::Instana.logger.debug_level = :agent
-```
-
-or to reset it:
-
-```Ruby
-::Instana.logger.debug_level = nil
-```
-
-Example output:
-```bash
-[2] pry(main)> Instana.logger.debug_level = :agent_comm
-=> :agent_comm
-
-D, [2016-12-01T11:45:12.876527 #74127] DEBUG -- : Instana: POST Req -> -body-: http://127.0.0.1:42699/com.instana.plugin.ruby.74127 ->
--{"gc":{"heap_live":171890,"heap_free":522},"memory":{"rss_size":51212.0}}- Resp -> body:#<Net::HTTPOK:0x007faee2161078> -> -[]-
-
-[3] pry(main)> Instana.logger.debug_level = nil
-=> nil
-```

data/README.md

@@ -24,6 +24,7 @@ Any and all feedback is welcome.  Happy Ruby visibility.
 [![sinatra](https://s3.amazonaws.com/instana/sinatra-logo.png?1)](http://www.sinatrarb.com/)
 [![padrino](https://s3.amazonaws.com/instana/padrino-logo.png?1)](http://padrinorb.com/)
 [![rack](https://s3.amazonaws.com/instana/rack-logo.png?1)](https://rack.github.io/)
+[![rack](https://user-images.githubusercontent.com/395132/27842764-27e0e452-610d-11e7-811f-8575f83b8944.png?1)](http://www.grpc.io/)
 
 ## Installation
 

data/Rakefile

@@ -41,8 +41,6 @@ task :environment do
 end
 
 task :console => :environment do
-  # Possible debug levels: :agent, :agent_comm, :trace, :agent_response, :tracing
-  # ::Instana.logger.debug_level = [ :agent, :agent_comm ]
   ARGV.clear
   Pry.start
 end

data/instana.gemspec

@@ -36,5 +36,5 @@ Gem::Specification.new do |spec|
 
   # Indirect dependency
   # https://github.com/instana/ruby-sensor/issues/10
-  spec.add_runtime_dependency('ffi', '>= 1.9.3')
+  spec.add_runtime_dependency('ffi', '>= 1.8.1')
 end

data/lib/instana/agent.rb

@@ -63,7 +63,7 @@ module Instana
     # the host agent.
     #
     def after_fork
-      ::Instana.logger.agent "after_fork hook called. Falling back to unannounced state and spawning a new background agent thread."
+      ::Instana.logger.debug "after_fork hook called. Falling back to unannounced state and spawning a new background agent thread."
 
       # Reseed the random number generator for this
       # new thread.
@@ -170,7 +170,7 @@ module Instana
     #
     def announce_sensor
       unless @discovered
-        ::Instana.logger.agent("#{__method__} called but discovery hasn't run yet!")
+        ::Instana.logger.debug("#{__method__} called but discovery hasn't run yet!")
         return false
       end
 
@@ -195,7 +195,7 @@ module Instana
       req = Net::HTTP::Put.new(uri)
       req.body = announce_payload.to_json
 
-      ::Instana.logger.agent "Announce: http://#{@discovered[:agent_host]}:#{@discovered[:agent_port]}/#{DISCOVERY_PATH} - payload: #{req.body}"
+      ::Instana.logger.debug "Announce: http://#{@discovered[:agent_host]}:#{@discovered[:agent_port]}/#{DISCOVERY_PATH} - payload: #{req.body}"
 
       response = make_host_agent_request(req)
 
@@ -223,7 +223,7 @@ module Instana
     #
     def report_metrics(payload)
       unless @discovered
-        ::Instana.logger.agent("#{__method__} called but discovery hasn't run yet!")
+        ::Instana.logger.debug("#{__method__} called but discovery hasn't run yet!")
         return false
       end
 
@@ -275,7 +275,7 @@ module Instana
       uri = URI.parse("http://#{@discovered[:agent_host]}:#{@discovered[:agent_port]}/#{path}")
       req = Net::HTTP::Post.new(uri)
       req.body = payload.to_json
-      ::Instana.logger.agent_response "Responding to agent: #{req.inspect}"
+      ::Instana.logger.debug "Responding to agent request: #{req.inspect}"
       make_host_agent_request(req)
     end
 
@@ -288,7 +288,7 @@ module Instana
       return unless @state == :announced
 
       unless @discovered
-        ::Instana.logger.agent("#{__method__} called but discovery hasn't run yet!")
+        ::Instana.logger.debug("#{__method__} called but discovery hasn't run yet!")
         return false
       end
 
@@ -397,7 +397,7 @@ module Instana
       return true if ENV['INSTANA_GEM_TEST']
 
       if forked?
-        ::Instana.logger.agent "Instana: detected fork.  Calling after_fork"
+        ::Instana.logger.debug "Instana: detected fork.  Calling after_fork"
         after_fork
       end
 
@@ -417,7 +417,7 @@ module Instana
     #   `:announced`, `:unannounced`
     #
     def transition_to(state)
-      ::Instana.logger.agent("Transitioning to #{state}")
+      ::Instana.logger.debug("Transitioning to #{state}")
       case state
       when :announced
         # announce successful; set state
@@ -456,7 +456,7 @@ module Instana
       end
 
       response = @httpclient.request(req)
-      ::Instana.logger.agent_comm "#{req.method}->#{req.uri} body:(#{req.body}) Response:#{response} body:(#{response.body})"
+      # ::Instana.logger.debug "#{req.method}->#{req.uri} body:(#{req.body}) Response:#{response} body:(#{response.body})"
 
       response
     rescue Errno::ECONNREFUSED

data/lib/instana/frameworks/rails.rb

@@ -5,7 +5,7 @@ if defined?(::Rails)
   ::Instana.logger = ::Rails.logger if ::Rails.logger
 
   if ::Rails::VERSION::MAJOR < 3
-    ::Rails.configuration.after_initialization do
+    ::Rails.configuration.after_initialize do
       ::Instana.logger.info "Instrumenting Rack"
       ::Rails.configuration.middleware.insert 0, ::Instana::Rack
     end

data/lib/instana/logger.rb

@@ -2,7 +2,6 @@ require "logger"
 
 module Instana
   class XLogger < Logger
-    LEVELS = [:agent, :agent_comm, :trace, :agent_response, :tracing].freeze
     STAMP = "Instana: ".freeze
 
     def initialize(*args)
@@ -11,63 +10,11 @@ module Instana
         self.level = Logger::DEBUG
       elsif ENV.key?('INSTANA_GEM_DEV')
         self.level = Logger::DEBUG
-        self.debug_level = nil
       else
         self.level = Logger::WARN
       end
     end
 
-    # Sets the debug level for this logger.  The debug level is broken up into various
-    # sub-levels as defined in LEVELS:
-    #
-    # :agent          - All agent related messages such as state & announcements
-    # :agent_comm     - Output all payload comm sent between this Ruby gem and the host agent
-    # :agent_response - Outputs messages related to handling requests received by the host agent
-    # :trace          - Output all traces reported to the host agent
-    # :tracing        - Output messages related to tracing components, spans and management
-    #
-    # To use:
-    # ::Instana.logger.debug_level = [:agent_comm, :trace]
-    #
-    def debug_level=(levels)
-      return unless levels
-
-      LEVELS.each do |l|
-        instance_variable_set("@level_#{l}", false)
-      end
-
-      levels = [ levels ] unless levels.is_a?(Array)
-      levels.each do |l|
-        next unless LEVELS.include?(l)
-        instance_variable_set("@level_#{l}", true)
-      end
-    end
-
-    def agent(msg)
-      return unless @level_agent
-      self.debug(msg)
-    end
-
-    def agent_comm(msg)
-      return unless @level_agent_comm
-      self.debug(msg)
-    end
-
-    def agent_response(msg)
-      return unless @level_agent_response
-      self.debug(msg)
-    end
-
-    def trace(msg)
-      return unless @level_trace
-      self.debug(msg)
-    end
-
-    def tracing(msg)
-      return unless @level_tracing
-      self.debug(msg)
-    end
-
     def error(msg)
       super(STAMP + msg)
     end
@@ -89,4 +36,3 @@ module Instana
     end
   end
 end
-

data/lib/instana/tracing/processor.rb

@@ -25,7 +25,7 @@ module Instana
     #
     # @param [Trace] the trace to be added to the queue
     def add(trace)
-      ::Instana.logger.trace("Queuing completed trace id: #{trace.id}")
+      # ::Instana.logger.debug("Queuing completed trace id: #{trace.id}")
       @queue.push(trace)
     end
 
@@ -33,7 +33,7 @@ module Instana
     #
     # @param [Trace] the trace to be added to the queue
     def stage(trace)
-      ::Instana.logger.trace("Staging incomplete trace id: #{trace.id}")
+      ::Instana.logger.debug("Staging incomplete trace id: #{trace.id}")
       @staging_queue.add(trace)
     end
 
@@ -46,7 +46,7 @@ module Instana
         if @staging_queue.size > 0
           @staging_queue.delete_if do |t|
             if t.complete?
-              ::Instana.logger.trace("Moving staged complete trace to main queue: #{t.id}")
+              ::Instana.logger.debug("Moving staged complete trace to main queue: #{t.id}")
               add(t)
               true
             elsif t.discard?
@@ -160,7 +160,7 @@ module Instana
         end
       }
       unless candidate
-        ::Instana.logger.trace("Couldn't find staged trace with trace_id: #{trace_id}")
+        ::Instana.logger.debug("Couldn't find staged trace with trace_id: #{trace_id}")
       end
       candidate
     end

data/lib/instana/tracing/span.rb

@@ -355,7 +355,7 @@ module Instana
       end
 
       if ::Instana.tracer.current_span.id != id
-        ::Instana.logger.tracing "Closing a span that isn't active. This will result in a broken trace: #{self.inspect}"
+        ::Instana.logger.debug "Closing a span that isn't active. This will result in a broken trace: #{self.inspect}"
       end
 
       if is_root?

data/lib/instana/version.rb

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

data/test/instrumentation/grpc_test.rb

@@ -79,6 +79,9 @@ class GrpcTest < Minitest::Test
 
     assert 'Hello World', response.message
 
+    # Pause for a split second to allow traces to be queued
+    sleep 0.2
+
     assert_equal 2, ::Instana.processor.queue_count
     client_trace, server_trace = differentiate_trace(
       Instana.processor.queued_traces
@@ -111,6 +114,9 @@ class GrpcTest < Minitest::Test
 
     assert '01234', response.message
 
+    # Pause for a split second to allow traces to be queued
+    sleep 0.2
+
     assert_equal 2, ::Instana.processor.queue_count
     client_trace, server_trace = differentiate_trace(
       Instana.processor.queued_traces
@@ -138,10 +144,11 @@ class GrpcTest < Minitest::Test
         PingPongService::PingRequest.new(message: 'Hello World')
       )
     end
-    sleep 1
-
     assert %w(0 1 2 3 4), responses.map(&:message)
 
+    # Pause for a split second to allow traces to be queued
+    sleep 0.2
+
     assert_equal 2, ::Instana.processor.queue_count
     client_trace, server_trace = differentiate_trace(
       Instana.processor.queued_traces
@@ -175,6 +182,9 @@ class GrpcTest < Minitest::Test
 
     assert %w(0 2 4 6 8), responses.to_a.map(&:message)
 
+    # Pause for a split second to allow traces to be queued
+    sleep 0.2
+
     assert_equal 2, ::Instana.processor.queue_count
     client_trace, server_trace = differentiate_trace(
       Instana.processor.queued_traces
@@ -202,6 +212,9 @@ class GrpcTest < Minitest::Test
       end
     end
 
+    # Pause for a split second to allow traces to be queued
+    sleep 0.2
+
     assert_equal 2, ::Instana.processor.queue_count
     client_trace, server_trace = differentiate_trace(
       Instana.processor.queued_traces
@@ -234,6 +247,9 @@ class GrpcTest < Minitest::Test
       end
     end
 
+    # Pause for a split second to allow traces to be queued
+    sleep 0.2
+
     assert_equal 2, ::Instana.processor.queue_count
     client_trace, server_trace = differentiate_trace(
       Instana.processor.queued_traces
@@ -264,7 +280,9 @@ class GrpcTest < Minitest::Test
       rescue
       end
     end
-    sleep 1
+
+    # Pause for a split second to allow traces to be queued
+    sleep 0.2
 
     assert_equal 2, ::Instana.processor.queue_count
     client_trace, server_trace = differentiate_trace(
@@ -294,7 +312,9 @@ class GrpcTest < Minitest::Test
         end
       )
     end
-    sleep 1
+
+    # Pause for a split second to allow traces to be queued
+    sleep 0.2
 
     assert_equal 2, ::Instana.processor.queue_count
     client_trace, server_trace = differentiate_trace(

data/test/test_helper.rb

@@ -27,9 +27,6 @@ end
 
 Minitest::Reporters.use! MiniTest::Reporters::SpecReporter.new
 
-# Set this (or a subset) if you want increased debug output
-#::Instana.logger.debug_level = [ :agent, :agent_comm, :trace ]
-
 # Used to reset the gem to boot state.  It clears out any queued and/or staged
 # traces and resets the tracer to no active trace.
 #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.2
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-04 00:00:00.000000000 Z
+date: 2017-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.3
+        version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.3
+        version: 1.8.1
 description: Provides Ruby sensor instrumentation for Instana.
 email:
 - pglombardo@gmail.com