From 67cdc4ecc8dc92bc0a79cf616e1c5e8e92b6ec45 Mon Sep 17 00:00:00 2001 From: Robert Elliot Date: Thu, 3 Apr 2025 12:51:06 +0100 Subject: [PATCH] fix: Image parsing SHA256 is hex encoded, not just digits. Fixes #1788 Signed-off-by: Robert Elliot --- .../io/opentelemetry/contrib/aws/resource/EcsResource.java | 2 +- .../src/test/resources/ecs-container-metadata-v3.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/EcsResource.java b/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/EcsResource.java index de6d50afe..efb112de8 100644 --- a/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/EcsResource.java +++ b/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/EcsResource.java @@ -314,7 +314,7 @@ private static class DockerImage { private static final Pattern imagePattern = Pattern.compile( - "^(?([^/\\s]+/)?([^:\\s]+))(:(?[^@\\s]+))?(@sha256:(?\\d+))?$"); + "^(?([^/\\s]+/)?([^:\\s]+))(:(?[^@\\s]+))?(@sha256:(?[\\da-fA-F]+))?$"); final String repository; final String tag; diff --git a/aws-resources/src/test/resources/ecs-container-metadata-v3.json b/aws-resources/src/test/resources/ecs-container-metadata-v3.json index 2e89ffe59..f7cc0f53f 100644 --- a/aws-resources/src/test/resources/ecs-container-metadata-v3.json +++ b/aws-resources/src/test/resources/ecs-container-metadata-v3.json @@ -2,7 +2,7 @@ "DockerId": "43481a6ce4842eec8fe72fc28500c6b52edcc0917f105b83379f88cac1ff3946", "Name": "nginx-curl", "DockerName": "ecs-nginx-5-nginx-curl-ccccb9f49db0dfe0d901", - "Image": "nrdlngr/nginx-curl", + "Image": "nrdlngr/nginx-curl:latest@sha256:8dc35e9386b5d280d285ae7a78d271a5d4a82106cb254fbed5fde4923faa8deb", "ImageID": "sha256:2e00ae64383cfc865ba0a2ba37f61b50a120d2d9378559dcd458dc0de47bc165", "Labels": { "com.amazonaws.ecs.cluster": "default", @@ -28,4 +28,4 @@ ] } ] -} \ No newline at end of file +}