@@ -65,7 +65,7 @@ PLATFORM_UTIL_TEST("find docker container ID") {
6565 }
6666}
6767
68- PLATFORM_UTIL_TEST (" find Fargate 1.3 container ID " ) {
68+ PLATFORM_UTIL_TEST (" find multiline container IDs " ) {
6969 struct TestCase {
7070 size_t line;
7171 std::string_view name;
@@ -74,12 +74,50 @@ PLATFORM_UTIL_TEST("find Fargate 1.3 container ID") {
7474 };
7575
7676 auto test_case = GENERATE (values<TestCase>({
77- {__LINE__, " empty inputs" , " " , nullopt },
78- {__LINE__, " no Fargate 1.3 container ID" , " coucou" , nullopt },
79- {__LINE__, " one line with Fargate 1.3 container ID" ,
80- " 1:name=systemd:/ecs/55091c13-b8cf-4801-b527-f4601742204d/432624d2150b349fe35ba397284dea788c2bf66b885d14dfc1569b01890ca7da" ,
81- " 432624d2150b349fe35ba397284dea788c2bf66b885d14dfc1569b01890ca7da" },
82- {__LINE__, " multiline with Fargate 1.3 container ID" , R"(
77+ {__LINE__, " Docker" , R"(
78+ 13:name=systemd:/docker/3726184226f5d3147c25fdeab5b60097e378e8a720503a5e19ecfdf29f869860
79+ 12:pids:/docker/3726184226f5d3147c25fdeab5b60097e378e8a720503a5e19ecfdf29f869860
80+ 11:hugetlb:/docker/3726184226f5d3147c25fdeab5b60097e378e8a720503a5e19ecfdf29f869860
81+ 10:net_prio:/docker/3726184226f5d3147c25fdeab5b60097e378e8a720503a5e19ecfdf29f869860
82+ 9:perf_event:/docker/3726184226f5d3147c25fdeab5b60097e378e8a720503a5e19ecfdf29f869860
83+ 8:net_cls:/docker/3726184226f5d3147c25fdeab5b60097e378e8a720503a5e19ecfdf29f869860
84+ 7:freezer:/docker/3726184226f5d3147c25fdeab5b60097e378e8a720503a5e19ecfdf29f869860
85+ 6:devices:/docker/3726184226f5d3147c25fdeab5b60097e378e8a720503a5e19ecfdf29f869860
86+ 5:memory:/docker/3726184226f5d3147c25fdeab5b60097e378e8a720503a5e19ecfdf29f869860
87+ 4:blkio:/docker/3726184226f5d3147c25fdeab5b60097e378e8a720503a5e19ecfdf29f869860
88+ 3:cpuacct:/docker/3726184226f5d3147c25fdeab5b60097e378e8a720503a5e19ecfdf29f869860
89+ 2:cpu:/docker/3726184226f5d3147c25fdeab5b60097e378e8a720503a5e19ecfdf29f869860
90+ 1:cpuset:/docker/3726184226f5d3147c25fdeab5b60097e378e8a720503a5e19ecfdf29f869860
91+ )" ,
92+ " 3726184226f5d3147c25fdeab5b60097e378e8a720503a5e19ecfdf29f869860" },
93+ {__LINE__, " Kubernetes" , R"(
94+ 11:perf_event:/kubepods/besteffort/pod3d274242-8ee0-11e9-a8a6-1e68d864ef1a/3e74d3fd9db4c9dd921ae05c2502fb984d0cde1b36e581b13f79c639da4518a1
95+ 10:pids:/kubepods/besteffort/pod3d274242-8ee0-11e9-a8a6-1e68d864ef1a/3e74d3fd9db4c9dd921ae05c2502fb984d0cde1b36e581b13f79c639da4518a1
96+ 9:memory:/kubepods/besteffort/pod3d274242-8ee0-11e9-a8a6-1e68d864ef1a/3e74d3fd9db4c9dd921ae05c2502fb984d0cde1b36e581b13f79c639da4518a1
97+ 8:cpu,cpuacct:/kubepods/besteffort/pod3d274242-8ee0-11e9-a8a6-1e68d864ef1a/3e74d3fd9db4c9dd921ae05c2502fb984d0cde1b36e581b13f79c639da4518a1
98+ 7:blkio:/kubepods/besteffort/pod3d274242-8ee0-11e9-a8a6-1e68d864ef1a/3e74d3fd9db4c9dd921ae05c2502fb984d0cde1b36e581b13f79c639da4518a1
99+ 6:cpuset:/kubepods/besteffort/pod3d274242-8ee0-11e9-a8a6-1e68d864ef1a/3e74d3fd9db4c9dd921ae05c2502fb984d0cde1b36e581b13f79c639da4518a1
100+ 5:devices:/kubepods/besteffort/pod3d274242-8ee0-11e9-a8a6-1e68d864ef1a/3e74d3fd9db4c9dd921ae05c2502fb984d0cde1b36e581b13f79c639da4518a1
101+ 4:freezer:/kubepods/besteffort/pod3d274242-8ee0-11e9-a8a6-1e68d864ef1a/3e74d3fd9db4c9dd921ae05c2502fb984d0cde1b36e581b13f79c639da4518a1
102+ 3:net_cls,net_prio:/kubepods/besteffort/pod3d274242-8ee0-11e9-a8a6-1e68d864ef1a/3e74d3fd9db4c9dd921ae05c2502fb984d0cde1b36e581b13f79c639da4518a1
103+ 2:hugetlb:/kubepods/besteffort/pod3d274242-8ee0-11e9-a8a6-1e68d864ef1a/3e74d3fd9db4c9dd921ae05c2502fb984d0cde1b36e581b13f79c639da4518a1
104+ 1:name=systemd:/kubepods/besteffort/pod3d274242-8ee0-11e9-a8a6-1e68d864ef1a/3e74d3fd9db4c9dd921ae05c2502fb984d0cde1b36e581b13f79c639da4518a1
105+ 1:name=systemd:/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod2d3da189_6407_48e3_9ab6_78188d75e609.slice/docker-3e74d3fd9db4c9dd921ae05c2502fb984d0cde1b36e581b13f79c639da4518a1.scope
106+ )" ,
107+ " 3e74d3fd9db4c9dd921ae05c2502fb984d0cde1b36e581b13f79c639da4518a1" },
108+ {__LINE__, " Ecs" , R"(
109+ 9:perf_event:/ecs/haissam-ecs-classic/5a0d5ceddf6c44c1928d367a815d890f/38fac3e99302b3622be089dd41e7ccf38aff368a86cc339972075136ee2710ce
110+ 8:memory:/ecs/haissam-ecs-classic/5a0d5ceddf6c44c1928d367a815d890f/38fac3e99302b3622be089dd41e7ccf38aff368a86cc339972075136ee2710ce
111+ 7:hugetlb:/ecs/haissam-ecs-classic/5a0d5ceddf6c44c1928d367a815d890f/38fac3e99302b3622be089dd41e7ccf38aff368a86cc339972075136ee2710ce
112+ 6:freezer:/ecs/haissam-ecs-classic/5a0d5ceddf6c44c1928d367a815d890f/38fac3e99302b3622be089dd41e7ccf38aff368a86cc339972075136ee2710ce
113+ 5:devices:/ecs/haissam-ecs-classic/5a0d5ceddf6c44c1928d367a815d890f/38fac3e99302b3622be089dd41e7ccf38aff368a86cc339972075136ee2710ce
114+ 4:cpuset:/ecs/haissam-ecs-classic/5a0d5ceddf6c44c1928d367a815d890f/38fac3e99302b3622be089dd41e7ccf38aff368a86cc339972075136ee2710ce
115+ 3:cpuacct:/ecs/haissam-ecs-classic/5a0d5ceddf6c44c1928d367a815d890f/38fac3e99302b3622be089dd41e7ccf38aff368a86cc339972075136ee2710ce
116+ 2:cpu:/ecs/haissam-ecs-classic/5a0d5ceddf6c44c1928d367a815d890f/38fac3e99302b3622be089dd41e7ccf38aff368a86cc339972075136ee2710ce
117+ 1:blkio:/ecs/haissam-ecs-classic/5a0d5ceddf6c44c1928d367a815d890f/38fac3e99302b3622be089dd41e7ccf38aff368a86cc339972075136ee2710ce
118+ )" ,
119+ " 38fac3e99302b3622be089dd41e7ccf38aff368a86cc339972075136ee2710ce" },
120+ {__LINE__, " Fargate1Dot3" , R"(
8312111:hugetlb:/ecs/55091c13-b8cf-4801-b527-f4601742204d/432624d2150b349fe35ba397284dea788c2bf66b885d14dfc1569b01890ca7da
8412210:pids:/ecs/55091c13-b8cf-4801-b527-f4601742204d/432624d2150b349fe35ba397284dea788c2bf66b885d14dfc1569b01890ca7da
851239:cpuset:/ecs/55091c13-b8cf-4801-b527-f4601742204d/432624d2150b349fe35ba397284dea788c2bf66b885d14dfc1569b01890ca7da
@@ -93,6 +131,53 @@ PLATFORM_UTIL_TEST("find Fargate 1.3 container ID") {
931311:name=systemd:/ecs/55091c13-b8cf-4801-b527-f4601742204d/432624d2150b349fe35ba397284dea788c2bf66b885d14dfc1569b01890ca7da
94132 )" ,
95133 " 432624d2150b349fe35ba397284dea788c2bf66b885d14dfc1569b01890ca7da" },
134+ {__LINE__, " Fargate1Dot4" , R"(
135+ 11:hugetlb:/ecs/34dc0b5e626f2c5c4c5170e34b10e765-1234567890
136+ 10:pids:/ecs/34dc0b5e626f2c5c4c5170e34b10e765-1234567890
137+ 9:cpuset:/ecs/34dc0b5e626f2c5c4c5170e34b10e765-1234567890
138+ 8:net_cls,net_prio:/ecs/34dc0b5e626f2c5c4c5170e34b10e765-1234567890
139+ 7:cpu,cpuacct:/ecs/34dc0b5e626f2c5c4c5170e34b10e765-1234567890
140+ 6:perf_event:/ecs/34dc0b5e626f2c5c4c5170e34b10e765-1234567890
141+ 5:freezer:/ecs/34dc0b5e626f2c5c4c5170e34b10e765-1234567890
142+ 4:devices:/ecs/34dc0b5e626f2c5c4c5170e34b10e765-1234567890
143+ 3:blkio:/ecs/34dc0b5e626f2c5c4c5170e34b10e765-1234567890
144+ 2:memory:/ecs/34dc0b5e626f2c5c4c5170e34b10e765-1234567890
145+ 1:name=systemd:/ecs/34dc0b5e626f2c5c4c5170e34b10e765-1234567890
146+ )" ,
147+ " 34dc0b5e626f2c5c4c5170e34b10e765-1234567890" },
148+ {__LINE__, " EksNodegroup" , R"(
149+ 11:blkio:/kubepods.slice/kubepods-pod9508fe66_7675_4003_b7c9_d83e9f8f85e5.slice/cri-containerd-26cfbe35e08b24f053011af4ada23d8fcbf81f27f8331a94f56de5b677c903e4.scope
150+ 10:cpuset:/kubepods.slice/kubepods-pod9508fe66_7675_4003_b7c9_d83e9f8f85e5.slice/cri-containerd-26cfbe35e08b24f053011af4ada23d8fcbf81f27f8331a94f56de5b677c903e4.scope
151+ 9:perf_event:/kubepods.slice/kubepods-pod9508fe66_7675_4003_b7c9_d83e9f8f85e5.slice/cri-containerd-26cfbe35e08b24f053011af4ada23d8fcbf81f27f8331a94f56de5b677c903e4.scope
152+ 8:memory:/kubepods.slice/kubepods-pod9508fe66_7675_4003_b7c9_d83e9f8f85e5.slice/cri-containerd-26cfbe35e08b24f053011af4ada23d8fcbf81f27f8331a94f56de5b677c903e4.scope
153+ 7:pids:/kubepods.slice/kubepods-pod9508fe66_7675_4003_b7c9_d83e9f8f85e5.slice/cri-containerd-26cfbe35e08b24f053011af4ada23d8fcbf81f27f8331a94f56de5b677c903e4.scope
154+ 6:cpu,cpuacct:/kubepods.slice/kubepods-pod9508fe66_7675_4003_b7c9_d83e9f8f85e5.slice/cri-containerd-26cfbe35e08b24f053011af4ada23d8fcbf81f27f8331a94f56de5b677c903e4.scope
155+ 5:net_cls,net_prio:/kubepods.slice/kubepods-pod9508fe66_7675_4003_b7c9_d83e9f8f85e5.slice/cri-containerd-26cfbe35e08b24f053011af4ada23d8fcbf81f27f8331a94f56de5b677c903e4.scope
156+ 4:devices:/kubepods.slice/kubepods-pod9508fe66_7675_4003_b7c9_d83e9f8f85e5.slice/cri-containerd-26cfbe35e08b24f053011af4ada23d8fcbf81f27f8331a94f56de5b677c903e4.scope
157+ 3:freezer:/kubepods.slice/kubepods-pod9508fe66_7675_4003_b7c9_d83e9f8f85e5.slice/cri-containerd-26cfbe35e08b24f053011af4ada23d8fcbf81f27f8331a94f56de5b677c903e4.scope
158+ 2:hugetlb:/kubepods.slice/kubepods-pod9508fe66_7675_4003_b7c9_d83e9f8f85e5.slice/cri-containerd-26cfbe35e08b24f053011af4ada23d8fcbf81f27f8331a94f56de5b677c903e4.scope
159+ 1:name=systemd:/kubepods.slice/kubepods-pod9508fe66_7675_4003_b7c9_d83e9f8f85e5.slice/cri-containerd-26cfbe35e08b24f053011af4ada23d8fcbf81f27f8331a94f56de5b677c903e4.scope
160+ )" ,
161+ " 26cfbe35e08b24f053011af4ada23d8fcbf81f27f8331a94f56de5b677c903e4" },
162+ {__LINE__, " PcfContainer1" , R"(
163+ 12:memory:/system.slice/garden.service/garden/6f265890-5165-7fab-6b52-18d1
164+ 11:rdma:/
165+ 10:freezer:/garden/6f265890-5165-7fab-6b52-18d1
166+ 9:hugetlb:/garden/6f265890-5165-7fab-6b52-18d1
167+ 8:pids:/system.slice/garden.service/garden/6f265890-5165-7fab-6b52-18d1
168+ 7:perf_event:/garden/6f265890-5165-7fab-6b52-18d1
169+ 6:cpu,cpuacct:/system.slice/garden.service/garden/6f265890-5165-7fab-6b52-18d1
170+ 5:net_cls,net_prio:/garden/6f265890-5165-7fab-6b52-18d1
171+ 4:cpuset:/garden/6f265890-5165-7fab-6b52-18d1
172+ 3:blkio:/system.slice/garden.service/garden/6f265890-5165-7fab-6b52-18d1
173+ 2:devices:/system.slice/garden.service/garden/6f265890-5165-7fab-6b52-18d1
174+ 1:name=systemd:/system.slice/garden.service/garden/6f265890-5165-7fab-6b52-18d1
175+ )" ,
176+ " 6f265890-5165-7fab-6b52-18d1" },
177+ {__LINE__, " PcfContainer2" , R"(
178+ 1:name=systemd:/system.slice/garden.service/garden/6f265890-5165-7fab-6b52-18d1
179+ )" ,
180+ " 6f265890-5165-7fab-6b52-18d1" },
96181 }));
97182
98183 CAPTURE (test_case.name );
0 commit comments