instana 1.11.2 → 1.11.3
Sign up to get free protection for your applications and to get access to all the features.
- 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: 964de6b7e7cf62695558794bb80a056a87427f0fc67d6428eaaa1b3bd1e4d7f8
|
4
|
+
data.tar.gz: d9f7d98a110ef3a73024f26050af10f1fde12dda500ec665dfe28062579577dd
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: bdb19c8b417c5d22918d3275a1bbfbe956ebd72b2672083b7045e941ea58dccf8d6fea00e5ec17ebf14a95de0e90ce68bbd936119d87f5632a824135f5afc722
|
7
|
+
data.tar.gz: 145abd6cfb3c1c267a3099fe715db07fe8e6d64dd6a0c47a29d7923d90ddfac2b7b7770b229034ef3e5d8c2a8e3b873dacf6ec47e6795690b9dee9625d37c17a
|
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: ruby
|
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
|
name: bundler
|