instana 1.10.2-java → 1.10.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e716dcf93b11c25ee83a4e0904ecc06973fa35977ee1228864e5b641c029a0d
-  data.tar.gz: 7c1e5da1f2475e3d517caa740116cd617ca47a79fc6b1ac6830e4eea019fd386
+  metadata.gz: 5dba3779f4bc86e26583716484fd49063e9e56ad27d19fb78c5a255544d44fac
+  data.tar.gz: 24f0f1fb3fe6d12d58b531a2e11f7e36f81a210758a51a794b464bb0fc554ba0
 SHA512:
-  metadata.gz: 004c60e166e9bbb42468f79c4e9657656098ee5a0fe6716069029925815d2eca7060106d51c6459a27a6eb99836d24ff15cc7709377199fc769b3231273cfcd9
-  data.tar.gz: 771071609061b33f003300ab2e767b1c5cf357808ca4b0baa9c88a270a76ec36232f23ef22cdaba811759643f9c1999fa716781493a362be8f7042acc81bb339
+  metadata.gz: 6e5a55cd765dbaac1af1544b40a026be3f37aa73f9c2cf97b928b784b31e48cb30b021c5891b711ec4c96094fd3ae8c731229de13366865c71912e05716adbcd
+  data.tar.gz: 82a5504c73b5c04e7ae76f52c712920b06d5be10e0ccd36253d16576ccbe6e7d28a27a885e3ff845dd8b711177fd00a66588fa5c877f01be70151c20505d948c

data/.fasterer.yml

@@ -0,0 +1,23 @@
+speedups:
+  rescue_vs_respond_to: true
+  module_eval: true
+  shuffle_first_vs_sample: true
+  for_loop_vs_each: true
+  each_with_index_vs_while: false
+  map_flatten_vs_flat_map: true
+  reverse_each_vs_reverse_each: true
+  select_first_vs_detect: true
+  sort_vs_sort_by: true
+  fetch_with_argument_vs_block: true
+  keys_each_vs_each_key: true
+  hash_merge_bang_vs_hash_brackets: true
+  block_vs_symbol_to_proc: true
+  proc_call_vs_yield: true
+  gsub_vs_tr: true
+  select_last_vs_reverse_detect: true
+  getter_vs_attr_reader: true
+  setter_vs_attr_writer: true
+
+exclude_paths:
+  - 'vendor/**/*.rb'
+  - 'db/schema.rb'

data/Gemfile

@@ -30,7 +30,7 @@ group :development do
       gem 'byebug', '< 9.1.0', :platform  =>  [:mri_19, :mri_20]
       gem 'pry-byebug', :platform  =>  [:mri_19, :mri_20]
     else
-      gem 'pry-byebug', :platform  =>  [:mri_19, :mri_20]
+      gem 'pry-byebug', :platform  =>  :ruby
     end
   else
     gem 'pry', '0.9.12.4'

data/benchmarks/10k-rack-traces.rb

@@ -0,0 +1,92 @@
+require "bundler"
+
+require 'rack'
+require 'rack/builder'
+require 'rack/handler/puma'
+require 'net/http'
+require "cgi"
+Bundler.require(:default)
+require "instana/rack"
+require 'ruby-prof'
+
+Thread.new do
+  app = Rack::Builder.new {
+    map "/" do
+      run Proc.new {
+        [200, {"Content-Type" => "application/json"}, ["[\"Stan\",\"is\",\"on\",\"the\",\"scene!\"]"]]
+      }
+    end
+    map "/error" do
+      run Proc.new {
+        [500, {"Content-Type" => "application/json"}, ["[\"Stan\",\"is\",\"on\",\"the\",\"error!\"]"]]
+      }
+    end
+  }
+
+  Rack::Handler::Puma.run(app, {:Host => '127.0.0.1', :Port => 7011})
+end
+
+Thread.new do
+  app = Rack::Builder.new {
+    use ::Instana::Rack
+    map "/" do
+      run Proc.new {
+        [200, {"Content-Type" => "application/json"}, ["[\"Stan\",\"is\",\"on\",\"the\",\"scene!\"]"]]
+      }
+    end
+    map "/error" do
+      run Proc.new {
+        [500, {"Content-Type" => "application/json"}, ["[\"Stan\",\"is\",\"on\",\"the\",\"error!\"]"]]
+      }
+    end
+  }
+
+  Rack::Handler::Puma.run(app, {:Host => '127.0.0.1', :Port => 7012})
+end
+
+puts ""
+puts "Vanilla Rack server started in background thread on localhost:7011"
+puts "Instrumented Rack server started in background thread on localhost:7012"
+puts ""
+puts "Waiting on successful announce to host agent..."
+puts ""
+
+#RubyProf.measure_mode = RubyProf::WALL_TIME
+#RubyProf.measure_mode = RubyProf::PROCESS_TIME
+RubyProf.measure_mode = RubyProf::ALLOCATIONS
+#RubyProf.measure_mode = RubyProf::MEMORY
+
+while !::Instana.agent.ready? do
+  sleep 2
+end
+
+puts "Starting 10k Traces..."
+
+# uri = URI.parse("http://127.0.0.1:7011/")
+# ::Net::HTTP.start(uri.host, uri.port) do |hc|
+#   x.report("vanilla") {
+#     10_000.times {
+#       req = Net::HTTP::Get.new(uri.request_uri)
+#       hc.request(req)
+#     }
+#   }
+# end
+
+uri = URI.parse("http://127.0.0.1:7012/")
+result = RubyProf.profile do
+  1.times {
+    ::Instana.tracer.start_or_continue_trace(:job, {:kind => :entry}) do
+      ::Net::HTTP.start(uri.host, uri.port) do |hc|
+        ::Instana.tracer.start_or_continue_trace(:rack_call) do
+          req = Net::HTTP::Get.new(uri.request_uri)
+          hc.request(req)
+        end
+      end
+    end
+  }
+end
+
+puts "Done - displaying results..."
+
+printer = RubyProf::FlatPrinter.new(result)
+printer.print(STDOUT, {})

