Fix #8462 - Use more permissive regexp to extract containerid (#18272)

Author: stefanroeck

instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/CgroupV2ContainerIdExtractor.java

@@ -7,6 +7,7 @@
 
 import static java.util.Optional.empty;
 import static java.util.logging.Level.WARNING;
+import static java.util.stream.Collectors.toList;
 
 import java.io.IOException;
 import java.nio.file.Path;
@@ -16,7 +17,6 @@
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.stream.Stream;
 
 /** Utility for extracting the container ID from runtimes inside cgroup v2 containers. */
 class CgroupV2ContainerIdExtractor {
@@ -25,7 +25,8 @@ class CgroupV2ContainerIdExtractor {
       Logger.getLogger(CgroupV2ContainerIdExtractor.class.getName());
 
   static final Path V2_CGROUP_PATH = Paths.get("/proc/self/mountinfo");
-  private static final Pattern CONTAINER_ID_RE = Pattern.compile("^[0-9a-f]{64}$");
+  private static final Pattern CONTAINER_ID_RE =
+      Pattern.compile("^\\d+ \\d+ \\d+:\\d+ [^ ]*/containers/[^ ]*?([0-9a-f]{64})");
   private static final Pattern CONTAINERD_CONTAINER_ID_RE =
       Pattern.compile("cri-containerd:[0-9a-f]{64}");
   private static final Pattern CRIO_CONTAINER_ID_RE = Pattern.compile("\\/crio-[0-9a-f]{64}");
@@ -76,12 +77,19 @@ Optional<String> extractContainerId() {
       return optCid;
     }
 
-    return fileAsList.stream()
-        .filter(line -> line.contains("/containers/"))
-        .flatMap(line -> Stream.of(line.split("/")))
-        .map(CONTAINER_ID_RE::matcher)
-        .filter(Matcher::matches)
-        .reduce((first, second) -> second)
-        .map(matcher -> matcher.group(0));
+    List<String> containerIds =
+        fileAsList.stream()
+            .filter(line -> line.contains("/containers/"))
+            .map(CONTAINER_ID_RE::matcher)
+            .filter(Matcher::find)
+            .map(matcher -> matcher.group(1))
+            .distinct()
+            .collect(toList());
+    if (containerIds.size() > 1) {
+      logger.log(WARNING, "Multiple container ids found in v2 cgroup path: {0}", containerIds);
+    }
+    return containerIds.isEmpty()
+        ? empty()
+        : Optional.of(containerIds.get(containerIds.size() - 1));
   }
 }

instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/CgroupV2ContainerIdExtractorTest.java

@@ -65,12 +65,19 @@ void extractSuccess_containerd() throws IOException {
   }
 
   @Test
-  void extractSuccess_podman() throws IOException {
+  void extractSuccess_podman1() throws IOException {
     verifyContainerId(
-        "podman_proc_self_mountinfo",
+        "podman_proc_self_mountinfo1",
         "2a33efc76e519c137fe6093179653788bed6162d4a15e5131c8e835c968afbe6");
   }
 
+  @Test
+  void extractSuccess_podman2() throws IOException {
+    verifyContainerId(
+        "podman_proc_self_mountinfo2",
+        "1b8f3c3819fbae7b858e55c52ec5783d06aa9cbf337815ecb9b96f47babcee5d");
+  }
+
   @Test
   void extractSuccess_crio() throws IOException {
     verifyContainerId(

…est/resources/podman_proc_self_mountinfo …st/resources/podman_proc_self_mountinfo1instrumentation/resources/library/src/test/resources/podman_proc_self_mountinfo renamed to instrumentation/resources/library/src/test/resources/podman_proc_self_mountinfo1 instrumentation/resources/library/src/test/resources/podman_proc_self_mountinfo renamed to instrumentation/resources/library/src/test/resources/podman_proc_self_mountinfo1

@@ -0,0 +1,3 @@
+495 499 0:54 /containers/overlay-containers/1b8f3c3819fbae7b858e55c52ec5783d06aa9cbf337815ecb9b96f47babcee5d/userdata/.containerenv /run/.containerenv rw,nosuid,nodev,relatime - tmpfs tmpfs rw,size=792480k,nr_inodes=198120,mode=700,uid=1000,gid=1000,inode64
+496 499 0:54 /containers/overlay-containers/1b8f3c3819fbae7b858e55c52ec5783d06aa9cbf337815ecb9b96f47babcee5d/userdata/run/secrets /run/secrets rw,nosuid,nodev,relatime - tmpfs tmpfs rw,size=792480k,nr_inodes=198120,mode=700,uid=1000,gid=1000,inode64
+499 325 0:81 / / rw,relatime - overlay overlay rw,lowerdir=/home/kiosk/.local/share/containers/storage/overlay/l/HRSQNMWW6Y6RMZ7ACTG6KK3IXD:/home/kiosk/.local/share/containers/storage/overlay/l/W23BT5LKDOIT7F5GNQ3DAFQW2J:/home/kiosk/.local/share/containers/storage/overlay/l/EHSFOISJJJSHGBWH7JZPSVFNCA:/home/kiosk/.local/share/containers/storage/overlay/l/7HOJBSPCIOYYKOXI2UHNAQRVGE:/home/kiosk/.local/share/containers/storage/overlay/l/WY4HKNEYETZGULKVTKU2SXGSZE:/home/kiosk/.local/share/containers/storage/overlay/l/MKJVFIO2LEFULLXCPVPNGOG7PQ:/home/kiosk/.local/share/containers/storage/overlay/l/DSPUZD5TRP673BCXTUOO5LG5X7:/home/kiosk/.local/share/containers/storage/overlay/l/JB6M4RNLP4O5WKSGNPGZW3SXNU:/home/kiosk/.local/share/containers/storage/overlay/l/CNVLAFAR4SHT6HZIKIXMEOBIIF:/home/kiosk/.local/share/containers/storage/overlay/l/VQZCBYV3Y6PV2PHNZDTRQ7UYOU,upperdir=/home/kiosk/.local/share/containers/storage/overlay/cf26b720fcbfb0546ac3eee4be26d3e2a97e9ee51ad878bcb1ebb0b5d378d5ab/diff,workdir=/home/kiosk/.local/share/containers/storage/overlay/cf26b720fcbfb0546ac3eee4be26d3e2a97e9ee51ad878bcb1ebb0b5d378d5ab/work,redirect_dir=nofollow,uuid=on,volatile,userxattr