instana 1.4.9 → 1.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfbeb7f48e3d0d69c313519deb00183597c21e4c
-  data.tar.gz: 6bffdf8a149bcb61368dc91e3ca75b89031fef05
+  metadata.gz: 8d2fe1c3a1066ce9cdf96311a5f8410ed3bc3287
+  data.tar.gz: 5954ed7f8f68915123c5744aac205410396c46c4
 SHA512:
-  metadata.gz: f680252a3b107bd70e75dcfc8364ab67b577e32c10d300ef46d6468ec22f8983dbe7ab659371d4d27a7867dfbcc22bbe08288ede9df265d63cab11b3daeba101
-  data.tar.gz: ce6dd7886eb3ddb795dc644b57f86f9a674c98b812ea9588678d4ea1664934c654e04247507899e19e0e08a6c3543d2bee3df0241b0767ad49bb40948477fc35
+  metadata.gz: c4716bb1f8e1dff2ae322bc6eead9bc7f6a2cebd364d11f6c098a320a6bfdb57d3dcc4a58ef4f8d2d1fad1c901ca6abc9998bd93b2db49a34bec6a914088c122
+  data.tar.gz: dd5ba99e78b1096c24954c43f234e424e8e7a94aef533f827b607d6306aa9bbd16b34c3763d53f9813ef978561cab84f426825a5cf5c42e75678f01e9b761b94

data/Gemfile

@@ -18,10 +18,10 @@ end
 group :development do
   gem 'ruby-debug',   :platforms => [:mri_18, :jruby]
   gem 'debugger',     :platform  =>  :mri_19
-  gem 'byebug',       :platforms => [:mri_20, :mri_21, :mri_22, :mri_23]
+  gem 'byebug',       :platforms => [:mri_20, :mri_21, :mri_22, :mri_23, :mri_24]
   if RUBY_VERSION > '1.8.7'
     gem 'pry'
-    gem 'pry-byebug', :platforms => [:mri_20, :mri_21, :mri_22, :mri_23]
+    gem 'pry-byebug', :platforms => [:mri_20, :mri_21, :mri_22, :mri_23, :mri_24]
   else
     gem 'pry', '0.9.12.4'
   end

data/lib/instana/agent.rb

@@ -44,6 +44,10 @@ module Instana
         @default_gateway = nil
       end
 
+      # Re-useable HTTP client for communication with
+      # the host agent.
+      @httpclient = nil
+
       # Collect initial process info - repeat prior to announce
       # in `announce_sensor` in case of process rename, after fork etc.
       @process = ::Instana::Util.collect_process_info
@@ -204,7 +208,7 @@ module Instana
         false
       end
     rescue => e
-      Instana.logger.error "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
+      Instana.logger.info "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
       Instana.logger.debug e.backtrace.join("\r\n")
       return false
     ensure
@@ -245,7 +249,7 @@ module Instana
       end
       false
     rescue => e
-      Instana.logger.error "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
+      Instana.logger.debug "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
       Instana.logger.debug e.backtrace.join("\r\n")
     end
 
@@ -328,7 +332,7 @@ module Instana
       end
       false
     rescue => e
-      Instana.logger.error "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
+      Instana.logger.debug "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
       Instana.logger.debug e.backtrace.join("\r\n") unless ::Instana.test?
       return false
     end
@@ -424,9 +428,11 @@ module Instana
 
       when :unannounced
         @state = :unannounced
+        # Reset our HTTP client
+        @httpclient = nil
 
       else
-        ::Instana.logger.warn "Uknown agent state: #{state}"
+        ::Instana.logger.debug "Uknown agent state: #{state}"
       end
       ::Instana.collector.reset_timer!
       true
@@ -443,16 +449,20 @@ module Instana
       req['Accept'] = MIME_JSON
       req['Content-Type'] = MIME_JSON
 
-      response = nil
-      Net::HTTP.start(req.uri.hostname, req.uri.port, :open_timeout => 1, :read_timeout => 1) do |http|
-        response = http.request(req)
+      if @state == :unannounced
+        @httpclient = Net::HTTP.new(req.uri.hostname, req.uri.port)
+        @httpclient.open_timeout = 1
+        @httpclient.read_timeout = 1
       end
