When the systemd cgroup driver is used, cgroup paths will have hyphen…

…s (e.g. in pod UIDs) escaped to underscores. When we're parsing cgroups, we must therefore unescape them. refs elastic/apm#165
beniwohli · Nov 12, 2019 · 330c0b8 · 330c0b8
1 parent 09c3129
commit 330c0b8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/elasticapm/utils/cgroup.py b/elasticapm/utils/cgroup.py
@@ -100,6 +100,6 @@ def parse_cgroups(filehandle):
             pod_id = kubepods_match.group(1)
             if not pod_id:
                 pod_id = kubepods_match.group(2)
-            return {"container": {"id": container_id}, "kubernetes": {"pod": {"uid": pod_id}}}
+            return {"container": {"id": container_id}, "kubernetes": {"pod": {"uid": pod_id.replace("_", "-")}}}
         elif container_id_regexp.match(container_id):
             return {"container": {"id": container_id}}
diff --git a/tests/utils/cgroup_tests.py b/tests/utils/cgroup_tests.py
@@ -56,7 +56,7 @@
             "1:name=systemd:/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod90d81341_92de_11e7_8cf2_507b9d4141fa.slice/crio-2227daf62df6694645fee5df53c1f91271546a9560e8600a525690ae252b7f63.scope",
             {
                 "container": {"id": "2227daf62df6694645fee5df53c1f91271546a9560e8600a525690ae252b7f63"},
-                "kubernetes": {"pod": {"uid": "90d81341_92de_11e7_8cf2_507b9d4141fa"}},
+                "kubernetes": {"pod": {"uid": "90d81341-92de-11e7-8cf2-507b9d4141fa"}},
             },
         ),
         (