Skip to content

Use containerd prefix #2988

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jeffalder wants to merge 3 commits into from
+6 −1
Closed

Use containerd prefix #2988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
22dbc2e
Use containerd prefix
jeffalder Jul 12, 2026
613b681
Add single v2 test case
jeffalder Jul 12, 2026
298b60e
fix regex "don't match this group"
jeffalder Jul 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion newrelic-agent/src/main/java/com/newrelic/agent/utilization/DockerData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public class DockerData {

private static final Pattern VALID_CONTAINER_ID = Pattern.compile("^[0-9a-f]{64}$");
private static final Pattern DOCKER_CONTAINER_STRING_V1 = Pattern.compile("^.*[^0-9a-f]+([0-9a-f]{64,}).*");
private static final Pattern DOCKER_CONTAINER_STRING_V2 = Pattern.compile(".*/docker/containers/([0-9a-f]{64,}).*");
private static final Pattern DOCKER_CONTAINER_STRING_V2 = Pattern.compile(".*(?:/docker/containers/|containerd-)([0-9a-f]{64,}).*");

private final CloudConfig cloudConfig;

Expand Down
5 changes: 5 additions & 0 deletions newrelic-agent/src/test/java/com/newrelic/agent/utilization/DockerDataTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,11 @@ public void testCheckLineAndGetIdValidV2() {
line = "886 322 5:997 /docker/containers/d340a98bd7761414d6b3b8fabd2917c74d85155af1477b584bcc4adf4b94eaf1 / rw - opts ro";
Assert.assertTrue(dockerData.checkLineAndGetResult(line, sb, CGroup.V2));
Assert.assertEquals("d340a98bd7761414d6b3b8fabd2917c74d85155af1477b584bcc4adf4b94eaf1", sb.toString());

sb = new StringBuilder();
line = "3798 3797 0:25 /kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod01c130b2_45db_44b3_9f82_782cf91c1219.slice/cri-containerd-bff561381c85069f7b48c507556d799376ef8a16e88abe4779332aae7ab5fa16.scope /sys/fs/cgroup/systemd ro,nosuid,nodev,noexec,relatime master:9 - cgroup cgroup rw,xattr,release_agent=/usr/lib/systemd/systemd-cgroups-agent,name=systemd";
Assert.assertTrue(dockerData.checkLineAndGetResult(line, sb, CGroup.V2));
Assert.assertEquals("bff561381c85069f7b48c507556d799376ef8a16e88abe4779332aae7ab5fa16", sb.toString());
}

@Test
Expand Down
Loading