+
+      response = @httpclient.request(req)
       ::Instana.logger.agent_comm "#{req.method}->#{req.uri} body:(#{req.body}) Response:#{response} body:(#{response.body})"
+
       response
     rescue Errno::ECONNREFUSED
       return nil
     rescue => e
-      Instana.logger.error "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
+      Instana.logger.debug "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
       Instana.logger.debug e.backtrace.join("\r\n") unless ::Instana.test?
       return nil
     end

data/lib/instana/collectors/gc.rb

@@ -34,14 +34,17 @@ module Instana
           # time around.
           @last_major_count = stats[:major_gc_count]
           @last_minor_count = stats[:minor_gc_count]
+
+          @this_gc[:heap_live] = stats[:heap_live_slots] || stats[:heap_live_num]
+          @this_gc[:heap_free] = stats[:heap_free_slots] || stats[:heap_free_num]
+        else
+          @this_gc[:heap_live] = stats[:heap_live_slot] || stats[:heap_live_num]
+          @this_gc[:heap_free] = stats[:heap_free_slot] || stats[:heap_free_num]
         end
 
-        # GC Heap
-        @this_gc[:heap_live] = stats[:heap_live_slot] || stats[:heap_live_slots] || stats[:heap_live_num]
-        @this_gc[:heap_free] = stats[:heap_free_slot] || stats[:heap_free_slots] || stats[:heap_free_num]
         @this_gc
       rescue => e
-        ::Instana.logger.error "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
+        ::Instana.logger.info "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
         ::Instana.logger.debug e.backtrace.join("\r\n")
       end
     end

data/lib/instana/collectors/memory.rb

@@ -21,7 +21,7 @@ module Instana
         @this_mem[:rss_size] = ::GetProcessMem.new(Process.pid).kb
         @this_mem
       rescue => e
-        ::Instana.logger.error "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
+        ::Instana.logger.info "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
         ::Instana.logger.debug e.backtrace.join("\r\n")
       end
     end

data/lib/instana/collectors/thread.rb

@@ -17,7 +17,7 @@ module Instana
         @this_count[:count] = ::Thread.list.count
         @this_count
       rescue => e
-        ::Instana.logger.error "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
+        ::Instana.logger.info "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
         ::Instana.logger.debug e.backtrace.join("\r\n")
       end
     end

data/lib/instana/frameworks/cuba.rb

@@ -1,6 +1,6 @@
 require "instana/rack"
 
 if defined?(::Cuba)
-  ::Instana.logger.warn "Instrumenting Cuba"
+  ::Instana.logger.info "Instrumenting Cuba"
   Cuba.use ::Instana::Rack
 end

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

@@ -151,7 +151,7 @@ module Instana
 end
 
 if defined?(::ActionController) && ::Instana.config[:action_controller][:enabled] && ::ActionPack::VERSION::MAJOR >= 2
-  ::Instana.logger.warn "Instrumenting ActionController"
+  ::Instana.logger.info "Instrumenting ActionController"
   if ActionPack::VERSION::MAJOR >= 5
     ::ActionController::Base.send(:prepend, ::Instana::Instrumentation::ActionController)
   else
@@ -166,6 +166,6 @@ end
 # We allow ActionController::API instrumentation in version of Ruby on Rails 3 and higher.
 #
 if defined?(::ActionController::API) && ::Instana.config[:action_controller][:enabled] && ::ActionPack::VERSION::MAJOR >= 3
-  ::Instana.logger.warn "Instrumenting ActionController API"
+  ::Instana.logger.info "Instrumenting ActionController API"
   ::ActionController::API.send(:prepend, ::Instana::Instrumentation::ActionController)
 end

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

@@ -38,6 +38,6 @@ module Instana
 end
 
 if defined?(::ActionView) && ::Instana.config[:action_view][:enabled] && ::ActionPack::VERSION::STRING >= '3.1'
-  ::Instana.logger.warn "Instrumenting ActionView"
+  ::Instana.logger.info "Instrumenting ActionView"
   ::ActionView::PartialRenderer.send(:include, ::Instana::Instrumentation::ActionViewRenderer)
 end

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

@@ -8,18 +8,18 @@ if defined?(::ActiveRecord) && ::Instana.config[:active_record][:enabled]
 
   # Mysql
   if defined?(ActiveRecord::ConnectionAdapters::MysqlAdapter)
-    ::Instana.logger.warn "Instrumenting ActiveRecord (mysql)"
+    ::Instana.logger.info "Instrumenting ActiveRecord (mysql)"
     ActiveRecord::ConnectionAdapters::MysqlAdapter.send(:include, ::Instana::Instrumentation::MysqlAdapter)
     ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter.send(:include, ::Instana::Instrumentation::AbstractMysqlAdapter)
 
   # Mysql2
   elsif defined?(ActiveRecord::ConnectionAdapters::Mysql2Adapter)
-    ::Instana.logger.warn "Instrumenting ActiveRecord (mysql2)"
+    ::Instana.logger.info "Instrumenting ActiveRecord (mysql2)"
     ActiveRecord::ConnectionAdapters::Mysql2Adapter.send(:include, ::Instana::Instrumentation::Mysql2Adapter)
 
   # Postgres
   elsif defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
-    ::Instana.logger.warn "Instrumenting ActiveRecord (postgresql)"
+    ::Instana.logger.info "Instrumenting ActiveRecord (postgresql)"
     ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.send(:include, ::Instana::Instrumentation::PostgreSQLAdapter)
 
   else

data/lib/instana/frameworks/rails.rb

@@ -6,14 +6,14 @@ if defined?(::Rails)
 
   if ::Rails::VERSION::MAJOR < 3
     ::Rails.configuration.after_initialization do
-      ::Instana.logger.warn "Instrumenting Rack"
+      ::Instana.logger.info "Instrumenting Rack"
       ::Rails.configuration.middleware.insert 0, ::Instana::Rack
     end
   else
     module ::Instana
       class Railtie < ::Rails::Railtie
         initializer 'instana.rack' do |app|
-          ::Instana.logger.warn "Instrumenting Rack"
+          ::Instana.logger.info "Instrumenting Rack"
           app.config.middleware.insert 0, ::Instana::Rack
         end
 

data/lib/instana/frameworks/roda.rb

@@ -1,6 +1,6 @@
 require "instana/rack"
 
 if defined?(::Roda)
-  ::Instana.logger.warn "Instrumenting Roda"
+  ::Instana.logger.info "Instrumenting Roda"
   Roda.use ::Instana::Rack
 end

data/lib/instana/frameworks/sinatra.rb

@@ -4,6 +4,6 @@ require "instana/rack"
 # the latter is based on Sinatra
 
 if defined?(::Sinatra)
-  ::Instana.logger.warn "Instrumenting Sinatra"
+  ::Instana.logger.info "Instrumenting Sinatra"
   ::Sinatra::Base.use ::Instana::Rack
 end

data/lib/instana/helpers.rb

@@ -15,7 +15,7 @@ module Instana
 
         ERB.new(EUM_SNIPPET).result
       rescue => e
-        Instana.logger.error "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
+        Instana.logger.info "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
         Instana.logger.debug e.backtrace.join("\r\n")
         return nil
       end
@@ -31,7 +31,7 @@ module Instana
 
         ERB.new(EUM_TEST_SNIPPET).result
       rescue => e
-        Instana.logger.error "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
+        Instana.logger.info "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
         Instana.logger.debug e.backtrace.join("\r\n")
         return nil
       end

data/lib/instana/instrumentation/dalli.rb

@@ -72,7 +72,7 @@ module Instana
 end
 
 if defined?(::Dalli) && ::Instana.config[:dalli][:enabled]
-  ::Instana.logger.warn "Instrumenting Dalli"
+  ::Instana.logger.info "Instrumenting Dalli"
   ::Dalli::Client.send(:include, ::Instana::Instrumentation::Dalli)
   ::Dalli::Server.send(:include, ::Instana::Instrumentation::DalliServer)
 end

