instana 1.10.10 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54dbfa2e6e3fee8fd8337508ce7d7d081a1194f8af73bde7c2cf5fb35aac326a
-  data.tar.gz: c075709c97ef6659d4ab6f5533cad16f77fdcaaff79ebd6fabeddf53f49ef72f
+  metadata.gz: 1d71c06463463f206e4dd8aeae47776ce792a130d3aa6daccc0477823dd7a357
+  data.tar.gz: bb6fe211979e648b15a48f7fbc949a4ee9408f6a46808159e32a8bf7323e8336
 SHA512:
-  metadata.gz: f290172a3f51b156f1eece7f23a53021766c7213b795191c5c33103c57006ce96e7155fee264dfcf102ebcc2836f55f52ef5e1faf2074d1b23e1953db932803d
-  data.tar.gz: a664f54a125015cb539e690add70372cdfea5d8519f556a36a88b7680a5b7cf65fbaece21b56a45a756d4d4a6432fd8327413b4d06a7850c23fc9a4ff5b1a876
+  metadata.gz: 20493e913bc0569334318bbfeab8590da2a3507810a51f35adaf7320d5d552aefecf12a37e29b0d47e250d5bf4eeecf81e5332d96c1bdaa784fb0ed9bc047984
+  data.tar.gz: d1cebdc236820122711614678d777c4d96587f3672ead7430ccb48b65743b1dfa38df8007647e39ef34fbe01ecab32dc58d4afdaa5c186903e593fffb653bba0

data/Dockerfile

@@ -1,13 +1,16 @@
 # For development/testing, you can run this instrumentation
 # interactively in a Docker container:
-# docker build -t instana/ruby-sensor-console:0.1
-# docker run -it instana/ruby-sensor-console:0.1
-#
-FROM ruby:2.3.1
-RUN apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs openssh-client git vim zip curl uni2ascii bsdmainutils
-RUN mkdir /ruby-sensor
-WORKDIR /ruby-sensor
-COPY Gemfile Gemfile.lock instana.gemspec ./
-COPY . ./
-RUN gem install bundler && bundle install --jobs 20 --retry 5
-CMD bundle exec rake console
+# docker build -t instana/ruby-sensor:1.0
+#
+# To mount the host ruby-sensor directory in the container:
+# docker run -v /host/path/to/ruby-sensor:/ruby-sensor instana/ruby-sensor:1.0 /bin/bash
+#
+# Once inside the container, you can run `cd /ruby-sensor && bundle install && bundle exec rake console` for a development
+# console in the gem.
+#
+# https://github.com/instana/ruby-sensor#development
+#
+FROM ruby:2.6
+ENV INSTANA_DEBUG=true
+RUN gem install bundler
+RUN apt update && apt install -y vim

data/lib/instana/agent.rb

@@ -231,25 +231,35 @@ module Instana
       @process = ::Instana::Util.collect_process_info
 
       announce_payload = {}
-      announce_payload[:pid] = pid_namespace? ? get_real_pid : Process.pid
       announce_payload[:name] = @process[:name]
       announce_payload[:args] = @process[:arguments]
 
+      socket = nil
       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]
+        socket = TCPSocket.open @discovered[:agent_host], @discovered[:agent_port]
+
         announce_payload[:fd] = socket.fileno
-        announce_payload[:inode] = File.readlink("/proc/#{Process.pid}/fd/#{socket.fileno}")
+        announce_payload[:inode] = File.readlink("/proc/self/fd/#{socket.fileno}")
+        announce_payload[:cpuSetFileContent] = get_cpuset_contents
+
+        sched_pid = get_sched_pid
+        announce_payload[:pid] = sched_pid
+        announce_payload[:pidFromParentNS] = running_in_container? && (sched_pid != Process.pid)
+      else
+        announce_payload[:pid] = Process.pid
+        announce_payload[:pidFromParentNS] = true
       end
 
       uri = URI.parse("http://#{@discovered[:agent_host]}:#{@discovered[:agent_port]}/#{DISCOVERY_PATH}")
       req = Net::HTTP::Put.new(uri)
       req.body = Oj.dump(announce_payload, OJ_OPTIONS)
 
-      ::Instana.logger.debug { "Announce: http://#{@discovered[:agent_host]}:#{@discovered[:agent_port]}/#{DISCOVERY_PATH} - payload: #{req.body}" }
+      #::Instana.logger.debug("Announce payload: #{announce_payload}")
+      #::Instana.logger.debug { "Announce: http://#{@discovered[:agent_host]}:#{@discovered[:agent_port]}/#{DISCOVERY_PATH} - payload: #{req.body}" }
 
-      response = make_host_agent_request(req)
+      response = make_host_agent_request(req, open_timeout=3, read_timeout=3, debug=true)
 
       if response && (response.code.to_i == 200)
         data = Oj.load(response.body, OJ_OPTIONS)
@@ -449,18 +459,21 @@ module Instana
     # @param req [Net::HTTP::Req] A prepared Net::HTTP request object of the type
     #  you wish to make (Get, Put, Post etc.)
     #
-    def make_host_agent_request(req)
+    def make_host_agent_request(req, open_timeout=1, read_timeout=1, debug=false)
       req['Accept'] = MIME_JSON
       req['Content-Type'] = MIME_JSON
 
       if @state == :unannounced
         @httpclient = Net::HTTP.new(req.uri.hostname, req.uri.port)
-        @httpclient.open_timeout = 1
-        @httpclient.read_timeout = 1
+        @httpclient.open_timeout = open_timeout
+        @httpclient.read_timeout = read_timeout
       end
 
       response = @httpclient.request(req)
-      # ::Instana.logger.debug "#{req.method}->#{req.uri} body:(#{req.body}) Response:#{response} body:(#{response.body})"
+
+      if debug
+        ::Instana.logger.debug "#{req.method}->#{req.uri} body:(#{req.body}) Response:#{response} body:(#{response.body})"
+      end
 
       response
     rescue Errno::ECONNREFUSED

data/lib/instana/agent/helpers.rb

@@ -7,13 +7,20 @@ module AgentHelpers
     Process.pid != get_real_pid
   end
 
+  # Attempts to determine if we're running inside a container.
+  # The qualifications are:
+  #   1. Linux based OS
+  #   2. /proc/self/cpuset exists and contents include a container id
+  def running_in_container?
+    return false unless @is_linux
+    get_cpuset_contents == '/' ? false : true
+  end
+
   # Attempts to determine the true process ID by querying the
   # /proc/<pid>/sched file.  This works on linux currently.
   #
-  def get_real_pid
-    raise RuntimeError.new("Unsupported platform: get_real_pid") unless @is_linux
-
-    sched_file = "/proc/#{Process.pid}/sched"
+  def get_sched_pid
+    sched_file = "/proc/self/sched"
     pid = Process.pid
 
     if File.exist?(sched_file)
@@ -23,6 +30,19 @@ module AgentHelpers
     pid
   end
 
+  # Open and read /proc/<pid>/cpuset and return as a string.  Used as
+  # part of the announce payload for process differentiation.
+  #
+  def get_cpuset_contents
+    cpuset_file = "/proc/#{Process.pid}/cpuset"
+    contents = ""
+
+    if File.exist?(cpuset_file)
+      contents = File.open(cpuset_file, "r").read
+    end
+    contents
+  end
+
   # Returns the PID that we are reporting to
   #
   def report_pid

data/lib/instana/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.10.10
+  version: 1.11.0
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-09 00:00:00.000000000 Z
+date: 2019-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler