open-telemetry
/
opentelemetry-java-contrib
mirror of https://github.com/open-telemetry/opentelemetry-java-contrib.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update dependency io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha to v2.1.0-alpha (#1196) 

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Jason Plumb <jplumb@splunk.com>
This commit is contained in:
renovate[bot] 2024-02-21 07:13:42 -08:00 committed by GitHub
parent de017df5db
commit 3d30b10683
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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( static void parseResponse(
JsonParser parser, AttributesBuilder attrBuilders, LogArnBuilder logArnBuilder) JsonParser parser, AttributesBuilder attrBuilders, LogArnBuilder logArnBuilder)
throws IOException { throws IOException {
@ -124,6 +126,7 @@ public final class EcsResource {
DockerImage parsedImage = DockerImage.parse(value); DockerImage parsedImage = DockerImage.parse(value);
if (parsedImage != null) { if (parsedImage != null) {
attrBuilders.put(ResourceAttributes.CONTAINER_IMAGE_NAME, parsedImage.getRepository()); 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()); attrBuilders.put(ResourceAttributes.CONTAINER_IMAGE_TAG, parsedImage.getTag());
} }
break; break;

4
aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/EcsResourceTest.java
View File

@ -33,6 +33,8 @@ class EcsResourceTest {
@Mock private SimpleHttpClient mockHttpClient; @Mock private SimpleHttpClient mockHttpClient;
// Suppression is required for CONTAINER_IMAGE_TAG until we are ready to upgrade.
@SuppressWarnings("deprecation")
@Test @Test
void testCreateAttributesV3() throws IOException { void testCreateAttributesV3() throws IOException {
Map<String, String> mockSysEnv = new HashMap<>(); Map<String, String> mockSysEnv = new HashMap<>();
@ -67,6 +69,8 @@ class EcsResourceTest {
entry(ResourceAttributes.AWS_ECS_TASK_REVISION, "5")); entry(ResourceAttributes.AWS_ECS_TASK_REVISION, "5"));
} }
// Suppression is required for CONTAINER_IMAGE_TAG until we are ready to upgrade.
@SuppressWarnings("deprecation")
@Test @Test
void testCreateAttributesV4() throws IOException { void testCreateAttributesV4() throws IOException {
Map<String, String> mockSysEnv = new HashMap<>(); Map<String, String> mockSysEnv = new HashMap<>();

2
dependencyManagement/build.gradle.kts
View File

@ -13,7 +13,7 @@ val DEPENDENCY_BOMS = listOf(
"com.linecorp.armeria:armeria-bom:1.27.1", "com.linecorp.armeria:armeria-bom:1.27.1",
"org.junit:junit-bom:5.10.2", "org.junit:junit-bom:5.10.2",
"io.grpc:grpc-bom:1.61.1", "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" "org.testcontainers:testcontainers-bom:1.19.5"
) )