instana 1.11.1-java → 1.11.2-java
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/instana/agent/helpers.rb +13 -2
- data/lib/instana/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: e9c56aa7b817714cc00f275a846710f0cba2d6bd9aa0d3a9ec0df7db4bb5785d
|
|
4
|
+
data.tar.gz: ca12da57895fbfec89cb6b852393d11f0411d9b132461558bbf4610130c0e5be
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f6d12998125eb27dce45202c4bbcc6d17280baeb09caec32bf6d0131cc88417f563f6fb5d0f8005402af87682fc13c0edbd7c2c90fcc2d33ffcfedfc4faa26aa
|
|
7
|
+
data.tar.gz: fcb0c7ca934e2d99c71db86f34de22d69c87047d4ec011eb122c804a2f237736de13bf67bf25955f4e1af2b4deb6a1e8f1fcd2704596bdafb3f79caa35a6fcbe
|
|
@@ -13,7 +13,15 @@ module AgentHelpers
|
|
|
13
13
|
# 2. /proc/self/cpuset exists and contents include a container id
|
|
14
14
|
def running_in_container?
|
|
15
15
|
return false unless @is_linux
|
|
16
|
-
|
|
16
|
+
|
|
17
|
+
cpuset_contents = get_cpuset_contents
|
|
18
|
+
|
|
19
|
+
if cpuset_contents.nil? or cpuset_contents == '/'
|
|
20
|
+
::Instana.logger.debug "running_in_container? == no"
|
|
21
|
+
return false
|
|
22
|
+
end
|
|
23
|
+
::Instana.logger.debug "running_in_container? == yes"
|
|
24
|
+
true
|
|
17
25
|
end
|
|
18
26
|
|
|
19
27
|
# Attempts to determine the true process ID by querying the
|
|
@@ -40,7 +48,10 @@ module AgentHelpers
|
|
|
40
48
|
if File.exist?(cpuset_file)
|
|
41
49
|
contents = File.open(cpuset_file, "r").read
|
|
42
50
|
end
|
|
43
|
-
contents
|
|
51
|
+
contents.chomp
|
|
52
|
+
rescue Exception => e
|
|
53
|
+
Instana.logger.debug { "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" }
|
|
54
|
+
return nil
|
|
44
55
|
end
|
|
45
56
|
|
|
46
57
|
# Returns the PID that we are reporting to
|
data/lib/instana/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: instana
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.11.
|
|
4
|
+
version: 1.11.2
|
|
5
5
|
platform: java
|
|
6
6
|
authors:
|
|
7
7
|
- Peter Giacomo Lombardo
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2020-01-
|
|
11
|
+
date: 2020-01-17 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
requirement: !ruby/object:Gem::Requirement
|