instana 1.11.1 → 1.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fda35bd4aba894e089926f629c7cdc679b6352636ccc11a9628b0097acc198eb
-  data.tar.gz: 15b14e845ce0f05394117ae356bc2d4497a87a9080fbee9e0f4531fbbe7ceb64
+  metadata.gz: ce791416a3cdf95eca52b3efc52aeb0600b038805d40dccc2ba6917395a0e3c3
+  data.tar.gz: ef21642c1d1d563c43013114f59273756dc60175184fa866d71def089cac1906
 SHA512:
-  metadata.gz: de96dfed29893d2fe4b3242cb5610f743bfcce886b5593ae83fca8bb4bd021f9426cee56dfab1efae29afe20c8bc12793665025b237b7df50fdf5ccf822cfed7
-  data.tar.gz: 792f7cbfb4f9c5d63659bf95564cce41f3348cee1403148d01a8abe0f8e6641a7cc94651dc419a837036d8df363ae40ed2116f0b897ba2599bb8470ac40ce91c
+  metadata.gz: 2fd21c41d48273ea1d1560d2d32b6b70a88935b35ba7118b5a77fea07c886a027992be6cfe7bee8cad5ea7dd44e297bee6b43fdc450c8576a6547ea8a2ea15e2
+  data.tar.gz: a84b5b85e14fa88474876c98aed9c06f40b24b3aae6aded2939eb97fc8fb93105acb86c0b1b46320c014971488ace8cdafbfc39945bf90d70338f2a13edee17b

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: ruby
 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
   name: bundler