data/lib/instana/instrumentation/excon.rb

@@ -65,7 +65,7 @@ if defined?(::Excon) && ::Instana.config[:excon][:enabled]
     end
   end
 
-  ::Instana.logger.warn "Instrumenting Excon"
+  ::Instana.logger.info "Instrumenting Excon"
   ::Excon.defaults[:middlewares].unshift(::Instana::Instrumentation::Excon)
 end
 

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

@@ -57,7 +57,7 @@ if defined?(::Net::HTTP) && ::Instana.config[:nethttp][:enabled]
       ::Instana.tracer.log_exit(:'net-http', kv_payload)
     end
 
-    Instana.logger.warn "Instrumenting Net::HTTP"
+    Instana.logger.info "Instrumenting Net::HTTP"
 
     alias request_without_instana request
     alias request request_with_instana

data/lib/instana/instrumentation/rack.rb

@@ -30,7 +30,7 @@ module Instana
       if ::Instana.tracer.tracing?
         kvs[:http][:status] = status
 
-        if status.between?(500, 511)
+        if !status.is_a?(Integer) || status.between?(500, 511)
           # Because of the 5xx response, we flag this span as errored but
           # without a backtrace (no exception)
           ::Instana.tracer.log_error(nil)

data/lib/instana/instrumentation/rest-client.rb

@@ -29,6 +29,6 @@ module Instana
 end
 
 if defined?(::RestClient::Request) && ::Instana.config[:'rest-client'][:enabled]
-  ::Instana.logger.warn "Instrumenting RestClient"
+  ::Instana.logger.info "Instrumenting RestClient"
   ::RestClient::Request.send(:include, ::Instana::Instrumentation::RestClientRequest)
 end

data/lib/instana/util.rb

@@ -90,6 +90,7 @@ module Instana
 
         data[:sensorVersion] = ::Instana::VERSION
         data[:ruby_version] = RUBY_VERSION
+        data[:rpl] = RUBY_PATCHLEVEL if defined?(RUBY_PATCHLEVEL)
 
         # Framework Detection
         if defined?(::RailsLts::VERSION)
@@ -119,7 +120,7 @@ module Instana
 
         data
       rescue => e
-        ::Instana.logger.error "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
+        ::Instana.logger.debug "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
         ::Instana.logger.debug e.backtrace.join("\r\n")
         return data
       end
@@ -193,7 +194,7 @@ module Instana
         end
         [id.to_i].pack('q>').unpack('H*')[0].gsub(/^0+/, '')
       rescue => e
-        Instana.logger.error "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
+        Instana.logger.info "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
         Instana.logger.debug e.backtrace.join("\r\n")
       end
 
@@ -216,7 +217,7 @@ module Instana
         end
         [header_id].pack("H*").unpack("q>")[0]
       rescue => e
-        Instana.logger.error "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
+        Instana.logger.info "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
         Instana.logger.debug e.backtrace.join("\r\n")
       end
     end

data/lib/instana/version.rb

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

data/test/test_helper.rb

@@ -9,7 +9,6 @@ require "minitest/autorun"
 require "minitest/reporters"
 require "minitest/debugger" if ENV['DEBUG']
 require 'webmock/minitest'
-::WebMock.disable_net_connect!(allow_localhost: true)
 
 require "instana/test"
 ::Instana::Test.setup_environment
@@ -19,11 +18,11 @@ require "./test/servers/rackapp_6511"
 
 case File.basename(ENV['BUNDLE_GEMFILE'])
 when /rails50|rails42|rails32/
+  # Allow localhost calls to the internal rails servers
+  ::WebMock.disable_net_connect!(allow_localhost: true)
   require './test/servers/rails_3205'
 end
 
-WebMock.disable_net_connect!(allow_localhost: true)
-
 Minitest::Reporters.use! MiniTest::Reporters::SpecReporter.new
 
 # Set this (or a subset) if you want increased debug output

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.4.9
+  version: 1.4.11
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-07 00:00:00.000000000 Z
+date: 2017-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -270,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Ruby sensor for Instana