Skip to content

Fix regex for EcsResource when image includes @sha256:<hash> #1789

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
danielcompton wants to merge 1 commit into from
Closed

Fix regex for EcsResource when image includes @sha256:<hash> #1789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/EcsResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ private static class DockerImage {

private static final Pattern imagePattern =
Pattern.compile(
"^(?<repository>([^/\\s]+/)?([^:\\s]+))(:(?<tag>[^@\\s]+))?(@sha256:(?<sha256>\\d+))?$");
"^(?<repository>([^/\\s]+/)?([^:\\s]+))(:(?<tag>[^@\\s]+))?(@sha256:(?<sha256>\\p{XDigit}+))?$");

final String repository;
final String tag;
Expand Down
23 changes: 23 additions & 0 deletions aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/EcsResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,4 +162,27 @@ void inServiceLoader() {
String readResourceJson(String resourceName) throws IOException {
return Resources.toString(Resources.getResource(resourceName), StandardCharsets.UTF_8);
}

@Test
void testImageWithSha256Digest() throws IOException {
// Create a minimal JSON with just the Image field containing a SHA256 digest
String json =
"{\"Image\": \"111122223333.dkr.ecr.us-east-1.amazonaws.com/myapp:a635776144e10255377fa15957781eb11f59daa7@sha256:ca8528f563912012ee19777fad134b9abbe305c5d7fcf62c4c351a4eb8656dd8\"}";

Map<String, String> mockSysEnv = new HashMap<>();
mockSysEnv.put(ECS_METADATA_KEY_V4, "ecs_metadata_uri");

when(mockHttpClient.fetchString("GET", "ecs_metadata_uri", Collections.emptyMap(), null))
.thenReturn(json);
when(mockHttpClient.fetchString("GET", "ecs_metadata_uri/task", Collections.emptyMap(), null))
.thenReturn("{}");

Resource resource = EcsResource.buildResource(mockSysEnv, mockHttpClient);
Attributes attributes = resource.getAttributes();

assertThat(attributes.get(CONTAINER_IMAGE_NAME))
.isEqualTo("111122223333.dkr.ecr.us-east-1.amazonaws.com/myapp");
assertThat(attributes.get(CONTAINER_IMAGE_TAGS))
.isEqualTo(singletonList("a635776144e10255377fa15957781eb11f59daa7"));
}
}
Loading