data/benchmarks/Gemfile.lock

@@ -0,0 +1,38 @@
+PATH
+  remote: ..
+  specs:
+    instana (1.9.6)
+      ffi (>= 1.0.11)
+      get_process_mem (>= 0.2.1)
+      oj (>= 3.0.11)
+      sys-proctable (>= 0.9.2)
+      timers (>= 4.0.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ffi (1.11.1)
+    get_process_mem (0.2.4)
+      ffi (~> 1.0)
+    nio4r (2.4.0)
+    oj (3.8.1)
+    puma (4.1.0)
+      nio4r (~> 2.0)
+    rack (2.0.7)
+    ruby-prof (1.0.0)
+    sys-proctable (1.2.2)
+      ffi
+    timers (4.3.0)
+
+PLATFORMS
+  ruby
+  x86_64-darwin-18
+
+DEPENDENCIES
+  instana!
+  puma
+  rack
+  ruby-prof
+
+BUNDLED WITH
+   2.0.2

data/benchmarks/rack_vanilla_vs_traced.rb

@@ -44,11 +44,16 @@ Thread.new do
   Rack::Handler::Puma.run(app, {:Host => '127.0.0.1', :Port => 7012})
 end
 
-sleep(2)
-puts "Rack server started in background thread on localhost:7011"
-puts "Sleeping for 10 to allow announce"
-sleep(10)
+puts ""
+puts "Vanilla Rack server started in background thread on localhost:7011"
+puts "Instrumented Rack server started in background thread on localhost:7012"
+puts ""
+puts "Waiting on successful announce to host agent..."
+puts ""
 
+while !::Instana.agent.ready? do
+  sleep 2
+end
 
 puts "Starting benchmarks"
 Benchmark.bm do |x|

data/gemfiles/rails52.gemfile

@@ -0,0 +1,52 @@
+source 'https://rubygems.org'
+
+group :development, :test do
+  gem 'rake'
+  gem 'minitest', '5.9.1'
+  gem 'minitest-reporters'
+  gem 'minitest-debugger', :require => false
+  gem 'rack-test'
+  gem 'webmock'
+  gem 'puma'
+  # public_suffix dropped support for Ruby 2.1 and earlier.
+  gem 'public_suffix', '< 3.0'
+end
+
+group :development do
+  gem 'ruby-debug',   :platforms => [:mri_18, :jruby]
+  gem 'debugger',     :platform  =>  :mri_19
+
+  if RUBY_VERSION > '1.8.7'
+    gem 'pry'
+
+    if RUBY_VERSION < '2.2'
+      gem 'byebug', '< 9.1.0'
+      gem 'pry-byebug'
+    else
+      gem 'pry-byebug'
+    end
+  else
+    gem 'pry', '0.9.12.4'
+  end
+end
+
+gem 'rails', '~> 5.2'
+gem 'sass-rails', '~> 5.0'
+gem 'uglifier', '>= 1.3.0'
+gem 'coffee-rails', '~> 4.2'
+# gem 'therubyracer', platforms: :ruby
+
+gem 'jquery-rails'
+gem 'turbolinks', '~> 5'
+gem 'jbuilder', '~> 2.5'
+
+gem 'pg'
+gem 'mysql2', '0.4.10'
+
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+
+# Include the Instana Ruby gem's base set of gems
+gemspec :path => File.expand_path(File.dirname(__FILE__) + '/../')
+
+# vim:syntax=ruby

data/lib/instana/agent.rb

@@ -26,11 +26,17 @@ module Instana
     attr_accessor :thread_spawn_lock
     attr_accessor :extra_headers
 
+    attr_accessor :testmode
+
     LOCALHOST = '127.0.0.1'.freeze
     MIME_JSON = 'application/json'.freeze
     DISCOVERY_PATH = 'com.instana.plugin.ruby.discovery'.freeze
+    METRICS_PATH = "com.instana.plugin.ruby.%s"
+    TRACES_PATH = "com.instana.plugin.ruby/traces.%s"
 
     def initialize
+      @testmode = ENV.key?('INSTANA_TEST')
+
       # Supported two states (unannounced & announced)
       @state = :unannounced
 
@@ -44,6 +50,7 @@ module Instana
       # Two timers, one for each state (unannounced & announced)
       @timers = ::Timers::Group.new
       @announce_timer = nil
+      @pending_timer = nil
       @collect_timer = nil
 
       @thread_spawn_lock = Mutex.new
@@ -111,15 +118,31 @@ module Instana
       # The announce timer
       # We attempt to announce this ruby sensor to the host agent.
       # In case of failure, we try again in 30 seconds.
-      @announce_timer = @timers.every(30) do
+      @announce_timer = @timers.now_and_every(30) do
         if @state == :unannounced
           if host_agent_available? && announce_sensor
             transition_to(:announced)
-            ::Instana.logger.info "Host agent available. We're in business. (#{@state} pid:#{Process.pid} #{@process[:name]})"
+            ::Instana.logger.debug "Announce successful.  Waiting on ready. (#{@state} pid:#{Process.pid} #{@process[:name]})"
           end
         end
       end
 
+      # The pending timer
+      # Handles the time between successful announce and when the host agent METRICS_PATH and TRACES_PATH
+      # no longer return 404s and are truly ready to accept data.
+      @pending_timer = @timers.now_and_every(1) do
+        path = sprintf(METRICS_PATH, @process[:report_pid])
+        uri = URI.parse("http://#{::Instana.config[:agent_host]}:#{::Instana.config[:agent_port]}/#{path}")
+        req = Net::HTTP::Post.new(uri)
+        req.body = Oj.dump({}, OJ_OPTIONS)
+
+        response = make_host_agent_request(req)
+        if response && (response.code.to_i == 200)
+          transition_to(:ready)
+          ::Instana.logger.info "Host agent available. We're in business. (#{@state} pid:#{Process.pid} #{@process[:name]})"
+        end
+      end
+
       # The collect timer
       # If we are in announced state, send metric data (only delta reporting)
       # every ::Instana.config[:collector][:interval] seconds.
@@ -129,7 +152,7 @@ module Instana
         # then we just skip.
         unless (Time.now - @last_collect_run) < ::Instana.config[:collector][:interval]
           @last_collect_run = Time.now
-          if @state == :announced
+          if @state == :ready
             if !::Instana.collector.collect_and_report
               # If report has been failing for more than 1 minute,
               # fall back to unannounced state
@@ -151,16 +174,22 @@ module Instana
     def start
       if !host_agent_available?
         if !ENV.key?("INSTANA_QUIET")
-          ::Instana.logger.warn "Host agent not available.  Will retry periodically. (Set env INSTANA_QUIET=1 to shut these messages off)"
+          ::Instana.logger.info "Instana host agent not available.  Will retry periodically. (Set env INSTANA_QUIET=1 to shut these messages off)"
         end
       end
 
       while true
         if @state == :unannounced
-          @collect_timer.pause
           @announce_timer.resume
-        else
+          @pending_timer.pause
+          @collect_timer.pause
+        elsif @state == :announced
+          @announce_timer.pause
+          @pending_timer.resume
+          @collect_timer.pause
+        elsif @state == :ready
           @announce_timer.pause
+          @pending_timer.pause
           @collect_timer.resume
         end
         @timers.wait
@@ -169,11 +198,12 @@ module Instana
       ::Instana.logger.warn { "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" }
       ::Instana.logger.debug { e.backtrace.join("\r\n") }
     ensure
-      if @state == :announced
+      if @state == :ready
         # Pause the timers so they don't fire while we are
         # reporting traces
-        @collect_timer.pause
         @announce_timer.pause
+        @pending_timer.pause
+        @collect_timer.pause
 
         ::Instana.logger.debug { "#{Thread.current}: Agent exiting. Reporting final spans (if any)." }
         ::Instana.processor.send
@@ -198,7 +228,7 @@ module Instana
       announce_payload[:name] = @process[:name]
       announce_payload[:args] = @process[:arguments]
 
-      if @is_linux && !ENV.key?('INSTANA_TEST')
+      if @is_linux && !@testmode
         # We create an open socket to the host agent in case we are running in a container
         # and the real pid needs to be detected.
         socket = TCPSocket.new @discovered[:agent_host], @discovered[:agent_port]
@@ -241,12 +271,12 @@ module Instana
     # @return [Boolean] true on success, false otherwise
     #
     def report_metrics(payload)
-      unless @discovered
-        ::Instana.logger.debug("#{__method__} called but discovery hasn't run yet!")
+      if @state != :ready && !@testmode
+        ::Instana.logger.debug "report_metrics called but agent not in ready state."
         return false
       end
 
-      path = "com.instana.plugin.ruby.#{@process[:report_pid]}"
+      path = sprintf(METRICS_PATH, @process[:report_pid])
       uri = URI.parse("http://#{@discovered[:agent_host]}:#{@discovered[:agent_port]}/#{path}")
       req = Net::HTTP::Post.new(uri)
 
@@ -274,18 +304,16 @@ module Instana
 
     # Accept and report spans to the host agent.
     #
-    # @param traces [Array] An array of [Span]
+    # @param spans [Array] An array of [Span]
     # @return [Boolean]
     #
     def report_spans(spans)
-      return unless @state == :announced
-
-      unless @discovered
-        ::Instana.logger.debug("#{__method__} called but discovery hasn't run yet!")
+      if @state != :ready && !@testmode
+        ::Instana.logger.debug "report_spans called but agent not in ready state."
         return false
       end
 
-      path = "com.instana.plugin.ruby/traces.#{@process[:report_pid]}"
+      path = sprintf(TRACES_PATH, @process[:report_pid])
       uri = URI.parse("http://#{@discovered[:agent_host]}:#{@discovered[:agent_port]}/#{path}")
       req = Net::HTTP::Post.new(uri)
 
@@ -315,20 +343,12 @@ module Instana
       @discovered ||= run_discovery
 
       if @discovered
-        # Try default location or manually configured (if so)
-        uri = URI.parse("http://#{@discovered[:agent_host]}:#{@discovered[:agent_port]}/")
-        req = Net::HTTP::Get.new(uri)
-
-        response = make_host_agent_request(req)
-
-        if response && (response.code.to_i == 200)
-          return true
-        end
+        return true
       end
       false
     rescue => e
       Instana.logger.debug { "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" }
-      Instana.logger.debug { e.backtrace.join("\r\n") } unless ENV.key?('INSTANA_TEST')
+      Instana.logger.debug { e.backtrace.join("\r\n") } unless @testmode
       return false
     end
 
@@ -390,22 +410,26 @@ module Instana
     def transition_to(state)
       ::Instana.logger.debug("Transitioning to #{state}")
       case state
+      when :ready
+        # announced
+        @state = :ready
+
+        # Reset the entity timer
+        @entity_last_seen = Time.now
       when :announced
         # announce successful; set state
         @state = :announced
 
         # Reset the entity timer
         @entity_last_seen = Time.now
-
       when :unannounced
         @state = :unannounced
         # Reset our HTTP client
         @httpclient = nil
-
       else
         ::Instana.logger.debug "Uknown agent state: #{state}"
       end
-      ::Instana.collector.reset_timer!
+      ::Instana.collector.reset_snapshot_timer!
       true
     end
 
@@ -434,7 +458,7 @@ module Instana
       return nil
     rescue => e
       Instana.logger.debug { "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" }
-      Instana.logger.debug { e.backtrace.join("\r\n") } unless ENV.key?('INSTANA_TEST')
+      Instana.logger.debug { e.backtrace.join("\r\n") } unless @testmode
       return nil
     end
   end

data/lib/instana/agent/helpers.rb

@@ -52,7 +52,7 @@ module AgentHelpers
       end
     end
 
-    @state == :announced
+    @state == :ready
   rescue => e
     Instana.logger.debug { "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" }
     Instana.logger.debug { e.backtrace.join("\r\n") } unless ENV.key?('INSTANA_TEST')

data/lib/instana/collector.rb

@@ -21,7 +21,7 @@ module Instana
 
     # Register an individual collector.
     #
-    # @param [Object] the class of the collector to register
+    # @param [Object] klass of the collector to register
     #
     def register(klass)
       ::Instana.logger.debug "Adding #{klass} to collectors..."
@@ -30,9 +30,9 @@ module Instana
 
     # Resets the timer on when to send process snapshot data.
     #
-    def reset_timer!
+    def reset_snapshot_timer!
       # Set last snapshot to 10 minutes ago
-      # so we send a snapshot on first report
+      # so that we send a snapshot on first report
       @last_snapshot = Time.now - 601
     end
 

data/lib/instana/config.rb

@@ -28,11 +28,8 @@ module Instana
       # Enable/disable tracing (default: enabled)
       @config[:tracing] = { :enabled => true }
 
-      if ENV.key?('INSTANA_DEBUG')
-        @config[:collector] = { :enabled => true, :interval => 3 }
-      else
-        @config[:collector] = { :enabled => true, :interval => 1 }
-      end
+      # Collector interval
+      @config[:collector] = { :enabled => true, :interval => 1 }
 
       # EUM Related
       @config[:eum_api_key] = nil

data/lib/instana/frameworks/cuba.rb

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

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

@@ -163,7 +163,7 @@ module Instana
 end
 
 if defined?(::ActionController) && ::Instana.config[:action_controller][:enabled] && ::ActionPack::VERSION::MAJOR >= 2
-  ::Instana.logger.info "Instrumenting ActionController"
+  ::Instana.logger.debug "Instrumenting ActionController"
   if ActionPack::VERSION::MAJOR >= 5
     ::ActionController::Base.send(:prepend, ::Instana::Instrumentation::ActionController)
   else
@@ -178,6 +178,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.info "Instrumenting ActionController API"
+  ::Instana.logger.debug "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.info "Instrumenting ActionView"
+  ::Instana.logger.debug "Instrumenting ActionView"
   ::ActionView::PartialRenderer.send(:include, ::Instana::Instrumentation::ActionViewRenderer)
 end

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

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

data/lib/instana/frameworks/rails.rb

@@ -8,7 +8,7 @@ if defined?(::Rails)
       ::Instana.logger = ::Rails.logger if ::Rails.logger
 
       if ::Instana.config[:tracing][:enabled]
-        ::Instana.logger.info "Instrumenting Rack"
+        ::Instana.logger.debug "Instrumenting Rack"
         ::Rails.configuration.middleware.insert 0, ::Instana::Rack
       else
         ::Instana.logger.info "Rack: Tracing disabled via config.  Not enabling middleware."
@@ -22,7 +22,7 @@ if defined?(::Rails)
           ::Instana.logger = ::Rails.logger if ::Rails.logger
 
           if ::Instana.config[:tracing][:enabled]
-            ::Instana.logger.info "Instrumenting Rack"
+            ::Instana.logger.debug "Instrumenting Rack"
             app.config.middleware.insert 0, ::Instana::Rack
           else
             ::Instana.logger.info "Rack: Tracing disabled via config.  Not enabling middleware."

data/lib/instana/frameworks/roda.rb

@@ -1,6 +1,6 @@
 require "instana/rack"
 
 if defined?(::Roda)
-  ::Instana.logger.info "Instrumenting Roda"
+  ::Instana.logger.debug "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.info "Instrumenting Sinatra"
+  ::Instana.logger.debug "Instrumenting Sinatra"
   ::Sinatra::Base.use ::Instana::Rack
 end

data/lib/instana/instrumentation/dalli.rb

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

data/lib/instana/instrumentation/excon.rb

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

data/lib/instana/instrumentation/grpc.rb

@@ -39,7 +39,7 @@ if defined?(GRPC::ActiveCall) && ::Instana.config[:grpc][:enabled]
       alias #{call_type} #{call_type}_with_instana
     RUBY
   end
-  ::Instana.logger.info 'Instrumenting GRPC client'
+  ::Instana.logger.debug 'Instrumenting GRPC client'
 end
 
 if defined?(GRPC::RpcDesc) && ::Instana.config[:grpc][:enabled]
@@ -80,5 +80,5 @@ if defined?(GRPC::RpcDesc) && ::Instana.config[:grpc][:enabled]
       alias handle_#{call_type} handle_#{call_type}_with_instana
     RUBY
   end
-  ::Instana.logger.info 'Instrumenting GRPC server'
+  ::Instana.logger.debug 'Instrumenting GRPC server'
 end

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

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

data/lib/instana/instrumentation/redis.rb

@@ -44,7 +44,7 @@ if defined?(::Redis) && ::Instana.config[:redis][:enabled]
       ::Instana.tracer.log_exit(:redis, {})
     end
 
-    ::Instana.logger.info "Instrumenting Redis"
+    ::Instana.logger.debug "Instrumenting Redis"
 
     alias call_without_instana call
     alias call call_with_instana

data/lib/instana/instrumentation/resque.rb

@@ -108,12 +108,12 @@ end
 if defined?(::Resque) && RUBY_VERSION >= '1.9.3'
 
   if ::Instana.config[:'resque-client'][:enabled]
-    ::Instana.logger.info 'Instrumenting Resque Client'
+    ::Instana.logger.debug 'Instrumenting Resque Client'
     ::Instana::Util.send_include(::Resque,         ::Instana::Instrumentation::ResqueClient)
   end
 
   if ::Instana.config[:'resque-worker'][:enabled]
-    ::Instana.logger.info 'Instrumenting Resque Worker'
+    ::Instana.logger.debug 'Instrumenting Resque Worker'
 
     ::Instana::Util.send_include(::Resque::Worker, ::Instana::Instrumentation::ResqueWorker)
     ::Instana::Util.send_include(::Resque::Job,    ::Instana::Instrumentation::ResqueJob)

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.info "Instrumenting RestClient"
+  ::Instana.logger.debug "Instrumenting RestClient"
   ::RestClient::Request.send(:include, ::Instana::Instrumentation::RestClientRequest)
 end

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

@@ -38,7 +38,7 @@ end
 if defined?(::Sidekiq) && ::Instana.config[:'sidekiq-client'][:enabled]
   ::Sidekiq.configure_client do |cfg|
     cfg.client_middleware do |chain|
-      ::Instana.logger.info "Instrumenting Sidekiq client"
+      ::Instana.logger.debug "Instrumenting Sidekiq client"
       chain.add ::Instana::Instrumentation::SidekiqClient
     end
   end

data/lib/instana/instrumentation/sidekiq-worker.rb

@@ -47,7 +47,7 @@ end
 if defined?(::Sidekiq) && ::Instana.config[:'sidekiq-worker'][:enabled]
   ::Sidekiq.configure_server do |cfg|
     cfg.server_middleware do |chain|
-      ::Instana.logger.info "Instrumenting Sidekiq worker"
+      ::Instana.logger.debug "Instrumenting Sidekiq worker"
       chain.add ::Instana::Instrumentation::SidekiqWorker
     end
   end

data/lib/instana/tracing/span.rb

@@ -22,7 +22,7 @@ module Instana
         id = ::Instana::Util.generate_id
         @data[:t] = id                    # Trace ID
         @data[:s] = id                    # Span ID
-        is_root = true
+        @is_root = true
       else
         if parent_ctx.is_a?(::Instana::Span)
           @parent = parent_ctx
@@ -41,7 +41,7 @@ module Instana
           @baggage = nil
         end
 
-        is_root = false
+        @is_root = false
       end
 
       @data[:data] = {}
@@ -143,9 +143,17 @@ module Instana
     #
     def configure_custom(name)
       @data[:n] = :sdk
-      @data[:k] = 3
-      @data[:data] = { :sdk => { :name => name.to_sym, :type => :intermediate } }
+      @data[:data] = { :sdk => { :name => name.to_sym } }
       @data[:data][:sdk][:custom] = { :tags => {}, :logs => {} }
+
+      if @is_root
+        # For custom root spans (via SDK or opentracing), default to entry type
+        @data[:k] = 1
+        @data[:data][:sdk][:type] = :entry
+      else
+        @data[:k] = 3
+        @data[:data][:sdk][:type] = :intermediate
+      end
       self
     end
 
@@ -300,10 +308,10 @@ module Instana
 
         if key.to_sym == :'span.kind'
           case value.to_sym
-          when :server, :consumer
+          when :entry, :server, :consumer
             @data[:data][:sdk][:type] = :entry
             @data[:k] = 1
-          when :client, :producer
+          when :exit, :client, :producer
             @data[:data][:sdk][:type] = :exit
             @data[:k] = 2
           else

data/lib/instana/version.rb

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

data/test/agent/agent_test.rb

@@ -5,6 +5,11 @@ class AgentTest < Minitest::Test
 
   Oj = ::Instana::Oj unless defined?(Oj)
 
+  def teardown
+    WebMock.reset!
+    ::Instana.agent.instance_variable_set(:@discovered, nil)
+  end
+
   def test_agent_host_detection
     url = "http://#{::Instana.config[:agent_host]}:#{::Instana.config[:agent_port]}/"
     stub_request(:get, url)
@@ -28,6 +33,7 @@ class AgentTest < Minitest::Test
     docker_url = "http://#{::Instana.agent.instance_variable_get(:@default_gateway)}:#{::Instana.config[:agent_port]}/"
     stub_request(:get, url).to_raise(Errno::ECONNREFUSED)
     stub_request(:get, docker_url).to_raise(Errno::ECONNREFUSED)
+
     discovered = ::Instana.agent.run_discovery
 
     assert_equal nil, discovered
@@ -134,10 +140,9 @@ class AgentTest < Minitest::Test
     discovery[:agent_port] = ::Instana.config[:agent_port]
     ::Instana.agent.instance_variable_set(:@discovered, discovery)
 
-    localhost_url = "http://#{::Instana::Agent::LOCALHOST}:#{::Instana.config[:agent_port]}/"
-    stub_request(:get, localhost_url).to_timeout
-    docker_url = "http://#{::Instana.agent.instance_variable_get(:@default_gateway)}:#{::Instana.config[:agent_port]}/"
-    stub_request(:get, docker_url).to_timeout
-    assert_equal false, ::Instana.agent.host_agent_available?
+    localhost_url = "http://#{::Instana::Agent::LOCALHOST}:#{::Instana.config[:agent_port]}/com.instana.plugin.ruby.discovery"
+    stub_request(:any, localhost_url).to_timeout
+
+    assert_equal false, ::Instana.agent.announce_sensor
   end
 end

data/test/instrumentation/dalli_test.rb

@@ -30,7 +30,7 @@ class DalliTest < Minitest::Test
     first_span = spans[1]
     second_span = spans[0]
 
-    validate_sdk_span(first_span, {:name => :dalli_test, :type => :intermediate})
+    validate_sdk_span(first_span, {:name => :dalli_test, :type => :entry})
 
     assert_equal :memcache, second_span[:n]
     assert_equal false, second_span.key?(:error)
@@ -63,7 +63,7 @@ class DalliTest < Minitest::Test
     first_span = spans[1]
     second_span = spans[0]
 
-    validate_sdk_span(first_span, {:name => :dalli_test, :type => :intermediate})
+    validate_sdk_span(first_span, {:name => :dalli_test, :type => :entry})
 
     assert_equal :memcache, second_span[:n]
     assert_equal false, second_span.key?(:error)
@@ -97,7 +97,7 @@ class DalliTest < Minitest::Test
     first_span = spans[1]
     second_span = spans[0]
 
-    validate_sdk_span(first_span, {:name => :dalli_test, :type => :intermediate})
+    validate_sdk_span(first_span, {:name => :dalli_test, :type => :entry})
 
     assert_equal :memcache, second_span[:n]
     assert_equal false, second_span.key?(:error)
@@ -131,7 +131,7 @@ class DalliTest < Minitest::Test
     first_span = spans[1]
     second_span = spans[0]
 
-    validate_sdk_span(first_span, {:name => :dalli_test, :type => :intermediate})
+    validate_sdk_span(first_span, {:name => :dalli_test, :type => :entry})
 
     assert_equal :memcache, second_span[:n]
     assert_equal false, second_span.key?(:error)
@@ -165,7 +165,7 @@ class DalliTest < Minitest::Test
     first_span = spans[1]
     second_span = spans[0]
 
-    validate_sdk_span(first_span, {:name => :dalli_test, :type => :intermediate})
+    validate_sdk_span(first_span, {:name => :dalli_test, :type => :entry})
 
     assert_equal :memcache, second_span[:n]
     assert_equal false, second_span.key?(:error)
@@ -199,7 +199,7 @@ class DalliTest < Minitest::Test
     first_span = spans[1]
     second_span = spans[0]
 
-    validate_sdk_span(first_span, {:name => :dalli_test, :type => :intermediate})
+    validate_sdk_span(first_span, {:name => :dalli_test, :type => :entry})
 
     assert_equal :memcache, second_span[:n]
     assert_equal false, second_span.key?(:error)
@@ -232,7 +232,7 @@ class DalliTest < Minitest::Test
     first_span = spans[1]
     second_span = spans[0]
 
-    validate_sdk_span(first_span, {:name => :dalli_test, :type => :intermediate})
+    validate_sdk_span(first_span, {:name => :dalli_test, :type => :entry})
 
     assert_equal :memcache, second_span[:n]
     assert_equal false, second_span.key?(:error)

data/test/instrumentation/excon_test.rb

@@ -29,7 +29,7 @@ class ExconTest < Minitest::Test
     excon_span = find_first_span_by_name(spans, :excon)
     rack_span = find_first_span_by_name(spans, :rack)
 
-    validate_sdk_span(sdk_span, {:name => :'excon-test', :type => :intermediate})
+    validate_sdk_span(sdk_span, {:name => :'excon-test', :type => :entry})
 
     # data keys/values
     refute_nil excon_span.key?(:data)
@@ -72,7 +72,7 @@ class ExconTest < Minitest::Test
     excon_span = find_first_span_by_name(spans, :excon)
     sdk_span = find_first_span_by_name(spans, :'excon-test')
 
-    validate_sdk_span(sdk_span, {:name => :'excon-test', :type => :intermediate})
+    validate_sdk_span(sdk_span, {:name => :'excon-test', :type => :entry})
 
     assert_equal sdk_span[:s], excon_span[:p]
     assert_equal excon_span[:s], rack_span[:p]
@@ -111,7 +111,7 @@ class ExconTest < Minitest::Test
     excon_spans = find_spans_by_name(spans, :excon)
     sdk_span = find_first_span_by_name(spans, :'excon-test')
 
-    validate_sdk_span(sdk_span, {:name => :'excon-test', :type => :intermediate})
+    validate_sdk_span(sdk_span, {:name => :'excon-test', :type => :entry})
 
     assert_equal 3, rack_spans.length
     assert_equal 3, excon_spans.length

data/test/instrumentation/rest-client_test.rb

@@ -25,7 +25,7 @@ class RestClientTest < Minitest::Test
     rest_span = find_first_span_by_name(spans, :'rest-client')
     net_span = find_first_span_by_name(spans, :'net-http')
 
-    validate_sdk_span(sdk_span, {:name => :'restclient-test', :type => :intermediate})
+    validate_sdk_span(sdk_span, {:name => :'restclient-test', :type => :entry})
     validate_sdk_span(rest_span, {:name => :'rest-client', :type => :intermediate})
 
     # Span name validation

data/test/instrumentation/sidekiq-client_test.rb

@@ -72,7 +72,7 @@ class SidekiqClientTest < Minitest::Test
     second_span = spans[0]
 
     assert_equal first_span[:s], second_span[:p]
-    validate_sdk_span(first_span, {:name => :sidekiqtests, :type => :intermediate})
+    validate_sdk_span(first_span, {:name => :sidekiqtests, :type => :entry})
 
     assert_equal :'sidekiq-client', second_span[:n]
     assert_equal 'some_random_queue', second_span[:data][:'sidekiq-client'][:queue]
@@ -89,7 +89,7 @@ class SidekiqClientTest < Minitest::Test
     second_span = spans[0]
 
     assert_equal first_span[:s], second_span[:p]
-    validate_sdk_span(first_span, {:name => :sidekiqtests, :type => :intermediate})
+    validate_sdk_span(first_span, {:name => :sidekiqtests, :type => :entry})
 
     assert_equal :'sidekiq-client', second_span[:n]
     assert_equal true, second_span[:error]

data/test/tracing/custom_test.rb

@@ -31,6 +31,10 @@ class CustomTracingTest < Minitest::Test
     assert_equal :custom_trace, first_span[:data][:sdk][:name]
     assert_equal 1, first_span[:data][:sdk][:custom][:tags][:one]
 
+    # Custom tracing root spans should default to entry type
+    assert_equal 1, first_span[:k]
+    assert_equal :entry, first_span[:data][:sdk][:type]
+
     assert first_span.key?(:f)
     assert first_span[:f].key?(:e)
     assert first_span[:f].key?(:h)

data/test/tracing/tracer_test.rb

@@ -105,6 +105,38 @@ class TracerTest < Minitest::Test
     assert_equal sdk_span[:data][:sdk][:custom][:tags][:sub_two], 2
   end
 
+  def test_custom_complex_trace_block
+    clear_all!
+    ::Instana.tracer.start_or_continue_trace(:root_span, {:one => 1}) do
+      sleep 0.2
+      ::Instana.tracer.trace(:sub_span, {:sub_two => 2}) do
+        sleep 0.2
+      end
+    end
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 2, spans.length
+
+    root_span = find_first_span_by_name(spans, :root_span)
+    sub_span = find_first_span_by_name(spans, :sub_span)
+
+    assert_equal root_span[:n], :sdk
+    assert_equal root_span[:data][:sdk][:name], :root_span
+    assert_equal root_span[:data][:sdk][:type], :entry
+    assert_equal root_span[:k], 1
+    assert_equal root_span[:p], nil
+    assert_equal root_span[:t], root_span[:s]
+    assert_equal root_span[:data][:sdk][:custom][:tags][:one], 1
+
+    assert_equal sub_span[:n], :sdk
+    assert_equal sub_span[:data][:sdk][:name], :sub_span
+    assert_equal sub_span[:data][:sdk][:type], :intermediate
+    assert_equal sub_span[:k], 3
+    assert_equal sub_span[:p], root_span[:s]
+    assert_equal sub_span[:t], root_span[:t]
+    assert_equal sub_span[:data][:sdk][:custom][:tags][:sub_two], 2
+  end
+
   def test_basic_low_level_tracing
     clear_all!
 
@@ -189,8 +221,8 @@ class TracerTest < Minitest::Test
 
     assert_equal sdk_span[:n], :sdk
     assert_equal sdk_span[:data][:sdk][:name], :test_trace
-    assert_equal sdk_span[:data][:sdk][:type], :intermediate
-    assert_equal sdk_span[:k], 3
+    assert_equal sdk_span[:data][:sdk][:type], :entry
+    assert_equal sdk_span[:k], 1
     assert_equal sdk_span[:data][:sdk][:custom][:tags][:one], 1
     assert_equal sdk_span[:error], true
     assert_equal sdk_span[:ec], 1
@@ -211,8 +243,8 @@ class TracerTest < Minitest::Test
 
     assert_equal sdk_span[:n], :sdk
     assert_equal sdk_span[:data][:sdk][:name], :test_trace
-    assert_equal sdk_span[:data][:sdk][:type], :intermediate
-    assert_equal sdk_span[:k], 3
+    assert_equal sdk_span[:data][:sdk][:type], :entry
+    assert_equal sdk_span[:k], 1
     assert_equal sdk_span[:data][:sdk][:custom][:tags][:one], 1
     assert_equal sdk_span[:data][:sdk][:custom][:tags][:info_logged], 1
     assert_equal sdk_span[:data][:sdk][:custom][:tags][:close_one], 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.10.2
+  version: 1.10.3
 platform: java
 authors:
 - Peter Giacomo Lombardo
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-09-09 00:00:00.000000000 Z
+date: 2019-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -131,6 +131,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
+- ".fasterer.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
@@ -142,7 +143,9 @@ files:
 - Rakefile
 - Tracing.md
 - Troubleshooting.md
+- benchmarks/10k-rack-traces.rb
 - benchmarks/Gemfile
+- benchmarks/Gemfile.lock
 - benchmarks/id_generation.rb
 - benchmarks/opentracing.rb
 - benchmarks/rack_vanilla_vs_traced.rb
@@ -156,6 +159,7 @@ files:
 - gemfiles/rails32.gemfile
 - gemfiles/rails42.gemfile
 - gemfiles/rails50.gemfile
+- gemfiles/rails52.gemfile
 - instana.gemspec
 - lib/instana.rb
 - lib/instana/agent.rb