instana 1.11.2-java → 1.11.3-java

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: e9c56aa7b817714cc00f275a846710f0cba2d6bd9aa0d3a9ec0df7db4bb5785d
4
- data.tar.gz: ca12da57895fbfec89cb6b852393d11f0411d9b132461558bbf4610130c0e5be
3
+ metadata.gz: 4fde1e3bb2163f5b9dd3735ce36defbc926bb7aa2da94435f83481be65e997a2
4
+ data.tar.gz: a8d96b5a678b5bfe088ef8ecbb91e152e5c4d4d4253679115f0a67d3c0a54b3f
5
5
  SHA512:
6
- metadata.gz: f6d12998125eb27dce45202c4bbcc6d17280baeb09caec32bf6d0131cc88417f563f6fb5d0f8005402af87682fc13c0edbd7c2c90fcc2d33ffcfedfc4faa26aa
7
- data.tar.gz: fcb0c7ca934e2d99c71db86f34de22d69c87047d4ec011eb122c804a2f237736de13bf67bf25955f4e1af2b4deb6a1e8f1fcd2704596bdafb3f79caa35a6fcbe
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
- announce_payload[:pidFromParentNS] = running_in_container? && (sched_pid != Process.pid)
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
@@ -1,4 +1,4 @@
1
1
  module Instana
2
- VERSION = "1.11.2"
2
+ VERSION = "1.11.3"
3
3
  VERSION_FULL = "instana-#{VERSION}"
4
4
  end
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.2
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-17 00:00:00.000000000 Z
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