adapted container ID regex to match IDs from CloudFoundry Garden (#564)

fixes #523
closes #564

Author: beniwohli

CHANGELOG.md

@@ -6,6 +6,7 @@
 ### Bugfixes
  * fixed an issue with empty responses from APM Server's config endpoint (#562, #563)
  * fixed Windows tests by avoiding time.sleep in breakdown metrics tests (#537, #550)
+ * fixed container ID matching to match CloudFoundry Garden container IDs (#523, #564)
 
 ## v5.1.0 
 [Check the diff](https://github.com/elastic/apm-agent-python/compare/v5.0.0...v5.1.0)

elasticapm/utils/cgroup.py

@@ -39,7 +39,9 @@
     r"(?:^/kubepods/[^/]+/pod([^/]+)$)|(?:^/kubepods\.slice/kubepods-[^/]+\.slice/kubepods-[^/]+-pod([^/]+)\.slice$)"
 )
 
-container_id_regexp = re.compile("^[0-9A-Fa-f]{64}$")
+container_id_regexp = re.compile(
+    "^(?:[0-9a-f]{64}|[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4,})$", re.IGNORECASE
+)
 
 
 def get_cgroup_container_metadata():
@@ -85,10 +87,8 @@ def parse_cgroups(filehandle):
         #
         # In a Kubernetes pod, the cgroup path will look like:
         #
-        #   systemd:
-        #      /kubepods.slice/kubepods-<QoS-class>.slice/kubepods-<QoS-class>-pod<pod-UID>.slice/<container-iD>.scope
-        #   cgroupfs:
-        #      /kubepods/<QoS-class>/pod<pod-UID>/<container-iD>
+        #   systemd:/kubepods.slice/kubepods-<QoS-class>.slice/kubepods-<QoS-class>-pod<pod-UID>.slice/<container-iD>.scope
+        #   cgroupfs:/kubepods/<QoS-class>/pod<pod-UID>/<container-iD>
 
         directory, container_id = os.path.split(cgroup_path)
         if container_id.endswith(SYSTEMD_SCOPE_SUFFIX):

tests/utils/cgroup_tests.py

@@ -59,6 +59,10 @@
                 "kubernetes": {"pod": {"uid": "90d81341_92de_11e7_8cf2_507b9d4141fa"}},
             },
         ),
+        (
+            "1:name=systemd:/system.slice/garden.service/garden/70eb4ce5-a065-4401-6990-88ed",
+            {"container": {"id": "70eb4ce5-a065-4401-6990-88ed"}},
+        ),
     ],
 )
 def test_cgroup_parsing(test_input, expected):