Skip to content

Commit 67cdc4e

Browse files
committed
fix: Image parsing
SHA256 is hex encoded, not just digits. Fixes open-telemetry#1788 Signed-off-by: Robert Elliot <rob@lidalia.org.uk>
1 parent 8405e30 commit 67cdc4e

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/EcsResource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ private static class DockerImage {
314314

315315
private static final Pattern imagePattern =
316316
Pattern.compile(
317-
"^(?<repository>([^/\\s]+/)?([^:\\s]+))(:(?<tag>[^@\\s]+))?(@sha256:(?<sha256>\\d+))?$");
317+
"^(?<repository>([^/\\s]+/)?([^:\\s]+))(:(?<tag>[^@\\s]+))?(@sha256:(?<sha256>[\\da-fA-F]+))?$");
318318

319319
final String repository;
320320
final String tag;

aws-resources/src/test/resources/ecs-container-metadata-v3.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"DockerId": "43481a6ce4842eec8fe72fc28500c6b52edcc0917f105b83379f88cac1ff3946",
33
"Name": "nginx-curl",
44
"DockerName": "ecs-nginx-5-nginx-curl-ccccb9f49db0dfe0d901",
5-
"Image": "nrdlngr/nginx-curl",
5+
"Image": "nrdlngr/nginx-curl:latest@sha256:8dc35e9386b5d280d285ae7a78d271a5d4a82106cb254fbed5fde4923faa8deb",
66
"ImageID": "sha256:2e00ae64383cfc865ba0a2ba37f61b50a120d2d9378559dcd458dc0de47bc165",
77
"Labels": {
88
"com.amazonaws.ecs.cluster": "default",
@@ -28,4 +28,4 @@
2828
]
2929
}
3030
]
31-
}
31+
}

0 commit comments

Comments
 (0)