instana 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44dfa9b5e6bf4088a5d81a201a997e64f3b1feaa
-  data.tar.gz: e25c83640f80026b17ae78c53534a730c4253f00
+  metadata.gz: e4e0afa7990ec121d8542873c665d2ddda7e1ee9
+  data.tar.gz: 33143dc761cf85e27ab21ed22c9f64f8670c3a2b
 SHA512:
-  metadata.gz: 969b07b8f027aaf3dacc2453f8ad0775eec5d028a625874602cb9d283682227443a9f5e32d9a31b2c377878d12b29a7326dea3cd1f659b52d3bdeb8cfa6ce0cd
-  data.tar.gz: 607287d232068842330e7e0ac8d959d6e4d55b58870fad5a21b3df69e513f1ae833493b39ed87392ecab2d5c017e051da454b627f7c0ed189f2c9bbbe01a2884
+  metadata.gz: 85b7857890a0da50ef837027a1c5e0e7f413189b60175d1f26e682f5c109c7f98534efa2a84ef0f2cbf0e1162eb00f88b10604118fc18ca8036b3aef94e4c02e
+  data.tar.gz: 57d956387066525d20f4e6efc108115f4b02d001418fdad0cdf639143be00e32bfc26173eccc96cfed2bf63be36dbc3b0e09fd96db9209c1037f44ff27a36801

data/lib/instana/agent.rb

@@ -22,6 +22,9 @@ module Instana
       # Supported two states (unannounced & announced)
       @state = :unannounced
 
+      # Store the pid from process boot so we can detect forks
+      @pid = Process.pid
+
       # Snapshot data is collected once per process but resent
       # every 10 minutes along side process metrics.
       @snapshot = take_snapshot
@@ -39,8 +42,9 @@ module Instana
       @announce_timer = nil
       @collect_timer = nil
 
-      # Detect if we're on linux or not (used in host_agent_ready?)
+      # Detect platform flags
       @is_linux = (RUBY_PLATFORM =~ /linux/i) ? true : false
+      @is_osx = (RUBY_PLATFORM =~ /darwin/i) ? true : false
 
       # In case we're running in Docker, have the default gateway available
       # to check in case we're running in bridged network mode
@@ -53,16 +57,57 @@ module Instana
       # The agent UUID returned from the host agent
       @agent_uuid = nil
 
+      collect_process_info
+    end
+
+    # Used in class initialization and after a fork, this method
+    # collects up process information and stores it in @process
+    #
+    def collect_process_info
       @process = {}
       cmdline = ProcTable.ps(Process.pid).cmdline.split("\0")
       @process[:name] = cmdline.shift
       @process[:arguments] = cmdline
-      @process[:original_pid] = Process.pid
+
+      if @is_osx
+        # Handle OSX bug where env vars show up at the end of process name
+        # such as MANPATH etc..
+        @process[:name].gsub!(/[_A-Z]+=\S+/, '')
+        @process[:name].rstrip!
+      end
+
+      @process[:original_pid] = @pid
       # This is usually Process.pid but in the case of docker, the host agent
       # will return to us the true host pid in which we use to report data.
       @process[:report_pid] = nil
     end
 
+    # Determine whether the pid has changed since Agent start.
+    #
+    # @ return [Boolean] true or false to indicate if forked
+    #
+    def forked?
+      @pid != Process.pid
+    end
+
+    # Used post fork to re-initialize state and restart communications with
+    # the host agent.
+    #
+    def after_fork
+      ::Instana.logger.debug "after_fork hook called. Falling back to unannounced state."
+
+      # Re-collect process information post fork
+      @pid = Process.pid
+      collect_process_info
+
+      # Set last snapshot to 10 minutes ago
+      # so we send a snapshot sooner than later
+      @last_snapshot = Time.now - 600
+
+      transition_to(:unannounced)
+      start
+    end
+
     # Sets up periodic timers and starts the agent in a background thread.
     #
     def start
@@ -70,6 +115,10 @@ module Instana
       # We attempt to announce this ruby sensor to the host agent.
       # In case of failure, we try again in 30 seconds.
       @announce_timer = @timers.now_and_every(30) do
+        if forked?
+          after_fork
+          break
+        end
         if host_agent_ready? && announce_sensor
           ::Instana.logger.debug "Announce successful. Switching to metrics collection."
           transition_to(:announced)
@@ -81,6 +130,10 @@ module Instana
       # every ::Instana::Collector.interval seconds.
       @collect_timer = @timers.every(::Instana::Collector.interval) do
         if @state == :announced
+          if forked?
+            after_fork
+            break
+          end
           unless ::Instana::Collector.collect_and_report
             # If report has been failing for more than 1 minute,
             # fall back to unannounced state

data/lib/instana/instrumentation/rack.rb

@@ -27,19 +27,21 @@ module Instana
 
       status, headers, response = @app.call(env)
 
-      kvs[:http][:status] = status
+      if ::Instana.tracer.tracing?
+        kvs[:http][:status] = status
 
-      # Save the IDs before the trace ends so we can place
-      # them in the response headers in the ensure block
-      trace_id = ::Instana.tracer.trace_id
-      span_id = ::Instana.tracer.span_id
+        # Save the IDs before the trace ends so we can place
+        # them in the response headers in the ensure block
+        trace_id = ::Instana.tracer.trace_id
+        span_id = ::Instana.tracer.span_id
+      end
 
       [status, headers, response]
     rescue Exception => e
       ::Instana.tracer.log_error(e)
       raise
     ensure
-      if headers
+      if headers && ::Instana.tracer.tracing?
         # Set reponse headers; encode as hex string
         headers['X-Instana-T'] = ::Instana.tracer.id_to_header(trace_id)
         headers['X-Instana-S'] = ::Instana.tracer.id_to_header(span_id)

data/lib/instana/version.rb

@@ -1,3 +1,3 @@
 module Instana
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Peter Giacomo Lombardo