instana 1.11.2-java → 1.11.3-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.rb +14 -1
- data/lib/instana/agent/helpers.rb +0 -8
- 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: 4fde1e3bb2163f5b9dd3735ce36defbc926bb7aa2da94435f83481be65e997a2
|
|
4
|
+
data.tar.gz: a8d96b5a678b5bfe088ef8ecbb91e152e5c4d4d4253679115f0a67d3c0a54b3f
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: e36ffa6117d07d1374c815d95459ebe8184ae74193ab2451c7d31a4193f1ef48061237594145fc42a85512b2a3a04a3e28fae1944ae65b14ce789a7b3be22fb2
|
|
7
|
+
data.tar.gz: c9327cb82f3115708138246fbc11ae71228afd6d8d48120bc1c411ddcdb756f2d8ffc3923298143c930c176560be5b788ca40a8f96b080447788f81565a68fc6
|
data/lib/instana/agent.rb
CHANGED
|
@@ -246,7 +246,20 @@ module Instana
|
|
|
246
246
|
|
|
247
247
|
sched_pid = get_sched_pid
|
|
248
248
|
announce_payload[:pid] = sched_pid
|
|
249
|
-
|
|
249
|
+
|
|
250
|
+
if running_in_container?
|
|
251
|
+
if sched_pid != Process.pid
|
|
252
|
+
# In container: sched reveals true PID
|
|
253
|
+
announce_payload[:pidFromParentNS] = true
|
|
254
|
+
else
|
|
255
|
+
# In container: sched told us nothing
|
|
256
|
+
announce_payload[:pidFromParentNS] = false
|
|
257
|
+
end
|
|
258
|
+
else
|
|
259
|
+
# Not in a container
|
|
260
|
+
announce_payload[:pidFromParentNS] = true
|
|
261
|
+
end
|
|
262
|
+
|
|
250
263
|
else
|
|
251
264
|
announce_payload[:pid] = Process.pid
|
|
252
265
|
announce_payload[:pidFromParentNS] = true
|
|
@@ -1,12 +1,4 @@
|
|
|
1
1
|
module AgentHelpers
|
|
2
|
-
# Indicates whether we are running in a pid namespace (such as
|
|
3
|
-
# Docker).
|
|
4
|
-
#
|
|
5
|
-
def pid_namespace?
|
|
6
|
-
return false unless @is_linux
|
|
7
|
-
Process.pid != get_real_pid
|
|
8
|
-
end
|
|
9
|
-
|
|
10
2
|
# Attempts to determine if we're running inside a container.
|
|
11
3
|
# The qualifications are:
|
|
12
4
|
# 1. Linux based OS
|
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.3
|
|
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-24 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
requirement: !ruby/object:Gem::Requirement
|