instana 1.11.1-java → 1.11.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd1cbd04c0c25885c901ea8ef81fd02a42cec07541b40a23133ac191e0ee17fe
-  data.tar.gz: 23aa4673f569645a182e6200a94d1f869d44d851710955bf46681142ef5883ab
+  metadata.gz: e9c56aa7b817714cc00f275a846710f0cba2d6bd9aa0d3a9ec0df7db4bb5785d
+  data.tar.gz: ca12da57895fbfec89cb6b852393d11f0411d9b132461558bbf4610130c0e5be
 SHA512:
-  metadata.gz: 001a9a9156206d69ddb14297b1809c98ed82d0b96a39218d776e68bae5ac8e0294bc61a96570fb6072c9a52aa1e3ec71c18992cb280e17a961e2cabae86e15db
-  data.tar.gz: b9f91f28d6b554a58788f1d9d741bdb04e2c593c3305ec48d0ce669236f386d86075679bf98b24d749682fdc09538997d1e1b38cca64d5f7cd8482c73a1b354b
+  metadata.gz: f6d12998125eb27dce45202c4bbcc6d17280baeb09caec32bf6d0131cc88417f563f6fb5d0f8005402af87682fc13c0edbd7c2c90fcc2d33ffcfedfc4faa26aa
+  data.tar.gz: fcb0c7ca934e2d99c71db86f34de22d69c87047d4ec011eb122c804a2f237736de13bf67bf25955f4e1af2b4deb6a1e8f1fcd2704596bdafb3f79caa35a6fcbe

data/lib/instana/agent/helpers.rb

@@ -13,7 +13,15 @@ module AgentHelpers
   #   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
+
+    cpuset_contents = get_cpuset_contents
+
+    if cpuset_contents.nil? or cpuset_contents == '/'
+      ::Instana.logger.debug "running_in_container? == no"
+      return false
+    end
+    ::Instana.logger.debug "running_in_container? == yes"
+    true
   end
 
   # Attempts to determine the true process ID by querying the
@@ -40,7 +48,10 @@ module AgentHelpers
     if File.exist?(cpuset_file)
       contents = File.open(cpuset_file, "r").read
     end
-    contents
+    contents.chomp
+  rescue Exception => e
+    Instana.logger.debug { "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" }
+    return nil
   end
 
   # Returns the PID that we are reporting to

data/lib/instana/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.11.1
+  version: 1.11.2
 platform: java
 authors:
 - Peter Giacomo Lombardo
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-15 00:00:00.000000000 Z
+date: 2020-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement