instana 1.3.3 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5188167998cd8f55f33cb1e5efabd7743d9320be
-  data.tar.gz: a8b730858f4f70b2cfdd4fedcda867b54484e580
+  metadata.gz: b99877f95d6100bd27c7baaf1c55480ee4144d94
+  data.tar.gz: 7ff1ffe1eda5611cc0abcf0be984929ec081971c
 SHA512:
-  metadata.gz: e78d461c1c5442e885621209f64c3cc47e20f49858d4237b61404caac6e9872f1b8660e9e9ae50443e9cdeeed63345bacf159becb6c1a62e90996c5e7fdd5f57
-  data.tar.gz: 5794cb3bb5b488406d802210a1234a1b2d1293eb2d451aeb6d91651719fca4e00b5ebeaeeaa2961b0fc3bb5137d154da6df39c2b116be94ff2905f3d36b6e9dc
+  metadata.gz: 0a97650d236dab27448c10643668081895a4d162d0f2b5d9706527b5d88d779723997a913d36b2bee50401b37a5c9d50394862035d5bde109c77c9c241dbd513
+  data.tar.gz: 893a53e42b37e577cab9e71ead189a15eb2f60a4c8cefd4b1eab9df4f0bf1aeb30a6b12eac731d444058a8c2ca6f6e37ef5b57eca214ddbda906c1a17ac9e937

data/README.md

@@ -20,6 +20,7 @@ Any and all feedback is welcome.  Happy Ruby visibility.
 [![rails](https://s3.amazonaws.com/instana/rails-logo.jpg?1)](http://rubyonrails.org/)
 [![roda](https://s3.amazonaws.com/instana/roda-logo.png?1)](http://roda.jeremyevans.net/)
 [![cuba](https://s3.amazonaws.com/instana/cuba-logo.png?1)](http://cuba.is/)
+[![mina logo 100px](https://cloud.githubusercontent.com/assets/395132/23832558/fcd5bdb2-0736-11e7-9809-3016e89698e2.png)](https://github.com/instana/mina-instana)
 [![sinatra](https://s3.amazonaws.com/instana/sinatra-logo.png?1)](http://www.sinatrarb.com/)
 [![padrino](https://s3.amazonaws.com/instana/padrino-logo.png?1)](http://padrinorb.com/)
 [![rack](https://s3.amazonaws.com/instana/rack-logo.png?1)](https://rack.github.io/)

data/lib/instana/agent.rb

@@ -1,8 +1,9 @@
-require 'net/http'
-require 'uri'
 require 'json'
-require 'timers'
+require 'net/http'
+require 'socket'
 require 'sys/proctable'
+require 'timers'
+require 'uri'
 include Sys
 
 module Instana
@@ -173,6 +174,15 @@ module Instana
       announce_payload[:pid] = pid_namespace? ? get_real_pid : Process.pid
       announce_payload[:args] = @process[:arguments]
 
+
+      if @is_linux && !::Instana.test?
+        # 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]
+        announce_payload[:fd] = socket.fileno
+        announce_payload[:inode] = File.readlink("/proc/#{Process.pid}/fd/#{socket.fileno}")
+      end
+
       uri = URI.parse("http://#{@discovered[:agent_host]}:#{@discovered[:agent_port]}/#{DISCOVERY_PATH}")
       req = Net::HTTP::Put.new(uri)
       req.body = announce_payload.to_json
@@ -193,6 +203,8 @@ module Instana
       Instana.logger.error "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
       Instana.logger.debug e.backtrace.join("\r\n")
       return false
+    ensure
+      socket.close if socket
     end
 
     # Method to report metrics data to the host agent.
@@ -454,8 +466,15 @@ module Instana
     #
     def get_real_pid
       raise RuntimeError.new("Unsupported platform: get_real_pid") unless @is_linux
-      v = File.open("/proc/#{Process.pid}/sched", &:readline)
-      v.match(/\d+/).to_s.to_i
+
+      sched_file = "/proc/#{Process.pid}/sched"
+      pid = Process.pid
+
+      if File.exist?(sched_file)
+        v = File.open(sched_file, &:readline)
+        pid = v.match(/\d+/).to_s.to_i
+      end
+      pid
     end
 
     # Determine whether the pid has changed since Agent start.

data/lib/instana/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.4.0
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-10 00:00:00.000000000 Z
+date: 2017-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler