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 badc358f..6cae5917 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 @@ -99,6 +99,8 @@ public final class EcsResource { } } + // Suppression is required for CONTAINER_IMAGE_TAG until we are ready to upgrade. + @SuppressWarnings("deprecation") static void parseResponse( JsonParser parser, AttributesBuilder attrBuilders, LogArnBuilder logArnBuilder) throws IOException { @@ -124,6 +126,7 @@ public final class EcsResource { DockerImage parsedImage = DockerImage.parse(value); if (parsedImage != null) { attrBuilders.put(ResourceAttributes.CONTAINER_IMAGE_NAME, parsedImage.getRepository()); + // TODO: CONTAINER_IMAGE_TAG has been replaced with CONTAINER_IMAGE_TAGS attrBuilders.put(ResourceAttributes.CONTAINER_IMAGE_TAG, parsedImage.getTag()); } break; diff --git a/aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/EcsResourceTest.java b/aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/EcsResourceTest.java index e822d88b..b41e5667 100644 --- a/aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/EcsResourceTest.java +++ b/aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/EcsResourceTest.java @@ -33,6 +33,8 @@ class EcsResourceTest { @Mock private SimpleHttpClient mockHttpClient; + // Suppression is required for CONTAINER_IMAGE_TAG until we are ready to upgrade. + @SuppressWarnings("deprecation") @Test void testCreateAttributesV3() throws IOException { Map mockSysEnv = new HashMap<>(); @@ -67,6 +69,8 @@ class EcsResourceTest { entry(ResourceAttributes.AWS_ECS_TASK_REVISION, "5")); } + // Suppression is required for CONTAINER_IMAGE_TAG until we are ready to upgrade. + @SuppressWarnings("deprecation") @Test void testCreateAttributesV4() throws IOException { Map mockSysEnv = new HashMap<>(); diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 601dd019..e9d4c2b0 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -13,7 +13,7 @@ val DEPENDENCY_BOMS = listOf( "com.linecorp.armeria:armeria-bom:1.27.1", "org.junit:junit-bom:5.10.2", "io.grpc:grpc-bom:1.61.1", - "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.0.0-alpha", + "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.1.0-alpha", "org.testcontainers:testcontainers-bom:1.19.5" )