instana 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b5079ebac90a5ee51a0a808661dd4ccf2f0a308
-  data.tar.gz: 61284e14d6d709258d7b67e5f0e582cc0fb9d72c
+  metadata.gz: 44130c934680011eede485a8a15d5e4cd893e7ec
+  data.tar.gz: 4a2af4a9b1a888b81f733d8362da8f0efa409033
 SHA512:
-  metadata.gz: 4eb5d83f78ae37c40b3e0d7a959391e67b938876cd13a0d1d07bc6c9b0638e0486626caf03349eb974dd5efc9bf62feb459607d978a57e557fd004709ebb9c74
-  data.tar.gz: adfdead8d412acb7bcaef9a1e51e9bdb70a4dd6aaaf323ffde5ddc4a5aa0950a6653b4015575f0fea65ad10b00b3fc71864d9cf61a5d1d5f2f41d5ab6b7ebba1
+  metadata.gz: 893eedd5bf3fa56b18c54ac511a430f41a5a27a650c12dee8f7ef1576e9b28aa0571c69e02c279976c5e05b566052b73a0aeffdc26e56e9eac38d8bea90b37f2
+  data.tar.gz: a3790d930ba1c5afd2622703458497006055bf984d54ff652ac41a277be8048abe3d1cea7dc9855e1e2cbd85b00a2e891eaec0fd2641a4794bd1babbc8f54999

data/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 Instana
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/lib/instana/agent.rb

@@ -4,6 +4,7 @@ require 'socket'
 require 'sys/proctable'
 require 'timers'
 require 'uri'
+require 'thread'
 include Sys
 
 module Instana
@@ -11,6 +12,8 @@ module Instana
     attr_accessor :state
     attr_accessor :agent_uuid
     attr_accessor :process
+    attr_accessor :collect_thread
+    attr_accessor :thread_spawn_lock
 
     LOCALHOST = '127.0.0.1'.freeze
     MIME_JSON = 'application/json'.freeze
@@ -32,6 +35,8 @@ module Instana
       @announce_timer = nil
       @collect_timer = nil
 
+      @thread_spawn_lock = Mutex.new
+
       # Detect platform flags
       @is_linux = (RUBY_PLATFORM =~ /linux/i) ? true : false
       @is_osx = (RUBY_PLATFORM =~ /darwin/i) ? true : false
@@ -90,12 +95,15 @@ module Instana
     # end
     #
     def spawn_background_thread
-      # The thread calling fork is the only thread in the created child process.
-      # fork doesn’t copy other threads.
-      # Restart our background thread
-      Thread.new do
-        start
-      end
+      @thread_spawn_lock.synchronize {
+        if @collect_thread && @collect_thread.alive?
+          ::Instana.logger.info "[instana] Collect thread already started & alive.  Not spawning another."
+        else
+          @collect_thread = Thread.new do
+            start
+          end
+        end
+      }
     end
 
     # Sets up periodic timers and starts the agent in a background thread.
@@ -104,7 +112,7 @@ 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_ready? && announce_sensor
             transition_to(:announced)
@@ -143,6 +151,7 @@ module Instana
     #
     def start
       ::Instana.logger.warn "Host agent not available.  Will retry periodically." unless host_agent_ready?
+
       loop do
         if @state == :unannounced
           @collect_timer.pause

data/lib/instana/tracing/processor.rb

@@ -25,6 +25,11 @@ module Instana
     #
     # @param [Trace] the trace to be added to the queue
     def add(trace)
+      # Do a quick checkup on our background thread.
+      if ::Instana.agent.collect_thread.nil? || !::Instana.agent.collect_thread.alive?
+        ::Instana.agent.spawn_background_thread
+      end
+
       # ::Instana.logger.debug("Queuing completed trace id: #{trace.id}")
       @queue.push(trace)
     end

data/lib/instana/version.rb

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

data/lib/instana.rb

@@ -5,9 +5,8 @@ require "instana/setup"
 #
 #   gem "instana", :require => "instana/setup"
 #
-# ...and manually call ::Instana.agent.start in the thread
-# of your choice
+# ...and override ::Instana::Agent.spawn_background_thread to boot
+# the thread of your choice.
 #
-Thread.new do
-  ::Instana.agent.start
-end
+
+::Instana.agent.spawn_background_thread

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-11 00:00:00.000000000 Z
+date: 2017-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -164,6 +164,7 @@ files:
 - Configuration.md
 - Dockerfile
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - Tracing.md