Fix container detection fails in k8s with containerd v1.5.0+ environments (#4733)

* pr with issue#4730

* PR for issue#4730

Signed-off-by: wuzhaoyin <[email protected]>

* Annotation adjustment

Signed-off-by: wuzhaoyin <[email protected]>

* fix code owner review required fail

Signed-off-by: wuzhaoyin <[email protected]>

Signed-off-by: wuzhaoyin <[email protected]>

Author: wzy531a

sdk-extensions/resources/src/main/java/io/opentelemetry/sdk/extension/resources/ContainerResource.java

@@ -86,19 +86,31 @@ private static String getIdFromLine(String line) {
       return null;
     }
 
+    String containerId;
+
     String lastSection = line.substring(lastSlashIdx + 1);
-    int startIdx = lastSection.lastIndexOf('-');
-    int endIdx = lastSection.lastIndexOf('.');
+    int colonIdx = lastSection.lastIndexOf(':');
 
-    startIdx = startIdx == -1 ? 0 : startIdx + 1;
-    if (endIdx == -1) {
-      endIdx = lastSection.length();
-    }
-    if (startIdx > endIdx) {
-      return null;
+    if (colonIdx != -1) {
+      // since containerd v1.5.0+, containerId is divided by the last colon when the cgroupDriver is
+      // systemd:
+      // https://github.com/containerd/containerd/blob/release/1.5/pkg/cri/server/helpers_linux.go#L64
+      containerId = lastSection.substring(colonIdx + 1);
+    } else {
+      int startIdx = lastSection.lastIndexOf('-');
+      int endIdx = lastSection.lastIndexOf('.');
+
+      startIdx = startIdx == -1 ? 0 : startIdx + 1;
+      if (endIdx == -1) {
+        endIdx = lastSection.length();
+      }
+      if (startIdx > endIdx) {
+        return null;
+      }
+
+      containerId = lastSection.substring(startIdx, endIdx);
     }
 
-    String containerId = lastSection.substring(startIdx, endIdx);
     if (OtelEncodingUtils.isValidBase16String(containerId) && !containerId.isEmpty()) {
       return containerId;
     } else {

sdk-extensions/resources/src/test/java/io/opentelemetry/sdk/extension/resources/ContainerResourceTest.java

@@ -84,6 +84,15 @@ void buildResource_Valid(@TempDir Path tempFolder) throws IOException {
             "11:perf_event:/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod4415fd05_2c0f_4533_909b_f2180dca8d7c.slice/cri-containerd-713a77a26fe2a38ebebd5709604a048c3d380db1eb16aa43aca0b2499e54733c.scope");
     assertThat(getContainerId(buildResource(cgroup5)))
         .isEqualTo("713a77a26fe2a38ebebd5709604a048c3d380db1eb16aa43aca0b2499e54733c");
+
+    // with colon, env: k8s v1.24.0, the cgroupDriver by systemd(default), and container is
+    // cri-containerd v1.6.8
+    Path cgroup6 =
+        createCGroup(
+            tempFolder.resolve("cgroup6"),
+            "11:devices:/system.slice/containerd.service/kubepods-pod87a18a64_b74a_454a_b10b_a4a36059d0a3.slice:cri-containerd:05c48c82caff3be3d7f1e896981dd410e81487538936914f32b624d168de9db0");
+    assertThat(getContainerId(buildResource(cgroup6)))
+        .isEqualTo("05c48c82caff3be3d7f1e896981dd410e81487538936914f32b624d168de9db0");
   }
 
   private static String getContainerId(Resource resource) {